diff --git a/Manifest b/Manifest
index bc505bc939c1..aec942c5e44f 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29603 BLAKE2B 36c225c6598f075c142626da74d4b49dae5da2b73b0be649ae45e6cbccaed8b204b632fbada58a6e6a003148a48458b3860eee4894abbd3ac105af6d30af1ed2 SHA512 54ff0ef7fdc3d9314e8b6d477a0ba203d2f6534f8d05c7268329e018118e268506190b80643114394535af6aba0d672b9025c8c31116eed3ccee6345ffd0445d
-TIMESTAMP 2022-10-24T11:39:43Z
+MANIFEST Manifest.files.gz 29607 BLAKE2B 3e69ae8b8b86127a24334219c1d2686027161a329b1bbcbf2d22cc7da7aad7ef206820825a0a065ddb1299c434802e9a7a61e8dc1059a7f47b7e3b462b02680e SHA512 1a288613e84b28f2b5a26b76ae6e9b9709ea10a6f2cf017e81cdf5bbaa78cb1bdabee1625d640a5e2b6b651fa46d461d55d81a060afa826658befd5587724f75
+TIMESTAMP 2022-10-26T04:39:49Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNWeX9fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNYuhVfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCSMQ//dqVLtGdGRlisILj/kfx3w0YfElC84+ksD3TDUEzyltGdGqoFTWZpa/qa
-6x7E8HSE8JRbtzJuYGwvrHhexbPM7zRdrd2fAhiQ6WbY+C8fPOKh1JXVybGeNtJc
-QLJ+282ZvubNrAT/qjDyJdhOpW+8IyOrqvbkyWvVAGAFpulx9zkxoIUqHL7Gm3KL
-2nP2TpP6x0EzECrJOQXwL+QnhRvkLZE/HDeK0A/pC8A6sl85KjTT/ewhX4Mx91b6
-69xvd/8pE3Zp9DmRH4KN81+91Ara0idE2yTshoygQ/KIBbvKIjcsXOVfpz2Lk0n0
-H0/NsvWN89XygHAw61NWjSB3T4OGjrNypGEy/qSzVKtWsNAqAD2UjdBi8ZsLfpI8
-5GKfVrEKkEp4upCTeRkNLDqykKVQGfudUDcYNHJ00nDJoTVLnjZoPtICE7cj//z4
-TDcRbRljVVwDICRndjf5YVIftLUs8JjrV3XewtzyW9Eqfk4NfjR5i4YgBFneGEP7
-Xb9haWke1tv0CIbu8cJKCjATfXO5BTc+uMo9RVDrP1Ox+SCSTIwv85uGwrWOZJcR
-eo9J5IyZCMtR2vY3ibi0moeAqYpF4w8Cs7atDuCJ1vJlrQ/VbO6tAAIlSL6BS79x
-VfBacYeQfk8kYvVBBVrXWBQ45ArB4iPuKDsduvH9dofwqpxBQ6I=
-=UQdP
+klD85A/+LVG2u179LiB7dioUsEmOH+XxrBrp7sTIh48YzezzIqNpMUwZxpUlwkUd
+UwQE4lX6iblkuMzuCk/885+3rzRkW1e0DEZDuBHz4ZZ+uq/unKosoVSrGJ0mhWR+
+KXC0nqyfnIhEChGdK4Yl7xkayhrMQSPd8JZFboJqqvCEZ2ZOvIMMUj6PwCYmbl3u
+rEj/tzro85BW2YnAfZerulZ7Qgc1hexr0/v2UEumwiRgUtH5FRYDC2v8FAmg4ReW
+nG2h9ZRB3kJBOVDGbEgUS90uLDzUi+I9OMCDoxP97IAXVBsCWD8iRAmRFXXJblkf
+pkb1sJ5Tz08AOA53DKnseA17etY9+EymF4cHnLmpISqZL/hwjwwc2qx18co4iier
+fo2eq8qf1fddoCnGpqU/fLCivFpcBFjWT99ey3kwzSbBNJreWgDvGsVgODyAZ5Fm
+pejDoHktB8ga6b9lHxrMJZQmmDRWdshebelMzMFUafJHlq+pRhaCcwB9ub8iHkIN
+7XwgbhT3JLBmneQH8Xp8IqMhPlEIa4e9kWLrIiN2KqzlLc/IqAZk6HJ1WLVH+h0Z
+ncrLSSxIP0YyuyyjCzXhInNImAPOdl727qUdXTyNCJqwDK4ApCfJHdDishjPhLQ+
+ViDEnBRDAwf7AseLgp92VvV8TYa5ANfXAjUQ0JmGxX25TfWHcFM=
+=1zYY
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 7d908f0cd242..960868cd3bbb 100644
Binary files a/Manifest.files.gz and b/Manifest.files.gz differ
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index d02c50dc2532..06994dcdd9a8 100644
Binary files a/app-admin/Manifest.gz and b/app-admin/Manifest.gz differ
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index 7f338f28fb2b..305a3680d316 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -1,19 +1,9 @@
-DIST aws-cli-1.25.81.gh.tar.gz 2273195 BLAKE2B 3bf3ca742b08c0bf4367ae1bfabcf8c2626010d60cc11ff66250753f62609eba80053c1d8696cc3184ba9f947f995a8bb95489b01f60a3fa7e1a8cbb4961652c SHA512 4f10de492a56b158d88671c149d4ed4171fbbde8fe84de15a446e31a7d8003a4562439eabd369cb80dcf91987caab6aef05e5b3f5684aeea47ba0d323883c53c
 DIST aws-cli-1.25.89.gh.tar.gz 2285887 BLAKE2B 1da21b1e314b187ee105d2bf256ce2fea42fec8d1e5cf0de39c8371a93a588e24e5415b2e50ae314d39613a4ae55963bd544cc7ab3e08d0e38089c5c609454f4 SHA512 39087e269a0318777af73d010d7c6264fd595fc5d27f24bb66da07763165729526bd8a60f4225241eb5172d879d6f562c5bf64ad5979d7ac3be40b7d8cf33486
-DIST aws-cli-1.25.90.gh.tar.gz 2285948 BLAKE2B a664e70e7367e6cf6fbaf62ab4dbbf649e92f3184793cb0f444c520b947cfc0845e075a44025b48a02b431e237d835de23aba6f83fdea5810d759690368ce069 SHA512 f42b0125cddc35314a675f84672fb5716300d9625eac7338b36b6f501d412a5e932f1d75566a9cdaca84b9f7cd65cc354199e5138675d48a0f52ace9a1ab126b
-DIST aws-cli-1.25.91.gh.tar.gz 2287481 BLAKE2B 6cc39905deee332187249124bedc14ef7f2bd82c8a54ee56c6156e767f811a8d26070040f64a059b1bf9a6c46e64cecf82be3d94434f6fb3e0c16dca4cbd94d2 SHA512 531985f71aea2c7eafeba61a214a7f19dfd84912b3c25c47d5c4c44b2e2fae25510a57027fa9a79aaee9a417cbcea1a6d222c7a0f0233ee0afee844a2d99dbe1
-DIST aws-cli-1.25.92.gh.tar.gz 2287842 BLAKE2B 5cbadaeed098efa7a7ac911e76d1259e2fd7310b4c87f6f37fb4c3aa731d4f4fdacf6a3ea4345a295e8f6eba2985698ed36287f84303ba22e1466afa7acdcd06 SHA512 9c646c7f081ffe26571d36953e1c98a80a863ae4b0b3cf941aaa4958a96967481aeb634dfb84dae2bf9d3e20ad528b093634d2bb011ec85f3d583de84c72ebb8
-DIST aws-cli-1.25.93.gh.tar.gz 2288018 BLAKE2B ef0a0c679f5e4e698b21f84f2f0aa594889205c0f468cd3ac665040987a843ad9888687e3127f7755d90c715680fcba39430b094e35c8d017837cd9e8b1d51f0 SHA512 6052e677e04b84eb90a853bb6a85506f1b0b1270e64e2f93d666c66deda1824392cbfa1746a55dfb4f2a64554decb54a94e91b60564291621ff939c894f39ca3
-DIST aws-cli-1.25.94.gh.tar.gz 2288438 BLAKE2B c30b798d1e489b04d0d63630fee9a782262be83cb30df6e66793cbba7951135a814734d90cb6117f87382ec520204f7e553a16bee87c1acd448d22581e0cc14d SHA512 9407751a543c4d15d80d8986508abe2b4c1eb2bc375119f17e60928342f3af442359982f6600b551c318fda0c80629ea02511ad70cdb096adf8e91891ceadc03
-DIST aws-cli-1.25.96.gh.tar.gz 2289725 BLAKE2B 8f1a562a9b144f32e0e72eb8a34cf02ce96f740bded6ebe2e14e16da69d614d06f5285614ff2a1c428330290cc2e6c9cab80639dd4b8da7219d16c112d26cb91 SHA512 c45e0ac254a4f3f7d84fdb082a7932f98921b660b465892b759302937f295ce4eeb7750c492be62c36f96cc6c21d5699c44093c5cd00a32a98659fc707b570a7
 DIST aws-cli-1.25.97.gh.tar.gz 2290672 BLAKE2B 4fbff8d9747b615f7b8633ce2a1c7a68880d50d3a22c5bcdfe2e352a8ea84f8b9d0d1c94d514be3e871beeba5c2cc69853fb40daaa4fa4bfd3409779ca2713b5 SHA512 a27dab95240036158d2dc331a3b1768e7c705b52cb1fcf7f5d0bbc3f40bed62838565493c463e22cf2b249981b0fca255ce65d64b7cfa45df24621cb788171e7
-EBUILD awscli-1.25.81.ebuild 1856 BLAKE2B 554e1053c19d16d4e0aeccddbd3a49b42ab412ba342ddd888b11552f1abede7a405f743edbabbda0cb4d42dfc95c0f29da64aab08d09c0cf3b24b0771438f23b SHA512 563c00bd712002ea3b3771e7f6c2f27b478fb78cd91b1009cf498e487b81c8abe04e754873f77f625e56594f34e282307c325cc6609bee2f6e856d0e461aa252
-EBUILD awscli-1.25.89.ebuild 1858 BLAKE2B 1ee53dfc682ba96eb15476dd37b44e1e0833eee35faf61ccad6f24f402a9eb18590e19cad2faa40e11490c13db91f2609859cdd4bcc5caae36a89cecea3143dd SHA512 8370816db2c51b0e6146a031ea1100b47fede8d1ceb82104206f0a55ffbe995a1792d6872913e0d72497b4726f763816ba77c6215441c993554d3065a5f9d3f6
-EBUILD awscli-1.25.90.ebuild 1858 BLAKE2B 1ee53dfc682ba96eb15476dd37b44e1e0833eee35faf61ccad6f24f402a9eb18590e19cad2faa40e11490c13db91f2609859cdd4bcc5caae36a89cecea3143dd SHA512 8370816db2c51b0e6146a031ea1100b47fede8d1ceb82104206f0a55ffbe995a1792d6872913e0d72497b4726f763816ba77c6215441c993554d3065a5f9d3f6
-EBUILD awscli-1.25.91.ebuild 1858 BLAKE2B 1ee53dfc682ba96eb15476dd37b44e1e0833eee35faf61ccad6f24f402a9eb18590e19cad2faa40e11490c13db91f2609859cdd4bcc5caae36a89cecea3143dd SHA512 8370816db2c51b0e6146a031ea1100b47fede8d1ceb82104206f0a55ffbe995a1792d6872913e0d72497b4726f763816ba77c6215441c993554d3065a5f9d3f6
-EBUILD awscli-1.25.92.ebuild 1858 BLAKE2B 1ee53dfc682ba96eb15476dd37b44e1e0833eee35faf61ccad6f24f402a9eb18590e19cad2faa40e11490c13db91f2609859cdd4bcc5caae36a89cecea3143dd SHA512 8370816db2c51b0e6146a031ea1100b47fede8d1ceb82104206f0a55ffbe995a1792d6872913e0d72497b4726f763816ba77c6215441c993554d3065a5f9d3f6
-EBUILD awscli-1.25.93.ebuild 1858 BLAKE2B 1ee53dfc682ba96eb15476dd37b44e1e0833eee35faf61ccad6f24f402a9eb18590e19cad2faa40e11490c13db91f2609859cdd4bcc5caae36a89cecea3143dd SHA512 8370816db2c51b0e6146a031ea1100b47fede8d1ceb82104206f0a55ffbe995a1792d6872913e0d72497b4726f763816ba77c6215441c993554d3065a5f9d3f6
-EBUILD awscli-1.25.94.ebuild 1858 BLAKE2B 1ee53dfc682ba96eb15476dd37b44e1e0833eee35faf61ccad6f24f402a9eb18590e19cad2faa40e11490c13db91f2609859cdd4bcc5caae36a89cecea3143dd SHA512 8370816db2c51b0e6146a031ea1100b47fede8d1ceb82104206f0a55ffbe995a1792d6872913e0d72497b4726f763816ba77c6215441c993554d3065a5f9d3f6
-EBUILD awscli-1.25.96.ebuild 1858 BLAKE2B 1ee53dfc682ba96eb15476dd37b44e1e0833eee35faf61ccad6f24f402a9eb18590e19cad2faa40e11490c13db91f2609859cdd4bcc5caae36a89cecea3143dd SHA512 8370816db2c51b0e6146a031ea1100b47fede8d1ceb82104206f0a55ffbe995a1792d6872913e0d72497b4726f763816ba77c6215441c993554d3065a5f9d3f6
+DIST aws-cli-1.26.0.gh.tar.gz 2291209 BLAKE2B ad2b9380d45d986b2cc4219a93ee30fdc1e86e35e66dc095c76f29e6062601d0e443a96fa93edbc65562580eb9815a8d3f31a59a0c850513793df3870e809be8 SHA512 5b7e87b4fe02d7fbca0482cb93616b8f78f0bb074ed779ca553532be54f914c827a30b8458e209e6fbd23d22b5e734dfe14fb79e8833c3055c771a1766153d2d
+DIST aws-cli-1.26.1.gh.tar.gz 2291902 BLAKE2B 04df153b4b7608ab3c2e86c230065f7b935a911e88e1a5b788dee545d328d9839ba9aba44b334522f2afafef8fa613aea6e749a2a7f9089f40993544f3cec9e9 SHA512 418257a8e4c92a6d21c89f7725cd70f463f4dd53c798783b29c4166daac644501e4a03a180257dfe356bf30228dedcf7a672ad46ff6f36afd40a8efd9ad786f9
+EBUILD awscli-1.25.89.ebuild 1856 BLAKE2B 554e1053c19d16d4e0aeccddbd3a49b42ab412ba342ddd888b11552f1abede7a405f743edbabbda0cb4d42dfc95c0f29da64aab08d09c0cf3b24b0771438f23b SHA512 563c00bd712002ea3b3771e7f6c2f27b478fb78cd91b1009cf498e487b81c8abe04e754873f77f625e56594f34e282307c325cc6609bee2f6e856d0e461aa252
 EBUILD awscli-1.25.97.ebuild 1858 BLAKE2B 1ee53dfc682ba96eb15476dd37b44e1e0833eee35faf61ccad6f24f402a9eb18590e19cad2faa40e11490c13db91f2609859cdd4bcc5caae36a89cecea3143dd SHA512 8370816db2c51b0e6146a031ea1100b47fede8d1ceb82104206f0a55ffbe995a1792d6872913e0d72497b4726f763816ba77c6215441c993554d3065a5f9d3f6
+EBUILD awscli-1.26.0.ebuild 1843 BLAKE2B 1c4942076455cb7b7f201cb909bb946c5ee231bbe589efdf2d58074413ff88fa08afec6c5b0d485bd5b24f0b997857acb0cf25eff2e78e7fca11ff2700c5164c SHA512 e1b7932cd3fb4de8d18b62c8d3cff4c0620b5997bd1a4739ccbd6914a969958eddde42ff99aeb819a3b68674c15f5cbceb768c210f5f4f8fdfb082642ca6636a
+EBUILD awscli-1.26.1.ebuild 1843 BLAKE2B 1c4942076455cb7b7f201cb909bb946c5ee231bbe589efdf2d58074413ff88fa08afec6c5b0d485bd5b24f0b997857acb0cf25eff2e78e7fca11ff2700c5164c SHA512 e1b7932cd3fb4de8d18b62c8d3cff4c0620b5997bd1a4739ccbd6914a969958eddde42ff99aeb819a3b68674c15f5cbceb768c210f5f4f8fdfb082642ca6636a
 MISC metadata.xml 334 BLAKE2B 84c9f50e6c0d015aad36a7f625cddf90cf1137a8c2d445cc641cd4890d64261187c10fde59ee1a6c19b98cfdb6ff534c66ae7a7a48a00ec62d6984c9a1891750 SHA512 a845de531df2cd75abf23cdbfa613e586855b95ac4e96566ef193708d7ecf2ec7f7db72fd31b8af0ac4ccd57e51da9c6d129d426bfdc6c4feb57d7df8647f160
diff --git a/app-admin/awscli/awscli-1.25.81.ebuild b/app-admin/awscli/awscli-1.25.81.ebuild
deleted file mode 100644
index c74fd526a729..000000000000
--- a/app-admin/awscli/awscli-1.25.81.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..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 ~arm64 ~riscv x86"
-
-# botocore is x.(y+2).(z-1)
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(( $(ver_cut 3-) - 1 ))"
-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() {
-	# 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.25.89.ebuild b/app-admin/awscli/awscli-1.25.89.ebuild
index 511be374181c..c74fd526a729 100644
--- a/app-admin/awscli/awscli-1.25.89.ebuild
+++ b/app-admin/awscli/awscli-1.25.89.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~riscv x86"
 
 # botocore is x.(y+2).(z-1)
 BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(( $(ver_cut 3-) - 1 ))"
diff --git a/app-admin/awscli/awscli-1.25.91.ebuild b/app-admin/awscli/awscli-1.25.91.ebuild
deleted file mode 100644
index 511be374181c..000000000000
--- a/app-admin/awscli/awscli-1.25.91.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..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 ~arm64 ~riscv ~x86"
-
-# botocore is x.(y+2).(z-1)
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(( $(ver_cut 3-) - 1 ))"
-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() {
-	# 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.25.92.ebuild b/app-admin/awscli/awscli-1.25.92.ebuild
deleted file mode 100644
index 511be374181c..000000000000
--- a/app-admin/awscli/awscli-1.25.92.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..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 ~arm64 ~riscv ~x86"
-
-# botocore is x.(y+2).(z-1)
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(( $(ver_cut 3-) - 1 ))"
-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() {
-	# 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.25.94.ebuild b/app-admin/awscli/awscli-1.25.94.ebuild
deleted file mode 100644
index 511be374181c..000000000000
--- a/app-admin/awscli/awscli-1.25.94.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..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 ~arm64 ~riscv ~x86"
-
-# botocore is x.(y+2).(z-1)
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(( $(ver_cut 3-) - 1 ))"
-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() {
-	# 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.25.96.ebuild b/app-admin/awscli/awscli-1.25.96.ebuild
deleted file mode 100644
index 511be374181c..000000000000
--- a/app-admin/awscli/awscli-1.25.96.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..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 ~arm64 ~riscv ~x86"
-
-# botocore is x.(y+2).(z-1)
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(( $(ver_cut 3-) - 1 ))"
-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() {
-	# 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.25.93.ebuild b/app-admin/awscli/awscli-1.26.0.ebuild
similarity index 94%
rename from app-admin/awscli/awscli-1.25.93.ebuild
rename to app-admin/awscli/awscli-1.26.0.ebuild
index 511be374181c..7bff39ee809a 100644
--- a/app-admin/awscli/awscli-1.25.93.ebuild
+++ b/app-admin/awscli/awscli-1.26.0.ebuild
@@ -24,8 +24,8 @@ LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 
-# botocore is x.(y+2).(z-1)
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(( $(ver_cut 3-) - 1 ))"
+# 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}]
diff --git a/app-admin/awscli/awscli-1.25.90.ebuild b/app-admin/awscli/awscli-1.26.1.ebuild
similarity index 94%
rename from app-admin/awscli/awscli-1.25.90.ebuild
rename to app-admin/awscli/awscli-1.26.1.ebuild
index 511be374181c..7bff39ee809a 100644
--- a/app-admin/awscli/awscli-1.25.90.ebuild
+++ b/app-admin/awscli/awscli-1.26.1.ebuild
@@ -24,8 +24,8 @@ LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 
-# botocore is x.(y+2).(z-1)
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(( $(ver_cut 3-) - 1 ))"
+# 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}]
diff --git a/app-admin/rsyslog/Manifest b/app-admin/rsyslog/Manifest
index 595bedb6ca09..e286f4f6812a 100644
--- a/app-admin/rsyslog/Manifest
+++ b/app-admin/rsyslog/Manifest
@@ -1,5 +1,6 @@
 AUX 50-default-r1.conf 1952 BLAKE2B dca027ea6073384a2ec5867722028f70599c51fd8c46672ce647e84a7de4b3a0dc5bfaf43f7317eddb902c4987266ae67f88b43375a51e82a3ffefbb61c4d099 SHA512 1bc4d8059d83de57ff44d34265b0c3881bab7889f51c044728ba462c9105c89425187f95b6b01d6d6d103abde22a9dff063e5d6b90027ed87e9f851f9b1ad5b3
 AUX README.gentoo 1126 BLAKE2B b7e3881605c2bacda7f415b3f3195e1ef405a8e9fc7fd627fd35b0ab90966cbb29c9a85fcf2df6092062c5af353d44a02d3451e3caa072f4fa44d681702e9807 SHA512 46fdf3350e2005d3ef588d50dfc6d474a1b5d3010329b656879a43cbbd7be0cd91944b88d3838f45f69c830fc28c42e7fac2cd52e0a4b24bb6780562d59ae384
+AUX rsyslog-8.2210.0-5004-hostname.patch 1137 BLAKE2B dcc87e205a0ac1cbb40d4b7b4e489468e439974fe50273b3a49282bacca7849073845c2ca3949c8a979972352b79230c7a994ed9968ccf2a3353df2f425706a6 SHA512 51ece6d4860eff8795b1e8b9418e0f3b39358b8a094b88161a747dc75103a2c81d7c149d82e2eeda617fd3e582ec203b73786f7d054b1083d10f5e2bf7b3f93c
 AUX rsyslog-r1.logrotate 994 BLAKE2B 36dee881c2cb79ce69678c7cb12c71fb70d970e5e10728a8d2b8acf2c08f613cea9c2a74d78ed7b75333147a6b1a553fe281956990e044a9db651c7486690dee SHA512 5ca68b4eec5bebaed48edb69c85f8338273db847ab1cc6999ce7cfe06644dc3854c3040e0ebd8a4900c213b267b2a081e7901ceb4e58f9dfdc7dc036aff02b6c
 AUX rsyslog.conf 1562 BLAKE2B 3abbc4c13c8c1d3817ac9a7c7f048aa1a8d7f279bf638dc91d15a785ad42c1b34a61de0be33b4ffa218a655849aeceff3e8686384e1d77472417235ce453b546 SHA512 1720174fab020e2de590f3d6bbb03784aca1928fe05f7e75e02fb4597cb8b2ee755e6deb8e8f989060511044ae483f791f496f24e0eecaf27eb9e0b5e20a2c7a
 AUX rsyslog.confd-r1 1145 BLAKE2B 06e63c7500238dd31abddd105269714387b990a3530ad11443a8502ad68221c3f8e8b0db02ba3ad2b7010483364d36a5b526a461d3465972b74d2cd36ff08747 SHA512 a7f8621bdd490596b09f9a7583dd0c992006c55335b2e6e687bef4141bb18cd4bb43e23f590a138e9c8d5a3cbac0cc46c3b01c7d3ff9f9dd3c53418b13b0dd4a
@@ -19,5 +20,5 @@ EBUILD rsyslog-8.2102.0-r1.ebuild 12864 BLAKE2B cdbbbe6c4b582c5d899318ebffc5a3eb
 EBUILD rsyslog-8.2112.0-r1.ebuild 12918 BLAKE2B a6b90c61486be47ed3b22a9bb5c7cc8b7837f56db21d88353403c50ef427fa4cf364a964db74d0a07fd15f4420cd87441a4d51edec4ff19dfbce7ef7d4c787f1 SHA512 a9b6313794a45610b62a0ff700c89db057c9c825445a124ab7b10826e379333fa236fa9376f4c4c798519f163ced12c9d753a63f48c1840e1d705d218bbb329f
 EBUILD rsyslog-8.2206.0-r1.ebuild 12965 BLAKE2B f57c348fd034c19ab6f68da85f881c14a1cdbbd06c89f7f0cedcf72e558dafa591acd8b9e6a1739bc0482697148f51fbaf5c10dadb8b75e9d50ca1cf794ca378 SHA512 47784827bfec562177f1673d8104d0820aef01153e5623aa5e4e96d1533ff30143b442b7613cea48799d4ec0da34fde913f47a204ff3c35116d36b2adb434af3
 EBUILD rsyslog-8.2208.0-r1.ebuild 13071 BLAKE2B aed0478ec7dd4b10ee8b5b9aad97eace6dcf00c5eb4e3c5a9fd5c6c6218c711ac7a43a6634fdc3f56fe42b645cb4554d7315053c0956e1990f68eccf97d03779 SHA512 d1f8052e38ef991de236af15d070587e643e359bffc16bc332831b55acbab55f358d3a5ac63dbbb89e654c717562f771025a22482b4d3163713d820cef74a605
-EBUILD rsyslog-8.2210.0.ebuild 13071 BLAKE2B aed0478ec7dd4b10ee8b5b9aad97eace6dcf00c5eb4e3c5a9fd5c6c6218c711ac7a43a6634fdc3f56fe42b645cb4554d7315053c0956e1990f68eccf97d03779 SHA512 d1f8052e38ef991de236af15d070587e643e359bffc16bc332831b55acbab55f358d3a5ac63dbbb89e654c717562f771025a22482b4d3163713d820cef74a605
+EBUILD rsyslog-8.2210.0-r1.ebuild 13123 BLAKE2B 7a1df2f8bfbe1c2c5be66c1a444ea83f024f3e39353506eed28eb7c31c6feed750bf435e326cdcf8fd693ff199a376c78ddf1a2b7f2770080669ec383906c52f SHA512 f3c3ba6a8420706e66cca3f8285f48ba49923b728f74211bf12d8c15a5fa7441829adf48615bc1416c5d71d3130fe0867445e8da85a7332b26c2136cb77815c9
 MISC metadata.xml 4688 BLAKE2B 61d9ef924def00bed85b9b164e95ae8f512e51a0f0090b61a5737ee93b21db69db642867ddb6076fda757ae10748b9172de42754839d01859529aec70760d04f SHA512 01bedda2baeefccffc765550ab2f8aa29235e7a3a3fc8b765beb205518785da9fb5905037ad9e8e6ba9385d2f009d260260e3c207bbf1eea5a5ce4834a004365
diff --git a/app-admin/rsyslog/files/rsyslog-8.2210.0-5004-hostname.patch b/app-admin/rsyslog/files/rsyslog-8.2210.0-5004-hostname.patch
new file mode 100644
index 000000000000..4f6c6cf944b6
--- /dev/null
+++ b/app-admin/rsyslog/files/rsyslog-8.2210.0-5004-hostname.patch
@@ -0,0 +1,40 @@
+From e2beca531157a4c0a27bcdda689bc53373e305b3 Mon Sep 17 00:00:00 2001
+From: Rainer Gerhards <rgerhards@adiscon.com>
+Date: Thu, 20 Oct 2022 18:08:11 +0200
+Subject: [PATCH] core bugfix: local hostname invalid if no global() config
+ object given
+
+The local hostname is invalidly set to "[localhost]" on rsyslog startup
+if no global() config object is present in rsyslog.conf. Sending a HUP
+corrects the hostname.
+
+This is a regression from ba00a9f25293f
+
+closes https://github.com/rsyslog/rsyslog/issues/4975,
+closes https://github.com/rsyslog/rsyslog/issues/4825
+---
+ runtime/glbl.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/runtime/glbl.c b/runtime/glbl.c
+index 3a9350b903..ed9a307804 100644
+--- a/runtime/glbl.c
++++ b/runtime/glbl.c
+@@ -1396,6 +1396,7 @@ glblDoneLoadCnf(void)
+ 		stddbg = -1;
+ 	}
+ 
++finalize_it:
+ 	/* we have now read the config. We need to query the local host name now
+ 	 * as it was set by the config.
+ 	 *
+@@ -1404,8 +1405,7 @@ glblDoneLoadCnf(void)
+ 	 * are taken from that queue, the hostname will be adapted.
+ 	 */
+ 	queryLocalHostname();
+-
+-finalize_it:	RETiRet;
++	RETiRet;
+ }
+ 
+ 
diff --git a/app-admin/rsyslog/rsyslog-8.2210.0.ebuild b/app-admin/rsyslog/rsyslog-8.2210.0-r1.ebuild
similarity index 99%
rename from app-admin/rsyslog/rsyslog-8.2210.0.ebuild
rename to app-admin/rsyslog/rsyslog-8.2210.0-r1.ebuild
index 87f42ed5e63c..124a6ec61a3d 100644
--- a/app-admin/rsyslog/rsyslog-8.2210.0.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.2210.0-r1.ebuild
@@ -114,6 +114,8 @@ if [[ ${PV} == "9999" ]]; then
 	BDEPEND+=" >=dev-python/docutils-0.12"
 fi
 
+PATCHES=( "${FILESDIR}"/${P}-5004-hostname.patch )
+
 CONFIG_CHECK="~INOTIFY_USER"
 WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER isn't set. Imfile module on this system will only support polling mode!"
 
diff --git a/app-admin/sudo/Manifest b/app-admin/sudo/Manifest
index 9f2999613807..83ede090e3b6 100644
--- a/app-admin/sudo/Manifest
+++ b/app-admin/sudo/Manifest
@@ -1,5 +1,8 @@
 DIST sudo-1.9.11p3.tar.gz 4826520 BLAKE2B f8508f65b514abd9979a11628d8bc0e085b2625993281e7d1f8794a576e88970bda6939d2f2f50d9485f00276970aba3489b19c102eca5625e389c9610f338dd SHA512 ad5c3d623547d1e3016e1a721676fee6d6b7348e77b2c234041e0af40c7220e8934c8c27beef0d12fa6df11708d37de711dacfefc135d26de46abca7f91c55d1
 DIST sudo-1.9.11p3.tar.gz.sig 566 BLAKE2B 8caf03b051222f0446eaf333b48563aa18d52acbd9f7e2d880f0a97043df1ec8d25d87cfd7b1b9543ab8f52f5dacff4cf031fe3e6b94593d576d1d351eb05aa4 SHA512 ea728cddbab50746a2cbb8ce6cb55df3def1c5e806a1d91ec6f2d65c8d246079bdb5799b961ab0da1cc2c347a36d93cc00d32c10856141a467b25e1224876e50
+DIST sudo-1.9.12.tar.gz 4906320 BLAKE2B dfe7e45dab9848e7eec30b9c3e96683b2a90c02c8468507a338cda26d8b28206f511c63c2330e1a33e2b0b2d263211d7e2b222d5729dc0670eaafea09603e586 SHA512 34ee165baa2e37ba2530901d49bf0dad30159f27aeccd2519d4719bf93be8281edff71220a49ba2e41dacaa3c58031de1464df48d75a8caea7b9568a76f80b67
+DIST sudo-1.9.12.tar.gz.sig 566 BLAKE2B 98c80addcea18d320a54473e34111411dc3e67bdec45ae1c34e98c5a95a0e0377b08e7d42d9cbf92f68160f6e5dfb2990e6cd3c773ba20484b15aecfe3104433 SHA512 67c2c0234345ff17ed9bef2a974a37dd7e4ba791bda4e6f1cc90620d6541e4549e1e2a8525b4092bc615ae035cd2f97eb4165e2e671a3056ac10585709045ae2
 EBUILD sudo-1.9.11_p3-r1.ebuild 7412 BLAKE2B 1ddfa12c7fed0f71ba2ed700009aee4dfbdf08aaee350e61e67e0ede62904f0eac97233285b94c820dd3da75c4fc4aa09c31673db42b973f3ac18519ec8fd814 SHA512 13254ff59e0360c2979d6e31d3f9491560cd43a03b03628640426a9535ecde6568706db7037cb4b1e4e74fb555381cc2d42d24b2a4b2b97d7d142179e61df46e
+EBUILD sudo-1.9.12.ebuild 7420 BLAKE2B b0b6e8f5e645b6a9b082693ebbfdb2f5ee6e5fc9564b0e74cd9fa03fe061f10c3816f3073bf2922cbfe6e9f8fae78f292fd0fdc1fec213ec6939e879e59259cb SHA512 f3f70b8015ee9a42261514c9206ddf8f91a1eb58a70fd67154884c972cbfec302135a0ae5a3bbfea99f28e953683bdf05deede217a91bf56dae78f385c1748df
 EBUILD sudo-9999.ebuild 7420 BLAKE2B b0b6e8f5e645b6a9b082693ebbfdb2f5ee6e5fc9564b0e74cd9fa03fe061f10c3816f3073bf2922cbfe6e9f8fae78f292fd0fdc1fec213ec6939e879e59259cb SHA512 f3f70b8015ee9a42261514c9206ddf8f91a1eb58a70fd67154884c972cbfec302135a0ae5a3bbfea99f28e953683bdf05deede217a91bf56dae78f385c1748df
 MISC metadata.xml 1107 BLAKE2B a18b1d280445ea98ba686021abf08ab47a5ac590795018c125008f2a8e44f7ea45e256e32a737781030960cb984bc16d8fd23175fd1e88b294e5036c86085367 SHA512 8cacbd9a1a23fc7734c5ad8b95c769b8506ec35490b5e3f69439bf71bd51d1eaf04fe699a82cbb3ac56182195fff570d75e3b20c33d86774480a2939122752a6
diff --git a/app-admin/sudo/sudo-1.9.12.ebuild b/app-admin/sudo/sudo-1.9.12.ebuild
new file mode 100644
index 000000000000..046d001b4139
--- /dev/null
+++ b/app-admin/sudo/sudo-1.9.12.ebuild
@@ -0,0 +1,282 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit pam libtool tmpfiles toolchain-funcs
+
+MY_P="${P/_/}"
+MY_P="${MY_P/beta/b}"
+
+DESCRIPTION="Allows users or groups to run commands as other users"
+HOMEPAGE="https://www.sudo.ws/"
+if [[ ${PV} == 9999 ]] ; then
+	inherit mercurial
+	EHG_REPO_URI="https://www.sudo.ws/repos/sudo"
+else
+	VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/sudo.ws.asc
+	inherit verify-sig
+
+	uri_prefix=
+	case ${P} in
+		*_beta*|*_rc*) uri_prefix=beta/ ;;
+	esac
+
+	SRC_URI="https://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz
+		ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz
+		verify-sig? (
+			https://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz.sig
+			ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz.sig
+		)"
+	if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~sparc-solaris"
+	fi
+
+	BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-sudo )"
+fi
+
+# Basic license is ISC-style as-is, some files are released under
+# 3-clause BSD license
+LICENSE="ISC BSD"
+SLOT="0"
+IUSE="gcrypt ldap nls offensive pam sasl +secure-path selinux +sendmail skey ssl sssd"
+
+DEPEND="
+	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] )
+"
+RDEPEND="
+	${DEPEND}
+	>=app-misc/editor-wrapper-3
+	virtual/editor
+	ldap? ( dev-lang/perl )
+	pam? ( sys-auth/pambase )
+	selinux? ( sec-policy/selinux-sudo )
+	sendmail? ( virtual/mta )
+"
+BDEPEND+="
+	sys-devel/bison
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/${MY_P}"
+
+REQUIRED_USE="
+	?? ( pam skey )
+	?? ( gcrypt ssl )
+"
+
+MAKEOPTS+=" SAMPLES="
+
+src_prepare() {
+	default
+
+	elibtoolize
+}
+
+set_secure_path() {
+	# First extract the default ROOTPATH from build env
+	SECURE_PATH=$(unset ROOTPATH; . "${EPREFIX}"/etc/profile.env; echo "${ROOTPATH}")
+
+	case "${SECURE_PATH}" in
+		*/usr/sbin*)
+			;;
+		*)
+			SECURE_PATH=$(unset PATH; . "${EPREFIX}"/etc/profile.env; echo "${PATH}")
+			;;
+	esac
+
+	if [[ -z ${SECURE_PATH} ]] ; then
+		ewarn "	Failed to detect SECURE_PATH, please report this"
+	fi
+
+	# Then remove duplicate path entries
+	cleanpath() {
+		local newpath thisp IFS=:
+		for thisp in $1 ; do
+			if [[ :${newpath}: != *:${thisp}:* ]] ; then
+				newpath+=:${thisp}
+			else
+				einfo "   Duplicate entry ${thisp} removed..."
+			fi
+		done
+		SECURE_PATH=${newpath#:}
+	}
+	cleanpath /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin${SECURE_PATH:+:${SECURE_PATH}}
+
+	# Finally, strip gcc paths, bug #136027
+	rmpath() {
+		local e newpath thisp IFS=:
+		for thisp in ${SECURE_PATH} ; do
+			for e ; do
+				[[ ${thisp} == ${e} ]] && continue 2 ;
+			done
+			newpath+=:${thisp}
+		done
+		SECURE_PATH=${newpath#:}
+	}
+	rmpath '*/gcc-bin/*' '*/gnat-gcc-bin/*' '*/gnat-gcc/*'
+}
+
+src_configure() {
+	local SECURE_PATH
+
+	set_secure_path
+
+	# bug #767712
+	tc-export PKG_CONFIG
+
+	# - audit: somebody got to explain me how I can test this before I
+	# enable it.. - Diego
+	# - plugindir: autoconf code is crappy and does not delay evaluation
+	# until `make` time, so we have to use a full path here rather than
+	# basing off other values.
+	local myeconfargs=(
+		# We set all of the relevant options by ourselves (patched
+		# into the toolchain) and setting these in the build system
+		# actually causes a downgrade when using e.g. -D_FORTIFY_SOURCE=3
+		# (it'll downgrade to =2). So, this has no functional effect on
+		# the hardening for users. It's safe.
+		--disable-hardening
+
+		# requires some python eclass
+		--disable-python
+		--enable-tmpfiles.d="${EPREFIX}"/usr/lib/tmpfiles.d
+		--enable-zlib=system
+		--with-editor="${EPREFIX}"/usr/libexec/editor
+		--with-env-editor
+		--with-plugindir="${EPREFIX}"/usr/$(get_libdir)/sudo
+		--with-rundir="${EPREFIX}"/run/sudo
+		--with-vardir="${EPREFIX}"/var/db/sudo
+		--without-linux-audit
+		--without-opie
+		$(use_enable gcrypt)
+		$(use_enable nls)
+		$(use_enable sasl)
+		$(use_enable ssl openssl)
+		$(use_with ldap)
+		$(use_with ldap ldap_conf_file /etc/ldap.conf.sudo)
+		$(use_with offensive insults)
+		$(use_with offensive all-insults)
+		$(use_with pam)
+		$(use_with pam pam-login)
+		$(use_with secure-path secure-path "${SECURE_PATH}")
+		$(use_with selinux)
+		$(use_with sendmail)
+		$(use_with skey)
+		$(use_with sssd)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	if use ldap ; then
+		dodoc README.LDAP.md
+
+		cat <<-EOF > "${T}"/ldap.conf.sudo
+		# See ldap.conf(5) and README.LDAP.md for details
+		# This file should only be readable by root
+
+		# supported directives: host, port, ssl, ldap_version
+		# uri, binddn, bindpw, sudoers_base, sudoers_debug
+		# tls_{checkpeer,cacertfile,cacertdir,randfile,ciphers,cert,key}
+		EOF
+
+		if use sasl ; then
+			cat <<-EOF >> "${T}"/ldap.conf.sudo
+
+			# SASL directives: use_sasl, sasl_mech, sasl_auth_id
+			# sasl_secprops, rootuse_sasl, rootsasl_auth_id, krb5_ccname
+			EOF
+		fi
+
+		insinto /etc
+		doins "${T}"/ldap.conf.sudo
+		fperms 0440 /etc/ldap.conf.sudo
+
+		insinto /etc/openldap/schema
+		newins docs/schema.OpenLDAP sudo.schema
+	fi
+
+	if use pam ; then
+		pamd_mimic system-auth sudo auth account session
+		pamd_mimic system-auth sudo-i auth account session
+	fi
+
+	keepdir /var/db/sudo/lectured
+	fperms 0700 /var/db/sudo/lectured
+	# bug #652958
+	fperms 0711 /var/db/sudo
+
+	# Don't install into /run as that is a tmpfs most of the time
+	# (bug #504854)
+	rm -rf "${ED}"/run || die
+
+	# bug #697812
+	find "${ED}" -type f -name "*.la" -delete || die
+}
+
+pkg_postinst() {
+	tmpfiles_process sudo.conf
+
+	# bug #652958
+	local sudo_db="${EROOT}/var/db/sudo"
+	if [[ "$(stat -c %a "${sudo_db}")" -ne 711 ]] ; then
+		chmod 711 "${sudo_db}" || die
+	fi
+
+	if use ldap ; then
+		ewarn
+		ewarn "sudo uses the ${ROOT}/etc/ldap.conf.sudo file for ldap configuration."
+		ewarn
+		if grep -qs '^[[:space:]]*sudoers:' "${ROOT}"/etc/nsswitch.conf ; then
+			ewarn "In 1.7 series, LDAP is no more consulted, unless explicitly"
+			ewarn "configured in ${ROOT}/etc/nsswitch.conf."
+			ewarn
+			ewarn "To make use of LDAP, add this line to your ${ROOT}/etc/nsswitch.conf:"
+			ewarn "  sudoers: ldap files"
+			ewarn
+		fi
+	fi
+	if use prefix ; then
+		ewarn
+		ewarn "To use sudo on Prefix, you need to change file ownership and permissions"
+		ewarn "with root privileges, as follows:"
+		ewarn
+		ewarn "  # chown root:root ${EPREFIX}/usr/bin/sudo"
+		ewarn "  # chown root:root ${EPREFIX}/usr/lib/sudo/sudoers.so"
+		ewarn "  # chown root:root ${EPREFIX}/etc/sudoers"
+		ewarn "  # chown root:root ${EPREFIX}/etc/sudoers.d"
+		ewarn "  # chown root:root ${EPREFIX}/var/db/sudo"
+		ewarn "  # chmod 4111 ${EPREFIX}/usr/bin/sudo"
+		ewarn
+	fi
+
+	elog "To use the -A (askpass) option, you need to install a compatible"
+	elog "password program from the following list. Starred packages will"
+	elog "automatically register for the use with sudo (but will not force"
+	elog "the -A option):"
+	elog ""
+	elog " [*] net-misc/ssh-askpass-fullscreen"
+	elog "     net-misc/x11-ssh-askpass"
+	elog ""
+	elog "You can override the choice by setting the SUDO_ASKPASS environmnent"
+	elog "variable to the program you want to use."
+}
diff --git a/app-admin/system-config-printer/Manifest b/app-admin/system-config-printer/Manifest
index 560b504fc671..b662d8db02a8 100644
--- a/app-admin/system-config-printer/Manifest
+++ b/app-admin/system-config-printer/Manifest
@@ -1,5 +1,5 @@
 DIST system-config-printer-1.5.16.tar.xz 1382124 BLAKE2B 37548bd470f8e80026e014d4077a79a38ad54258d620654536890b67b688fc790c9a9a269b321f2e12d63ec21f24858866e39b41089195c528ddbdf1351bba5f SHA512 ed20a409def66bdea7de4cd5b397891eca220c841e1b5c8cab98e45f87389ae8ba881d9e24072dd07203141fc34c49c4b67cf099791857c007971e3b7d2e2fc2
 DIST system-config-printer-1.5.18.tar.xz 1396808 BLAKE2B 910e853829ee876edc597a3103b5ab857b3b8c1cb87096f25213b1088e35d9f4d320dad61f55b530283a7650b07abe028a53b4e144b33b1b66c733cb2caa8011 SHA512 33dc9c52d92f4234e055fb10a99cadd58424dcdb62554797b44bdd5319f1c3662bd2fa33417ac3a3f5ec51216d64e81e1897f3e671eb49f6be34057d7c38f3f4
 EBUILD system-config-printer-1.5.16-r1.ebuild 2074 BLAKE2B 6064a0cccc81f78fab6769164ddc870adbf2e2472421f162c0d6aa7bec9a67a8ed1cb19e7327bf8835b051a710fe5aeaca49b04722db40950631c23368728990 SHA512 0d077bc93964462ff9a79ebfcce6c5bef72e15bea4790549c9318bed814a7bf6b2702a7acd57c680010c1e76abb316099e54e53fd427985c6359c80a9ff1a3e6
-EBUILD system-config-printer-1.5.18.ebuild 2079 BLAKE2B 587811edfdaae6a4b77e93d13434f9bbed0038145176160ef3d19a459e33f679e22276306f67ae220d5fbf47672ce3f2bce01a4acbfb022e9f9d068a4abbd7bb SHA512 f51053a075e44d8b8739c0266b2880b788d64147fe380001ce40f6cee825abcdaf49984b00d68d998b8513613bcecb97a4c58a42e33c1d375b0798e4b86106ca
+EBUILD system-config-printer-1.5.18.ebuild 2079 BLAKE2B c71d502bb5cb4e41b2e43faf2db3cd1e73cf0a12271a7aa7ae57d0052e36ff91ddc16af1fa2f4c0e0193c344190096356e91e4130bbfda4a54560f743505b82a SHA512 ebea287b17f3528335eba688f436a0518e5944af93ceaf3ce41892c5c8bf32c88760383ad3d44a5421024c0e0bec061b56a7b7bdd3e2b81bee35f1b7ce0fae3a
 MISC metadata.xml 464 BLAKE2B 6b9e1c83ddd541fa865336261d248c43e24354dbe1fdb585436bdaacd6cbbca9949b54961c0ad32220326b168650c377862640c50c2f40ad61106fbbb59fa3c4 SHA512 20f80adda8d894d92410585732a88565196b6cd10177bf5ed93966cf450d6dced89f46a840fd5c5ce26a9d7ac2fc42e59fbb8f789eb1f7f594e95da7a0cf60b8
diff --git a/app-admin/system-config-printer/system-config-printer-1.5.18.ebuild b/app-admin/system-config-printer/system-config-printer-1.5.18.ebuild
index da888acedc10..fd5b6fe104cb 100644
--- a/app-admin/system-config-printer/system-config-printer-1.5.18.ebuild
+++ b/app-admin/system-config-printer/system-config-printer-1.5.18.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 PYTHON_REQ_USE="xml(+)"
 inherit python-single-r1 systemd udev xdg
 
diff --git a/app-admin/xtail/Manifest b/app-admin/xtail/Manifest
index dea30f072e07..6308bf8c1b4e 100644
--- a/app-admin/xtail/Manifest
+++ b/app-admin/xtail/Manifest
@@ -5,5 +5,5 @@ DIST 20120219-patch-aalto.zip 4991 BLAKE2B 6b3e228508bb12c1e18f3d2982c1bf23c996e
 DIST xtail-2.1.tar.gz 26769 BLAKE2B 9a5c47810b2a8cd7aa4d8cc543ec9edce7a24ee446627f658063547276a43dfb72503f10c4d2d6a35f25415a32a2aa177dc5fde79e8ed834cf8ade5aaf9fb447 SHA512 a8519969ef960af97c4dcb75c679daa5687f553c909817ede1134dfa5d70ed71c5264f0e61c8c579cc253ccb7739a68c5213811169489a98e676ef8941d9446f
 DIST xtail_2.1-8.debian.tar.xz 7168 BLAKE2B c04a239aabd307f36b983b83384ace6f7abbe7215f84921da159da57b338affb9840e3bfb9886121fd140e1a412f017cfdc1f22afe2ac8484fc1d8b641ef196e SHA512 6c00f87f905a94c579085e5f18e27fce94642d0a5a1376deb618f464a9ca6bb2f7ac0529ef7a2439b28c5314de7ee733f86dda0d7577d3575ce085e2a02c39fc
 EBUILD xtail-2.1-r1.ebuild 755 BLAKE2B 31ca3dd7ee5ebeb9fbcb28be16bf5d127b4ebe813b6988a1a0c4b5e752cadd2a3f8710640db0627d7d5cc33c82ace85191b1de32d8865fef0c737a92fe020e19 SHA512 190a8e7362c30ba5d1d53048859c64194db7e40d8a4fc1bab9e061ba8747524d9b1e9f0b07b80a63d0f6b0504e8666c89a28b53c07be884a0c67f76d88722c10
-EBUILD xtail-2.1_p8.ebuild 1029 BLAKE2B 553d0ea9b61428533b04a158227db5e77000175c54d70fe17a339b3c53bbff6aa00a0e7c22c8b175c51611e3dbed31d37e666554ae0a4898a6d647dd2db48e3c SHA512 2156df6b758594abc0922f798cd6212bb51dd98aa6d14b73987ea4897f160f509bc9282b9b774095f47973b61e75697677e3da5025ea005d964f5b9cd649c7e3
+EBUILD xtail-2.1_p8.ebuild 1026 BLAKE2B 5e95f2313d1e6a6224267db52d44da9555ae7100e47e5c517634c1a45405044bad4c41441ac294a498e653a108a4c8697f8633d678a769ef1f85af0cdb843187 SHA512 76a0234f664344ed69590e7d436e240ed1f5098953d4cdfdfa8abc3ee4708f3770fd79fbad9f2c1c58dee74a2c81406f4eee8b1b02f957a71be30f4b7e0fae3e
 MISC metadata.xml 391 BLAKE2B 5e2a05efa60fb020077edf3a5c4dc026ab1ca6d3cea217c4252ae18b175a4ba5fcc7956ca079aeab704f187105839ea2f35e330567e8d47760cff23562f2466b SHA512 786871c7f378de616b4a0dfb8222fb1ec744886c2919e364f2bc4b783c46d4e6f394a463556dcae7d6bed678886c9aefb98d71682e38ab126b8f823e0d85f607
diff --git a/app-admin/xtail/xtail-2.1_p8.ebuild b/app-admin/xtail/xtail-2.1_p8.ebuild
index 1ff57c0e443a..e93cf162e952 100644
--- a/app-admin/xtail/xtail-2.1_p8.ebuild
+++ b/app-admin/xtail/xtail-2.1_p8.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}"/${PN}-${MY_PV}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~ppc sparc x86"
 
 BDEPEND="app-arch/unzip"
 
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 1c4381258348..b0ef9597a7de 100644
Binary files a/app-arch/Manifest.gz and b/app-arch/Manifest.gz differ
diff --git a/app-arch/brotli/Manifest b/app-arch/brotli/Manifest
index 96208282f2de..9fa7354ff15d 100644
--- a/app-arch/brotli/Manifest
+++ b/app-arch/brotli/Manifest
@@ -2,6 +2,6 @@ AUX 1.0.9-linker.patch 1799 BLAKE2B b082af9af7eb8df80bf86717e9b9511952e77afd649d
 DIST brotli-1.0.9.tar.gz 486984 BLAKE2B 8b9939d5224396ef33b43e019250ba4bc8949903583615e8dc02c85340fc0a1e2d1632161e00b0ee7355d77f05529ac772f482e05d2089afd71a0bf71e803904 SHA512 b8e2df955e8796ac1f022eb4ebad29532cb7e3aa6a4b6aee91dbd2c7d637eee84d9a144d3e878895bb5e62800875c2c01c8f737a1261020c54feacf9f676b5f5
 DIST brotli-1.0.9.testdata.tar.xz 3771536 BLAKE2B e22a7e926a68b64cf3ddcf90d2381201d0bac6486f28c3a675c83a2a685108491011195faf48df9abd478a011e874df560ae81988348f7605197805cc3be20dd SHA512 d98c48dbc7772959a9cf276b638cf773a05a896c9daf4f6235f7d7fd625490b3f538e0690afcd6968ff81ad3745c7d78419850c2518048c44d73b470bcd08c97
 EBUILD brotli-1.0.9-r3.ebuild 1780 BLAKE2B 571c95c541b3def87351a232b69bd291dc0d50b9676a08a7a2a0a757d5fc993bad72efab1dc29c37302b2126370b5356d1571b232c9b520c43ea176247bbfc9b SHA512 e159729140a4e9046ec5a850dd7fb1d3f22c32adfc6b54748512abcf7aac0a266852a769814aea9a0219b2076c35cfa7b3b0dd33c6dfc1a0b05dbbb315f69ef9
-EBUILD brotli-1.0.9-r5.ebuild 2021 BLAKE2B 248575f27391f464db56caaadab701621da8f5d220f5338ff8b7aeb6688a66750d43d7242bb41021baac2b612dfb09bfaad311db2b503c39fc19641483ec87fa SHA512 f10930de2872be242b60bc21b7fc23201bf029dcc9bded25b4eee44ec3bb771ae67823ebd99d71126d4752cd8a4f00ac42c2f24386a95592ee5c545501c456ce
+EBUILD brotli-1.0.9-r5.ebuild 2013 BLAKE2B c2656a8ef6832421679c8136025e3f3af86ac159fc51a0ef753ae4dec0c94f45dd3c90ba1d7a4439dbc822e9c79bab8155f2301b4d6db6d58d3198ffddbe8cb5 SHA512 3f4b3ebc08f06311f505e104d060386239d3f11a8b9bd3639a31438efe91731247db70a54cf2a6f0df77bc430e60c66d9a784bb8594df02a7e8979f1c92b3e07
 EBUILD brotli-9999.ebuild 2021 BLAKE2B 248575f27391f464db56caaadab701621da8f5d220f5338ff8b7aeb6688a66750d43d7242bb41021baac2b612dfb09bfaad311db2b503c39fc19641483ec87fa SHA512 f10930de2872be242b60bc21b7fc23201bf029dcc9bded25b4eee44ec3bb771ae67823ebd99d71126d4752cd8a4f00ac42c2f24386a95592ee5c545501c456ce
 MISC metadata.xml 829 BLAKE2B 31c7c9adc087001ef6feb8937752317fe46ab500de9c686cf450a9184574b6e4483214e12791b8a81f9dd591a6a5d1ab9fc6f3997831f1e7805d475ff54ac5ed SHA512 c49f2027ce150e20d76f50268940d0ed231419ad57904d1cfcfa76cd4dd281c89e1c16be907c3140026781ae74266b8f37b9a6455893f8e8d824e8e57281573d
diff --git a/app-arch/brotli/brotli-1.0.9-r5.ebuild b/app-arch/brotli/brotli-1.0.9-r5.ebuild
index cc2d8ebdd0d1..6515cdaa45ff 100644
--- a/app-arch/brotli/brotli-1.0.9-r5.ebuild
+++ b/app-arch/brotli/brotli-1.0.9-r5.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]] ; then
 	EGIT_REPO_URI="https://github.com/google/${PN}.git"
 	inherit git-r3
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 	SRC_URI="
 		https://github.com/google/${PN}/archive/v${PV}.tar.gz
 			-> ${P}.tar.gz
diff --git a/app-arch/bzip3/Manifest b/app-arch/bzip3/Manifest
index 31c95d8ebc86..b1190ddad3d0 100644
--- a/app-arch/bzip3/Manifest
+++ b/app-arch/bzip3/Manifest
@@ -1,7 +1,7 @@
-DIST bzip3-1.1.4.tar.xz 260404 BLAKE2B ddd087b631c9d5945dea0f4da280dfd74fd303eaed10f7553f770ca18b3b65f00718c073d87e565602a9ed02f4604a0d2dda0ff42cbd38f593bb012f5362cc5c SHA512 86f26b290001d255ad1d2378b5e2d59f9c85e1625ba5d7dca86acd544bb80af95b3379c215a03e0f81f77b7972a852d37746c1028464f404d28a6f9b707383b8
 DIST bzip3-1.1.5.tar.xz 265340 BLAKE2B 0226a97d564f1c9d9d1089b43ae79a9e43d0b77628298ef953c45505ad8d62caaf17bf6fa357857f123cf072b8ccd3003bfe138f25284baa5a5a5cdd8a555f71 SHA512 589c2e8e675a61014c7c4e82d0f2067201e3fb97bf7cfa6b7aa23690dc739824226089ac710509cc085b22eeb671ed5e23c6493967a433d3b284cb638af71be8
 DIST bzip3-1.1.6.tar.xz 265708 BLAKE2B 9429dcb3e9deef8aafdf890215ba95669dbcb135d6d2896f18cc70b482bab321497d3a26f36be59700ad0da879578b7c906f20629c72642aa15fc3b1507a788a SHA512 19120d3a850495a5bcc43b124e4a8eddf41bac55119d0898bf1e7c5b744f4bcc84c41b9018615f577fe3bfdceab8dd2ab6f2722cb9fbf86bf1c0a2da9ca32916
-EBUILD bzip3-1.1.4.ebuild 782 BLAKE2B 63fd29cc68cd7caa2e8108efbcfd7061d15dfbd5adab63c13c2214650fd6f443d4be06f7baa0f9c723b48eb9562976cfb8aa0c646784dfa3561d8374419959b6 SHA512 9183d00e40f9750cc71dc3d8b15e0fdea75122e2e32911c04cdfbdaf4b8b5ebfaa47c6d6ca2d2ab779a0c52d9221794f1353a6c980b5be2c81ed74d8a0d0ca58
-EBUILD bzip3-1.1.5.ebuild 782 BLAKE2B 63fd29cc68cd7caa2e8108efbcfd7061d15dfbd5adab63c13c2214650fd6f443d4be06f7baa0f9c723b48eb9562976cfb8aa0c646784dfa3561d8374419959b6 SHA512 9183d00e40f9750cc71dc3d8b15e0fdea75122e2e32911c04cdfbdaf4b8b5ebfaa47c6d6ca2d2ab779a0c52d9221794f1353a6c980b5be2c81ed74d8a0d0ca58
+DIST bzip3-1.1.8.tar.xz 269668 BLAKE2B fe85ba2ecca8e2433501c13e57856720da731b6c959340a68dd4654a516c12e034a90ff6cd6aed55dd2160c3860fdc3e60cddd47ffd00737a657a2e6c73704af SHA512 36141a48f0d5b35de4b06117ceca3c5d5cdc3df6be187856f1436751984b0154942e0eece531ee7b191cc0cd7056960de6a1ca3ec0fc2bcc7ff1d50444cd1e3e
+EBUILD bzip3-1.1.5.ebuild 780 BLAKE2B 40c5d480da40010a89acd6f33a35048bdf5983017b9701840b917ff2fc56ffff93da2189cc783f1009d2de3063a41892bba33d3a59bf5a1d9d0c4104075dc71b SHA512 2b3d5355ca469a43563a54ffc1bc8f3e1378955e955e5e603659f7367296c68cbf0392550df77c2ae29f919b01ab33505371ed0a871e98ede7174eb7bf15c6f5
 EBUILD bzip3-1.1.6.ebuild 782 BLAKE2B 63fd29cc68cd7caa2e8108efbcfd7061d15dfbd5adab63c13c2214650fd6f443d4be06f7baa0f9c723b48eb9562976cfb8aa0c646784dfa3561d8374419959b6 SHA512 9183d00e40f9750cc71dc3d8b15e0fdea75122e2e32911c04cdfbdaf4b8b5ebfaa47c6d6ca2d2ab779a0c52d9221794f1353a6c980b5be2c81ed74d8a0d0ca58
+EBUILD bzip3-1.1.8.ebuild 782 BLAKE2B 63fd29cc68cd7caa2e8108efbcfd7061d15dfbd5adab63c13c2214650fd6f443d4be06f7baa0f9c723b48eb9562976cfb8aa0c646784dfa3561d8374419959b6 SHA512 9183d00e40f9750cc71dc3d8b15e0fdea75122e2e32911c04cdfbdaf4b8b5ebfaa47c6d6ca2d2ab779a0c52d9221794f1353a6c980b5be2c81ed74d8a0d0ca58
 MISC metadata.xml 879 BLAKE2B eacb925ae4939be72ae25f0f333d8c8e1c08b2fd7946e27dfadd214b8fd5f27eef3f141f9ca911cf89151245f2fa11c7a8c5459c63badbfaf71e62aaca6d67f4 SHA512 963eae34b110b883993959f97a84c5fbaae914e009d024379d8b83ad02b335f3d7404ecd9020e291a38e78cb358dd4d0ff1b4b8f3604a2cc719e9d82ebee1e50
diff --git a/app-arch/bzip3/bzip3-1.1.5.ebuild b/app-arch/bzip3/bzip3-1.1.5.ebuild
index 0d9329da48ca..4bbe2c3cdb5b 100644
--- a/app-arch/bzip3/bzip3-1.1.5.ebuild
+++ b/app-arch/bzip3/bzip3-1.1.5.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]] ; then
 	EGIT_REPO_URI="https://github.com/kspalaiologos/${PN}.git"
 else
 	SRC_URI="https://github.com/kspalaiologos/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm64 ~loong ~x86"
+	KEYWORDS="amd64 arm64 ~loong ~x86"
 fi
 
 LICENSE="LGPL-3+"
diff --git a/app-arch/bzip3/bzip3-1.1.4.ebuild b/app-arch/bzip3/bzip3-1.1.8.ebuild
similarity index 100%
rename from app-arch/bzip3/bzip3-1.1.4.ebuild
rename to app-arch/bzip3/bzip3-1.1.8.ebuild
diff --git a/app-arch/engrampa/Manifest b/app-arch/engrampa/Manifest
index b6a2aa2929a4..232eb2102a97 100644
--- a/app-arch/engrampa/Manifest
+++ b/app-arch/engrampa/Manifest
@@ -1,3 +1,5 @@
 DIST engrampa-1.24.2.tar.xz 1687432 BLAKE2B b2ef407aef77f9ecd3f8b06d2e991615a39fa2d4487678292d035a7cab882551bc8c757c6a15037b828cb51aaba14c2ec25e85e891770f6f8c9b453753d87b42 SHA512 1e0acecfe42e3945fe43729283522dfd56dc4cee92a4d5998c995a496f42f41b284ec10f01eb142139c1cec65e3b5a037299b168b73a2e6e828ae3ab4b9c777d
+DIST engrampa-1.26.0.tar.xz 1761596 BLAKE2B c72def523f6589ab97351568e0562898d996e640ffefa66f32096e5a0ad97ad0b05b21ebdcc16ba1f75d9b75a444f8ed4ed492a412cc16c018e65135a88f3398 SHA512 8058627af19744d26f0997fca37a9a1d9902c63e4008e1af44b2a3b15ebc03e27f2018c60351ee503a28aa072836d201625074abb838e0a95071ce65c64a52bc
 EBUILD engrampa-1.24.2-r1.ebuild 1562 BLAKE2B 58401e50358f410fc04be43e6491ce95369609374a84a93062370bad19e12979af9a0722ffd5f40bd46363edbfbfe9d91674d5682822511a55aefeb8ad77d65a SHA512 2dd25260a6cc08db597bb3add653c6eecb3986d662ce8f2db0253211b53fb88915a0a9bb4d6f71100768375e7f9778a7c82e94bafc596edbc280749f292754cc
+EBUILD engrampa-1.26.0.ebuild 1768 BLAKE2B e56b4751beaf10ca6f35549b2cea6d473510a113fc8a7ab52ef50c34f1ff081ba9caa057e98a85dbddf8dba5ea75a93e4bb2cb6913e574f3de6b4c8421310b1d SHA512 5395656b694fa8622d2936a27f1c163aad118ab911db6a06e3244e99e228826bcca5a9070bb5f4f47504793913b18b621a7da69700b3879af1bb691df97ddc4d
 MISC metadata.xml 591 BLAKE2B 9a58776d887b3437f4edccb14ba8cd85139acfadece0e4c7a9c7ed7f5f02d5276fc86d30affeb1b605eba15a8ed34a7c40847564436c320e2a8cef5a313de12f SHA512 b0ae271bbdb0046308b9e06df3259bb5dc9d43e406830e000e4513d817fddccfee4b0af956f1c218ad6800e21d79682deddb4561789a42226ee1afa005cc7b3b
diff --git a/app-arch/engrampa/engrampa-1.26.0.ebuild b/app-arch/engrampa/engrampa-1.26.0.ebuild
new file mode 100644
index 000000000000..e81d005f37ef
--- /dev/null
+++ b/app-arch/engrampa/engrampa-1.26.0.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} == 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/mate-desktop/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/mate-desktop/${PN}/archive/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86"
+fi
+
+inherit mate optfeature
+
+DESCRIPTION="Engrampa archive manager for MATE"
+HOMEPAGE="https://mate-desktop.org/ https://github.com/mate-desktop/engrampa"
+
+LICENSE="FDL-1.1+ GPL-2+ LGPL-2+"
+SLOT="0"
+IUSE="caja magic"
+
+DEPEND="
+	>=dev-libs/glib-2.50:2
+	>=dev-libs/json-glib-0.14
+	virtual/libintl
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3.22:3[X]
+	x11-libs/libSM
+	x11-libs/pango
+	caja? ( >=mate-base/caja-1.17.1 )
+	magic? ( sys-apps/file )
+"
+RDEPEND="
+	${DEPEND}
+	virtual/libintl
+"
+BDEPEND="
+	app-text/yelp-tools
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+src_configure() {
+	mate_src_configure \
+		--disable-run-in-place \
+		$(use_enable caja caja-actions) \
+		$(use_enable magic) \
+		--disable-packagekit
+}
+
+pkg_postinst() {
+	mate_pkg_postinst
+
+	optfeature "Support for 7-zip" app-arch/p7zip
+	optfeature "Support for ace" app-arch/unace
+	optfeature "Support for arj" app-arch/arj
+	optfeature "Support for cpio" app-arch/cpio
+	optfeature "Support for deb" app-arch/dpkg
+	optfeature "Support for iso" app-cdr/cdrtools
+	optfeature "Support for jar,zip" app-arch/zip app-arch/unzip
+	optfeature "Support for lha" app-arch/lha
+	optfeature "Support for lzma" app-arch/xz-utils
+	optfeature "Support for lzop" app-arch/lzop
+	optfeature "Support for rar" app-arch/unrar
+	optfeature "Support for rpm" app-arch/rpm
+	optfeature "Support for unstuff" app-arch/stuffit
+	optfeature "Support for zoo" app-arch/zoo
+}
diff --git a/app-arch/rpm/Manifest b/app-arch/rpm/Manifest
index 232069625616..d124aaf433eb 100644
--- a/app-arch/rpm/Manifest
+++ b/app-arch/rpm/Manifest
@@ -1,7 +1,5 @@
 AUX rpm-4.17.0-libdir.patch 855 BLAKE2B 81a2daf0577c8dc3feac190764125da7a616e24ccdd38c3715c3c68f7fc831cf2662e629f23ed88f7d133961a40ac7f63acd6c7f52e99f17abe53442b2a5f14e SHA512 68d884cf9d57d89138ee7d6882869b0560aa9cd3dc82b837c47732f2d0248b42fbdafbbcc1f3f04322cd750744d97e4512491fb0591eb0622b2a5d1918391c46
 AUX rpm-4.8.1-db-path.patch 628 BLAKE2B 69ac0d4541c4d6e74fd716529c4cfd482432d400f84f39775bd585931e786acf45ab7a1da617f0214dcba90c78511ca22fc556896ae1963ec9160787fdaab902 SHA512 12539bbeda99d261890d50304945c7f022681ca0a283c70f17a6b1f188e9e24e9ce05b71d541ed6d951f94576b5183c49c4db784d5016d075a859c1e4dcb9005
-DIST rpm-4.17.1.tar.bz2 4642016 BLAKE2B d82926845e523c82fcf6a985d8de00f7a5bcc981e15d3115c310260713c482dc43e23b43f887644415b5a51ee382297d6d3569b6914595c91b9b89cc813af8e8 SHA512 d0429510140f25a25b6c9441abe2027d27c485bbd4969752f69e1c843435c9508b9f85e5bb68085dd64b7da533801aa5c04d8c9d962e08d2ddd3199d0265cc85
 DIST rpm-4.18.0.tar.bz2 6600013 BLAKE2B 127c3b1427884d04c3db4fc73eb73a978a58241bc740620e3e46c7557d99833092866b5d9c8b4fdf72cd106668d9e5f5cb8c4b918decf1513a82d10258975116 SHA512 c218b811c0c2db368a2919f60742904a4a5abf09dc20804d649eb42f1853d1c21d121086d6014cd210b2040643c37b5d86b53052958cf702ae2e54fe65f1c0ec
-EBUILD rpm-4.17.1.ebuild 3995 BLAKE2B 5ad79dd4b80820a3c96bc16389fa5d84bfbccb611576e7b000d315c0dd821965c3679a783112a3f36e4861a4c9793ef31c993846647effdfd7aa897829d6c34b SHA512 902704fe5fd184f14769dbb42ec6c4e3fd139f49fa869bd6552e0817d06515cf4d6f95a9b3b2ba29d9d3369de4036b4a18ceb6fc8a8d01362efcf1d415381c69
-EBUILD rpm-4.18.0.ebuild 4091 BLAKE2B 96b4b325d34a2b281567387eed4a9080ff93662ecbae984662b96c5339d05cd5d900751557bb843d06a3c40f03f7745e8a3ba3267a9a9bb9b752a0a7e22de05f SHA512 f51a48df3d9b4bcbb8f76e1af7929906ec9a70cb9b6495a70bec74353931200172d20e37178b24720f96bf1152432aebbe004a20ec8c3ade2d0b4a61b4dc08a0
+EBUILD rpm-4.18.0.ebuild 4089 BLAKE2B 9cad446a7e55ca5f2c1a993edbd42c7ebfd551ab4e416d18dc6400469fbbbbca4297d39e9f1291983f6f3181fa6c9293ad6b2c87e630c9dbda1714e652c08e75 SHA512 9b9c89bf06e70f6f2c163fad313856b48905608ffb64de134498bf2825af494816d4637d6058ed7a6017bd17f511fa70316276471e06f57f6a92fc4296005cb4
 MISC metadata.xml 260 BLAKE2B 00f83151d62c157bea18101b36007f01e6da9d16d438671c37b929b1e19cfc202f379816a1b0d9e3faea99c44a43f97a5d43100266c683487dabba09f1378eea SHA512 d6fc386bd5be91d5dff3d7aa514f4d72e7301a47f888db95573d72505ee86987ae6412fdd8aec82842c006abe831d99f6178b1ac78a04a7dbf9e5bce1d249cb7
diff --git a/app-arch/rpm/rpm-4.17.1.ebuild b/app-arch/rpm/rpm-4.17.1.ebuild
deleted file mode 100644
index a4ee4d202c0d..000000000000
--- a/app-arch/rpm/rpm-4.17.1.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-{3,4} )
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit autotools lua-single perl-module python-single-r1 toolchain-funcs
-
-DESCRIPTION="Red Hat Package Management Utils"
-HOMEPAGE="https://rpm.org
-	https://github.com/rpm-software-management/rpm"
-SRC_URI="https://ftp.osuosl.org/pub/rpm/releases/rpm-$(ver_cut 1-2).x/${P}.tar.bz2
-	http://ftp.rpm.org/releases/rpm-$(ver_cut 1-2).x/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
-
-# Tests are broken. See bug 657500
-RESTRICT="test"
-
-IUSE="acl audit caps +berkdb doc dbus nls openmp python selinux +sqlite test +zstd"
-REQUIRED_USE="${LUA_REQUIRED_USE}
-	python? ( ${PYTHON_REQUIRED_USE} )"
-
-DEPEND="!app-arch/rpm5
-	app-arch/libarchive:=
-	>=app-arch/bzip2-1.0.1
-	app-arch/xz-utils
-	>=app-crypt/gnupg-1.2
-	>=dev-lang/perl-5.8.8
-	dev-libs/elfutils
-	dev-libs/libgcrypt:=
-	>=dev-libs/popt-1.7
-	sys-apps/file
-	>=sys-libs/zlib-1.2.3-r1
-	virtual/libintl
-	${LUA_DEPS}
-	acl? ( virtual/acl )
-	audit? ( sys-process/audit )
-	caps? ( >=sys-libs/libcap-2.0 )
-	dbus? ( sys-apps/dbus )
-	sqlite? ( dev-db/sqlite:3 )
-	python? ( ${PYTHON_DEPS} )
-	nls? ( virtual/libintl )
-	zstd? ( app-arch/zstd:= )
-"
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	nls? ( sys-devel/gettext )
-	test? ( sys-apps/fakechroot )
-"
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-rpm )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.8.1-db-path.patch
-	"${FILESDIR}"/${PN}-4.17.0-libdir.patch
-)
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-	lua-single_pkg_setup
-
-	use python && python-single-r1_pkg_setup
-
-	# Added USE=openmp and this check for bug #779769
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-src_prepare() {
-	default
-
-	# bug #356769
-	sed -i 's:%{_var}/tmp:/var/tmp:' macros.in || die "Fixing tmppath failed"
-	# bug #492642
-	sed -i "s:@__PYTHON@:${PYTHON}:" macros.in || die "Fixing %__python failed"
-
-	# Prevent automake maintainer mode from kicking in (bug #450448).
-	#touch -r Makefile.am preinstall.am || die
-
-	eautoreconf
-}
-
-src_configure() {
-	# rpm no longer supports berkdb, but has readonly support.
-	# https://github.com/rpm-software-management/rpm/commit/4290300e24c5ab17c615b6108f38438e31eeb1d0
-	econf \
-		--without-selinux \
-		--disable-inhibit-plugin \
-		--with-crypto=libgcrypt \
-		$(use_enable berkdb bdb-ro) \
-		$(use_enable python) \
-		$(use_enable nls) \
-		$(use_enable openmp) \
-		$(use_enable dbus inhibit-plugin) \
-		$(use_enable sqlite) \
-		$(use_with caps cap) \
-		$(use_with acl) \
-		$(use_with audit) \
-		$(use_enable zstd zstd $(usex zstd yes no))
-}
-
-src_test() {
-	# Known to fail with FEATURES=usersandbox (bug #657500)
-	if has usersandbox ${FEATURES} ; then
-		ewarn "You are emerging ${P} with 'usersandbox' enabled." \
-			"Expect some test failures or emerge with 'FEATURES=-usersandbox'!"
-	fi
-
-	emake check
-}
-
-src_install() {
-	default
-
-	# Remove la files
-	find "${ED}" -name '*.la' -delete || die
-
-	# Fix symlinks to /bin/rpm (bug #349840)
-	for binary in rpmquery rpmverify; do
-		ln -sf rpm "${ED}"/usr/bin/${binary} || die
-	done
-
-	if ! use nls; then
-		rm -rf "${ED}"/usr/share/man/?? || die
-	fi
-
-	keepdir /usr/src/rpm/{SRPMS,SPECS,SOURCES,RPMS,BUILD}
-
-	dodoc CREDITS README*
-	if use doc; then
-		local docname
-		for docname in librpm; do
-			docinto "html/${docname}"
-			dodoc -r "docs/${docname}/html/."
-		done
-	fi
-
-	# Fix perllocal.pod file collision
-	perl_delete_localpod
-
-	use python && python_optimize
-}
-
-pkg_postinst() {
-	if [[ -f "${EROOT}"/var/lib/rpm/Packages ]] ; then
-		einfo "RPM database found... Rebuilding database (may take a while)..."
-		"${EROOT}"/usr/bin/rpmdb --rebuilddb --root="${EROOT}/" || die
-	else
-		einfo "No RPM database found... Creating database..."
-		"${EROOT}"/usr/bin/rpmdb --initdb --root="${EROOT}/" || die
-	fi
-}
diff --git a/app-arch/rpm/rpm-4.18.0.ebuild b/app-arch/rpm/rpm-4.18.0.ebuild
index b0907a49357b..fc81ed9a8eb9 100644
--- a/app-arch/rpm/rpm-4.18.0.ebuild
+++ b/app-arch/rpm/rpm-4.18.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://ftp.osuosl.org/pub/rpm/releases/rpm-$(ver_cut 1-2).x/${P}.tar.b
 
 LICENSE="GPL-2 LGPL-2"
 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"
 
 # Tests are broken. See bug #657500
 RESTRICT="test"
diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index 8080583d2a6e..8f40fd052a3c 100644
Binary files a/app-backup/Manifest.gz and b/app-backup/Manifest.gz differ
diff --git a/app-backup/borgbackup/Manifest b/app-backup/borgbackup/Manifest
index e222665e951a..bebaabe3dd47 100644
--- a/app-backup/borgbackup/Manifest
+++ b/app-backup/borgbackup/Manifest
@@ -3,6 +3,6 @@ DIST borgbackup-1.2.1.tar.gz 4017050 BLAKE2B 2841f3c02b6af76aba61064513ebd903936
 DIST borgbackup-1.2.2.tar.gz 4042984 BLAKE2B c5c7bacd543e97af5bb1a42dd4a37900b9570328addd33e2ee83347ca631eaf172d8349b4a462bcc871da9f3c1b4e6efeb16da20893e8d58bb0655ed73ceea5b SHA512 9ba040dc659b123e09d1814ea158eb06bd802dbb4961e258910a586f88c5e92e8f32a72c1858f7a8d9d79c3e985b12cf0245436f46a474f627cfd70a59a7e29d
 EBUILD borgbackup-1.1.17-r1.ebuild 938 BLAKE2B 9e1165ef693d028e2936f22ba5bf0af42bbd7a83d1df32f667bd79269cea3d39ee90cbfe9b9718d8e650cb0ab33d6de5d909a78274897ca1ebefd918538db2eb SHA512 04fdb94a90a9a0bc36de20029c03d73625bae7f1ae099f96ce225e778cc60a00e60fea2ebe5cb40b35c2fb8af46fd0cade56a359e2a2d9eeef99e5581c560dd0
 EBUILD borgbackup-1.2.1-r2.ebuild 1124 BLAKE2B d49e5eff5669dff8eef72e21659a3a0926d683c65af581233bf53aedf57b3c5cba5972f97976ce806d993859439d916c01562f9229aef60b2e4d6a06daf873da SHA512 72f78973bcc85b372109b3c7fd45eb96d14cbccb083304e8f63b9a20c01557d8e3dee0f2dd5a526878ee399baee8e512e75628a971f2c52229fc220212d422d8
-EBUILD borgbackup-1.2.2.ebuild 1126 BLAKE2B 4762c677facc18c89d9830108dd12c993099dd510000e3fb9466a79ef2c443e47709fe4ea8c3b3c6f6db111fc682df641cdcf260843dd7a7a9052eeea2e836ad SHA512 112347bef1052ebc52b0b26359050d11ccdc6a82f2b674f54429552e08e3d6fb30e0c935835c28f662aa469bb8b82e5823b01ff4b1ba270492a3c1e77543325f
+EBUILD borgbackup-1.2.2-r1.ebuild 1404 BLAKE2B 61e87ed3daf94de28e4f4140552047155c7366aa4c361a81699581df273f22b0601632af92b7c5db15800146b78f266a8db1dacca7b2137f236c584c7ca46058 SHA512 96af4829bdf367cea9c26592a6d023edfaa454bc874c4c436065167e546526d096b06be8db5dac166100814d1c0aeda72f6ff49287d9c92a4da278a8c29c21a7
 EBUILD borgbackup-9999.ebuild 1126 BLAKE2B 4762c677facc18c89d9830108dd12c993099dd510000e3fb9466a79ef2c443e47709fe4ea8c3b3c6f6db111fc682df641cdcf260843dd7a7a9052eeea2e836ad SHA512 112347bef1052ebc52b0b26359050d11ccdc6a82f2b674f54429552e08e3d6fb30e0c935835c28f662aa469bb8b82e5823b01ff4b1ba270492a3c1e77543325f
 MISC metadata.xml 494 BLAKE2B 885fa002bca2ba16e31bc66dde9d21aea8eb5a3ab5522cab3e824a9cde1d87f8819eb028eb21a9382d23622fe0a699a481e7cb7cd50fba897e59490ba0734d39 SHA512 bddc0ca7934315439e4a23b43fbd42d538c1570b43b0401efa9641c2854e5633d727db4bda82a34fe88ad2c1b512df47b6654b50f85a0501f0ef8405d7f8a667
diff --git a/app-backup/borgbackup/borgbackup-1.2.2.ebuild b/app-backup/borgbackup/borgbackup-1.2.2-r1.ebuild
similarity index 76%
rename from app-backup/borgbackup/borgbackup-1.2.2.ebuild
rename to app-backup/borgbackup/borgbackup-1.2.2-r1.ebuild
index 9ac4b1a5217a..85d04fd5696f 100644
--- a/app-backup/borgbackup/borgbackup-1.2.2.ebuild
+++ b/app-backup/borgbackup/borgbackup-1.2.2-r1.ebuild
@@ -3,9 +3,10 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
+DISTUTILS_USE_PEP517=setuptools
 
-inherit distutils-r1
+inherit distutils-r1 bash-completion-r1
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/${PN}/borg.git"
@@ -44,4 +45,12 @@ DEPEND="
 src_install() {
 	distutils-r1_src_install
 	doman docs/man/*
+
+	dobashcomp scripts/shell_completions/bash/borg
+
+	insinto /usr/share/zsh/site-functions
+	doins scripts/shell_completions/zsh/_borg
+
+	insinto /usr/share/fish/vendor_completions.d
+	doins scripts/shell_completions/fish/borg.fish
 }
diff --git a/app-backup/borgmatic/Manifest b/app-backup/borgmatic/Manifest
index af24cde566a3..518730df2a69 100644
--- a/app-backup/borgmatic/Manifest
+++ b/app-backup/borgmatic/Manifest
@@ -5,6 +5,6 @@ DIST borgmatic-1.6.6.tar.gz 323601 BLAKE2B b40d8f00e3b7bbd343336cf4c6992e34d8289
 DIST borgmatic-1.7.2.tar.gz 333772 BLAKE2B fd628e9c77547686d4edf5d1066d3c171575f4d923ebc5205c5eb64f3a960e94c121282e9f4fb02b1291a81011a18dc393c6d13a07f215585459e7a5b55f8107 SHA512 6ec12ec25ae4d0210bb9114795c1ea292d8236f9e68c9425e24ee7b580796504e4c317a3fcf778806a33bbd3db68669beb4ef7a88ec538c1bd432db9a2845b3e
 DIST borgmatic-1.7.4.tar.gz 337521 BLAKE2B cbdf22c7428d2bd098a8bec0608c9d2fe41ab945aca4921cf78f72a5b73e2ea562a1e9e37705ada615f830b2655977179beca0f9a9bfa2937cc1cde0c292caed SHA512 bd320cbbb108fa20f7acc9a50fd4404166556a74df0a3631a2beca61de0e50c29e1e102345e6c3759538420040f359ff2f0cefe89b49c2c19250a4c7a27acd54
 EBUILD borgmatic-1.6.6.ebuild 1904 BLAKE2B b03ba369e333dc898f8b7901ee651470ccd83d05c37becedbc2f6ddea0b5d29515eb5331015645b1b5f17b921dc180907d1a02edf96a6a1546db4d444f01b415 SHA512 dc5208c3fbed40f6617effc59539e1fcf1cc166ce4083f8a0475b22b0f1a8e70e4f0dcaf35c3acecd6ee6c08b1dd32961d59284b2baba565ea4c558f0bfcebab
-EBUILD borgmatic-1.7.2.ebuild 2133 BLAKE2B 6f2dfcb4e7822ee1de43a961888ed326b52fa2ed10b291b3aa04a0a510f28598e86d08694274275f52743aec9ff368efbe7c9db11feff7692534aa87b5963805 SHA512 461dde9ae021a879a997cab17caba0303011804fb656f5e884cb271e3d7913759166261f43d2684da80355a3bf9be6aaf89f0be9b1243bbe43a916397f95325b
+EBUILD borgmatic-1.7.2.ebuild 2132 BLAKE2B f1fbbcda7472bb4b2d4faa8d7470fa23570498fe1299af1fbe01e710c209d467da1c72be978bf9ebf6668661ac7a6dd7b48c9969758f0f3f6fde0c3b92faaad1 SHA512 10962b09f1d1a20aa1937f99274aedcc1da7f97ce5116d2721502d284f1cf0cd4ee06d90d612c775c7a9ef451688e76c88a56cb00a0407b5911d79a0c867fa6b
 EBUILD borgmatic-1.7.4.ebuild 1696 BLAKE2B 60856bcf3b73f9ee31f2b49665637cbd9856f843f6dd62c8ec3cf4a058a3493dd9e7f241450a3644b478b0ed6f8435f374ece20f4863a0a8f929b516b798bf87 SHA512 f957bc2ae30f663388f87623836e0ab19168ccb0ed9c0970a2990f7c2c4861534d9a71fc0376b94ab9b5e01450eca225bac16b298a50b911af11b35dfab11a09
 MISC metadata.xml 380 BLAKE2B bd4f6eb451caa6b36d51dff099c7885ad2c30f2f9f5397e12049a28214601d67853f0dc604e6e42a566b8bf57acf0d9e39c685af8743cce72ec3b5b07adea72e SHA512 1d2c0a22d3b844b58ed35f3fae261a1d6906e5e1b0e69bbe364e0409f335b44f04089ea1d0e6144e2ddfcf066cc8ad85d14c0b22a28ddd22d235c48e1401569f
diff --git a/app-backup/borgmatic/borgmatic-1.7.2.ebuild b/app-backup/borgmatic/borgmatic-1.7.2.ebuild
index 85a3ea05cce7..83cdf16dba35 100644
--- a/app-backup/borgmatic/borgmatic-1.7.2.ebuild
+++ b/app-backup/borgmatic/borgmatic-1.7.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv"
 
 # borg is called as an external tool, hence no pythonic stuff
 RDEPEND="app-backup/borgbackup
diff --git a/app-backup/btrbk/Manifest b/app-backup/btrbk/Manifest
index 7a8503d9fd68..54c05c9a8fc1 100644
--- a/app-backup/btrbk/Manifest
+++ b/app-backup/btrbk/Manifest
@@ -1,16 +1,6 @@
 DIST btrbk-0.31.2.tar.xz 107124 BLAKE2B a05ef8a665d50b0f9637b1bc7026f0ca0f8364377b4165dae09cd27790dc139aaea1096a54719d948adda5050f91580650bf58db70a086cfdd14b73559fad9f3 SHA512 f953fe1a231f7a28c2d98cf124e3d52cc6d0810e6cb1673b90f335e07cd7473d0302ec227361f902c40a36dab5c075c675d2ee0543a23c37cb1e4baaf74efea0
-DIST btrbk-0.31.3.tar.xz 109884 BLAKE2B 7f78d00815259e42bb3fd16ee48272717fe57913b7af83ca8a98f1dfd0de715cbf8b07177ea60b5b8bdcb9793ee0d5829b90b8327cd4810f6275611276a6e707 SHA512 62dee5430635b6a31edcdc9bed1829f549b60074ea09bb6f1fcd56d242d4215339846c8c2dbcd4bee05cd2a0cb32c1237ce7311d2b887885373c13fa15a6f476
-DIST btrbk-0.32.0.tar.xz 110408 BLAKE2B d9627d0f0a258bba9412b37707c3e79ca8a65870148aa27f38e615c90d0e26adfc5ecf697cc34052916127a0a26be850f5874ff52ab6cb193093d591cb05dab1 SHA512 201dde5ea9bf459e5a837b520d3e76ef1077a1769ed2e06b9754e34a93e2abd513a0da2b18abbe13c09fc3a945117a4b022ad423f805056b62a2b2be9c0f768a
-DIST btrbk-0.32.1.tar.xz 110364 BLAKE2B 5d2860e182701ba6c407b9d0f41e476442bdf0ebc8491c3fa944860228d087d6bbe13084a4e950a24fc6ea1e251e2c4c6cbf17e9e3a4cb4f3f9b7ea9b85b2c11 SHA512 a44c1a50696793661fa6a06fafc6a7682ba5db57b511666a9b77d2df79b724855e91187e4d13e1dfe340077f550b0aced8923c6dec955d25ce46f7644ed802f3
-DIST btrbk-0.32.2.tar.xz 111044 BLAKE2B f06e563d0a3f6a7096426b205c56446c8cba34767a0a2cd092f1d0d2661c1a38d88adfae0cd2046d2f43623fb236e9a2d7ef7281938a37b410f2cf842f5df83c SHA512 204bd48605b369909b1cb586bfa75dda5ee57b833c71a9d39699020f05f7305e2bc932c76face5aa0e435c1df46e13a566cbb2042c86975f6f8cd65c82ddcccf
-DIST btrbk-0.32.3.tar.xz 110724 BLAKE2B f0e389891bfdfa961187505548ec5139aa8967932d2fcca43c151c8ca25664c30af96f0f52531507e7c838ca3df16f371f7419df226283734fee23f6af56b3cf SHA512 8503ddb47a54b02abc03b160c296f9e5d2d71cc9705f4891f99732c36a62bb0bf81caa5cbe793d7e070c68ab461de995b442aa3a140d6aa68fe2a3b8a9cafb20
-DIST btrbk-0.32.4.tar.xz 110736 BLAKE2B e76a0b6ed8d54f97fa0ac2dad139891ae0f9450095e08d560f5a62ad28e3cc2e39da0a3a094ca841c5debbe9d34ca1cb3930cb3a16877b1547fb81f9c5e7e244 SHA512 495ec786c94f76c590f8e84cc9aa6be7b9a4807c11d501360bbdf171e0f0598fe6498b0d5b8aa8030af8d957aa8cebdff903876473f5111a9100032c16995373
+DIST btrbk-0.32.5.tar.xz 110840 BLAKE2B 036a2b5c31a308dbc1efc7a27211f89dfc07bcfcead49deb68a2e8313aec9539483ef3a91481f4ebaa9d2b4817b202ced1945a30ed7fc9b51f1336878b2f17d7 SHA512 6ff8df173656cbfdc1c4e74e84e031816fec73c2a42d1069fe5e77bf9eff1a3e27699a383ee58843f59619e6cbc0d66d13bf1b2a72524c58fdcd948ba62448fc
 EBUILD btrbk-0.31.2.ebuild 2381 BLAKE2B dead45950b470fbd2303425a522186e5ac553711583ea1406112260a05484a7420884a3023dbc4314121f7ef28f4b473b78082a9a77ee9c6ab6c1afcb4a693e5 SHA512 6fb46ea01bb0f105ac50d28fb0c830b70934d8660ab24bc89c1f72eea2c5c1b6b150fab1eba9ade528a6e7b9cb514fe6f5255523ef455e23a634ae29a116c6f9
-EBUILD btrbk-0.31.3.ebuild 2385 BLAKE2B 2aca46fa4c713bdf92f7bb24afc18bbf662e1118bc59afc430a8fc133fb7f9d08eb2b5c5ed2451347c4a2ab5eb6fddd9ab462ce688c5c28fbe8905f4e6c7201f SHA512 c5079950260f6b6411d3bcd66f6066874a7bcac22812989383d41b08f8e9fa2bb8f25becac65871322b063c8e2da3c80d443265357dad9485f41b24413329a40
-EBUILD btrbk-0.32.0.ebuild 2385 BLAKE2B f1ce5388d83881455a946299992622f44ff958cd8ef57e6d8f0ead9c8e490b784b3ac02da587119cf6415feae772d5fa4c449c9d2ba218fb9c780e94f15e98cd SHA512 b1b25893f4ded6f719b36216006de236210a3ca1b39d5c6b7d2468d4ffcff867b590be40a2e47415fdf3672873321bcf06e4393a89cce44098f7a71f83cb7f97
-EBUILD btrbk-0.32.1.ebuild 2385 BLAKE2B f1ce5388d83881455a946299992622f44ff958cd8ef57e6d8f0ead9c8e490b784b3ac02da587119cf6415feae772d5fa4c449c9d2ba218fb9c780e94f15e98cd SHA512 b1b25893f4ded6f719b36216006de236210a3ca1b39d5c6b7d2468d4ffcff867b590be40a2e47415fdf3672873321bcf06e4393a89cce44098f7a71f83cb7f97
-EBUILD btrbk-0.32.2.ebuild 2385 BLAKE2B 34a17462e9aa80f5a86cedbb3ce25c0524aca74eeaed226f79a27b73eb604ddc4e1baa9472a113bf647871c37c7e7926baf42542f18e96245a573dc8f778b061 SHA512 763c8e25ca107eede4bd509b7c9a2f9f191e0965b4b156ff4286f3a67624b2c34b83b9db64c2e1b93d2e501f89e2eeb9629bb78de9d68da9a43a1f2846debb46
-EBUILD btrbk-0.32.3.ebuild 2385 BLAKE2B 34a17462e9aa80f5a86cedbb3ce25c0524aca74eeaed226f79a27b73eb604ddc4e1baa9472a113bf647871c37c7e7926baf42542f18e96245a573dc8f778b061 SHA512 763c8e25ca107eede4bd509b7c9a2f9f191e0965b4b156ff4286f3a67624b2c34b83b9db64c2e1b93d2e501f89e2eeb9629bb78de9d68da9a43a1f2846debb46
-EBUILD btrbk-0.32.4.ebuild 2385 BLAKE2B 34a17462e9aa80f5a86cedbb3ce25c0524aca74eeaed226f79a27b73eb604ddc4e1baa9472a113bf647871c37c7e7926baf42542f18e96245a573dc8f778b061 SHA512 763c8e25ca107eede4bd509b7c9a2f9f191e0965b4b156ff4286f3a67624b2c34b83b9db64c2e1b93d2e501f89e2eeb9629bb78de9d68da9a43a1f2846debb46
+EBUILD btrbk-0.32.5.ebuild 2385 BLAKE2B 34a17462e9aa80f5a86cedbb3ce25c0524aca74eeaed226f79a27b73eb604ddc4e1baa9472a113bf647871c37c7e7926baf42542f18e96245a573dc8f778b061 SHA512 763c8e25ca107eede4bd509b7c9a2f9f191e0965b4b156ff4286f3a67624b2c34b83b9db64c2e1b93d2e501f89e2eeb9629bb78de9d68da9a43a1f2846debb46
 EBUILD btrbk-9999.ebuild 2385 BLAKE2B 34a17462e9aa80f5a86cedbb3ce25c0524aca74eeaed226f79a27b73eb604ddc4e1baa9472a113bf647871c37c7e7926baf42542f18e96245a573dc8f778b061 SHA512 763c8e25ca107eede4bd509b7c9a2f9f191e0965b4b156ff4286f3a67624b2c34b83b9db64c2e1b93d2e501f89e2eeb9629bb78de9d68da9a43a1f2846debb46
 MISC metadata.xml 1075 BLAKE2B 9e352a1f9346ebb1cff94393f977dfb0c3714e53380ce2ed3c8eb53375d2ac74c95655556fb604bf538ae63ae00de9ed97cf9a02cadaec97c7117f9a621ca481 SHA512 681a2a38dc3ddba866d46bd9e88bc8549cb1ba297de965a1faecada4ac7b966a3603ce4b647544ba9dabfbbb59e1072cbecf550b580835ae1d1d79efcc3af7e5
diff --git a/app-backup/btrbk/btrbk-0.31.3.ebuild b/app-backup/btrbk/btrbk-0.31.3.ebuild
deleted file mode 100644
index f301c70cd559..000000000000
--- a/app-backup/btrbk/btrbk-0.31.3.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/digint/btrbk.git"
-	inherit git-r3
-	SRC_URI=""
-else
-	SRC_URI="https://digint.ch/download/btrbk/releases/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-fi
-
-DESCRIPTION="Tool for creating snapshots and remote backups of btrfs subvolumes"
-HOMEPAGE="https://digint.ch/btrbk/"
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE="+mbuffer +doc +lsbtr"
-
-DEPEND="doc? ( >=dev-ruby/asciidoctor-1.5.7 )"
-
-RDEPEND="dev-lang/perl
-	net-misc/openssh
-	mbuffer? ( >=sys-block/mbuffer-20180505 )
-	>=sys-fs/btrfs-progs-4.12"
-
-src_compile() {
-	emake clean
-	use doc && emake -C doc
-}
-src_install() {
-	local targets="install-bin install-etc install-share install-systemd"
-	use doc && targets="${targets} install-man install-doc"
-	use lsbtr && targets="${targets} install-bin-links"
-	emake \
-		DESTDIR="${D}" \
-		DOCDIR="/usr/share/doc/${PF}" \
-		SYSTEMDDIR="$(systemd_get_systemunitdir)" \
-		${targets}
-}
-pkg_preinst() {
-	if has_version "<${CATEGORY}/${PN}-0.26.0" ; then
-		upgrade_0_26_0_warning="1"
-	fi
-	if has_version "<${CATEGORY}/${PN}-0.27.0" ; then
-		upgrade_0_27_0_warning="1"
-	fi
-}
-pkg_postinst() {
-	if [[ "${upgrade_0_26_0_warning}" == "1" ]]; then
-		ewarn "If you are using raw targets, make sure to run the"
-		ewarn "\"raw_suffix2sidecar\" utility in each target directory."
-	fi
-	if [[ "${upgrade_0_27_0_warning}" == "1" ]]; then
-		ewarn 'Due to a bugfix in the scheduler [1] [2], previously preserved'
-		ewarn 'monthly/yearly backups could get deleted when upgrading to'
-		ewarn 'btrbk-0.27.0.'
-		ewarn ''
-		ewarn 'Before upgrading to btrbk-0.27.0, make sure to stop all cron jobs'
-		ewarn 'or systemd timers calling btrbk.'
-		ewarn ''
-		ewarn 'After upgrading, run "btrbk prune --dry-run --print-schedule" and'
-		ewarn 'check if any snapshots/backups would get deleted. If you want to'
-		ewarn 'forcibly preserve a snapshot/backup forever, rename it:'
-		ewarn ''
-		ewarn '    mv mysubvol.YYYYMMDD mysubvol.YYYYMMDD.keep_forever'
-		ewarn ''
-		ewarn 'Note that btrbk ignores subvolumes with unknown naming scheme, e.g.'
-		ewarn '(".keep_forever" suffix in the example above).'
-		ewarn ''
-		ewarn '  [1] https://github.com/digint/btrbk/issues/217'
-		ewarn '  [2] https://github.com/digint/btrbk/commit/719fb5f'
-	fi
-}
diff --git a/app-backup/btrbk/btrbk-0.32.0.ebuild b/app-backup/btrbk/btrbk-0.32.0.ebuild
deleted file mode 100644
index 29b1c6d3fc78..000000000000
--- a/app-backup/btrbk/btrbk-0.32.0.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/digint/btrbk.git"
-	inherit git-r3
-	SRC_URI=""
-else
-	SRC_URI="https://digint.ch/download/btrbk/releases/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-fi
-
-DESCRIPTION="Tool for creating snapshots and remote backups of btrfs subvolumes"
-HOMEPAGE="https://digint.ch/btrbk/"
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE="+mbuffer +doc +lsbtr"
-
-DEPEND="doc? ( >=dev-ruby/asciidoctor-1.5.7 )"
-
-RDEPEND="dev-lang/perl
-	net-misc/openssh
-	mbuffer? ( >=sys-block/mbuffer-20180505 )
-	>=sys-fs/btrfs-progs-4.12"
-
-src_compile() {
-	emake clean
-	use doc && emake -C doc
-}
-src_install() {
-	local targets="install-bin install-etc install-share install-systemd"
-	use doc && targets="${targets} install-man install-doc"
-	use lsbtr && targets="${targets} install-bin-links"
-	emake \
-		DESTDIR="${D}" \
-		DOCDIR="/usr/share/doc/${PF}" \
-		SYSTEMDDIR="$(systemd_get_systemunitdir)" \
-		${targets}
-}
-pkg_preinst() {
-	if has_version "<${CATEGORY}/${PN}-0.26.0" ; then
-		upgrade_0_26_0_warning="1"
-	fi
-	if has_version "<${CATEGORY}/${PN}-0.27.0" ; then
-		upgrade_0_27_0_warning="1"
-	fi
-}
-pkg_postinst() {
-	if [[ "${upgrade_0_26_0_warning}" == "1" ]]; then
-		ewarn "If you are using raw targets, make sure to run the"
-		ewarn "\"raw_suffix2sidecar\" utility in each target directory."
-	fi
-	if [[ "${upgrade_0_27_0_warning}" == "1" ]]; then
-		ewarn 'Due to a bugfix in the scheduler [1] [2], previously preserved'
-		ewarn 'monthly/yearly backups could get deleted when upgrading to'
-		ewarn 'btrbk-0.27.0.'
-		ewarn ''
-		ewarn 'Before upgrading to btrbk-0.27.0, make sure to stop all cron jobs'
-		ewarn 'or systemd timers calling btrbk.'
-		ewarn ''
-		ewarn 'After upgrading, run "btrbk prune --dry-run --print-schedule" and'
-		ewarn 'check if any snapshots/backups would get deleted. If you want to'
-		ewarn 'forcibly preserve a snapshot/backup forever, rename it:'
-		ewarn ''
-		ewarn '    mv mysubvol.YYYYMMDD mysubvol.YYYYMMDD.keep_forever'
-		ewarn ''
-		ewarn 'Note that btrbk ignores subvolumes with unknown naming scheme, e.g.'
-		ewarn '(".keep_forever" suffix in the example above).'
-		ewarn ''
-		ewarn '  [1] https://github.com/digint/btrbk/issues/217'
-		ewarn '  [2] https://github.com/digint/btrbk/commit/719fb5f'
-	fi
-}
diff --git a/app-backup/btrbk/btrbk-0.32.1.ebuild b/app-backup/btrbk/btrbk-0.32.1.ebuild
deleted file mode 100644
index 29b1c6d3fc78..000000000000
--- a/app-backup/btrbk/btrbk-0.32.1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/digint/btrbk.git"
-	inherit git-r3
-	SRC_URI=""
-else
-	SRC_URI="https://digint.ch/download/btrbk/releases/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-fi
-
-DESCRIPTION="Tool for creating snapshots and remote backups of btrfs subvolumes"
-HOMEPAGE="https://digint.ch/btrbk/"
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE="+mbuffer +doc +lsbtr"
-
-DEPEND="doc? ( >=dev-ruby/asciidoctor-1.5.7 )"
-
-RDEPEND="dev-lang/perl
-	net-misc/openssh
-	mbuffer? ( >=sys-block/mbuffer-20180505 )
-	>=sys-fs/btrfs-progs-4.12"
-
-src_compile() {
-	emake clean
-	use doc && emake -C doc
-}
-src_install() {
-	local targets="install-bin install-etc install-share install-systemd"
-	use doc && targets="${targets} install-man install-doc"
-	use lsbtr && targets="${targets} install-bin-links"
-	emake \
-		DESTDIR="${D}" \
-		DOCDIR="/usr/share/doc/${PF}" \
-		SYSTEMDDIR="$(systemd_get_systemunitdir)" \
-		${targets}
-}
-pkg_preinst() {
-	if has_version "<${CATEGORY}/${PN}-0.26.0" ; then
-		upgrade_0_26_0_warning="1"
-	fi
-	if has_version "<${CATEGORY}/${PN}-0.27.0" ; then
-		upgrade_0_27_0_warning="1"
-	fi
-}
-pkg_postinst() {
-	if [[ "${upgrade_0_26_0_warning}" == "1" ]]; then
-		ewarn "If you are using raw targets, make sure to run the"
-		ewarn "\"raw_suffix2sidecar\" utility in each target directory."
-	fi
-	if [[ "${upgrade_0_27_0_warning}" == "1" ]]; then
-		ewarn 'Due to a bugfix in the scheduler [1] [2], previously preserved'
-		ewarn 'monthly/yearly backups could get deleted when upgrading to'
-		ewarn 'btrbk-0.27.0.'
-		ewarn ''
-		ewarn 'Before upgrading to btrbk-0.27.0, make sure to stop all cron jobs'
-		ewarn 'or systemd timers calling btrbk.'
-		ewarn ''
-		ewarn 'After upgrading, run "btrbk prune --dry-run --print-schedule" and'
-		ewarn 'check if any snapshots/backups would get deleted. If you want to'
-		ewarn 'forcibly preserve a snapshot/backup forever, rename it:'
-		ewarn ''
-		ewarn '    mv mysubvol.YYYYMMDD mysubvol.YYYYMMDD.keep_forever'
-		ewarn ''
-		ewarn 'Note that btrbk ignores subvolumes with unknown naming scheme, e.g.'
-		ewarn '(".keep_forever" suffix in the example above).'
-		ewarn ''
-		ewarn '  [1] https://github.com/digint/btrbk/issues/217'
-		ewarn '  [2] https://github.com/digint/btrbk/commit/719fb5f'
-	fi
-}
diff --git a/app-backup/btrbk/btrbk-0.32.3.ebuild b/app-backup/btrbk/btrbk-0.32.3.ebuild
deleted file mode 100644
index f75978a45363..000000000000
--- a/app-backup/btrbk/btrbk-0.32.3.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit systemd
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/digint/btrbk.git"
-	inherit git-r3
-	SRC_URI=""
-else
-	SRC_URI="https://digint.ch/download/btrbk/releases/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-fi
-
-DESCRIPTION="Tool for creating snapshots and remote backups of btrfs subvolumes"
-HOMEPAGE="https://digint.ch/btrbk/"
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE="+mbuffer +doc +lsbtr"
-
-DEPEND="doc? ( >=dev-ruby/asciidoctor-1.5.7 )"
-
-RDEPEND="dev-lang/perl
-	net-misc/openssh
-	mbuffer? ( >=sys-block/mbuffer-20180505 )
-	>=sys-fs/btrfs-progs-4.12"
-
-src_compile() {
-	emake clean
-	use doc && emake -C doc
-}
-src_install() {
-	local targets="install-bin install-etc install-share install-systemd"
-	use doc && targets="${targets} install-man install-doc"
-	use lsbtr && targets="${targets} install-bin-links"
-	emake \
-		DESTDIR="${D}" \
-		DOCDIR="/usr/share/doc/${PF}" \
-		SYSTEMDDIR="$(systemd_get_systemunitdir)" \
-		${targets}
-}
-pkg_preinst() {
-	if has_version "<${CATEGORY}/${PN}-0.26.0" ; then
-		upgrade_0_26_0_warning="1"
-	fi
-	if has_version "<${CATEGORY}/${PN}-0.27.0" ; then
-		upgrade_0_27_0_warning="1"
-	fi
-}
-pkg_postinst() {
-	if [[ "${upgrade_0_26_0_warning}" == "1" ]]; then
-		ewarn "If you are using raw targets, make sure to run the"
-		ewarn "\"raw_suffix2sidecar\" utility in each target directory."
-	fi
-	if [[ "${upgrade_0_27_0_warning}" == "1" ]]; then
-		ewarn 'Due to a bugfix in the scheduler [1] [2], previously preserved'
-		ewarn 'monthly/yearly backups could get deleted when upgrading to'
-		ewarn 'btrbk-0.27.0.'
-		ewarn ''
-		ewarn 'Before upgrading to btrbk-0.27.0, make sure to stop all cron jobs'
-		ewarn 'or systemd timers calling btrbk.'
-		ewarn ''
-		ewarn 'After upgrading, run "btrbk prune --dry-run --print-schedule" and'
-		ewarn 'check if any snapshots/backups would get deleted. If you want to'
-		ewarn 'forcibly preserve a snapshot/backup forever, rename it:'
-		ewarn ''
-		ewarn '    mv mysubvol.YYYYMMDD mysubvol.YYYYMMDD.keep_forever'
-		ewarn ''
-		ewarn 'Note that btrbk ignores subvolumes with unknown naming scheme, e.g.'
-		ewarn '(".keep_forever" suffix in the example above).'
-		ewarn ''
-		ewarn '  [1] https://github.com/digint/btrbk/issues/217'
-		ewarn '  [2] https://github.com/digint/btrbk/commit/719fb5f'
-	fi
-}
diff --git a/app-backup/btrbk/btrbk-0.32.4.ebuild b/app-backup/btrbk/btrbk-0.32.4.ebuild
deleted file mode 100644
index f75978a45363..000000000000
--- a/app-backup/btrbk/btrbk-0.32.4.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit systemd
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/digint/btrbk.git"
-	inherit git-r3
-	SRC_URI=""
-else
-	SRC_URI="https://digint.ch/download/btrbk/releases/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-fi
-
-DESCRIPTION="Tool for creating snapshots and remote backups of btrfs subvolumes"
-HOMEPAGE="https://digint.ch/btrbk/"
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE="+mbuffer +doc +lsbtr"
-
-DEPEND="doc? ( >=dev-ruby/asciidoctor-1.5.7 )"
-
-RDEPEND="dev-lang/perl
-	net-misc/openssh
-	mbuffer? ( >=sys-block/mbuffer-20180505 )
-	>=sys-fs/btrfs-progs-4.12"
-
-src_compile() {
-	emake clean
-	use doc && emake -C doc
-}
-src_install() {
-	local targets="install-bin install-etc install-share install-systemd"
-	use doc && targets="${targets} install-man install-doc"
-	use lsbtr && targets="${targets} install-bin-links"
-	emake \
-		DESTDIR="${D}" \
-		DOCDIR="/usr/share/doc/${PF}" \
-		SYSTEMDDIR="$(systemd_get_systemunitdir)" \
-		${targets}
-}
-pkg_preinst() {
-	if has_version "<${CATEGORY}/${PN}-0.26.0" ; then
-		upgrade_0_26_0_warning="1"
-	fi
-	if has_version "<${CATEGORY}/${PN}-0.27.0" ; then
-		upgrade_0_27_0_warning="1"
-	fi
-}
-pkg_postinst() {
-	if [[ "${upgrade_0_26_0_warning}" == "1" ]]; then
-		ewarn "If you are using raw targets, make sure to run the"
-		ewarn "\"raw_suffix2sidecar\" utility in each target directory."
-	fi
-	if [[ "${upgrade_0_27_0_warning}" == "1" ]]; then
-		ewarn 'Due to a bugfix in the scheduler [1] [2], previously preserved'
-		ewarn 'monthly/yearly backups could get deleted when upgrading to'
-		ewarn 'btrbk-0.27.0.'
-		ewarn ''
-		ewarn 'Before upgrading to btrbk-0.27.0, make sure to stop all cron jobs'
-		ewarn 'or systemd timers calling btrbk.'
-		ewarn ''
-		ewarn 'After upgrading, run "btrbk prune --dry-run --print-schedule" and'
-		ewarn 'check if any snapshots/backups would get deleted. If you want to'
-		ewarn 'forcibly preserve a snapshot/backup forever, rename it:'
-		ewarn ''
-		ewarn '    mv mysubvol.YYYYMMDD mysubvol.YYYYMMDD.keep_forever'
-		ewarn ''
-		ewarn 'Note that btrbk ignores subvolumes with unknown naming scheme, e.g.'
-		ewarn '(".keep_forever" suffix in the example above).'
-		ewarn ''
-		ewarn '  [1] https://github.com/digint/btrbk/issues/217'
-		ewarn '  [2] https://github.com/digint/btrbk/commit/719fb5f'
-	fi
-}
diff --git a/app-backup/btrbk/btrbk-0.32.2.ebuild b/app-backup/btrbk/btrbk-0.32.5.ebuild
similarity index 100%
rename from app-backup/btrbk/btrbk-0.32.2.ebuild
rename to app-backup/btrbk/btrbk-0.32.5.ebuild
diff --git a/app-containers/Manifest.gz b/app-containers/Manifest.gz
index 17fab14fdb18..62bab7f785c0 100644
Binary files a/app-containers/Manifest.gz and b/app-containers/Manifest.gz differ
diff --git a/app-containers/snapd/Manifest b/app-containers/snapd/Manifest
index be021527eb1f..1bd7dae6643f 100644
--- a/app-containers/snapd/Manifest
+++ b/app-containers/snapd/Manifest
@@ -1,6 +1,8 @@
 AUX README.gentoo 1941 BLAKE2B dd25269f2aaaea693701d74511d632bc45f2c99954ae683cb81d4df41c4c1f8007bb6c337234e46bfc5973aa7e8356cd12ac510e9109eca09890cbc42bd184bb SHA512 5b522e6c29bdad84a71245fa1f0289e9cfed0501d936b433829f66ef9d655f3cc13d6bca29beeae2c00e1b68f9fa30058608b9c4cde86ba66eab67bd011c9d00
 DIST snapd-2.57.2.tar.xz 6827264 BLAKE2B f9b1ae934a9c5b777d2e36854e259ddde301067a91b04ecef064accfccecc74693a2a58700e60867f46f028728a271b87cb3d4cdb316ae35df11363990959c3a SHA512 671e7598074894daf76646f7eea09c4163c57e68d0d46ebb77b20f71b898109fd73c78d363cb1253386ce058c1796eb25fab7f2f0345360426d3b9cc11d38804
 DIST snapd-2.57.4.tar.xz 6884432 BLAKE2B 47dcb8857070ab9f5cd02f6b64d6ef263ab1cf958c0eee6654064f7beec10c5b9995dcad9c66ba8237c6e4991e6c82b2fa758e204cdc3fb1134a5d8bb45e855b SHA512 00763d64a17c94ae7a8f4b09f61489f5dc32d923e2a22f223e0fa817693cf69e5d36cb7f9ea7b04d4ea325abdbaf3c1aeb87884318bf16de803bce1fef9666de
+DIST snapd-2.57.5.tar.xz 6900544 BLAKE2B e6579f8ece458ff02eabd92eb3e813cae3fd11eb3ef0a6c5949487ee5505297d3e24f69025969f0d491fb0e2d86657580a1b29e583015686ddee6afdda2724ec SHA512 955a0d61e8d6a2c585d356e67ec27551ee04894d6c4463aed33dcef4c751414ad30b7143733736dbf5d17897731fc3769ba755ab524b4f144e0a469fe3284460
 EBUILD snapd-2.57.2-r1.ebuild 5169 BLAKE2B f96430c3131d507c6b7566f7b085851a6db569a93dae668d0a34d13319c06f563566858367bf028ed600f1d0ba8f29e5970c56ca72241b7b72eccf5318939633 SHA512 b7551510c5b5adf6f12c2df137ef54c8c62f96984141f49e2706a7c88c65490b03f43674b8314c82cb83bbad5de560285d1c10b1b11bf79359034cf758096caf
 EBUILD snapd-2.57.4.ebuild 5169 BLAKE2B f96430c3131d507c6b7566f7b085851a6db569a93dae668d0a34d13319c06f563566858367bf028ed600f1d0ba8f29e5970c56ca72241b7b72eccf5318939633 SHA512 b7551510c5b5adf6f12c2df137ef54c8c62f96984141f49e2706a7c88c65490b03f43674b8314c82cb83bbad5de560285d1c10b1b11bf79359034cf758096caf
+EBUILD snapd-2.57.5.ebuild 5169 BLAKE2B f96430c3131d507c6b7566f7b085851a6db569a93dae668d0a34d13319c06f563566858367bf028ed600f1d0ba8f29e5970c56ca72241b7b72eccf5318939633 SHA512 b7551510c5b5adf6f12c2df137ef54c8c62f96984141f49e2706a7c88c65490b03f43674b8314c82cb83bbad5de560285d1c10b1b11bf79359034cf758096caf
 MISC metadata.xml 457 BLAKE2B 204b67bf36a85bd18f4111b4d8590195908bf15ae0bafedb76b6124b7d19c6570627925e5dfc46dd4dd47732c6d8f1066451831a0cc475518aab8a29403ececc SHA512 07671272b60f1a6793e3f36b096e99153263830314359eb86000aec65266c61ebe9c448af4ec166d6163e3ca2325f36cc74fe5aace95e7ffa7b0293516b18120
diff --git a/app-containers/snapd/snapd-2.57.5.ebuild b/app-containers/snapd/snapd-2.57.5.ebuild
new file mode 100644
index 000000000000..35255adff108
--- /dev/null
+++ b/app-containers/snapd/snapd-2.57.5.ebuild
@@ -0,0 +1,178 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools bash-completion-r1 flag-o-matic go-module linux-info readme.gentoo-r1 systemd xdg-utils
+
+DESCRIPTION="Service and tools for management of snap packages"
+HOMEPAGE="http://snapcraft.io/"
+
+SRC_URI="https://github.com/snapcore/${PN}/releases/download/${PV}/${PN}_${PV}.vendor.tar.xz -> ${P}.tar.xz"
+MY_PV=${PV}
+KEYWORDS="~amd64"
+
+LICENSE="GPL-3 Apache-2.0 BSD BSD-2 LGPL-3-with-linking-exception MIT"
+SLOT="0"
+IUSE="apparmor +forced-devmode gtk kde systemd"
+REQUIRED_USE="!forced-devmode? ( apparmor ) systemd"
+
+CONFIG_CHECK="~CGROUPS
+		~CGROUP_DEVICE
+		~CGROUP_FREEZER
+		~NAMESPACES
+		~SQUASHFS
+		~SQUASHFS_ZLIB
+		~SQUASHFS_LZO
+		~SQUASHFS_XZ
+		~BLK_DEV_LOOP
+		~SECCOMP
+		~SECCOMP_FILTER"
+
+RDEPEND="
+	sys-libs/libseccomp:=
+	apparmor? (
+		sec-policy/apparmor-profiles
+		sys-apps/apparmor:=
+	)
+	dev-libs/glib
+	virtual/libudev
+	systemd? ( sys-apps/systemd )
+	sys-libs/libcap:=
+	sys-fs/squashfs-tools[lzma]"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+	>=dev-lang/go-1.9
+	dev-python/docutils
+	sys-devel/gettext
+	sys-fs/xfsprogs"
+
+PDEPEND="sys-auth/polkit[gtk?,kde?]"
+
+README_GENTOO_SUFFIX=""
+
+pkg_setup() {
+	if use apparmor; then
+		CONFIG_CHECK+=" ~SECURITY_APPARMOR"
+	fi
+	linux-info_pkg_setup
+
+	# Seems to have issues building with -O3, switch to -O2
+	replace-flags -O3 -O2
+}
+
+src_prepare() {
+	default
+	# Update apparmor profile to allow libtinfow.so*
+	sed -i 's/libtinfo/libtinfo{,w}/' \
+		"cmd/snap-confine/snap-confine.apparmor.in" || die
+
+	if ! use forced-devmode; then
+		sed -e 's#return !apparmorFull#if !apparmorFull {\n\t\tpanic("USE=forced-devmode is disabled")\n\t}\n\treturn false#' \
+			-i "sandbox/forcedevmode.go" || die
+		grep -q 'panic("USE=forced-devmode is disabled")' "sandbox/forcedevmode.go" || die "failed to disable forced-devmode"
+	fi
+
+	sed -i 's:command -v git >/dev/null:false:' -i "mkversion.sh" || die
+
+	./mkversion.sh "${PV}"
+	pushd "cmd" >/dev/null || die
+	eautoreconf
+}
+
+src_configure() {
+	SNAPD_MAKEARGS=(
+		"BINDIR=${EPREFIX}/usr/bin"
+		"DBUSSERVICESDIR=${EPREFIX}/usr/share/dbus-1/services"
+		"LIBEXECDIR=${EPREFIX}/usr/lib"
+		"SNAP_MOUNT_DIR=${EPREFIX}/var/lib/snapd/snap"
+		"SYSTEMDSYSTEMUNITDIR=$(systemd_get_systemunitdir)"
+	)
+	export CGO_ENABLED="1"
+	export CGO_CFLAGS="${CFLAGS}"
+	export CGO_CPPFLAGS="${CPPFLAGS}"
+	export CGO_CXXFLAGS="${CXXFLAGS}"
+
+	pushd "${S}/cmd" >/dev/null || die
+	econf --libdir="${EPREFIX}/usr/lib" \
+		--libexecdir="${EPREFIX}/usr/lib/snapd" \
+		$(use_enable apparmor) \
+		--enable-nvidia-biarch \
+		--with-snap-mount-dir="${EPREFIX}/var/lib/snapd/snap"
+}
+
+src_compile() {
+	export -n GOCACHE XDG_CACHE_HOME
+	export GOBIN="${S}/bin"
+
+	local file
+	for file in "${S}/po/"*.po; do
+		msgfmt "${file}" -o "${file%.po}.mo" || die
+	done
+
+	emake -C "${S}/data" "${SNAPD_MAKEARGS[@]}"
+
+	local -a flags=(-buildmode=pie -ldflags "-s -linkmode external -extldflags '${LDFLAGS}'" -trimpath)
+	local -a staticflags=(-buildmode=pie -ldflags "-s -linkmode external -extldflags '${LDFLAGS} -static'" -trimpath)
+
+	local cmd
+	for cmd in snap snapd snapd-apparmor snap-bootstrap snap-failure snap-preseed snap-recovery-chooser snap-repair snap-seccomp; do
+		go build ${GOFLAGS} -mod=vendor -o "${GOBIN}/${cmd}" "${flags[@]}" \
+		    -v -x "github.com/snapcore/${PN}/cmd/${cmd}"
+		[[ -e "${GOBIN}/${cmd}" ]] || die "failed to build ${cmd}"
+	done
+	for cmd in snapctl snap-exec snap-update-ns; do
+		go build ${GOFLAGS} -mod=vendor -o "${GOBIN}/${cmd}" "${staticflags[@]}" \
+		    -v -x "github.com/snapcore/${PN}/cmd/${cmd}"
+		[[ -e "${GOBIN}/${cmd}" ]] || die "failed to build ${cmd}"
+	done
+}
+
+src_install() {
+	emake -C "${S}/data" install "${SNAPD_MAKEARGS[@]}" DESTDIR="${D}"
+	emake -C "${S}/cmd" install "${SNAPD_MAKEARGS[@]}" DESTDIR="${D}"
+
+	if use apparmor; then
+		mv "${ED}/etc/apparmor.d/usr.lib.snapd.snap-confine"{,.real} || die
+		keepdir /var/lib/snapd/apparmor/profiles
+	fi
+	keepdir /var/lib/snapd/{apparmor/snap-confine,cache,cookie,snap,void}
+	fperms 700 /var/lib/snapd/{cache,cookie}
+
+	dobin "${GOBIN}/"{snap,snapctl}
+	ln "${ED}/usr/bin/snapctl" "${ED}/usr/lib/snapd/snapctl" || die
+
+	exeinto /usr/lib/snapd
+	doexe "${GOBIN}/"{snapd,snapd-apparmor,snap-bootstrap,snap-failure,snap-exec,snap-preseed,snap-recovery-chooser,snap-repair,snap-seccomp,snap-update-ns} \
+		"${S}/"{cmd/snap-discard-ns/snap-discard-ns,cmd/snap-gdb-shim/snap-gdb-shim,cmd/snap-mgmt/snap-mgmt} \
+		"${S}/data/completion/bash/"{complete.sh,etelpmoc.sh,}
+
+	dobashcomp "${S}/data/completion/bash/snap"
+
+	insinto /usr/share/zsh/site-functions
+	doins "${S}/data/completion/zsh/_snap"
+
+	insinto "/usr/share/polkit-1/actions"
+	doins "${S}/data/polkit/io.snapcraft.snapd.policy"
+
+	dodoc "${S}/packaging/ubuntu-16.04/changelog"
+	domo "${S}/po/"*.mo
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+	xdg_desktop_database_update
+
+	if use apparmor && [[ -z ${ROOT} && -e /sys/kernel/security/apparmor/profiles &&
+		$(wc -l < /sys/kernel/security/apparmor/profiles) -gt 0 ]]; then
+		apparmor_parser -r "${EPREFIX}/etc/apparmor.d/usr.lib.snapd.snap-confine.real"
+	fi
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 6fe56a1b1df1..cb3b7dfdd188 100644
Binary files a/app-crypt/Manifest.gz and b/app-crypt/Manifest.gz differ
diff --git a/app-crypt/efitools/Manifest b/app-crypt/efitools/Manifest
index a7ea541655bf..eb5d1d523391 100644
--- a/app-crypt/efitools/Manifest
+++ b/app-crypt/efitools/Manifest
@@ -1,5 +1,8 @@
 AUX 1.7.0-Make.rules.patch 296 BLAKE2B ca12dbe2f0bb60cffcbe2646a99f421e1f7f9d3b9eab0c96481cbbcfe064efc81afb25e8819746051e3f47b325eb97d213b7ebf95df60a195a5d16d68332f42d SHA512 a8d6245b09e80e2c9082589e62c2687234ee7838d19255e07aadfd05ddffdb1817e38eac434e71d5f0e19b7f9a88a51126349ae4aa324a634769050dbf433f0d
 AUX 1.8.1-respect-ar.patch 634 BLAKE2B a75d716b2f16f9c64e0a99fb91eda15a1009cd29576fbaf70d02b6565a6374647e924a964b607832ef122f003871578eff7dfac8b30deaaf292527cf24506b58 SHA512 4bfa8347a5e6965971320fd7fbbb1b8b8a57ac4aa186bf0ee1264190fefc34fee00bf40cec094763ee1d3adfc2c9d121de7832ce735734f442836941d2bd070c
+AUX 1.9.2-Makefile.patch 4250 BLAKE2B f71ed4b638a21d90249ec7e045ff15fa49f315c8accce4bc42154d7fc9d5c3d45c059e2fc4c9980531726f5392bb2746d1fad184a1a791f002e461c6e2c0fc02 SHA512 cd579b1ce5467ecbe0e9b53d2439d32e14669e846bad5fe0116524e1f7d3d9bff34538f3dc7b35fb21d147c870e739f0d9b783aa5f75c1d8e34b6b764ec200dc
+AUX 1.9.2-clang16.patch 2098 BLAKE2B 1d6c58a5908a498d47244e24eb2518d992a8f1de09da32baad510d7db010a548006b00b8a3c21a7517fc433f5a1a75abbc9ee4831759421a93beff3bfbc25c97 SHA512 c74625f804a5cb892047b2fcb0fdf759224680eafb6e6392a9098d19af786b0b7392eeb6cceee0c57684403cd97c350f8880655eb487dbb8f57841086efb5d01
 DIST efitools-1.9.2.tar.gz 116037 BLAKE2B b3540932eb112e362fd0eed47090360603807dcaec8c6a10058618f8252eeb5dcbbd703d313cb6fadae62c1312815080cf2c77fc86f9dfc9f9afca24ad97f584 SHA512 77e0ad7e865814ed388ff6daabe0f4b49ba51672bf2cbb98b7905e209cbd28f9ede2f73213ce45af8a978c1e67dba24ec88a1188661317cc22317b47e575cde8
+EBUILD efitools-1.9.2-r1.ebuild 1121 BLAKE2B 793763cdefe49a5d122b484bee0171069f3108159a00168a4346a1ace69c3bca9fd3278f2ae1a2e7bc476803cb1884e7cb247e4032af2d24f162a4ab713a0f14 SHA512 5d094bc9f5ca6856bc725a436b1be174469f9dcfeaf88dd8ca75fb459245052398be5953614a7dfe543a04e104ad9325eefb374bc7dc007d0d7df45ff2f2ab97
 EBUILD efitools-1.9.2.ebuild 1371 BLAKE2B 3b6365e47baea942517f9a607ada4b332ad1a305bda1a6e160e2a9a86b04b1f622f060ec34a0f296138c9b312bc984155c6103eb9f953389d0021c0ed742a78e SHA512 b5509e5b8bc324d493d47d62685be8079ed940da0ed27ced73644351a57d4ec17df0b6247dffea03dd675a9c1202f89104c8625f0de8a126fcadae5972faaf23
 MISC metadata.xml 218 BLAKE2B e650ab1b6c50b385efc18a924f5382ef66cd5669e4c138270215328e5b595a45b519dc48925a76e824ba834e159865adbb131c0b7e166c2ffaf91d3c63b76163 SHA512 79219cfff4bf8680335548005e5f1f64270e1dcbabb2700b033e355fa65f0a5aefb0eaec20fbe231fc4525a7511693b84c0d957452fc9aa39e4ab31a1e1e56eb
diff --git a/app-crypt/efitools/efitools-1.9.2-r1.ebuild b/app-crypt/efitools/efitools-1.9.2-r1.ebuild
new file mode 100644
index 000000000000..ae06bba83d82
--- /dev/null
+++ b/app-crypt/efitools/efitools-1.9.2-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="Tools for manipulating UEFI secure boot platforms"
+HOMEPAGE="https://git.kernel.org/cgit/linux/kernel/git/jejb/efitools.git"
+SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/jejb/efitools.git/snapshot/${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="static"
+
+LIB_DEPEND="dev-libs/openssl:=[static-libs(+)]"
+
+RDEPEND="
+	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
+	sys-apps/util-linux"
+DEPEND="${RDEPEND}
+	static? ( ${LIB_DEPEND} )
+	sys-boot/gnu-efi"
+BDEPEND="
+	app-crypt/sbsigntools
+	dev-perl/File-Slurp
+	sys-apps/help2man
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/1.9.2-clang16.patch
+	"${FILESDIR}"/1.9.2-Makefile.patch
+)
+
+src_prepare() {
+	default
+
+	# Let it build with clang
+	if tc-is-clang; then
+		sed -i -e 's/-fno-toplevel-reorder//g' Make.rules || die
+	fi
+
+	if use static; then
+		append-ldflags -static
+		export STATIC_FLAG=--static
+	fi
+}
+
+src_configure() {
+	tc-export AR CC LD NM OBJCOPY PKG_CONFIG
+}
diff --git a/app-crypt/efitools/files/1.9.2-Makefile.patch b/app-crypt/efitools/files/1.9.2-Makefile.patch
new file mode 100644
index 000000000000..e8e99b1858a5
--- /dev/null
+++ b/app-crypt/efitools/files/1.9.2-Makefile.patch
@@ -0,0 +1,121 @@
+--- a/Makefile
++++ b/Makefile
+@@ -21,6 +21,8 @@
+ KEYBLACKLISTAUTH = $(ALLKEYS:=-blacklist.auth)
+ KEYHASHBLACKLISTAUTH = $(ALLKEYS:=-hash-blacklist.auth)
+ 
++SSL_LIBS = $(shell $(PKG_CONFIG) $(STATIC_FLAG) --libs libcrypto)
++
+ export TOPDIR	:= $(shell pwd)/
+ 
+ include Make.rules
+@@ -88,31 +90,31 @@
+ ShimReplace.so: lib/lib-efi.a
+ 
+ cert-to-efi-sig-list: cert-to-efi-sig-list.o lib/lib.a
+-	$(CC) $(ARCH3264) -o $@ $< lib/lib.a -lcrypto
++	$(CC) $(LDFLAGS) $(ARCH3264) -o $@ $< lib/lib.a $(SSL_LIBS)
+ 
+ sig-list-to-certs: sig-list-to-certs.o lib/lib.a
+-	$(CC) $(ARCH3264) -o $@ $< lib/lib.a -lcrypto
++	$(CC) $(LDFLAGS) $(ARCH3264) -o $@ $< lib/lib.a $(SSL_LIBS)
+ 
+ sign-efi-sig-list: sign-efi-sig-list.o lib/lib.a
+-	$(CC) $(ARCH3264) -o $@ $< lib/lib.a -lcrypto
++	$(CC) $(LDFLAGS) $(ARCH3264) -o $@ $< lib/lib.a $(SSL_LIBS)
+ 
+ hash-to-efi-sig-list: hash-to-efi-sig-list.o lib/lib.a
+-	$(CC) $(ARCH3264) -o $@ $< lib/lib.a
++	$(CC) $(LDFLAGS) $(ARCH3264) -o $@ $< lib/lib.a
+ 
+ cert-to-efi-hash-list: cert-to-efi-hash-list.o lib/lib.a
+-	$(CC) $(ARCH3264) -o $@ $< lib/lib.a -lcrypto
++	$(CC) $(LDFLAGS) $(ARCH3264) -o $@ $< lib/lib.a $(SSL_LIBS)
+ 
+ efi-keytool: efi-keytool.o lib/lib.a
+-	$(CC) $(ARCH3264) -o $@ $< lib/lib.a
++	$(CC) $(LDFLAGS) $(ARCH3264) -o $@ $< lib/lib.a
+ 
+ efi-readvar: efi-readvar.o lib/lib.a
+-	$(CC) $(ARCH3264) -o $@ $< lib/lib.a -lcrypto
++	$(CC) $(LDFLAGS) $(ARCH3264) -o $@ $< lib/lib.a $(SSL_LIBS)
+ 
+ efi-updatevar: efi-updatevar.o lib/lib.a
+-	$(CC) $(ARCH3264) -o $@ $< lib/lib.a -lcrypto
++	$(CC) $(LDFLAGS) $(ARCH3264) -o $@ $< lib/lib.a $(SSL_LIBS)
+ 
+ flash-var: flash-var.o lib/lib.a
+-	$(CC) $(ARCH3264) -o $@ $< lib/lib.a
++	$(CC) $(LDFLAGS) $(ARCH3264) -o $@ $< lib/lib.a
+ 
+ clean:
+ 	rm -f PK.* KEK.* DB.* $(EFIFILES) $(EFISIGNED) $(BINARIES) *.o *.so
+--- a/Make.rules
++++ b/Make.rules
+@@ -15,8 +15,7 @@
+ endif
+ INCDIR	   = -I$(TOPDIR)include/ -I/usr/include/efi -I/usr/include/efi/$(ARCH) -I/usr/include/efi/protocol
+ CPPFLAGS   = -DCONFIG_$(ARCH)
+-CFLAGS	   = -O2 -g $(ARCH3264) -fpic -Wall -fshort-wchar -fno-strict-aliasing -fno-merge-constants -fno-stack-protector -ffreestanding -fno-stack-check
+-LDFLAGS	   = -nostdlib
++CFLAGS +=  $(ARCH3264) -fpic -Wall -fshort-wchar -fno-strict-aliasing -fno-merge-constants -fno-stack-protector -ffreestanding -fno-stack-check
+ CRTOBJ		= crt0-efi-$(ARCH).o
+ CRTPATHS	= /lib /lib64 /lib/efi /lib64/efi /usr/lib /usr/lib64 /usr/lib/efi /usr/lib64/efi /usr/lib/gnuefi /usr/lib64/gnuefi
+ CRTPATH		= $(shell for f in $(CRTPATHS); do if [ -e $$f/$(CRTOBJ) ]; then echo $$f; break; fi; done)
+@@ -24,10 +23,9 @@
+ # there's a bug in the gnu tools ... the .reloc section has to be
+ # aligned otherwise the file alignment gets screwed up
+ LDSCRIPT	= elf_$(ARCH)_efi.lds
+-LDFLAGS		+= -shared -Bsymbolic $(CRTOBJS) -L $(CRTPATH) -L /usr/lib -L /usr/lib64 -T $(LDSCRIPT)
++LIBS		+= -nostdlib -shared -Bsymbolic $(CRTOBJS) -L $(CRTPATH) -T $(LDSCRIPT)
+ LOADLIBES	= -lefi -lgnuefi $(shell $(CC) $(ARCH3264) -print-libgcc-file-name)
+ FORMAT		= --target=efi-app-$(ARCH)
+-OBJCOPY		= objcopy
+ MYGUID		= 11111111-2222-3333-4444-123456789abc
+ INSTALL		= install
+ BINDIR		= $(DESTDIR)/usr/bin
+@@ -47,12 +45,12 @@
+ endif
+ 
+ ifeq ($(ARCH),arm)
+-  LDFLAGS += --defsym=EFI_SUBSYSTEM=0x0a
++  LIBS += --defsym=EFI_SUBSYSTEM=0x0a
+   FORMAT = -O binary
+ endif
+ 
+ ifeq ($(ARCH),aarch64)
+-  LDFLAGS += --defsym=EFI_SUBSYSTEM=0x0a
++  LIBS += --defsym=EFI_SUBSYSTEM=0x0a
+   FORMAT = -O binary
+ endif
+ 
+@@ -61,9 +59,9 @@
+ 		   -j .rel -j .rela -j .rel.* -j .rela.* -j .rel* -j .rela* \
+ 		   -j .reloc $(FORMAT) $*.so $@
+ %.so: %.o
+-	$(LD) $(LDFLAGS) $^ -o $@ $(LOADLIBES)
++	$(LD) $(LIBS) $^ -o $@ $(LOADLIBES)
+ 	# check we have no undefined symbols
+-	nm -D $@ | grep ' U ' && exit 1 || exit 0
++	$(NM) -D $@ | grep ' U ' && exit 1 || exit 0
+ 
+ %.h: %.auth
+ 	./xxdi.pl $< > $@
+@@ -71,7 +69,7 @@
+ %.hash: %.efi hash-to-efi-sig-list
+ 	./hash-to-efi-sig-list $< $@
+ 
+-%-blacklist.esl: %.crt cert-to-efi-hash-list
++%-blacklist.esl: %.crt cert-to-efi-sig-list
+ 	./cert-to-efi-sig-list $< $@
+ 
+ %-hash-blacklist.esl: %.crt cert-to-efi-hash-list
+@@ -129,7 +127,7 @@
+ #	sbsign --key KEK.key --cert KEK.crt --output $@ $<
+ 
+ %.a:
+-	ar rcv $@ $^
++	$(AR) rcv $@ $^
+ 
+ doc/%.1: doc/%.1.in %
+ 	$(HELP2MAN) --no-info -i $< -o $@ ./$*
diff --git a/app-crypt/efitools/files/1.9.2-clang16.patch b/app-crypt/efitools/files/1.9.2-clang16.patch
new file mode 100644
index 000000000000..944a731bcde8
--- /dev/null
+++ b/app-crypt/efitools/files/1.9.2-clang16.patch
@@ -0,0 +1,108 @@
+--- a/cert-to-efi-sig-list.c
++++ b/cert-to-efi-sig-list.c
+@@ -6,7 +6,6 @@
+ 
+ 
+ #include <stdint.h>
+-#define __STDC_VERSION__ 199901L
+ #include <efi.h>
+ #ifdef CONFIG_arm
+ /* FIXME:
+--- a/efi-keytool.c
++++ b/efi-keytool.c
+@@ -15,7 +15,6 @@
+ #include <fcntl.h>
+ #include <unistd.h>
+ 
+-#define __STDC_VERSION__ 199901L
+ #include <efi.h>
+ 
+ #include <kernel_efivars.h>
+--- a/efi-readvar.c
++++ b/efi-readvar.c
+@@ -17,7 +17,6 @@
+ 
+ #include <openssl/x509.h>
+ 
+-#define __STDC_VERSION__ 199901L
+ #include <efi.h>
+ 
+ #include <kernel_efivars.h>
+--- a/efi-updatevar.c
++++ b/efi-updatevar.c
+@@ -20,7 +20,6 @@
+ #include <openssl/err.h>
+ #include <openssl/pem.h>
+ 
+-#define __STDC_VERSION__ 199901L
+ #include <efi.h>
+ 
+ #include <kernel_efivars.h>
+--- a/flash-var.c
++++ b/flash-var.c
+@@ -1,3 +1,5 @@
++#define _XOPEN_SOURCE 700
++
+ #include <stdlib.h>
+ #include <stdint.h>
+ #include <sys/types.h>
+@@ -10,7 +12,6 @@
+ #include <fcntl.h>
+ #include <unistd.h>
+ 
+-#define __STDC_VERSION__ 199901L
+ #include <efi.h>
+ 
+ #include <version.h>
+--- a/hash-to-efi-sig-list.c
++++ b/hash-to-efi-sig-list.c
+@@ -4,7 +4,6 @@
+  * see COPYING file
+  */
+ #include <stdint.h>
+-#define __STDC_VERSION__ 199901L
+ #include <efi.h>
+ #ifdef CONFIG_arm
+ /* FIXME:
+--- a/include/variableformat.h
++++ b/include/variableformat.h
+@@ -109,7 +109,7 @@
+ 
+ #pragma pack()
+ 
+-inline BOOLEAN
++static inline BOOLEAN
+ IsValidVariableHeader (VARIABLE_HEADER   *vh) {
+ 	if (vh == NULL || vh->StartId != VARIABLE_DATA)
+ 		return FALSE;
+--- a/lib/kernel_efivars.c
++++ b/lib/kernel_efivars.c
+@@ -16,7 +16,6 @@
+ #include <unistd.h>
+ #include <time.h>
+ 
+-#define __STDC_VERSION__ 199901L
+ #include <efi.h>
+ 
+ #include <kernel_efivars.h>
+--- a/sig-list-to-certs.c
++++ b/sig-list-to-certs.c
+@@ -4,7 +4,6 @@
+  * see COPYING file
+  */
+ #include <stdint.h>
+-#define __STDC_VERSION__ 199901L
+ #include <efi.h>
+ #ifdef CONFIG_arm
+ /* FIXME:
+--- a/sign-efi-sig-list.c
++++ b/sign-efi-sig-list.c
+@@ -4,7 +4,7 @@
+  * see COPYING file
+  */
+ #include <stdint.h>
+-#define __STDC_VERSION__ 199901L
++#define _XOPEN_SOURCE 700
+ #include <efi.h>
+ #ifdef CONFIG_arm
+ /* FIXME:
diff --git a/app-crypt/swtpm/Manifest b/app-crypt/swtpm/Manifest
index ebff88e5c0d4..122957c50d80 100644
--- a/app-crypt/swtpm/Manifest
+++ b/app-crypt/swtpm/Manifest
@@ -2,5 +2,5 @@ AUX swtpm-0.5.0-build-sys-Remove-WError.patch 431 BLAKE2B 8b0d63dcab783a322c72aa
 AUX swtpm-0.6.0-fix-localca-path.patch 1321 BLAKE2B 06d9e7409dda7554bd819a822e2ec4e3e1b8b0a9a41bcb4c45705e082b887d4739d7bd23481dd0c528f957b78e1c84d0e33a0e8b211ee2266018c79014b83afa SHA512 c90c438ad805db4310b2fd2b8c985f86c30e4010f08be9cae2de65d8ba4c4c65df8f80eb62636b30b2cc1d5df3ebc4a225bc32f77434d603aa71ee917560d5c8
 AUX swtpm-0.7.2-Conditionalize-test-dependencies.patch 1065 BLAKE2B 359cf6e692691317255d8c456abee7fe59a5370bf94f0bdd37ee6bb16ceb80340939f3f0a348398c6c93177690f4e2dc141d2b6c9f12319586c5a850dec2cd5c SHA512 8a2731b9d9c49fa2a8ea2732b20dbbd7264b1c93b00848e67f83e5d54f8ed150e97ff940422ccf46de21ae8d81fbf951314b3908ef0377d8548adebc4872474f
 DIST swtpm-0.7.3.tar.gz 354088 BLAKE2B 687e3161cbc08be68427648187ba2fb05749bcaaf9929b951eea4884bd4210c6105a2494f5e7d51915e5be1b700b13889cd83c96d22e00d621ea9336221ee67b SHA512 7f4cdf7ca2539f28e3a78e2a081b24983f3305905c7cafcac0957b14f5c06c8ee9485a0adaf3710561091f9ee85e00822fe1ff874389808218c1e17f938c45d9
-EBUILD swtpm-0.7.3.ebuild 1415 BLAKE2B 01736a7c1752b98cb3c02f6e001d3b571d3e192ad4a9e7ee7758ccad2849dbc5e7ed788b364ec35c88cf1e9fd42a9fbc333c8d345980712a21127e1cee2e6d6a SHA512 4d0a0f890693078324b6a73358a69a3c7b2b2a7477ec4b0d5e543517336818f4d56069fa2ecca09102dafab7f6f5d383218840e3d93bc8677b33c61b32fba303
+EBUILD swtpm-0.7.3.ebuild 1418 BLAKE2B 783b60d93e4cb092df4c5f1c84a92823cdfe7f2514a90c9a2df8343fbcaf905b509135066d4308cde146d09873fb6f29db3bc5c4fdccdddc6b49e6fd84c1d548 SHA512 9265e6c401c593273e7f7716e345e259bf41dc47cbc6f8e4e323c6bc18f3ebb88040a985cff200124d4355b2a21f2a85756b438bbbe8219d548b7c710835b274
 MISC metadata.xml 634 BLAKE2B dd82ee76167fca29b65bb4f334c2b7c50c41073485fef6592702a13c35e0e4dde0d575f8d65ba159dabd23da73646fba08412572136db195877bfb4a719a1de7 SHA512 fb676807f792f073fc93ad8509dff08c3b5bb0eddb82fdc30285a9bf7994f17b4deb896e27c99459b1cd74a113ff966de4b93fe526901740263095b78a40ce7f
diff --git a/app-crypt/swtpm/swtpm-0.7.3.ebuild b/app-crypt/swtpm/swtpm-0.7.3.ebuild
index cc9d50f697be..52b78e67c85c 100644
--- a/app-crypt/swtpm/swtpm-0.7.3.ebuild
+++ b/app-crypt/swtpm/swtpm-0.7.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8,9,10} )
+PYTHON_COMPAT=( python3_{8,9,10,11} )
 
 inherit autotools python-any-r1
 
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index c010852d714d..d9b055b385c5 100644
Binary files a/app-editors/Manifest.gz and b/app-editors/Manifest.gz differ
diff --git a/app-editors/jed/Manifest b/app-editors/jed/Manifest
index 9cf3797d7318..5d67b3f517e5 100644
--- a/app-editors/jed/Manifest
+++ b/app-editors/jed/Manifest
@@ -1,3 +1,3 @@
 DIST jed-0.99-19.tar.bz2 884198 BLAKE2B c3d967e59b909a39d0f7fb49c8ce9aef70585ba433bc5c6bebf5db1b6b88de0c41b35059a242a38be91a97a5296a279bdc85ac30ec9d4ae221d94e50e41d8995 SHA512 db8a30284f9b8e3e2c5d1a600eeb7af29c9f943a5c23d7c74fce926e0b0252f54805e214670e7c9357ce0e6918ad67cba2769a523979bfbd285328f94fff747c
 EBUILD jed-0.99.19-r1.ebuild 1131 BLAKE2B c2211e282620cb6a4dc5f05b65845a70542b7e0f52fad77f0060da4cee397e5336f936d0b1587dfef61208a8322ad19db97bde93c283cc4dccdc4fa77631762a SHA512 6f2063478254b5b791bae4895729863c50346e6a602cc8c32b3da01deb01decd28803349881e6da8181d6a1210305b98d5b6dc70fb240b02efb2be06bd0f8b4c
-MISC metadata.xml 615 BLAKE2B f26ae867521f97be0393d7694e42f2ba62d969372a829bd6c6a3ce21d1032e67e152f303b87dd1d2c9e84b946a6fa885b98c7360d569047018074ee8de64a1b3 SHA512 f2342ba6899557bf419be2b7d4addead56a6f8adefd287eb1e571aaedb5e2640783ca9739a0b85f52462f1d20f0cb4c67fdec0223a388e5de29cf2ddca997a81
+MISC metadata.xml 689 BLAKE2B 3d109174c5544940bfd0c67620df413ceb6b6f25b27346c1a9cf2ad47340b3592c8b6b937d37a95c134788afe727fbfce767b775e0af72df2982957eb2248c96 SHA512 0589fd546a22e0822cc00dddb1b8ead693c72919c4bb8b17bd7f912dc1b9a2c7b89cc18280041846c8155a94ebd51322b9aeb8427eb4ab020e0659d1c2edd262
diff --git a/app-editors/jed/metadata.xml b/app-editors/jed/metadata.xml
index aff74631c869..a66165354832 100644
--- a/app-editors/jed/metadata.xml
+++ b/app-editors/jed/metadata.xml
@@ -12,4 +12,7 @@
   Jed has a multitude of programming modes and couples with the Slang library
   for powerful extensions.
 </longdescription>
+<upstream>
+  <remote-id type="github">jedsoft/jed</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/app-editors/qhexedit2/Manifest b/app-editors/qhexedit2/Manifest
index b3f676a72b4e..a77fa536a819 100644
--- a/app-editors/qhexedit2/Manifest
+++ b/app-editors/qhexedit2/Manifest
@@ -2,11 +2,6 @@ AUX qhexedit2-0.8.4-setup.py.patch 596 BLAKE2B 15a801d87d9f690aa354162cb4966b1b6
 AUX qhexedit2-0.8.6-sip.patch 1134 BLAKE2B a64403e077b388f7c95ec5feada3d07e7e027732cd03ae9703fba43bcbc96bb434ea6bf2b8050620404fc7129850fe6affa5bed44a8b22000f7adee782f5683f SHA512 23143fbc94ec2eab8c89b41ff1e1a7e432828881c337e3cd56c3f84ed9639f1c2aea76c4826ac318956cc672d4b770d22613f45c6f4473bf25ad2469b680a71b
 AUX qhexedit2-0.8.6-sip5.patch 2295 BLAKE2B 8a689da202adf6169ed34eb7c7fc0c824451f05f5030fa457a7bdef4ec079c8df7b688a91855d7fc98b96f9e112c98e1805233af19b42fbd570eab6ed3fafa33 SHA512 0bc8a18085e9f928026ae852820b5a2cd6f8bea56f6193359d05c439fea3eb71a6baf3cf529d5f8ea95b6d0a1c28a460dedf1430e06f56486be108402c213daf
 AUX qhexedit2-0.8.9-fix-crash.patch 1437 BLAKE2B 8a58e4dc74de1fb5120ea7fc53df92f07d38023dede7bd4e778c7ad1de22ac981269d28fc80c1c61b7a1e448a812b4452b5a9494d486b71ff07e2e1cd07ffa24 SHA512 e8abff741616cbaf842942ff426b7ce6e43e88cd42f5c3ad282b7654ba727cacb2d3eb197656769ff1b9ff9a819a7ef61df594a686b2b339f0b67c8cfc8b55df
-AUX qhexedit2-0.8.9.patch 1135 BLAKE2B fb9c3c9a4fa01b6cba9b3ca12a1a1e82f1503663bb186835b56d2610145bf3c1e211ab31c705d55cc9f3e22312c566058b816c20a4a65c7d7a501bd05db3fb8f SHA512 934bd0422b539459b446fc6ea18806f9fe6f6e107822dc4a94150632fdef35b091ca309cb0a5b7eb96c325c4d71091314c89907ce6c6404e0a6d8ebd126c58c3
-DIST qhexedit2-0.8.6_p20190316.tar.gz 355512 BLAKE2B a7edc8d05a7788f3a3f2202762ca3dc436cafbde1b1216ff1bb342055600a2e9d53c27fe324380331b8182904545c698106129238065cd2416d244fdfa176446 SHA512 4ef288c8a220c308d38c41fee83fe962e213cdfa448445ef73c3d2fe1952b68f2096732e78d2aa0a87eddd3cf2f47bed3e77807e12d2b7616c1447b3bf1b0e7d
 DIST qhexedit2-0.8.9_p20210525.tar.gz 342178 BLAKE2B baffe5b5e1130476162f23a91420cc86675a162c39539c9f07685cecc82571817625202814006221f96b56e94c0325fd7a6d8f2294041b426054f809c9967bad SHA512 d8a5159433a1212085371473cc7a89c4888c6af6b1416a34e3ea9d1ef9ae19411af32bea2e2fb256a024d6f2d05c733d285314cfc17f37dae065d7407a9c0d2c
-EBUILD qhexedit2-0.8.6_p20190316-r2.ebuild 2284 BLAKE2B 0a3e943b1b04852de5e72c1ae34f4767ab04ac29c4e18e54148ea39201e367116fb99987b3d12228518b4f2013a37c29121a671c6decd32c24b0bd96cd1a9dc8 SHA512 4aca967f831c7774618f8e596e7b13b160e975b66ef23d4a1a9733a8fd6db0860ede6a1fb0b89d06270dcdcfda7bd7cd378fe9845a0632da5d7814eb3f2d3d3f
-EBUILD qhexedit2-0.8.6_p20190316.ebuild 1878 BLAKE2B deb3b0b20fd1681443e3e05fec6d35006966f94613e6397940f08220db939b5240924929aaa6095670c590f9bebdd6857a517b45855fb1f7081202248e3abe63 SHA512 1722f81744db0e01ed78ca3f2ae664510fd11a5fc42db897a8bf2defd8f432a0c06470e19a70b365b6c31f625f7b793d45d131c089b3368a13ef6b549694930a
 EBUILD qhexedit2-0.8.9_p20210525-r2.ebuild 2370 BLAKE2B fdf16a540f1585f8ed620a5f209e6594a0f6ff2993a2c9503e4959a798cb4f3c8952345c14957e7551b4e6d1109b76910240f13c1faa3f07cf78dac1d1e9db18 SHA512 783dd4e2ee8e6b9e2f1ec47e22e64a80003bfa73e0c024e6f1e1ff8c7c0b443b3016372cf37dd5d6f56ec18d3f5dce4381f280d84769f74030c19eb80532bb47
-EBUILD qhexedit2-0.8.9_p20210525.ebuild 1671 BLAKE2B e36e973b9137abda5736e5e9eba1c5f0a2396651315e86c4b6f91f499d5ccbcb2b64e9c552fc88503d62f8d28cdbbd80056680da8876b6e0a3cecfa17da68848 SHA512 d941ac5d83ccb9e1bee51a64397bb749416df4d7a363f88bf36c8108f565eee6d9399f3dc58266aeea0921137b8f8d4445041ce233ae154dba342b6c26dd0d26
 MISC metadata.xml 877 BLAKE2B f7343c25b4643b468d75938b4af93a8e52e10ebb1bc774c3caada33d202d0ea938789bc9400584fc78098b05c7a029c9be781f37302ac8edf7cae40659f6d9a9 SHA512 897f7435ec755c6689192e762172fc02a10ea043d7ba2662eb88dd7db4856dbe82e95c3b7fed890ee6dd2f8b11a3dd77e25af4ec56b69cb7191c5805b31371b3
diff --git a/app-editors/qhexedit2/files/qhexedit2-0.8.9.patch b/app-editors/qhexedit2/files/qhexedit2-0.8.9.patch
deleted file mode 100644
index cabbd77ac843..000000000000
--- a/app-editors/qhexedit2/files/qhexedit2-0.8.9.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git a/setup.py b/setup.py
-index 1a0d912..646c359 100644
---- a/setup.py
-+++ b/setup.py
-@@ -98,7 +98,7 @@ if cfg.qt_framework:
-                                       lib + ".framework", "Headers")]
- else:
-     if PyQt_Version == 'PyQt5':
--        for qt_inc_dir in ('/usr/include/qt', '/usr/include/x86_64-linux-gnu/qt5'):
-+        for qt_inc_dir in ('/usr/include/qt', '/usr/include/qt5'):
-             include_dirs.append(qt_inc_dir)
-             include_dirs += [os.path.join(qt_inc_dir, lib) for lib in qt_libs]
-         libraries = ["Qt5" + lib[2:] for lib in qt_libs]
-diff --git a/src/qhexedit.pro b/src/qhexedit.pro
-index 2a94016..55d7bc2 100644
---- a/src/qhexedit.pro
-+++ b/src/qhexedit.pro
-@@ -23,5 +23,7 @@ Release:TARGET = qhexedit
- Debug:TARGET = qhexeditd
- 
- 
--unix:DESTDIR = /usr/lib
- win32:DESTDIR = ../lib
-+
-+target.path = /usr/lib64
-+INSTALLS += target
-diff --git a/src/qhexedit.sip b/src/qhexedit.sip
-index 082621e..a7ef4e7 100644
---- a/src/qhexedit.sip
-+++ b/src/qhexedit.sip
-@@ -1,4 +1,4 @@
--%Module(name=qhexedit, version=1)
-+%Module(name=qhexedit)
- 
- %Import QtCore/QtCoremod.sip
- %Import QtGui/QtGuimod.sip
diff --git a/app-editors/qhexedit2/qhexedit2-0.8.6_p20190316-r2.ebuild b/app-editors/qhexedit2/qhexedit2-0.8.6_p20190316-r2.ebuild
deleted file mode 100644
index 094aed04481c..000000000000
--- a/app-editors/qhexedit2/qhexedit2-0.8.6_p20190316-r2.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit python-r1 qmake-utils
-
-EGIT_COMMIT="ba5af8616b3a6c916e718914225a483267c01356"
-DESCRIPTION="Hex editor library, Qt application written in C++ with Python bindings"
-HOMEPAGE="https://github.com/lancos/qhexedit2/"
-SRC_URI="https://github.com/lancos/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
-IUSE="doc +gui python"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.8.4-setup.py.patch"
-	"${FILESDIR}/${PN}-0.8.6-sip5.patch" #820473
-)
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			>=dev-python/PyQt5-5.15.6[gui,widgets,${PYTHON_USEDEP}]
-		')
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	python? (
-		$(python_gen_cond_dep '
-			>=dev-python/PyQt-builder-1.10[${PYTHON_USEDEP}]
-			>=dev-python/sip-5:=[${PYTHON_USEDEP}]
-		')
-	)
-"
-
-S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
-
-src_prepare() {
-	default
-	sed -i -e '/^unix:DESTDIR/ d' -e "\$atarget.path = /usr/$(get_libdir)" \
-		-e "\$aINSTALLS += target" src/qhexedit.pro \
-		|| die "src/qhexedit.pro: sed failed"
-}
-
-src_configure() {
-	eqmake5 src/qhexedit.pro
-	if use gui; then
-		cd example || die "can't cd example"
-		eqmake5 qhexedit.pro
-	fi
-}
-
-src_compile() {
-	emake
-	use gui && emake -C example
-	if use python; then
-		export PATH="$(qt5_get_bindir):${PATH}"
-		python_build() {
-			pushd "${S}" || die
-			sip-build || die
-			popd || die
-		}
-		python_foreach_impl run_in_build_dir python_build
-	fi
-}
-
-src_test() {
-	cd test || die "can't cd test"
-	mkdir logs || die "can't create logs dir"
-	eqmake5 chunks.pro
-	emake
-	./chunks || die "test run failed"
-	grep -q "^NOK" logs/Summary.log && die "test failed"
-}
-
-src_install() {
-	doheader src/*.h
-	dolib.so libqhexedit.so*
-	if use python; then
-		python_install() {
-			pushd "${S}"/build || die
-			emake INSTALL_ROOT="${D}" install
-			popd || die
-		}
-		python_foreach_impl run_in_build_dir python_install
-	fi
-	if use gui; then
-		dobin example/qhexedit
-		insinto /usr/share/${PN}/
-		doins example/translations/*.qm
-	fi
-	if use doc; then
-		dodoc -r doc/html
-		dodoc doc/release.txt
-	fi
-}
diff --git a/app-editors/qhexedit2/qhexedit2-0.8.6_p20190316.ebuild b/app-editors/qhexedit2/qhexedit2-0.8.6_p20190316.ebuild
deleted file mode 100644
index c5e05a60e67c..000000000000
--- a/app-editors/qhexedit2/qhexedit2-0.8.6_p20190316.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-DISTUTILS_OPTIONAL=1
-
-inherit distutils-r1 qmake-utils
-
-EGIT_COMMIT="ba5af8616b3a6c916e718914225a483267c01356"
-DESCRIPTION="Hex editor library, Qt application written in C++ with Python bindings"
-HOMEPAGE="https://github.com/lancos/qhexedit2/"
-SRC_URI="https://github.com/lancos/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-IUSE="doc +gui python"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.8.4-setup.py.patch"
-)
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	python? (
-		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
-		<dev-python/sip-5[${PYTHON_USEDEP}]
-		${PYTHON_DEPS}
-		)
-"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
-
-src_prepare() {
-	default
-	sed -i -e '/^unix:DESTDIR/ d' -e "\$atarget.path = /usr/$(get_libdir)" \
-		-e "\$aINSTALLS += target" src/qhexedit.pro \
-		|| die "src/qhexedit.pro: sed failed"
-	use python && distutils-r1_src_prepare
-}
-
-src_configure() {
-	eqmake5 src/qhexedit.pro
-	if use gui; then
-		cd example || die "can't cd example"
-		eqmake5 qhexedit.pro
-	fi
-}
-
-src_compile() {
-	default
-	use python && distutils-r1_src_compile
-	use gui && emake -C example
-}
-
-python_compile() {
-	use python && distutils-r1_python_compile build_ext --library-dirs="${S}"
-}
-
-src_test() {
-	cd test || die "can't cd test"
-	mkdir logs || die "can't create logs dir"
-	eqmake5 chunks.pro
-	emake
-	./chunks || die "test run failed"
-	grep -q "^NOK" logs/Summary.log && die "test failed"
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-	doheader src/*.h
-	use python && distutils-r1_src_install
-	use gui && dobin example/qhexedit
-	if use doc; then
-		dodoc -r doc/html
-		dodoc doc/release.txt
-	fi
-}
diff --git a/app-editors/qhexedit2/qhexedit2-0.8.9_p20210525.ebuild b/app-editors/qhexedit2/qhexedit2-0.8.9_p20210525.ebuild
deleted file mode 100644
index 0818ddefb0cb..000000000000
--- a/app-editors/qhexedit2/qhexedit2-0.8.9_p20210525.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8,9,10} )
-
-#DISTUTILS_OPTIONAL=1
-#DISTUTILS_USE_PEP517=p
-
-inherit distutils-r1 qmake-utils
-
-EGIT_COMMIT="541139125be034b90b6811a84faa1413e357fd94"
-DESCRIPTION="Hex editor library, Qt application written in C++ with Python bindings"
-HOMEPAGE="https://github.com/Simsys/qhexedit2/"
-SRC_URI="https://github.com/Simsys/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
-IUSE="doc +gui python"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-PATCHES=( "${FILESDIR}/${PN}-0.8.9.patch" )
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	python? (
-		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
-		${PYTHON_DEPS}
-		)
-"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
-
-src_configure() {
-	eqmake5 src/qhexedit.pro
-	if use gui; then
-		cd example || die "can't cd example"
-		eqmake5 qhexedit.pro
-	fi
-}
-
-src_compile() {
-	default
-	use python && distutils-r1_src_compile
-	use gui && emake -C example
-}
-
-python_compile() {
-	use python && distutils-r1_python_compile build_ext
-}
-
-src_test() {
-	cd test || die "can't cd test"
-	mkdir logs || die "can't create logs dir"
-	eqmake5 chunks.pro
-	emake
-	./chunks || die "test run failed"
-	grep -q "^NOK" logs/Summary.log && die "test failed"
-}
-
-src_install() {
-	doheader src/*.h
-	dolib.so libqhexedit.so*
-	use python && distutils-r1_src_install
-	if use gui; then
-		dobin example/qhexedit
-		insinto /usr/share/${PN}/
-		doins example/translations/*.qm
-	fi
-	if use doc; then
-		dodoc -r doc/html
-		dodoc doc/release.txt
-	fi
-}
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index 3c40a5b42f63..99cf14e210df 100644
Binary files a/app-emacs/Manifest.gz and b/app-emacs/Manifest.gz differ
diff --git a/app-emacs/buttercup/Manifest b/app-emacs/buttercup/Manifest
index c0a064feac12..165c841e6a7b 100644
--- a/app-emacs/buttercup/Manifest
+++ b/app-emacs/buttercup/Manifest
@@ -1,5 +1,4 @@
 AUX 50buttercup-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
-AUX buttercup-1.24-properties-equal.patch 1596 BLAKE2B 384adba33517c2f6677e10aac40c5a939914f74a936d7891e52eb4b706d33c0005f1ce63e0ba8b9672fdad403f6ec36e3191246c252c30574c448408ce24a1aa SHA512 a7dfe3a0d9df701b47287afd8718fbe01886870ab0665cfb73ba240b03facae5b1dc53d5e07ac2cbf21823a203e46a038e64025a82d627d2e8a516997bc8e654
 DIST buttercup-1.25.tar.gz 86763 BLAKE2B ccf7ba797517710e66b666cc121766d29886e0e1a8fd5ad63cb8b5fa4ee2d2a0d2644cd413c1095f37b1ba60467c012e507230787e1daaca3e869a4072e61bb4 SHA512 1eb45485fb1de638837da4d97f6043a64e97d167c8c130d9c5ba6ff67a5e0bcae272c8247779ab1c9427668468a3b94e91af07426b5465a7c3f9c54433a0433e
 DIST buttercup-1.26.tar.gz 87554 BLAKE2B ee5d37360b6c9daa8b790f7ea6ae5bf7ff4266b1fcbe913877aefd4ede2e7d6561e48eae533c17c906e19b498d9d127692597ee728bd1fa791430f5f6ab508c8 SHA512 fb491e1db33ffaeca52529630c538040487a7bdf7766faab2c6a1bc39d1060c5bbbb7a259006b741abbec9b9a6911f8390b2513e0a4dddf856b79274ed24307c
 DIST buttercup-1.27.tar.gz 87761 BLAKE2B d372e3285bb80a0005e79142dc95d219a2219959974039083df502ceeec10281aaeaa57f97c8bf45ec1d31b530934faf03b24d2a40e94f09f1cce4a986ae602b SHA512 537c1cc1fc560000537f3894f0917738ab344a4b117eac927b290bc8b5d01b6ad1df1caad63e1f339edc8f4bcaa9cdf483995e2730661481b53dd5e693a33f34
diff --git a/app-emacs/buttercup/files/buttercup-1.24-properties-equal.patch b/app-emacs/buttercup/files/buttercup-1.24-properties-equal.patch
deleted file mode 100644
index 2af36a3560cd..000000000000
--- a/app-emacs/buttercup/files/buttercup-1.24-properties-equal.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 108d2298cc34d906b196178ad955e3dc139e1779 Mon Sep 17 00:00:00 2001
-From: Philipp Stephani <phst@google.com>
-Date: Mon, 6 Dec 2021 15:39:53 +0100
-Subject: [PATCH] Fix property comparisons in unit tests.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Before Emacs 29, ‘equal-including-properties’ should not be used to compare
-propertized strings due to https://debbugs.gnu.org/cgi/bugreport.cgi?bug=6581.
-ERT provides a replacement ‘ert-equal-including-properties’.
----
- tests/test-buttercup.el | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/tests/test-buttercup.el b/tests/test-buttercup.el
-index bda3e6f..4b73b78 100644
---- a/tests/test-buttercup.el
-+++ b/tests/test-buttercup.el
-@@ -1,6 +1,6 @@
- ;;; buttercup-test.el --- Tests for buttercup.el -*-lexical-binding:t-*-
- 
--;; Copyright (C) 2015  Jorgen Schaefer <contact@jorgenschaefer.de>
-+;; Copyright (C) 2015, 2021  Jorgen Schaefer <contact@jorgenschaefer.de>
- 
- ;; This program is free software; you can redistribute it and/or
- ;; modify it under the terms of the GNU General Public License
-@@ -27,6 +27,7 @@
- (require 'autoload)
- (require 'ansi-color)
- (require 'ert)
-+(require 'ert-x)
- (require 'cl-lib)
- (require 'imenu)
- 
-@@ -1117,7 +1118,7 @@ text properties using `ansi-color-apply'."
- ;;;;;;;;;;;;;
- ;;; Reporters
- (buttercup-define-matcher-for-binary-function
--    :to-equal-including-properties equal-including-properties)
-+    :to-equal-including-properties ert-equal-including-properties)
- 
- (describe "The batch reporters"
-   :var (print-buffer)
diff --git a/app-emacs/editorconfig-emacs/Manifest b/app-emacs/editorconfig-emacs/Manifest
index e18aadd062a0..c5bc04672393 100644
--- a/app-emacs/editorconfig-emacs/Manifest
+++ b/app-emacs/editorconfig-emacs/Manifest
@@ -1,6 +1,8 @@
 AUX 50editorconfig-emacs-gentoo.el 436 BLAKE2B 3472733b5554060e3067ac6b4efdfcfb2061c4d94b07379cf73006e81213ce0c2441018354cdc05a9fa6f2d9e9b8b86faf863ec499707c32a31dcfdb9c71ab1f SHA512 d118b13c8ccfcb8e50274db3edd69c2aa392f4012d426a37183adf0eb5efc1b041bd7379a03ff19691f85c41c3c822580d9affa62820ce7284c25dcd164e2d3f
 DIST editorconfig-emacs-0.7.8.tar.gz 28250 BLAKE2B 8c09b7e495ff38d4276cdbaf60109f91b3e32215f2c6a8aceffd80a02cf024d79eac1739b3f2efa3697b78804da32d0cc2969db628d1064a0fb1db1b059a191d SHA512 21815a5a778ffef68b5205e409aa827c1bd6c9a8c542647ebec889a9f00f5b3f71e3a2072bc2f0373e8ce30c1bb57f5f6350953a3c149742a8e2e46ca9846c9a
 DIST editorconfig-emacs-0.8.2.tar.gz 39675 BLAKE2B a2a9641185a00c2908715b59a7e4429008f7587e00552ebc19f6cc38b6a10423c26a25557b887caaddc47d9c136fdec82476ef916e18c06b8228925b4554428b SHA512 6934418fd7890c49d8df7cdac1a0afe066e07ddf6274f674a4624dca47de278a78778f25beca793cdb537852beb7c8df5ea46743fb0bc753acccbb9974448e18
+DIST editorconfig-emacs-0.9.0.tar.gz 39891 BLAKE2B 68a0e397e1fcb83478092b72cde32bff78fb585f38064b218e0e5e31ded617604eefa42cd8d1432562d72e26533f8d8179ccc58cd8adaa1794769ce72416132f SHA512 5a201c7de2a74051a0cc428ad8c9eab85a1e5ae0ab9258cffe1764d00d03933a776e623e7e25c9110e9a726b40266a0588977c3cd4f7edb845145ed67e0e546d
 EBUILD editorconfig-emacs-0.7.8-r3.ebuild 643 BLAKE2B 208c992003325e6032e9e0e4fb8d5a809525fb47df3ce9230ca06e0ded7a1f3d2f784665d523d2f04e9bf68af17c3832c23b99d3e4bf20f243922881a7d623c2 SHA512 a723535a6344b20ade6cc9642c96075abcd6e596f1683231f5b5b436fe3cb611e1dc3ba5c132c4acc70a28c4303ed54c05db48709cd76138113f4e5c955aa10b
 EBUILD editorconfig-emacs-0.8.2-r2.ebuild 643 BLAKE2B cd8b1c3edf7fb93e11d195423f0e8a88ed62973d9233fa202f79737a41f2c8b57490d38d05b44f60abcc87f8b1d6a760356ff5be0921707e034e794f5b085b02 SHA512 9147e98b5153d9965a66b67107f1891c9de1994673607dae4b1bb430715ff6db927b2a29ad487223beef5873e59a5478dc990ebc3db17ebf6069821beb1de437
+EBUILD editorconfig-emacs-0.9.0.ebuild 659 BLAKE2B 2642e922451e0c4f77b0acac44ba75b40a1d9a7d8894282e36c5054e48a94fa8117132c545de26ef9c15e1e2dc1e7cd6ff6e9e8785625f4a1177badc1b12dc49 SHA512 4d43fab43f633fb5c36d7fe881dd78ad727ca1c6a3f025650ed9f55e9f3fe1543bca292db41f8af8475fb85f7c99470a0cc684fd916690e96271dbe804e140e6
 MISC metadata.xml 461 BLAKE2B e8415c92944d44ef9186b4882d7a5b912ccc16f224da3faef90b43ee8077e94496234341b80eaaf20a17118ebe6f8e8b0cfb70910c948a3ef5a8f853a02cba22 SHA512 a679c75eda6a98c3810b3fc1982ed8c7ff9349a63541eaf3c2b5dfdfec4d1a97f7c540d6b6442511c2645aed46e4b6d346f01ed952a51eb12d076aab8d29351f
diff --git a/app-emacs/editorconfig-emacs/editorconfig-emacs-0.9.0.ebuild b/app-emacs/editorconfig-emacs/editorconfig-emacs-0.9.0.ebuild
new file mode 100644
index 000000000000..d58236571e60
--- /dev/null
+++ b/app-emacs/editorconfig-emacs/editorconfig-emacs-0.9.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp readme.gentoo-r1
+
+DESCRIPTION="EditorConfig plugin for emacs"
+HOMEPAGE="https://github.com/editorconfig/editorconfig-emacs"
+SRC_URI="https://github.com/editorconfig/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="test"	# make test requires a git repo
+
+SITEFILE="50${PN}-gentoo.el"
+DOCS=( CHANGELOG.md README.md )
+DOC_CONTENTS="The EditorConfig feature is not enabled as a site default.
+	Add the following line to your ~/.emacs file to activate it:
+	\n\t(editorconfig-mode 1)"
diff --git a/app-emacs/systemd-mode/Manifest b/app-emacs/systemd-mode/Manifest
new file mode 100644
index 000000000000..88ce1b4bed7f
--- /dev/null
+++ b/app-emacs/systemd-mode/Manifest
@@ -0,0 +1,5 @@
+AUX 50systemd-mode-gentoo.el 76 BLAKE2B 1ccdda0e583af91bead6b672c59f163a80e96e624911ca843745c9b9709cbbe1f05e7ee6154136c8b1f3cd99ca94e5fafaf643ab2163d775d6e1d3393bcf4f91 SHA512 3e7e9d8c790dcb4fba7e0c125f1fc08d6e05c1822cb3c5ef686466cd2fdfb1a9cda7910400b0844743f57f1720bc25d50692e714dadac18fc98bf9ea583685e3
+AUX systemd-mode-1.6-directive-txt-files.patch 1136 BLAKE2B b6ee41752eb8e89efd4f7afaedab82c80e06997ab19e46c7e655f8f95c8eedd4138ed114981df6c4aa91f132f6565947c6758609aeea04103cd65bd8cbb4fb8a SHA512 a7e98036a72dae4074ddf4a6f633fc23f59da4166a914d3f04f4f5f25980bda068c19299f41d4ad63df6d9c7404d29a516faeffe1a58aa9cfe95aa4bcb22ea76
+DIST systemd-mode-1.6.tar.gz 21986 BLAKE2B 05278d86a6df9b5e95c75c1d1ebee182653f760e12639d4a260cf757fee3236988d5f8de671fe9a4724bc0338e08d6f10c405a1d42691f5d83c0efdc516da178 SHA512 2461e07287c1dbe5990eaae83484e98f4e8f2e89ece4b2f5f53f3c9174fc20a0cdf2e930c356bfb6a84587595d66ac353f4f85b5a96507c5344a615d4516f646
+EBUILD systemd-mode-1.6.ebuild 758 BLAKE2B 0fd88b05490996b40e8efefd61767ec470f92acd6b20f25bb14ee8810e4206003e3293ff93b508995e03053eabefb38d95ecb0af6a2e91129c2e1807281508c6 SHA512 415141ba36c36437e686220d381e4b61cded29aa845bd475474521c0d6302a4e961cd00af928e984c884a7b1852fbca92649085ab8c16cb57858a8b17473b194
+MISC metadata.xml 433 BLAKE2B b4f99c28f3470ec8e7c0dd9f074a94eddaf30e231ca31fbf23cbde0723bd5384c9fec863af1061a210134010053b74e996ae959a57c6cd16ce825216b2bc41fb SHA512 bd8c6d7fcd7edd34e2d18a7a4c3678ba44444a8789d62a52992b4996c907e65a7da2316fe13d98e2cf98e6271e6af89d5b586f71e3094aeebff46c54ef86f4d5
diff --git a/app-emacs/systemd-mode/files/50systemd-mode-gentoo.el b/app-emacs/systemd-mode/files/50systemd-mode-gentoo.el
new file mode 100644
index 000000000000..01b8ef7e6e34
--- /dev/null
+++ b/app-emacs/systemd-mode/files/50systemd-mode-gentoo.el
@@ -0,0 +1,2 @@
+(add-to-list 'load-path "@SITELISP@")
+(load "systemd-mode-autoloads" nil t)
diff --git a/app-emacs/systemd-mode/files/systemd-mode-1.6-directive-txt-files.patch b/app-emacs/systemd-mode/files/systemd-mode-1.6-directive-txt-files.patch
new file mode 100644
index 000000000000..c85d78a10200
--- /dev/null
+++ b/app-emacs/systemd-mode/files/systemd-mode-1.6-directive-txt-files.patch
@@ -0,0 +1,29 @@
+--- a/systemd.el
++++ b/systemd.el
+@@ -89,7 +89,7 @@
+       (insert-file-contents
+        (let ((f "unit-directives.txt"))
+          (if (null load-file-name) f
+-           (expand-file-name f (file-name-directory load-file-name)))))
++           (expand-file-name f (file-name-directory "@SITEETC@")))))
+       (split-string (buffer-string))))
+   "Configuration directives for systemd.")
+ 
+@@ -105,7 +105,7 @@
+       (insert-file-contents
+        (let ((f "network-directives.txt"))
+          (if (null load-file-name) f
+-           (expand-file-name f (file-name-directory load-file-name)))))
++           (expand-file-name f (file-name-directory "@SITEETC@")))))
+       (split-string (buffer-string))))
+   "Network configuration directives for systemd.")
+ 
+@@ -119,7 +119,7 @@
+       (insert-file-contents
+        (let ((f "nspawn-directives.txt"))
+          (if (null load-file-name) f
+-           (expand-file-name f (file-name-directory load-file-name)))))
++           (expand-file-name f (file-name-directory "@SITEETC@")))))
+       (split-string (buffer-string))))
+   "Namespace container configuration directives for systemd.")
+ 
diff --git a/app-emacs/systemd-mode/metadata.xml b/app-emacs/systemd-mode/metadata.xml
new file mode 100644
index 000000000000..9c2714e05bce
--- /dev/null
+++ b/app-emacs/systemd-mode/metadata.xml
@@ -0,0 +1,13 @@
+<?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>
+    <bugs-to>https://github.com/holomorph/systemd-mode/issues/</bugs-to>
+    <remote-id type="github">holomorph/systemd-mode</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-emacs/systemd-mode/systemd-mode-1.6.ebuild b/app-emacs/systemd-mode/systemd-mode-1.6.ebuild
new file mode 100644
index 000000000000..801fb5effd59
--- /dev/null
+++ b/app-emacs/systemd-mode/systemd-mode-1.6.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=24.4
+
+inherit elisp
+
+DESCRIPTION="Major mode for editing systemd units in GNU Emacs"
+HOMEPAGE="https://github.com/holomorph/systemd-mode/"
+SRC_URI="https://github.com/holomorph/${PN}/archive/v${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+PATCHES=( "${FILESDIR}"/${P}-directive-txt-files.patch )
+
+DOCS=( README )
+SITEFILE="50${PN}-gentoo.el"
+
+src_prepare() {
+	elisp_src_prepare
+
+	sed "s|@SITEETC@|${EPREFIX}${SITEETC}/${PN}|" -i systemd.el || die
+}
+
+src_compile() {
+	elisp_src_compile
+	elisp-make-autoload-file
+}
+
+src_install() {
+	elisp_src_install
+
+	insinto "${SITEETC}/${PN}"
+	doins "${S}"/*.txt
+}
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 9428c307a94a..66c43cf4de4a 100644
Binary files a/app-emulation/Manifest.gz and b/app-emulation/Manifest.gz differ
diff --git a/app-emulation/qemu-guest-agent/Manifest b/app-emulation/qemu-guest-agent/Manifest
index 2cc9c3a50d83..663cf59514df 100644
--- a/app-emulation/qemu-guest-agent/Manifest
+++ b/app-emulation/qemu-guest-agent/Manifest
@@ -6,6 +6,6 @@ AUX qemu-ga.logrotate 128 BLAKE2B 99035fefeccc6334c0cd5ae16e8550a07cfe4256d2374a
 AUX qemu-guest-agent-7.1.0-configure-Avoid-using-strings-binary.patch 2707 BLAKE2B 56a98b8375bdc1ad636044e894a126c1704c27986a74b9088e14fa0e4c672c70d593a265da4efc0e43055d65b447e6adc2b1f03f6186a68ec03ad4b1fe747547 SHA512 6efe0228988bf5d23ad7a60531815b9f5c77886fc26ff65bccf33a0f19b9d6d6993b63327de2630fa802abb0c824b30646871d4cc25d48ee3c492d8b4992f42f
 DIST qemu-6.0.0.tar.xz 107333232 BLAKE2B 7746329d3e13782b7c346ce4052cc517cfc65cd9b2d514d199e4d5b8570ca79566ec04b0c114db2e97c84e68eb551e0d4cdce1b14b91a88fe08d2a5f682c1418 SHA512 ee3ff00aebec4d8891d2ff6dabe4e667e510b2a4fe3f6190aa34673a91ea32dcd2db2e9bf94c2f1bf05aa79788f17cfbbedc6027c0988ea08a92587b79ee05e4
 DIST qemu-7.1.0.tar.xz 121833004 BLAKE2B e05f91ce4993c7591a2df08b5fb017f8b8ec2141ab7bfd55d14730ea6b793ac1091de539992058392a5522d4e58beee92a87752707be58e3619b8213ef9f35bf SHA512 c60c5ff8ec99b7552e485768908920658fdd8035ff7a6fa370fb6881957dc8b7e5f18ff1a8f49bd6aa22909ede2a7c084986d8244f12074ccd33ebe40a0c411f
-EBUILD qemu-guest-agent-6.0.0.ebuild 1674 BLAKE2B bfbdf0f1fcd5b88cef51dfe7a5535c18a8c32aea4c2b1f69a435b96210fd335b385dee9f7c34f078dbd47ca41f3b154e917f9f576f84067033e208c0ce7dde60 SHA512 eec616aac8cd544fa9a57fbbba0887bde037d74152ca1919623d5cdb2498e4122a8494772c7520ddd7844232d5fd9e2e6bc6024c6982e7ae0ad75f0120897d06
-EBUILD qemu-guest-agent-7.1.0.ebuild 1725 BLAKE2B 5c2afd0c0a09e9e70f46f8c0b69abf4de33cc133ee09e8dd7567388ea62b777bd5eec7a408ddf05530f867f767e86ee58bf4b2c2431dee38def2e5b4ea638dc7 SHA512 a8ac266f9cb0d849227bfff4670db3c0087b39203b219428a96bcc8272318b45b6eece95e9b2dc51bdfdae691316eeacfd51a811bbc257f01baf9c17a071500b
+EBUILD qemu-guest-agent-6.0.0.ebuild 1674 BLAKE2B a3e16bd3d7475893320a8a8f6a297df789d60dcce17cf2c8f91401fc0494940d46f96922b62a3e3f002b1e2fce0de99cd2095cfbcc6c9c769a0bc398a9cf453a SHA512 13c311a2fa5a7843f07cd139175c485e8539f38e5a6ab450f561d6b9c06343fcef15262e5d98bd89c0ff5fd41d6f4ca29fd90b76333eeb14847b36e9746609a2
+EBUILD qemu-guest-agent-7.1.0.ebuild 1725 BLAKE2B 1a1432a2b3d71e7d66d720a286b66d0e0f46454ed5fd49a90e6b064ab5fd352f34191d20522d4dc1b1787c4c2a95710c172ad81ad87d18959808d41743c87641 SHA512 dfee19883fcee2634d06703e9adf45b2a89e94360e7295593254669596ab902e39b799aeb764177b85c250c11371cef1db1874f1d102565f05126817193b8b2f
 MISC metadata.xml 696 BLAKE2B 3d5f68defa6dc2b19e1e590edf70849bd20e6d23aa3038be3e482485c7848d61f4c45987416daddaa945f5beb4ba3e89e209e28bc04a7495fb5bbe3f2c82533e SHA512 e1b4844ab6d6b4f2e1dcd3c3fca0bc23218819952a3645f874d55cd63d60cbc35216956431aed09708f257d159b70c6813a400460dfc0e64576f2bdcdb6ef1a9
diff --git a/app-emulation/qemu-guest-agent/qemu-guest-agent-6.0.0.ebuild b/app-emulation/qemu-guest-agent/qemu-guest-agent-6.0.0.ebuild
index 755c49bd5d95..90262e9f632b 100644
--- a/app-emulation/qemu-guest-agent/qemu-guest-agent-6.0.0.ebuild
+++ b/app-emulation/qemu-guest-agent/qemu-guest-agent-6.0.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_COMPAT=( python3_{7..11} )
 
 inherit systemd toolchain-funcs udev python-any-r1
 
diff --git a/app-emulation/qemu-guest-agent/qemu-guest-agent-7.1.0.ebuild b/app-emulation/qemu-guest-agent/qemu-guest-agent-7.1.0.ebuild
index 87c4dbf69d23..2064e3a7dc15 100644
--- a/app-emulation/qemu-guest-agent/qemu-guest-agent-7.1.0.ebuild
+++ b/app-emulation/qemu-guest-agent/qemu-guest-agent-7.1.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit edo systemd toolchain-funcs python-any-r1 udev
 
diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest
index d3d94612bbef..885525fc9e1f 100644
--- a/app-emulation/xen-tools/Manifest
+++ b/app-emulation/xen-tools/Manifest
@@ -27,7 +27,7 @@ DIST xen-gentoo-patches-4.16.1-gentoo-patchset-2.tar.bz2 5403 BLAKE2B 7fa3b4aa12
 DIST xen-upstream-patches-4.15.4-pre-patchset-1.tar.bz2 68066 BLAKE2B ee6aac9aa8988423fd1594fa09c54678ee8d089abfff27913fdbe4f60c1f2a038e06cca5d03924595036bd9ca9be8a7f61ed5d7662e6534b05a45da24c88babd SHA512 65c7c900ca91f7444cdc03fa0902e8d58d68cd755cfa2d16cf1df76b657328e374fec0da3ceb734aefa10cfa874a46de5f731c3827ab4f815b4eabc305ed497f
 DIST xen-upstream-patches-4.16.3-pre-patchset-0.tar.bz2 36580 BLAKE2B 7a16b452fda7cf00321c70c239f30fbff72204d5b021aba23e1e08b2d8dee0f1180a18301b5935f4d35dc54533e2e253f047681b837de187a2a174191a168c3c SHA512 5e7328c8cd7ce98cdff47033a76705395419c1322d5212206aa1255d19aeb2fd3d097e71d39137ab97aeab0b9f991e1660b92a6ddb08f02c9407ceaa24aa9ec0
 EBUILD xen-tools-4.15.3.ebuild 16676 BLAKE2B c29d32c15877a708566b0482700c856ca39f2607767880c725e623357298847aca14f0b112e51c455821bfc2c090fdc6b47b170cfa95b03598fe6c820964677b SHA512 8b20304ee4a260e0d41bbf651271c315c6529a3ff61daf5c160adb1126423ee80abb93adad22b2d62bcd6c27994de3dc219630c4f385f2b1e2e9c6100e44a2d0
-EBUILD xen-tools-4.15.4_pre1.ebuild 16708 BLAKE2B 5ca3ab6dcc4f81db5d976d3d8571cbf400daea07f2572bff19792d772cc12f7731afa5c62e64b664e7afbec08958f83ca7fb7a31ba9289862ea8f55f63d17137 SHA512 b8526eba14b02be9d1dde269335ac302153465c0007ca21e45042ab00bc65e66cc3019ca0b2f2ee3af4b513a4caa0278d386d87a99a834015c337a63d1537c84
+EBUILD xen-tools-4.15.4_pre1.ebuild 16707 BLAKE2B c845719ce59d634f16092f64d2aeaa42021cfd4e0acaf66dd4523ce41c519b88c759cbea2dcbb74fe550d30b210dd1813b541e4b019c6c3b4dcf1b92997dbe4b SHA512 c1ec819b8499b60c34fc071644f10575421b6fe871e5b443a519ec1c94da261073d9dff8449d9aea46831b4b1163e75a9faf4b4f3f697bf0cd9631c75ea1fc3a
 EBUILD xen-tools-4.16.2.ebuild 16190 BLAKE2B 834bdebc9fa33ff472f464f43fcdcd5d79702d0dd2763198e3edcfdb365f91c9cba4fae40f7a7dcefded1cc5f878b86b970d028859d5172bc07c6a495a3b91a5 SHA512 703947a7722cd40f8cbb7e9fffdca6f08c9042302aa179c78360cce7a39a47e118c5c4400a60f3b135f9a1c12922022524b07ecfa4b015507843e5cf2c99484d
 EBUILD xen-tools-4.16.3_pre.ebuild 16197 BLAKE2B 719e5e700675698f26f341960ff3c85e9b9fd6f47d297f3a5ba2eb0f4d465f7cb80fca81b3ac769ee455628efa1b38e860e2046d2b72e29d799480796046ed47 SHA512 2cc290effb5789d470fe1a17571a2bc332414a02aae2c99bfc8ab219555d67f3ffdca85e770b8afb9d2a98c38b5620bba34fa37946da3d37a71e6d7d87224a98
 MISC metadata.xml 1562 BLAKE2B a619e34e6fec4c6ffc00fd098dc040c5bb464ed7f2032db2e933fada0614e82c21269175f37720a123404551474e2aeeb2728b405ff93f9b4d9d092d027e0839 SHA512 f45c793a4b4819f0e50501ddc85acdaf99e4d675530712f8dccfb5166d071ae8ed07917a61d56037d6ba3a54123f72f4512d8c11643ea8c6e507feb9d29594e7
diff --git a/app-emulation/xen-tools/xen-tools-4.15.4_pre1.ebuild b/app-emulation/xen-tools/xen-tools-4.15.4_pre1.ebuild
index fe5976e6e978..f80af4173dba 100644
--- a/app-emulation/xen-tools/xen-tools-4.15.4_pre1.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.15.4_pre1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="git://xenbits.xen.org/${REPO}"
 	S="${WORKDIR}/${REPO}"
 else
-	KEYWORDS="~amd64 ~arm ~arm64 x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 
 	SEABIOS_VER="1.14.0"
 	EDK2_COMMIT="7b4a99be8a39c12d3a7fc4b8db9f0eab4ac688d5"
diff --git a/app-emulation/xen/Manifest b/app-emulation/xen/Manifest
index 0b5e637467ef..1f66430e7b4a 100644
--- a/app-emulation/xen/Manifest
+++ b/app-emulation/xen/Manifest
@@ -6,7 +6,7 @@ DIST xen-gentoo-patches-4.16.1-gentoo-patchset-2.tar.bz2 5403 BLAKE2B 7fa3b4aa12
 DIST xen-upstream-patches-4.15.4-pre-patchset-1.tar.bz2 68066 BLAKE2B ee6aac9aa8988423fd1594fa09c54678ee8d089abfff27913fdbe4f60c1f2a038e06cca5d03924595036bd9ca9be8a7f61ed5d7662e6534b05a45da24c88babd SHA512 65c7c900ca91f7444cdc03fa0902e8d58d68cd755cfa2d16cf1df76b657328e374fec0da3ceb734aefa10cfa874a46de5f731c3827ab4f815b4eabc305ed497f
 DIST xen-upstream-patches-4.16.3-pre-patchset-0.tar.bz2 36580 BLAKE2B 7a16b452fda7cf00321c70c239f30fbff72204d5b021aba23e1e08b2d8dee0f1180a18301b5935f4d35dc54533e2e253f047681b837de187a2a174191a168c3c SHA512 5e7328c8cd7ce98cdff47033a76705395419c1322d5212206aa1255d19aeb2fd3d097e71d39137ab97aeab0b9f991e1660b92a6ddb08f02c9407ceaa24aa9ec0
 EBUILD xen-4.15.3.ebuild 4724 BLAKE2B d8cea46c30edb523780e7e6bcd2bfa0d45e5c3cd025341228aeaa24b8d5f26587f48a18372f3794f1bc635363391c793d77b63c14de574b239e19f74a4f3a17e SHA512 5167e60d83e9765391d6281cef6dab12145e71ed96a3f6f48139ae9e6d823dd1af0c0becd95d80e84a50a3e978416862232996b34213eaeec55544e0c21b57f3
-EBUILD xen-4.15.4_pre1.ebuild 4677 BLAKE2B 2108862c6e5853f99261325ac6924798e40290892d912441b16c2260b1f0219d700ecb6088abc1816b3785d46964b42f5e51470c0383e142f333472a9c3433b7 SHA512 021f850721a82613b84da9a4b70a47ad4366711b338279bf259e6c7a3d668b28b1598d97c24fcff6cc86a0c9cf8ad34c4e4e2f669eab05e7268f59def3a939cd
+EBUILD xen-4.15.4_pre1.ebuild 4676 BLAKE2B bca4039fc0ded4ed79f3fc4a24a261c73f321ec1d765d5afc8014d5fbfc613342fcb2e74572d47f44ad64eeee459206479cc67a842f7727ca9ad6279eca140b7 SHA512 3ca49c40488d02ad81e1f18390967e1f87bb27269f44799cf74851d600aaf069daf9bbbabb5eb52feca6efb3e87b4b19f410e81e7342ec3edf455655c2f15f5e
 EBUILD xen-4.16.2.ebuild 4413 BLAKE2B b9603ec01227513d2c281cebe0e5bc645a3b420490b509ef55e6ce8c3b33296405e32ca6db3b575bdc613554eaca97a2f226f0a63bf9ee60c3df8fb114f474f8 SHA512 25c4c54bfe07f913c3b33b22ea58bb415b6dcb7729c823e649f3a6870caa3268059630554a26bb31de5ab7c47155491aaf96bf39b216822d362c3486caf6a012
 EBUILD xen-4.16.3_pre.ebuild 4420 BLAKE2B c14da1ebcc56c5d0321adfb27dee3a17d20757f89f79326821ed7868862c759937dea2615efc4b26c27158dc2038dc6ce5bd08d2f34855a2934607842f5c27fb SHA512 d2549676e2c4b9afa8dbe61b0f70bde0107e4bf86f33843c993c9f342122d46c62c02b2e8f4fc8f2ee15256e4198c9e100a840b0b580bfbdce14c20885ee929a
 MISC metadata.xml 773 BLAKE2B 3d0c64f8bfaf753ee92681f9da2dfabd6196952b5694244b806cb6cdac02fedd10d8c8defb4f4211664e135cce38c671f543faab58575ae2d603efcb9b2a48b8 SHA512 16993794d7f578562112533f97bb76d1a2fafd0dce038dbd879a4a65d5fc893251f1d188cdc1a2b9f955a27581f76a26409cc0c90706c86514c05e81501966b9
diff --git a/app-emulation/xen/xen-4.15.4_pre1.ebuild b/app-emulation/xen/xen-4.15.4_pre1.ebuild
index 3bd90ba15de4..0af18aeb62b9 100644
--- a/app-emulation/xen/xen-4.15.4_pre1.ebuild
+++ b/app-emulation/xen/xen-4.15.4_pre1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="git://xenbits.xen.org/xen.git"
 	SRC_URI=""
 else
-	KEYWORDS="~amd64 ~arm -x86"
+	KEYWORDS="amd64 ~arm -x86"
 
 	XEN_PRE_PATCHSET_NUM=1
 	XEN_GENTOO_PATCHSET_NUM=
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 38e7295d5c7c..d1584b864db7 100644
Binary files a/app-misc/Manifest.gz and b/app-misc/Manifest.gz differ
diff --git a/app-misc/cstream/Manifest b/app-misc/cstream/Manifest
index c56a3979f076..ab28b23c6043 100644
--- a/app-misc/cstream/Manifest
+++ b/app-misc/cstream/Manifest
@@ -1,5 +1,6 @@
+AUX cstream-3.2.1-Fix-implicit-function-declaration.patch 639 BLAKE2B 370a895d2a9ea8d4fdfbde19c2a60f60a87491f54adb3f33208515dafb69a4be8c71b42c421bd723f9e3396b85c67f3ead7464d76a1ea8a7c0145621ca1b9e31 SHA512 52355857aaf6e00ba33784b357ab1f234d811e99e80dd8dcf38d4a379d74986f979a95a22b2026413f59d2c441213ad00483275938bc5f5b82f48392ddac7d46
 DIST cstream-3.1.1.tar.gz 96609 BLAKE2B 360183c215e4aaf536d6455393b8e5a27fcfb15dc581205e53c0a160c97d028165cd9c24feea13f9a4ed11de1710ffbd1d548cadaa7fdef912eb1ee932a49ee6 SHA512 8d6364da622711f6888fd221b2f36f5da23d2a562d5a797d58d7ef361415481de8ab9ae55ae856d47c2d0141d570e22a61ab0ce9954c043877196df168f2f43a
 DIST cstream-3.2.1.tar.gz 110388 BLAKE2B 4537f2affd696620f53cfdb08d8f85ba01bdc1b5db8b3d8fa3e373a1ece96f2dc1e88efed20f1278ffde87cd1456b466d87c2c2c05480abdf79af84ca7d629f7 SHA512 f40819f07e27887528d9ff1abe6183e6e97fcefc60eb0b289f20449cdef73567b2cb5f40c52bf66dd3f4c8f869bdfdcbe0faa983659e6f8f427129f75ee1ee70
 EBUILD cstream-3.1.1-r1.ebuild 455 BLAKE2B a2885f659ddf5f8d7e47bf2d2757e05e9749c0822d0a6afd7e5b8047409c7b4f81b31bd12477020dd4b2d773c416c2638c32c637eef7c2031b081f00801aa802 SHA512 5d1b2608e8eede8e810d042c47101b149a6fd8b8b97b231cd63a7d2db46a9cb3e13ff1b7a11c046ec3858faff24e91bc06c40270e9c8efc6b214fcd9edaf7bbe
-EBUILD cstream-3.2.1.ebuild 459 BLAKE2B 134541597a3ad4f82d2bdff1370a3375e8936a467c238294b4a54fc1aeb8e7e218cbe7aa513e8aa5f557e5dd9e144c1764fa0d32b3bf93bc7b2cc681e0bcfba7 SHA512 72154af7739b76aee82013f9823fab8ff0107c1e2bc131bcc383a66b4be182c9cd657468d16858af8b6f3678985a66e7e7925d4ee2180e12b5f4035976238dbc
+EBUILD cstream-3.2.1-r1.ebuild 539 BLAKE2B f9dec4aae6e947ec991d631a19982e1138d52e4de5c34ef66bdf0db9c2a145b7e3fab4b0b842a60df73f1ba1d05311f39c4ddd5235e9631a28e33ecf1558232d SHA512 6d6492e44afb39b6c01edabdad758cd4fc57fd6ad2980479bb9b4d33aaece3d76a756c042f45f7b9696c9e83f34dabca9a11660281041f4420230639a6b1ddae
 MISC metadata.xml 1734 BLAKE2B bccb6fccda0a99fc2c9e475acdfd2261c9bd3201236857ab21d5f5b42c8b1c18fe849c3b9fa1cb8e291511c90907a92f4c80a8322ff7b286ecae3cfd25fac471 SHA512 aff51f76be1d6b5c5c279c68301e5a7a3cf49f8417b4a6f7ccfe1dddd66129b9703169c6decdf6b7c394e18c986834abe1c3bda6e21c99600e0f267964dd90da
diff --git a/app-misc/cstream/cstream-3.2.1.ebuild b/app-misc/cstream/cstream-3.2.1-r1.ebuild
similarity index 85%
rename from app-misc/cstream/cstream-3.2.1.ebuild
rename to app-misc/cstream/cstream-3.2.1-r1.ebuild
index 315ee13ddc53..b02cc0a8efaa 100644
--- a/app-misc/cstream/cstream-3.2.1.ebuild
+++ b/app-misc/cstream/cstream-3.2.1-r1.ebuild
@@ -13,6 +13,10 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.2.1-Fix-implicit-function-declaration.patch
+)
+
 src_prepare() {
 	default
 
diff --git a/app-misc/cstream/files/cstream-3.2.1-Fix-implicit-function-declaration.patch b/app-misc/cstream/files/cstream-3.2.1-Fix-implicit-function-declaration.patch
new file mode 100644
index 000000000000..0e158afdd39a
--- /dev/null
+++ b/app-misc/cstream/files/cstream-3.2.1-Fix-implicit-function-declaration.patch
@@ -0,0 +1,25 @@
+From aba21403014d3a0c4886b930ce3e7c07e2df5169 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Tue, 25 Oct 2022 13:34:28 +0100
+Subject: [PATCH] Fix implicit function declaration
+
+Bug: https://bugs.gentoo.org/871225
+--- a/cstream.c
++++ b/cstream.c
+@@ -92,6 +92,8 @@
+ 
+ #ifndef NOSOUND
+ 
++#include <sys/ioctl.h>
++
+ #ifdef HAVE_MACHINE_SOUNDCARD_H
+ #include <machine/soundcard.h>
+ #define WANT_SOUND 1
+@@ -103,7 +105,6 @@
+ #ifdef HAVE_LINUX_SOUNDCARD_H
+ #include <linux/soundcard.h>
+ #define WANT_SOUND 1
+-#include <sys/ioctl.h>
+ #endif /* linux/soundcard.h */
+ #endif /* either soundcard.h */
+ #endif /* either soundcard.h */
diff --git a/app-misc/mouseremote/Manifest b/app-misc/mouseremote/Manifest
index 4031ae11629d..cd17a3c49c4d 100644
--- a/app-misc/mouseremote/Manifest
+++ b/app-misc/mouseremote/Manifest
@@ -1,8 +1,9 @@
-AUX mouseremote-0.90-fix-warnings.diff 631 BLAKE2B ca0d5dfc9cdcb51a9a7426be220113a21aa12d2100503632cc6c7e56cee58174b2c81bc885abd152a67dbd7cd5fd35969434e429a6e83c128b20bfda77246733 SHA512 203b8df256510e98e5f46365c308b12c80fb7c92f164663ace8627e1ff9ae0e47c69912fe562e92466f289c0827d46f295b776ce43859d94b272ff6f8cf35a6f
-AUX mouseremote-0.90-gentoo.diff 1130 BLAKE2B f219bba9912a620a02a91881e6bce1d0558dfec032d1b926b4be7439b25a224a8655de2f054230a0705fa1a5777d1e997dde7f9c07f5d542937519e3cf178921 SHA512 607483c622f3347d3fad6de2f8c9eacd3a4f389baaa2bed94e72a6d5db65006c67231b92962ad08b1756983fe6af7d599b93bba880558867a032840942654e6b
-AUX mouseremote-0.90-makefile.diff 507 BLAKE2B c93decf07db9ad8f25c9ee8902b1e9841fe29e10c26cb1dc0c49736a3755edc25cd8545190b25aafc1b36d903e381f24e01fbf1a80efd04983f815883cdba09e SHA512 160efb2db998c42ab2efb34e8b462f3b709a03b8d4a8bf0be4c6c45c8204285e67bc6e5cecc4dd25ee71c6625b3e7653f83a2be8c51ed09103e2f119102b2ec0
+AUX mouseremote-0.90-fix-clang-16.patch 657 BLAKE2B e2895fae5d77955da31c150475311d49f2ed10bf8297a5f1d44c67a991ccecf1ffd9c91ec431ca6a6ba3816545011b538222dd111d677ea30b34f12563d0bd7a SHA512 fc91ef87a5bd918779601a89636f4df5ff0cc2db477e2c6dcc970f798a8e471ed095d0925c419b9a5256db76b161ebeaa0668f1a609a9fb3e06df8b99b3a01ca
+AUX mouseremote-0.90-fix-warnings.patch 381 BLAKE2B 54e7ed74c5dd232ab27faa5e9b8841a3e8262ea0e29cea31d85920c9863aea8bea1db15664109f4b0a87169ab4830ddd4a8aa9ce864fc66b32b6f2d3a2ba42bf SHA512 d0744b28ee5f45aece227fbe42ae3ba073b0855c282372169dc261e888a42fc263367689deae3309173a29e0e2c947ae0abe10a558091c6d3676dbb68ee6dc6f
+AUX mouseremote-0.90-gentoo.patch 804 BLAKE2B 5fb6bea89179c1ba0f5752ca6d72952d4a2da10f6ed20a32451c2a25af1f210ea1b174bb0d62c32c425607756c62eb4dff71b7595a8a2f11e2415020907ff487 SHA512 e7a01110d59b1f50d533d942098d3c2aabca3a61866a9f2cb6881a22a6759ab6b2105ce694003adade9a0e492f79c3a0e3296fdf0723825f2c1936ae3fc39cb5
+AUX mouseremote-0.90-makefile.patch 439 BLAKE2B e882c266ee4a04d461d9aef6fdfec8c595ee8cbfdb3b610f9c834c62ed12f0ad45858b27a47e5dcc58a7a254c173318c52e8ceeb658e31e4cd6df0a21761dd3a SHA512 874317c9b6ab47584b4c82973aa222e0d6bba693735f3bcf0aa3e90fb929e0871d1c3393ae87f3a00f8e191ce6be33b3b223dbae1cad20c541a518eab6ab0d79
 AUX mouseremote.conf 461 BLAKE2B 323401e37e6824b581ac63c947f5551b96bea35b9901310a039f86754ab35648b09b49fe5a01ce80be518fc6841b424d65c5ae5d1e64c8864035ca080183325a SHA512 b1e99866c0aec8036ea6bbd0e831afca79a5530ab1635fa1f6f407f7c49df5aa1df9c14e7e864fd6503063c05fc882792f6da4785e694865e4ef90d459a8e1f4
 AUX mouseremote.start-r1 607 BLAKE2B 5a260f70faf0fe6ff119c83193e04a497b9865616763de970b978a92e53c63a2ca4e7c36a9e35403ee2b23fe23baf8610bf17d07fd3b0d57eca6d8ef872418d6 SHA512 41783d068e8c3a2d835edde5b8e3d5f124418a80abeadd770d1b62d3fb2b7a654ae62a6008bfac074640fd61307f56dff66d953a234dc4aaa5a6cadd85bdfdc0
 DIST MouseRemote.tar.gz 41752 BLAKE2B 90e80bf4d6584db567e035c293460bbf4d30592fa6c25a6cf97769f4e9879b935ef597d8073f429e630e3fb4947f9e8cbdff7450cb5c3b64d0f482e576e2905d SHA512 d92ec4a1efda7e63cc02283b2aabcd6b42bedba17539371856e6ca3b6b5feaf9c306604db9a781836375afb6da226c16b8031f5f749d367857c2cde28e097483
-EBUILD mouseremote-0.90-r3.ebuild 1939 BLAKE2B a299b4475ce5029fa010e4acb82c8ee70754749cce9f87c74fc7a8e91b4040ddb91555bf844791fac83daa5c7d4f1b362bfe44da51e5842ab08cfd182e2cdc3f SHA512 7ee05d7a0faacdf0edfae7a43d343722fbbd23b4ae34d9159846fd0e4d052bfb6a77840795e60111ea2ecd808453433fd328067dd52bcd8c2ae4435a229942e2
+EBUILD mouseremote-0.90-r4.ebuild 1946 BLAKE2B 6247de2685888c1f6f3ffb03db47be2d337d064411cf0e6d6a470e7374dda1112e50c62b8ce99519e5091570a89e290feaad8b494a0a99dbf9085727890fe7eb SHA512 92672ad450b85454fa349d45fdc9ec38f27e8f151c40ba43b269f1fa707eb868b8a39de4f03be8540f37511380ec8664eebe2e95e477cbc615b621c09933aa04
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/app-misc/mouseremote/files/mouseremote-0.90-fix-clang-16.patch b/app-misc/mouseremote/files/mouseremote-0.90-fix-clang-16.patch
new file mode 100644
index 000000000000..041a28041652
--- /dev/null
+++ b/app-misc/mouseremote/files/mouseremote-0.90-fix-clang-16.patch
@@ -0,0 +1,29 @@
+From 4363dd75d5df8c85869f0f6f5d3a22d561cff7e0 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Mon, 24 Oct 2022 17:28:49 +0100
+Subject: [PATCH] Fix build with Clang 16
+
+Bug: https://bugs.gentoo.org/874957
+--- a/MultiMouse/daemon.c
++++ b/MultiMouse/daemon.c
+@@ -78,6 +78,7 @@ int MakeMeDaemon()
+     setsid();
+     close(fileno(stderr));
+     kill(parent, SIGTERM);
++    return 0;
+ }
+ 
+ void SetSignals()
+--- a/MultiMouse/main.c
++++ b/MultiMouse/main.c
+@@ -30,6 +30,10 @@
+ 
+ #include "mumse.h"
+ 
++int MakeMeDaemon(void);
++void SetSignals(void);
++void Selection(int numMouse);
++
+ static
+ void InitMouse(int mfd, u_short baud, u_short cflag)
+ {
diff --git a/app-misc/mouseremote/files/mouseremote-0.90-fix-warnings.diff b/app-misc/mouseremote/files/mouseremote-0.90-fix-warnings.diff
deleted file mode 100644
index 63447b9bc4ce..000000000000
--- a/app-misc/mouseremote/files/mouseremote-0.90-fix-warnings.diff
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -ur MultiMouse.orig/daemon.c MultiMouse/daemon.c
---- MultiMouse.orig/daemon.c	1999-10-09 20:08:58.000000000 +0000
-+++ MultiMouse/daemon.c	2016-04-27 22:36:59.133322312 +0000
-@@ -22,6 +22,7 @@
- #include <unistd.h>
- #include <sys/types.h>
- #include <signal.h>
-+#include <stdlib.h>
- 
- #include "mumse.h"
- 
-diff -ur MultiMouse.orig/main.c MultiMouse/main.c
---- MultiMouse.orig/main.c	1999-10-03 17:40:23.000000000 +0000
-+++ MultiMouse/main.c	2016-04-27 22:34:58.346647395 +0000
-@@ -25,6 +25,8 @@
- #include <sys/types.h>
- #include <sys/time.h>
- #include <signal.h>
-+#include <stdlib.h>
-+#include <string.h>
- 
- #include "mumse.h"
- 
diff --git a/app-misc/mouseremote/files/mouseremote-0.90-fix-warnings.patch b/app-misc/mouseremote/files/mouseremote-0.90-fix-warnings.patch
new file mode 100644
index 000000000000..11a7e63b850b
--- /dev/null
+++ b/app-misc/mouseremote/files/mouseremote-0.90-fix-warnings.patch
@@ -0,0 +1,21 @@
+--- a/MultiMouse/daemon.c
++++ b/MultiMouse/daemon.c
+@@ -22,6 +22,7 @@
+ #include <unistd.h>
+ #include <sys/types.h>
+ #include <signal.h>
++#include <stdlib.h>
+ 
+ #include "mumse.h"
+ 
+--- a/MultiMouse/main.c
++++ b/MultiMouse/main.c
+@@ -25,6 +25,8 @@
+ #include <sys/types.h>
+ #include <sys/time.h>
+ #include <signal.h>
++#include <stdlib.h>
++#include <string.h>
+ 
+ #include "mumse.h"
+ 
diff --git a/app-misc/mouseremote/files/mouseremote-0.90-gentoo.diff b/app-misc/mouseremote/files/mouseremote-0.90-gentoo.patch
similarity index 60%
rename from app-misc/mouseremote/files/mouseremote-0.90-gentoo.diff
rename to app-misc/mouseremote/files/mouseremote-0.90-gentoo.patch
index d86902e37ed5..1d73ffeb8725 100644
--- a/app-misc/mouseremote/files/mouseremote-0.90-gentoo.diff
+++ b/app-misc/mouseremote/files/mouseremote-0.90-gentoo.patch
@@ -1,6 +1,5 @@
-diff -Naur MouseRemote.ORG/client/MouseRemote.conf MouseRemote/client/MouseRemote.conf
---- MouseRemote.ORG/client/MouseRemote.conf	Sat Oct  9 21:03:42 1999
-+++ MouseRemote/client/MouseRemote.conf	Sat May  4 16:04:43 2002
+--- a/client/MouseRemote.conf
++++ b/client/MouseRemote.conf
 @@ -61,3 +61,35 @@
  
  # Definitions for the DVD device
@@ -37,9 +36,8 @@ diff -Naur MouseRemote.ORG/client/MouseRemote.conf MouseRemote/client/MouseRemot
 +TxtOff
 +TxtTrns
 +Rec
-diff -Naur MouseRemote.ORG/client/MouseRemoteKeys.pl MouseRemote/client/MouseRemoteKeys.pl
---- MouseRemote.ORG/client/MouseRemoteKeys.pl	Sun Oct 10 00:09:42 1999
-+++ MouseRemote/client/MouseRemoteKeys.pl	Sat May  4 15:58:58 2002
+--- a/client/MouseRemoteKeys.pl
++++ b/client/MouseRemoteKeys.pl
 @@ -11,6 +11,7 @@
  	play =>		0x0d,
  	stop =>		0x0e,
diff --git a/app-misc/mouseremote/files/mouseremote-0.90-makefile.diff b/app-misc/mouseremote/files/mouseremote-0.90-makefile.patch
similarity index 76%
rename from app-misc/mouseremote/files/mouseremote-0.90-makefile.diff
rename to app-misc/mouseremote/files/mouseremote-0.90-makefile.patch
index 2f6fb8a81f15..560740c67a2e 100644
--- a/app-misc/mouseremote/files/mouseremote-0.90-makefile.diff
+++ b/app-misc/mouseremote/files/mouseremote-0.90-makefile.patch
@@ -1,5 +1,5 @@
---- MultiMouse/Makefile	1997-08-21 08:52:56.000000000 -0400
-+++ MultiMouse/Makefile	2010-08-13 00:05:47.000000000 -0400
+--- a/MultiMouse/Makefile
++++ b/MultiMouse/Makefile
 @@ -20,14 +20,13 @@
  	-DMOUSE_FIFO=\"$(FIFO)\"\
  	-DLOCKDIR=\"$(LOCKDIR)\"\
diff --git a/app-misc/mouseremote/mouseremote-0.90-r3.ebuild b/app-misc/mouseremote/mouseremote-0.90-r4.ebuild
similarity index 72%
rename from app-misc/mouseremote/mouseremote-0.90-r3.ebuild
rename to app-misc/mouseremote/mouseremote-0.90-r4.ebuild
index 5827c8e764a0..3c211b40c07a 100644
--- a/app-misc/mouseremote/mouseremote-0.90-r3.ebuild
+++ b/app-misc/mouseremote/mouseremote-0.90-r4.ebuild
@@ -1,36 +1,34 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit toolchain-funcs
 
 DESCRIPTION="X10 MouseRemote"
 HOMEPAGE="http://www4.pair.com/gribnif/ha/"
 SRC_URI="http://www4.pair.com/gribnif/ha/MouseRemote.tar.gz"
+S="${WORKDIR}"/MouseRemote
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="amd64 ~ppc x86"
 
-DEPEND="virtual/perl-Time-HiRes"
-
-S="${WORKDIR}/MouseRemote"
+RDEPEND="virtual/perl-Time-HiRes"
 
-src_prepare() {
-	eapply -p0 "${FILESDIR}"/${P}-makefile.diff
-	eapply "${FILESDIR}"/${P}-gentoo.diff
-	eapply -p0 "${FILESDIR}"/${P}-fix-warnings.diff
-
-	eapply_user
-}
+PATCHES=(
+	"${FILESDIR}"/${P}-makefile.patch
+	"${FILESDIR}"/${P}-gentoo.patch
+	"${FILESDIR}"/${P}-fix-warnings.patch
+	"${FILESDIR}"/${P}-fix-clang-16.patch
+)
 
 src_compile() {
-	cd MultiMouse && emake \
+	emake -C MultiMouse \
 		CC="$(tc-getCC)" \
 		PREFIX=/usr \
 		LOCKDIR=/var/lock \
-	    JMANDIR=/usr/share/man/ja_JP.ujis
+		JMANDIR=/usr/share/man/ja_JP.ujis
 }
 
 src_install() {
@@ -48,8 +46,8 @@ src_install() {
 }
 
 pkg_postinst() {
-	[ -e /dev/mumse ] || mkfifo "${ROOT}"/dev/mumse
-	[ -e /dev/x10fifo ] || mkfifo "${ROOT}"/dev/x10fifo
+	[[ -e /dev/mumse ]] || mkfifo "${ROOT}"/dev/mumse
+	[[ -e /dev/x10fifo ]] || mkfifo "${ROOT}"/dev/x10fifo
 
 	elog "To use the mouse function in X, add the following to your XF86Config"
 	elog "Section \"InputDevice\""
@@ -64,7 +62,7 @@ pkg_postinst() {
 	elog
 	elog "Enable the daemon with \"rc-update add mouseremote default\"."
 	elog
-	elog "Configure the daemon is run in /etc/conf.d/mouseremote."
+	elog "Configure the daemon is run in ${EROOT}/etc/conf.d/mouseremote."
 	elog
-	elog "See /usr/share/doc/${PF} on how to configure the buttons."
+	elog "See ${EROOT}/usr/share/doc/${PF} on how to configure the buttons."
 }
diff --git a/app-misc/rlwrap/Manifest b/app-misc/rlwrap/Manifest
index 1c6f77e00ae3..454980a42db3 100644
--- a/app-misc/rlwrap/Manifest
+++ b/app-misc/rlwrap/Manifest
@@ -1,3 +1,5 @@
 DIST rlwrap-0.45.2.tar.gz 182025 BLAKE2B 38e54ab87b0530e49cb736072825441f638aa4ed4b22b0f30c7243f5f8ac7b439e3a75784d6a4eed051bf367d15ac3b576109663ddf3fc082171a73c5af7c11e SHA512 77664bc17c4e6148037b8ae64c025b07c3feae91dfeff59f1846ce38e5f808a41005286daa81fd0ed01e0c789762e377cc48e6abdf124a7d4654f66b2b6c6cc4
+DIST rlwrap-0.46.tar.gz 339767 BLAKE2B 0f3ad18d43008c97a642c653c43f6406ed02a2d4946f2448ee13cd578ade4454ad43a5a5c5c413fd20c24559f9dae974529a9e11d4cf103544c061a4ce584bac SHA512 28c5d8fa30ee1fd81dc0a670124e50191ceff1c041f5249a18e26d7fce6fe29ce105d7f87913bcd11292dc7d628e297b0238424927a9f375c686971dd00f29c9
 EBUILD rlwrap-0.45.2-r1.ebuild 602 BLAKE2B b6052f8354e67a914d708b299c5960d1780aa85c7966d4b7d5da4a07cacae7ebbf5e8980edd048fa3a9ab80b10bb0b48d2ff8a14a2c11afa6d716236de107ff5 SHA512 672e95fb1110fb2566b32cab45f61985f1d77afff03f959e2f1fcf0c67b84df71c77bc7d67b9bf771bce8151197acf46ca58cbaaa3549469f58a58fc383c5eb2
-MISC metadata.xml 708 BLAKE2B bc2ef5d5636159a7291fede5d7b84384e5fa714b33fe29f19eebf632dd4f2eae86d6edb62b074b62903727b2fa4d0fe3faf4abb22d3ba9b99363be81b5bcf416 SHA512 6fbb3167b1c064b75afb4c95c2ab31dcd53d99e2d12bde77d220fbfc8c213ab01ee178dd5e950d4983ddfb85e3ef870dab5e35e59dea4e73ec5c2bcdf823e456
+EBUILD rlwrap-0.46.ebuild 609 BLAKE2B 98d21d9d128b1e7ff696bb18212df52e93f96cd316a2816be10373dd9650a5c0cf2183f5309cdb77aac8f030a07e0122a7b842c056e8cb49d34832184b247e84 SHA512 58d97716f431da4c81814be43c9a665a7c62a6ec4648a10381ae18ed47637ec609580302a62bc2a233923d754c641a65b0936425fbca96779630937ac79d78d4
+MISC metadata.xml 793 BLAKE2B 9b4b021afa05e1cbe8992f88da4aa7a6e55bc95ff8db76f3221a84f8b5929f0f9d20271bf6359263202380a8e3e3a60cd7ef00364ab11e09efe0073bb446f367 SHA512 2832792b84ad2ea0b9df5ff6e032081ec83fd28e7713526b7dd4c0c659a09fcb5edd909838429eb9774464b9a4d0a4c81099a36c89609254812b968d088801a6
diff --git a/app-misc/rlwrap/metadata.xml b/app-misc/rlwrap/metadata.xml
index 5df39400d609..47fa76d97866 100644
--- a/app-misc/rlwrap/metadata.xml
+++ b/app-misc/rlwrap/metadata.xml
@@ -15,4 +15,7 @@
   <use>
     <flag name="debug">Enable debug</flag>
   </use>
+  <upstream>
+    <remote-id type="github">hanslub42/rlwrap</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/app-misc/rlwrap/rlwrap-0.46.ebuild b/app-misc/rlwrap/rlwrap-0.46.ebuild
new file mode 100644
index 000000000000..38ebe8a79778
--- /dev/null
+++ b/app-misc/rlwrap/rlwrap-0.46.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="GNU readline wrapper"
+HOMEPAGE="https://github.com/hanslub42/rlwrap"
+SRC_URI="https://github.com/hanslub42/rlwrap/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~mips ~ppc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="debug"
+
+RDEPEND="
+	sys-libs/ncurses:=
+	sys-libs/readline:=
+"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	# TODO: Python, Perl?
+	# https://github.com/hanslub42/rlwrap#filters
+	econf $(use_enable debug)
+}
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index 2d50a60d6bab..f901a4697e9f 100644
Binary files a/app-portage/Manifest.gz and b/app-portage/Manifest.gz differ
diff --git a/app-portage/iwdevtools/Manifest b/app-portage/iwdevtools/Manifest
index 9b1a6ed3aaf1..12510f09c331 100644
--- a/app-portage/iwdevtools/Manifest
+++ b/app-portage/iwdevtools/Manifest
@@ -1,4 +1,6 @@
 DIST iwdevtools-0.11.9.tar.gz 86756 BLAKE2B 8c9e25dd273af9a6e10e4a0a4dff1f82889176dbc730981c3ce84a2b1ef5d7138d45bf86430d77c670fed2e9c7f4345758a5fc572f0522c2087f2daaa1ff80c5 SHA512 c9583fed736e670cc9af820c8ba314b771ae3eafd36323d473cb76de0edf8e57c89a52e16e4c7b2985c78d4e43b8cb5b34aabb0bd1951a15e5aad56eef860fad
+DIST iwdevtools-0.12.0.tar.gz 88411 BLAKE2B 9220d59ee9ec7305925798d8beafec49ef35d8e39a428b62df3b3ed3832da1e42aff5e94ab8c5cfd85272d21cbb13c856408cf665523f8b1de85818ba08aebc4 SHA512 b69face29355df2443e75101b81c477dfdb1f54aad14f0d6275c399bd97cd654c4819f5621177d7ef75ecc4540e923ee5cd42f806240ed346ab469959f6a38d9
 EBUILD iwdevtools-0.11.9.ebuild 1907 BLAKE2B 5cce7273be85fbd5ff5b3aa468086c23612e40e54ff7acf456311e07aa4ab39e597424f23b94c6b56912c9b1252e72cd7c12e8d14f654f91eb636bb63909177a SHA512 698c0530e9dcdac227d14000ebf845f9c1919a0801aee12818ea5588e30276ad57fb8480a920976c91b020cbd80cefcb143ff8446454f18222dfeed46bd5b6f4
+EBUILD iwdevtools-0.12.0.ebuild 1915 BLAKE2B a98ac7ead6f494052f08e6dbd20f34866bfe2481d252c43cc94d31f75fb0b4bf24c6f6f1d73a2b5dcc4c76e2fb1e1b5d14b0b58af4162c1f27183b73ba8daa66 SHA512 6da66aa4d2ea4d6e040636a8b189f8d3fc83662a4a042472a8bbad9202fb8849595cae99a41a55a924c8a094e1bdc0392050d40f294b398a4139fd149c33c5e4
 EBUILD iwdevtools-9999.ebuild 1806 BLAKE2B 90e7cd55d1f57c126a6c59489b4bfacf39266a48875370659693efcdd90fef644bbc21e67ecb21c665000139b28008c3d0979796b7f2f2312ca2deebb3860250 SHA512 56e8546414c77b124a5da1b334833384bf2e78adfc385918f6a05a336d1a22cae705d3e526846b8e7a483f929fb9327288d9527c9c157a607a69c362743d9d11
 MISC metadata.xml 354 BLAKE2B 752c8fbf18967fb380f0f5d460396222f5fea3f0c7b9ed960ff0dbe62a9a505a2d07c45750aaa55285d11169e01f5e83b82eb278b12fbc5e9c43353c0a5fc9ed SHA512 d8e5866d89b7f05a5a8cd8cc464083d3d096b4c03f8a83e9314dcf45e57c25369bf8a3bc725aed3b8db9f3f86e76bad358bfa58f1eca70f7ec0bf3d31286c2c3
diff --git a/app-portage/iwdevtools/iwdevtools-0.12.0.ebuild b/app-portage/iwdevtools/iwdevtools-0.12.0.ebuild
new file mode 100644
index 000000000000..f618116f15e0
--- /dev/null
+++ b/app-portage/iwdevtools/iwdevtools-0.12.0.ebuild
@@ -0,0 +1,64 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson optfeature
+
+DESCRIPTION="Small tools to aid with Gentoo development, primarily intended for QA"
+HOMEPAGE="https://github.com/ionenwks/iwdevtools"
+SRC_URI="https://github.com/ionenwks/iwdevtools/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	app-misc/pax-utils
+	app-portage/portage-utils
+	>=app-shells/bash-5.1
+	dev-libs/libxml2:2
+	sys-apps/diffutils
+	sys-apps/file
+	sys-apps/portage
+	|| ( sys-apps/util-linux app-misc/getopt )"
+BDEPEND="
+	sys-apps/help2man
+	|| ( sys-apps/util-linux app-misc/getopt )
+	test? ( ${RDEPEND} )"
+
+src_configure() {
+	local emesonargs=(
+		-Ddocdir=${PF}
+		-Deprefix="${EPREFIX}"
+		-Dshellcheck=false
+		$(meson_use test)
+	)
+
+	has_version sys-apps/util-linux || emesonargs+=( -Dgetopt=getopt-long )
+
+	meson_src_configure
+}
+
+pkg_postinst() {
+	optfeature "detecting potential ABI issues using abidiff" dev-util/libabigail
+
+	if [[ ! ${REPLACING_VERSIONS} ]]; then
+		elog "Optional portage integration relies on using /etc/portage/bashrc."
+		elog "The example bashrc can be used as-is if not already using one:"
+		elog
+		elog "    ln -s ../../usr/share/${PN}/bashrc ${EROOT}/etc/portage/bashrc"
+		elog
+		elog "Otherwise, inspect the tools' --help output and the example to integrate"
+		elog "(if not defining the same phase functions, the example can be sourced)."
+		elog
+		elog "Note that \`eqawarn\` is used for portage output by default. QA messages"
+		elog "aren't logged / shown post-emerge unless e.g. in /etc/portage/make.conf:"
+		elog
+		elog '    PORTAGE_ELOG_CLASSES="${PORTAGE_ELOG_CLASSES} qa"'
+		elog
+		elog "See ${EROOT}/usr/share/doc/${PF}/README.rst* for information on tools."
+	fi
+}
diff --git a/app-portage/mgorny-dev-scripts/Manifest b/app-portage/mgorny-dev-scripts/Manifest
index 15c7b27f39dc..6725421f5913 100644
--- a/app-portage/mgorny-dev-scripts/Manifest
+++ b/app-portage/mgorny-dev-scripts/Manifest
@@ -1,9 +1,5 @@
-DIST mgorny-dev-scripts-25.tar.gz 11688 BLAKE2B 224234844956e0adfad6d731e3693d5741405b41f454f570fd431cc126520b35ed3d34beb12368ac5977b76138c88e7843b92c1d89e35a2bad766342ead5a7ec SHA512 b6423b080e6931aef8ddd7f9dd8a10ba4939793b9837b218742dc9c4357448b161cba8d9798af510db13cccc5912080e2a05f8f2c9173f828907bdce6fc7141e
-DIST mgorny-dev-scripts-26.tar.gz 11732 BLAKE2B 31337aae905453a7ce8e036341854e27f0c01593ad6443d70ab5a8179683886d03e262dafe4cebfd7e19e39cb4f41e8f49a51acc93651cb6d82a08296d71e826 SHA512 e74e9f1d84698e0159d690cd744f6dfabe0b369a561ee88b14818e3e5eae01244e50fba6db0dc29d35677019354d55179bcccbe323f0b7f864935cebd5f1a828
-DIST mgorny-dev-scripts-27.tar.gz 11749 BLAKE2B b989f3577fad70b76a5d3f0a2910d15b188d21d74b32729fe0a4a1d5ca91144b5a09b769e8d939e2c74cb90984f4a4a72fe70a5c62474bf803fd658af583f176 SHA512 fe6fdca956c0eec2bf426fffd5ef72f382f55ba8cef8ec4c9c2d9e034640d8aa2a7f3e626121d6303ae78c828d02e3ffd12336b11ae6565b0b40db6a7fa52854
 DIST mgorny-dev-scripts-28.tar.gz 11748 BLAKE2B 53111a6779cfafb560fb895fcdad4c5bbf1c3cfa1a8e4afcd4bf4ea7af51a4a165a898c5f3f55e5cf35e2145d77f0f291f3c3ed7a002db01021274266ec0f91f SHA512 0f6d1c9abd54d978a69fb0c9b2e794e9cafd9d0d62f957086b24d8f989a040c0c1e03f23b0315195657f1fd338e1f216dbb305082a4852cb603737b983e6bd98
-EBUILD mgorny-dev-scripts-25.ebuild 695 BLAKE2B a743b633c5732c86e68e91b2cb70462379021d834abe8818fbe40a90200efb624de722cdebfa64a5e187f70c83eacb21194c67bb16f938f89f033ccc0e7b0e33 SHA512 f52d547ca624087dd58db3871e02897e7187baf26bb6e455810ac01436a9b961201adad9d898730816933386960f5ed5a12d0fcaeed84c8bbf0180d67a355943
-EBUILD mgorny-dev-scripts-26.ebuild 699 BLAKE2B 856397a7231991c59c2f0c9a25d71cb184533123784b122fb01860e379198c1e4ff68f0a41032cbf68d88c8c09594f0680ccd82302815341786561de0d255a7d SHA512 411161e86b5996103f56d9b82ed8a43f19b1674da37b4448829c1e367d54813ae32e5d91fd89e9c9b0ddb017be1fe0909b133d31ac56a3d2c9393ab0983997ce
-EBUILD mgorny-dev-scripts-27.ebuild 699 BLAKE2B 856397a7231991c59c2f0c9a25d71cb184533123784b122fb01860e379198c1e4ff68f0a41032cbf68d88c8c09594f0680ccd82302815341786561de0d255a7d SHA512 411161e86b5996103f56d9b82ed8a43f19b1674da37b4448829c1e367d54813ae32e5d91fd89e9c9b0ddb017be1fe0909b133d31ac56a3d2c9393ab0983997ce
-EBUILD mgorny-dev-scripts-28.ebuild 699 BLAKE2B 856397a7231991c59c2f0c9a25d71cb184533123784b122fb01860e379198c1e4ff68f0a41032cbf68d88c8c09594f0680ccd82302815341786561de0d255a7d SHA512 411161e86b5996103f56d9b82ed8a43f19b1674da37b4448829c1e367d54813ae32e5d91fd89e9c9b0ddb017be1fe0909b133d31ac56a3d2c9393ab0983997ce
+DIST mgorny-dev-scripts-29.tar.gz 11752 BLAKE2B 93105d0cabb8acd418dc416211a5a6e621d1e96152be00c19cfb8f559f0afc029d83c7203fb1c533b74f2f0c90316e6ff705bf199efd2e0322728a27de80c8ee SHA512 c140a20d2190c92edb900ccdb20cd13170912be30050f7c248b5b4897e24f586552747cfb4aa3df6b9dce9ee74686958dfdbea572349dcdccae3a10cef5a6173
+EBUILD mgorny-dev-scripts-28.ebuild 695 BLAKE2B a743b633c5732c86e68e91b2cb70462379021d834abe8818fbe40a90200efb624de722cdebfa64a5e187f70c83eacb21194c67bb16f938f89f033ccc0e7b0e33 SHA512 f52d547ca624087dd58db3871e02897e7187baf26bb6e455810ac01436a9b961201adad9d898730816933386960f5ed5a12d0fcaeed84c8bbf0180d67a355943
+EBUILD mgorny-dev-scripts-29.ebuild 699 BLAKE2B 856397a7231991c59c2f0c9a25d71cb184533123784b122fb01860e379198c1e4ff68f0a41032cbf68d88c8c09594f0680ccd82302815341786561de0d255a7d SHA512 411161e86b5996103f56d9b82ed8a43f19b1674da37b4448829c1e367d54813ae32e5d91fd89e9c9b0ddb017be1fe0909b133d31ac56a3d2c9393ab0983997ce
 MISC metadata.xml 362 BLAKE2B 9f7873c2b1dea8abe84daabea4db33438b730c92487220d28af391e411f58b15f7eaa7aedffab8849a8d0cf4c032db04e48cbf9be28f0ee7602b6a05f0e430be SHA512 d7d44e67c952a00cda52b223975c1c48ca8283d55ccc084edbed956633e8f2a04ede1553f16a3b673485ce433b9067d35c1459f0ef392ddf6d4d03ab02d339a2
diff --git a/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-25.ebuild b/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-25.ebuild
deleted file mode 100644
index 4cd466d472db..000000000000
--- a/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-25.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2019-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Handy scripts for ebuild development and more"
-HOMEPAGE="https://github.com/projg2/mgorny-dev-scripts/"
-SRC_URI="
-	https://github.com/projg2/mgorny-dev-scripts/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz
-"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc x86 ~x64-macos"
-
-RDEPEND="
-	app-portage/gentoolkit
-	app-portage/portage-utils
-	dev-perl/URI
-	dev-util/pkgcheck
-	dev-vcs/git
-	net-misc/wget
-	sys-apps/portage
-	x11-misc/xdg-utils
-	!dev-util/pkgdiff
-"
-
-src_install() {
-	dodoc README.rst
-	rm -f COPYING README.rst || die
-	dobin *
-}
diff --git a/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-27.ebuild b/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-27.ebuild
deleted file mode 100644
index 2838be105fd2..000000000000
--- a/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-27.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2019-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Handy scripts for ebuild development and more"
-HOMEPAGE="https://github.com/projg2/mgorny-dev-scripts/"
-SRC_URI="
-	https://github.com/projg2/mgorny-dev-scripts/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz
-"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
-
-RDEPEND="
-	app-portage/gentoolkit
-	app-portage/portage-utils
-	dev-perl/URI
-	dev-util/pkgcheck
-	dev-vcs/git
-	net-misc/wget
-	sys-apps/portage
-	x11-misc/xdg-utils
-	!dev-util/pkgdiff
-"
-
-src_install() {
-	dodoc README.rst
-	rm -f COPYING README.rst || die
-	dobin *
-}
diff --git a/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-28.ebuild b/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-28.ebuild
index 2838be105fd2..4cd466d472db 100644
--- a/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-28.ebuild
+++ b/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-28.ebuild
@@ -12,7 +12,7 @@ SRC_URI="
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc x86 ~x64-macos"
 
 RDEPEND="
 	app-portage/gentoolkit
diff --git a/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-26.ebuild b/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-29.ebuild
similarity index 100%
rename from app-portage/mgorny-dev-scripts/mgorny-dev-scripts-26.ebuild
rename to app-portage/mgorny-dev-scripts/mgorny-dev-scripts-29.ebuild
diff --git a/app-portage/portage-utils/Manifest b/app-portage/portage-utils/Manifest
index ac407ad7e435..313b5f12ab35 100644
--- a/app-portage/portage-utils/Manifest
+++ b/app-portage/portage-utils/Manifest
@@ -1,6 +1,6 @@
 DIST portage-utils-0.94.1.tar.xz 1871688 BLAKE2B bec5ddd514b397c157c3b1bff70d61730f15804a6751f56eb69c4030a35fc6a6b11fa1e2bde94332772660f02bf9428623210733ae9e2f1290f29aa3b31a1813 SHA512 29fdb4093997eb95703d407da6b00305c949f0a00ae3aa5cfb2c47b66bddc59e034fae114663b40b611f906332066b648018aa4e5bc1b935e61a64f4b4bf1088
 DIST portage-utils-0.94.3.tar.xz 1804720 BLAKE2B b0239a26d878db6dd73c9ee54f586526f8812921775126ef74afbe089186fdc5ca7197847e204c6ecbf9d79b6e2a6173cb0c39d4a26653ed0db2d7f9b10e88c5 SHA512 bf8fcccc26bb985bf7664f6ab0227a5251c3f918199de0c4e4c95b7107eb72eee367d1d524b5d9608b3c7eea9b1fae789456390cbb0d375297b807bb98644e01
 EBUILD portage-utils-0.94.1.ebuild 1525 BLAKE2B 31633b095b9fb0dbc0e9a4c5810be266484b0d353578969d587d725722c7f6870031453466b8e8ea70b094ff3129e94d71a81a7000b432f739f4b64a811df561 SHA512 c2f182e8b08adad0f5b22ff08bd1a41aec90a0fa03e40070ab3535947a5d3eee57d5fe4d6bec28b6d228ef9e8baddbe69203a4cc24833a7e02af5e2cfb615186
-EBUILD portage-utils-0.94.3.ebuild 1654 BLAKE2B 6582abc4a5666204d307764051662f1fc217a42c136ff10f8d94b74b019863a7041c1decdf81fa8a28f8896fcf3d66687d56d7001b2368fb070498b464cee530 SHA512 4e3a8de13028c6b9df3feb15812e9fb771f79f1b0cc5b59bb71043cf9210aecfeed4e1e68efbf20a46e92b4e98aee62bbff6a93e7453e5ebe6b3242f12dbefe1
+EBUILD portage-utils-0.94.3.ebuild 1647 BLAKE2B fb1433bc5dfa5a2b8cbf1bbfd5ec23ec9c68e82a2165e31ab485fe69ca32bc66b78c793f7454a91fad46c98c60dd6b8e517d383b05f6479f79d1d8fa121b1bc4 SHA512 e904d047568d686d91945a795f096e4e665a1d4f44f84d8d49ebc5bad02803c1c4d3f7dbce6438f541a8e4b07216f861a50f60904237a9d09220629db4a9f5e8
 EBUILD portage-utils-9999.ebuild 1654 BLAKE2B 6582abc4a5666204d307764051662f1fc217a42c136ff10f8d94b74b019863a7041c1decdf81fa8a28f8896fcf3d66687d56d7001b2368fb070498b464cee530 SHA512 4e3a8de13028c6b9df3feb15812e9fb771f79f1b0cc5b59bb71043cf9210aecfeed4e1e68efbf20a46e92b4e98aee62bbff6a93e7453e5ebe6b3242f12dbefe1
 MISC metadata.xml 574 BLAKE2B 1448e8343748e8bbc61128f3a621010ae1f7095872c271962ac24e62abcea8cca7c52034008c0d5691a56ca7f2e242ab4cec7d38fceecc2c39f858d1ceb30ab1 SHA512 dcf9949c990845794a534b34e44e820b16b3700bc993e13707bfac6d26269d2aba00fd3f873b9157ead222d2fa5cdd63d263c098bfc79c1b1f66097fa24f552e
diff --git a/app-portage/portage-utils/portage-utils-0.94.3.ebuild b/app-portage/portage-utils/portage-utils-0.94.3.ebuild
index b07e43f8a485..15084f49d2f7 100644
--- a/app-portage/portage-utils/portage-utils-0.94.3.ebuild
+++ b/app-portage/portage-utils/portage-utils-0.94.3.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage-utils.git"
 else
 	SRC_URI="https://dev.gentoo.org/~grobian/distfiles/${P}.tar.xz"
-	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-2"
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 2033ca86b909..03c9c598194e 100644
Binary files a/app-text/Manifest.gz and b/app-text/Manifest.gz differ
diff --git a/app-text/pdftk/Manifest b/app-text/pdftk/Manifest
index c3d4b203d648..0fc7b0edfff2 100644
--- a/app-text/pdftk/Manifest
+++ b/app-text/pdftk/Manifest
@@ -1,6 +1,6 @@
 DIST pdftk-v3.3.2.tar.gz 2343475 BLAKE2B cfa3cac4b78695d757e9cd3ba02f2a3e304343c481a44b0b6165e239d90e5ef72be3385faa1a72cd36194844f441fd1e93194e8d815807d2d0b364d0421553d2 SHA512 44056737e3b9b3cb988f46e96a0f3ec13193cfc662946f6def93add0ed56608fc026181254165440f1172e9fdda00771c3c018c20bf20ce87dad322fc1394893
 DIST pdftk-v3.3.3.tar.gz 2380289 BLAKE2B b370777f5b87706ed811e424214db23b5622ef4e2420fe00c7e5e7d03fb51314589e7a1588d911c0734c075612adab9af17a1ad4ddcaac7a5dfc407c1aa28392 SHA512 2fd8dce8787856955984d6396ccb9a57d4e7a255cd74f10b31a7d87c84fac80143c0067d76bf6d8c0ec1a55dfb7d1e90f4898706e8ae26ccdf657b38d88e6cd6
 EBUILD pdftk-3.3.2-r1.ebuild 1893 BLAKE2B ca3c168e1a446049c2430e71ec61530141e1a6a310a464efec1fe49a20a6fb048fcebbb2efe81e4593865dc7de97807ef34a2b3e9b0e8afa6246fcf49924879a SHA512 91a7dec0d586ee3863a936ca46bd54167bc875343dfe0caf3c4d7725b0c78b6ab846e0bf2cc8e41986b3f240f7ef1c9e056eb55e525ce81ffb5bb866a53c5d4a
-EBUILD pdftk-3.3.3.ebuild 1928 BLAKE2B 8725c68ba81f82edecf7c4794bda714724d70b0d16490b2ba4b7b18e44d2c912766537bb0b72c5cefdf98a075e29e6c61d2c51ac7efb86d558d45d4bfff436bf SHA512 50f8b16a2b2f9809cf4e96069fc50d40b34578586046ecb56a4f560668bc8a0a5656b738c45b6a21948fad35d29665945813600c3b1a082367f649e808a77987
+EBUILD pdftk-3.3.3.ebuild 1927 BLAKE2B 260a9db34f2373d0472ee336a5c49580ebe01aed757e178f4c3966c3f0535b2bca53713b4244d2a1ba05c5e962a1f1b1b8a7951d1b29f7dc50dd8d9ab0c13f68 SHA512 abd2bb9b19767d1ef131548a8326f3a4b96b76e9314368abd64aff5b8a3ca3ee52d4ed9e7369f0fd0f4452f09916c38c21a9556c9d7fdb84fc362b7c9acc1409
 EBUILD pdftk-9999.ebuild 906 BLAKE2B bbc5a168431ff4f4f8a51ee581c1dde06c3044212be071360168a7f192cf7f257fa3b0bf966cc66532763b3cbe5ac74fca56de276f8afbf17cfe49fa7a837a5a SHA512 312c2f2bfb40abc41c2b67f96ecb54b1cdaeeb083dffb2d395e5fb757e56b7b1d128850f64c6427a4066734a2cf33d29ebbf3841497cbc8a106edb1c305de55a
 MISC metadata.xml 349 BLAKE2B 3fd6e82540ef8da6c46195a90af4638d914e5f3f6a1e6f3e3dbf0bfb940f23ed7b26578185219ef1fd00f069bb38a308056a39edea7661e263ac523c3bd40a2e SHA512 364f75cc6a80de2e1d517b094c1073fab7fc10738182d1fb37f0723fdcfc5238704f905a0f6ec8e373e1a91f2a7ad0990891beb26f94010eab13e8f688d230ad
diff --git a/app-text/pdftk/pdftk-3.3.3.ebuild b/app-text/pdftk/pdftk-3.3.3.ebuild
index 986693f78055..111d9d3dc1fd 100644
--- a/app-text/pdftk/pdftk-3.3.3.ebuild
+++ b/app-text/pdftk/pdftk-3.3.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://gitlab.com/pdftk-java/pdftk/-/archive/v${PV}/pdftk-v${PV}.tar.g
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
 
 CP_DEPEND="
 	dev-java/bcprov:0
diff --git a/app-text/qpdf/Manifest b/app-text/qpdf/Manifest
index 9ababb61e582..e6bf24e85704 100644
--- a/app-text/qpdf/Manifest
+++ b/app-text/qpdf/Manifest
@@ -1,13 +1,7 @@
 DIST qpdf-10.6.3-doc.zip 6852725 BLAKE2B 407b5994d3c3f80f71e60da12ebecf2c977fecb9e42be1aef32586b7b743bb62acc9662bc02fee174f9738f3e4e43e2769a5df415ae4bb9fb80f16b9d00cfd0e SHA512 780c25df78bc0360a17de85b0701f2e929677b02989d47c6e26b57749dd2315bb21511de9d8d40670a4745254c5c17fcf1c649233be1a0255b5a661f5dcda61b
 DIST qpdf-10.6.3.tar.gz 18573584 BLAKE2B 3b6ee845163ab6593ba3d85e8563e4f56f57a831e2bf67fd3a2ccd19aaca47af8c50e03dede233380442384e5bb8fa3fc317a8c54732d2cf3bdfd7d152210a4c SHA512 c584b7443984b0f28eec2fbff054096b9a14a10858dda0c6b370d7a19e34c395ee15a8dc0770d3d85773281cd79944f029fb3bfad55833a2c32ff7e1a751c149
-DIST qpdf-11.0.0-doc.zip 7049971 BLAKE2B 25191511e4327d99eab8bcd08b1db3a16c5289898034d1ec12d4f551264da489e040b2cac25d34f320898ad5698f2f7578c4ce7c0ec73c682ae2583f341ab996 SHA512 1e393007a4334467668079b4807724d36e9af15f05696f9b512a28b7172a9f74180c684141b3bec9dd973ba37827b159c3fd3adbd1da3061899d9a81cffb5da6
-DIST qpdf-11.0.0.tar.gz 18452218 BLAKE2B bb1dabae56f6ef5ca635ec7a0434387294ff6b6150ed19335243ac8774f4ecb57a7f97b00ef07c0c4f3bdfd2b510b4699324f77405c2342162c37a7860313c56 SHA512 08f1f3cfb3bc1532d04da9a3453dee6c9b411020c0a1dfe112da1961dd4d6dc76d6e89d57cb00b3b8b0cf0848e9fd3032a16c3c591a89b5631d0badfb44ef234
-DIST qpdf-11.1.0-doc.zip 7053772 BLAKE2B 8e2d377fc40a8206567e82733125b4abf23f07d062e0416ed2f2d9349a3555188cba1b68737cfae8943bcda3b93effdd020548b45d257eb9845fe1b569394000 SHA512 300dca6495ff9770138b7166e584cff1f2d26c60f273030211a895cf0f0147124240c2f22e79fae4f66595b863e2ce9dcdd7e8144c8b64357bf9a9e9b92ca6ea
-DIST qpdf-11.1.0.tar.gz 18452386 BLAKE2B 1df1f148db3132073f5e504b0dc79f8029e7049b334591d5dbd0adb425964d2d97ae5e086a3cbfcd82c82b22491b7b8897db8c3f20dab35feac3657066c6a776 SHA512 4c4daf3e6ae40e57d0d099abb7c9e694b7bec0c6657ffa4dc084f295d57799b8a5cbe5827d346fcbb89fa88a84c4dbd9a5437cc649b617cd479231c9ecc3fb5a
 DIST qpdf-11.1.1-doc.zip 7062109 BLAKE2B f9ffa32efa3835427773ee6ef87985388722b868f5a6e9a6df23e5458c2fde049aadbc98dc6966c0b2268c7a264af07cb448f61e49e04b25d908f2bafe140469 SHA512 6e4b87abefedcaf1e3407d1630f9c6e796db64b3cdae25a9489d8f0b1d5c06673821436877c36f015d6a5d126feefda17bb246f0b8ea87c0617238254816f7c2
 DIST qpdf-11.1.1.tar.gz 18464793 BLAKE2B 66fa80b513bc5ef033a60011e34df1c6e9ac6a8b777ab1eb30aeddfa077827dcfe30f6ea5816ab0ec208840d4dc2b4e3823449378b5bc50073ae1d754fb124c4 SHA512 da7540152a82cbb853089afa2503ece04086513bab662171758f1e0e928ac09cc7c00e61470bd5ec5285d99ef586b59ad66d5ff90e9060b1361d837fe18cbc24
 EBUILD qpdf-10.6.3.ebuild 1855 BLAKE2B 3579d2303c15c8fc84a6bcb804986574f4a7e36f66e69b2411494c8106d6b1874e979809bf828b9a7af410494579da7fad762ff5df374abd0afbb105b7df6175 SHA512 2ceadd6b80689c2ae8a5ddd5e4960f441883005c61d3c6e18d52666421ac747330a6479485a606043e54f2530c8ab1426f6d1d554f7830bdd9d35dc7471f0077
-EBUILD qpdf-11.0.0.ebuild 1797 BLAKE2B 2e5c1be383b083e4d740340053dc6e82257dd96501006b7ec94e3050a484b5007a8fb8c33c38cf7081cb5b3dbcf249d43a2e61531c97cb62381982605ed4295a SHA512 7a6aa841b59f89d7ea46cf6f89cd299ac96c545235467f6f95f18c0bc4590e84ea9ccd821ca2604e13fb2be1704809e2efa403b7d5edf7737a5787268a25be4d
-EBUILD qpdf-11.1.0-r2.ebuild 1867 BLAKE2B c630eff1d313e5b120e219c24d8656f8971523ddc8b87a5e29e5e98daa70904c47da159077253aa1a6d28a7862c3ab9b62580656a79a25c3b9b11eec4a2bada7 SHA512 b096aedd6abf8d176783d591397bef30cc95fadc0239f423d75d72ab29d8fed2ce88c2ac45958b1d530acd89f59d685916aa3db468783661e8a34ba9ddf24ac6
 EBUILD qpdf-11.1.1.ebuild 1873 BLAKE2B 3f505a8925e86e540eaf5c041053f6fae32fa41a9449e09d40571ca6f0e09b2ee8523d8359621119669c64fd121acb59cf77377b3de20254071a4699a6a8fec0 SHA512 93f89f21752f0744035cd281159bdfdeeed7e2aa032a26ad52815e6656dff6b1507f9b27ac5164f2e235a903ee706ef7f536b36d6fdf28f343b8c071cf209258
 MISC metadata.xml 444 BLAKE2B 1febc86d8f85aff5ec02d910550aca3bde66111c3e7364b264db3fca10020ea9bc2887dc8283217e2cb8d05ba46c176a92993e0d418528cbe590771dccc49d90 SHA512 dde5e34ef0d6c65df8a2ca8d630182413800f4c10f4b9860ed752623b6f4864dd4969c757e06b2689c8c5da3377bfcc28ec223e531432add083cd4a68211ea1c
diff --git a/app-text/qpdf/qpdf-11.0.0.ebuild b/app-text/qpdf/qpdf-11.0.0.ebuild
deleted file mode 100644
index bd30e1e661fc..000000000000
--- a/app-text/qpdf/qpdf-11.0.0.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake bash-completion-r1
-
-DESCRIPTION="Command-line tool for structural, content-preserving transformation of PDF files"
-HOMEPAGE="https://qpdf.sourceforge.net/"
-# TODO: verify-sig
-SRC_URI="https://github.com/qpdf/qpdf/releases/download/v${PV}/${P}.tar.gz"
-SRC_URI+=" doc? ( https://github.com/qpdf/qpdf/releases/download/v${PV}/${P}-doc.zip )"
-
-LICENSE="|| ( Apache-2.0 Artistic-2 )"
-# Subslot for libqpdf soname version (just represent via major version)
-SLOT="0/$(ver_cut 1)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris"
-IUSE="doc examples gnutls ssl test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	media-libs/libjpeg-turbo:=
-	sys-libs/zlib
-	ssl? (
-		gnutls? ( net-libs/gnutls:= )
-		!gnutls? ( dev-libs/openssl:= )
-	)
-"
-DEPEND="
-	${RDEPEND}
-	test? (
-		app-text/ghostscript-gpl[tiff(+)]
-		media-libs/tiff
-		sys-apps/diffutils
-	)
-"
-BDEPEND="
-	dev-lang/perl
-	doc? ( app-arch/unzip )
-"
-
-DOCS=( ChangeLog README.md TODO )
-
-src_configure() {
-	# Keep an eye on https://qpdf.readthedocs.io/en/stable/packaging.html.
-	local mycmakeargs=(
-		-DINSTALL_EXAMPLES=$(usex examples)
-
-		# Breaks install with USE=-doc in 11.0.0?
-		#-DINSTALL_MANUAL=ON
-	)
-
-	if use ssl ; then
-		local crypto_provider=$(usex gnutls GNUTLS OPENSSL)
-		myconf+=(
-			-DDEFAULT_CRYPTO=${crypto_provider}
-			-DREQUIRE_CRYPTO_${crypto_provider}=ON
-		)
-	fi
-
-	cmake_src_configure
-}
-
-src_install() {
-	if use doc ; then
-		mv "${WORKDIR}"/${P}-doc "${BUILD_DIR}"/manual/doc-dist || die
-	fi
-
-	cmake_src_install
-
-	# Completions
-	dobashcomp completions/bash/qpdf
-
-	insinto /usr/share/zsh/site-functions
-	doins completions/zsh/_qpdf
-}
diff --git a/app-text/qpdf/qpdf-11.1.0-r2.ebuild b/app-text/qpdf/qpdf-11.1.0-r2.ebuild
deleted file mode 100644
index 774c671b8246..000000000000
--- a/app-text/qpdf/qpdf-11.1.0-r2.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake bash-completion-r1
-
-DESCRIPTION="Command-line tool for structural, content-preserving transformation of PDF files"
-HOMEPAGE="https://qpdf.sourceforge.net/"
-# TODO: verify-sig
-SRC_URI="https://github.com/qpdf/qpdf/releases/download/v${PV}/${P}.tar.gz"
-SRC_URI+=" doc? ( https://github.com/qpdf/qpdf/releases/download/v${PV}/${P}-doc.zip )"
-
-LICENSE="|| ( Apache-2.0 Artistic-2 )"
-# Subslot for libqpdf soname version (just represent via major version)
-SLOT="0/$(ver_cut 1)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris"
-IUSE="doc examples gnutls ssl test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	media-libs/libjpeg-turbo:=
-	sys-libs/zlib
-	ssl? (
-		gnutls? ( net-libs/gnutls:= )
-		!gnutls? ( dev-libs/openssl:= )
-	)
-"
-DEPEND="
-	${RDEPEND}
-	test? (
-		app-text/ghostscript-gpl[tiff(+)]
-		media-libs/tiff
-		sys-apps/diffutils
-	)
-"
-BDEPEND="
-	dev-lang/perl
-	doc? ( app-arch/unzip )
-"
-
-DOCS=( ChangeLog README.md TODO )
-
-src_configure() {
-	# Keep an eye on https://qpdf.readthedocs.io/en/stable/packaging.html.
-	local mycmakeargs=(
-		-DINSTALL_EXAMPLES=$(usex examples)
-
-		# Breaks install with USE=-doc in 11.0.0?
-		#-DINSTALL_MANUAL=ON
-	)
-
-	if use ssl ; then
-		local crypto_provider=$(usex gnutls GNUTLS OPENSSL)
-		local crypto_provider_lowercase=${crypto_provider,,}
-		mycmakeargs+=(
-			-DDEFAULT_CRYPTO=${crypto_provider_lowercase}
-			-DREQUIRE_CRYPTO_${crypto_provider}=ON
-		)
-	fi
-
-	cmake_src_configure
-}
-
-src_install() {
-	if use doc ; then
-		mv "${WORKDIR}"/${P}-doc "${BUILD_DIR}"/manual/doc-dist || die
-	fi
-
-	cmake_src_install
-
-	# Completions
-	dobashcomp completions/bash/qpdf
-
-	insinto /usr/share/zsh/site-functions
-	doins completions/zsh/_qpdf
-}
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index 074e9409ed3f..0783fc53288a 100644
Binary files a/dev-cpp/Manifest.gz and b/dev-cpp/Manifest.gz differ
diff --git a/dev-cpp/amqp-cpp/Manifest b/dev-cpp/amqp-cpp/Manifest
index d21f1205eea6..9df3452ed472 100644
--- a/dev-cpp/amqp-cpp/Manifest
+++ b/dev-cpp/amqp-cpp/Manifest
@@ -1,5 +1,3 @@
-DIST AMQP-CPP-4.3.16.tar.gz 158954 BLAKE2B 175c5c22a88e20ca5d123fbf808a354a0b3048a0127ba75170b61e8c8822ba8d8b78cb4247cb26cfeebff92c0ca74213d6fb254afbc74e9f92a88751137e8c97 SHA512 bdce6a93f3b88a0ab26dae66e289f98194d0f1a3e2eb03e0c858111275a02ebec042dfe9d757989a1c0cbe1b15652346f86008bf4248e366d1896c4750d9194f
-DIST AMQP-CPP-4.3.17.tar.gz 160729 BLAKE2B 963b32e4736627da3eece481168565136ad6fd387e71a04de9d08664b6877a38e084e27f482c2c24886bff5c78dcdf266fab88189dc2eef85f3b50d15d020565 SHA512 763e9a3d6565584753a5bcd8f4e8b174327f206e01f001ae8b4b7d1728ccebf195cd2d4463a8b65badc1a91010978360f6f5c25fd3acf70116b5ff7eba2db7f6
-EBUILD amqp-cpp-4.3.16.ebuild 834 BLAKE2B b2d244cb41c8741b987c20fc197b8d5bdd4c61118e960873dacedf8d7d632d0e3a8972d3c1c7d600aa6d9ca445a32dd07b577c99ae19019ee451f6fe1cb61ca8 SHA512 053f40f13197b584bc96049ab3095d077d236770d34c635ca86703b57192c07cbf5d87b1ce4c6637b26fe3d1245bf186fee117d7c32151ca8b3b6a149fb743b8
-EBUILD amqp-cpp-4.3.17.ebuild 834 BLAKE2B b2d244cb41c8741b987c20fc197b8d5bdd4c61118e960873dacedf8d7d632d0e3a8972d3c1c7d600aa6d9ca445a32dd07b577c99ae19019ee451f6fe1cb61ca8 SHA512 053f40f13197b584bc96049ab3095d077d236770d34c635ca86703b57192c07cbf5d87b1ce4c6637b26fe3d1245bf186fee117d7c32151ca8b3b6a149fb743b8
+DIST AMQP-CPP-4.3.18.tar.gz 160732 BLAKE2B 3c3d77772c21dcd461cf92b67d7e8cfac5a2052a81aade2fd00eca75d4991f9cfc6cfa397924361a7a8a28accb98153c2a50bda259726e81513a1d910390f3d5 SHA512 950d84a769ccbbf146be617297e81d8f036096bcbe5ca520d4b909549bf8d74fc576eec90a1fafb164b86c9eb693c3ae29d884c3a30749f04440646549ffe5ce
+EBUILD amqp-cpp-4.3.18.ebuild 834 BLAKE2B b2d244cb41c8741b987c20fc197b8d5bdd4c61118e960873dacedf8d7d632d0e3a8972d3c1c7d600aa6d9ca445a32dd07b577c99ae19019ee451f6fe1cb61ca8 SHA512 053f40f13197b584bc96049ab3095d077d236770d34c635ca86703b57192c07cbf5d87b1ce4c6637b26fe3d1245bf186fee117d7c32151ca8b3b6a149fb743b8
 MISC metadata.xml 349 BLAKE2B 509cb064b08453cac6096be89d5a07a198a62983cb186d146872a97f9543f615dbb3039c606fb4bcdf877c0d10c1ab4654d1019d7dca2920c48645553ee556f1 SHA512 792290af273069d20eeae7b21409d31aed2b3f9c001dcb72fdceba58150eae68791e832ebe8747bb11a0d31da62922cd46e22eebd95a46c6329492e3ad6a487c
diff --git a/dev-cpp/amqp-cpp/amqp-cpp-4.3.17.ebuild b/dev-cpp/amqp-cpp/amqp-cpp-4.3.17.ebuild
deleted file mode 100644
index 33a052a82f5f..000000000000
--- a/dev-cpp/amqp-cpp/amqp-cpp-4.3.17.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-MY_PN=${PN^^}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="AMQP-CPP is a C++ library for communicating with a RabbitMQ message broker"
-HOMEPAGE="https://github.com/CopernicaMarketingSoftware/AMQP-CPP"
-SRC_URI="https://github.com/CopernicaMarketingSoftware/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-src_prepare() {
-	sed \
-		-e "s:DESTINATION lib:DESTINATION $(get_libdir):g" \
-		-e "s:DESTINATION cmake:DESTINATION $(get_libdir)/cmake/${PN/-/}:g" \
-		-i CMakeLists.txt || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DAMQP-CPP_BUILD_SHARED=ON
-		-DAMQP-CPP_LINUX_TCP=ON
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-cpp/amqp-cpp/amqp-cpp-4.3.16.ebuild b/dev-cpp/amqp-cpp/amqp-cpp-4.3.18.ebuild
similarity index 100%
rename from dev-cpp/amqp-cpp/amqp-cpp-4.3.16.ebuild
rename to dev-cpp/amqp-cpp/amqp-cpp-4.3.18.ebuild
diff --git a/dev-cpp/argparse/Manifest b/dev-cpp/argparse/Manifest
index 3c0de07fc721..5a2e6f57660d 100644
--- a/dev-cpp/argparse/Manifest
+++ b/dev-cpp/argparse/Manifest
@@ -1,5 +1,3 @@
-DIST argparse-2.1.tar.gz 72452 BLAKE2B eece3f1cf6a2e58f5bec99f0223b31ba92147964053d98122099dd806a0ab62c6039ee8741281d1eca28b9d0e3aa02d7d076e8bcc64bbd5dd03c777f8e460531 SHA512 35746e0b526bd4406c954ab315f191abc57b08b48a047f108ddacc7baace406d3ddddb1af23d41caff565afecfeb41dfedd27a08cdba8d11b59dbe7c78b7e9b0
-DIST argparse-2.6.tar.gz 93865 BLAKE2B 5ab49a1e9d85e1252b4066fb3278b6c34c0e813f6b49063196cb294544a3adaf45930295834786d41ebbe483b4704be45e90e3a1d53e5085529e78e0b07fad0d SHA512 778e405b7790906794506a2175279465c7d7efa905d0848807fcbddf5ff827e9556a3f2660ee0207a70195a8e9e652ba37ba4df2a038d8646339525cec0f1784
-EBUILD argparse-2.1-r1.ebuild 362 BLAKE2B bb3a1df0edfab8253250f85f4a217c226b4bf027abf43c683e7e5157c4434ee6aeeb1b4353d5e3d6072e54a058884f011b7c0e964dc93a6719a2ef0e07374823 SHA512 44248666587c9e25b4593829de629f401831c6b5ef160c212ced47b6ed4212ddcf340fcab89b8e488e99409fa6b32acedf43acd329bcfb16fa27e60bba58254b
-EBUILD argparse-2.6.ebuild 569 BLAKE2B c4378b69b06072bc37879d6555a594c5fd0ba0eb75969e42c034d629e34e7d7c0eda02b930d344d72eab52ba84ce0abbc49ee204bc5305730411523ea6cf055b SHA512 5fcef85bc8807a208c087d847deed4861fdf5ff1586c5f7bd2247c22f8c56e2021afa7c00f5cf5706e108d6a3c31499d286336aa4173250180cffb88cda64161
+DIST argparse-2.9.tar.gz 103147 BLAKE2B 2862acd7dc43dea0f7a7a1e6c9541ec8e7b7ecc70ce72ad327b34f72a330799475490e7da4e3a07c9ab28ddec4f88911514690c8b438f36d7c02704fe26b0f08 SHA512 fa471e7d8c448510376e79927496f62775e6ed37e1dffefd607839e6005dfbc61125d0e18bfc1ff20f86cef7efd75339d7bb143dc6574d988f83c7c96896fa5f
+EBUILD argparse-2.9.ebuild 569 BLAKE2B c4378b69b06072bc37879d6555a594c5fd0ba0eb75969e42c034d629e34e7d7c0eda02b930d344d72eab52ba84ce0abbc49ee204bc5305730411523ea6cf055b SHA512 5fcef85bc8807a208c087d847deed4861fdf5ff1586c5f7bd2247c22f8c56e2021afa7c00f5cf5706e108d6a3c31499d286336aa4173250180cffb88cda64161
 MISC metadata.xml 330 BLAKE2B b2116c014f0385ca1a4d617dcb6c48ee60e39d82630fb716230c27f4de79ec6cd4611f9194aa9d8555cdb54e2cc22ab0a96cd755231ef99e272877a490226e5b SHA512 ef007277e64f992e40944f540606c9908ac87284d73dfcf252caa885da6c381bb33640544e841b857483c24dfcc5250a6e59a082cb463a02c059afd23069d686
diff --git a/dev-cpp/argparse/argparse-2.1-r1.ebuild b/dev-cpp/argparse/argparse-2.1-r1.ebuild
deleted file mode 100644
index 67e32ea4d3d2..000000000000
--- a/dev-cpp/argparse/argparse-2.1-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="Argument Parser for Modern C++"
-HOMEPAGE="https://github.com/p-ranav/argparse"
-SRC_URI="https://github.com/p-ranav/argparse/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
diff --git a/dev-cpp/argparse/argparse-2.6.ebuild b/dev-cpp/argparse/argparse-2.9.ebuild
similarity index 100%
rename from dev-cpp/argparse/argparse-2.6.ebuild
rename to dev-cpp/argparse/argparse-2.9.ebuild
diff --git a/dev-cpp/highway/Manifest b/dev-cpp/highway/Manifest
index fd8d992bf1e6..37fc6ee72f46 100644
--- a/dev-cpp/highway/Manifest
+++ b/dev-cpp/highway/Manifest
@@ -2,6 +2,6 @@ AUX highway-0.16.0-fix-AVX512-detection-on-IceLakeClient.patch 569 BLAKE2B 89915
 DIST highway-0.16.0.tar.gz 1639388 BLAKE2B 660b0079b25a12a2e982b4ba16147b923d167989a7dc1c0cb65ebe5219577f2f02c8774a554fd3fe9e1c10ef7b1cf5db747500bd8acf454e26952722f7b5ac9e SHA512 c08e66f43d9d0b307737b016cfa6c3d3a1df9bd528de435d193388104f34c264866c5ff0da633fc0a6f8c50f21df1ac653e9dd3f6fbfaf227d636411ac14cd47
 DIST highway-1.0.1.tar.gz 1730746 BLAKE2B 1c6185af91afe32fbb35285d49101d381ade7ded262cbcd3b0a8bf28b1924a76ac5a11423a1613068f3435fbbdd2ab0119aa8a1aafe2c3467e0aff1987f40aad SHA512 35b6287579b6248966b0d36fda1522fd6338523934b079e94e857f9de08354f20b99739c99d53249a3a6c583519da0e0ac5e06dfbe6e3a89262f627c75b59dd8
 EBUILD highway-0.16.0-r1.ebuild 916 BLAKE2B 17410588cab5c08a1da3ca44eb583925d599193db12c6f37defddad4013c9dd276de7ff697ebf7fd226b29ab07175061e56fdc4fa355e4c1fdfadd3b55cadc7f SHA512 378b957de0be23be595567c5ba100e958d0defe3331a8672e0c8e36158d277a77ed43fb94a5e71e49343873dc4a3b8d7dc04a5f8931d66cf7bb7794a77f7fd77
-EBUILD highway-1.0.1-r1.ebuild 905 BLAKE2B 113cc92ab5430b7906efa440f86a459be49f90964526af7928d3f37fff09fe05ec0c306d5026c603b8811ae413615511e707f95de66b91cfae5cc4d3897e2e64 SHA512 f22e87e3a87be3460ad8e4a5fdaa8a2a009ec3b01ecfc6170eb9eb65ce57ff5840b8701925004a7c7e893474df5f4537dc51c8f483def609ba47231efe30da71
+EBUILD highway-1.0.1-r1.ebuild 904 BLAKE2B ec30579ca24c6fddccb2a991ba0d68c36d4f7e15a7cc367f506b281a216b11989227a2dfc785c9d94cc5b893bd8ff89aee3ddcf8548d7c2a52e656bdb7ba086a SHA512 aafce4c6783053a919600c9efb2de3a18713dbe366453f68532bc916a16dc4165de3cfea5cde2555e22895231e60c47c3e18e1575e252c8d6fa48a0128398e1f
 EBUILD highway-9999.ebuild 911 BLAKE2B 6a008f19eddd676ee0d1d1978aaf3457eb9d7398e9a34fd493782b7a42053cfda73a663a4f0cc902cc5bf9293622355dc410021fe722434a320c82c06c4e68a6 SHA512 9b586d99ee8faf0db0c882f515b30fb022ee9462d49f32e8913107d14ef43a575b699003204357c64f6306cf87a91482cc01fdb15cbb08fec5ea142cfe2367fb
 MISC metadata.xml 617 BLAKE2B 85392a8a226aa984039fed26796d0baf6bdb38da7084932e59ec6dcf882ba11863066adff2caffcb34b2b9f337b539c64498cf48c4eea43364ebf2522ea9971f SHA512 5ec72623048e7c940af745ca256671402dc2126004b2be29e01891619c119f847ba1ed72b99f66ee44b8076510833444f5c733a9724e1b9eb13bc58a125e16e4
diff --git a/dev-cpp/highway/highway-1.0.1-r1.ebuild b/dev-cpp/highway/highway-1.0.1-r1.ebuild
index 5266f6feb59b..593d67993d48 100644
--- a/dev-cpp/highway/highway-1.0.1-r1.ebuild
+++ b/dev-cpp/highway/highway-1.0.1-r1.ebuild
@@ -13,7 +13,7 @@ if [[ "${PV}" == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/google/highway.git"
 else
 	SRC_URI="https://github.com/google/highway/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm arm64 ppc ppc64 ~riscv sparc x86"
+	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86"
 fi
 
 LICENSE="Apache-2.0"
diff --git a/dev-cpp/rapidfuzz-cpp/Manifest b/dev-cpp/rapidfuzz-cpp/Manifest
index 158dca789903..9ba780b719df 100644
--- a/dev-cpp/rapidfuzz-cpp/Manifest
+++ b/dev-cpp/rapidfuzz-cpp/Manifest
@@ -1,5 +1,7 @@
 DIST rapidfuzz-cpp-1.7.0.gh.tar.gz 252646 BLAKE2B 5d79c07e26b6bb8e84d3280c3401bad60a3ca9846977a5bf9b13787ed7951c3805c71b7e6e2e03b14e2b988381484d969e1cc885c316bcb805b403e53332b31b SHA512 ed8af678a40161aa738bd3606b41fd54c1dba603c47fbdb1182527abd5667736e50f458af252e7bde954f263040cdbd662ad1c6be0a5caa5289f0a351dfd6d9e
 DIST rapidfuzz-cpp-1.8.0.gh.tar.gz 280419 BLAKE2B ae6b7694df3f8ba97b369608bb02783bdd48572e80a9d4f0ee51585975aaee1c0ee058862b94a7a8e46f835b03c04d134143ed07fb5c6d412b4b5cff8686c6d3 SHA512 35729c90494b419fefd9c6bbd03e42cc485d421defcd65bf5dee776d4d0756318a90456980914ccebc100b1bb388474db54638a8628efd496764c604d6221688
+DIST rapidfuzz-cpp-1.9.0.gh.tar.gz 281385 BLAKE2B 4afc48edd9c8270200645eb77065bf212b9579b90b3916e261bbe69fd60f67c1e510c3ae4ef9877a26c3313063717b362e01c6cf799a0f9fc3429799d9b2dca6 SHA512 d95c90f9118811d650d859a20f847c71427acbc8c4f907f49d23b069cd6d1a848749d32f8fbff7326828b7a030c3f488acacba5845a72a0057ccf4c3088badf4
 EBUILD rapidfuzz-cpp-1.7.0.ebuild 825 BLAKE2B b4323c2873210fe0bd3ed5fdd79d45fa552f2e9c48bea3144c98dc4a2e9cc52119b4b16926d08a8a12d0c92f89d2598662da22a4d4130192e5c40958e9000289 SHA512 bcb6ff63843c3e50ad6c80cee4b2c94a98c96946fee0970ca1997a1185c0587e5f87e88c6051803813791f1f9537f9e4927f3903e5974954b1485939c4198998
 EBUILD rapidfuzz-cpp-1.8.0.ebuild 832 BLAKE2B 5fdd97deaab9825fa681d7e3368532acd52e441d0e7d904ce4d039a85ec1f4a92c78083a6969a55b6a8681d128f17ed21d99bc62125cf85bfa408e58c45aa825 SHA512 c10d398604743e5804720ccafe52a76cab39d3ff59d6f6a97d8fb9ef45df5a8a49d48f94246785189d02bca1c96cdd9dcf33c1223df26e5655d752fd28cff35a
+EBUILD rapidfuzz-cpp-1.9.0.ebuild 832 BLAKE2B 5fdd97deaab9825fa681d7e3368532acd52e441d0e7d904ce4d039a85ec1f4a92c78083a6969a55b6a8681d128f17ed21d99bc62125cf85bfa408e58c45aa825 SHA512 c10d398604743e5804720ccafe52a76cab39d3ff59d6f6a97d8fb9ef45df5a8a49d48f94246785189d02bca1c96cdd9dcf33c1223df26e5655d752fd28cff35a
 MISC metadata.xml 338 BLAKE2B 43c0cb99a03961ca48146b237a22fbf56c90312b7a39b57a3d01dd532f4f01891e713c802b372b4efb0af528198d8f2c0febae6ffec65da152e8e23f7a67b8a4 SHA512 a54d78c951d15319a2e467dc5d5692d9af5ef9e79c9c9135ee5e26853361ec6bcfebab8e82e3299314f9b7c8cd703365ff6d144e7e6876f486ca5f3a02a3b0f7
diff --git a/dev-cpp/rapidfuzz-cpp/rapidfuzz-cpp-1.9.0.ebuild b/dev-cpp/rapidfuzz-cpp/rapidfuzz-cpp-1.9.0.ebuild
new file mode 100644
index 000000000000..6fb280d52d37
--- /dev/null
+++ b/dev-cpp/rapidfuzz-cpp/rapidfuzz-cpp-1.9.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Rapid fuzzy string matching in C++"
+HOMEPAGE="https://github.com/maxbachmann/rapidfuzz-cpp/"
+SRC_URI="
+	https://github.com/maxbachmann/rapidfuzz-cpp/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	test? (
+		>=dev-cpp/catch-3
+	)
+"
+
+src_prepare() {
+	# apparently "C++ best practices" don't mind fetching random stuff
+	# at build time
+	sed -i -e '/aminya/,/^)/d' test/CMakeLists.txt || die
+	find -name 'CMakeLists.txt' -exec \
+		sed -i -e 's:project_warnings::' {} + || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DRAPIDFUZZ_BUILD_TESTING=$(usex test)
+	)
+	cmake_src_configure
+}
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 6dc56a3725a9..30eca8c75f22 100644
Binary files a/dev-db/Manifest.gz and b/dev-db/Manifest.gz differ
diff --git a/dev-db/kdb/Manifest b/dev-db/kdb/Manifest
index 77fb1ef5557f..6e975917d1b5 100644
--- a/dev-db/kdb/Manifest
+++ b/dev-db/kdb/Manifest
@@ -1,5 +1,5 @@
 AUX kdb-3.2.0-postgresql-gcc12.patch 1355 BLAKE2B 1884b7b1db9a60a625722a3d20cfc8aece7320675aaa627737edd841997859de9ac499f8c07101eed67d1190a66334a23a99562819f30466f5c56fc566f437a0 SHA512 c6527802b3c34661717fd190f11385d8a4338ec5e3757ebdbc48df36ef40d7f6bcf44cba221faeef95507045840a5652e996b1621890c25d3944df1a4089607a
 DIST kdb-3.2.0-patches.tar.xz 7448 BLAKE2B 924a3ac0db2fedfa6d757dcb96fefc48540d5bee7dd2e1239e0e7eca9765393e3b72b13365a66a8e336a655aa4c8978e800f3baa86b704e85134d0c7281b90d7 SHA512 4fe59f33059dcfe19a26bed93615ce152f321f040daa57a2e6747a397aebbc896cd6c964cd2cb1350762552173ff146e4e51b864aa098ec5ae77e0dd6c6d9a2f
 DIST kdb-3.2.0.tar.xz 650180 BLAKE2B 306152b37c2ecc670d26a2df2ae8acb950505ecb37c4994f4debd1b80c8b2ee94252658fe28b59255d9ad0d350375171f3b43dc9e94949417c3aa9ed167134fe SHA512 7df22f2c5b6e20ae3de71cb6c76b234d2f1f33b2abcdffa85be313c63d067a40a85ed102b6256207315db08ced5d69f8bc40afdf84a188463713a6b2ffdb2df7
-EBUILD kdb-3.2.0-r2.ebuild 1689 BLAKE2B 8d56e52f6c5ca655557ceffc9a52c04d63a19df1a1d20d5c715049f65aeb47e54c26c27abebaeb2a6d813a4bf045e86ceeb320c8f06a2d96a950c02cff38e53c SHA512 9f8b07d26d09936cff23f988f057f0f76392734413a2f36ee807251c5faed7bb396230ed269fb734c327da3e46017a3797ddd694d50c05a8875437061e642b4c
+EBUILD kdb-3.2.0-r2.ebuild 1689 BLAKE2B 4fe6a12259ded77bff2bb7a75e202643b4fdb021c8d57db6c5ba990265652375e266c493d3d67a853021fb8b9edbc6d7369eb9b8316905b713f16fca7a68ec75 SHA512 dc0ccad71bf7482945d08b5944719118bb17d94df76c36d585cee76b00e68dddf89fbbac0a307c101deefbc511a4fa12b96894307e17a693bbc2ee0bb9e53912
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/dev-db/kdb/kdb-3.2.0-r2.ebuild b/dev-db/kdb/kdb-3.2.0-r2.ebuild
index 94af5b00c771..206084f54682 100644
--- a/dev-db/kdb/kdb-3.2.0-r2.ebuild
+++ b/dev-db/kdb/kdb-3.2.0-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 ECM_QTHELP="true"
 ECM_TEST="true"
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 KFMIN=5.82.0
 QTMIN=5.15.2
 inherit ecm kde.org python-any-r1
diff --git a/dev-db/mydumper/Manifest b/dev-db/mydumper/Manifest
index 3f8ac2f49791..1a5dcfe5e25d 100644
--- a/dev-db/mydumper/Manifest
+++ b/dev-db/mydumper/Manifest
@@ -4,5 +4,5 @@ DIST mydumper-0.12.1.tar.gz 114268 BLAKE2B d8fd459c645e0a8c7f978f0b948b534d3e602
 DIST mydumper-0.12.5-3.tar.gz 131104 BLAKE2B 436c92474c498f17e7cfd723d7dbdd9f56f0a3cd42be88233dcfee6a2768ff49c795bb232e5f4bad1d6d9eb5e1cedf7fa812bc3dbc7a4eeb8fbb4894034a5960 SHA512 03c4a219877c61a3659561afd37ba095030edd0f44f922de51d4801a08cf6dc17c5fc8864f9b47d4d7c70a94bd2f814192ab1fa66f174e27d5d0e8a3a09a6b02
 EBUILD mydumper-0.11.5.2.ebuild 1104 BLAKE2B c9fa788e14d3d615da06cf9981442b0d1519ce116258462b73a77ce0d28dad1577e0da5ee0e9eb5a960b59a952a375633888f655716c78cdb76b4a16a9bcd728 SHA512 ff607256bd05bf3f3995963d6be4a9b850085a635752fd4e3fb9c6216136d0ab3a685eb17cc15cce901b1ac451b09f53a193c276d653130cce12be55789702c7
 EBUILD mydumper-0.12.1.ebuild 1103 BLAKE2B daed3504d8b4c475023b331b13bd57f2c76488fac0dc7011f0e5dbb5b4e2b451f7dd22fb89f93494b367b9506e5727bcf3b147119a0af2e235941ec26e08d5ad SHA512 3fc55c2a7af21182f1804fa1d212f741c271ed86a0c53156f0902060a27e68a78afe035ca70b5f3f394f1b360517159f68ecd0d75c42f06754b57db38b2a11c6
-EBUILD mydumper-0.12.5.3.ebuild 1103 BLAKE2B daed3504d8b4c475023b331b13bd57f2c76488fac0dc7011f0e5dbb5b4e2b451f7dd22fb89f93494b367b9506e5727bcf3b147119a0af2e235941ec26e08d5ad SHA512 3fc55c2a7af21182f1804fa1d212f741c271ed86a0c53156f0902060a27e68a78afe035ca70b5f3f394f1b360517159f68ecd0d75c42f06754b57db38b2a11c6
+EBUILD mydumper-0.12.5.3.ebuild 1102 BLAKE2B b0f68ddea15fd9e5224b87613a1007ce83dfa9af24c3a077ae952b0e72cafd1a166758a84179823327bba00a32ba640aac8804c669a39a306b6c0459d2386663 SHA512 5ca36b18540d946bb272892b350e456eec535d98fa9093614960bc943e63e35531d169586e8b5b8c232bb903a25c667838778420e778584e632b7873e2fa028b
 MISC metadata.xml 479 BLAKE2B a45a9746e2f5be11c4cd992e81135c8b39fa494c105f1f3c01586482b635596f1384690d0d1bfa3f08b8e33d1bd64b625fba07f410b8a8220a9a19f7f048f2dd SHA512 b0f20f8fb1b5eb3771d9a59869a3a28b0011642721dd12b5545b4f80456556f2f7a9da3b4b69c85cfae666534bad6143ae437b43b45179544626455a03b9218a
diff --git a/dev-db/mydumper/mydumper-0.12.5.3.ebuild b/dev-db/mydumper/mydumper-0.12.5.3.ebuild
index e4e2ef8601ec..b224046fa4f0 100644
--- a/dev-db/mydumper/mydumper-0.12.5.3.ebuild
+++ b/dev-db/mydumper/mydumper-0.12.5.3.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="doc"
 
 RDEPEND="app-arch/zstd
diff --git a/dev-db/pgpool2/Manifest b/dev-db/pgpool2/Manifest
index 8bb737a514f6..2b0db417eba0 100644
--- a/dev-db/pgpool2/Manifest
+++ b/dev-db/pgpool2/Manifest
@@ -1,19 +1,11 @@
 AUX pgpool-4.2.0-configure-memcached.patch 2023 BLAKE2B 6216bb0e83f2e66ab3b46d6fca08ec151ad18821b2ca3dba1f5444c553874ded5d839c11efe5031979c3f4d11aa8c2db0e68c35b77c415daf2b622fe332821dd SHA512 34de23f441a8b0ad4cc727ac450132c43b91d015ac4488f243b86305749a8cf1df967c19ddf9e6a5e3beb6dafff7680c7273dac316ee2d10b97b6c340b5cd5eb
 AUX pgpool-4.2.0-configure-pthread.patch 471 BLAKE2B 789cbcb435d64ef87d12379dc4d4e66b38e253286321d4994480c04635713bc272f0e70b25493189cea891f8a33be86a882c682cf7394c75cadf6c5ab5919e10 SHA512 3ba36eec9c2d22c4abc18aaa5a60a7713ed807f5d7d69c129ba16875082553875ab0ee9f03f59b490ac1973a1cf7c7adafabac8d2e3788c356a84eb399532fb6
-AUX pgpool-4.2.0-run_paths.patch 19114 BLAKE2B 1a3f545774b9389cdb16a09741e39d6b470580aa7e26d17ed32bcaf0d83e83e6772a3e6bbfbb4ec894088347d05d06f59a8ebacea6a1fe9ded4bd0d0ac184359 SHA512 65a4c32d2061608dea10f0a38dd6043a3f95ad087aea3867c3501bc56babb739c9f71ed3d9138fd7343a4d27049224eb4828ebb2aa79c8205bab3052be117ada
 AUX pgpool-4.3.1-run_paths.patch 4009 BLAKE2B bb9f4ce01af465b826559312d73c0bdb60fb1433a7e5bfc1db9bc5608a4408866e657a9e35c2b19ffb5ffebd7e1fa0b813c4da1754fd3e2449fd7d57fdeed54b SHA512 426da4fd0904fab31ebedbddab226d50b7fe173dd76524c7c515f92c8a348c186f1285c8e164f72aa2023499b993087b2c1b4f5c79cbfc1ed1e537de00be44b8
+AUX pgpool-9999-run_paths.patch 3772 BLAKE2B 37f98d76a06ac74ad1af4a917d795ee85e1890119361f0f8de92ef64a17ceafa7cb84f38fa795e569d35d6b3261e279a1f0caaa4e200cea610334339b6f81b1a SHA512 1a155c5e9c84d3b77adf0dbf93f4571ad0c4f91076a18aaafe45e84f5664442c8bc8ca5d11ceb6793ef4944b2b468980b38c67de307c676a451f5b0f44831108
 AUX pgpool-configure-pam.patch 1077 BLAKE2B 4dad8c20faf2ecb1c65e95b87d394d1c17c363d0337e830ea25efb88b1cb07d1a19fc1169ed9fbf69807347eba59296c276b33e0f786d32300e6c518b7a8c4ea SHA512 7c3b3f02977c7d9b1dbf7fb8905cca3a405ab856b8884bb9016dccb70650ed074af76ee81ee6cf2c1d4c366283af07ddb5c473960d81f7528d9d7afe762f9d4e
 AUX pgpool2.confd 649 BLAKE2B 1c520c4fa954c7411c1b700c03bf4e39196c599eb239cf86412fcf491759ca6f46b1264e7647a8d278ac45da3e20702f6f077dfbcccf83cb3f45575dd3571308 SHA512 5f9a4fa1e68161049ad767d64c764fbf70e84a4239e58119455a45a7e45d86ea2d19b617147cf891053e0dad4420c84704d67015334c7d41bad05b260d70e910
 AUX pgpool2.initd 2162 BLAKE2B b04f6b952507b8e4815c7b27f09b59ffe64f6262719c5490377fdbc5f8490cdead18fdbeb0ce8379d9cbd4bbb1aa21221d61853ff49a456a5ef6a8d78f3f5129 SHA512 05dd358d20bae60cfdefd7116b1111288b5a2be6d68a9dc40eaf6ba641524d422f2faac79bd3c629cee4f8b1ca601a9b6e303d4228e538d742ea407b6190ee53
-DIST pgpool-II-4.2.1.tar.gz 4713114 BLAKE2B 207cb3c43e47d40385d6808195561117293e5acec6bc34664ec7a1d8754bf9beb8c5350252a4274d4c50520254089f0e5a5fdfc0faf778186fa8000db6124df2 SHA512 b859a3952f69dd98a3df60b33b801d3bc96b9a11757593795a89751abe558c6baab10a37701d69d415c9da26a16abcdc72e0209e74c62204facfb25cdbc512f8
-DIST pgpool-II-4.2.2.tar.gz 4734840 BLAKE2B 2b4d26991732293e1411d1219f85a8c9ad1dca72c63069381ae1377a02ae215e813356172f3b89b42b9140549c92c76d443b125bb65cbc6abf03d2b99cf18dab SHA512 a147c810cc691fb27b823a813cbd2eaad66822c7c9f5c0f829cc70d4ac65911bbe827640f2dbd8060913276ed97340b52167e4332e9cdf013b6c9bc144c7b5d8
-DIST pgpool-II-4.2.9.tar.gz 4642836 BLAKE2B 75cfaf86d2e7a4f9677b7d5a98b783e25458e282b682979d31023372dd827dd0b52bf684949e9c97e404c383ab8b2f526e40b00e643d3d6566c702b111a13e34 SHA512 b0256095298e1c1ee50133b4bdc5716aea52f2ab6dc4dc4152ca0415f9b5ccfc14f97d6af1167e69fa1e2b0fd37468a5a10a1cffd8dfcea8e93b11616a66cf42
-DIST pgpool-II-4.3.1.tar.gz 6034811 BLAKE2B 6ca2a27eefc2b20186d0e5cbdfd838f429d9996e299ab177e655ed69aa214e676029db728b16020dbdc49d9036fe7aad71d6abb12b486a4cf8fb8348bb201c6c SHA512 a5417d9f5baa1b39e3645f7d44accf0a2f04d5fc5cb4d28089169aaebbd15c20b4cd280d09f15fa764c3b793117086fc03f5d7be584c0c5ff9c5f8e11ddb9ef8
 DIST pgpool-II-4.3.2.tar.gz 5846769 BLAKE2B 82cfe7095ad303ac3a910c533d6e57edb4e3d5b28a9a9bffb2df473dd3087ec329d3a77f9490d9bb738d5d1a443020d96d0e9a1b1d6adecc04cce5d1caa04e7d SHA512 771426257eddb5c48504c80a2c8cccf44a18f7ea50df55654b7e9e017bda561a73a3e1f0db79785785ff6893d6df26f73b55310d0184ef3301838d12290d3d4c
-EBUILD pgpool2-4.2.1-r2.ebuild 2385 BLAKE2B 02e2a2b25faf32d0cac4ded29ef6be7751e3fb02e6887ca0449375055c82711b095813890250cc7a3cffc1dd76392010a7bfb35a6f19809d0d1715afc7a9d19d SHA512 2c657926d9a44b369e424111def6d72ba7bf3979f33b516ff071d55d382b3bb89b0adc2c0bf60d1abbf2f94d077cac05b1ea14207fc249247a3e46bbb60b30dd
-EBUILD pgpool2-4.2.2-r2.ebuild 2386 BLAKE2B 877085b5eeceb6fcbfbaf097c85bf4090d855ed8adff5ac52f83efb613432899bb6b03ace5f7523ea248409e11c88b22aa956b837dca617b2b90071de086ef6e SHA512 b7136a85a7e6a4a696d7a3baf8cd97c9762a6e0cbfbbecd33da4ef583f98e65905c4fe49cdfbf961feb6435e1b90992a784013a65c36289acf5214ff474a9f18
-EBUILD pgpool2-4.2.9.ebuild 2370 BLAKE2B 2d5ac6f8983a3ae52ee1c0e4f95af7b8ba0d9c603fb99950b73fd66519b1ad4d0feab014b192d506c7d8adb6201a1470463e907804a6c5214112cf277f8266c7 SHA512 773356a22f55b2cb485d388013f681778b8955c2966c41de12c74c014f8e12a9cff6e311fad84cc4167f0b51cbde88ff2932d00f7c5f6d4fc145ce483189859e
-EBUILD pgpool2-4.3.1.ebuild 2319 BLAKE2B 3c5663663db3a4e5dc87ea1c522ae79ee07bb217fd6720f9eed2bcc53c22f99e69c0eb5e2361b1b37e54c9013c2d10ac5f258a2507607f430d5ec1f98397f593 SHA512 d62c1383ac31af5db62e72415de448e464471f4b133c8de26c12b03f2ebc72090fe241113d3dc84faafb416c97b45a1ac1642aaa73bb3a3aae8a9108ec2d4585
 EBUILD pgpool2-4.3.2.ebuild 2317 BLAKE2B 5a932d7b01e5e3b2ee8811fb68de3caf131ecb589851aa808fff055701fb2627d033b7483bde12d0f5f74ab64b51485d07b7d830b343bb2e085635eb5643634a SHA512 dbde38f5939a008e3940b2237f4230f7342f38da031e7a84b935232a7f72b77cbd4764a13c6cbe4ef6a7742b443e6bd16088a9ca96770f81b26f82d35b2a92ae
-EBUILD pgpool2-9999.ebuild 2429 BLAKE2B 6e153bb0a6369f55918b043f201ab9e3077098a6e638abbcd2a187014899ac516e1210d2f99c0d9a95e2740ea8533e8d4de67c7febb406fb8837d99785c98625 SHA512 97863b967c82901f19ad8ee64b22fd12b150225e2b8946a7209cd04ff6f92bd72c4619679c55fe22dd77c9b4e21657a4a2eb36ab996bb5bdd64553c046ccb2b4
+EBUILD pgpool2-9999.ebuild 2413 BLAKE2B fc0e0c1fb7b13f81eec53c1d878e4fc455a4112e9ff1b96e0a5c38dbf3fdd3e3563b0c6b62387fda876bc9cb76b19c880506f93412aeb14680c9f875ba062477 SHA512 f343781e12622108647be5e06f4eb735e6fd9cb0137be548a5f30076f01c35f710062a0b56c9eadbedb4df8fac8bb890456b485bbe34848994629a8928d1d684
 MISC metadata.xml 391 BLAKE2B c5855fde95e138709d778b50b897ea0dd75267547e89faf60988d1dfe78740c313291a226c30fdd618ef2893ad3dc11000b33026e04369fe294ca9ed1e18efb1 SHA512 374bd70841f1f13e2f8265f972e2debc7fb79a3f463efb897a75fd8ddc3163edf82c888d3d8d5bfede6c509fc27f67e74592599b8da8640035a5d4241cad98c1
diff --git a/dev-db/pgpool2/files/pgpool-4.2.0-run_paths.patch b/dev-db/pgpool2/files/pgpool-4.2.0-run_paths.patch
deleted file mode 100644
index 2eca0fd59185..000000000000
--- a/dev-db/pgpool2/files/pgpool-4.2.0-run_paths.patch
+++ /dev/null
@@ -1,432 +0,0 @@
-diff -Naruw a/src/include/parser/pg_config_manual.h b/src/include/parser/pg_config_manual.h
---- a/src/include/parser/pg_config_manual.h
-+++ b/src/include/parser/pg_config_manual.h
-@@ -228,7 +228,7 @@
-  * support them yet.
-  */
- #ifndef WIN32
--#define DEFAULT_PGSOCKET_DIR  "/tmp"
-+#define DEFAULT_PGSOCKET_DIR  "/run/postgresql"
- #else
- #define DEFAULT_PGSOCKET_DIR ""
- #endif
-diff -Naruw a/src/include/pcp/pcp_stream.h b/src/include/pcp/pcp_stream.h
---- a/src/include/pcp/pcp_stream.h
-+++ b/src/include/pcp/pcp_stream.h
-@@ -49,6 +49,6 @@
- extern int	pcp_write(PCP_CONNECTION * pc, void *buf, int len);
- extern int	pcp_flush(PCP_CONNECTION * pc);
- 
--#define UNIX_DOMAIN_PATH "/tmp"
-+#define UNIX_DOMAIN_PATH "/run/pgpool"
- 
- #endif							/* PCP_STREAM_H */
-diff -Naruw a/src/include/pool.h b/src/include/pool.h
---- a/src/include/pool.h
-+++ b/src/include/pool.h
-@@ -69,16 +69,16 @@
- #define HBA_CONF_FILE_NAME "pool_hba.conf"
- 
- /* pid file directory */
--#define DEFAULT_LOGDIR "/tmp"
-+#define DEFAULT_LOGDIR "/run/pgpool"
- 
- /* Unix domain socket directory */
--#define DEFAULT_SOCKET_DIR "/tmp"
-+#define DEFAULT_SOCKET_DIR "/run/postgresql"
- 
- /* Unix domain socket directory for watchdog IPC */
--#define DEFAULT_WD_IPC_SOCKET_DIR "/tmp"
-+#define DEFAULT_WD_IPC_SOCKET_DIR "/run/pgpool"
- 
- /* pid file name */
--#define DEFAULT_PID_FILE_NAME "/var/run/pgpool/pgpool.pid"
-+#define DEFAULT_PID_FILE_NAME "/run/pgpool/pgpool.pid"
- 
- /* status file name */
- #define STATUS_FILE_NAME "pgpool_status"
-diff -Naruw a/src/sample/pgpool.conf.sample b/src/sample/pgpool.conf.sample
---- a/src/sample/pgpool.conf.sample
-+++ b/src/sample/pgpool.conf.sample
-@@ -39,10 +39,8 @@
- port = 9999
-                                    # Port number
-                                    # (change requires restart)
--socket_dir = '/tmp'
-+socket_dir = '/run/postgresql'
-                                    # Unix domain socket path
--                                   # The Debian package defaults to
--                                   # /var/run/postgresql
-                                    # (change requires restart)
- reserved_connections = 0
-                                    # Number of reserved connections.
-@@ -59,10 +57,8 @@
- pcp_port = 9898
-                                    # Port number for pcp
-                                    # (change requires restart)
--pcp_socket_dir = '/tmp'
-+pcp_socket_dir = '/run/pgpool'
-                                    # Unix domain socket path for pcp
--                                   # The Debian package defaults to
--                                   # /var/run/postgresql
-                                    # (change requires restart)
- listen_backlog_multiplier = 2
-                                    # Set the backlog parameter of listen(2) to
-@@ -286,13 +282,13 @@
- # FILE LOCATIONS
- #------------------------------------------------------------------------------
- 
--pid_file_name = '/var/run/pgpool/pgpool.pid'
-+pid_file_name = '/run/pgpool/pgpool.pid'
-                                    # PID file name
-                                    # Can be specified as relative to the"
-                                    # location of pgpool.conf file or
-                                    # as an absolute path
-                                    # (change requires restart)
--logdir = '/tmp'
-+logdir = '/run/pgpool'
-                                    # Directory of pgPool status file
-                                    # (change requires restart)
- 
-@@ -659,10 +655,8 @@
-                                     # Authentication key for watchdog communication
-                                     # (change requires restart)
- 
--wd_ipc_socket_dir = '/tmp'
-+wd_ipc_socket_dir = '/run/pgpool'
-                                     # Unix domain socket path for watchdog IPC socket
--                                    # The Debian package defaults to
--                                    # /var/run/postgresql
-                                     # (change requires restart)
- 
- 
-diff -Naruw a/src/sample/pgpool.conf.sample-logical b/src/sample/pgpool.conf.sample-logical
---- a/src/sample/pgpool.conf.sample-logical
-+++ b/src/sample/pgpool.conf.sample-logical
-@@ -38,10 +38,8 @@
- port = 9999
-                                    # Port number
-                                    # (change requires restart)
--socket_dir = '/tmp'
-+socket_dir = '/run/postgresql'
-                                    # Unix domain socket path
--                                   # The Debian package defaults to
--                                   # /var/run/postgresql
-                                    # (change requires restart)
- reserved_connections = 0
- 				   # Number of reserved connections.
-@@ -58,10 +56,8 @@
- pcp_port = 9898
-                                    # Port number for pcp
-                                    # (change requires restart)
--pcp_socket_dir = '/tmp'
-+pcp_socket_dir = '/run/pgpool'
-                                    # Unix domain socket path for pcp
--                                   # The Debian package defaults to
--                                   # /var/run/postgresql
-                                    # (change requires restart)
- listen_backlog_multiplier = 2
-                                    # Set the backlog parameter of listen(2) to
-@@ -286,13 +282,13 @@
- # FILE LOCATIONS
- #------------------------------------------------------------------------------
- 
--pid_file_name = '/var/run/pgpool/pgpool.pid'
-+pid_file_name = '/run/pgpool/pgpool.pid'
-                                    # PID file name
-                                    # Can be specified as relative to the"
-                                    # location of pgpool.conf file or
-                                    # as an absolute path
-                                    # (change requires restart)
--logdir = '/tmp'
-+logdir = '/run/pgpool'
-                                    # Directory of pgPool status file
-                                    # (change requires restart)
- 
-@@ -621,10 +617,8 @@
-                                     # Authentication key for watchdog communication
-                                     # (change requires restart)
- 
--wd_ipc_socket_dir = '/tmp'
-+wd_ipc_socket_dir = '/run/pgpool'
-                                     # Unix domain socket path for watchdog IPC socket
--                                    # The Debian package defaults to
--                                    # /var/run/postgresql
-                                     # (change requires restart)
- 
- 
-diff -Naruw a/src/sample/pgpool.conf.sample-raw b/src/sample/pgpool.conf.sample-raw
---- a/src/sample/pgpool.conf.sample-raw
-+++ b/src/sample/pgpool.conf.sample-raw
-@@ -39,10 +39,8 @@
- port = 9999
-                                    # Port number
-                                    # (change requires restart)
--socket_dir = '/tmp'
-+socket_dir = '/run/postgresql'
-                                    # Unix domain socket path
--                                   # The Debian package defaults to
--                                   # /var/run/postgresql
-                                    # (change requires restart)
- reserved_connections = 0
-                                    # Number of reserved connections.
-@@ -59,10 +57,8 @@
- pcp_port = 9898
-                                    # Port number for pcp
-                                    # (change requires restart)
--pcp_socket_dir = '/tmp'
-+pcp_socket_dir = '/run/pgpool'
-                                    # Unix domain socket path for pcp
--                                   # The Debian package defaults to
--                                   # /var/run/postgresql
-                                    # (change requires restart)
- listen_backlog_multiplier = 2
-                                    # Set the backlog parameter of listen(2) to
-@@ -287,13 +283,13 @@
- # FILE LOCATIONS
- #------------------------------------------------------------------------------
- 
--pid_file_name = '/var/run/pgpool/pgpool.pid'
-+pid_file_name = '/run/pgpool/pgpool.pid'
-                                    # PID file name
-                                    # Can be specified as relative to the"
-                                    # location of pgpool.conf file or
-                                    # as an absolute path
-                                    # (change requires restart)
--logdir = '/tmp'
-+logdir = '/run/pgpool'
-                                    # Directory of pgPool status file
-                                    # (change requires restart)
- 
-@@ -660,10 +656,8 @@
-                                     # Authentication key for watchdog communication
-                                     # (change requires restart)
- 
--wd_ipc_socket_dir = '/tmp'
-+wd_ipc_socket_dir = '/run/pgpool'
-                                     # Unix domain socket path for watchdog IPC socket
--                                    # The Debian package defaults to
--                                    # /var/run/postgresql
-                                     # (change requires restart)
- 
- # - Virtual IP control Setting -
-diff -Naruw a/src/sample/pgpool.conf.sample-replication b/src/sample/pgpool.conf.sample-replication
---- a/src/sample/pgpool.conf.sample-replication
-+++ b/src/sample/pgpool.conf.sample-replication
-@@ -39,10 +39,8 @@
- port = 9999
-                                    # Port number
-                                    # (change requires restart)
--socket_dir = '/tmp'
-+socket_dir = '/run/postgresql'
-                                    # Unix domain socket path
--                                   # The Debian package defaults to
--                                   # /var/run/postgresql
-                                    # (change requires restart)
- listen_backlog_multiplier = 2
-                                    # Set the backlog parameter of listen(2) to
-@@ -65,10 +63,8 @@
- pcp_port = 9898
-                                    # Port number for pcp
-                                    # (change requires restart)
--pcp_socket_dir = '/tmp'
-+pcp_socket_dir = '/run/pgpool'
-                                    # Unix domain socket path for pcp
--                                   # The Debian package defaults to
--                                   # /var/run/postgresql
-                                    # (change requires restart)
- 
- # - Backend Connection Settings -
-@@ -282,13 +278,13 @@
- # FILE LOCATIONS
- #------------------------------------------------------------------------------
- 
--pid_file_name = '/var/run/pgpool/pgpool.pid'
-+pid_file_name = '/run/pgpool/pgpool.pid'
-                                    # PID file name
-                                    # Can be specified as relative to the"
-                                    # location of pgpool.conf file or
-                                    # as an absolute path
-                                    # (change requires restart)
--logdir = '/tmp'
-+logdir = '/run/pgpool'
-                                    # Directory of pgPool status file
-                                    # (change requires restart)
- 
-@@ -657,10 +653,8 @@
-                                     # Authentication key for watchdog communication
-                                     # (change requires restart)
- 
--wd_ipc_socket_dir = '/tmp'
-+wd_ipc_socket_dir = '/run/pgpool'
-                                     # Unix domain socket path for watchdog IPC socket
--                                    # The Debian package defaults to
--                                    # /var/run/postgresql
-                                     # (change requires restart)
- 
- 
-diff -Naruw a/src/sample/pgpool.conf.sample-slony b/src/sample/pgpool.conf.sample-slony
---- a/src/sample/pgpool.conf.sample-slony
-+++ b/src/sample/pgpool.conf.sample-slony
-@@ -39,10 +39,8 @@
- port = 9999
-                                    # Port number
-                                    # (change requires restart)
--socket_dir = '/tmp'
-+socket_dir = '/run/postgresql'
-                                    # Unix domain socket path
--                                   # The Debian package defaults to
--                                   # /var/run/postgresql
-                                    # (change requires restart)
- listen_backlog_multiplier = 2
-                                    # Set the backlog parameter of listen(2) to
-@@ -65,10 +63,8 @@
- pcp_port = 9898
-                                    # Port number for pcp
-                                    # (change requires restart)
--pcp_socket_dir = '/tmp'
-+pcp_socket_dir = '/run/pgpool'
-                                    # Unix domain socket path for pcp
--                                   # The Debian package defaults to
--                                   # /var/run/postgresql
-                                    # (change requires restart)
- 
- # - Backend Connection Settings -
-@@ -283,13 +279,13 @@
- # FILE LOCATIONS
- #------------------------------------------------------------------------------
- 
--pid_file_name = '/var/run/pgpool/pgpool.pid'
-+pid_file_name = '/run/pgpool/pgpool.pid'
-                                    # PID file name
-                                    # Can be specified as relative to the"
-                                    # location of pgpool.conf file or
-                                    # as an absolute path
-                                    # (change requires restart)
--logdir = '/tmp'
-+logdir = '/run/pgpool'
-                                    # Directory of pgPool status file
-                                    # (change requires restart)
- 
-@@ -658,10 +654,8 @@
-                                     # Authentication key for watchdog communication
-                                     # (change requires restart)
- 
--wd_ipc_socket_dir = '/tmp'
-+wd_ipc_socket_dir = '/run/pgpool'
-                                     # Unix domain socket path for watchdog IPC socket
--                                    # The Debian package defaults to
--                                    # /var/run/postgresql
-                                     # (change requires restart)
- 
- # - Virtual IP control Setting -
-diff -Naruw a/src/sample/pgpool.conf.sample-snapshot b/src/sample/pgpool.conf.sample-snapshot
---- a/src/sample/pgpool.conf.sample-snapshot
-+++ b/src/sample/pgpool.conf.sample-snapshot
-@@ -39,10 +39,8 @@
- port = 9999
-                                    # Port number
-                                    # (change requires restart)
--socket_dir = '/tmp'
-+socket_dir = '/run/postgresql'
-                                    # Unix domain socket path
--                                   # The Debian package defaults to
--                                   # /var/run/postgresql
-                                    # (change requires restart)
- listen_backlog_multiplier = 2
-                                    # Set the backlog parameter of listen(2) to
-@@ -65,10 +63,8 @@
- pcp_port = 9898
-                                    # Port number for pcp
-                                    # (change requires restart)
--pcp_socket_dir = '/tmp'
-+pcp_socket_dir = '/run/pgpool'
-                                    # Unix domain socket path for pcp
--                                   # The Debian package defaults to
--                                   # /var/run/postgresql
-                                    # (change requires restart)
- 
- # - Backend Connection Settings -
-@@ -280,13 +276,13 @@
- # FILE LOCATIONS
- #------------------------------------------------------------------------------
- 
--pid_file_name = '/var/run/pgpool/pgpool.pid'
-+pid_file_name = '/run/pgpool/pgpool.pid'
-                                    # PID file name
-                                    # Can be specified as relative to the"
-                                    # location of pgpool.conf file or
-                                    # as an absolute path
-                                    # (change requires restart)
--logdir = '/tmp'
-+logdir = '/run/pgpool'
-                                    # Directory of pgPool status file
-                                    # (change requires restart)
- 
-@@ -655,10 +651,8 @@
-                                     # Authentication key for watchdog communication
-                                     # (change requires restart)
- 
--wd_ipc_socket_dir = '/tmp'
-+wd_ipc_socket_dir = '/run/pgpool'
-                                     # Unix domain socket path for watchdog IPC socket
--                                    # The Debian package defaults to
--                                    # /var/run/postgresql
-                                     # (change requires restart)
- 
- 
-diff -Naruw a/src/sample/pgpool.conf.sample-stream b/src/sample/pgpool.conf.sample-stream
---- a/src/sample/pgpool.conf.sample-stream
-+++ b/src/sample/pgpool.conf.sample-stream
-@@ -39,10 +39,8 @@
- port = 9999
-                                    # Port number
-                                    # (change requires restart)
--socket_dir = '/tmp'
-+socket_dir = '/run/postgresql'
-                                    # Unix domain socket path
--                                   # The Debian package defaults to
--                                   # /var/run/postgresql
-                                    # (change requires restart)
- reserved_connections = 0
-                                    # Number of reserved connections.
-@@ -59,10 +57,8 @@
- pcp_port = 9898
-                                    # Port number for pcp
-                                    # (change requires restart)
--pcp_socket_dir = '/tmp'
-+pcp_socket_dir = '/run/pgpool'
-                                    # Unix domain socket path for pcp
--                                   # The Debian package defaults to
--                                   # /var/run/postgresql
-                                    # (change requires restart)
- listen_backlog_multiplier = 2
-                                    # Set the backlog parameter of listen(2) to
-@@ -286,13 +282,13 @@
- # FILE LOCATIONS
- #------------------------------------------------------------------------------
- 
--pid_file_name = '/var/run/pgpool/pgpool.pid'
-+pid_file_name = '/run/pgpool/pgpool.pid'
-                                    # PID file name
-                                    # Can be specified as relative to the"
-                                    # location of pgpool.conf file or
-                                    # as an absolute path
-                                    # (change requires restart)
--logdir = '/tmp'
-+logdir = '/run/pgpool'
-                                    # Directory of pgPool status file
-                                    # (change requires restart)
- 
-@@ -659,10 +655,8 @@
-                                     # Authentication key for watchdog communication
-                                     # (change requires restart)
- 
--wd_ipc_socket_dir = '/tmp'
-+wd_ipc_socket_dir = '/run/pgpool'
-                                     # Unix domain socket path for watchdog IPC socket
--                                    # The Debian package defaults to
--                                    # /var/run/postgresql
-                                     # (change requires restart)
- 
- 
diff --git a/dev-db/pgpool2/files/pgpool-9999-run_paths.patch b/dev-db/pgpool2/files/pgpool-9999-run_paths.patch
new file mode 100644
index 000000000000..bca3b213edb9
--- /dev/null
+++ b/dev-db/pgpool2/files/pgpool-9999-run_paths.patch
@@ -0,0 +1,98 @@
+--- a/src/include/parser/pg_config_manual.h
++++ b/src/include/parser/pg_config_manual.h
+@@ -244,7 +244,7 @@
+  * support them yet.
+  */
+ #ifndef WIN32
+-#define DEFAULT_PGSOCKET_DIR  "/tmp"
++#define DEFAULT_PGSOCKET_DIR  "/run/postgresql"
+ #else
+ #define DEFAULT_PGSOCKET_DIR ""
+ #endif
+--- a/src/include/pcp/pcp_stream.h
++++ b/src/include/pcp/pcp_stream.h
+@@ -49,6 +49,6 @@
+ extern int	pcp_write(PCP_CONNECTION * pc, void *buf, int len);
+ extern int	pcp_flush(PCP_CONNECTION * pc);
+ 
+-#define UNIX_DOMAIN_PATH "/tmp"
++#define UNIX_DOMAIN_PATH "/run/pgpool"
+ 
+ #endif							/* PCP_STREAM_H */
+--- a/src/include/pool.h
++++ b/src/include/pool.h
+@@ -69,16 +69,16 @@
+ #define HBA_CONF_FILE_NAME "pool_hba.conf"
+ 
+ /* pid file directory */
+-#define DEFAULT_LOGDIR "/tmp"
++#define DEFAULT_LOGDIR "/run/pgpool"
+ 
+ /* Unix domain socket directory */
+-#define DEFAULT_SOCKET_DIR "/tmp"
++#define DEFAULT_SOCKET_DIR "/run/postgresql"
+ 
+ /* Unix domain socket directory for watchdog IPC */
+-#define DEFAULT_WD_IPC_SOCKET_DIR "/tmp"
++#define DEFAULT_WD_IPC_SOCKET_DIR "/run/pgpool"
+ 
+ /* pid file name */
+-#define DEFAULT_PID_FILE_NAME "/var/run/pgpool/pgpool.pid"
++#define DEFAULT_PID_FILE_NAME "/run/pgpool/pgpool.pid"
+ 
+ /* status file name */
+ #define STATUS_FILE_NAME "pgpool_status"
+--- a/src/sample/pgpool.conf.sample-stream
++++ b/src/sample/pgpool.conf.sample-stream
+@@ -39,10 +39,8 @@
+ #port = 9999
+                                    # Port number
+                                    # (change requires restart)
+-#unix_socket_directories = '/tmp'
++unix_socket_directories = '/run/postgresql'
+                                    # Unix domain socket path(s)
+-                                   # The Debian package defaults to
+-                                   # /var/run/postgresql
+                                    # (change requires restart)
+ #unix_socket_group = ''
+                                    # The Owner group of Unix domain socket(s)
+@@ -65,10 +63,8 @@
+ #pcp_port = 9898
+                                    # Port number for pcp
+                                    # (change requires restart)
+-#pcp_socket_dir = '/tmp'
++pcp_socket_dir = '/run/pgpool'
+                                    # Unix domain socket path for pcp
+-                                   # The Debian package defaults to
+-                                   # /var/run/postgresql
+                                    # (change requires restart)
+ #listen_backlog_multiplier = 2
+                                    # Set the backlog parameter of listen(2) to
+@@ -298,13 +294,13 @@
+ # FILE LOCATIONS
+ #------------------------------------------------------------------------------
+ 
+-#pid_file_name = '/var/run/pgpool/pgpool.pid'
++pid_file_name = '/run/pgpool/pgpool.pid'
+                                    # PID file name
+                                    # Can be specified as relative to the"
+                                    # location of pgpool.conf file or
+                                    # as an absolute path
+                                    # (change requires restart)
+-#logdir = '/tmp'
++logdir = '/run/pgpool'
+                                    # Directory of pgPool status file
+                                    # (change requires restart)
+ 
+@@ -687,10 +683,8 @@
+                                     # Authentication key for watchdog communication
+                                     # (change requires restart)
+ 
+-#wd_ipc_socket_dir = '/tmp'
++wd_ipc_socket_dir = '/run/postgresql'
+                                     # Unix domain socket path for watchdog IPC socket
+-                                    # The Debian package defaults to
+-                                    # /var/run/postgresql
+                                     # (change requires restart)
+ 
+ 
diff --git a/dev-db/pgpool2/pgpool2-4.2.1-r2.ebuild b/dev-db/pgpool2/pgpool2-4.2.1-r2.ebuild
deleted file mode 100644
index d3efaa96ffff..000000000000
--- a/dev-db/pgpool2/pgpool2-4.2.1-r2.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-POSTGRES_COMPAT=( 9.6 {10..13} )
-
-inherit autotools postgres-multi
-
-MY_P="${PN/2/-II}-${PV}"
-
-DESCRIPTION="Connection pool server for PostgreSQL"
-HOMEPAGE="https://www.pgpool.net/"
-SRC_URI="https://www.pgpool.net/download.php?f=${MY_P}.tar.gz -> ${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc memcached pam ssl static-libs"
-
-RDEPEND="
-	${POSTGRES_DEP}
-	acct-group/postgres
-	acct-user/pgpool
-	net-libs/libnsl:0=
-	virtual/libcrypt:=
-	memcached? ( dev-libs/libmemcached )
-	pam? ( sys-auth/pambase )
-	ssl? (
-		dev-libs/openssl:0=
-	)
-"
-
-DEPEND="${RDEPEND}
-	sys-devel/bison
-	virtual/pkgconfig
-"
-
-pkg_setup() {
-	postgres-multi_pkg_setup
-}
-
-src_prepare() {
-	eapply \
-		"${FILESDIR}/pgpool-4.2.0-configure-memcached.patch" \
-		"${FILESDIR}/pgpool-configure-pam.patch" \
-		"${FILESDIR}/pgpool-4.2.0-configure-pthread.patch" \
-		"${FILESDIR}/pgpool-4.2.0-run_paths.patch"
-
-	eautoreconf
-
-	postgres-multi_src_prepare
-}
-
-src_configure() {
-	postgres-multi_foreach econf \
-		--disable-rpath \
-		--sysconfdir="${EPREFIX}/etc/${PN}" \
-		--with-pgsql-includedir='/usr/include/postgresql-@PG_SLOT@' \
-		--with-pgsql-libdir="/usr/$(get_libdir)/postgresql-@PG_SLOT@/$(get_libdir)" \
-		$(use_enable static-libs static) \
-		$(use_with memcached) \
-		$(use_with pam) \
-		$(use_with ssl openssl)
-}
-
-src_compile() {
-	# Even though we're only going to do an install for the best slot
-	# available, the extension bits in src/sql need some things outside
-	# of that directory built, too.
-	postgres-multi_foreach emake
-	postgres-multi_foreach emake -C src/sql
-}
-
-src_install() {
-	# We only need the best stuff installed
-	postgres-multi_forbest emake DESTDIR="${D}" install
-
-	# Except for the extension and .so files that each PostgreSQL slot needs
-	postgres-multi_foreach emake DESTDIR="${D}" -C src/sql install
-
-	newinitd "${FILESDIR}/${PN}.initd" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-
-	# Documentation!
-	dodoc NEWS TODO
-	doman doc/src/sgml/man{1,8}/*
-	use doc && dodoc -r doc/src/sgml/html
-
-	# mv some files that get installed to /usr/share/pgpool-II so that
-	# they all wind up in the same place
-	mv "${ED}/usr/share/${PN/2/-II}" "${ED}/usr/share/${PN}" || die
-
-	# One more thing: Evil la files!
-	find "${ED}" -name '*.la' -exec rm -f {} +
-}
diff --git a/dev-db/pgpool2/pgpool2-4.2.2-r2.ebuild b/dev-db/pgpool2/pgpool2-4.2.2-r2.ebuild
deleted file mode 100644
index c8b5484a0cdb..000000000000
--- a/dev-db/pgpool2/pgpool2-4.2.2-r2.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-POSTGRES_COMPAT=( 9.6 {10..13} )
-
-inherit autotools postgres-multi
-
-MY_P="${PN/2/-II}-${PV}"
-
-DESCRIPTION="Connection pool server for PostgreSQL"
-HOMEPAGE="https://www.pgpool.net/"
-SRC_URI="https://www.pgpool.net/download.php?f=${MY_P}.tar.gz -> ${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc memcached pam ssl static-libs"
-
-RDEPEND="
-	${POSTGRES_DEP}
-	acct-group/postgres
-	acct-user/pgpool
-	net-libs/libnsl:0=
-	virtual/libcrypt:=
-	memcached? ( dev-libs/libmemcached )
-	pam? ( sys-auth/pambase )
-	ssl? (
-		dev-libs/openssl:0=
-	)
-"
-DEPEND="${RDEPEND}
-	sys-devel/bison
-	virtual/pkgconfig
-"
-
-pkg_setup() {
-	postgres-multi_pkg_setup
-}
-
-src_prepare() {
-	eapply \
-		"${FILESDIR}/pgpool-4.2.0-configure-memcached.patch" \
-		"${FILESDIR}/pgpool-configure-pam.patch" \
-		"${FILESDIR}/pgpool-4.2.0-configure-pthread.patch" \
-		"${FILESDIR}/pgpool-4.2.0-run_paths.patch"
-
-	eautoreconf
-
-	postgres-multi_src_prepare
-}
-
-src_configure() {
-	postgres-multi_foreach econf \
-		--disable-rpath \
-		--sysconfdir="${EPREFIX}/etc/${PN}" \
-		--with-pgsql-includedir='/usr/include/postgresql-@PG_SLOT@' \
-		--with-pgsql-libdir="/usr/$(get_libdir)/postgresql-@PG_SLOT@/$(get_libdir)" \
-		$(use_enable static-libs static) \
-		$(use_with memcached) \
-		$(use_with pam) \
-		$(use_with ssl openssl)
-}
-
-src_compile() {
-	# Even though we're only going to do an install for the best slot
-	# available, the extension bits in src/sql need some things outside
-	# of that directory built, too.
-	postgres-multi_foreach emake
-	postgres-multi_foreach emake -C src/sql
-}
-
-src_install() {
-	# We only need the best stuff installed
-	postgres-multi_forbest emake DESTDIR="${D}" install
-
-	# Except for the extension and .so files that each PostgreSQL slot needs
-	postgres-multi_foreach emake DESTDIR="${D}" -C src/sql install
-
-	newinitd "${FILESDIR}/${PN}.initd" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-
-	# Documentation!
-	dodoc NEWS TODO
-	doman doc/src/sgml/man{1,8}/*
-	use doc && dodoc -r doc/src/sgml/html
-
-	# mv some files that get installed to /usr/share/pgpool-II so that
-	# they all wind up in the same place
-	mv "${ED}/usr/share/${PN/2/-II}" "${ED}/usr/share/${PN}" || die
-
-	# One more thing: Evil la files!
-	find "${ED}" -name '*.la' -exec rm -f {} +
-}
diff --git a/dev-db/pgpool2/pgpool2-4.2.9.ebuild b/dev-db/pgpool2/pgpool2-4.2.9.ebuild
deleted file mode 100644
index c2ce05764ea6..000000000000
--- a/dev-db/pgpool2/pgpool2-4.2.9.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-POSTGRES_COMPAT=( {10..14} )
-
-inherit autotools postgres-multi
-
-MY_P="${PN/2/-II}-${PV}"
-
-DESCRIPTION="Connection pool server for PostgreSQL"
-HOMEPAGE="https://www.pgpool.net/"
-SRC_URI="https://www.pgpool.net/download.php?f=${MY_P}.tar.gz -> ${MY_P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-
-KEYWORDS="~amd64 ~x86"
-
-IUSE="doc memcached pam ssl static-libs"
-
-RDEPEND="
-	${POSTGRES_DEP}
-	net-libs/libnsl:0=
-	virtual/libcrypt:=
-	memcached? ( dev-libs/libmemcached )
-	pam? ( sys-auth/pambase )
-	ssl? (
-		dev-libs/openssl:0=
-	)
-"
-DEPEND="${RDEPEND}
-	sys-devel/bison
-	virtual/pkgconfig
-"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	postgres_new_user pgpool
-
-	postgres-multi_pkg_setup
-}
-
-src_prepare() {
-	eapply \
-		"${FILESDIR}/pgpool-4.2.0-configure-memcached.patch" \
-		"${FILESDIR}/pgpool-configure-pam.patch" \
-		"${FILESDIR}/pgpool-4.2.0-configure-pthread.patch" \
-		"${FILESDIR}/pgpool-4.2.0-run_paths.patch"
-
-	eautoreconf
-
-	postgres-multi_src_prepare
-}
-
-src_configure() {
-	postgres-multi_foreach econf \
-		--disable-rpath \
-		--sysconfdir="${EPREFIX}/etc/${PN}" \
-		--with-pgsql-includedir='/usr/include/postgresql-@PG_SLOT@' \
-		--with-pgsql-libdir="/usr/$(get_libdir)/postgresql-@PG_SLOT@/$(get_libdir)" \
-		$(use_enable static-libs static) \
-		$(use_with memcached) \
-		$(use_with pam) \
-		$(use_with ssl openssl)
-}
-
-src_compile() {
-	# Even though we're only going to do an install for the best slot
-	# available, the extension bits in src/sql need some things outside
-	# of that directory built, too.
-	postgres-multi_foreach emake
-	postgres-multi_foreach emake -C src/sql
-}
-
-src_install() {
-	# We only need the best stuff installed
-	postgres-multi_forbest emake DESTDIR="${D}" install
-
-	# Except for the extension and .so files that each PostgreSQL slot needs
-	postgres-multi_foreach emake DESTDIR="${D}" -C src/sql install
-
-	newinitd "${FILESDIR}/${PN}.initd" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-
-	# Documentation!
-	dodoc NEWS TODO
-	doman doc/src/sgml/man{1,8}/*
-	use doc && dodoc -r doc/src/sgml/html
-
-	# mv some files that get installed to /usr/share/pgpool-II so that
-	# they all wind up in the same place
-	mv "${ED}/usr/share/${PN/2/-II}" "${ED}/usr/share/${PN}" || die
-
-	# One more thing: Evil la files!
-	find "${ED}" -name '*.la' -exec rm -f {} +
-}
diff --git a/dev-db/pgpool2/pgpool2-4.3.1.ebuild b/dev-db/pgpool2/pgpool2-4.3.1.ebuild
deleted file mode 100644
index f78d11206305..000000000000
--- a/dev-db/pgpool2/pgpool2-4.3.1.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
-
-POSTGRES_COMPAT=( 9.6 {10..14} )
-
-inherit autotools postgres-multi
-
-MY_P="${PN/2/-II}-${PV}"
-
-DESCRIPTION="Connection pool server for PostgreSQL"
-HOMEPAGE="https://www.pgpool.net/"
-SRC_URI="https://www.pgpool.net/download.php?f=${MY_P}.tar.gz -> ${MY_P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-
-KEYWORDS="~amd64 ~x86"
-
-IUSE="doc memcached pam ssl static-libs"
-
-RDEPEND="
-	${POSTGRES_DEP}
-	acct-user/pgpool
-	net-libs/libnsl:0=
-	virtual/libcrypt:=
-	memcached? ( dev-libs/libmemcached )
-	pam? ( sys-auth/pambase )
-	ssl? ( dev-libs/openssl:0= )
-"
-DEPEND="${RDEPEND}
-	sys-devel/bison
-	virtual/pkgconfig
-"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	eapply \
-		"${FILESDIR}/pgpool-4.2.0-configure-memcached.patch" \
-		"${FILESDIR}/pgpool-configure-pam.patch" \
-		"${FILESDIR}/pgpool-4.2.0-configure-pthread.patch" \
-		"${FILESDIR}/pgpool-4.3.1-run_paths.patch"
-
-	eautoreconf
-
-	postgres-multi_src_prepare
-}
-
-src_configure() {
-	postgres-multi_foreach econf \
-		--disable-rpath \
-		--sysconfdir="${EPREFIX}/etc/${PN}" \
-		--with-pgsql-includedir='/usr/include/postgresql-@PG_SLOT@' \
-		--with-pgsql-libdir="/usr/$(get_libdir)/postgresql-@PG_SLOT@/$(get_libdir)" \
-		$(use_enable static-libs static) \
-		$(use_with memcached) \
-		$(use_with pam) \
-		$(use_with ssl openssl)
-}
-
-src_compile() {
-	# Even though we're only going to do an install for the best slot
-	# available, the extension bits in src/sql need some things outside
-	# of that directory built, too.
-	postgres-multi_foreach emake
-	postgres-multi_foreach emake -C src/sql
-}
-
-src_install() {
-	# We only need the best stuff installed
-	postgres-multi_forbest emake DESTDIR="${D}" install
-
-	# Except for the extension and .so files that each PostgreSQL slot needs
-	postgres-multi_foreach emake DESTDIR="${D}" -C src/sql install
-
-	newinitd "${FILESDIR}/${PN}.initd" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-
-	# Documentation!
-	dodoc NEWS TODO
-	doman doc/src/sgml/man{1,8}/*
-	use doc && dodoc -r doc/src/sgml/html
-
-	# mv some files that get installed to /usr/share/pgpool-II so that
-	# they all wind up in the same place
-	mv "${ED}/usr/share/${PN/2/-II}" "${ED}/usr/share/${PN}" || die
-
-	# One more thing: Evil la files!
-	find "${ED}" -name '*.la' -exec rm -f {} +
-}
diff --git a/dev-db/pgpool2/pgpool2-9999.ebuild b/dev-db/pgpool2/pgpool2-9999.ebuild
index d14481554c21..0de82e93599a 100644
--- a/dev-db/pgpool2/pgpool2-9999.ebuild
+++ b/dev-db/pgpool2/pgpool2-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 EGIT_REPO_URI="https://git.postgresql.org/git/pgpool2.git"
 
-POSTGRES_COMPAT=( 9.6 {10..13} )
+POSTGRES_COMPAT=( 9.6 {10..15} )
 
 inherit autotools git-r3 postgres-multi
 
@@ -45,7 +45,7 @@ src_prepare() {
 		"${FILESDIR}/pgpool-4.2.0-configure-memcached.patch" \
 		"${FILESDIR}/pgpool-configure-pam.patch" \
 		"${FILESDIR}/pgpool-4.2.0-configure-pthread.patch" \
-		"${FILESDIR}/pgpool-4.2.0-run_paths.patch"
+		"${FILESDIR}/pgpool-9999-run_paths.patch"
 
 	eautoreconf
 
@@ -70,7 +70,7 @@ src_compile() {
 	# of that directory built, too.
 	postgres-multi_foreach emake
 	postgres-multi_foreach emake -C src/sql
-	use doc && postgres-multi_forbest emake DESTDIR="${D}" -C doc
+	use doc && postgres-multi_forbest emake -C doc
 }
 
 src_install() {
diff --git a/dev-db/rqlite/Manifest b/dev-db/rqlite/Manifest
index 4d2509e421c1..9f8db361eb7a 100644
--- a/dev-db/rqlite/Manifest
+++ b/dev-db/rqlite/Manifest
@@ -2,7 +2,9 @@ DIST rqlite-7.7.2-deps.tar.xz 83998504 BLAKE2B df32a7b9a664f79241033d92dd4d0c71c
 DIST rqlite-7.7.2.tar.gz 473521 BLAKE2B fc3d48854ed6e0eca6897504b999a72e8b5503c263195078fea4f0719ca48757b4f2ca52c1d63dffab9d6f6788b1e36ea5bd53e32512862d7cd581bebeed6ba2 SHA512 6f5756005d72f1c97b71866b3f341ec5959f53178cf99c6bb3315bb45cf44e81c4d2807aebd3ccc858e2c6b9e3cc7d1e9a86c3f6c3dd6272ab3f7fb7550a632f
 DIST rqlite-7.8.0.tar.gz 476401 BLAKE2B b87c5996fbb62503add3afd0e3526b1545670ede6ade0bd589e33d97ed489f3f93a027c565102de1737fb9b13a6f6f9cc5be346fe4e9cbca35b045b8982d1c91 SHA512 555bfaf1f95d890d8d0e73e0c52b94f323c4198cd2d61ab6bfbb95b9e908475b75fb409944162ca19709273c069c2263fa6f1d86c8ca73b96eab803bde9d72c6
 DIST rqlite-7.9.0.tar.gz 478284 BLAKE2B bcb60f771397b067e1479a12603458e7823839a8ff174b30479a3a14dda72b7f3f3b717875a0aea8cd03f469f3da3d418ea3334211e3d39adf6b20d1947b68ec SHA512 c898b8b96def0a4d01bd1b98de952dece520d8b8ac7fcf12f4d81affab76095cb4a9898d1c7aeb9bc67462e5069e01012cda37073455f3382228194db6cda3e7
+DIST rqlite-7.9.2.tar.gz 478780 BLAKE2B 4b072e9dab1fcfdb64a38e1a59bef2a1d81cf7543d6964ad75d3d3bd50cd52686d8b6f60a5e2a192b3998b3990efbe6f758a4226b03b8520fbd0569ab5aeca07 SHA512 86b3b89396d60d73e58ced463ae4cf5caf2cc8ba39bab87153b0a5a14e97745b07545bade7fa28dfde095255b547327ff83cefdaa78a399e1976e28d54ec430a
 EBUILD rqlite-7.7.2.ebuild 884 BLAKE2B 10648283b728ca99dff0ec8f63f45eedf7c2f477255101871722b41b5fe79f5dbc76d6832be7400c6517c75b262dcc0a82d4f9b04f75252447e2f6ec5029bb8e SHA512 bfdd17f61c887630598b2f50671679886a9b7a9d8402c69179afeb3f98a2981f33caee25b8315a63e31b640bd93c6cd5cc5005e846d778f155ce791be2b1d7d2
 EBUILD rqlite-7.8.0.ebuild 892 BLAKE2B b0b196ea4262c22d3c9a5553dbf62af0605a543260fe24eccc3d02ce5514c92a1fe7543b4efdef333f42af95c0b95e59c7ef11d38f97c0e5b52090fb6d2d3417 SHA512 52efbfd0bcb6a76430f2fdb015ed9b7191279dd99bb0efdea6a9dcd98f4d9c3ce736179c5062be80123bdf6c8cbe170585b227d11d974333970fe3d6e0be9631
 EBUILD rqlite-7.9.0.ebuild 892 BLAKE2B d05f4b8389e7c216e31946c97eba48c3224b191c923c2bb67f913ddcb57bdb2631179aa63a9fdbab22d2e09b328d9876bd2ca8db1f3bad37ba4a0f61ddb2c5c0 SHA512 6395ccf089b9e4adb0621e1601c2681f217774144a3ab8e2cce036e195c8b61b972c79557d3dc47370624a1a009026aea938cca019ec59068e4200f403eafa7d
+EBUILD rqlite-7.9.2.ebuild 892 BLAKE2B b47d9ce7cee671cfe4d94e64aecc8f19cd25f18df14b3d2bd54b47c51a665ebddc31c785ddcfd197d44593ca0e774d787ca7c031748afd613ae16bee3caf5e10 SHA512 9183b4af31918d1ad4d7916669d6804b5417c1c88c787527e9df9dc4314976a464dd225e5de317bdb376fc26c2ae121c80537839d8e9c6819c9897d876ff8424
 MISC metadata.xml 305 BLAKE2B 43bc299dae9450677761bfaeaa02ac649ac4ecdbb35e3242c8525db13ef0471397a352b2a8aa751ec725ff8e9c86c2a8a19caf71bbe0de206f266d945f287561 SHA512 3dbddc6b5e4e6d8cd82beb722b5b45af6621e8fb84a1d3a1ec5c444026f595fd14babadc92084afe122202c9b940be21b2e1af145d24846de4225582e5e4d5de
diff --git a/dev-db/rqlite/rqlite-7.9.2.ebuild b/dev-db/rqlite/rqlite-7.9.2.ebuild
new file mode 100644
index 000000000000..01355d29e8c0
--- /dev/null
+++ b/dev-db/rqlite/rqlite-7.9.2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module
+EGIT_COMMIT=187098927ba9083a19fff36ed01eab0f8b1b045c
+
+DESCRIPTION="Replicated SQLite using the Raft consensus protocol"
+HOMEPAGE="https://github.com/rqlite/rqlite https://www.philipotoole.com/tag/rqlite/"
+SRC_URI="https://github.com/rqlite/rqlite/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://dev.gentoo.org/~zmedico/dist/rqlite-7.7.2-deps.tar.xz"
+
+LICENSE="MIT Apache-2.0 BSD CC0-1.0 MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+src_compile() {
+	GOBIN="${S}/bin" \
+		go install \
+			-ldflags="-X main.version=v${PV}
+				-X main.branch=master
+				-X main.commit=${EGIT_COMMIT}
+				-X main.buildtime=$(date +%Y-%m-%dT%T%z)" \
+			./cmd/... || die
+}
+
+src_test() {
+	GOBIN="${S}/bin" \
+		go test ./... || die
+}
+
+src_install() {
+	dobin bin/*
+	dodoc -r *.md DOC
+}
diff --git a/dev-games/KXL/KXL-1.1.7-r3.ebuild b/dev-games/KXL/KXL-1.1.7-r3.ebuild
deleted file mode 100644
index 7620b659e603..000000000000
--- a/dev-games/KXL/KXL-1.1.7-r3.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Development Library for making games for X"
-HOMEPAGE="http://kxl.orz.hm/"
-SRC_URI="http://kxl.hn.org/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-DEPEND="x11-libs/libX11"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-m4.patch
-	"${FILESDIR}"/${P}-amd64.patch
-	"${FILESDIR}"/${P}-as-needed.patch
-	"${FILESDIR}"/${P}-ldflags.patch
-)
-
-src_prepare() {
-	default
-
-	mv configure.{in,ac} || die
-
-	eautoreconf
-}
-
-src_configure() {
-	econf --disable-static
-}
-
-src_install() {
-	default
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/dev-games/KXL/KXL-1.1.7_p17.ebuild b/dev-games/KXL/KXL-1.1.7_p17.ebuild
index 33e072b293c6..242c5e00de58 100644
--- a/dev-games/KXL/KXL-1.1.7_p17.ebuild
+++ b/dev-games/KXL/KXL-1.1.7_p17.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}"/${PN}-${MY_PV}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="x11-libs/libX11"
 RDEPEND="${DEPEND}"
diff --git a/dev-games/KXL/Manifest b/dev-games/KXL/Manifest
index e5f4de2642fc..2504a8fdb333 100644
--- a/dev-games/KXL/Manifest
+++ b/dev-games/KXL/Manifest
@@ -5,6 +5,5 @@ AUX KXL-1.1.7-ldflags.patch 162 BLAKE2B 61c7bd89e29c84ff9739dace1e6e8fa8c30b6cd3
 AUX KXL-1.1.7-m4.patch 205 BLAKE2B a4ff3c1c5ab2fc159924248eb7c564b3b0c579ce03831d4b7601bf89b8d8205aa308d479d847fa4e66f3c025a8a182dfb4e4e1d224c42ab16bc763f30fbb6d9f SHA512 4c80ef4624ae37e3f8ddcef16ab7f84d2edb5ae0722b8737a08420ef718027dfa83c6b0c46333d7ebf1280fbcffc2e9a9b0161e71432b8fe8e545fc0c551c54b
 DIST KXL-1.1.7.tar.gz 192070 BLAKE2B 7f5256afaffe94cd5f6551d8f53b43e2d9512cf94dfaebb123205b55d83d4645e226bbed62bf5f0da909104d4e33d1da60c7e08c0ee527087a4793c79c117df2 SHA512 f3a9051b0e8916745725a2809097df07c59f8811f336574def7e479c992175d0bd49661817f9da35d122d291aff0bde5d4c27e5b17a3f09878e71b2c7a709adb
 DIST kxl_1.1.7-17.debian.tar.xz 178364 BLAKE2B 067f73a23b3bfd3c2fbdeb6c032d56444a3db68190a1a23cbe88f39767cea4ad1f16c641d24d12cccd6f3c480134105e85384d2f34b9bc0f4487d71faa975fc2 SHA512 ac2b8e919dcf3e1449df393aad9daf282b9954da6c2f43ff4cbb7bc073fd9ad660413ea09ea8cac480593fd2ea63ec2d176b338fa8f8a24b128636d5e3376495
-EBUILD KXL-1.1.7-r3.ebuild 693 BLAKE2B 8c91e0e1598843010ba34cd0810c899e9399e5da325a402de9f69ed2d2804f791e982e1474da88a77a8575a73d341b6c5f32ca0e8a8c107a77ed5bbe7db0eaba SHA512 f798232c470fea8390179c28a625fee01facc05b66fe620e90a7a23853cd9e9a8558b48442262ae741a2c03cbfab28a1638043772583de3ffd5e8348356af9a9
-EBUILD KXL-1.1.7_p17.ebuild 1149 BLAKE2B db02810fb3a92d517ab0e67f8af921018ccf65f45a6a9d83fe3e1b7d404ab58ab0466c26aa848a8ab82b255d8d7c52d7d736b9b986ab5f3596cab4ccf185e291 SHA512 4f3cfd0c137e266e9d8276a56a600349489cf52fb4bd144c9838c72fc86ff1d4128593520da63536d9ec6c96b94e95c1a4175a954c439ccb01fa0c24ddee0c7a
+EBUILD KXL-1.1.7_p17.ebuild 1147 BLAKE2B f74095dd0b0e11137383e4de1b3a0af5c8290c5d06e57bb4e5281e36e88edfe2fbc1f5e8ac6866e25c1d75ed724398a4295ea2ffb78240f6e7f3b62bbdcd47ee SHA512 b16291671cb1e7fc2d2f686df757edd1b960dcdcb308a998e5c28b142526fc5066348136f0e658ed7428a8b9667934cd4021103de06e27c6aca22bb8fcfdd37d
 MISC metadata.xml 678 BLAKE2B 9c98a572ee5273641ec20e6f2c5f751e3adae5668afad106e8a79b11842a6416e9d4d7aedeed662afce113f7c9b606f72d4ac70b7cfc12e35423232be3df11f9 SHA512 eb82e9ac1b3bbc2a1b747dc4a5d9501b139b20528c15bdafaaee3d35866bf3ab95c8ab8501f28884a6811e35eb5f0fb0700c819b2b212346bcd4cda761cc861f
diff --git a/dev-games/Manifest.gz b/dev-games/Manifest.gz
index 40defe95eff7..2e38399aa167 100644
Binary files a/dev-games/Manifest.gz and b/dev-games/Manifest.gz differ
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 57bf3ba44e9c..ff86c418db40 100644
Binary files a/dev-java/Manifest.gz and b/dev-java/Manifest.gz differ
diff --git a/dev-java/commons-text/Manifest b/dev-java/commons-text/Manifest
index d72d6aade655..62add9d90a22 100644
--- a/dev-java/commons-text/Manifest
+++ b/dev-java/commons-text/Manifest
@@ -1,5 +1,3 @@
 DIST commons-text-1.10.0-src.tar.gz 342224 BLAKE2B efed282c9fed7dae5766f7158136a4d7414ba0610e16a52fa2d12ee04e43960d47ec7c62f220c2ab881a13afa8a81cf85e453364e37c67550e15c314122ebf25 SHA512 6bf2dc7dda4429cb1b9ba3a4d383c1d9ffabd5ff35a0adc55216e7cf4c532e51b2b012c9b0f3ea859cd32aef75e05547d892301f34f304a0bfd27c39a28fe04f
-DIST commons-text-1.9-sources.tar.gz 312764 BLAKE2B 44b628c418a910ff38b5a1fb3b4c9f14a1f9818afd12540f8c8cf8b1a99fd7abd365e704142bcec901e5e067b303ff44f9c992f8714eae68b94819780a270dd2 SHA512 53f993e79aaa6789d3388aa96b6b2a14cf646b27ff3774524390e511241a85288947cc929519eff61a8734578f25bdf3d9969d84da20c1a749b19d90a55da8ae
-EBUILD commons-text-1.10.0.ebuild 1946 BLAKE2B 49fc9eb76bf7205099b4f339f287877be2650762c3f7ec6760812a0264a5da4d604666bc477cb9a9633f7730fd8d2304114582ac5fd7aeb03bbf3f2dcfcc7e9e SHA512 5691521052d2739688841bc2bf22aad2cbfc270a6436fa7c8416a276e8cc4bcb16904bbcda3d7756174621ddec9ffd106b6c0a6fabeb8d51606afd08d6084c9f
-EBUILD commons-text-1.9.ebuild 1142 BLAKE2B 0beeef324dac52e6201d090bf55e4d1d090d88d82ccf3a6beaa2b7d1cfb7670295cf294c0c071863583f3512dcd4bf38f24e53f94fa972f1f82e14d9262f947d SHA512 658d2fd0186f9dded92492d975f2262f35c2a618a25dd85a6c2e1d82a4663a7f833703675ad1bedebeae4234fbe90269bf28f61d2c1e2d0bc659faa6ab36a6c1
+EBUILD commons-text-1.10.0.ebuild 1944 BLAKE2B 0ad39c8569085b4deadfd703b8d4c0996a5d8a249c2895b253092d5ce66f9292635f2d782582a941b4927622f296044c7c04ce5b2583ec1448a1db6288fceb2d SHA512 6229c7492d11147e33f4311d0497c9e5cc9da0fb9a69f62333c18f2e39d481a7695b0d912d80147aa6a35ee50e760335c61c2659e0f73317c8c95a3b24a76ccd
 MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/dev-java/commons-text/commons-text-1.10.0.ebuild b/dev-java/commons-text/commons-text-1.10.0.ebuild
index 3a297ceebf2d..6241e756e3c3 100644
--- a/dev-java/commons-text/commons-text-1.10.0.ebuild
+++ b/dev-java/commons-text/commons-text-1.10.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://apache//commons/text/source/commons-text-${PV}-src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ppc64 ~x86"
+KEYWORDS="amd64 ppc64 x86"
 
 # Common dependencies
 # POM: pom.xml
diff --git a/dev-java/commons-text/commons-text-1.9.ebuild b/dev-java/commons-text/commons-text-1.9.ebuild
deleted file mode 100644
index 530b720f0f19..000000000000
--- a/dev-java/commons-text/commons-text-1.9.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 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://downloads.apache.org//commons/text/source/commons-text-1.9-src.tar.gz --slot 0 --keywords "~amd64 ~x86" --ebuild commons-text-1.9.ebuild
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="org.apache.commons:commons-text:1.9"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Apache Commons Text is a library focused on algorithms working on strings"
-HOMEPAGE="https://commons.apache.org/proper/commons-text"
-SRC_URI="https://downloads.apache.org//commons/text/source/${P}-src.tar.gz -> ${P}-sources.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
-
-# Common dependencies
-# POM: pom.xml
-# org.apache.commons:commons-lang3:3.11 -> >=dev-java/commons-lang-3.11:3.6
-
-CDEPEND="
-	>=dev-java/commons-lang-3.11:3.6
-"
-
-DEPEND="
-	>=virtual/jdk-1.8:*
-	${CDEPEND}
-"
-
-RDEPEND="
-	>=virtual/jre-1.8:*
-	${CDEPEND}"
-
-S="${WORKDIR}/${P}-src"
-
-JAVA_ENCODING="ISO-8859-1"
-
-JAVA_GENTOO_CLASSPATH="commons-lang-3.6"
-JAVA_SRC_DIR="src/main/java"
diff --git a/dev-java/jakarta-servlet-api/Manifest b/dev-java/jakarta-servlet-api/Manifest
index 059917d4c47f..3af0398607b9 100644
--- a/dev-java/jakarta-servlet-api/Manifest
+++ b/dev-java/jakarta-servlet-api/Manifest
@@ -1,5 +1,5 @@
 DIST jakarta-servlet-api-4.0.4-RELEASE.tar.gz 188270 BLAKE2B 6c5db208603333abb9aa31726e60d489c5f860e3b6ad61e691d65e8b99909a8139f7677cec52d2a74ed9e8445ea2f0f510875ca32a2e512a09183245a9822889 SHA512 9cd613f8c33f5d415b06f70543eee926c81e87a14d03b837998a6c4db11ce5fb9c2b97f796f2936a63f2a6dc7847d7a97aec7a804b80234cd52e4bfdca9920a9
 DIST jakarta-servlet-api-6.0.0-RELEASE.tar.gz 634690 BLAKE2B e48375f6a0b74950a2c50d73f2d50f7c79db96e22d5c845380bff670948cd1a1d1ea98eaf93e7fa02887e94010c8573382ba3f6fb52a8fca6fa98e5915c307f6 SHA512 65285bce3e8b5143eb33d548549ff5653c6c90f55e7a19e8fdb4a7799842d3430cfe0cebe54f7a7d253d9da4c2b6d4d7a08b35846636c11a2ca814b8311cecc7
 EBUILD jakarta-servlet-api-4.0.4.ebuild 935 BLAKE2B 5007e96b0617853577ea6159caa7e587e9316568f5ea620c8366d27c9dbe74b280b646d8b60c2ad9dd37b1ff37556d9c2a5c49f74d918d0d0ec58ad243e2f3ff SHA512 cab6ebbea0966a0be1f785efd65e2af6ff8b80a602101877f8551be26ea945f20208d820743a8be59fc83aff4c84e12d03516cf2dea79b2de9d8e207b0ddf03c
-EBUILD jakarta-servlet-api-6.0.0.ebuild 1276 BLAKE2B 286064fa66026035e2b9e511aedcfa57cd7070741857ad768d0dc6fcb0edce2fd434596e4701741ec1340c8a656794dc18ca6abb4a6590c4abac2b9b9e98a2d5 SHA512 25b103aa0fdc99e9a23df2bd98e43cef804fed73fe6907fb2f06250a244e880793977a7286c744385ba00559b6d7c5ec8a68c0519f2a3a22c553f9094323a5ef
+EBUILD jakarta-servlet-api-6.0.0.ebuild 1275 BLAKE2B c19c344a97153cf4bc5790fd606d22e60d1469d281134159b06a1c138f60f59c5c41776235c6c8cbc921b44ffebd252604c9c8590df8563272a4f6c4ebbeef77 SHA512 663a93796e2cc15ac4e116abac681f93a7a9206bbd2b9251f299d8fcdebe44d2c717346c7a5cebc2998b2307f0817910161c6d24abc23b25eb6f32d2a13f3fa4
 MISC metadata.xml 332 BLAKE2B b9a06fe2a5573bde0da5b4f0d11a4cdf8c26738b67ac575014c01ed7fadfbc057a63fe2de907942a83d12afe8335933edbf671460b33939969bbb8d2657ffd81 SHA512 4c044f785c3a41116e24cc56b46b8e74327e4fbe29b11a25e1004e18d815023d073465658bb9467afbf80f8490e29815e1e52ce3d5ccde250ae48f0edbf0d380
diff --git a/dev-java/jakarta-servlet-api/jakarta-servlet-api-6.0.0.ebuild b/dev-java/jakarta-servlet-api/jakarta-servlet-api-6.0.0.ebuild
index b3bba8165175..18f4251527ea 100644
--- a/dev-java/jakarta-servlet-api/jakarta-servlet-api-6.0.0.ebuild
+++ b/dev-java/jakarta-servlet-api/jakarta-servlet-api-6.0.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/jakartaee/servlet/archive/${PV}-RELEASE.tar.gz -> ${
 
 LICENSE="EPL-2.0 GPL-2-with-classpath-exception"
 SLOT="6"
-KEYWORDS="~amd64 ~arm arm64 ppc64"
+KEYWORDS="amd64 ~arm arm64 ppc64"
 
 RDEPEND=">=virtual/jre-1.8:*"
 DEPEND=">=virtual/jdk-11:*"
diff --git a/dev-java/jakartaee-migration/Manifest b/dev-java/jakartaee-migration/Manifest
index 73aa4eb9bc11..763ff5455368 100644
--- a/dev-java/jakartaee-migration/Manifest
+++ b/dev-java/jakartaee-migration/Manifest
@@ -1,5 +1,3 @@
-DIST jakartaee-migration-1.0.3-sources.tar.gz 38243 BLAKE2B e1c05c05dd16ec6d54f0eb3523aed14a3fcbc9c0999b54e7c240c5ebfbb968a8cc3025855485318c19f0e85931ea239f4f08efbd0d042c7ad163c1fe5d3819f9 SHA512 79947fe47d55e4e93a417118e7a41fd79614b3fe3bfad967bfdcc865121c9247f92ecd99231e08abb2187036cdb1dceb85b8f2bc695c5bd2ecbf48a84bdd3b2a
 DIST jakartaee-migration-1.0.4-sources.tar.gz 38400 BLAKE2B c0c0151adfde56632ad95919a88eedd6a44056e2d29320e63e0dc64c59cf7ba928135f817ddb3c79a96dd7a8418ab92c8fe4aa9f50a51442bb55384349de603f SHA512 a9d49463f44affa1c5f57d9342e7b4dc77a829c904ba2376f87f086c3662f01e05a2b1cfe2dc746e33605a66849f12415ebb2b63eb05c5e476a4eab9ffd39644
-EBUILD jakartaee-migration-1.0.3.ebuild 2945 BLAKE2B da19a875db924748ac6c1ebb6cbf25ff48419a447683be29af3a893764b1a51ebd0258c019f5af292b3b006417c907257004e6431d66269a534b9536b5efee71 SHA512 5f96ce048739dc89191d22756eee6086bcc4da74a61435a999374fa72961bf7bdad8a374b8165575b0929690f1b13abee0dddfd8d90ec85a7ecef8eae4c7cb63
-EBUILD jakartaee-migration-1.0.4.ebuild 2980 BLAKE2B 1c43e3eaf409e3552879b8ebec84911fa7940f375c8ea0e780d42ee366cb947af91c7248b8c19d1b294a57cc0b6c200c3ae26b8c2de9946b274d0867dfb85401 SHA512 a0732d9732faf2a24698340b0eebb475166f9ffbf64201b38248fde3074a624a86510d9eea15cea4ce39c569ea582c141632989e2009a80e7dc9c95ce1eb37e6
+EBUILD jakartaee-migration-1.0.4.ebuild 2979 BLAKE2B 1213e1b55b6822382c81fe9d8643b6ad6c55a5ef1ad204f732fafabec6d914f9b2b04c70ef6ec4af26e9e39026f96a67a64f0f23ff2bf81d2b3c4a43e582a1b8 SHA512 9740c0f632d1c6d9102806bca98eb87ee8728aff425515af033a5c6cb895af7ca500a347a51a943ae52dcfe5f3955bbc7a181b916c399336761f87ac61a2918d
 MISC metadata.xml 233 BLAKE2B 2b385ca77219f08b2874b3a4a91a0c836d3cb45ec44b05babb33d590c56ceb5337ecb93a8450a37f8e6bbf4cfc1455892e8142d22e0a1d527d40361e2dce350b SHA512 1acc975a7dc3344bc63282d652ca00d8245970b58353b4fd00f09a4859db3eaba2dcd85e1537d424b7174e4f9c01c2ffb10ec6d107b5c895c9ca20730666de7f
diff --git a/dev-java/jakartaee-migration/jakartaee-migration-1.0.3.ebuild b/dev-java/jakartaee-migration/jakartaee-migration-1.0.3.ebuild
deleted file mode 100644
index f4e644bdec92..000000000000
--- a/dev-java/jakartaee-migration/jakartaee-migration-1.0.3.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2022 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://ftp.fau.de/apache/tomcat/jakartaee-migration/v1.0.3/source/jakartaee-migration-1.0.3-src.tar.gz --slot 0 --keywords "~amd64" --ebuild jakartaee-migration-1.0.3.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.apache.tomcat:jakartaee-migration:1.0.3"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Apache Tomcat tool for migration from Java EE 8 to Jakarta EE 9"
-HOMEPAGE="https://tomcat.apache.org"
-SRC_URI="mirror://apache/tomcat/${PN}/v${PV}/source/${P}-src.tar.gz -> ${P}-sources.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64"
-
-# Common dependencies
-# POM: pom.xml
-# commons-io:commons-io:2.8.0 -> >=dev-java/commons-io-2.8.0:1
-# org.apache.bcel:bcel:6.5.0 -> >=dev-java/bcel-6.5.0:0
-# org.apache.commons:commons-compress:1.20 -> >=dev-java/commons-compress-1.20:0
-
-CDEPEND="
-	dev-java/ant-core:0
-	dev-java/bcel:0
-	>=dev-java/commons-compress-1.20:0
-	dev-java/commons-io:1
-"
-
-# Compile dependencies
-# POM: pom.xml
-# org.apache.ant:ant:1.10.9 -> !!!groupId-not-found!!!
-# POM: pom.xml
-# test? junit:junit:4.13.1 -> >=dev-java/junit-4.13.1:4
-
-DEPEND="
-	>=virtual/jdk-1.8:*
-	${CDEPEND}
-"
-
-RDEPEND="
-	>=virtual/jre-1.8:*
-	${CDEPEND}"
-
-S="${WORKDIR}/${P}"
-
-JAVA_LAUNCHER_FILENAME="${PN}"
-
-JAVA_GENTOO_CLASSPATH="ant-core,bcel,commons-compress,commons-io-1"
-JAVA_SRC_DIR="src/main/java"
-JAVA_MAIN_CLASS="org.apache.tomcat.jakartaee.MigrationCLI"
-JAVA_RESOURCE_DIRS=(
-	"src/main/resources"
-)
-
-JAVA_TEST_GENTOO_CLASSPATH="junit-4"
-JAVA_TEST_SRC_DIR="src/test/java"
-JAVA_TEST_RESOURCE_DIRS=(
-	"src/test/resources"
-)
-JAVA_TEST_EXCLUDES=(
-	"org.apache.tomcat.jakartaee.TesterConstants"
-)
-
-src_prepare() {
-	default
-	sed -i "s/\${project.version}/${PV}/g" src/main/resources/info.properties
-}
-
-src_test() {
-	# we need to create jar files for the tests the same way as it's done using pom.xml
-	local implementation_version=$(grep Implementation-Version pom.xml | grep -oE "[0-9]+\.[0-9]+\.[0-9]+")
-	mkdir -p target/test-classes/META-INF || die
-	pushd target/test-classes || die
-	echo "Implementation-Version: ${implementation_version}" > META-INF/MANIFEST.MF
-	ejavac -d . -encoding ${JAVA_ENCODING} $(find "${S}/${JAVA_TEST_SRC_DIR}" -name CommonGatewayInterface.java) || die
-	jar cfm cgi-api.jar META-INF/MANIFEST.MF $(find -name CommonGatewayInterface.class) || die
-	ejavac -d . -encoding ${JAVA_ENCODING} $(find "${S}/${JAVA_TEST_SRC_DIR}" -name HelloCGI.java) || die
-	jar cfm hellocgi.jar META-INF/MANIFEST.MF $(find -name HelloCGI.class) || die
-	for enc in rsa dsa ec; do
-		cp hellocgi.jar hellocgi-signed-${enc}.jar || die
-		jarsigner -keystore "${S}/src/test/resources/keystore.p12" -storepass apache hellocgi-signed-${enc}.jar ${enc} || die
-	done
-	popd
-
-	java-pkg-simple_src_test
-}
diff --git a/dev-java/jakartaee-migration/jakartaee-migration-1.0.4.ebuild b/dev-java/jakartaee-migration/jakartaee-migration-1.0.4.ebuild
index 06ff253bc625..92c0218f4b3b 100644
--- a/dev-java/jakartaee-migration/jakartaee-migration-1.0.4.ebuild
+++ b/dev-java/jakartaee-migration/jakartaee-migration-1.0.4.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://tomcat.apache.org"
 SRC_URI="mirror://apache/tomcat/${PN}/v${PV}/source/${P}-src.tar.gz -> ${P}-sources.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 # Common dependencies
 # POM: pom.xml
diff --git a/dev-java/protobuf-java/Manifest b/dev-java/protobuf-java/Manifest
index fd3f0cd0bb6f..c699495997ad 100644
--- a/dev-java/protobuf-java/Manifest
+++ b/dev-java/protobuf-java/Manifest
@@ -1,6 +1,12 @@
+DIST protobuf-21.8.tar.gz 5110670 BLAKE2B 3c1b0c857a86e9586481d63896341d0cb11290dbd710d87a6f7889d34f5f262abe2986a29ed19a730f8fa5df0b5c62d77a4db6aa415a72b239f7483ae8d6380c SHA512 cb17be759311e91172801add1f88fe7a0291b547170c40d2e3303f5c248570dddeade96bd48740edd628215f55269c97475e2f4c4a41c50f1018d525f52036cb
 DIST protobuf-3.19.3.tar.gz 5293258 BLAKE2B c05b70ffca97f7166ea6a511a36907eed125edf1ebf17f908718221d9b851be84dfb2b1b39973f2faf35f6ade630e6ba4f9e8b91b8fbc922c5db97079323ee6e SHA512 1c003e7cbc8eae6a038f46e688b401ee202ba47f502561e909df79770f6e8b7daf3dc1ccc727e31bfb5b52cd04cb4fef7d2d2a28d650c13f396872ad4aa076c6
+DIST protobuf-3.19.6.tar.gz 5299501 BLAKE2B 3121f76b95f83c5309ce49ce296b738eff7be9d3a5093c564fbe2339fb5f3729e406f1b44bfcc05feb0d31ab63838bb4f54685017977c73a33b91215a6776072 SHA512 8f92242f2be8e1bbfba41341c87709ad91ad83b8b3e3df88bb430411541d3399295f49291fd52b50e3487b0fce33181cb4d175685fd25aac72adfaee26a612d4
 DIST protobuf-3.20.1.tar.gz 5368262 BLAKE2B 1ce1aef2e4c4f3ea4863629cc75d89fe17d0c7ac0c342ac641c787456fd4a12756c2892a27ddadedc94a7201494ec84566638ce33a03cb0c867b04e9eee0edb3 SHA512 fde3eb9f13946887ddfd87df428c5615ad09aaf191e4478b24e98e5e13231feeff4e70b4ca6a2ff7d9b9b2e2c60bc1d5479526edeafa78f9a8ed3bef2e0bacb0
+DIST protobuf-3.20.3.tar.gz 5374320 BLAKE2B fb51f2a0ecf5b83235f5252051f8192ae377bb7a5e030c3f3e9435ccde25919c059830cf476e840fa6c970928a32c0075e213c9d5d4d9e3d3b24732c39a9fbfa SHA512 01d6703bdbe769a1200ee6e4ebcdcb99688ec21f576988c60d82ec36e0822820fb245fcb4ca53293143d53e666d748b5a0c6937bc659fb3cdc4cd9b05ed12a1c
 EBUILD protobuf-java-3.19.3.ebuild 1451 BLAKE2B c0bad09302e1e52cff018223c055939e2d4335874f2be95e913705368926106c6967b5a98d7f0a392037060c040fd3116210f0d1de567dc17e66bfc252202e4b SHA512 a74e044d91db564a682f8d9b82fa73608fc10f2b0a917b1eb696375f5993e62cf03289a31b7e28aa27cbfdf027bf62160083ff39186d1f8333b52633ba5ed0fb
+EBUILD protobuf-java-3.19.6.ebuild 2852 BLAKE2B b131c6753d9af1c5038d449e40476455256905f323cad1eaa9c0378e5b0aaf132e11dec4e2622e5f51edc2952e1ab6de2de25cd0b8d5e5d205b7be9ae3c56a75 SHA512 2b5c46eab2b9b9fa398cdfbb4a2bb12a7f0dcdce4a977b9bc63a955a54283da548f8921231349a89442d7222708afb803335518bafe2ddd6f424e7fe5866dc2a
 EBUILD protobuf-java-3.20.1.ebuild 1430 BLAKE2B 8625de036d5ed22f587b922cd69620ce7e8dd1a0a30e77bc2154937156c2d1686c2ba27efaa1d55fc68720c420f16b14ba3520175791cefe99a754425d496a0a SHA512 e78e00cb7584d7d909b64feea2dc430819f63558ed124b86cdc2e518106a0e288638db14919286947fb86db15bbc47668398ca0081245a61e8294d56c5963d85
-EBUILD protobuf-java-9999.ebuild 1365 BLAKE2B 6d6876bc2cd65b0e17e4dfdf4de0fe4cde077a3f040ea1318511ff6da9915331a3f0686b132fe893aeda8d31c0f8031f338efef43c9f6e7e92d7ce75c1c8dc5a SHA512 f7c9ac0f8f37fe746aa3a0febd35d176e51600250ef512b2f7f28e17f6225fcd550b9bd708eb5eb5540f841b3e5116d18b011ef6bd75ee1a8e319124157df53c
-MISC metadata.xml 548 BLAKE2B 2468487e12d536d67daebf5b7a21cd63a9c4af321a8979132e63d9b8394bf577e347f891326c73bfa6907e82ca355ea0d4ec40a37bb297db0da1e55a62b6ef33 SHA512 c0c2556fbf8821f3a75ed344daa59b4fc355029f96efb8f9784f54c819916adeb46b2c5d8c2e8d405dc58395c2f18b30cda69c6d406948a066bd1d78a55df80b
+EBUILD protobuf-java-3.20.3.ebuild 2852 BLAKE2B c214278702be2c18ff5637fcc80171f34b8993a0369e6d01a142c365b53f281a81cdfbe4b834f7a58a1502608fc0a3b672a4c975d73be7a24b999d7ff56bb878 SHA512 ea67fa3fc66d97bcd6e95621c79ba7747a396d48d68689715a23c1dbcd03d71e4e2897a4d7418b49152af94c43f69876ce31b2e866647b037faa1e7dbeeb75e1
+EBUILD protobuf-java-3.21.8.ebuild 2854 BLAKE2B c9ee0042e0550d67b211360f9f37bac37b7ca592f20cc6cf8830279f1d22f91b571e1100e19f3158b757bff969575705bb52f26b8ebb56b753be98fcecbd8c7a SHA512 c60a2a04a9601a3d7afff24de4dafd48121c771c8aa92818f44c0a6a7de468e797d6287787969be546d744b1b8ddaa9e73e3121c115ba25b39fbb988dbb91ff9
+EBUILD protobuf-java-9999.ebuild 2995 BLAKE2B e1538e1a635ba897a9c2f75db235384cb4122c4390ed8bab3a9f46c57f74b1db58ef54e6df65e328df6458067e6b671b3dda4a08226c94e9929388aaa8efe386 SHA512 94b01edfaee931cc4a5944940429e89cf8837f74c25efe026c3ad7fb3a637da21f794b68d7fda90e9bbef58251bab3f3b0271fc4a50ea29c4389578fa3597e16
+MISC metadata.xml 625 BLAKE2B 13394b9a2148b9117ce719954591e79088f845ac1ceb667bbdd2645b989daadcfea09525f9dde68c405e3f1cce5cc1af32de9fb4dff629e4745e13fa92727dd7 SHA512 47f693db57dbde04f419ed65494d81b0a800c9ac49d790c9b794baef34fb1f876da29c5a0662c45aa3c01cecd34af648e196fb76110fcc0066198c59543049b3
diff --git a/dev-java/protobuf-java/metadata.xml b/dev-java/protobuf-java/metadata.xml
index 7fc9e27ef82d..5fdb33c1c7c3 100644
--- a/dev-java/protobuf-java/metadata.xml
+++ b/dev-java/protobuf-java/metadata.xml
@@ -9,6 +9,9 @@
 		<email>cjk@gentoo.org</email>
 		<name>Cjk</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+	</maintainer>
 	<slots>
 		<subslots>Soname version number of Protobuf</subslots>
 	</slots>
diff --git a/dev-java/protobuf-java/protobuf-java-3.19.6.ebuild b/dev-java/protobuf-java/protobuf-java-3.19.6.ebuild
new file mode 100644
index 000000000000..6adff3a717e4
--- /dev/null
+++ b/dev-java/protobuf-java/protobuf-java-3.19.6.ebuild
@@ -0,0 +1,102 @@
+# Copyright 2008-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="com.google.protobuf:${PN}:${PV}"
+# Tests not enabled, depend on com.google.truth which is not packaged
+# https://github.com/protocolbuffers/protobuf/blob/v3.19.6/java/core/pom.xml#L35-L40
+# JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+PARENT_PN="${PN/-java/}"
+PARENT_PV="${PV}"
+PARENT_P="${PARENT_PN}-${PARENT_PV}"
+
+if [[ "${PV}" == *9999 ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf.git"
+	EGIT_SUBMODULES=()
+	EGIT_CHECKOUT_DIR="${WORKDIR}/${PARENT_P}"
+else
+	SRC_URI="
+		https://github.com/protocolbuffers/protobuf/archive/v${PARENT_PV}.tar.gz
+			-> ${PARENT_P}.tar.gz
+	"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+fi
+
+DESCRIPTION="Google's Protocol Buffers - Java bindings"
+HOMEPAGE="
+	https://developers.google.com/protocol-buffers/
+"
+
+LICENSE="BSD"
+SLOT="0/30"
+
+S="${WORKDIR}/${PARENT_P}/java"
+
+BDEPEND="
+	dev-libs/protobuf:${SLOT}
+"
+DEPEND="
+	>=virtual/jdk-1.8:*
+	test? (
+		dev-java/guava:0
+		dev-java/mockito:4
+	)
+"
+RDEPEND="
+	>=virtual/jre-1.8:*
+"
+
+JAVA_AUTOMATIC_MODULE_NAME="com.google.protobuf"
+JAVA_JAR_FILENAME="protobuf.jar"
+JAVA_RESOURCE_DIRS="core/src/main/resources"
+JAVA_SRC_DIR="core/src/main/java"
+
+JAVA_TEST_GENTOO_CLASSPATH="guava,junit-4,mockito-4"
+JAVA_TEST_RESOURCE_DIRS="../src"
+JAVA_TEST_SRC_DIR="core/src/test/java"
+
+# Same than PATCHES but from repository's root directory,
+# please see function `src_prepare` below.
+# Simplier for users IMHO.
+PARENT_PATCHES=(
+)
+
+# Here for patches within "java/" subdirectory.
+PATCHES=(
+)
+
+src_prepare() {
+	pushd "${WORKDIR}/${PARENT_P}" > /dev/null || die
+	[[ -n "${PARENT_PATCHES[@]}" ]] && eapply "${PARENT_PATCHES[@]}"
+	eapply_user
+	popd > /dev/null || die
+
+	# Remove bundled jars
+	java-pkg_clean
+
+	java-pkg-2_src_prepare
+
+	# There is also compiler/plugin, but not in this list because in a subdirectory
+	core_protos=( any api descriptor duration empty field_mask source_context struct timestamp type wrappers )
+
+	# Copy resources from ../src/google/protobuf according to
+	# https://github.com/protocolbuffers/protobuf/blob/v3.19.6/java/core/pom.xml#L45-L61
+	mkdir -p "${JAVA_RESOURCE_DIRS}/google/protobuf/compiler" || die
+	cp "../src/google/protobuf/${core_protos[@]}.proto" \
+		"${JAVA_RESOURCE_DIRS}/google/protobuf" || die
+	cp {../src,"${JAVA_RESOURCE_DIRS}"}/google/protobuf/compiler/plugin.proto || die
+
+	# Generate 146 .java files according to
+	# https://github.com/protocolbuffers/protobuf/blob/v3.19.6/java/core/generate-sources-build.xml
+	for proto in "${core_protos[@]}" compiler/plugin; do
+		"${BROOT}/usr/bin/protoc" \
+			--java_out="${JAVA_SRC_DIR}" -I../src ../src/google/protobuf/"${proto}".proto || die
+	done
+}
diff --git a/dev-java/protobuf-java/protobuf-java-3.20.3.ebuild b/dev-java/protobuf-java/protobuf-java-3.20.3.ebuild
new file mode 100644
index 000000000000..2e58b824d118
--- /dev/null
+++ b/dev-java/protobuf-java/protobuf-java-3.20.3.ebuild
@@ -0,0 +1,102 @@
+# Copyright 2008-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="com.google.protobuf:${PN}:${PV}"
+# Tests not enabled, depend on com.google.truth which is not packaged
+# https://github.com/protocolbuffers/protobuf/blob/v3.20.3/java/core/pom.xml#L35-L40
+# JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+PARENT_PN="${PN/-java/}"
+PARENT_PV="${PV}"
+PARENT_P="${PARENT_PN}-${PARENT_PV}"
+
+if [[ "${PV}" == *9999 ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf.git"
+	EGIT_SUBMODULES=()
+	EGIT_CHECKOUT_DIR="${WORKDIR}/${PARENT_P}"
+else
+	SRC_URI="
+		https://github.com/protocolbuffers/protobuf/archive/v${PARENT_PV}.tar.gz
+			-> ${PARENT_P}.tar.gz
+	"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+fi
+
+DESCRIPTION="Google's Protocol Buffers - Java bindings"
+HOMEPAGE="
+	https://developers.google.com/protocol-buffers/
+"
+
+LICENSE="BSD"
+SLOT="0/31"
+
+S="${WORKDIR}/${PARENT_P}/java"
+
+BDEPEND="
+	dev-libs/protobuf:${SLOT}
+"
+DEPEND="
+	>=virtual/jdk-1.8:*
+	test? (
+		dev-java/guava:0
+		dev-java/mockito:4
+	)
+"
+RDEPEND="
+	>=virtual/jre-1.8:*
+"
+
+JAVA_AUTOMATIC_MODULE_NAME="com.google.protobuf"
+JAVA_JAR_FILENAME="protobuf.jar"
+JAVA_RESOURCE_DIRS="core/src/main/resources"
+JAVA_SRC_DIR="core/src/main/java"
+
+JAVA_TEST_GENTOO_CLASSPATH="guava,junit-4,mockito-4"
+JAVA_TEST_RESOURCE_DIRS="../src"
+JAVA_TEST_SRC_DIR="core/src/test/java"
+
+# Same than PATCHES but from repository's root directory,
+# please see function `src_prepare` below.
+# Simplier for users IMHO.
+PARENT_PATCHES=(
+)
+
+# Here for patches within "java/" subdirectory.
+PATCHES=(
+)
+
+src_prepare() {
+	pushd "${WORKDIR}/${PARENT_P}" > /dev/null || die
+	[[ -n "${PARENT_PATCHES[@]}" ]] && eapply "${PARENT_PATCHES[@]}"
+	eapply_user
+	popd > /dev/null || die
+
+	# Remove bundled jars
+	java-pkg_clean
+
+	java-pkg-2_src_prepare
+
+	# There is also compiler/plugin, but not in this list because in a subdirectory
+	core_protos=( any api descriptor duration empty field_mask source_context struct timestamp type wrappers )
+
+	# Copy resources from ../src/google/protobuf according to
+	# https://github.com/protocolbuffers/protobuf/blob/v3.20.2/java/core/pom.xml#L45-L61
+	mkdir -p "${JAVA_RESOURCE_DIRS}/google/protobuf/compiler" || die
+	cp "../src/google/protobuf/${core_protos[@]}.proto" \
+		"${JAVA_RESOURCE_DIRS}/google/protobuf" || die
+	cp {../src,"${JAVA_RESOURCE_DIRS}"}/google/protobuf/compiler/plugin.proto || die
+
+	# Generate 146 .java files according to
+	# https://github.com/protocolbuffers/protobuf/blob/v3.20.3/java/core/generate-sources-build.xml
+	for proto in "${core_protos[@]}" compiler/plugin; do
+		"${BROOT}/usr/bin/protoc" \
+			--java_out="${JAVA_SRC_DIR}" -I../src ../src/google/protobuf/"${proto}".proto || die
+	done
+}
diff --git a/dev-java/protobuf-java/protobuf-java-3.21.8.ebuild b/dev-java/protobuf-java/protobuf-java-3.21.8.ebuild
new file mode 100644
index 000000000000..abe81a5bcd1d
--- /dev/null
+++ b/dev-java/protobuf-java/protobuf-java-3.21.8.ebuild
@@ -0,0 +1,102 @@
+# Copyright 2008-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="com.google.protobuf:${PN}:${PV}"
+# Tests not enabled, depend on com.google.truth which is not packaged
+# https://github.com/protocolbuffers/protobuf/blob/v21.7/java/core/pom.xml#L35-L40
+# JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+PARENT_PN="${PN/-java/}"
+PARENT_PV="$(ver_cut 2-)"
+PARENT_P="${PARENT_PN}-${PARENT_PV}"
+
+if [[ "${PV}" == *9999 ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf.git"
+	EGIT_SUBMODULES=()
+	EGIT_CHECKOUT_DIR="${WORKDIR}/${PARENT_P}"
+else
+	SRC_URI="
+		https://github.com/protocolbuffers/protobuf/archive/v${PARENT_PV}.tar.gz
+			-> ${PARENT_P}.tar.gz
+	"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+fi
+
+DESCRIPTION="Google's Protocol Buffers - Java bindings"
+HOMEPAGE="
+	https://developers.google.com/protocol-buffers/
+"
+
+LICENSE="BSD"
+SLOT="0/32"
+
+S="${WORKDIR}/${PARENT_P}/java"
+
+BDEPEND="
+	dev-libs/protobuf:${SLOT}
+"
+DEPEND="
+	>=virtual/jdk-1.8:*
+	test? (
+		dev-java/guava:0
+		dev-java/mockito:4
+	)
+"
+RDEPEND="
+	>=virtual/jre-1.8:*
+"
+
+JAVA_AUTOMATIC_MODULE_NAME="com.google.protobuf"
+JAVA_JAR_FILENAME="protobuf.jar"
+JAVA_RESOURCE_DIRS="core/src/main/resources"
+JAVA_SRC_DIR="core/src/main/java"
+
+JAVA_TEST_GENTOO_CLASSPATH="guava,junit-4,mockito-4"
+JAVA_TEST_RESOURCE_DIRS="../src"
+JAVA_TEST_SRC_DIR="core/src/test/java"
+
+# Same than PATCHES but from repository's root directory,
+# please see function `src_prepare` below.
+# Simplier for users IMHO.
+PARENT_PATCHES=(
+)
+
+# Here for patches within "java/" subdirectory.
+PATCHES=(
+)
+
+src_prepare() {
+	pushd "${WORKDIR}/${PARENT_P}" > /dev/null || die
+	[[ -n "${PARENT_PATCHES[@]}" ]] && eapply "${PARENT_PATCHES[@]}"
+	eapply_user
+	popd > /dev/null || die
+
+	# Remove bundled jars
+	java-pkg_clean
+
+	java-pkg-2_src_prepare
+
+	# There is also compiler/plugin, but not in this list because in a subdirectory
+	core_protos=( any api descriptor duration empty field_mask source_context struct timestamp type wrappers )
+
+	# Copy resources from ../src/google/protobuf according to
+	# https://github.com/protocolbuffers/protobuf/blob/v21.7/java/core/pom.xml#L45-L61
+	mkdir -p "${JAVA_RESOURCE_DIRS}/google/protobuf/compiler" || die
+	cp "../src/google/protobuf/${core_protos[@]}.proto" \
+		"${JAVA_RESOURCE_DIRS}/google/protobuf" || die
+	cp {../src,"${JAVA_RESOURCE_DIRS}"}/google/protobuf/compiler/plugin.proto || die
+
+	# Generate 146 .java files according to
+	# https://github.com/protocolbuffers/protobuf/blob/v21.7/java/core/generate-sources-build.xml
+	for proto in "${core_protos[@]}" compiler/plugin; do
+		"${BROOT}/usr/bin/protoc" \
+			--java_out="${JAVA_SRC_DIR}" -I../src ../src/google/protobuf/"${proto}".proto || die
+	done
+}
diff --git a/dev-java/protobuf-java/protobuf-java-9999.ebuild b/dev-java/protobuf-java/protobuf-java-9999.ebuild
index 43fa605b496c..ab4856250e05 100644
--- a/dev-java/protobuf-java/protobuf-java-9999.ebuild
+++ b/dev-java/protobuf-java/protobuf-java-9999.ebuild
@@ -3,52 +3,103 @@
 
 EAPI=8
 
-JAVA_PKG_IUSE="doc source"
+JAVA_PKG_IUSE="doc source test"
+# Version based on value in (java/)core/pom.xml from main branch
+# Please update me when new release
+# Maybe find a way to automatically change it?
+MAVEN_ID="com.google.protobuf:${PN}:3.21.7"
+# Tests not enabled, depend on com.google.truth which is not packaged
+# https://github.com/protocolbuffers/protobuf/blob/v21.7/java/core/pom.xml#L35-L40
+# JAVA_TESTING_FRAMEWORKS="junit-4"
 
 inherit java-pkg-2 java-pkg-simple
 
-if [[ "${PV}" == "9999" ]]; then
+PARENT_PN="${PN/-java/}"
+PARENT_PV="${PV}"
+PARENT_P="${PARENT_PN}-${PARENT_PV}"
+
+if [[ "${PV}" == *9999 ]]; then
 	inherit git-r3
 
-	EGIT_CHECKOUT_DIR="${WORKDIR}/protobuf-${PV}"
-	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf"
+	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf.git"
 	EGIT_SUBMODULES=()
+	EGIT_CHECKOUT_DIR="${WORKDIR}/${PARENT_P}"
+else
+	SRC_URI="
+		https://github.com/protocolbuffers/protobuf/archive/v${PARENT_PV}.tar.gz
+			-> ${PARENT_P}.tar.gz
+	"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 fi
 
 DESCRIPTION="Google's Protocol Buffers - Java bindings"
-HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
-if [[ "${PV}" == "9999" ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> protobuf-${PV}.tar.gz"
-fi
-S="${WORKDIR}/protobuf-${PV}/java"
+HOMEPAGE="
+	https://developers.google.com/protocol-buffers/
+"
 
 LICENSE="BSD"
-SLOT="0/31"
-KEYWORDS=""
+SLOT="0/32"
+
+S="${WORKDIR}/${PARENT_P}/java"
 
-COMMON_DEPEND=">=virtual/jdk-1.8:*"
 BDEPEND="
-	~dev-libs/protobuf-${PV}
-	${COMMON_DEPEND}
+	dev-libs/protobuf:${SLOT}
+"
+DEPEND="
+	>=virtual/jdk-1.8:*
+	test? (
+		dev-java/guava:0
+		dev-java/mockito:4
+	)
+"
+RDEPEND="
+	>=virtual/jre-1.8:*
 "
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${DEPEND}"
+
+JAVA_AUTOMATIC_MODULE_NAME="com.google.protobuf"
+JAVA_JAR_FILENAME="protobuf.jar"
+JAVA_RESOURCE_DIRS="core/src/main/resources"
+JAVA_SRC_DIR="core/src/main/java"
+
+JAVA_TEST_GENTOO_CLASSPATH="guava,junit-4,mockito-4"
+JAVA_TEST_RESOURCE_DIRS="../src"
+JAVA_TEST_SRC_DIR="core/src/test/java"
+
+# Same than PATCHES but from repository's root directory,
+# please see function `src_prepare` below.
+# Simplier for users IMHO.
+PARENT_PATCHES=(
+)
+
+# Here for patches within "java/" subdirectory.
+PATCHES=(
+)
 
 src_prepare() {
-	pushd "${WORKDIR}/protobuf-${PV}" > /dev/null || die
+	pushd "${WORKDIR}/${PARENT_P}" > /dev/null || die
+	[[ -n "${PARENT_PATCHES[@]}" ]] && eapply "${PARENT_PATCHES[@]}"
 	eapply_user
 	popd > /dev/null || die
 
+	# Remove bundled jars
+	java-pkg_clean
+
 	java-pkg-2_src_prepare
-}
 
-src_compile() {
-	"${BROOT}/usr/bin/protoc" --java_out=core/src/main/java -I../src ../src/google/protobuf/descriptor.proto || die
-	JAVA_SRC_DIR="core/src/main/java" JAVA_JAR_FILENAME="protobuf.jar" java-pkg-simple_src_compile
-}
+	# There is also compiler/plugin, but not in this list because in a subdirectory
+	core_protos=( any api descriptor duration empty field_mask source_context struct timestamp type wrappers )
+
+	# Copy resources from ../src/google/protobuf according to
+	# https://github.com/protocolbuffers/protobuf/blob/v21.7/java/core/pom.xml#L45-L61
+	mkdir -p "${JAVA_RESOURCE_DIRS}/google/protobuf/compiler" || die
+	cp "../src/google/protobuf/${core_protos[@]}.proto" \
+		"${JAVA_RESOURCE_DIRS}/google/protobuf" || die
+	cp {../src,"${JAVA_RESOURCE_DIRS}"}/google/protobuf/compiler/plugin.proto || die
 
-src_install() {
-	JAVA_SRC_DIR="core/src/main/java" JAVA_JAR_FILENAME="protobuf.jar" java-pkg-simple_src_install
+	# Generate 146 .java files according to
+	# https://github.com/protocolbuffers/protobuf/blob/v21.7/java/core/generate-sources-build.xml
+	for proto in "${core_protos[@]}" compiler/plugin; do
+		"${BROOT}/usr/bin/protoc" \
+			--java_out="${JAVA_SRC_DIR}" -I../src ../src/google/protobuf/"${proto}".proto || die
+	done
 }
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 6de300d17273..ed1d12c88966 100644
Binary files a/dev-lang/Manifest.gz and b/dev-lang/Manifest.gz differ
diff --git a/dev-lang/lua/Manifest b/dev-lang/lua/Manifest
index 88ce57ef3ee8..b00f4032f4f1 100644
--- a/dev-lang/lua/Manifest
+++ b/dev-lang/lua/Manifest
@@ -8,4 +8,4 @@ DIST lua-5.4.4.tar.xz 606456 BLAKE2B ba6cad647c0171e5e737151b189b5b404948c08182e
 EBUILD lua-5.1.5-r200.ebuild 1214 BLAKE2B 5e37b356ee233f7f3e658985a5159ecf0e5d56902f60ba76959ee0b23399415c004471026b74897b14529d3298d18e2f2f3fdbd0aa5265e22ef8e82e445fded8 SHA512 ee6b51bde5d2ab06973489173588ec99997a9f5cadf7f2718db26b09fce56608c6687a1a4c4e3902ff53e4ed329c1d51270bea64890d8615e04373df41033874
 EBUILD lua-5.3.6-r102.ebuild 1400 BLAKE2B 17e972648f85f16b6ab40cd90506dcb7443cd4ef908bcc9cedb149f4b2ba0c4ddc3582c33b071fc6b59ef462fee7ec79dbb83dd95b2a83645fb057b27911e5cf SHA512 3f057e2b155ae5dc5d588e2ae1cdc88b6838736f0c42309e8d7a57ba909c34be3286f36076c5b838c29c98020d3c4d8f4f8cd51df7e4c6b5e81537eb3cd90512
 EBUILD lua-5.4.4-r103.ebuild 1439 BLAKE2B 0cbb4f6f386d3f50135cdc7d6d854e30c559bd3201e72bfda33f2af1e1d060b02779d1ea8cf0d618fe8598c6c08cd76f98589cd981e78e2ea2bea8ae613a627e SHA512 bb380b641c8e7647740476220c6820a0d9bc80786552561d15ccf8a8fd328ae9b9563085ab394b9b62b49f64ea672e702fd2a9cc8fad509b7f223aeaccf832f7
-MISC metadata.xml 459 BLAKE2B fa30f3140c6d04a909f8bcb6f0ec1044c55bab6ada7d1356e2a36efc4be72a6b414f499362b47d2ce1c20a1c1e65c991ce47a63f5f2d02b4952fb968e31706a6 SHA512 5c0e3d8d562d555907de40041fc8de2e194cf5e40eac8e4ca046b35349dc991b2206da932e86048f430c19c31bcfaf9da5b7e4326392a9dcaa6cdc73fe2116e2
+MISC metadata.xml 531 BLAKE2B 19b9857f40565977f08d20b76cc444f2e736b040d68afc50b8697ca771345a7393aad5dc0d27251c59ea3a47840465ce76fad315d91b63758cb969bbfdc94fce SHA512 fef206f3d804206a8f0941767e27a46b0237d528125512b49a368ae15ab90750ad40a1261699f22e8f53274a1ea129b392becada0f4757d712b9197733093793
diff --git a/dev-lang/lua/metadata.xml b/dev-lang/lua/metadata.xml
index 3060e368c16f..9237282a3ce5 100644
--- a/dev-lang/lua/metadata.xml
+++ b/dev-lang/lua/metadata.xml
@@ -12,4 +12,7 @@
 	<use>
 		<flag name="deprecated">make deprecated data structures/routines available</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">lua/lua</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index 3048c243ac43..8c8a1e8655e6 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -4,20 +4,28 @@ DIST Python-2.7.18.tar.xz 12854736 BLAKE2B 060a621c91dd8e3d321aec99d44c17aa67381
 DIST Python-2.7.18.tar.xz.asc 833 BLAKE2B 1d98770e46171971fb99994508d238c01d2755281d2f94353314014d9e83e0ec5f0b3e3950ea1fdf5fce9ba6b8f55312355845c2a3fc4291c27ee56fe6215448 SHA512 c2a5f5a52f47dec52460ad3275758d4e5de6e7075c3def4353c988d74d563a39b42cae2d5eb24e2a23a6247cef69100f91620b11a49c2359fbf99b203c9cbda8
 DIST Python-3.10.8.tar.xz 19619508 BLAKE2B 8bbfbae34fbc517c4a746e5e4c360efc57aca175c50fe46a378aa9d6d023a3d90c7df816149e4cca0c9b64ca0142267d8df552e8f8dc53a04b5251e8848dce74 SHA512 40e3e77d79618c81d6fc57c5d119b99c2959dcf932f40aad6b26f2ec39c5e713e6ff298f7597b4fad2ab94680db3732483b5ca0a45e6ae58c14580b3ea44cb0f
 DIST Python-3.10.8.tar.xz.asc 833 BLAKE2B 1e94822a57d055f5db1a5d2915df24be9d6fd9e6b301d148919a7643285a93ca1c8a16db7d74e0adabe7d2a21678b5126e3df7fffb253b35f8db6f74284a0aba SHA512 0c2ef09d898257ba5e9ec7c5bb224a7e50e5ebca96843b4d9e25be6cdd2f17144772aafc92280af20c21491e3c8cedc697414688ece613c93b28ff7ecddcf93f
+DIST Python-3.11.0.tar.xz 19819768 BLAKE2B 3a9852b8973e0e6ce414742f08f17f2c239d20a4e437e95656a325e151d04f4751f07fce955e55f2818af6810b767f2438b3d14e9f2313fe607bab31c47a2fca SHA512 314eef88ae0d68760f34d7a32f238fd2ecb27c50963baa7357c42ad8159026ec50229a0b31d83c39710a472904a06422afc082f9658a90a1dc83ccb74c08039d
+DIST Python-3.11.0.tar.xz.asc 833 BLAKE2B 7133f390ff8e7d856466c8d310903ef694196f5d945d6b753dcd7bf3e5416d69ef0e2320252ecce419ecce07ac5e2a37ad1657e2ded393d0c38a6521a65cebc2 SHA512 d20fb152c5b16cfef1f59af588f7576eb45c903d9e15fd4ad0e15fd32bef7ffd951b99a062d2944234ecffcf29eb9266544e92d2f6584710cbb20ba38f8ac224
 DIST Python-3.11.0rc2.tar.xz 19828340 BLAKE2B c4e8578d967917fc6f19355c466ba8e5487e83a17b373dd03ae90f2a73f5f6d07c38ec308c03435d23454cdcb06e63b74fc9ceb3900079996ae71b9327a4a5b3 SHA512 8b37bc9df3c966bd35cffdb7d6406a3c1a5ccfbea10bd8dad498880e3b1492f8cdbbe227ab3a30557843eb05d8fb93077c791e25d71b33ed420992d54b6c9473
 DIST Python-3.11.0rc2.tar.xz.asc 833 BLAKE2B 80ea3e8a3565fef6552da2287a5bf07a764002c273842b7d03a417a75adfe616e1b7816c161c42751a495b32ab8d8c11efc6c90ade97c0b31be54f7391ee9c9d SHA512 13e6bfa719db29aa169763399203168923cbfbb01d209e18269399ca84723582f480134edd3bf9f24785cd5ab0486411132d6bbb354fa45ebbba68bf4c70021a
+DIST Python-3.12.0a1.tar.xz 19776600 BLAKE2B 035e75c5713f9ff139f6df50329d9b74ade3b255f5413311d7012b2298dd3cb6d71ed11f5855d01e79d6bac334f80bd6a3340591fc3654d9723fd1c5f80eb750 SHA512 fa69dddf36dfe89b869d4de71cb8e878ef1e8be2b96ddfe2d58286710dd09b64db67c130d0438e3cea6679f6e9cd6bb83633691c8b7d6f346b730668866a28f7
+DIST Python-3.12.0a1.tar.xz.asc 963 BLAKE2B 5027ce705b80ad2d186f45c27d00542df1090dcaa30e9d97e483d7debdaeb35b5bf94c9f0cd000715a8ccf6dc5f752e0129bb42e48bfd6b308754bd73ee26090 SHA512 4db7946d27505da9c9b358a3b0fc2f47bb79b10bbcdb8f3ce2f918d1b74665e41a51600de3b94d50b126b66c72f191f8532f4030af184698c32430c35ef8d821
 DIST Python-3.8.15.tar.xz 19038408 BLAKE2B 4ce84171b2f7ca8c9cf1d130adf70f16a0899766cea98965c3e7afcb84b73c482bcb400b59b91736d20e31c57be79edc178f6eeecd775a1f8920a8fbfdd90c24 SHA512 4fb3827b13c2452faa75e5ed18dddf381e80b4fffcfde046e289b4629cff0bb87fba1d09916b9b8a6f8039dc422c952293ebdb381c49f8ca7e7893ae4be6c28d
 DIST Python-3.8.15.tar.xz.asc 833 BLAKE2B bff055e28f4a2e59bb9e6d131ed39f954b729ac791279a6ac618521b545ace16e4eba3aaab629ca1c155d973c0c255b3d184b38fd82ee943d59a328d0603b1b6 SHA512 8ed69db7773a111e7b356848e18fc35b8835426e8d2cb8f311644d511682960c97740232c32c92196391adaecebc0ff842c2f918aad07e5dd46b168e8277ac04
 DIST Python-3.9.15.tar.xz 19712208 BLAKE2B a8490c998c89ed4e3e87ef48e3b5d622e5d06ebd7b8b79db564d668cd1f0c7fe89e0ef37ec4481ff82b30778e2be1a96c1b16199b9dce1f82de32f73b4343ddd SHA512 9310d263bc7a7925f73a6f66fd254ae61f377f43011a6bc5c58e57c8b170c2da4f197a646927ab9d05f8912ed8be4369c09576063931a3f93c3b0228ccb33a39
 DIST Python-3.9.15.tar.xz.asc 833 BLAKE2B c325fb52fae254153456c24c1039b07c9ccf8734df3665640215d35219ccacb705f99d94c9f8b644d15d4ea4612f5ac0da599814f68f7d3b6fc1fdc175db9002 SHA512 722625091731536757b9db447590c31620665133d45076367a3281f2ee3add23a781b10ce5cea582d65caabb18814583c1a347689d2b396214e36a6771182f38
 DIST python-gentoo-patches-2.7.18_p15.tar.xz 34956 BLAKE2B d173f276dd9c0ce31004dcc55a0d18e9ce25a47683c2df3c4dd62e967dfbbb35be59a2f08cf20f30a19475a8a2344dd95b17400eafa88b5fdbe9270a12ccbf32 SHA512 d9386808265f978808e5c0ffd384cefe54fb0e05aeccfd394167d5227d9cd66e25c8e93c54914762b2cfc3c2dd851b26a7a84d62634c6aa8a0798aacbb7ac25f
 DIST python-gentoo-patches-3.10.8.tar.xz 10104 BLAKE2B a2e5fa956652fda1464c65ba4f648da2d77a545d53bf8d2429bce745c93e82eaea40bf6da3289f4216fe4b029b97ccf6ac0c3cfbdcc179f3c5f9e64e89cd5fe4 SHA512 e506c7fc3f6ebff340f090b462716c745f1acfa95c00a39a58367941efb356b8dcd72a3fa46d6760422733c0d6b65b79f0e8bedc77b93289c51ca4dc2ea0db2a
+DIST python-gentoo-patches-3.11.0.tar.xz 5404 BLAKE2B 7109040bd27e77b4a17e94d24060644ae9b42f618768beb4ae0659c65b33a943e6158ccf8724432ff0f97d7b3a86e2efb99795fbeed801723049a99d2dcc96c3 SHA512 94f3f7f3262f5c064fec4977230bbde09ca8f77e92739aa230f73ef9e1012049a2d9cefc7774a2538f732e0e7ba170214956578d64c19124bd964d4915982bb0
 DIST python-gentoo-patches-3.11.0rc2_p1.tar.xz 6292 BLAKE2B e52e0066ca3f53e2efd2d71c035849cd619d3a8cdeb9767cc28369f4b7f04ffd74419e7c02913d4b10958937dc8960fa4287862e8db627e5f421472a18efeb73 SHA512 a6ae37288e7621275b46ab1a813dfbbbf24ee511d644b4027e396f5cba56fccf94e19cb354468ea4c35cd86db2040b165c87c8e24cc2c9e598e91946a1f80863
+DIST python-gentoo-patches-3.12.0a1.tar.xz 4896 BLAKE2B 2c1582f37372eedd3fddae0a07db718cb9bd2ae41e1b9c5807ee400c554bb9aa928445ea8043fe8d12dc64c6d23766875b5957e10aa8414658cc9e037ad87244 SHA512 d6f6f522ee8c9c616bea4237449417f585b0dd3606307fe80e0a3f719856ea5691c90a6ea5bf8b330d71d88477a5411f66146dc2aebb697edcfa04112bad4e2c
 DIST python-gentoo-patches-3.8.15.tar.xz 25700 BLAKE2B 1f13964caed36f70f5d5d2637ce39ac06efd52b744c353463486844dfaa411d38c37e3e50921a97183315bf44aa36557bd071dbfd8b2a69e8f1a05de5f11bba8 SHA512 39326cd1cff1794ca607c769750525a77cb0a4e6435d0fab141cff82cb05d68a6269014f8a30d7143b57b51170b3efcf43bfa6b41a079f588880e5562a63d54f
 DIST python-gentoo-patches-3.9.15.tar.xz 20200 BLAKE2B 4367cdeb0d9c27110f52f5061717e37da6b9d8a167de24417fdf2b88b4cf6d512fba2c81df90a19f02e929baaf755e70ede305b5ebbb0be94bd5ab3dc3f1bdfa SHA512 9c3a20b49a29d83d2c55d7432f606ebdcaf6210c6bf6d891084d0b2161502002c6f6738cee6e05eceb8ffd6b6a40d4c6ea42f6e07634388644aaeb8f87dbdf8e
 EBUILD python-2.7.18_p15-r1.ebuild 8307 BLAKE2B 4be343c831fc645acc31432978f0ddb6da538abadc55238b5907a7b7c822c2e308455d1bb0d27d53c887be89fca742088932c2d4ba570293097113f6b5c0c2a6 SHA512 5fb05c1a8f045fd3eb3e24fafef2063fc51db7cfd13fcb3475a1c0e54c458db76c5667f9e164bd9ec084ba9965b7745bbf3c6bc7070db228b32c934a19722ecf
-EBUILD python-3.10.8.ebuild 12450 BLAKE2B da8c821133145186da6ce1f443543045b87894dccf57c274a077535fa2609c80a2b60721345c9931b6f419918e92e68d4e922e1df781011c10d45343dc3dfa24 SHA512 97532f4b5a60be9f01d67982ad6d23a85f0fec774897029c962cd96cdf4447d7b38bd1d712c4f0c99fce232fa312dd80b2cea313250d368da33fcd6e7b148094
+EBUILD python-3.10.8.ebuild 12688 BLAKE2B 389b8c4090310a79e3f8b35606f92e965aef5811726d3b81588dbd3d87597031d857ca1e1492149baa23c59d79ce8f98c03e41077a51deae441e4917b5a9a2e3 SHA512 4d2206754e2a00fb32bf16e71d639323cf209f097fb6d88ef9c8f4191fe56a5f5605b66755e95e286a1da7f6f37984651b9f15d706a8383bc5e5034d48a5c81b
+EBUILD python-3.11.0.ebuild 13796 BLAKE2B 68a3298bf892bcb49b231d55e5bdc4795860324f4be5c128cb322871f6f851c3a82e955229d5e44aa01f18d38c95a44c967ad4aa4117d1aeb5e368353838fb80 SHA512 355d220ecc17ae85ee0c8c1bf5140bce8014c7c60bb6965c6d09493fe3e98cd25f78e4611cadbb40b6e35d8ce90f67eb77b03d13e129fe2373d663a745f778d6
 EBUILD python-3.11.0_rc2_p1.ebuild 13357 BLAKE2B fac65a9fba93a49af0ed0dd91f532e6cd729b815ae71b06dcdc40391dbf5252c56067be5a8085576cee41bf96d011fe9264ec0c390bb22db2265579d8b696092 SHA512 faa9b3067f81e57d8969825fa7851ac74690fdaab8b380f963f8567a09ce69a250592ee23df42f584c25261a49e93bafcecd23ab9d392d90ad4794e2c532d7e7
-EBUILD python-3.8.15.ebuild 11000 BLAKE2B 526b13e531cd159b422b1b422c28f6a1a6ae7a6af13ddc16b4dabfe8b08514299dcc9c6e14ff93dd1b0a4703c4a5146d8a7e9dfecfd82367941ca90d508c2260 SHA512 3fae39fdf1cb630f0d9cc3780b72cfb8403a09b58809f92e10562acf310487db98195951df6beb23b0aafaea93fbcf351851573538b50876de7c0d647b7093a4
-EBUILD python-3.9.15.ebuild 12253 BLAKE2B 25c38fdde54f35f0b9237a9265610108a01d87bb866dfa33f3e99f7be7ff3b1b3e9ef8c0bccc046324c18d7fe4163f86f7907b798cd4b478c021f0ce002a16a2 SHA512 4c04b08e342ee26beb887fcd01a2dd4bb047d5a171cf1ed4034e8334de93ba842b1be5d3cb86bca4144f469402090a83d285049bcfc0e628e363f394875be45b
+EBUILD python-3.12.0_alpha1.ebuild 13351 BLAKE2B 1ac4335670654fc62854502cdc86505afa55710aa26cc5f6c4660bbdcea26b5977996b02a552786d4e644d4347223c6faab01b21ae595e8417ffd5b93ae80a3e SHA512 4e2a27dd7582470774b8e523320ee13ca24087ef4bcc71f7c1098d6fa9a49533d2d284dbc25a2cb25238e88c88e89259e292ea2b3760bb196aa00aca0431bf8e
+EBUILD python-3.8.15.ebuild 11238 BLAKE2B 8299e6660df9f222e3e1ba22f2baa30686f5be412294f3266db0431c0cb28a530b957bbba8170581f095c7bdb8ea25e3374aad831a52df936e4ffe748eb20837 SHA512 991a3fdf9f69a39600542b5a70ffba5113213689f7a1efe0d3307ce63fd00a31c046bc7c114c126c0fec1b9bd74e27b0dce52f7d4d9863211c9e5eb04b2682d3
+EBUILD python-3.9.15.ebuild 12491 BLAKE2B ea7e3f7bf9d06e6c995ee7f4ce62179ced7a2791a42e4d53013b8f6fbb363992f3547c2dc844669f92bf27ee880bd69bfa7af366124cd83bfb36a9d5214112ae SHA512 c3b701a2d63ca021f948df9b23426c938b3c005a2fe6570cb543a997fffd289ebce58815460d930265b0ad124cfab0ebf378cf2c6e42ee9ac7f0a139bdea9ab6
 MISC metadata.xml 1068 BLAKE2B 3c3511739ae8251d11bde32aa3a21225fd3468f2b1f31c459de956c5bb7dbc2de4103a288dd29b26d1023e40bac62631fa953d1515513e934f5c3962d9c715a7 SHA512 0f7d3f9305cc539619568aea7e54cdb9a3319579e811108cf03d7c66290e4f21080a87ca02f1a62264d4ecd41a243c91f0a639e6c064ccf2b24b460508c848b8
diff --git a/dev-lang/python/python-3.10.8.ebuild b/dev-lang/python/python-3.10.8.ebuild
index 625f41d24ffb..0b7ad7f2c527 100644
--- a/dev-lang/python/python-3.10.8.ebuild
+++ b/dev-lang/python/python-3.10.8.ebuild
@@ -231,13 +231,14 @@ src_configure() {
 
 	# disable implicit optimization/debugging flags
 	local -x OPT=
-	# pass system CFLAGS & LDFLAGS as _NODIST, otherwise they'll get
-	# propagated to sysconfig for built extensions
-	local -x CFLAGS_NODIST=${CFLAGS}
-	local -x LDFLAGS_NODIST=${LDFLAGS}
-	local -x CFLAGS= LDFLAGS=
 
 	if tc-is-cross-compiler ; then
+		# pass system CFLAGS & LDFLAGS as _NODIST, otherwise they'll get
+		# propagated to sysconfig for built extensions
+		local -x CFLAGS_NODIST=${CFLAGS_FOR_BUILD}
+		local -x LDFLAGS_NODIST=${LDFLAGS_FOR_BUILD}
+		local -x CFLAGS= LDFLAGS=
+
 		# We need to build our own Python on CBUILD first, and feed it in.
 		# bug #847910 and bug #864911.
 		local myeconfargs_cbuild=(
@@ -282,6 +283,12 @@ src_configure() {
 		popd &> /dev/null || die
 	fi
 
+	# pass system CFLAGS & LDFLAGS as _NODIST, otherwise they'll get
+	# propagated to sysconfig for built extensions
+	local -x CFLAGS_NODIST=${CFLAGS}
+	local -x LDFLAGS_NODIST=${LDFLAGS}
+	local -x CFLAGS= LDFLAGS=
+
 	econf "${myeconfargs[@]}"
 
 	if grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
diff --git a/dev-lang/python/python-3.11.0.ebuild b/dev-lang/python/python-3.11.0.ebuild
new file mode 100644
index 000000000000..ab0050062031
--- /dev/null
+++ b/dev-lang/python/python-3.11.0.ebuild
@@ -0,0 +1,498 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+WANT_LIBTOOL="none"
+
+inherit autotools check-reqs flag-o-matic multiprocessing pax-utils
+inherit python-utils-r1 toolchain-funcs verify-sig
+
+MY_PV=${PV/_rc/rc}
+MY_P="Python-${MY_PV%_p*}"
+PYVER=$(ver_cut 1-2)
+PATCHSET="python-gentoo-patches-${MY_PV}"
+
+DESCRIPTION="An interpreted, interactive, object-oriented programming language"
+HOMEPAGE="
+	https://www.python.org/
+	https://github.com/python/cpython/
+"
+SRC_URI="
+	https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
+	verify-sig? (
+		https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz.asc
+	)
+"
+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"
+IUSE="
+	bluetooth build +ensurepip examples gdbm hardened libedit lto
+	+ncurses pgo +readline +sqlite +ssl test tk
+"
+RESTRICT="!test? ( test )"
+
+# Do not add a dependency on dev-lang/python to this ebuild.
+# If you need to apply a patch which requires python for bootstrapping, please
+# run the bootstrap code on your dev box and include the results in the
+# patchset. See bug 447752.
+
+RDEPEND="
+	app-arch/bzip2:=
+	app-arch/xz-utils:=
+	app-crypt/libb2
+	>=dev-libs/expat-2.1:=
+	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? (
+		!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
+	)
+	!!<sys-apps/sandbox-2.21
+"
+# bluetooth requires headers from bluez
+DEPEND="
+	${RDEPEND}
+	bluetooth? ( net-wireless/bluez )
+	test? ( app-arch/xz-utils[extra-filters(+)] )
+"
+# autoconf-archive needed to eautoreconf
+BDEPEND="
+	sys-devel/autoconf-archive
+	virtual/awk
+	virtual/pkgconfig
+	verify-sig? ( sec-keys/openpgp-keys-python )
+"
+RDEPEND+="
+	!build? ( app-misc/mime-types )
+"
+if [[ ${PV} != *_alpha* ]]; then
+	RDEPEND+="
+		dev-lang/python-exec[python_targets_python${PYVER/./_}(-)]
+	"
+fi
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/python.org.asc
+
+# large file tests involve a 2.5G file being copied (duplicated)
+CHECKREQS_DISK_BUILD=5500M
+
+QA_PKGCONFIG_VERSION=${PYVER}
+
+pkg_pretend() {
+	use test && check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+	use test && check-reqs_pkg_setup
+}
+
+src_unpack() {
+	if use verify-sig; then
+		verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.asc}
+	fi
+	default
+}
+
+src_prepare() {
+	# Ensure that internal copies of expat and libffi are not used.
+	rm -r Modules/expat || die
+	rm -r Modules/_ctypes/libffi* || die
+
+	local PATCHES=(
+		"${WORKDIR}/${PATCHSET}"
+	)
+
+	default
+
+	# https://bugs.gentoo.org/850151
+	sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" setup.py || die
+
+	# force the correct number of jobs
+	# https://bugs.gentoo.org/737660
+	local jobs=$(makeopts_jobs)
+	sed -i -e "s:-j0:-j${jobs}:" Makefile.pre.in || die
+	sed -i -e "/self\.parallel/s:True:${jobs}:" setup.py || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local disable
+	# disable automagic bluetooth headers detection
+	if ! use bluetooth; then
+		local -x ac_cv_header_bluetooth_bluetooth_h=no
+	fi
+
+	append-flags -fwrapv
+	filter-flags -malign-double
+
+	# https://bugs.gentoo.org/700012
+	if is-flagq -flto || is-flagq '-flto=*'; then
+		append-cflags $(test-flags-CC -ffat-lto-objects)
+	fi
+
+	# Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
+	# PKG_CONFIG needed for cross.
+	tc-export CXX PKG_CONFIG
+
+	# Fix implicit declarations on cross and prefix builds. Bug #674070.
+	if use ncurses; then
+		append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw
+	fi
+
+	local dbmliborder=
+	if use gdbm; then
+		dbmliborder+="${dbmliborder:+:}gdbm"
+	fi
+
+	if use pgo; then
+		local profile_task_flags=(
+			-m test
+			"-j$(makeopts_jobs)"
+			--pgo-extended
+			-x test_gdb
+			-u-network
+
+			# All of these seem to occasionally hang for PGO inconsistently
+			# They'll even hang here but be fine in src_test sometimes.
+			# bug #828535 (and related: bug #788022)
+			-x test_asyncio
+			-x test_httpservers
+			-x test_logging
+			-x test_multiprocessing_fork
+			-x test_socket
+			-x test_xmlrpc
+		)
+
+		if has_version "app-arch/rpm" ; then
+			# Avoid sandbox failure (attempts to write to /var/lib/rpm)
+			profile_task_flags+=(
+				-x test_distutils
+			)
+		fi
+		local -x PROFILE_TASK="${profile_task_flags[*]}"
+	fi
+
+	local myeconfargs=(
+		# glibc-2.30 removes it; since we can't cleanly force-rebuild
+		# Python on glibc upgrade, remove it proactively to give
+		# a chance for users rebuilding python before glibc
+		ac_cv_header_stropts_h=no
+
+		--enable-shared
+		--without-static-libpython
+		--enable-ipv6
+		--infodir='${prefix}/share/info'
+		--mandir='${prefix}/share/man'
+		--with-computed-gotos
+		--with-dbmliborder="${dbmliborder}"
+		--with-libc=
+		--enable-loadable-sqlite-extensions
+		--without-ensurepip
+		--with-system-expat
+		--with-system-ffi
+		--with-platlibdir=lib
+		--with-pkg-config=yes
+		--with-wheel-pkg-dir="${EPREFIX}"/usr/lib/python/ensurepip
+
+		$(use_with lto)
+		$(use_enable pgo optimizations)
+		$(use_with readline readline "$(usex libedit editline readline)")
+	)
+
+	# disable implicit optimization/debugging flags
+	local -x OPT=
+
+	if tc-is-cross-compiler ; then
+		# pass system CFLAGS & LDFLAGS as _NODIST, otherwise they'll get
+		# propagated to sysconfig for built extensions
+		local -x CFLAGS_NODIST=${CFLAGS_FOR_BUILD}
+		local -x LDFLAGS_NODIST=${LDFLAGS_FOR_BUILD}
+		local -x CFLAGS= LDFLAGS=
+
+		# We need to build our own Python on CBUILD first, and feed it in.
+		# bug #847910
+		local myeconfargs_cbuild=(
+			"${myeconfargs[@]}"
+
+			# As minimal as possible for the mini CBUILD Python
+			# we build just for cross to satisfy --with-build-python.
+			--without-lto
+			--without-readline
+			--disable-optimizations
+		)
+
+		myeconfargs+=(
+			# Point the imminent CHOST build to the Python we just
+			# built for CBUILD.
+			--with-build-python="${WORKDIR}"/${P}-${CBUILD}/python
+		)
+
+		mkdir "${WORKDIR}"/${P}-${CBUILD} || die
+		pushd "${WORKDIR}"/${P}-${CBUILD} &> /dev/null || die
+		ECONF_SOURCE="${S}" econf_build "${myeconfargs_cbuild[@]}"
+
+		# Avoid as many dependencies as possible for the cross build.
+		cat >> Makefile <<-EOF || die
+			MODULE_NIS_STATE=disabled
+			MODULE__DBM_STATE=disabled
+			MODULE__GDBM_STATE=disabled
+			MODULE__DBM_STATE=disabled
+			MODULE__SQLITE3_STATE=disabled
+			MODULE__HASHLIB_STATE=disabled
+			MODULE__SSL_STATE=disabled
+			MODULE__CURSES_STATE=disabled
+			MODULE__CURSES_PANEL_STATE=disabled
+			MODULE_READLINE_STATE=disabled
+			MODULE__TKINTER_STATE=disabled
+			MODULE_PYEXPAT_STATE=disabled
+			MODULE_ZLIB_STATE=disabled
+		EOF
+
+		# Unfortunately, we do have to build this immediately, and
+		# not in src_compile, because CHOST configure for Python
+		# will check the existence of the --with-build-python value
+		# immediately.
+		emake
+		popd &> /dev/null || die
+	fi
+
+	# pass system CFLAGS & LDFLAGS as _NODIST, otherwise they'll get
+	# propagated to sysconfig for built extensions
+	local -x CFLAGS_NODIST=${CFLAGS}
+	local -x LDFLAGS_NODIST=${LDFLAGS}
+	local -x CFLAGS= LDFLAGS=
+
+	econf "${myeconfargs[@]}"
+
+	if grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
+		eerror "configure has detected that the sem_open function is broken."
+		eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777."
+		die "Broken sem_open function (bug 496328)"
+	fi
+
+	# force-disable modules we don't want built
+	local disable_modules=( NIS )
+	use gdbm || disable_modules+=( _GDBM _DBM )
+	use sqlite || disable_modules+=( _SQLITE3 )
+	use ssl || disable_modules+=( _HASHLIB _SSL )
+	use ncurses || disable_modules+=( _CURSES _CURSES_PANEL )
+	use readline || disable_modules+=( READLINE )
+	use tk || disable_modules+=( _TKINTER )
+
+	local mod
+	for mod in "${disable_modules[@]}"; do
+		echo "MODULE_${mod}_STATE=disabled"
+	done >> Makefile || die
+
+	# install epython.py as part of stdlib
+	echo "EPYTHON='python${PYVER}'" > Lib/epython.py || die
+}
+
+src_compile() {
+	# Ensure sed works as expected
+	# https://bugs.gentoo.org/594768
+	local -x LC_ALL=C
+	# Prevent using distutils bundled by setuptools.
+	# https://bugs.gentoo.org/823728
+	export SETUPTOOLS_USE_DISTUTILS=stdlib
+	export PYTHONSTRICTEXTENSIONBUILD=1
+
+	# Save PYTHONDONTWRITEBYTECODE so that 'has_version' doesn't
+	# end up writing bytecode & violating sandbox.
+	# bug #831897
+	local -x _PYTHONDONTWRITEBYTECODE=${PYTHONDONTWRITEBYTECODE}
+
+	if use pgo ; then
+		# bug 660358
+		local -x COLUMNS=80
+		local -x PYTHONDONTWRITEBYTECODE=
+
+		addpredict /usr/lib/python3.11/site-packages
+	fi
+
+	# also need to clear the flags explicitly here or they end up
+	# in _sysconfigdata*
+	emake CPPFLAGS= CFLAGS= LDFLAGS=
+
+	# Restore saved value from above.
+	local -x PYTHONDONTWRITEBYTECODE=${_PYTHONDONTWRITEBYTECODE}
+
+	# Work around bug 329499. See also bug 413751 and 457194.
+	if has_version dev-libs/libffi[pax-kernel]; then
+		pax-mark E python
+	else
+		pax-mark m python
+	fi
+}
+
+src_test() {
+	# Tests will not work when cross compiling.
+	if tc-is-cross-compiler; then
+		elog "Disabling tests due to crosscompiling."
+		return
+	fi
+
+	# this just happens to skip test_support.test_freeze that is broken
+	# without bundled expat
+	# TODO: get a proper skip for it upstream
+	local -x LOGNAME=buildbot
+
+	local test_opts=(
+		-u-network
+		-j "$(makeopts_jobs)"
+
+		# fails
+		-x test_gdb
+	)
+
+	if use sparc ; then
+		# bug #788022
+		test_opts+=(
+			-x test_multiprocessing_fork
+			-x test_multiprocessing_forkserver
+		)
+	fi
+
+	# workaround docutils breaking tests
+	cat > Lib/docutils.py <<-EOF || die
+		raise ImportError("Thou shalt not import!")
+	EOF
+
+	# bug 660358
+	local -x COLUMNS=80
+	local -x PYTHONDONTWRITEBYTECODE=
+	# workaround https://bugs.gentoo.org/775416
+	addwrite /usr/lib/python3.11/site-packages
+
+	nonfatal emake test EXTRATESTOPTS="${test_opts[*]}" \
+		CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
+	local ret=${?}
+
+	rm Lib/docutils.py || die
+
+	[[ ${ret} -eq 0 ]] || die "emake test failed"
+}
+
+src_install() {
+	local libdir=${ED}/usr/lib/python${PYVER}
+
+	# -j1 hack for now for bug #843458
+	emake -j1 DESTDIR="${D}" altinstall
+
+	# Fix collisions between different slots of Python.
+	rm "${ED}/usr/$(get_libdir)/libpython3.so" || die
+
+	# Cheap hack to get version with ABIFLAGS
+	local abiver=$(cd "${ED}/usr/include"; echo python*)
+	if [[ ${abiver} != python${PYVER} ]]; then
+		# Replace python3.X with a symlink to python3.Xm
+		rm "${ED}/usr/bin/python${PYVER}" || die
+		dosym "${abiver}" "/usr/bin/python${PYVER}"
+		# Create python3.X-config symlink
+		dosym "${abiver}-config" "/usr/bin/python${PYVER}-config"
+		# Create python-3.5m.pc symlink
+		dosym "python-${PYVER}.pc" "/usr/$(get_libdir)/pkgconfig/${abiver/${PYVER}/-${PYVER}}.pc"
+	fi
+
+	# python seems to get rebuilt in src_install (bug 569908)
+	# Work around it for now.
+	if has_version dev-libs/libffi[pax-kernel]; then
+		pax-mark E "${ED}/usr/bin/${abiver}"
+	else
+		pax-mark m "${ED}/usr/bin/${abiver}"
+	fi
+
+	rm -r "${libdir}"/ensurepip/_bundled || die
+	if ! use ensurepip; then
+		rm -r "${libdir}"/ensurepip || die
+	fi
+	if ! use sqlite; then
+		rm -r "${libdir}/"sqlite3 || die
+	fi
+	if ! use tk; then
+		rm -r "${ED}/usr/bin/idle${PYVER}" || die
+		rm -r "${libdir}/"{idlelib,tkinter,test/test_tk*} || die
+	fi
+
+	dodoc Misc/{ACKS,HISTORY,NEWS}
+
+	if use examples; then
+		docinto examples
+		find Tools -name __pycache__ -exec rm -fr {} + || die
+		dodoc -r Tools
+	fi
+	insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
+	local libname=$(
+		printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' |
+		emake --no-print-directory -s -f - 2>/dev/null
+	)
+	newins Tools/gdb/libpython.py "${libname}"-gdb.py
+
+	newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER}
+	newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER}
+	sed \
+		-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \
+		-e "s:@PYDOC@:pydoc${PYVER}:" \
+		-i "${ED}/etc/conf.d/pydoc-${PYVER}" \
+		"${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed"
+
+	# python-exec wrapping support
+	local pymajor=${PYVER%.*}
+	local EPYTHON=python${PYVER}
+	local scriptdir=${D}$(python_get_scriptdir)
+	mkdir -p "${scriptdir}" || die
+	# python and pythonX
+	ln -s "../../../bin/${abiver}" "${scriptdir}/python${pymajor}" || die
+	ln -s "python${pymajor}" "${scriptdir}/python" || die
+	# python-config and pythonX-config
+	# note: we need to create a wrapper rather than symlinking it due
+	# to some random dirname(argv[0]) magic performed by python-config
+	cat > "${scriptdir}/python${pymajor}-config" <<-EOF || die
+		#!/bin/sh
+		exec "${abiver}-config" "\${@}"
+	EOF
+	chmod +x "${scriptdir}/python${pymajor}-config" || die
+	ln -s "python${pymajor}-config" "${scriptdir}/python-config" || die
+	# 2to3, pydoc
+	ln -s "../../../bin/2to3-${PYVER}" "${scriptdir}/2to3" || die
+	ln -s "../../../bin/pydoc${PYVER}" "${scriptdir}/pydoc" || die
+	# idle
+	if use tk; then
+		ln -s "../../../bin/idle${PYVER}" "${scriptdir}/idle" || die
+	fi
+}
+
+pkg_postinst() {
+	local v
+	for v in ${REPLACING_VERSIONS}; do
+		if ver_test "${v}" -lt 3.11.0_beta4-r2; then
+			ewarn "Python 3.11.0b4 has changed its module ABI.  The .pyc files"
+			ewarn "installed previously are no longer valid and will be regenerated"
+			ewarn "(or ignored) on the next import.  This may cause sandbox failures"
+			ewarn "when installing some packages and checksum mismatches when removing"
+			ewarn "old versions.  To actively prevent this, rebuild all packages"
+			ewarn "installing Python 3.11 modules, e.g. using:"
+			ewarn
+			ewarn "  emerge -1v /usr/lib/python3.11/site-packages"
+		fi
+	done
+}
diff --git a/dev-lang/python/python-3.12.0_alpha1.ebuild b/dev-lang/python/python-3.12.0_alpha1.ebuild
new file mode 100644
index 000000000000..096bd0ca36a9
--- /dev/null
+++ b/dev-lang/python/python-3.12.0_alpha1.ebuild
@@ -0,0 +1,487 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+WANT_LIBTOOL="none"
+
+inherit autotools check-reqs flag-o-matic multiprocessing pax-utils
+inherit python-utils-r1 toolchain-funcs verify-sig
+
+MY_PV=${PV/_alpha/a}
+MY_P="Python-${MY_PV%_p*}"
+PYVER=$(ver_cut 1-2)
+PATCHSET="python-gentoo-patches-${MY_PV}"
+
+DESCRIPTION="An interpreted, interactive, object-oriented programming language"
+HOMEPAGE="
+	https://www.python.org/
+	https://github.com/python/cpython/
+"
+SRC_URI="
+	https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
+	verify-sig? (
+		https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz.asc
+	)
+"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="PSF-2"
+SLOT="${PYVER}"
+KEYWORDS=""
+IUSE="
+	bluetooth build +ensurepip examples gdbm hardened libedit lto
+	+ncurses pgo +readline +sqlite +ssl test tk
+"
+RESTRICT="!test? ( test )"
+
+# Do not add a dependency on dev-lang/python to this ebuild.
+# If you need to apply a patch which requires python for bootstrapping, please
+# run the bootstrap code on your dev box and include the results in the
+# patchset. See bug 447752.
+
+RDEPEND="
+	app-arch/bzip2:=
+	app-arch/xz-utils:=
+	app-crypt/libb2
+	>=dev-libs/expat-2.1:=
+	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? (
+		!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
+	)
+	!!<sys-apps/sandbox-2.21
+"
+# bluetooth requires headers from bluez
+DEPEND="
+	${RDEPEND}
+	bluetooth? ( net-wireless/bluez )
+	test? ( app-arch/xz-utils[extra-filters(+)] )
+"
+# autoconf-archive needed to eautoreconf
+BDEPEND="
+	sys-devel/autoconf-archive
+	virtual/awk
+	virtual/pkgconfig
+	verify-sig? ( >=sec-keys/openpgp-keys-python-20221025 )
+"
+RDEPEND+="
+	!build? ( app-misc/mime-types )
+"
+if [[ ${PV} != *_alpha* ]]; then
+	RDEPEND+="
+		dev-lang/python-exec[python_targets_python${PYVER/./_}(-)]
+	"
+fi
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/python.org.asc
+
+# large file tests involve a 2.5G file being copied (duplicated)
+CHECKREQS_DISK_BUILD=5500M
+
+QA_PKGCONFIG_VERSION=${PYVER}
+
+pkg_pretend() {
+	use test && check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+	use test && check-reqs_pkg_setup
+}
+
+src_unpack() {
+	if use verify-sig; then
+		verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.asc}
+	fi
+	default
+}
+
+src_prepare() {
+	# Ensure that internal copies of expat and libffi are not used.
+	# TODO: Makefile has annoying deps on expat headers
+	#rm -r Modules/expat || die
+	rm -r Modules/_ctypes/libffi* || die
+
+	local PATCHES=(
+		"${WORKDIR}/${PATCHSET}"
+	)
+
+	default
+
+	# force the correct number of jobs
+	# https://bugs.gentoo.org/737660
+	sed -i -e "s:-j0:-j$(makeopts_jobs):" Makefile.pre.in || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local disable
+	# disable automagic bluetooth headers detection
+	if ! use bluetooth; then
+		local -x ac_cv_header_bluetooth_bluetooth_h=no
+	fi
+
+	append-flags -fwrapv
+	filter-flags -malign-double
+
+	# https://bugs.gentoo.org/700012
+	if is-flagq -flto || is-flagq '-flto=*'; then
+		append-cflags $(test-flags-CC -ffat-lto-objects)
+	fi
+
+	# Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
+	# PKG_CONFIG needed for cross.
+	tc-export CXX PKG_CONFIG
+
+	# Fix implicit declarations on cross and prefix builds. Bug #674070.
+	if use ncurses; then
+		append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw
+	fi
+
+	local dbmliborder=
+	if use gdbm; then
+		dbmliborder+="${dbmliborder:+:}gdbm"
+	fi
+
+	if use pgo; then
+		local profile_task_flags=(
+			-m test
+			"-j$(makeopts_jobs)"
+			--pgo-extended
+			-x test_gdb
+			-u-network
+
+			# All of these seem to occasionally hang for PGO inconsistently
+			# They'll even hang here but be fine in src_test sometimes.
+			# bug #828535 (and related: bug #788022)
+			-x test_asyncio
+			-x test_httpservers
+			-x test_logging
+			-x test_multiprocessing_fork
+			-x test_socket
+			-x test_xmlrpc
+		)
+
+		if has_version "app-arch/rpm" ; then
+			# Avoid sandbox failure (attempts to write to /var/lib/rpm)
+			profile_task_flags+=(
+				-x test_distutils
+			)
+		fi
+		local -x PROFILE_TASK="${profile_task_flags[*]}"
+	fi
+
+	local myeconfargs=(
+		# glibc-2.30 removes it; since we can't cleanly force-rebuild
+		# Python on glibc upgrade, remove it proactively to give
+		# a chance for users rebuilding python before glibc
+		ac_cv_header_stropts_h=no
+
+		--enable-shared
+		--without-static-libpython
+		--enable-ipv6
+		--infodir='${prefix}/share/info'
+		--mandir='${prefix}/share/man'
+		--with-computed-gotos
+		--with-dbmliborder="${dbmliborder}"
+		--with-libc=
+		--enable-loadable-sqlite-extensions
+		--without-ensurepip
+		--with-system-expat
+		--with-system-ffi
+		--with-platlibdir=lib
+		--with-pkg-config=yes
+		--with-wheel-pkg-dir="${EPREFIX}"/usr/lib/python/ensurepip
+
+		$(use_with lto)
+		$(use_enable pgo optimizations)
+		$(use_with readline readline "$(usex libedit editline readline)")
+	)
+
+	# disable implicit optimization/debugging flags
+	local -x OPT=
+	# pass system CFLAGS & LDFLAGS as _NODIST, otherwise they'll get
+	# propagated to sysconfig for built extensions
+	local -x CFLAGS_NODIST=${CFLAGS}
+	local -x LDFLAGS_NODIST=${LDFLAGS}
+	local -x CFLAGS= LDFLAGS=
+
+	if tc-is-cross-compiler ; then
+		# We need to build our own Python on CBUILD first, and feed it in.
+		# bug #847910
+		local myeconfargs_cbuild=(
+			"${myeconfargs[@]}"
+
+			# As minimal as possible for the mini CBUILD Python
+			# we build just for cross to satisfy --with-build-python.
+			--without-lto
+			--without-readline
+			--disable-optimizations
+		)
+
+		myeconfargs+=(
+			# Point the imminent CHOST build to the Python we just
+			# built for CBUILD.
+			--with-build-python="${WORKDIR}"/${P}-${CBUILD}/python
+		)
+
+		mkdir "${WORKDIR}"/${P}-${CBUILD} || die
+		pushd "${WORKDIR}"/${P}-${CBUILD} &> /dev/null || die
+		ECONF_SOURCE="${S}" econf_build "${myeconfargs_cbuild[@]}"
+
+		# Avoid as many dependencies as possible for the cross build.
+		cat >> Makefile <<-EOF || die
+			MODULE_NIS_STATE=disabled
+			MODULE__DBM_STATE=disabled
+			MODULE__GDBM_STATE=disabled
+			MODULE__DBM_STATE=disabled
+			MODULE__SQLITE3_STATE=disabled
+			MODULE__HASHLIB_STATE=disabled
+			MODULE__SSL_STATE=disabled
+			MODULE__CURSES_STATE=disabled
+			MODULE__CURSES_PANEL_STATE=disabled
+			MODULE_READLINE_STATE=disabled
+			MODULE__TKINTER_STATE=disabled
+			MODULE_PYEXPAT_STATE=disabled
+			MODULE_ZLIB_STATE=disabled
+		EOF
+
+		# Unfortunately, we do have to build this immediately, and
+		# not in src_compile, because CHOST configure for Python
+		# will check the existence of the --with-build-python value
+		# immediately.
+		emake
+		popd &> /dev/null || die
+	fi
+
+	econf "${myeconfargs[@]}"
+
+	if grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
+		eerror "configure has detected that the sem_open function is broken."
+		eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777."
+		die "Broken sem_open function (bug 496328)"
+	fi
+
+	# force-disable modules we don't want built
+	local disable_modules=( NIS )
+	use gdbm || disable_modules+=( _GDBM _DBM )
+	use sqlite || disable_modules+=( _SQLITE3 )
+	use ssl || disable_modules+=( _HASHLIB _SSL )
+	use ncurses || disable_modules+=( _CURSES _CURSES_PANEL )
+	use readline || disable_modules+=( READLINE )
+	use tk || disable_modules+=( _TKINTER )
+
+	local mod
+	for mod in "${disable_modules[@]}"; do
+		echo "MODULE_${mod}_STATE=disabled"
+	done >> Makefile || die
+
+	# install epython.py as part of stdlib
+	echo "EPYTHON='python${PYVER}'" > Lib/epython.py || die
+}
+
+src_compile() {
+	# Ensure sed works as expected
+	# https://bugs.gentoo.org/594768
+	local -x LC_ALL=C
+	# Prevent using distutils bundled by setuptools.
+	# https://bugs.gentoo.org/823728
+	export SETUPTOOLS_USE_DISTUTILS=stdlib
+	export PYTHONSTRICTEXTENSIONBUILD=1
+
+	# Save PYTHONDONTWRITEBYTECODE so that 'has_version' doesn't
+	# end up writing bytecode & violating sandbox.
+	# bug #831897
+	local -x _PYTHONDONTWRITEBYTECODE=${PYTHONDONTWRITEBYTECODE}
+
+	if use pgo ; then
+		# bug 660358
+		local -x COLUMNS=80
+		local -x PYTHONDONTWRITEBYTECODE=
+
+		addpredict /usr/lib/python3.11/site-packages
+	fi
+
+	# also need to clear the flags explicitly here or they end up
+	# in _sysconfigdata*
+	emake CPPFLAGS= CFLAGS= LDFLAGS=
+
+	# Restore saved value from above.
+	local -x PYTHONDONTWRITEBYTECODE=${_PYTHONDONTWRITEBYTECODE}
+
+	# Work around bug 329499. See also bug 413751 and 457194.
+	if has_version dev-libs/libffi[pax-kernel]; then
+		pax-mark E python
+	else
+		pax-mark m python
+	fi
+}
+
+src_test() {
+	# Tests will not work when cross compiling.
+	if tc-is-cross-compiler; then
+		elog "Disabling tests due to crosscompiling."
+		return
+	fi
+
+	# this just happens to skip test_support.test_freeze that is broken
+	# without bundled expat
+	# TODO: get a proper skip for it upstream
+	local -x LOGNAME=buildbot
+
+	local test_opts=(
+		-u-network
+		-j "$(makeopts_jobs)"
+
+		# fails
+		-x test_gdb
+	)
+
+	if use sparc ; then
+		# bug #788022
+		test_opts+=(
+			-x test_multiprocessing_fork
+			-x test_multiprocessing_forkserver
+		)
+	fi
+
+	# workaround docutils breaking tests
+	cat > Lib/docutils.py <<-EOF || die
+		raise ImportError("Thou shalt not import!")
+	EOF
+
+	# bug 660358
+	local -x COLUMNS=80
+	local -x PYTHONDONTWRITEBYTECODE=
+	# workaround https://bugs.gentoo.org/775416
+	addwrite /usr/lib/python3.11/site-packages
+
+	nonfatal emake test EXTRATESTOPTS="${test_opts[*]}" \
+		CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
+	local ret=${?}
+
+	rm Lib/docutils.py || die
+
+	[[ ${ret} -eq 0 ]] || die "emake test failed"
+}
+
+src_install() {
+	local libdir=${ED}/usr/lib/python${PYVER}
+
+	# -j1 hack for now for bug #843458
+	emake -j1 DESTDIR="${D}" altinstall
+
+	# Fix collisions between different slots of Python.
+	rm "${ED}/usr/$(get_libdir)/libpython3.so" || die
+
+	# Cheap hack to get version with ABIFLAGS
+	local abiver=$(cd "${ED}/usr/include"; echo python*)
+	if [[ ${abiver} != python${PYVER} ]]; then
+		# Replace python3.X with a symlink to python3.Xm
+		rm "${ED}/usr/bin/python${PYVER}" || die
+		dosym "${abiver}" "/usr/bin/python${PYVER}"
+		# Create python3.X-config symlink
+		dosym "${abiver}-config" "/usr/bin/python${PYVER}-config"
+		# Create python-3.5m.pc symlink
+		dosym "python-${PYVER}.pc" "/usr/$(get_libdir)/pkgconfig/${abiver/${PYVER}/-${PYVER}}.pc"
+	fi
+
+	# python seems to get rebuilt in src_install (bug 569908)
+	# Work around it for now.
+	if has_version dev-libs/libffi[pax-kernel]; then
+		pax-mark E "${ED}/usr/bin/${abiver}"
+	else
+		pax-mark m "${ED}/usr/bin/${abiver}"
+	fi
+
+	rm -r "${libdir}"/ensurepip/_bundled || die
+	if ! use ensurepip; then
+		rm -r "${libdir}"/ensurepip || die
+	fi
+	if ! use sqlite; then
+		rm -r "${libdir}/"sqlite3 || die
+	fi
+	if ! use tk; then
+		rm -r "${ED}/usr/bin/idle${PYVER}" || die
+		rm -r "${libdir}/"{idlelib,tkinter,test/test_tk*} || die
+	fi
+
+	dodoc Misc/{ACKS,HISTORY,NEWS}
+
+	if use examples; then
+		docinto examples
+		find Tools -name __pycache__ -exec rm -fr {} + || die
+		dodoc -r Tools
+	fi
+	insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
+	local libname=$(
+		printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' |
+		emake --no-print-directory -s -f - 2>/dev/null
+	)
+	newins Tools/gdb/libpython.py "${libname}"-gdb.py
+
+	newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER}
+	newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER}
+	sed \
+		-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \
+		-e "s:@PYDOC@:pydoc${PYVER}:" \
+		-i "${ED}/etc/conf.d/pydoc-${PYVER}" \
+		"${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed"
+
+	# python-exec wrapping support
+	local pymajor=${PYVER%.*}
+	local EPYTHON=python${PYVER}
+	local scriptdir=${D}$(python_get_scriptdir)
+	mkdir -p "${scriptdir}" || die
+	# python and pythonX
+	ln -s "../../../bin/${abiver}" "${scriptdir}/python${pymajor}" || die
+	ln -s "python${pymajor}" "${scriptdir}/python" || die
+	# python-config and pythonX-config
+	# note: we need to create a wrapper rather than symlinking it due
+	# to some random dirname(argv[0]) magic performed by python-config
+	cat > "${scriptdir}/python${pymajor}-config" <<-EOF || die
+		#!/bin/sh
+		exec "${abiver}-config" "\${@}"
+	EOF
+	chmod +x "${scriptdir}/python${pymajor}-config" || die
+	ln -s "python${pymajor}-config" "${scriptdir}/python-config" || die
+	# 2to3, pydoc
+	ln -s "../../../bin/2to3-${PYVER}" "${scriptdir}/2to3" || die
+	ln -s "../../../bin/pydoc${PYVER}" "${scriptdir}/pydoc" || die
+	# idle
+	if use tk; then
+		ln -s "../../../bin/idle${PYVER}" "${scriptdir}/idle" || die
+	fi
+}
+
+pkg_postinst() {
+	local v
+	for v in ${REPLACING_VERSIONS}; do
+		if ver_test "${v}" -lt 3.11.0_beta4-r2; then
+			ewarn "Python 3.11.0b4 has changed its module ABI.  The .pyc files"
+			ewarn "installed previously are no longer valid and will be regenerated"
+			ewarn "(or ignored) on the next import.  This may cause sandbox failures"
+			ewarn "when installing some packages and checksum mismatches when removing"
+			ewarn "old versions.  To actively prevent this, rebuild all packages"
+			ewarn "installing Python 3.11 modules, e.g. using:"
+			ewarn
+			ewarn "  emerge -1v /usr/lib/python3.11/site-packages"
+		fi
+	done
+}
diff --git a/dev-lang/python/python-3.8.15.ebuild b/dev-lang/python/python-3.8.15.ebuild
index 521277294b91..c45c62c2e163 100644
--- a/dev-lang/python/python-3.8.15.ebuild
+++ b/dev-lang/python/python-3.8.15.ebuild
@@ -184,13 +184,14 @@ src_configure() {
 
 	# disable implicit optimization/debugging flags
 	local -x OPT=
-	# pass system CFLAGS & LDFLAGS as _NODIST, otherwise they'll get
-	# propagated to sysconfig for built extensions
-	local -x CFLAGS_NODIST=${CFLAGS}
-	local -x LDFLAGS_NODIST=${LDFLAGS}
-	local -x CFLAGS= LDFLAGS=
 
 	if tc-is-cross-compiler ; then
+		# pass system CFLAGS & LDFLAGS as _NODIST, otherwise they'll get
+		# propagated to sysconfig for built extensions
+		local -x CFLAGS_NODIST=${CFLAGS_FOR_BUILD}
+		local -x LDFLAGS_NODIST=${LDFLAGS_FOR_BUILD}
+		local -x CFLAGS= LDFLAGS=
+
 		# We need to build our own Python on CBUILD first, and feed it in.
 		# bug #847910 and bug #864911.
 		local myeconfargs_cbuild=(
@@ -235,6 +236,12 @@ src_configure() {
 		popd &> /dev/null || die
 	fi
 
+	# pass system CFLAGS & LDFLAGS as _NODIST, otherwise they'll get
+	# propagated to sysconfig for built extensions
+	local -x CFLAGS_NODIST=${CFLAGS}
+	local -x LDFLAGS_NODIST=${LDFLAGS}
+	local -x CFLAGS= LDFLAGS=
+
 	econf "${myeconfargs[@]}"
 
 	if grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
diff --git a/dev-lang/python/python-3.9.15.ebuild b/dev-lang/python/python-3.9.15.ebuild
index 05ce9ad53913..a4f409cd861b 100644
--- a/dev-lang/python/python-3.9.15.ebuild
+++ b/dev-lang/python/python-3.9.15.ebuild
@@ -225,13 +225,14 @@ src_configure() {
 
 	# disable implicit optimization/debugging flags
 	local -x OPT=
-	# pass system CFLAGS & LDFLAGS as _NODIST, otherwise they'll get
-	# propagated to sysconfig for built extensions
-	local -x CFLAGS_NODIST=${CFLAGS}
-	local -x LDFLAGS_NODIST=${LDFLAGS}
-	local -x CFLAGS= LDFLAGS=
 
 	if tc-is-cross-compiler ; then
+		# pass system CFLAGS & LDFLAGS as _NODIST, otherwise they'll get
+		# propagated to sysconfig for built extensions
+		local -x CFLAGS_NODIST=${CFLAGS_FOR_BUILD}
+		local -x LDFLAGS_NODIST=${LDFLAGS_FOR_BUILD}
+		local -x CFLAGS= LDFLAGS=
+
 		# We need to build our own Python on CBUILD first, and feed it in.
 		# bug #847910 and bug #864911.
 		local myeconfargs_cbuild=(
@@ -276,6 +277,12 @@ src_configure() {
 		popd &> /dev/null || die
 	fi
 
+	# pass system CFLAGS & LDFLAGS as _NODIST, otherwise they'll get
+	# propagated to sysconfig for built extensions
+	local -x CFLAGS_NODIST=${CFLAGS}
+	local -x LDFLAGS_NODIST=${LDFLAGS}
+	local -x CFLAGS= LDFLAGS=
+
 	econf "${myeconfargs[@]}"
 
 	if grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
diff --git a/dev-lang/swig/Manifest b/dev-lang/swig/Manifest
index 396bd65121cb..6fe64d8b7055 100644
--- a/dev-lang/swig/Manifest
+++ b/dev-lang/swig/Manifest
@@ -1,3 +1,5 @@
 DIST swig-4.0.2.tar.gz 8097014 BLAKE2B 4c36b7e9b9bf1663779aa31b0eda8a1fe443695d945bcc1642c3404b22e45440def85e58dd65dc18a2ca8c00ffdcfe0f1d75373b7becc0b0e5402fda90b8c29a SHA512 05e7da70ce6d9a733b96c0bcfa3c1b82765bd859f48c74759bbf4bb1467acb1809caa310cba5e2b3280cd704fca249eaa0624821dffae1d2a75097c7f55d14ed
+DIST swig-4.1.0.tar.gz 8600226 BLAKE2B 6e10c04251153bd7300145877e6f078f7cb30d0cd18642f9094574da5f0e9cc59e40b4c8a1bf17523dc5acfd112e45297c7ada00b445d2e7696a137f48664bc3 SHA512 a7d43d6aa764923826786081a3f2e25aa0f8345e1169c1e57bf02d01f6f41c92d8db0f360ec86e0e428ef5a21d1b5cd3edb7e4b71d0beff3e6611e344b5c22b1
 EBUILD swig-4.0.2.ebuild 954 BLAKE2B dfdf0c2db27888d3d4cfe83522e58bd9eeafce29ed01e2834f8e9b74ec1a699b55286f5945b020915c34e6d4aac3d4627eafd7e1be0e8e2effa1476065b768dc SHA512 1e04c8f7c2d2edb34cc082d21dfee6e24324392c598fcf6e91c8cae52b4df0ee18ea4e95611e19c1ba84b589949aee9f2f6e7a517dec5a9d025854be9eb7801a
+EBUILD swig-4.1.0.ebuild 1060 BLAKE2B 8c0a6812bd741512c05c165ec86ba7f475c15d39442c90dfd998308f52226d715558e2aaf9145dd7ff462ba918b12c7806eced2ce3334b049488b9c7c7df20c2 SHA512 076ca1ce7bb6bdd75ddc79cb8fcfdc98aa644eed37f52c1f82f9bb89ba7375e67d14794998f14013b9352887eae1ab0c19153069d33da0c119d3c3e8ae188286
 MISC metadata.xml 1019 BLAKE2B 1f6a79945d3bb92bd9b5c06f7b4e96c8c9f8f6e68d5c13890247d2c08adf46409a194e3198fb3df19f699a176fe92bebc1e7ba6eb0944a0db12c5e3271043552 SHA512 5ba26e3670ba852648a243f14efe096e52781418eb4d07cabc1bcf46efcd098d099ecbb3d504862540db796279fd855a581d60dd3b1de2f60e9d542e3ccb9b00
diff --git a/dev-lang/swig/swig-4.1.0.ebuild b/dev-lang/swig/swig-4.1.0.ebuild
new file mode 100644
index 000000000000..a87f2a77cd6a
--- /dev/null
+++ b/dev-lang/swig/swig-4.1.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Simplified Wrapper and Interface Generator"
+HOMEPAGE="http://www.swig.org/ https://github.com/swig/swig"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+ BSD BSD-2"
+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 ~x64-solaris ~x86-solaris"
+IUSE="ccache doc pcre"
+#RESTRICT="test"
+
+RDEPEND="
+	pcre? ( dev-libs/libpcre2 )
+	ccache? ( sys-libs/zlib )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( ANNOUNCE CHANGES CHANGES.current README TODO )
+
+src_configure() {
+	econf \
+		PKGCONFIG="$(tc-getPKG_CONFIG)" \
+		$(use_enable ccache) \
+		$(use_with pcre)
+}
+
+src_test() {
+	# The tests won't get run w/o an explicit call, broken Makefiles?
+	emake check
+}
+
+src_install() {
+	default
+
+	if use doc; then
+		docinto html
+		dodoc -r Doc/{Devel,Manual}
+	fi
+}
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 68003a47a045..be9ac9025bed 100644
Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ
diff --git a/dev-libs/expat/Manifest b/dev-libs/expat/Manifest
index 3080a0091345..07f2341a7ca7 100644
--- a/dev-libs/expat/Manifest
+++ b/dev-libs/expat/Manifest
@@ -1,3 +1,5 @@
 DIST expat-2.4.9.tar.xz 459284 BLAKE2B 105fef732e26b691f6c212341b7377b518d693aa67f106d0ff2f0fbccd798b7526473ed21e22b6d2b6f1ca8aa7d0eb0adc62ffdefc3c2cb81a6af5a379e64de9 SHA512 8508379b4915d84d50f3638678a90792179c98247d1cb5e6e6387d117af4dc148ac7031c1debea8b96e7b710ef436cf0dd5da91f3d22b8186a00cfafe1201169
+DIST expat-2.5.0.tar.xz 460560 BLAKE2B 670298d076ff3b512a0212170d40cb04c601a11d6b152f215a5302ad3238c69c2386393d7a6c70bc284be35ce97bf27d87115c3391f4bc17406e509d739d3e31 SHA512 2da73b991b7c0c54440485c787e5edeb3567230204e31b3cac1c3a6713ec6f9f1554d3afffc0f8336168dfd5df02db4a69bcf21b4d959723d14162d13ab87516
 EBUILD expat-2.4.9.ebuild 2284 BLAKE2B 2f75d5b3709f2891725858a1b4f0f3d357288453653c40e32fcc599caedc1e0d6e0755ce497d00a535f2ac6ebc925c7ad4b9703bb6e88c58ee6f6a45f49dbb52 SHA512 216cf850735cbd4d992b7163dd2fe921f368876af70fa9d84229bdfb81f54d61078937ad007645d6b4578f4262f6ad963a19d13546d0d28aa5ae87cfddf6ff00
+EBUILD expat-2.5.0.ebuild 2286 BLAKE2B 45efa0ba0630d4c47c0ff04983a336a8b6cd8103d2b6825f548505de8ec257911335b7604454af14d62138bf18160f85d4f2858b261d608a7137b30b62cfac19 SHA512 c5528277997a98557fbd6136c20e385579181b83110dd03563ae3e886ba357c4028714a6d261c77305c304351d1139a4a22c1bbedf9e092fb64bcad9308b6fa8
 MISC metadata.xml 571 BLAKE2B ebefe11eb4a54dda87048089930a051a629fd99a6983b3c804dfd033eee4017c3b1871cbdff56c8659cdf74b19651cd7f2134721a9bab3e8a752d4a1694c6266 SHA512 8d726b1dee71528e43c8693bd4b08cf33a94f43470126aa18a51ed248b032c5e8b9d801c5b2d5f58c2fd7896b32ee9e6eb3953395e5a6004cdf00569d114ad1d
diff --git a/dev-libs/expat/expat-2.5.0.ebuild b/dev-libs/expat/expat-2.5.0.ebuild
new file mode 100644
index 000000000000..a28cd0e2ee08
--- /dev/null
+++ b/dev-libs/expat/expat-2.5.0.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+AUTOTOOLS_AUTO_DEPEND=no
+AT_NOEAUTOHEADER=yes  # because expat_config.h.in would need post-processing
+inherit autotools multilib-minimal
+
+DESCRIPTION="Stream-oriented XML parser library"
+HOMEPAGE="https://libexpat.github.io/"
+SRC_URI="https://github.com/libexpat/libexpat/releases/download/R_${PV//\./_}/expat-${PV}.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 ~x86-winnt"
+IUSE="examples static-libs unicode"
+BDEPEND="unicode? ( ${AUTOTOOLS_DEPEND} )"
+
+DOCS=( README.md )
+
+src_prepare() {
+	default
+
+	# fix interpreter to be a recent/good shell
+	sed -i -e "1s:/bin/sh:${BASH}:" conftools/get-version.sh || die
+	if use unicode; then
+		cp -R "${S}" "${S}"w || die
+		pushd "${S}"w >/dev/null
+		find -name Makefile.am \
+			-exec sed \
+			-e 's,libexpat\.la,libexpatw.la,' \
+			-e 's,libexpat_la,libexpatw_la,' \
+			-i {} + || die
+		eautoreconf
+		popd >/dev/null
+	fi
+}
+
+multilib_src_configure() {
+	local myconf="$(use_enable static-libs static) --without-docbook"
+
+	mkdir -p "${BUILD_DIR}"w || die
+
+	if use unicode; then
+		pushd "${BUILD_DIR}"w >/dev/null
+		CPPFLAGS="${CPPFLAGS} -DXML_UNICODE" ECONF_SOURCE="${S}"w econf ${myconf}
+		popd >/dev/null
+	fi
+
+	ECONF_SOURCE="${S}" econf ${myconf}
+}
+
+multilib_src_compile() {
+	emake
+
+	if use unicode; then
+		pushd "${BUILD_DIR}"w >/dev/null
+		emake -C lib
+		popd >/dev/null
+	fi
+}
+
+multilib_src_install() {
+	emake install DESTDIR="${D}"
+
+	if use unicode; then
+		pushd "${BUILD_DIR}"w >/dev/null
+		emake -C lib install DESTDIR="${D}"
+		popd >/dev/null
+
+		pushd "${ED}"/usr/$(get_libdir)/pkgconfig >/dev/null
+		cp expat.pc expatw.pc
+		sed -i -e '/^Libs/s:-lexpat:&w:' expatw.pc || die
+		popd >/dev/null
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	doman doc/xmlwf.1
+
+	# Note: Use of HTML_DOCS would add unwanted "doc" subfolder
+	docinto html
+	dodoc doc/*.{css,html}
+
+	if use examples; then
+		docinto examples
+		dodoc examples/*.c
+		docompress -x usr/share/doc/${PF}/examples
+	fi
+
+	find "${D}" -name '*.la' -type f -delete || die
+}
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index fc44b3a4502f..6c18a6416c8c 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -3,6 +3,8 @@ AUX glib-2.74.0-clang-build.patch 1038 BLAKE2B 3340b6403a351d00d7c26813a09f28617
 AUX glib-2.74.0-crash-gparamspec.patch 820 BLAKE2B 963e9b3550ca8d7abbb72881ce82fd94f207ac846fc138e7ce2409d74812da662615f309c40ffbbf4cdd5911c6ce070741cb06d6cef3c80c89e4f8e28d632f2c SHA512 1d0d0ea2fdf14be8d480e8bf60e93d8e1840da67739c8fe747b4bba2379240b42bc2dc26bf53912627b5ab35e9aa7ad3997876a9ec05aa2b50e71f9634751a89
 DIST glib-2.72.3.tar.xz 4893484 BLAKE2B 1360c887b07ede3de3a7d31589f3dfc07ada2fe3e7901d3f30048ab9a1379357753ae142c6c107b3fcd6dd61e1401fbe6db22f0e89ea617db2c1073f1900cbe6 SHA512 8834ab7498577c2f659d135b87c27b34e1157be27f6c1fe5af0d64a94654f78cbe6a87e6868966849674c34e88a9d51d2de8d89f78f86aa1e1af3482761f0638
 DIST glib-2.74.0.tar.xz 5183072 BLAKE2B b21e5a72e2ce3390cbf13601aa902104f1ac1cfbd75181d30cd340f24b5875753f898b229f99c71d47d499be86cddb0191a0072c0c2decc82956a46c16255905 SHA512 5cdadd2f4568c0c3d45083b4d39699abf651e42e020f7bc880cce3ff33d28943118388d17a0632777e843f48009c1f97d5634fde3cb8c69c7c7f35b278ac8225
+DIST glib-2.74.1.tar.xz 5189452 BLAKE2B 58d977a5d2a100aa9125f2009ae66c6f27232dff70159433076552bdb64f9a6a93d7cb705feba890ee43d6f16d4766f6f1d5502c2e01eeb7e88d5ed0dd205d5c SHA512 21176cb95fcab49a781d02789bf21191a96a34a6391f066699b3c20b414b3169c958bd86623deb34ca55912083862885f7a7d12b67cc041467da2ba94d9e83c3
 EBUILD glib-2.72.3.ebuild 10244 BLAKE2B 3f37fd728f89fabc8bba3a09946a069cf3220d14637089300cac575a1fafc667d9e04a4592552db64db2144c80f9ae697f0597a5110175cdb0fb3c74e95d71e2 SHA512 ad314b8967042ad94110d0c582bb08bdb4df84dbef60f6184223604abdaf311fe1eb056103df0ec19d7fda010b8e90f2054df86ca817f451e0dc6e6b695a530f
 EBUILD glib-2.74.0-r1.ebuild 10285 BLAKE2B dde057709a510d0f63a534449f8b84c4834a833f27f54db7047887345312f736be2bdf6eac871626cde97960628a52e77d97fe33fc8a9756c63898bc257d23ff SHA512 f8a0532d404cfd6ec7e64392f02772517d65e4ec3f043b2f235b24ced5bf02e5fac53964a6341435c13855594e3bfeede62919248e705df439d83ba3dfb6c38b
+EBUILD glib-2.74.1.ebuild 10187 BLAKE2B 199582fe65e0fab8419dcc85697b0992687caf17956d92046f060d761a4e6778a95797982a63db5cc14671b59c42f0e097c8399376e1bb82a84c19592e91f684 SHA512 7c77b9cb108cee711a39f57a1c48ba5ec354e519b3a301ee8c0aed434847eba4851fb1c0e64d4a7ae76397aaf1b9841af889d8f22328e3fd7c92be401f6d0def
 MISC metadata.xml 1221 BLAKE2B 517c6f9ee14ccac7192d7c1189773ec6e034bc638a8acd28081a604f8516ee639f43c82ca3233d513dbfd06db714358e396f2c4cd906715bb0950f130974ab9e SHA512 0c4203b3c9d8b91eebe4ee54f34d1aae26e5efa4c791760559b18b58d90b508936ead62ee8df81e6777ad8e0cb0e9c68d504d0f24ecd5903d4e3df89c6cc0bdf
diff --git a/dev-libs/glib/glib-2.74.1.ebuild b/dev-libs/glib/glib-2.74.1.ebuild
new file mode 100644
index 000000000000..de789c752115
--- /dev/null
+++ b/dev-libs/glib/glib-2.74.1.ebuild
@@ -0,0 +1,287 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_REQ_USE="xml(+)"
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit flag-o-matic gnome.org gnome2-utils linux-info meson-multilib multilib python-any-r1 toolchain-funcs xdg
+
+DESCRIPTION="The GLib library of C routines"
+HOMEPAGE="https://www.gtk.org/"
+
+LICENSE="LGPL-2.1+"
+SLOT="2"
+IUSE="dbus debug +elf gtk-doc +mime selinux static-libs sysprof systemtap test utils xattr"
+RESTRICT="!test? ( test )"
+#REQUIRED_USE="gtk-doc? ( test )" # Bug #777636
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+# * elfutils (via libelf) does not build on Windows. gresources are not embedded
+# within ELF binaries on that platform anyway and inspecting ELF binaries from
+# other platforms is not that useful so exclude the dependency in this case.
+# * Technically static-libs is needed on zlib, util-linux and perhaps more, but
+# these are used by GIO, which glib[static-libs] consumers don't really seem
+# to need at all, thus not imposing the deps for now and once some consumers
+# are actually found to static link libgio-2.0.a, we can revisit and either add
+# them or just put the (build) deps in that rare consumer instead of recursive
+# RDEPEND here (due to lack of recursive DEPEND).
+RDEPEND="
+	!<dev-util/gdbus-codegen-${PV}
+	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
+	>=dev-libs/libpcre2-10.32:0=[${MULTILIB_USEDEP},static-libs?]
+	>=dev-libs/libffi-3.0.13-r1:=[${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	>=virtual/libintl-0-r2[${MULTILIB_USEDEP}]
+	kernel_linux? ( >=sys-apps/util-linux-2.23[${MULTILIB_USEDEP}] )
+	selinux? ( >=sys-libs/libselinux-2.2.2-r5[${MULTILIB_USEDEP}] )
+	xattr? ( !elibc_glibc? ( >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] ) )
+	elf? ( virtual/libelf:0= )
+	sysprof? ( >=dev-util/sysprof-capture-3.40.1:4[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}"
+# libxml2 used for optional tests that get automatically skipped
+BDEPEND="
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	>=sys-devel/gettext-0.19.8
+	gtk-doc? ( >=dev-util/gtk-doc-1.33
+		app-text/docbook-xml-dtd:4.2
+		app-text/docbook-xml-dtd:4.5 )
+	systemtap? ( >=dev-util/systemtap-1.3 )
+	${PYTHON_DEPS}
+	test? ( >=sys-apps/dbus-1.2.14 )
+	virtual/pkgconfig
+"
+# TODO: >=dev-util/gdbus-codegen-${PV} test dep once we modify gio/tests/meson.build to use external gdbus-codegen
+
+PDEPEND="
+	dbus? ( gnome-base/dconf )
+	mime? ( x11-misc/shared-mime-info )
+"
+# shared-mime-info needed for gio/xdgmime, bug #409481
+# dconf is needed to be able to save settings, bug #498436
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/gio-querymodules$(get_exeext)
+)
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.74.0-crash-gparamspec.patch
+)
+
+pkg_setup() {
+	if use kernel_linux ; then
+		CONFIG_CHECK="~INOTIFY_USER"
+		if use test ; then
+			CONFIG_CHECK="~IPV6"
+			WARNING_IPV6="Your kernel needs IPV6 support for running some tests, skipping them."
+		fi
+		linux-info_pkg_setup
+	fi
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	if use test; then
+		# TODO: Review the test exclusions, especially now with meson
+		# Disable tests requiring dev-util/desktop-file-utils when not installed, bug #286629, upstream bug #629163
+		if ! has_version dev-util/desktop-file-utils ; then
+			ewarn "Some tests will be skipped due dev-util/desktop-file-utils not being present on your system,"
+			ewarn "think on installing it to get these tests run."
+			sed -i -e "/appinfo\/associations/d" gio/tests/appinfo.c || die
+			sed -i -e "/g_test_add_func/d" gio/tests/desktop-app-info.c || die
+		fi
+
+		# gdesktopappinfo requires existing terminal (gnome-terminal or any
+		# other), falling back to xterm if one doesn't exist
+		#if ! has_version x11-terms/xterm && ! has_version x11-terms/gnome-terminal ; then
+		#	ewarn "Some tests will be skipped due to missing terminal program"
+		# These tests seem to sometimes fail even with a terminal; skip for now and reevulate with meson
+		# Also try https://gitlab.gnome.org/GNOME/glib/issues/1601 once ready for backport (or in a bump) and file new issue if still fails
+		sed -i -e "/appinfo\/launch/d" gio/tests/appinfo.c || die
+		# desktop-app-info/launch* might fail similarly
+		sed -i -e "/desktop-app-info\/launch-as-manager/d" gio/tests/desktop-app-info.c || die
+		#fi
+
+		# https://bugzilla.gnome.org/show_bug.cgi?id=722604
+		sed -i -e "/timer\/stop/d" glib/tests/timer.c || die
+		sed -i -e "/timer\/basic/d" glib/tests/timer.c || die
+
+		ewarn "Tests for search-utils have been skipped"
+		sed -i -e "/search-utils/d" glib/tests/meson.build || die
+
+		# Play nice with network-sandbox, but this approach would defeat the purpose of the test
+		#sed -i -e "s/localhost/127.0.0.1/g" gio/tests/gsocketclient-slow.c || die
+	else
+		# Don't build tests, also prevents extra deps, bug #512022
+		sed -i -e '/subdir.*tests/d' {.,gio,glib}/meson.build || die
+	fi
+
+	# Don't build fuzzing binaries - not used
+	sed -i -e '/subdir.*fuzzing/d' meson.build || die
+
+	# gdbus-codegen is a separate package
+	sed -i -e '/install_dir/d' gio/gdbus-2.0/codegen/meson.build || die
+
+	# Same kind of meson-0.50 issue with some installed-tests files; will likely be fixed upstream soon
+	sed -i -e '/install_dir/d' gio/tests/meson.build || die
+
+	cat > "${T}/glib-test-ld-wrapper" <<-EOF
+		#!/usr/bin/env sh
+		exec \${LD:-ld} "\$@"
+	EOF
+	chmod a+x "${T}/glib-test-ld-wrapper" || die
+	sed -i -e "s|'ld'|'${T}/glib-test-ld-wrapper'|g" gio/tests/meson.build || die
+
+	default
+	gnome2_environment_reset
+	# TODO: python_name sedding for correct python shebang? Might be relevant mainly for glib-utils only
+}
+
+multilib_src_configure() {
+	if use debug; then
+		append-cflags -DG_ENABLE_DEBUG
+	else
+		append-cflags -DG_DISABLE_CAST_CHECKS # https://gitlab.gnome.org/GNOME/glib/issues/1833
+	fi
+
+	# TODO: figure a way to pass appropriate values for all cross properties that glib uses (search for get_cross_property)
+	#if tc-is-cross-compiler ; then
+		# https://bugzilla.gnome.org/show_bug.cgi?id=756473
+		# TODO-meson: This should be in meson cross file as 'growing_stack' property; and more, look at get_cross_property
+		#case ${CHOST} in
+		#hppa*|metag*) export glib_cv_stack_grows=yes ;;
+		#*)            export glib_cv_stack_grows=no ;;
+		#esac
+	#fi
+
+	local emesonargs=(
+		-Ddefault_library=$(usex static-libs both shared)
+		$(meson_feature selinux)
+		$(meson_use xattr)
+		-Dlibmount=enabled # only used if host_system == 'linux'
+		-Dman=true
+		$(meson_use systemtap dtrace)
+		$(meson_use systemtap)
+		$(meson_feature sysprof)
+		$(meson_native_use_bool gtk-doc gtk_doc)
+		$(meson_use test tests)
+		-Dinstalled_tests=false
+		-Dnls=enabled
+		-Doss_fuzz=disabled
+		$(meson_native_use_feature elf libelf)
+		-Dmultiarch=false
+	)
+	meson_src_configure
+}
+
+multilib_src_test() {
+	export XDG_CONFIG_DIRS=/etc/xdg
+	export XDG_DATA_DIRS=/usr/local/share:/usr/share
+	export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp"
+	export LC_TIME=C # bug #411967
+	export TZ=UTC
+	unset GSETTINGS_BACKEND # bug #596380
+	python_setup
+
+	# https://bugs.gentoo.org/839807
+	local -x SANDBOX_PREDICT=${SANDBOX_PREDICT}
+	addpredict /usr/b
+
+	# Related test is a bit nitpicking
+	mkdir "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
+	chmod 0700 "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
+
+	meson_src_test --timeout-multiplier 2 --no-suite flaky
+}
+
+multilib_src_install() {
+	meson_src_install
+	keepdir /usr/$(get_libdir)/gio/modules
+}
+
+multilib_src_install_all() {
+	# These are installed by dev-util/glib-utils
+	# TODO: With patching we might be able to get rid of the python-any deps and removals, and test depend on glib-utils instead; revisit now with meson
+	rm "${ED}/usr/bin/glib-genmarshal" || die
+	rm "${ED}/usr/share/man/man1/glib-genmarshal.1" || die
+	rm "${ED}/usr/bin/glib-mkenums" || die
+	rm "${ED}/usr/share/man/man1/glib-mkenums.1" || die
+	rm "${ED}/usr/bin/gtester-report" || die
+	rm "${ED}/usr/share/man/man1/gtester-report.1" || die
+	# gdbus-codegen manpage installed by dev-util/gdbus-codegen
+	rm "${ED}/usr/share/man/man1/gdbus-codegen.1" || die
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+
+	# Make gschemas.compiled belong to glib alone
+	local cache="/usr/share/glib-2.0/schemas/gschemas.compiled"
+
+	if [[ -e ${EROOT}${cache} ]]; then
+		cp "${EROOT}"${cache} "${ED}"/${cache} || die
+	else
+		touch "${ED}"${cache} || die
+	fi
+
+	multilib_pkg_preinst() {
+		# Make giomodule.cache belong to glib alone
+		local cache="/usr/$(get_libdir)/gio/modules/giomodule.cache"
+
+		if [[ -e ${EROOT}${cache} ]]; then
+			cp "${EROOT}"${cache} "${ED}"${cache} || die
+		else
+			touch "${ED}"${cache} || die
+		fi
+	}
+
+	# Don't run the cache ownership when cross-compiling, as it would end up with an empty cache
+	# file due to inability to create it and GIO might not look at any of the modules there
+	if ! tc-is-cross-compiler ; then
+		multilib_foreach_abi multilib_pkg_preinst
+	fi
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	# glib installs no schemas itself, but we force update for fresh install in case
+	# something has dropped in a schemas file without direct glib dep; and for upgrades
+	# in case the compiled schema format could have changed
+	gnome2_schemas_update
+
+	multilib_pkg_postinst() {
+		gnome2_giomodule_cache_update \
+			|| die "Update GIO modules cache failed (for ${ABI})"
+	}
+	if ! tc-is-cross-compiler ; then
+		multilib_foreach_abi multilib_pkg_postinst
+	else
+		ewarn "Updating of GIO modules cache skipped due to cross-compilation."
+		ewarn "You might want to run gio-querymodules manually on the target for"
+		ewarn "your final image for performance reasons and re-run it when packages"
+		ewarn "installing GIO modules get upgraded or added to the image."
+	fi
+
+	for v in ${REPLACING_VERSIONS}; do
+		if ver_test "$v" "-lt" "2.63.6"; then
+			ewarn "glib no longer installs the gio-launch-desktop binary. You may need"
+			ewarn "to restart your session for \"Open With\" dialogs to work."
+		fi
+	done
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+
+	if [[ -z ${REPLACED_BY_VERSION} ]]; then
+		multilib_pkg_postrm() {
+			rm -f "${EROOT}"/usr/$(get_libdir)/gio/modules/giomodule.cache
+		}
+		multilib_foreach_abi multilib_pkg_postrm
+		rm -f "${EROOT}"/usr/share/glib-2.0/schemas/gschemas.compiled
+	fi
+}
diff --git a/dev-libs/grantlee/Manifest b/dev-libs/grantlee/Manifest
index 3794cacba2df..9d25d7497381 100644
--- a/dev-libs/grantlee/Manifest
+++ b/dev-libs/grantlee/Manifest
@@ -1,8 +1,5 @@
 AUX grantlee-0.3.0-nonfatal-warnings.patch 573 BLAKE2B 1e7ca46d955900e24597666e04b7e6eb60ef5c5bc6e77964721bbed93612bd5024a6935f297f0b888c93c78da71472ac0cc03d842dc04c61e3eafcc7d18b92f3 SHA512 903a1ece31f2ddce273188d29078fbd14fab064eb1a1242569a856b716d85e9a3eab99c348d691cc2b41c83a9e446934629dd211dbebed1e74ca8ab1a24d9ea9
-AUX grantlee-5.2.0-slot.patch 2261 BLAKE2B e84c2899e45b0476b1455c7935af2058167f168c9abbf5c324b7bdf7402fe6b272d57cfdca64c61189f4107f436e333ebd2ee5e3f3235f04e46fbc5d80526cf6 SHA512 fbef42f23ce9f44820215112e0b2f7dcf3f0a6bffcb79939c6693471cc35ad53452792efb269be6699b99a0b3d54318d4dd84a5b89d71d51cd2192b479f5ca7c
 AUX grantlee-5.3.0-slot.patch 2262 BLAKE2B 8a876c6e19f426c3eaa6117672def327b57fada417e94a523e7c91b0d33bcb6c05d26ae0467463544e6f926014efa04fd78d9d9bd50ef84b0e48b8d24efcb37a SHA512 2e9f0bdb3fd493548944fdac879c6854d08ed27c3ef957f6a9d35d10fd0223b1794a01dcede28d639d3846dc5eb6c5bb86a0d82b0612020780e9735f60ba3546
-DIST grantlee-5.2.0.tar.gz 1166467 BLAKE2B 89f66fefe3c5bbd087cdaed0f83a6b9ca2456629465dfd68d32c6f316d6d4533ece09e5a1444833897c70abbeb8258e0ca9faba09388dcbf40245c04f72f5040 SHA512 94b53d103aa775e6d45357d44d5634a5214d12ea7178d251fda30c5a88ddc2682ae44501ee8b7dc475793b84fa0998eb0bc13eea3f2e10ab29b1489db6ea60bd
 DIST grantlee-5.3.0.tar.gz 1176075 BLAKE2B a3418250845b39c4766dd19a1f423f18ca7393f675d0045477b345e589d5649f1cc332f9c228e9e9317bdf356992e533cfabe62bcfb50c40ffa38be9b5009013 SHA512 8018c92e1001e039243b4a22a790907b53bff21e062c7e3ee63d1e2de4ce7bccc4a7580fc4ec2e61dc2f7131ac336d46f76e2f03a7314c1547b8744842c0a02a
-EBUILD grantlee-5.2.0.ebuild 1070 BLAKE2B e1c7e4b33661b07c114de7b0c4b2626d029674202651ca83d8e1dc26fa3cde2234218f9580ce145a1f1b650dcfe4b0bed117a39de352b013c1dd43670bf6bd85 SHA512 1556fb717d94328c13f71e4d75d9834b415468dc067a00287d7250d54525ec9032bdf4fb554bcdc86f7feb53cb1bd2a1ec9b4cbc99ed402edb57355e6067362a
-EBUILD grantlee-5.3.0.ebuild 1122 BLAKE2B 3b20e64b6248642743a55dd0924ac24234fd02442647cdc7c42f320dab3295dcfd63fcb040807196cdb00fab078e467637620e1ca39f6aacc31bee43e13379c4 SHA512 620e183e6a7c6d33418dffa0427561e745348dd8639081e74173c60ddec6c6f2927e5a4e773d222add4118bdbff462f05604a77b37dfe9d50ed9360a1af0c278
+EBUILD grantlee-5.3.0.ebuild 1121 BLAKE2B 54e1df4284cf7a89adcebfbd4b7ffac44e05265a70890cc6a1bf1b7e5e45aa3e34314ad45bd5ba5d3e1de2bc66c51a36b44553e0b844d5c15b31339b3a18bf3e SHA512 7097ad80e753ccc9e7c2d289bb76543db5e0f00f9cc4cb6d898a2020bb37ac5824b02838b23baa29daec35ef08dd9e87caf1568cd32468f20c82596ee05be3db
 MISC metadata.xml 332 BLAKE2B 655bf07600689b25f75cd8889d468ab092a861c8cd88c604a3d0411916ae29ab1508ebd7e296d0df1f037ab9cfad06b146cc2d0fe5d2d4d590d8a36e2de858ed SHA512 5837c62f635103c8ff77caf457916a32600134cd2d9333dc5389f92fa95fba39af867eac73df99fe59cd0c9a16388c6da890f25397986c8406e844aec66bf66b
diff --git a/dev-libs/grantlee/files/grantlee-5.2.0-slot.patch b/dev-libs/grantlee/files/grantlee-5.2.0-slot.patch
deleted file mode 100644
index 9490df2327ec..000000000000
--- a/dev-libs/grantlee/files/grantlee-5.2.0-slot.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 0bf2a3f667a958b3cc7859cc2fe60ca8a7ccac08 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Sat, 30 Nov 2019 11:55:33 +0100
-Subject: [PATCH] Install headers to a custom location to permit slotting
-
-That was previously necessary with Qt4 version, let's keep it while
-Qt6 is around the corner.
-
-Amended with target_include_directories fix by jospezial.
-
----
- templates/lib/CMakeLists.txt    | 5 +++--
- textdocument/lib/CMakeLists.txt | 5 +++--
- 2 files changed, 6 insertions(+), 4 deletions(-)
-
-diff --git a/templates/lib/CMakeLists.txt b/templates/lib/CMakeLists.txt
-index 5058481..3ef29a4 100644
---- a/templates/lib/CMakeLists.txt
-+++ b/templates/lib/CMakeLists.txt
-@@ -101,6 +101,7 @@ if (Qt5Qml_FOUND)
- 
-   target_sources(Grantlee_Templates PRIVATE ${scriptabletags_SRCS})
-   target_include_directories(Grantlee_Templates PRIVATE ../scriptabletags)
-+  target_include_directories(Grantlee_Templates INTERFACE "$<INSTALL_INTERFACE:include/grantlee5>")
-   target_link_libraries(Grantlee_Templates
-     PRIVATE Qt5::Qml
-   )
-@@ -152,10 +153,10 @@ install(FILES
-   token.h
-   util.h
-   variable.h
--  DESTINATION include/grantlee COMPONENT Templates
-+  DESTINATION include/grantlee5/grantlee COMPONENT Templates
- )
- 
- install(FILES
-   grantlee_templates.h
--  DESTINATION include COMPONENT Templates
-+  DESTINATION include/grantlee5 COMPONENT Templates
- )
-diff --git a/textdocument/lib/CMakeLists.txt b/textdocument/lib/CMakeLists.txt
-index 2c5a96f..c42d32a 100644
---- a/textdocument/lib/CMakeLists.txt
-+++ b/textdocument/lib/CMakeLists.txt
-@@ -34,6 +34,7 @@ if (CMAKE_GENERATOR MATCHES "Visual Studio")
-       )
-   endforeach()
- endif()
-+target_include_directories(Grantlee_TextDocument INTERFACE "$<INSTALL_INTERFACE:include/grantlee5>")
- 
- target_link_libraries(Grantlee_TextDocument
-   PUBLIC Qt5::Gui
-@@ -59,10 +60,10 @@ install(FILES
-   texthtmlbuilder.h
-   mediawikimarkupbuilder.h
-   ${CMAKE_CURRENT_BINARY_DIR}/grantlee_textdocument_export.h
--  DESTINATION include/grantlee COMPONENT TextDocument
-+  DESTINATION include/grantlee5/grantlee COMPONENT TextDocument
- )
- 
- install(FILES
-   grantlee_textdocument.h
--  DESTINATION include COMPONENT TextDocument
-+  DESTINATION include/grantlee5 COMPONENT TextDocument
- )
--- 
-2.24.0
diff --git a/dev-libs/grantlee/grantlee-5.2.0.ebuild b/dev-libs/grantlee/grantlee-5.2.0.ebuild
deleted file mode 100644
index 1a4abea4eeb3..000000000000
--- a/dev-libs/grantlee/grantlee-5.2.0.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-VIRTUALX_REQUIRED="test"
-inherit cmake virtualx
-
-DESCRIPTION="C++ string template engine based on the Django template system"
-HOMEPAGE="https://github.com/steveire/grantlee"
-SRC_URI="http://downloads.grantlee.org/${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv x86"
-IUSE="debug doc test"
-
-BDEPEND="
-	doc? ( app-doc/doxygen[dot] )
-	test? ( dev-qt/linguist-tools:5 )
-"
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-"
-DEPEND="${RDEPEND}
-	test? ( dev-qt/qttest:5 )
-"
-
-RESTRICT+=" !test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.3.0-nonfatal-warnings.patch"
-	"${FILESDIR}/${P}-slot.patch"
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTS=$(usex test)
-	)
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-
-	use doc && cmake_src_compile docs
-}
-
-src_test() {
-	virtx cmake_src_test
-}
-
-src_install() {
-	use doc && local HTML_DOCS=("${BUILD_DIR}/apidox/")
-
-	cmake_src_install
-}
diff --git a/dev-libs/grantlee/grantlee-5.3.0.ebuild b/dev-libs/grantlee/grantlee-5.3.0.ebuild
index 3c7e7c10080c..467066d842a0 100644
--- a/dev-libs/grantlee/grantlee-5.3.0.ebuild
+++ b/dev-libs/grantlee/grantlee-5.3.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://downloads.grantlee.org/${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="5"
-KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv x86"
 IUSE="debug doc test"
 
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/kreport/Manifest b/dev-libs/kreport/Manifest
index 4feb8a988a12..a31ec947d4c3 100644
--- a/dev-libs/kreport/Manifest
+++ b/dev-libs/kreport/Manifest
@@ -4,5 +4,5 @@ AUX kreport-3.2.0-fix-insane-delay.patch 5496 BLAKE2B 1d3adb61aa38ba73cf58c862fb
 AUX kreport-3.2.0-gcc10.patch 4160 BLAKE2B 1d3e579ac1c2e6da0cecc22a2128746a6f3fdf99c7b4b5b66e0992f10ec9555b83efc6b6eff62acc5c2a72299abf3baf6b0e7fec9b7b0c57702a23d7cdc4cec4 SHA512 a378710adb3c885591dadb878ad6c4c8ed6c3e92feebfd59aaf8eaf1f03ddbe720d4480622e744c37ec0d7bb52812b9e91eef90ff5d3af30f70da7bbbba5aff8
 AUX kreport-3.2.0-gcc12.patch 1014 BLAKE2B 7fa0a343e670f93762832e4667fbef2037dd8330818937040eb5abca5c93c140eda0da002d9013378bf559249690b49289ca86d5f40c6a65e9f3630cec5cb905 SHA512 fffa5455ac114c143f4b5b29440884393234b020b1a773e243fcb223cf08cbffecd00b86111cc99a7090127ff28b2f192b7f6b3eb95d1406bf42032bcd412f4f
 DIST kreport-3.2.0.tar.xz 374072 BLAKE2B b0e4a028464f424e1e6661a02233a0e6f711a890892ea34c8c8ebc12675379a233e9aa8b00f9165e9a82993d43ae2086c7a8c0f5cc17cfaa658614225c7b56c8 SHA512 3f7b8bf8d4c5e88de74b38c55b4c82ac1e3ae11db424b10b85884ff479d25640b0ef7c6f90567cf27a1bab099d4b14a042ddf4549cec9ca7d5b237c3a8f7104c
-EBUILD kreport-3.2.0-r3.ebuild 1505 BLAKE2B 5008ee1558bb5e08d93a8da26921a050e5912850d1010ab5905b2113fbc30f2b94853d87089eda71ccf86976fb758336b4fd3b7c75803076038e113929c636de SHA512 28867ae3b3839112009fdf36172c0067f5fa79eb591ae0c9145d9cb6e9d240e8242977690eaf2d8a0d6f289f7b6bca10d22fe7d7a4319eaa00e67a149cdd6e47
+EBUILD kreport-3.2.0-r3.ebuild 1505 BLAKE2B 3a402080c5e3d4edc5413e5813704c4affc5e66cdacd858190d656174715818e474b404f6333ec5dbf3c5a7836b7e05290acc1f4b43311cd83a1a15018b3e4e1 SHA512 332c212f6afc05258e0ad742d8902a70ec53ab6944794a40a04f11d4363d9588b013d5f751490fb99a0b0b9d190b3464e6c170c6316b90d20d23b93b8eaa7f45
 MISC metadata.xml 513 BLAKE2B 38e212c004da9c51581f191c2cb3852199931eb9135c9f07dfcdfa30ff780630038291169cead63edd1c842bedaaf00c261d20c6871e325f9b9dc8901481b868 SHA512 1f696a012a26537e7025bc3e2e4b4979e90b2a45f79c751ec0b97a7e27db46c946b4eeefe5b16a9ded482e910ed538bb3113757bcca2148252b6b1c2597a3b45
diff --git a/dev-libs/kreport/kreport-3.2.0-r3.ebuild b/dev-libs/kreport/kreport-3.2.0-r3.ebuild
index 820ffe91a5a8..736caeac70a7 100644
--- a/dev-libs/kreport/kreport-3.2.0-r3.ebuild
+++ b/dev-libs/kreport/kreport-3.2.0-r3.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 ECM_QTHELP="true"
 ECM_TEST="true"
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 KFMIN=5.82.0
 QTMIN=5.15.2
 VIRTUALX_REQUIRED="test"
diff --git a/dev-libs/libclc/Manifest b/dev-libs/libclc/Manifest
index 5cef3423afb7..6b8e81a793ed 100644
--- a/dev-libs/libclc/Manifest
+++ b/dev-libs/libclc/Manifest
@@ -5,8 +5,8 @@ DIST llvm-project-15.0.3.src.tar.xz 112069972 BLAKE2B 3d29bab890467ba87fedcc4e76
 DIST llvm-project-15.0.3.src.tar.xz.sig 438 BLAKE2B e7e0614e144eb878f694c12e97cf42ff8476e47cb55e8f259eb2ec52e303463ad753771271512e89baf0137c1382b11cfa028c85324174ebcd054a124000f537 SHA512 41229bebdb0c2df9a5e3a4d6f02d39fac7dc91f21895a659523beab4fa3ef99ff06eff5e4386221369b6e2b6f8fe974d67b7d8496d5911ce484d09ae0db8b916
 DIST llvm-project-b34ea582774c057d9bf5591174d683fd3d8aa02b.tar.gz 169735900 BLAKE2B d3a82a07f855b038071fc8eb3f41a88b4c220a577219985ecddeb9a535ea8b159dbad575699997d90a49db74c074b5f4354ad707e91d6934daaa7319e0d8ee9b SHA512 3f5525c7d893bdac701cff4cf82dafc31608920d788d9b7401654f320b2432528cf4ae8ef013182807b3dc0c5b758c71f1efeedb672dd47fdb8aa6f434dfb583
 EBUILD libclc-14.0.6.ebuild 1390 BLAKE2B eb984d3f19f3b147d3974722c11218117240cad75033c12eb6664ef7d492e9ed77fd3c3dfef2fe59bb0c23716072b7ff3b10840b19b213fa96121d5aa7faa335 SHA512 66b74a3cb2ee6c54e6d348d64fe239f2ea72a43f28d1ab0cf22a4757cf87cadde427516d8aa74b4c95a947f38d01571f23e69388a04694527e2be9b0fd1bf94e
-EBUILD libclc-15.0.3.9999.ebuild 1402 BLAKE2B 3c240051e1752ea60d9c040f75a5f95319e97754684c4e98c8bdcc8fe60ec266736d573f71929328f12ce96357ca33376244adf7305d674ec5e21a182b635bb6 SHA512 0986f1338d3048444632759c5276c1bbfc8ed4dc4450a83603985aea7643b26eef86d24550eba3b52be06e851c0ad4d866eee295e84385b26bc3df911c1ad9a6
 EBUILD libclc-15.0.3.ebuild 1413 BLAKE2B 837a7970e531e7198059f14a7ab25f416852993c0775b76baf01e334cc6050ba0714cf74ce645b9c8aa6312152b5991b2aef2ae7d1d10d0235ab6724efe35a28 SHA512 047251cbf6e7185be5061d5d1e6db01833a97702b844511bc5a0db76b7323cb5f253f3ac77593c0b989515b7651c3bef2e3def8b017b1233457bd1ae4696dda5
+EBUILD libclc-15.0.4.9999.ebuild 1402 BLAKE2B 3c240051e1752ea60d9c040f75a5f95319e97754684c4e98c8bdcc8fe60ec266736d573f71929328f12ce96357ca33376244adf7305d674ec5e21a182b635bb6 SHA512 0986f1338d3048444632759c5276c1bbfc8ed4dc4450a83603985aea7643b26eef86d24550eba3b52be06e851c0ad4d866eee295e84385b26bc3df911c1ad9a6
 EBUILD libclc-16.0.0.9999.ebuild 1423 BLAKE2B 340c42c12fee9ca7f7fca73019d304e182f4e67b4ccd01c742f893483246d95fceafb4bdbdb6b3832520803ab3a7c58b6a21ead7ae40e32c7f0a3cbd48cab862 SHA512 448e79b028b81c9a6a601abb16ed1b4e71ae73611820e5c0f4287a924011619fe9af7d06eb0f2458a3c07fec8e30d1298d3ab810d5bd8bd995fe4e3e894b84c5
 EBUILD libclc-16.0.0_pre20221016.ebuild 1423 BLAKE2B 340c42c12fee9ca7f7fca73019d304e182f4e67b4ccd01c742f893483246d95fceafb4bdbdb6b3832520803ab3a7c58b6a21ead7ae40e32c7f0a3cbd48cab862 SHA512 448e79b028b81c9a6a601abb16ed1b4e71ae73611820e5c0f4287a924011619fe9af7d06eb0f2458a3c07fec8e30d1298d3ab810d5bd8bd995fe4e3e894b84c5
 EBUILD libclc-16.0.0_pre20221023.ebuild 1423 BLAKE2B 340c42c12fee9ca7f7fca73019d304e182f4e67b4ccd01c742f893483246d95fceafb4bdbdb6b3832520803ab3a7c58b6a21ead7ae40e32c7f0a3cbd48cab862 SHA512 448e79b028b81c9a6a601abb16ed1b4e71ae73611820e5c0f4287a924011619fe9af7d06eb0f2458a3c07fec8e30d1298d3ab810d5bd8bd995fe4e3e894b84c5
diff --git a/dev-libs/libclc/libclc-15.0.3.9999.ebuild b/dev-libs/libclc/libclc-15.0.4.9999.ebuild
similarity index 100%
rename from dev-libs/libclc/libclc-15.0.3.9999.ebuild
rename to dev-libs/libclc/libclc-15.0.4.9999.ebuild
diff --git a/dev-libs/libcpuid/Manifest b/dev-libs/libcpuid/Manifest
index ec94a66e6921..e9ba80ac349e 100644
--- a/dev-libs/libcpuid/Manifest
+++ b/dev-libs/libcpuid/Manifest
@@ -1,5 +1,7 @@
 DIST libcpuid-0.5.1.tar.gz 166522 BLAKE2B 3471c11bbe4b0eaac7b00ac20a27556a95991f1b678269ae6f142a0fe2db066ebb756722ae2e76f95158742c93e29a35da6e735226d32b746034acae3ec2a5b7 SHA512 d725bc82e5aa2db69cea7b3590afbe11d6028cf4802fde8d498b4f1cc6d823e73d71b89a453d81bf996d97b36a71f6c00d0f6e8292b72f2be8a64b5d59c01861
 DIST libcpuid-0.6.0.tar.gz 240709 BLAKE2B 6be56956d17aab774282b3e2be83b02f0180153af9cea665dbf8a8a216b35fd8c030b053184d09ac3946d163943281ecb906134290516d8063380749944339e8 SHA512 9f80f0d45f408d35d9ee657d8f53c99bb14e37d26a8a7b6a914546f0446f83a3d75eb06d261c7708a810ba10ce6fadaef54ba7c94cbf22cd113a9f2210c1a708
+DIST libcpuid-0.6.1.tar.gz 255938 BLAKE2B 80239930d7259b76289f6130c720d1700ae3a10be2a29b118cc8db38fb72f821b1d1a01afef06e00b2a3678b91b660ccd101eaf50af442a80166a508eb435294 SHA512 ccdb486a848f01a4f977c6f6b7ca59a2e65a7e04665e1a04bc3a57f1e8a68617f8bfbb2a71a1c93465bbaa7cc060fd7d120bbcb1a17fa004981e1074a4788818
 EBUILD libcpuid-0.5.1.ebuild 753 BLAKE2B d01fe11a825a7e708f94c0f765921317d1364c535e080848d76581d868a7c383fbacad54a6cd8ce0eced41115ed5db383060d2460b948075fd092bb4b1075bbe SHA512 df249ef974f257d4908b7c770781001903ad83698d02d910d09ceb3d644c89abe90a743861077d5b24b3c00dd26522400c33669778f6f9e3759a3873bd269a06
 EBUILD libcpuid-0.6.0.ebuild 753 BLAKE2B f2868a5e15edb572e13c2e6ce58aeb4d31966fbb73c1e5c6bc2f0730f936438f5019f696cf8e35fa01acca39cb06b0b074f6281251b7ed59a8e11e3c46119a31 SHA512 03beaa05a4d3c7f1b1f268b1c73a7e216040f3b04c8cc68d55212142db2408d39f2089d492047ccbfe1a9945db7849e7e752bff092dcae3deeda620a25ba27a7
+EBUILD libcpuid-0.6.1.ebuild 753 BLAKE2B f2868a5e15edb572e13c2e6ce58aeb4d31966fbb73c1e5c6bc2f0730f936438f5019f696cf8e35fa01acca39cb06b0b074f6281251b7ed59a8e11e3c46119a31 SHA512 03beaa05a4d3c7f1b1f268b1c73a7e216040f3b04c8cc68d55212142db2408d39f2089d492047ccbfe1a9945db7849e7e752bff092dcae3deeda620a25ba27a7
 MISC metadata.xml 2130 BLAKE2B 729a7382c0d844c94da0f24c0a96d6570fbb75202436298dafe21611c8047ddbf5d1479e5ab73655bfa28af5165bde93028ed662ae2c9c294474958bb6b5ef60 SHA512 62b2bdbeb95b3716b40532658720a63825e54c64f312151dd220070ac84d3a067658fbc69b1804afc00c861ebd4f0f0c389c007b1b70a06ffe1e4a7975bd5f3c
diff --git a/dev-libs/libcpuid/libcpuid-0.6.1.ebuild b/dev-libs/libcpuid/libcpuid-0.6.1.ebuild
new file mode 100644
index 000000000000..c3576366dccf
--- /dev/null
+++ b/dev-libs/libcpuid/libcpuid-0.6.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=(python3_{9..11})
+
+inherit autotools python-any-r1
+
+DESCRIPTION="A small C library for x86 (and x86_64) CPU detection and feature extraction"
+HOMEPAGE="http://libcpuid.sourceforge.net/"
+SRC_URI="https://github.com/anrieff/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="BSD-2"
+SLOT="0/16"
+KEYWORDS="~amd64"
+IUSE="static-libs test"
+RESTRICT="!test? ( test )"
+
+DEPEND="test? ( ${PYTHON_DEPS} )"
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf "$(use_enable static-libs static)"
+}
+
+src_install() {
+	default
+	find "${ED}" -name "*.la" -delete || die
+}
diff --git a/dev-libs/libffi/Manifest b/dev-libs/libffi/Manifest
index bde9c2efcfe4..13ed8d0731eb 100644
--- a/dev-libs/libffi/Manifest
+++ b/dev-libs/libffi/Manifest
@@ -10,9 +10,8 @@ AUX libffi-3.4.2-backport-pr-722.patch 2813 BLAKE2B 6d89a670b64a62e88a6f9d4a59ae
 DIST libffi-3.3.tar.gz 1305466 BLAKE2B cddc40729a30a9bd34d675809f51f8d1b4ccaffa54bc6dd6f7e965f4e260edd34754719f9f6247c8957aeb7cf154d56ce1fe16a54c3f1ad39afbebdf41d23caa SHA512 61513801a156f11420f541d325de697131846487122d6bdcf5491b18b4da788589f5c0bb07e88e396495d3be5830d74e9135595e2b8ddbfe95c448d8597fbd6f
 DIST libffi-3.4.2-loongarch64-20220428.patch.xz 64932 BLAKE2B d144dc28a7fce008bc5cd43d9e04125ea8e972324d77951d42039d46e818014079c871f87a0cdbec758b55320c02dff718cf2449f9c630cc899e8e1610784a60 SHA512 33715b21fe027692cc584d6524c03510af7876cc35f318221e1b2b91644cf165c02979c8b426228a8cc6c471e6a59d0435e761b6b7aef589c41a4f28caa36e62
 DIST libffi-3.4.2.tar.gz 1351355 BLAKE2B a8137bc895b819f949fd7705e405be627219c6d1fdef280253330f7407d4a548bb057d7bb0e9225d1767d42f9bf5f0ab3c455db1c3470d7cc876bb7b7d55d308 SHA512 31bad35251bf5c0adb998c88ff065085ca6105cf22071b9bd4b5d5d69db4fadf16cadeec9baca944c4bb97b619b035bb8279de8794b922531fddeb0779eb7fb1
-DIST libffi-3.4.3.tar.gz 1358634 BLAKE2B 5e751c53a6b65316e438723810fbafe7f27732feb50466f1459d086c35a519f460b57968721212496a7502b0a5860546c84b22ec269e979728f18d0731fc918a SHA512 6e3620d3842ae0f983c47c3268364be32b6eeb2fc708b23d141531730e9149abb035c618b295be834999eadef64fabfa39df21c955c40473f3bbc9fd3170bad8
+DIST libffi-3.4.4.tar.gz 1362394 BLAKE2B 189fe1ffe9507f204581b0ab09995dc7e7b761bb4eac7e338e9f5ff81431aebcef6c182c1839c9f9acb2706697a260c67e6d1351cf7e2aed7c4eb5d694f6f8fd SHA512 88680aeb0fa0dc0319e5cd2ba45b4b5a340bc9b4bcf20b1e0613b39cd898f177a3863aa94034d8e23a7f6f44d858a53dcd36d1bb8dee13b751ef814224061889
 EBUILD libffi-3.3-r2.ebuild 2257 BLAKE2B 5a212c60da8441e8fa7ae839bde431f4f74025cfb975836f3369138931ece80d140c109d79d5fba45bd5d684ae96abd273004e211c4782cfcd56d83714b76e93 SHA512 8d4be46533328714d161a6d52ef0316c2286f50d6cce723fa8c1ae9b2bb29336fbb666992c9662da4eaf0dd9d983be79f3177b3d398edceb1223a358340320be
-EBUILD libffi-3.4.2-r1.ebuild 2528 BLAKE2B e94c8e41d88a5c24914d36fbcdc84b5ad9bf5454d1a440e2a6e8fb1a9e2f6da5ae4acc8fa4387422a949a200aab092cabd0fc324acd7fc58e1a95b6c9aa27795 SHA512 27b02c6d584a01b63b7ef542dee022fbdb550e4748c2c57f2d0b19c563793fe780a4fd73a00a7a3d25089699ea1d4a1489e5eaf5773ddb00994a48bd699658f4
 EBUILD libffi-3.4.2-r2.ebuild 2603 BLAKE2B 26f4b9013b55be099f3d6235513e9797311efdbb6bce0b0da8900b16b4d1880b6a7f16b841edaf7200518b2e3ec89df0959835440a33fba59b8066931a0bbd81 SHA512 37885b1ae91666e275c56b70b32730163845157756f7197d44a3ee63e13529bbdae701bbc3798b472715150975c8eb494b07637d517bf1d7f526b5539b506709
-EBUILD libffi-3.4.3.ebuild 2286 BLAKE2B eeb2bc73ec94d064f82d8384ce153be1b5d06a483e830a5ad506a224364300ab0ff60a3439b35ca74f0fa04e45ea49e42e17f705db85fc59f83e8bab0b2a589f SHA512 24862afc48606c3470988b5eee04ce2856bbc5a5b78d4239f938a650968923d5df581dda70d217924dde182d05df43df91796c1cc8a31d7c95503b9d2a43639c
+EBUILD libffi-3.4.4.ebuild 2286 BLAKE2B eeb2bc73ec94d064f82d8384ce153be1b5d06a483e830a5ad506a224364300ab0ff60a3439b35ca74f0fa04e45ea49e42e17f705db85fc59f83e8bab0b2a589f SHA512 24862afc48606c3470988b5eee04ce2856bbc5a5b78d4239f938a650968923d5df581dda70d217924dde182d05df43df91796c1cc8a31d7c95503b9d2a43639c
 MISC metadata.xml 2187 BLAKE2B b3d0fff226007e6f7f69b6d07b7ad703bca294c50d43101c1230acba690b6113eb15c979bcbfba590a5d8c209802fb7046c9fa8f98352b29c1be602cdc4d2b34 SHA512 144b470177885afb19c2f6f76552156c84fd2084be3840fb8168e75e8991ba99189d2549d6de567a5a2c881805099722c1dae9d67562e97ad05b2739f2d3ba92
diff --git a/dev-libs/libffi/libffi-3.4.2-r1.ebuild b/dev-libs/libffi/libffi-3.4.2-r1.ebuild
deleted file mode 100644
index c5d52adb0a81..000000000000
--- a/dev-libs/libffi/libffi-3.4.2-r1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib-minimal preserve-libs
-
-MY_PV=${PV/_rc/-rc}
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="a portable, high level programming interface to various calling conventions"
-HOMEPAGE="https://sourceware.org/libffi/"
-SRC_URI="https://github.com/libffi/libffi/releases/download/v${MY_PV}/${MY_P}.tar.gz
-	experimental-loong? ( https://dev.gentoo.org/~xen0n/distfiles/${MY_P}-loongarch64-20220428.patch.xz )"
-S="${WORKDIR}"/${MY_P}
-
-LICENSE="MIT"
-# This is a core package which is depended on by e.g. Python
-# Please use preserve-libs.eclass in pkg_{pre,post}inst to cover users
-# with FEATURES="-preserved-libs" or another package manager if SONAME
-# changes.
-SLOT="0/8" # SONAME=libffi.so.8
-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="debug exec-static-trampoline experimental-loong pax-kernel static-libs test"
-
-RESTRICT="!test? ( test )"
-BDEPEND="test? ( dev-util/dejagnu )"
-
-DOCS="ChangeLog* README.md"
-
-ECONF_SOURCE=${S}
-
-src_prepare() {
-	if use experimental-loong; then
-		PATCHES+=( "${WORKDIR}/${MY_P}-loongarch64-20220428.patch" )
-	fi
-
-	default
-	if [[ ${CHOST} == arm64-*-darwin* ]] ; then
-		# ensure we use aarch64 asm, not x86 on arm64
-		sed -i -e 's/aarch64\*-\*-\*/arm64*-*-*|&/' \
-			configure configure.host || die
-	fi
-}
-
-multilib_src_configure() {
-	# --includedir= path maintains a few properties:
-	# 1. have stable name across libffi versions: some packages like
-	#    dev-lang/ghc or kde-frameworks/networkmanager-qt embed
-	#    ${includedir} at build-time. Don't require those to be
-	#    rebuilt unless SONAME changes. bug #695788
-	#
-	#    We use /usr/.../${PN} (instead of former /usr/.../${P}).
-	#
-	# 2. have ${ABI}-specific location as ffi.h is target-dependent.
-	#
-	#    We use /usr/$(get_libdir)/... to have ABI identifier.
-	econf \
-		--includedir="${EPREFIX}"/usr/$(get_libdir)/${PN}/include \
-		--disable-multi-os-directory \
-		$(use_enable static-libs static) \
-		$(use_enable exec-static-trampoline exec-static-tramp) \
-		$(use_enable pax-kernel pax_emutramp) \
-		$(use_enable debug)
-}
-
-multilib_src_install_all() {
-	find "${ED}" -name "*.la" -delete || die
-	einstalldocs
-}
-
-pkg_preinst() {
-	preserve_old_lib /usr/$(get_libdir)/libffi.so.7
-}
-
-pkg_postinst() {
-	preserve_old_lib_notify /usr/$(get_libdir)/libffi.so.7
-}
diff --git a/dev-libs/libffi/libffi-3.4.3.ebuild b/dev-libs/libffi/libffi-3.4.4.ebuild
similarity index 100%
rename from dev-libs/libffi/libffi-3.4.3.ebuild
rename to dev-libs/libffi/libffi-3.4.4.ebuild
diff --git a/dev-libs/libgpiod/Manifest b/dev-libs/libgpiod/Manifest
index 25642c69c59a..b712c4bde233 100644
--- a/dev-libs/libgpiod/Manifest
+++ b/dev-libs/libgpiod/Manifest
@@ -1,6 +1,3 @@
-DIST libgpiod-1.4.1.tar.xz 314936 BLAKE2B 8949c4a96f69a83a479f5951e6f1eb8fee56db700e72320131c365a5d736a48700fb42b7ecc2b676cec54887eaa650075f45ec1f0b803de914958cefd3863db8 SHA512 2a9c58a46fb3c2e2dd15cc4ba52f589b44e5ae4547226eeb68a8e5bea6292d38aaf0889cc639e0979e12e129bb944bb42d9258f10292f59d074660e7c2d56d04
 DIST libgpiod-1.6.3.tar.xz 326068 BLAKE2B eda5409f2db3914ede92690589643211eca3002f8dc53a7c48213602f28158084c8eb8061319923f7a51c7d91650ff58b81b059323b5b9133a28b0bb04f6904d SHA512 f7e48662d02904f3f25976d61aa2cf4af0b8a52f65f184f23dfb6916bde9b86634b211f2696d3459a4f902ba5a79621b2fc47d18d487fd7a159018fe8933e370
-EBUILD libgpiod-1.4.1.ebuild 1165 BLAKE2B 190c2b8c0bfaf71973fb722717798b663ca73486f2b9724bfe53f4931169cf055451a7bf7fdabccc0689c5e0e148c99596cf3081b75ebdb759de4c562c07ae55 SHA512 b77d0c3b7f7354b99bb648312fb794253cdda9bdf333d29c34e563e4965555a35c201d3568a7881cd123a81fe7a8f48568680c60e2cdcdb728128eb1057a3846
-EBUILD libgpiod-1.6.3-r1.ebuild 1242 BLAKE2B ba051b6fa13eeca8250040d2150343826cbd99369bc5be1db7779da86aada258e8173294bb369a9c27e882825f6b959f4a9e992de477ed876273d37ff6a76c1e SHA512 3f8eb6bf52e1d0505452183d6659f3d50b17b2192d643a0a32c8840f1e6a4cb17c124709c71a2e36a12ba8b93974efe34d6c5c19fb66695b4bdbea4c211459c5
-EBUILD libgpiod-1.6.3-r4.ebuild 1179 BLAKE2B 0ce08199599057a55bb24552ff41837b460117a7795cb9eb8c8caa1e666260a94925978b51ff489638d59d89a7bdfc6a46fe423fa48c47519c1be7f03b43b341 SHA512 783afa3e15506463f07ba91ec9cc292d0e68ff82afaaf897066fecf9e9f98e1faa107f8e128b42a26a0876a698af2a32aa0c72e67a69168d2f0bc9573ffa96eb
+EBUILD libgpiod-1.6.3-r4.ebuild 1175 BLAKE2B 923b428c143c3640f71a66f1ecde97a49c6633437f445b19a83e40138e21147a4a653eeeefbe375ede291a1736823fa7b3bfeb5eae81961e7a8006add6db0336 SHA512 5ec466695703f6a6c2bc2a7bd852cbcace62e37b4dbe6dc7fc7897f483f7b77123bede6f8cea95dcc61a68a4a894ead137bfbf7c692b31386b21f16ca2e64ae3
 MISC metadata.xml 344 BLAKE2B 3c4f791ae16ba0fa5e2d061ee5aa6795f39b4b2224643b564fcb5f2368a42e349a8d1fa57413a475d48f7038371af321d4758be99658842246403212a22321f3 SHA512 b2d8068c46c3478e2d2251d74f81657c7fcbc320b8d35a56f36e609a118f6858eb62c7905da35ba39c0ae2c98a6bcd0c13418bb9f14176c0d887b5df505a4374
diff --git a/dev-libs/libgpiod/libgpiod-1.4.1.ebuild b/dev-libs/libgpiod/libgpiod-1.4.1.ebuild
deleted file mode 100644
index 5d51f888fe65..000000000000
--- a/dev-libs/libgpiod/libgpiod-1.4.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib-minimal
-
-DESCRIPTION="C library and tools for interacting with the linux GPIO character device"
-HOMEPAGE="https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/"
-SRC_URI="https://mirrors.edge.kernel.org/pub/software/libs/libgpiod/${P}.tar.xz"
-
-LICENSE="LGPL-2.1"
-# Reflects the ABI of libgpiod.so
-SLOT="0/1"
-KEYWORDS="amd64 arm arm64 ~riscv x86"
-IUSE="static-libs +tools cxx python test"
-RESTRICT="!test? ( test )"
-
-#  --enable-tests          enable libgpiod tests [default=no]
-#  --enable-bindings-cxx   enable C++ bindings [default=no]
-#  --enable-bindings-python
-
-multilib_src_configure() {
-	local myconf=(
-		$(use_enable tools)
-		$(use_enable cxx bindings-cxx)
-		$(use_enable test tests)
-		$(multilib_native_use_enable python bindings-python)
-	)
-
-	if ! multilib_is_native_abi; then
-		myconf+=(
-			--disable-tools
-		)
-	fi
-
-	ECONF_SOURCE="${S}" econf "${myconf[@]}"
-}
-
-multilib_src_install() {
-	default
-
-	find "${D}" -name '*.la' -type f -delete || die
-
-	if ! use static-libs; then
-		find "${D}" -name "*.a" -delete || die
-	fi
-}
diff --git a/dev-libs/libgpiod/libgpiod-1.6.3-r1.ebuild b/dev-libs/libgpiod/libgpiod-1.6.3-r1.ebuild
deleted file mode 100644
index 2cb895596af0..000000000000
--- a/dev-libs/libgpiod/libgpiod-1.6.3-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit linux-mod multilib-minimal
-
-DESCRIPTION="C library and tools for interacting with the linux GPIO character device"
-HOMEPAGE="https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/"
-SRC_URI="https://mirrors.edge.kernel.org/pub/software/libs/libgpiod/${P}.tar.xz"
-
-LICENSE="LGPL-2.1"
-# Reflects the ABI of libgpiod.so
-SLOT="0/2"
-KEYWORDS="amd64 arm arm64 ~riscv x86"
-IUSE="static-libs +tools cxx python test"
-RESTRICT="!test? ( test )"
-
-#  --enable-tests          enable libgpiod tests [default=no]
-#  --enable-bindings-cxx   enable C++ bindings [default=no]
-#  --enable-bindings-python
-
-pkg_setup() {
-	CONFIG_CHECK="GPIO_CDEV_V1"
-	linux-mod_pkg_setup
-}
-
-multilib_src_configure() {
-	local myconf=(
-		$(use_enable tools)
-		$(use_enable cxx bindings-cxx)
-		$(use_enable test tests)
-		$(multilib_native_use_enable python bindings-python)
-	)
-
-	if ! multilib_is_native_abi; then
-		myconf+=(
-			--disable-tools
-		)
-	fi
-
-	ECONF_SOURCE="${S}" econf "${myconf[@]}"
-}
-
-multilib_src_install() {
-	default
-
-	find "${D}" -name '*.la' -type f -delete || die
-
-	if ! use static-libs; then
-		find "${D}" -name "*.a" -delete || die
-	fi
-}
diff --git a/dev-libs/libgpiod/libgpiod-1.6.3-r4.ebuild b/dev-libs/libgpiod/libgpiod-1.6.3-r4.ebuild
index cf58ecdba373..edd9c253a6f3 100644
--- a/dev-libs/libgpiod/libgpiod-1.6.3-r4.ebuild
+++ b/dev-libs/libgpiod/libgpiod-1.6.3-r4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://mirrors.edge.kernel.org/pub/software/libs/libgpiod/${P}.tar.xz"
 LICENSE="LGPL-2.1"
 # Reflects the ABI of libgpiod.so
 SLOT="0/2"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~riscv x86"
 IUSE="+tools cxx python test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libucl/Manifest b/dev-libs/libucl/Manifest
index 6ca4b24b96ed..5d2cb28f20d0 100644
--- a/dev-libs/libucl/Manifest
+++ b/dev-libs/libucl/Manifest
@@ -1,4 +1,4 @@
 DIST libucl-0.8.1.tar.gz 2028394 BLAKE2B 18fda317b4b4aed3d6b72c599d191f141bf4722d1c08244deda9c5e77300e2bef7de029889a05d9b4573472928d9d49a797123ac392a4cdd3b690ac277ad673d SHA512 36a059561eadb2dd7253ca22ff56f6a0c6cdd28580e28451c0cf47e1aec321a2e1589fc83ccb2033346f2dbca31a7e6afa9666ea544a0c190b7f80ed0e9f45af
-EBUILD libucl-0.8.1-r100.ebuild 1490 BLAKE2B 55c295364f548c2e3c48c5b4f771fa70103382d3c292d55509a0e474f84af7909d6c49a3812ab207188112a9333bea1eca950a8f7c72612a7d03c72267d62829 SHA512 2947703267883f73d58d74b8ccba8a513f93ad1eb5fa2da5a8b9533b91a71d8e14fc1c535254977725fc6dfb18c1b97cb80e7202f33ec98ccdc41d11209a8c00
-EBUILD libucl-9999.ebuild 1490 BLAKE2B 55c295364f548c2e3c48c5b4f771fa70103382d3c292d55509a0e474f84af7909d6c49a3812ab207188112a9333bea1eca950a8f7c72612a7d03c72267d62829 SHA512 2947703267883f73d58d74b8ccba8a513f93ad1eb5fa2da5a8b9533b91a71d8e14fc1c535254977725fc6dfb18c1b97cb80e7202f33ec98ccdc41d11209a8c00
+EBUILD libucl-0.8.1-r100.ebuild 1510 BLAKE2B ee18667e322d4f17ff1ccfa1559f131e0bb601e8a403b00712749b1071f82e2153b226eb5738fd452fb65a6c33ded8c4d2e88fa2b40fccde4755845f34aa6e3a SHA512 a222fffff87d59deca9a7565185da709187a39a14256bc51c88f3c03c8e71569d20a26caf3fbb70ffea19a8452418f766f9471c5bcbfad2fc64ab40fdfbb4f52
+EBUILD libucl-9999.ebuild 1510 BLAKE2B ee18667e322d4f17ff1ccfa1559f131e0bb601e8a403b00712749b1071f82e2153b226eb5738fd452fb65a6c33ded8c4d2e88fa2b40fccde4755845f34aa6e3a SHA512 a222fffff87d59deca9a7565185da709187a39a14256bc51c88f3c03c8e71569d20a26caf3fbb70ffea19a8452418f766f9471c5bcbfad2fc64ab40fdfbb4f52
 MISC metadata.xml 753 BLAKE2B b2ec84a2e1bb8227e1e5ffc6a33ce008456c7e858291b951bfbdf72dc3c8bbbcb9bb34f2a376aecee94d073c5f9fac81a3e0208454f688eb5cb2a554645e5166 SHA512 ef5a33e0fb26259b2caa719f246065164ee501828b583f6b54976149c5d212cc9d80f5b81b1e0ce00ed59defd61f7447bf731057c67a018936f19c6457d18076
diff --git a/dev-libs/libucl/libucl-0.8.1-r100.ebuild b/dev-libs/libucl/libucl-0.8.1-r100.ebuild
index 2eb9fa97c158..8b3e4c0b5cc2 100644
--- a/dev-libs/libucl/libucl-0.8.1-r100.ebuild
+++ b/dev-libs/libucl/libucl-0.8.1-r100.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -35,6 +35,10 @@ RDEPEND="${DEPEND}"
 
 DOCS=( README.md doc/api.md )
 
+pkg_setup() {
+	use lua && lua_pkg_setup
+}
+
 src_prepare() {
 	default
 	rm tests/schema/{definitions,ref{,Remote}}.json || die
@@ -42,8 +46,6 @@ src_prepare() {
 }
 
 src_configure() {
-	use lua && lua_setup
-
 	local myeconfargs=(
 		"$(use_enable lua)"
 		"$(use_enable regex)"
diff --git a/dev-libs/libucl/libucl-9999.ebuild b/dev-libs/libucl/libucl-9999.ebuild
index 2eb9fa97c158..8b3e4c0b5cc2 100644
--- a/dev-libs/libucl/libucl-9999.ebuild
+++ b/dev-libs/libucl/libucl-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -35,6 +35,10 @@ RDEPEND="${DEPEND}"
 
 DOCS=( README.md doc/api.md )
 
+pkg_setup() {
+	use lua && lua_pkg_setup
+}
+
 src_prepare() {
 	default
 	rm tests/schema/{definitions,ref{,Remote}}.json || die
@@ -42,8 +46,6 @@ src_prepare() {
 }
 
 src_configure() {
-	use lua && lua_setup
-
 	local myeconfargs=(
 		"$(use_enable lua)"
 		"$(use_enable regex)"
diff --git a/dev-libs/libzia/Manifest b/dev-libs/libzia/Manifest
index 166a914d432a..4d220d529af2 100644
--- a/dev-libs/libzia/Manifest
+++ b/dev-libs/libzia/Manifest
@@ -1,5 +1,7 @@
 DIST libzia-4.34.tar.gz 636031 BLAKE2B f33c13f4159fd6e6e83e3aada2560ed6f2160811eb1d94078c8792c5dfb07cc6c69f2a41f9b82ddf73b28b2cd57480590393b3c6b5ac24eece1ef40e55a52014 SHA512 a93ecea84d506767d20f03fa8b56408c6e8a0aaa4b8dad26b21e133c83a4726ebf3ca88425bc63249cb98fbd95dd3bb4d9afb8529bdd5e70fc5dbffbc6bf5533
 DIST libzia-4.36.tar.gz 637486 BLAKE2B d9872b4d3b3dea05a2b18b36fc4aeb75696d83fa98154ed716f70f9906c7cd66fe60a36dae802e2f05145c27945b9c97838b09a4414009b58caae86805e011be SHA512 4eaf2aa19bf85abf17299d70b2d9c6c15b9d99a4b62198675860fe8fedadec8deccfd5c664368a110e4c10cf2f6c936a85e7cc689d59cf03a1150f39a9164cbf
+DIST libzia-4.37.tar.gz 637291 BLAKE2B 1f221a0bf1229a2c6b863363e3634b51177a9d45a1f7b828e5fb85da3e2a9a319e5deebc3a7640ca5c4ed3004fa087b81d5a5bc59197b0ad90e161e1989c02ed SHA512 5b3a708f243ac845505645da0e2a76658775a49edfd8cbfd6fd99edd8bee13e4c54d6038ccccccd258c7a9d80943265486b01bd127a86c7c880fefc0a714cc39
 EBUILD libzia-4.34.ebuild 1190 BLAKE2B 9b6faa760f7ef5c0bd134d72a43903e927db0ba2ab9191611355ca62caa6378920e6265a217e0b85eceee7401a6faa22691b64f9125bd180d944a89474ef9d21 SHA512 4aad61f2c2bab235851613f3175f9b9789458cc911ba6e07e8d2c56e320690696c04e1138459741bb9a16667259d4ce362942c65a2235e0d8349e344993f0cbb
 EBUILD libzia-4.36.ebuild 1190 BLAKE2B 9b6faa760f7ef5c0bd134d72a43903e927db0ba2ab9191611355ca62caa6378920e6265a217e0b85eceee7401a6faa22691b64f9125bd180d944a89474ef9d21 SHA512 4aad61f2c2bab235851613f3175f9b9789458cc911ba6e07e8d2c56e320690696c04e1138459741bb9a16667259d4ce362942c65a2235e0d8349e344993f0cbb
+EBUILD libzia-4.37.ebuild 1192 BLAKE2B 096ac59fc183a8b54c86eb8c3f63fb971c05c9a7331d029f3ed102da207512a196f5c69e2f8c99a6d457e781ef621e6512fa124f6b2006b51837b3ef78155f93 SHA512 59439daca828396c5101fca4a8b6173ba53b642b70236577f3c913220041179d857f2b8ea683a2b249868074bf3cd2e8e29fa9f7de26de1241c176b6377f8ceb
 MISC metadata.xml 326 BLAKE2B 1b8ed6c9d40252f3371cf9a1ec295f593c8898dd8e45173ca05cededf987c7e44e2fafca613f8ad3022e9fbb6886d6aec2d183fd47c3064f35038784f361ebc4 SHA512 0c8a48b1101aa184dc596581feaf47463688801cb0f342177ecfb6fade1d63520ca1b9dcb278279470c181b560f555de332e4d2583e8856eec9057cde34df48f
diff --git a/dev-libs/libzia/libzia-4.37.ebuild b/dev-libs/libzia/libzia-4.37.ebuild
new file mode 100644
index 000000000000..ab1b7f2cd743
--- /dev/null
+++ b/dev-libs/libzia/libzia-4.37.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic
+
+DESCRIPTION="Platform abstraction code for tucnak package"
+HOMEPAGE="http://tucnak.nagano.cz"
+SRC_URI="http://tucnak.nagano.cz/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ftdi"
+
+RDEPEND="dev-libs/glib:2
+	x11-libs/gtk+:2
+	media-libs/libsdl
+	media-libs/libpng:0
+	ftdi? ( dev-embedded/libftdi:1 )
+	elibc_musl? ( sys-libs/libunwind )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+MAKEOPTS+=" -j1"
+
+src_prepare() {
+	eapply_user
+	sed -i -e "s/docsdir/#docsdir/g" \
+		-e "s/docs_/#docs_/g" Makefile.am || die
+
+	# Fix QA-Warning "QA Notice: pkg-config files with wrong LDFLAGS detected"
+	sed -i -e 's/@LDFLAGS@//' libzia.pc.in || die
+
+	# fix build for MUSL (bug #832235)
+	if use elibc_musl ; then
+		sed -i -e "s/ backtrace(/ unw_backtrace(/" src/zbfd.c || die
+	fi
+	eautoreconf
+}
+
+src_configure() {
+	use elibc_musl && append-libs -lunwind
+	econf \
+		$(use_with ftdi) --with-sdl \
+		--with-png --without-bfd \
+		--disable-static
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	find "${D}" -name '*.la' -type f -delete || die
+}
diff --git a/dev-libs/mmtf-cpp/Manifest b/dev-libs/mmtf-cpp/Manifest
index f6c5f24656bf..c234d955c66e 100644
--- a/dev-libs/mmtf-cpp/Manifest
+++ b/dev-libs/mmtf-cpp/Manifest
@@ -1,3 +1,5 @@
 DIST mmtf-cpp-1.0.0.tar.gz 59363 BLAKE2B afcb03ce1f83e10348b148bd6218e5e10ab3e425b0f8105d292f9e265800ea6ca4562dc11fa4453df05d8a698576fba9dfe982aa91a8dcc1983480c0c52dbcf7 SHA512 0e502ae76e31689d440bff2fbc90fdab7ff62d5369e26f7ab2836966a30bda72625d6d5da33bc0770cf471a1549a02f7478ea16a01dd6be2809568d8daecb073
+DIST mmtf-cpp-1.1.0.tar.gz 106527 BLAKE2B 46f7b44ca6d9096b1f6c7911121d54ab50889c884156724229912bb125492682435d05d93b55b0c8c8025f293eb23f537da4f01a42fe65f4f89270e49429fce7 SHA512 91f30ac1031d71a5358fd83bf864afdac1d1ea758d775811b94a2609be286fcbb7dcfece097c6959afb4f8f9d237b7372183424d4ef211364cc69c08f2cd6e52
 EBUILD mmtf-cpp-1.0.0-r1.ebuild 476 BLAKE2B 41ab5557ca52751a77aab013709b3e9b0897e248b902b36c3f3acccfc38b1c49a2ad2f039969275208f40d7bf767c4b904adbdb401fe1cfb7fe939506e7bdae2 SHA512 a1099655707c9c1d6eb24b812bab09b379f86a7cf649510977daf33f9d8d17d31facea0ab7926b112a5f6c3236259a12bf8b2bfa2df3db3a2c66c18d1c1b2f9d
+EBUILD mmtf-cpp-1.1.0.ebuild 476 BLAKE2B 41ab5557ca52751a77aab013709b3e9b0897e248b902b36c3f3acccfc38b1c49a2ad2f039969275208f40d7bf767c4b904adbdb401fe1cfb7fe939506e7bdae2 SHA512 a1099655707c9c1d6eb24b812bab09b379f86a7cf649510977daf33f9d8d17d31facea0ab7926b112a5f6c3236259a12bf8b2bfa2df3db3a2c66c18d1c1b2f9d
 MISC metadata.xml 441 BLAKE2B b55284cf0df7ee0750b0a2058b95ee0e83b556cacf506d41f8c58c5f4ae6e283f61b288bf2b5f00d86f4636e1ea2f9c1824524db83d3ddcc77c10e0fb0452ec7 SHA512 c7d481aa61f4a5fa627e72bc2307eec74e1bbfcc70efa6b1ff6132ced2df8d9b55d5710a78bac639c09375d2314a74dd9e46e20a9058aceb2b7e3b85cf8c3f35
diff --git a/dev-libs/mmtf-cpp/mmtf-cpp-1.1.0.ebuild b/dev-libs/mmtf-cpp/mmtf-cpp-1.1.0.ebuild
new file mode 100644
index 000000000000..c31d0595eb2f
--- /dev/null
+++ b/dev-libs/mmtf-cpp/mmtf-cpp-1.1.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 2019-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="The pure C++ implementation of the MMTF API, decoder and encoder"
+HOMEPAGE="https://github.com/rcsb/mmtf-cpp"
+SRC_URI="https://github.com/rcsb/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE=""
+
+DEPEND="dev-libs/msgpack"
+RDEPEND="${DEPEND}"
+BDEPEND=""
diff --git a/dev-libs/nss-pem/Manifest b/dev-libs/nss-pem/Manifest
index 722a29a17386..c70e08188fbe 100644
--- a/dev-libs/nss-pem/Manifest
+++ b/dev-libs/nss-pem/Manifest
@@ -1,3 +1,3 @@
 DIST nss-pem-1.0.8.tar.xz 41840 BLAKE2B 6a210517b6f70a6a1a0351970811500c1364c6cbb0159dc4b7b3edeff7c01d3b643a5a4a4946a350a1a49898570141acda1e913fdc79d750339f5021445e61c7 SHA512 9fd1fa9203fd707668506752be6f99d26e53281b8b95d7c3020da33ab8cb287890b66c8a59f1ee952fe8d2a8a350d7c5b4214a523a2e1762e48989f02c408b33
-EBUILD nss-pem-1.0.8.ebuild 700 BLAKE2B b7db56bb728f9b996a002187424e744d070b0262ad4c11133b8afb16b6c97192fcd875734fdb5e995abaaeb28d1b68bafa90508dcbe8e8c20773da5f262996ca SHA512 62fe4052585e305760444ff6912aa43f2ee083aad467b30646131fb09241ae623f73d863455007f766d7cf3587b9f5348d47121c2b1a04f00843bdd3664335a3
+EBUILD nss-pem-1.0.8.ebuild 701 BLAKE2B 08f228e27e37891dd1367204e0369bf905211d18e3454264da193055b2f9364cbcd4488a16fbc0f110896e751545a150bbcabf6f4de7f4e7595247634f02032a SHA512 943a41c06e0a668e80dca170c4e2535a54b84a74b94857aa6503206ba400c2846eba6d8f6ab1d0a481a69a5b0cf21755a64ce7ad7a3dfdb6dc16e7c5570689d7
 MISC metadata.xml 334 BLAKE2B 7d88d82ca4bedbacb87ab53bc2a30e77ab13b062c439dacd1521f68a5677bad460310abf9f1e69826c44eaee4cade54bdb0d30923a7d2dfef9eaa4554288498e SHA512 c1a58a0c5e2401a1b75e4223f2cc6e0a25e8a3ead8c5c3f86cf96675ecf3dd813d0db4652fb6c68e0acbffa62ca6e4123dc74a4f565345cb1bba79e033b41922
diff --git a/dev-libs/nss-pem/nss-pem-1.0.8.ebuild b/dev-libs/nss-pem/nss-pem-1.0.8.ebuild
index 7e08b6ffcc78..7ebc9d0946a4 100644
--- a/dev-libs/nss-pem/nss-pem-1.0.8.ebuild
+++ b/dev-libs/nss-pem/nss-pem-1.0.8.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 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-solaris"
 IUSE=""
 
 BDEPEND=" >=dev-libs/nss-3.50-r1 "
diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest
index d8c9dd6e04b1..37610b8f7ca3 100644
--- a/dev-libs/nss/Manifest
+++ b/dev-libs/nss/Manifest
@@ -1,13 +1,10 @@
 AUX nss-3.21-gentoo-fixup-warnings.patch 178 BLAKE2B b51f80310db3db416d8aeaf9117ef801389b5b2df47c04aff51bf0759dd5bff41b09d1e9011f99b345d5769a3aab19acb943ee97f8437465518115f6902a0da1 SHA512 7667a020311ca11e8f1836bc146e4a3c94ff2a489882dbe87debcccfeaafeb50e6607574c64254a826b4b6f0bb436b310a3386fff4a58324f0e5e58debaa9d51
 AUX nss-3.23-hppa-byte_order.patch 460 BLAKE2B 97358cc8fbea0b0d3beee0697833e48ef01039ceb08fd00792a7f7ef68409eb076022c03764ab079fdaa971a0358130002fa11c0c182ebeb33dcdf660be26408 SHA512 ad0097bb6cf409d61eb28202d7460c87e983d6db977aba38ff9ef2749b3f7bb8fdadce4174f5bf806350ae33733097a1f444792d31cc43574b28341893642e5a
 AUX nss-3.53-gentoo-fixups.patch 6886 BLAKE2B 1c605d8db02ebe0492c41955207368197a79990e43e219a71962cb28ac0cecd9e0acc2b76e16f5b116fdb8bf8790d96046cb4f376df9b8634ac48e54924589f8 SHA512 51031f92519f57d4b57a547cf549f2d5da1c5a7212d4b304fb0d71d6a85a5aefd64724ec9075c14c9b49c1e99c3ffe91cbec501c3504985aa9b16eacf2aa15ed
-AUX nss-3.68-ld-fix.patch 1059 BLAKE2B ea449bf15d603e970468f1349a32804403036300c33bb77909d9752f069b2b8bc5bb3ddc3da286b5f0d4f3901c990af6ad308f7b5523103e35d72cfe18e031c2 SHA512 b3f39cb0c9d91968b3dd45fbdbd4de841e17e9b97790c574d8dc6a43e8fa59f3add77125c1117092d4600ea6a89659b0a8a26ff00cdb92165d107f47372ef862
 AUX nss-3.79-gcc-13.patch 1058 BLAKE2B d0249304f09fdea7e391732e7da63344c3e29c1856cb5ddb9e55a27305ab050077d138d9a8fdfbd6573bd7e7a345ed39f506e534464c3caaae925d1717b75edb SHA512 24dd41401b44ce86498a9b42f96068dbf58c6814ab18453db0615d49bdf327610a1ee2b0e32a2905a1c34364abd8d4c162a179f6b57cac19068babebbed229b4
-DIST nss-3.68.4.tar.gz 82409303 BLAKE2B a3cf572e82ce29dbc77e9356e0db425170f7294f1468755843746539663fe486089660e1c1b379d0184003d9ccf57db6cf0b2c161d7038301c1cb5028175b16d SHA512 f97b63a9f8218f8fbd7b5d48c084b8166366d02cd50aac69a22d56324d2fea01c49d074e51430bd128f510c733085f3f43c9739ce4073a07a5666675e0ef3b15
 DIST nss-3.79.1.tar.gz 84694831 BLAKE2B 209a502ba4b808bb4cb9b8775328fa26e36c55147ee5da7b8f661349129250f09685dd69919e24d7ff72cc55a2e9cbbbc9c059e543cf1b0a6a08e809be262d4c SHA512 e841efe9d0300d99b50e54c159c75df76c09c34c74bbc9b6ca007ad017b2cb91a8d33f6f4195e52bd8f3ed7be5d53f3ce7ce10825fa21abbf5dbba3db109e037
 DIST nss-3.84.tar.gz 84851235 BLAKE2B 5dead5ae336998db97acc6dc2a59b387aac9baeba0f2fad6eaf921bdc894867f6177179545378091d9b50b295b71409781b5ef5044222afe7a1cd2f920a7d15f SHA512 b4ed4b2e44d9f896a4a4c33f92813a84825dc4502f4e14e047f3583666c453138515e6edbcd71144c4b02a8ee16b3443803f1ff12458fd82c338ee1dd911b175
 DIST nss-cacert-class1-class3-r2.patch 21925 BLAKE2B 7627ff9a09f084c19d72d0490676865e3cab3ca7c920ae1ce4bea2db664f37fd0aa84fcda919809a516891ab2a62e2e7a43a9d6ada4c231adfe4c216525fac7d SHA512 1ce6ff9ab310aaca9005eafb461338b291df8523cc7044e096cd75774ce746c26eed19ec6bb2643c6c67f94650f2f309463492d80a90568f38ce2557f8ada2f4
-EBUILD nss-3.68.4.ebuild 9328 BLAKE2B 5883d294203e24b15b927cf60dd90b5a9b4666b26d5a8591ccbf248b99bf82da2866383de792c1bb5af794cb73fc7be73ead212cb3193ef98198509e061010d3 SHA512 0bb43a21931d5a3bd8ff9146ed4c63ad1d3d76075bb27eb25ed97fd3825dbd436576fc71387a6633961ad15bf03bfd37b315094cb2551073ca331187a55572c7
 EBUILD nss-3.79.1.ebuild 10473 BLAKE2B 617a363bef0b4cf1109d7df69c6d130799388ea6bea750d6274ab20bc8b5f05ce747ae8c77795fa0c777d7edd9736044e1f2f8a2ee605102fa078425a9b92a6e SHA512 167e811b1e830290f77c773080fc714a806c7b15d3e698077d4432b1d81fe470c8317738e3f27c581a77b9c5fe88396f371a96c2d4f5e3a0253f64ee4c44a0f1
 EBUILD nss-3.84.ebuild 10490 BLAKE2B 977e8bfcd32f8124301da413077b763b12a1083177cd677c03b03405f21284271c54dfe9e52941d067a64dc45a44e197a99c19ccf356a12834219413f7a0d900 SHA512 0aa16c52712cddb4d5a9552bf30c2af8df95b1edca389b98d2680adba219c1d015673cbf81fc0a3ec469c038a27ac8435d99ae8c521bc868f39a8b719bbb07e9
 MISC metadata.xml 517 BLAKE2B 85fba14d0b8a3539c57b8dca15a0f7789bb78a92891ff39271f804fa07b1620f5f3ece89269e3305b578064a53aeae7ab298bb97cdc019f41793888d42159727 SHA512 7b1fba5488498d5499134f1b58ecaa01cb8c51af3da666d55fba3884703d34efb57b449e76461fb6e13c37687bf5125c5dbab1934a950d4d13c0cff5a3b3318e
diff --git a/dev-libs/nss/files/nss-3.68-ld-fix.patch b/dev-libs/nss/files/nss-3.68-ld-fix.patch
deleted file mode 100644
index ecdbdeebd4cf..000000000000
--- a/dev-libs/nss/files/nss-3.68-ld-fix.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 3cba2869869c8480605f7ffcc41d2e4bae1b31c8 Mon Sep 17 00:00:00 2001
-From: Zi Lin <lziest@google.com>
-Date: Wed, 9 Mar 2022 19:14:16 +0000
-Subject: [PATCH] Use $(LD) instead of 'ld' for cross-platform compilation
-
----
- coreconf/Linux.mk | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff -Naur a/coreconf/Linux.mk b/coreconf/Linux.mk
---- a/coreconf/Linux.mk	2022-03-03 12:18:53.000000000 +0200
-+++ b/coreconf/Linux.mk	2022-03-29 08:59:10.157349449 +0300
-@@ -6,6 +6,7 @@
- CC     ?= gcc
- CCC    ?= g++
- RANLIB ?= ranlib
-+LD     ?= ld
- 
- include $(CORE_DEPTH)/coreconf/UNIX.mk
- 
-@@ -157,7 +158,7 @@
- # Also, -z defs conflicts with Address Sanitizer, which emits relocations
- # against the libsanitizer runtime built into the main executable.
- ZDEFS_FLAG		= -Wl,-z,defs
--DSO_LDOPTS		+= $(if $(findstring 2.11.90.0.8,$(shell ld -v)),,$(ZDEFS_FLAG))
-+DSO_LDOPTS		+= $(if $(findstring 2.11.90.0.8,$(shell $(LD) -v)),,$(ZDEFS_FLAG))
- LDFLAGS			+= $(ARCHFLAG) -z noexecstack
- 
- # On Maemo, we need to use the -rpath-link flag for even the standard system
diff --git a/dev-libs/nss/nss-3.68.4.ebuild b/dev-libs/nss/nss-3.68.4.ebuild
deleted file mode 100644
index a3ff3dba2827..000000000000
--- a/dev-libs/nss/nss-3.68.4.ebuild
+++ /dev/null
@@ -1,362 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic multilib toolchain-funcs multilib-minimal
-
-NSPR_VER="4.32"
-RTM_NAME="NSS_${PV//./_}_RTM"
-
-DESCRIPTION="Mozilla's Network Security Services library that implements PKI support"
-HOMEPAGE="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS"
-SRC_URI="https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/${P}.tar.gz
-	cacert? ( https://dev.gentoo.org/~whissi/dist/ca-certificates/nss-cacert-class1-class3-r2.patch )"
-
-LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-IUSE="cacert utils cpu_flags_ppc_altivec cpu_flags_ppc_vsx"
-# pkg-config called by nss-config -> virtual/pkgconfig in RDEPEND
-RDEPEND="
-	>=dev-libs/nspr-${NSPR_VER}[${MULTILIB_USEDEP}]
-	>=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-	virtual/pkgconfig
-"
-DEPEND="${RDEPEND}"
-BDEPEND="dev-lang/perl"
-
-RESTRICT="test"
-
-S="${WORKDIR}/${P}/${PN}"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/nss-config
-)
-
-PATCHES=(
-	# Custom changes for gentoo
-	"${FILESDIR}/${PN}-3.53-gentoo-fixups.patch"
-	"${FILESDIR}/${PN}-3.21-gentoo-fixup-warnings.patch"
-	"${FILESDIR}/${PN}-3.23-hppa-byte_order.patch"
-	"${FILESDIR}/nss-3.68-ld-fix.patch"
-)
-
-src_prepare() {
-	default
-
-	if use cacert ; then
-		eapply -p2 "${DISTDIR}"/nss-cacert-class1-class3-r2.patch
-	fi
-
-	pushd coreconf >/dev/null || die
-	# hack nspr paths
-	echo 'INCLUDES += -I$(DIST)/include/dbm' \
-		>> headers.mk || die "failed to append include"
-
-	# modify install path
-	sed -e '/CORE_DEPTH/s:SOURCE_PREFIX.*$:SOURCE_PREFIX = $(CORE_DEPTH)/dist:' \
-		-i source.mk || die
-
-	# Respect LDFLAGS
-	sed -i -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' rules.mk
-	popd >/dev/null || die
-
-	# Fix pkgconfig file for Prefix
-	sed -i -e "/^PREFIX =/s:= /usr:= ${EPREFIX}/usr:" \
-		config/Makefile || die
-
-	# use host shlibsign if need be #436216
-	if tc-is-cross-compiler ; then
-		sed -i \
-			-e 's:"${2}"/shlibsign:shlibsign:' \
-			cmd/shlibsign/sign.sh || die
-	fi
-
-	# dirty hack
-	sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../freebl/\$(OBJDIR):" \
-		lib/ssl/config.mk || die
-	sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../../lib/freebl/\$(OBJDIR):" \
-		cmd/platlibs.mk || die
-
-	multilib_copy_sources
-
-	strip-flags
-}
-
-multilib_src_configure() {
-	# Ensure we stay multilib aware
-	sed -i -e "/@libdir@/ s:lib64:$(get_libdir):" config/Makefile || die
-}
-
-nssarch() {
-	# Most of the arches are the same as $ARCH
-	local t=${1:-${CHOST}}
-	case ${t} in
-		*86*-pc-solaris2*) echo "i86pc"   ;;
-		aarch64*)          echo "aarch64" ;;
-		hppa*)             echo "parisc"  ;;
-		i?86*)             echo "i686"    ;;
-		x86_64*)           echo "x86_64"  ;;
-		*)                 tc-arch ${t}   ;;
-	esac
-}
-
-nssbits() {
-	local cc cppflags="${1}CPPFLAGS" cflags="${1}CFLAGS"
-	if [[ ${1} == BUILD_ ]]; then
-		cc=$(tc-getBUILD_CC)
-	else
-		cc=$(tc-getCC)
-	fi
-	echo > "${T}"/test.c || die
-	${cc} ${!cppflags} ${!cflags} -c "${T}"/test.c -o "${T}/${1}test.o" || die
-	case $(file "${T}/${1}test.o") in
-		*32-bit*x86-64*) echo USE_X32=1;;
-		*64-bit*|*ppc64*|*x86_64*) echo USE_64=1;;
-		*32-bit*|*ppc*|*i386*) ;;
-		*) die "Failed to detect whether ${cc} builds 64bits or 32bits, disable distcc if you're using it, please";;
-	esac
-}
-
-multilib_src_compile() {
-	# use ABI to determine bit'ness, or fallback if unset
-	local buildbits mybits
-	case "${ABI}" in
-		n32) mybits="USE_N32=1";;
-		x32) mybits="USE_X32=1";;
-		s390x|*64) mybits="USE_64=1";;
-		${DEFAULT_ABI})
-			einfo "Running compilation test to determine bit'ness"
-			mybits=$(nssbits)
-			;;
-	esac
-	# bitness of host may differ from target
-	if tc-is-cross-compiler; then
-		buildbits=$(nssbits BUILD_)
-	fi
-
-	local makeargs=(
-		CC="$(tc-getCC)"
-		CCC="$(tc-getCXX)"
-		AR="$(tc-getAR) rc \$@"
-		RANLIB="$(tc-getRANLIB)"
-		OPTIMIZER=
-		${mybits}
-	)
-
-	# Take care of nspr settings #436216
-	local myCPPFLAGS="${CPPFLAGS} $($(tc-getPKG_CONFIG) nspr --cflags)"
-	unset NSPR_INCLUDE_DIR
-
-	export NSS_ALLOW_SSLKEYLOGFILE=1
-	export NSS_ENABLE_WERROR=0 #567158
-	export BUILD_OPT=1
-	export NSS_USE_SYSTEM_SQLITE=1
-	export NSDISTMODE=copy
-	export FREEBL_NO_DEPEND=1
-	export FREEBL_LOWHASH=1
-	export NSS_SEED_ONLY_DEV_URANDOM=1
-	export USE_SYSTEM_ZLIB=1
-	export ZLIB_LIBS=-lz
-	export ASFLAGS=""
-	# Fix build failure on arm64
-	export NS_USE_GCC=1
-	# Detect compiler type and set proper environment value
-	if tc-is-gcc; then
-		export CC_IS_GCC=1
-	elif tc-is-clang; then
-		export CC_IS_CLANG=1
-	fi
-
-	# explicitly disable altivec/vsx if not requested
-	# https://bugs.gentoo.org/789114
-	case ${ARCH} in
-		ppc*)
-			use cpu_flags_ppc_altivec || export NSS_DISABLE_ALTIVEC=1
-			use cpu_flags_ppc_vsx || export NSS_DISABLE_CRYPTO_VSX=1
-			;;
-	esac
-
-	local d
-
-	# Build the host tools first.
-	LDFLAGS="${BUILD_LDFLAGS}" \
-	XCFLAGS="${BUILD_CFLAGS}" \
-	NSPR_LIB_DIR="${T}/fakedir" \
-	emake -j1 -C coreconf \
-		CC="$(tc-getBUILD_CC)" \
-		${buildbits-${mybits}}
-	makeargs+=( NSINSTALL="${PWD}/$(find -type f -name nsinstall)" )
-
-	# Then build the target tools.
-	for d in . lib/dbm ; do
-		CPPFLAGS="${myCPPFLAGS}" \
-		XCFLAGS="${CFLAGS} ${CPPFLAGS}" \
-		NSPR_LIB_DIR="${T}/fakedir" \
-		emake -j1 "${makeargs[@]}" -C ${d} OS_TEST="$(nssarch)"
-	done
-}
-
-# Altering these 3 libraries breaks the CHK verification.
-# All of the following cause it to break:
-# - stripping
-# - prelink
-# - ELF signing
-# http://www.mozilla.org/projects/security/pki/nss/tech-notes/tn6.html
-# Either we have to NOT strip them, or we have to forcibly resign after
-# stripping.
-#local_libdir="$(get_libdir)"
-#export STRIP_MASK="
-#	*/${local_libdir}/libfreebl3.so*
-#	*/${local_libdir}/libnssdbm3.so*
-#	*/${local_libdir}/libsoftokn3.so*"
-
-export NSS_CHK_SIGN_LIBS="freebl3 nssdbm3 softokn3"
-
-generate_chk() {
-	local shlibsign="$1"
-	local libdir="$2"
-	einfo "Resigning core NSS libraries for FIPS validation"
-	shift 2
-	local i
-	for i in ${NSS_CHK_SIGN_LIBS} ; do
-		local libname=lib${i}.so
-		local chkname=lib${i}.chk
-		"${shlibsign}" \
-			-i "${libdir}"/${libname} \
-			-o "${libdir}"/${chkname}.tmp \
-		&& mv -f \
-			"${libdir}"/${chkname}.tmp \
-			"${libdir}"/${chkname} \
-		|| die "Failed to sign ${libname}"
-	done
-}
-
-cleanup_chk() {
-	local libdir="$1"
-	shift 1
-	local i
-	for i in ${NSS_CHK_SIGN_LIBS} ; do
-		local libfname="${libdir}/lib${i}.so"
-		# If the major version has changed, then we have old chk files.
-		[ ! -f "${libfname}" -a -f "${libfname}.chk" ] \
-			&& rm -f "${libfname}.chk"
-	done
-}
-
-multilib_src_install() {
-	pushd dist >/dev/null || die
-
-	dodir /usr/$(get_libdir)
-	cp -L */lib/*$(get_libname) "${ED}"/usr/$(get_libdir) || die "copying shared libs failed"
-	local i
-	for i in crmf freebl nssb nssckfw ; do
-		cp -L */lib/lib${i}.a "${ED}"/usr/$(get_libdir) || die "copying libs failed"
-	done
-
-	# Install nss-config and pkgconfig file
-	dodir /usr/bin
-	cp -L */bin/nss-config "${ED}"/usr/bin || die
-	dodir /usr/$(get_libdir)/pkgconfig
-	cp -L */lib/pkgconfig/nss.pc "${ED}"/usr/$(get_libdir)/pkgconfig || die
-
-	# create an nss-softokn.pc from nss.pc for libfreebl and some private headers
-	# bug 517266
-	sed 	-e 's#Libs:#Libs: -lfreebl#' \
-		-e 's#Cflags:#Cflags: -I${includedir}/private#' \
-		*/lib/pkgconfig/nss.pc >"${ED}"/usr/$(get_libdir)/pkgconfig/nss-softokn.pc \
-		|| die "could not create nss-softokn.pc"
-
-	# all the include files
-	insinto /usr/include/nss
-	doins public/nss/*.{h,api}
-	insinto /usr/include/nss/private
-	doins private/nss/{blapi,alghmac,cmac}.h
-
-	popd >/dev/null || die
-
-	local f nssutils
-	# Always enabled because we need it for chk generation.
-	nssutils=( shlibsign )
-
-	if multilib_is_native_abi ; then
-		if use utils; then
-			# The tests we do not need to install.
-			#nssutils_test="bltest crmftest dbtest dertimetest
-			#fipstest remtest sdrtest"
-			# checkcert utils has been removed in nss-3.22:
-			# https://bugzilla.mozilla.org/show_bug.cgi?id=1187545
-			# https://hg.mozilla.org/projects/nss/rev/df1729d37870
-			# certcgi has been removed in nss-3.36:
-			# https://bugzilla.mozilla.org/show_bug.cgi?id=1426602
-			nssutils+=(
-				addbuiltin
-				atob
-				baddbdir
-				btoa
-				certutil
-				cmsutil
-				conflict
-				crlutil
-				derdump
-				digest
-				makepqg
-				mangle
-				modutil
-				multinit
-				nonspr10
-				ocspclnt
-				oidcalc
-				p7content
-				p7env
-				p7sign
-				p7verify
-				pk11mode
-				pk12util
-				pp
-				rsaperf
-				selfserv
-				signtool
-				signver
-				ssltap
-				strsclnt
-				symkeyutil
-				tstclnt
-				vfychain
-				vfyserv
-			)
-			# install man-pages for utils (bug #516810)
-			doman doc/nroff/*.1
-		fi
-		pushd dist/*/bin >/dev/null || die
-		for f in ${nssutils[@]}; do
-			dobin ${f}
-		done
-		popd >/dev/null || die
-	fi
-}
-
-pkg_postinst() {
-	multilib_pkg_postinst() {
-		# We must re-sign the libraries AFTER they are stripped.
-		local shlibsign="${EROOT}/usr/bin/shlibsign"
-		# See if we can execute it (cross-compiling & such). #436216
-		"${shlibsign}" -h >&/dev/null
-		if [[ $? -gt 1 ]] ; then
-			shlibsign="shlibsign"
-		fi
-		generate_chk "${shlibsign}" "${EROOT}"/usr/$(get_libdir)
-	}
-
-	multilib_foreach_abi multilib_pkg_postinst
-}
-
-pkg_postrm() {
-	multilib_pkg_postrm() {
-		cleanup_chk "${EROOT}"/usr/$(get_libdir)
-	}
-
-	multilib_foreach_abi multilib_pkg_postrm
-}
diff --git a/dev-libs/poco/Manifest b/dev-libs/poco/Manifest
index ce996c1efd57..ee780f1c01bf 100644
--- a/dev-libs/poco/Manifest
+++ b/dev-libs/poco/Manifest
@@ -3,6 +3,6 @@ DIST poco-1.10.1.tar.gz 10224204 BLAKE2B 644bb2134c571e10b63937ca15b3f5d7255767b
 DIST poco-1.11.2.tar.gz 10935312 BLAKE2B 66b4cdb6cb4b5dd4f5f0eee744e1d147d66e98561ec4286ed09693b638d565fbf084c3e40eff3f6a9a88cff167b1d774da08e8c8424986aefe13d029a540afe2 SHA512 3f9e46dbfb0a85f19389b269725cb6272172d993d8239f13da8110c0c6ce9ed2b6595708d5dba91a027292c74358c87da988e22587a74011e84707816a6a277c
 DIST poco-1.12.2.tar.gz 11268579 BLAKE2B fe23216884d1effb7e93072c5e90d5eabf813c6cf0326af5c4b6d3646d54e5411966485e97d50960df97cd545b3a265eb4b43c1cb041ff97b4457f53f6bd06bc SHA512 86b6b106e9a677397c73139e949a65925e78611cad478fc4206a6a7365613307fc1549b1160faf6ca8f02fb7f7ae58858c3913cb701111b7cbb5ffcbe5363bb3
 EBUILD poco-1.10.1.ebuild 3785 BLAKE2B ca9eeac5cedc288c23fef5400d2428704b09aa707fcdbe02d12d9905caf3d72beed144a1588e6a440c66f59751f7b7e3d9e81cbcc86acbfaee0dd27222e54028 SHA512 f67bb94b6b08ed7f5d17d3c3b6f7186d7d7bd834bb8eedf1db045e001d683ac8ddc3be94ef3e2e1e0a27c65ee5b88525e46208907dfda88c7b17fa5d4c1261d6
-EBUILD poco-1.11.2-r1.ebuild 3966 BLAKE2B d54937ba2a1ae9b4be1f088ccef16d9b8b2f3be4529587bfbc952621320d0e24a7d1ace74d714bac515b7aa61f61893fcdccb868e57b51fc7b7a01a50a795bae SHA512 593ceca2bfc3a990dfb7d3a11b53c5248cd5f803e7a55f2a9fd222891b6f8cbcc8a40bd14708051df9d75beef93f4787ad0b970752b317f1f3c9931c70acfffa
+EBUILD poco-1.11.2-r1.ebuild 3964 BLAKE2B ac053087d7eeca9274152973fd7a9a2ed21ac99c7c6aa5b85dce4667f9063e8c93c177a7ce0ef678950a80a17e8001ff8a497a367e3f57411501ef73192cc1f8 SHA512 950f19be0ef462fc7312f4c1bb2d2f74e3e15766d8c1345ae884219415df01b00b76fba3ac8110183e73908be848d4259a6c31633275de27981836afffd7a180
 EBUILD poco-1.12.2.ebuild 3970 BLAKE2B ba2c33b9dc9eb551259ba89b6371c5bdb1fe8db14bf767e6578bc19b4cf3ef0749f0211456a0e75b9c2699995257a6956cd1932440b1f85e091e8eee8ef06855 SHA512 36b0ea3cd6c5fe321f284f7da5ef9ef250a3f244e19c4e6201ab4350d2a1b443a4614c63008315f1edff8a5cf96d576f2504c3c872a289fe15cbc38f4deede8c
 MISC metadata.xml 2718 BLAKE2B 12755bed35c458a4e7e5d7c66681970d533e9c2bf9222e4a0599769251ef9b9c252be48e8e0155b32f69769e200cf1fb14435020cfd57937a50b290d719c586c SHA512 2688e2a138ab997e70fd21f8dab00aa60513cb9fa8112f690570fe3059be3084610cff97d11262900c6907fdde69b5a12e7cbe81266f7ac76c44966b16b12313
diff --git a/dev-libs/poco/poco-1.11.2-r1.ebuild b/dev-libs/poco/poco-1.11.2-r1.ebuild
index 8eaeb3549134..e9754d726988 100644
--- a/dev-libs/poco/poco-1.11.2-r1.ebuild
+++ b/dev-libs/poco/poco-1.11.2-r1.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}-${P}-release"
 
 LICENSE="Boost-1.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc64 x86"
 IUSE="7z activerecord cppparser +crypto +data examples +file2pagecompiler iodbc +json mariadb +mongodb mysql +net odbc +pagecompiler pdf pocodoc sqlite +ssl test +util +xml +zip"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="
diff --git a/dev-libs/ppl/Manifest b/dev-libs/ppl/Manifest
index 31e19d11757f..889ec0de0e7e 100644
--- a/dev-libs/ppl/Manifest
+++ b/dev-libs/ppl/Manifest
@@ -3,6 +3,5 @@ AUX disable-mipproblem2.patch 1098 BLAKE2B b15da536e0e46a2edbec44e4c68a97e57b96d
 AUX fix-clang-build.patch 1546 BLAKE2B ba0557f5cb36defa21cc5afdfa8d65bda9fe2a3b8d6262609eccf70e29f6442a7b261b22ffc112ff30cfddc0b8f2a80ffd787d2e9f14f8bb1ba35c095110d695 SHA512 d802c597e408ca50fe01e240c868b2fb5cc2ca3ff00cf15ff1de1c1dc5d0cf0b88da25de0d1151f8011e331f85e343348150285bb515c9ffc17806ff4edd082d
 DIST ppl-1.2-r3-disable-boeing-tests.patch 21485 BLAKE2B e68bab59710c63726f04a139e84d72b277e85625bc405c594a22c005186a2c3aae3850e17b81d38fa0231dcfd08454d488bbad2474ed810be78ef646d9c92559 SHA512 fc8dc020e493e5726167741d1548c661bac07991a982bf09ff61f593adfd2faf723886cbcb16d741db61e46530c4dddf49b6b61b67fef7d5ac15ca577c7fc46d
 DIST ppl-1.2.tar.xz 14136236 BLAKE2B 060b73384dac558dc8b2b0f1027ed0aa270b0adf0992c2ca1a281fa7bcdf959cba3a9e8ee29e978d12c3eee606b819075c5bcab59f4aed24fbf1c5512b5e2c36 SHA512 b509ed85fa6aedd40119bd4c980b17f33072c56c2acd923da3445b6bc80d48051cfa4c04cce96f6974711f5279c24b31cb3869f87b2eb6a2a1b30a058c809350
-EBUILD ppl-1.2-r4.ebuild 1807 BLAKE2B 366052cd9d0fe920886556a93f525df1cb700cca0954ed591a447337f9d25b3f355bfb838536547c1b29f7fbf71c5afafa32d3588bfd70e66db483dd28d75146 SHA512 e2fa2d70907fc818de1b2299529f3ccf36901d760cf73f85f3430cbd1ce9d4aa611acb373b162da4001a263661b851a24badf253dfd973ea59a4eaace10bd936
-EBUILD ppl-1.2-r5.ebuild 1801 BLAKE2B 62690abdced77d9f0f9c2417e889f144140b5f6af9e30743082e5fbdac8ac18e814586aa7c475ffde74c8ac09782d8fc31ac71a76ee86d3e9504a87e4d8d2cc2 SHA512 1534c9d8896b91d8c1a6fd931de2ef7ed90d54561c5c8025d530ae6cb3f7ea202dcb8eae688e2edf0f2723eb5f9edd5b43bb6a5aa0bb334cecf14e0b40ef934f
+EBUILD ppl-1.2-r5.ebuild 1799 BLAKE2B ff7b3f384dd3fedeaf0046e09fb139c66efb7b484a20e096765243cee394f004d7d5ef7c953b891c3022a8daa91a5d71e51c033564b698fcaab04e21482ec52e SHA512 df9f91a36bf84ea50b23b0efe884e843e614e2ea4722fecb64f493fb2cd4835d8d1e5f3bf826ef1f155e5581343b09b6150772ded0a2694da7eb3060d02b331e
 MISC metadata.xml 890 BLAKE2B ff950fbc0699a9817b2b364e5e4d21aa8d60d40608c8e6ef322e25474c4e528573063e8f62a733e8df3312afbbd8648f5d5bd8de6aa09b1a3cae7cd46fe81a05 SHA512 32ac8e0aca7d550a2a485f6c354e0a71409a3a8c80202609b864e7ceda023d86560787e9c6d38d67276816fadb1126dbf57ff67a0acc247b2833cee85af8c79d
diff --git a/dev-libs/ppl/ppl-1.2-r4.ebuild b/dev-libs/ppl/ppl-1.2-r4.ebuild
deleted file mode 100644
index 6ce0fa97ee98..000000000000
--- a/dev-libs/ppl/ppl-1.2-r4.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="The Parma Polyhedra Library for numerical analysis of complex systems"
-HOMEPAGE="http://bugseng.com/products/ppl"
-SRC_URI="http://bugseng.com/products/ppl/download/ftp/releases/${PV}/${P}.tar.xz
-	https://dev.gentoo.org/~juippis/distfiles/tmp/ppl-1.2-r3-disable-boeing-tests.patch"
-
-LICENSE="GPL-3"
-SLOT="0/4.14" # SONAMEs
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~sparc-solaris"
-IUSE="cdd +cxx doc lpsol pch static-libs test"
-
-RDEPEND=">=dev-libs/gmp-6[cxx(+)]
-	lpsol? ( sci-mathematics/glpk )"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	sys-devel/m4"
-
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}/disable-mipproblem2.patch"
-	"${FILESDIR}/disable-containsintegerpoint1.patch"
-	"${DISTDIR}/ppl-1.2-r3-disable-boeing-tests.patch"
-	"${FILESDIR}/fix-clang-build.patch"
-)
-
-src_prepare() {
-	default
-
-	# The patch should do this, but then the diff makes it run
-	# afoul of the Gentoo patch size limit.
-	rm demos/ppl_lpsol/examples/boeing[12].mps || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local interfaces=( c )
-	use cxx && interfaces+=( cxx )
-	econf \
-		--disable-debugging \
-		--disable-optimization \
-		$(use_enable doc documentation) \
-		$(use_enable cdd ppl_lcdd) \
-		$(use_enable lpsol ppl_lpsol) \
-		$(use_enable pch) \
-		$(use_enable static-libs static) \
-		--enable-interfaces="${interfaces[*]}" \
-		$(use test && echo --enable-check=quick)
-}
-
-src_install() {
-	default
-	if ! use static-libs; then
-		find "${ED}"/usr -name 'libppl*.la' -delete || die
-	fi
-
-	pushd "${ED}/usr/share/doc/${PF}" >/dev/null || die
-	rm gpl* fdl* || die
-	if ! use doc ; then
-		rm -r *-html/ *.ps.gz *.pdf || die
-	fi
-}
diff --git a/dev-libs/ppl/ppl-1.2-r5.ebuild b/dev-libs/ppl/ppl-1.2-r5.ebuild
index 793dfb79d209..14ac46456209 100644
--- a/dev-libs/ppl/ppl-1.2-r5.ebuild
+++ b/dev-libs/ppl/ppl-1.2-r5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://bugseng.com/products/ppl/download/ftp/releases/${PV}/${P}.tar.xz
 
 LICENSE="GPL-3"
 SLOT="0/4.14" # SONAMEs
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~sparc-solaris"
 IUSE="cdd +cxx doc lpsol pch test"
 
 RDEPEND=">=dev-libs/gmp-6[cxx(+)]
diff --git a/dev-libs/protobuf/Manifest b/dev-libs/protobuf/Manifest
index 55ce29cda734..ca615f0231e1 100644
--- a/dev-libs/protobuf/Manifest
+++ b/dev-libs/protobuf/Manifest
@@ -4,9 +4,16 @@ AUX protobuf-3.16.0-protoc_input_output_files.patch 10060 BLAKE2B e91d2e60ec9a90
 AUX protobuf-3.19.0-disable_no-warning-test.patch 1620 BLAKE2B e4f324ed59b2c31662cc625e9d3f1fdb20ee2a25769dbf86093e5000f73a01e11f05459989aaefeaf0414648cd52f1f1025b9d4f1423cdca4844e42e96f54836 SHA512 8c4bc72976a7eb3418b51e7a1c45b49d7ffaeb91a86f440008e6f162773b1db7afed4a6ae1d0b3510d49361c369b6552a9ba4976d104d804d825227aa7113d95
 AUX protobuf-3.19.0-system_libraries.patch 7514 BLAKE2B 1ff5c226232c325ed48cf16e2c47652615c4bd1503f1be8560e7f2e8658ffefeffeef72a6baf4368f758e30a4a81d582769b61dd0b3e383c8188cd03bf409c01 SHA512 b6a58e483dbb1f6151c2f7c735fbd55f34bcf98d6370eabb425dbd96e10cb87e8dfbf5024ad8f888cb80a095bc26598aceb55d576d37166550ee62db41c51a44
 AUX protobuf-3.20.1-protoc_input_output_files.patch 10066 BLAKE2B 1a5c045cc1c30ddf520ce6f68495f373a2dc4265ae3629b2e2deb6abb37935aea4c17267977442b5fe4e5b81d1c9467fddf5ca5e9045b444a4212a28e31ffab1 SHA512 7ca9fa2d602d0a11eea35e8284cd11f12e4e3ad3e6b0bba99f8e2c47a804f3f196810f0507806fb8d559c44f73b87a771f8fa9e9ce2c0acf4405f44894f2d13a
+AUX protobuf-3.20.2-protoc_input_output_files.patch 10080 BLAKE2B f52ea613b1104aa703e5e10eb5f968e33e46f05523e13fe84369a24ccbc16cecbcce3221b64b1acd624500864d224ccb59d1ce626157a0d0d77870f79ea64bd8 SHA512 dcf5dbd7be4a025d9ee96ed9be4566452ae4f946d0e1ae4c411a0dc3b7071fc156aca796497c0f2b67563a8ee884bded1a931d712cd7a3727301bbe37ec646f0
+DIST protobuf-21.8.tar.gz 5110670 BLAKE2B 3c1b0c857a86e9586481d63896341d0cb11290dbd710d87a6f7889d34f5f262abe2986a29ed19a730f8fa5df0b5c62d77a4db6aa415a72b239f7483ae8d6380c SHA512 cb17be759311e91172801add1f88fe7a0291b547170c40d2e3303f5c248570dddeade96bd48740edd628215f55269c97475e2f4c4a41c50f1018d525f52036cb
 DIST protobuf-3.19.3.tar.gz 5293258 BLAKE2B c05b70ffca97f7166ea6a511a36907eed125edf1ebf17f908718221d9b851be84dfb2b1b39973f2faf35f6ade630e6ba4f9e8b91b8fbc922c5db97079323ee6e SHA512 1c003e7cbc8eae6a038f46e688b401ee202ba47f502561e909df79770f6e8b7daf3dc1ccc727e31bfb5b52cd04cb4fef7d2d2a28d650c13f396872ad4aa076c6
+DIST protobuf-3.19.6.tar.gz 5299501 BLAKE2B 3121f76b95f83c5309ce49ce296b738eff7be9d3a5093c564fbe2339fb5f3729e406f1b44bfcc05feb0d31ab63838bb4f54685017977c73a33b91215a6776072 SHA512 8f92242f2be8e1bbfba41341c87709ad91ad83b8b3e3df88bb430411541d3399295f49291fd52b50e3487b0fce33181cb4d175685fd25aac72adfaee26a612d4
 DIST protobuf-3.20.1.tar.gz 5368262 BLAKE2B 1ce1aef2e4c4f3ea4863629cc75d89fe17d0c7ac0c342ac641c787456fd4a12756c2892a27ddadedc94a7201494ec84566638ce33a03cb0c867b04e9eee0edb3 SHA512 fde3eb9f13946887ddfd87df428c5615ad09aaf191e4478b24e98e5e13231feeff4e70b4ca6a2ff7d9b9b2e2c60bc1d5479526edeafa78f9a8ed3bef2e0bacb0
+DIST protobuf-3.20.3.tar.gz 5374320 BLAKE2B fb51f2a0ecf5b83235f5252051f8192ae377bb7a5e030c3f3e9435ccde25919c059830cf476e840fa6c970928a32c0075e213c9d5d4d9e3d3b24732c39a9fbfa SHA512 01d6703bdbe769a1200ee6e4ebcdcb99688ec21f576988c60d82ec36e0822820fb245fcb4ca53293143d53e666d748b5a0c6937bc659fb3cdc4cd9b05ed12a1c
+EBUILD protobuf-21.8.ebuild 4124 BLAKE2B ae66579a111e158ecb2d37f8190943c33e3f29eeb2a1806915423d88229b9f388b10a0d4baf055948344c89bfb16a7bc62f37d9acf96841d1372a18d2e95d994 SHA512 e70c0f5aecce8d0220d3a1d538c23ecbeef78539dc36f8f7f4e5a74e55b1e221a3366ed2ecad8cb300ed56a0bcf849c8eb9a5d85e386d6c1fc2e12a6db482c7f
 EBUILD protobuf-3.19.3.ebuild 4138 BLAKE2B b37b99abbd41acfb2299e1a054d3c36547bdd63542ecc76d03d69344d7e89a03870eda97bba1ae6ae3284c33abdfca6930e74b6ab7109d93cd588c522d6d52f6 SHA512 2eadab6fd0f4b30338a294b69c866ff945e98f05549403484700b2e44314433736a682ab033bc4c2eb0a802934cba92567e6c9bad4d30d79a67d671f88e04591
+EBUILD protobuf-3.19.6.ebuild 4331 BLAKE2B 0672fb5ecbd4080811f6c51f18accbaa1665d2e63ba5e9d6d422531638ac17ac475ff094cb59313c8c6ea0bf232b071b875091e15e033284e9f74f35fcaf194d SHA512 7ac1389f1895200c9c6d5067b03bbd95ee428ce6cbcee334eb23ec81102b9e0c24b548b755e5c26c5afbf72603e92600ab8118504f8e9127b288d33cc0b308fe
 EBUILD protobuf-3.20.1-r1.ebuild 3930 BLAKE2B 3ac2d80c6391f9147445a23fa39576ed5158bfde601f4a38f80784c9a29523c0749ec8572bd1910412bbae402237539f5ba3fa4fe5a16b188d9fbceb0babc3dc SHA512 3dfff6e4a92afb0707398ab58f00051269cbb8c70ac73ef1bfe532baa0ae59ea47fec2131f797f7fe4750929b966c2878676c235339762d8c447cdfd4bfa1c47
-EBUILD protobuf-9999.ebuild 3938 BLAKE2B 35b8a868ae096c0f74b5037051278e79ec8f0cf869b9effb038015ec11ff4775d04d13b6ffa8978066111e86d9387b23d2872ddc5991f3f9f71f11f2aebac064 SHA512 8edbd0f333611fdc9590369339cd68bff7e32a7f193c3cba72ccc3e923a970b205147accc430a4fe0df3e1edc0a0970f2857782728b82a6e78d4a631109e3849
+EBUILD protobuf-3.20.3.ebuild 4124 BLAKE2B 63f38b9330d49ae36131aa934e5b38cf87e10408370d92a59720b103ea499f00af61a4d22935ea361655349fcf6e584fdff45663b0d521bbc358d1039a1372b5 SHA512 511aad6e3a7af19a3f207657e9f9c6f20ef8c283e673d17f5ac1237f34bef615ae29b04a1461c0b743afbf9aa110007bf7fba847b2448c0eef3ba93c72fe970a
+EBUILD protobuf-9999.ebuild 4124 BLAKE2B 80612d28804cb40f5dd36e014ffc996cae88c7a29f7da51654df768c938f5f91c736c7bba53a4dd4ed80dc7de460a48aeecba695312e63c9814e244053fa1b87 SHA512 57a1305fbe4500c43cda4bb6408a43e8b9e3e9cb9c0210a9f59ed3094f2f58bbbd21818c436f091918864e682ff8314b0aa8d30cddae03efccc58a5d06ccd2f7
 MISC metadata.xml 595 BLAKE2B ba1b916e26b1e53f68e660f03d2e53fea8d22db04e8241ebec3ec20fbb251c2b164cf25d5fb6118423ce7721a822ae2302aab137b0748730e9a6860bf8e65668 SHA512 785e2550621b79b6350e1a6b52ed9992610769885fb29a9e92ee45a35158cc08707a3590dfcbece9ee9a5e16e1abfb614e8186132da7b942f2761b5e6ecfa827
diff --git a/dev-libs/protobuf/files/protobuf-3.20.2-protoc_input_output_files.patch b/dev-libs/protobuf/files/protobuf-3.20.2-protoc_input_output_files.patch
new file mode 100644
index 000000000000..e4bf6858974a
--- /dev/null
+++ b/dev-libs/protobuf/files/protobuf-3.20.2-protoc_input_output_files.patch
@@ -0,0 +1,240 @@
+https://github.com/protocolbuffers/protobuf/pull/235
+
+--- a/src/google/protobuf/compiler/command_line_interface.cc
++++ b/src/google/protobuf/compiler/command_line_interface.cc
+@@ -1112,6 +1112,28 @@
+   }
+
+   if (mode_ == MODE_ENCODE || mode_ == MODE_DECODE) {
++    bool success = false;
++    int in_fd = STDIN_FILENO;
++    int out_fd = STDOUT_FILENO;
++
++    if (!protobuf_in_path_.empty()) {
++      in_fd = open(protobuf_in_path_.c_str(), O_RDONLY);
++      if (in_fd == -1) {
++        std::cerr << protobuf_in_path_ << ": error: failed to open file." << std::endl;
++        return 1;
++      }
++    }
++    if (!protobuf_out_path_.empty()) {
++      out_fd = open(protobuf_out_path_.c_str(),
++                    O_WRONLY | O_CREAT | O_TRUNC,
++                    0644);
++      if (out_fd == -1) {
++        std::cerr << protobuf_out_path_ << ": error: failed to open file." << std::endl;
++        close(in_fd);
++        return 1;
++      }
++    }
++
+     if (codec_type_.empty()) {
+       // HACK:  Define an EmptyMessage type to use for decoding.
+       DescriptorPool pool;
+@@ -1120,13 +1142,20 @@
+       file.add_message_type()->set_name("EmptyMessage");
+       GOOGLE_CHECK(pool.BuildFile(file) != nullptr);
+       codec_type_ = "EmptyMessage";
+-      if (!EncodeOrDecode(&pool)) {
+-        return 1;
+-      }
++      success = EncodeOrDecode(&pool, in_fd, out_fd);
+     } else {
+-      if (!EncodeOrDecode(descriptor_pool.get())) {
+-        return 1;
+-      }
++      success = EncodeOrDecode(descriptor_pool.get(), in_fd, out_fd);
++    }
++
++    if (in_fd != STDIN_FILENO) {
++      close(in_fd);
++    }
++    if (out_fd != STDOUT_FILENO) {
++      close(out_fd);
++    }
++
++    if (!success) {
++      return 1;
+     }
+   }
+
+@@ -1165,6 +1194,11 @@
+   for (int i = 0; i < proto_path_.size(); i++) {
+     source_tree->MapPath(proto_path_[i].first, proto_path_[i].second);
+   }
++  if (mode_ == MODE_COMPILE &&
++      (!protobuf_in_path_.empty() || !protobuf_out_path_.empty())) {
++    std::cerr << "--protobuf_in and --protobuf_out are only valid with "
++         << "decode operations. Ignoring.";
++  }
+
+   // Map input files to virtual paths if possible.
+   if (!MakeInputsBeProtoPathRelative(source_tree, fallback_database)) {
+@@ -1888,6 +1922,12 @@
+   } else if (name == "--deterministic_output") {
+     deterministic_output_ = true;
+
++  } else if (name == "--protobuf_in") {
++    protobuf_in_path_ = value;
++
++  } else if (name == "--protobuf_out") {
++    protobuf_out_path_ = value;
++
+   } else if (name == "--error_format") {
+     if (value == "gcc") {
+       error_format_ = ERROR_FORMAT_GCC;
+@@ -2021,22 +2061,38 @@
+   --version                   Show version info and exit.
+   -h, --help                  Show this text and exit.
+   --encode=MESSAGE_TYPE       Read a text-format message of the given type
+-                              from standard input and write it in binary
+-                              to standard output.  The message type must
++                              from input protobuf file and write it in binary
++                              to output protobuf file.  The message type must
+                               be defined in PROTO_FILES or their imports.
++                              The input/output protobuf files are specified
++                              using the --protobuf_in and --protobuf_out
++                              command line flags.
+   --deterministic_output      When using --encode, ensure map fields are
+                               deterministically ordered. Note that this order
+                               is not canonical, and changes across builds or
+                               releases of protoc.
+   --decode=MESSAGE_TYPE       Read a binary message of the given type from
+-                              standard input and write it in text format
+-                              to standard output.  The message type must
++                              input protobuf file and write it in text format
++                              to output protobuf file.  The message type must
+                               be defined in PROTO_FILES or their imports.
++                              The input/output protobuf files are specified
++                              using the --protobuf_in and --protobuf_out
++                              command line flags.
+   --decode_raw                Read an arbitrary protocol message from
+-                              standard input and write the raw tag/value
+-                              pairs in text format to standard output.  No
++                              input protobuf file and write the raw tag/value
++                              pairs in text format to output protobuf file.  No
+                               PROTO_FILES should be given when using this
+-                              flag.
++                              flag.  The input/output protobuf files are
++                              specified using the --protobuf_in and
++                              --protobuf_out command line flags.
++  --protobuf_in=FILE          Absolute path to the protobuf file from which
++                              input of encoding/decoding operation will be
++                              read.  If omitted, input will be read from
++                              standard input.
++  --protobuf_out=FILE         Absolute path to the protobuf file to which
++                              output of encoding/decoding operation will be
++                              written.  If omitted, output will be written to
++                              standard output.
+   --descriptor_set_in=FILES   Specifies a delimited list of FILES
+                               each containing a FileDescriptorSet (a
+                               protocol buffer defined in descriptor.proto).
+@@ -2347,7 +2403,9 @@
+   return true;
+ }
+
+-bool CommandLineInterface::EncodeOrDecode(const DescriptorPool* pool) {
++bool CommandLineInterface::EncodeOrDecode(const DescriptorPool* pool,
++                                          int in_fd,
++                                          int out_fd) {
+   // Look up the type.
+   const Descriptor* type = pool->FindMessageTypeByName(codec_type_);
+   if (type == nullptr) {
+@@ -2359,15 +2417,15 @@
+   std::unique_ptr<Message> message(dynamic_factory.GetPrototype(type)->New());
+
+   if (mode_ == MODE_ENCODE) {
+-    SetFdToTextMode(STDIN_FILENO);
+-    SetFdToBinaryMode(STDOUT_FILENO);
++    SetFdToTextMode(in_fd);
++    SetFdToBinaryMode(out_fd);
+   } else {
+-    SetFdToBinaryMode(STDIN_FILENO);
+-    SetFdToTextMode(STDOUT_FILENO);
++    SetFdToBinaryMode(in_fd);
++    SetFdToTextMode(out_fd);
+   }
+
+-  io::FileInputStream in(STDIN_FILENO);
+-  io::FileOutputStream out(STDOUT_FILENO);
++  io::FileInputStream in(in_fd);
++  io::FileOutputStream out(out_fd);
+
+   if (mode_ == MODE_ENCODE) {
+     // Input is text.
+--- a/src/google/protobuf/compiler/command_line_interface.h
++++ b/src/google/protobuf/compiler/command_line_interface.h
+@@ -294,7 +294,9 @@
+       GeneratorContext* generator_context, std::string* error);
+
+   // Implements --encode and --decode.
+-  bool EncodeOrDecode(const DescriptorPool* pool);
++  bool EncodeOrDecode(const DescriptorPool* pool,
++                      int in_fd,
++                      int out_fd);
+
+   // Implements the --descriptor_set_out option.
+   bool WriteDescriptorSet(
+@@ -429,6 +431,13 @@
+   // parsed FileDescriptorSets to be used for loading protos.  Otherwise, empty.
+   std::vector<std::string> descriptor_set_in_names_;
+
++  // When using --encode / --decode / --decode_raw absolute path to the output
++  // file. (Empty string indicates write to STDOUT).
++  std::string protobuf_out_path_;
++  // When using --encode / --decode / --decode_raw, absolute path to the input
++  // file. (Empty string indicates read from STDIN).
++  std::string protobuf_in_path_;
++
+   // If --descriptor_set_out was given, this is the filename to which the
+   // FileDescriptorSet should be written.  Otherwise, empty.
+   std::string descriptor_set_out_name_;
+--- a/src/google/protobuf/compiler/command_line_interface_unittest.cc
++++ b/src/google/protobuf/compiler/command_line_interface_unittest.cc
+@@ -99,7 +99,7 @@
+   void SetUp() override;
+   void TearDown() override;
+
+-  // Runs the CommandLineInterface with the given command line.  The
++  // Run the CommandLineInterface with the given command line.  The
+   // command is automatically split on spaces, and the string "$tmpdir"
+   // is replaced with TestTempDir().
+   void Run(const std::string& command);
+@@ -2626,6 +2626,17 @@
+               std::string::npos);
+   }
+
++  void ExpectBinaryFilesMatch(const std::string &expected_file,
++                              const std::string &actual_file) {
++    std::string expected_output, actual_output;
++    ASSERT_TRUE(File::ReadFileToString(expected_file, &expected_output));
++    ASSERT_TRUE(File::ReadFileToString(actual_file, &actual_output));
++
++    // Don't use EXPECT_EQ because we don't want to print raw binary data to
++    // stdout on failure.
++    EXPECT_TRUE(expected_output == actual_output);
++  }
++
+  private:
+   void WriteUnittestProtoDescriptorSet() {
+     unittest_proto_descriptor_set_filename_ =
+@@ -2749,6 +2760,19 @@
+       "Can only use --deterministic_output with --encode.\n");
+ }
+
++TEST_P(EncodeDecodeTest, RedirectInputOutput) {
++  std::string out_file = TestTempDir() + "/golden_message_out.pbf";
++  EXPECT_TRUE(
++      Run(TestUtil::MaybeTranslatePath("net/proto2/internal/unittest.proto") +
++          " --encode=protobuf_unittest.TestAllTypes" +
++          " --protobuf_in=" + TestUtil::GetTestDataPath(
++              "net/proto2/internal/"
++              "testdata/text_format_unittest_data_oneof_implemented.txt") +
++          " --protobuf_out=" + out_file));
++  ExpectBinaryFilesMatch(out_file, TestUtil::GetTestDataPath(
++      "net/proto2/internal/testdata/golden_message_oneof_implemented"));
++}
++
+ INSTANTIATE_TEST_SUITE_P(FileDescriptorSetSource, EncodeDecodeTest,
+                          testing::Values(PROTO_PATH, DESCRIPTOR_SET_IN));
+ }  // anonymous namespace
diff --git a/dev-libs/protobuf/protobuf-21.8.ebuild b/dev-libs/protobuf/protobuf-21.8.ebuild
new file mode 100644
index 000000000000..523c763c265c
--- /dev/null
+++ b/dev-libs/protobuf/protobuf-21.8.ebuild
@@ -0,0 +1,148 @@
+# Copyright 2008-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools elisp-common flag-o-matic multilib-minimal toolchain-funcs
+
+if [[ "${PV}" == *9999 ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf.git"
+	EGIT_SUBMODULES=()
+else
+	SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+fi
+
+DESCRIPTION="Google's Protocol Buffers - Extensible mechanism for serializing structured data"
+HOMEPAGE="
+	https://developers.google.com/protocol-buffers/
+"
+
+LICENSE="BSD"
+SLOT="0/32"
+IUSE="emacs examples static-libs test zlib"
+RESTRICT="!test? ( test )"
+
+BDEPEND="emacs? ( app-editors/emacs:* )"
+DEPEND="test? ( >=dev-cpp/gtest-1.9[${MULTILIB_USEDEP}] )
+	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
+RDEPEND="emacs? ( app-editors/emacs:* )
+	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.19.0-disable_no-warning-test.patch"
+	"${FILESDIR}/${PN}-3.19.0-system_libraries.patch"
+	"${FILESDIR}/${PN}-3.20.2-protoc_input_output_files.patch"
+)
+
+DOCS=(CHANGES.txt CONTRIBUTORS.txt README.md)
+
+src_prepare() {
+	default
+
+	# https://github.com/protocolbuffers/protobuf/issues/7413
+	sed -e "/^AC_PROG_CXX_FOR_BUILD$/d" -i configure.ac || die
+
+	# https://github.com/protocolbuffers/protobuf/issues/8082
+	sed -e "/^TEST_F(IoTest, LargeOutput) {$/,/^}$/d" -i src/google/protobuf/io/zero_copy_stream_unittest.cc || die
+
+	# https://github.com/protocolbuffers/protobuf/issues/8459
+	sed \
+		-e "/^TEST(ArenaTest, BlockSizeSmallerThanAllocation) {$/a\\  if (sizeof(void*) == 4) {\n    GTEST_SKIP();\n  }" \
+		-e "/^TEST(ArenaTest, SpaceAllocated_and_Used) {$/a\\  if (sizeof(void*) == 4) {\n    GTEST_SKIP();\n  }" \
+		-i src/google/protobuf/arena_unittest.cc || die
+
+	# https://github.com/protocolbuffers/protobuf/issues/8460
+	sed -e "/^TEST(AnyTest, TestPackFromSerializationExceedsSizeLimit) {$/a\\  if (sizeof(void*) == 4) {\n    GTEST_SKIP();\n  }" -i src/google/protobuf/any_test.cc || die
+
+	# https://github.com/protocolbuffers/protobuf/issues/9433
+	sed -e "/^[[:space:]]*static_assert(alignof(U) <= 8, \"\");$/d" -i src/google/protobuf/descriptor.cc || die
+
+	eautoreconf
+}
+
+src_configure() {
+	append-cppflags -DGOOGLE_PROTOBUF_NO_RTTI
+
+	if tc-ld-is-gold; then
+		# https://sourceware.org/bugzilla/show_bug.cgi?id=24527
+		tc-ld-disable-gold
+	fi
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local options=(
+		$(use_enable static-libs static)
+		$(use_with zlib)
+	)
+
+	if tc-is-cross-compiler; then
+		# Build system uses protoc when building, so protoc copy runnable on host is needed.
+		mkdir -p "${WORKDIR}/build" || die
+		pushd "${WORKDIR}/build" > /dev/null || die
+		ECONF_SOURCE="${S}" econf_build "${options[@]}"
+		options+=(--with-protoc="$(pwd)/src/protoc")
+		popd > /dev/null || die
+	fi
+
+	ECONF_SOURCE="${S}" econf "${options[@]}"
+}
+
+src_compile() {
+	multilib-minimal_src_compile
+
+	if use emacs; then
+		elisp-compile editors/protobuf-mode.el
+	fi
+}
+
+multilib_src_compile() {
+	if tc-is-cross-compiler; then
+		emake -C "${WORKDIR}/build/src" protoc
+	fi
+
+	default
+}
+
+multilib_src_test() {
+	emake check
+}
+
+multilib_src_install_all() {
+	find "${ED}" -name "*.la" -delete || die
+
+	if [[ ! -f "${ED}/usr/$(get_libdir)/libprotobuf.so.${SLOT#*/}" ]]; then
+		eerror "No matching library found with SLOT variable, currently set: ${SLOT}\n" \
+			"Expected value: ${ED}/usr/$(get_libdir)/libprotobuf.so.${SLOT#*/}"
+		die "Please update SLOT variable"
+	fi
+
+	insinto /usr/share/vim/vimfiles/syntax
+	doins editors/proto.vim
+	insinto /usr/share/vim/vimfiles/ftdetect
+	doins "${FILESDIR}/proto.vim"
+
+	if use emacs; then
+		elisp-install ${PN} editors/protobuf-mode.el*
+		elisp-site-file-install "${FILESDIR}/70${PN}-gentoo.el"
+	fi
+
+	if use examples; then
+		DOCS+=(examples)
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-libs/protobuf/protobuf-3.19.6.ebuild b/dev-libs/protobuf/protobuf-3.19.6.ebuild
new file mode 100644
index 000000000000..8784499c1fd7
--- /dev/null
+++ b/dev-libs/protobuf/protobuf-3.19.6.ebuild
@@ -0,0 +1,151 @@
+# Copyright 2008-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools elisp-common flag-o-matic multilib-minimal toolchain-funcs
+
+if [[ "${PV}" == *9999 ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf.git"
+	EGIT_SUBMODULES=()
+else
+	SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+fi
+
+DESCRIPTION="Google's Protocol Buffers - Extensible mechanism for serializing structured data"
+HOMEPAGE="
+	https://developers.google.com/protocol-buffers/
+"
+
+LICENSE="BSD"
+SLOT="0/30"
+IUSE="emacs examples static-libs test zlib"
+RESTRICT="!test? ( test )"
+
+BDEPEND="emacs? ( app-editors/emacs:* )"
+DEPEND="test? ( >=dev-cpp/gtest-1.9[${MULTILIB_USEDEP}] )
+	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
+RDEPEND="emacs? ( app-editors/emacs:* )
+	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.19.0-disable_no-warning-test.patch"
+	"${FILESDIR}/${PN}-3.19.0-system_libraries.patch"
+	"${FILESDIR}/${PN}-3.16.0-protoc_input_output_files.patch"
+)
+
+DOCS=(CHANGES.txt CONTRIBUTORS.txt README.md)
+
+src_prepare() {
+	default
+
+	# https://github.com/protocolbuffers/protobuf/issues/7413
+	sed -e "/^AC_PROG_CXX_FOR_BUILD$/d" -i configure.ac || die
+
+	# https://github.com/protocolbuffers/protobuf/issues/8082
+	sed -e "/^TEST_F(IoTest, LargeOutput) {$/,/^}$/d" -i src/google/protobuf/io/zero_copy_stream_unittest.cc || die
+
+	# https://github.com/protocolbuffers/protobuf/issues/8459
+	sed \
+		-e "/^TEST(ArenaTest, BlockSizeSmallerThanAllocation) {$/a\\  if (sizeof(void*) == 4) {\n    GTEST_SKIP();\n  }" \
+		-e "/^TEST(ArenaTest, SpaceAllocated_and_Used) {$/a\\  if (sizeof(void*) == 4) {\n    GTEST_SKIP();\n  }" \
+		-i src/google/protobuf/arena_unittest.cc || die
+
+	# https://github.com/protocolbuffers/protobuf/issues/8460
+	sed -e "/^TEST(AnyTest, TestPackFromSerializationExceedsSizeLimit) {$/a\\  if (sizeof(void*) == 4) {\n    GTEST_SKIP();\n  }" -i src/google/protobuf/any_test.cc || die
+
+	# https://github.com/protocolbuffers/protobuf/issues/9392
+	sed -e "s/^AC_PROG_OBJC$/AS_CASE([\$target_os], [darwin*], [AC_PROG_OBJC], [AM_CONDITIONAL([am__fastdepOBJC], [false])])/" -i configure.ac || die
+
+	# https://github.com/protocolbuffers/protobuf/issues/9433
+	sed -e "/^[[:space:]]*static_assert(alignof(T) <= 8, \"\");$/d" -i src/google/protobuf/descriptor.cc || die
+
+	eautoreconf
+}
+
+src_configure() {
+	append-cppflags -DGOOGLE_PROTOBUF_NO_RTTI
+
+	if tc-ld-is-gold; then
+		# https://sourceware.org/bugzilla/show_bug.cgi?id=24527
+		tc-ld-disable-gold
+	fi
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local options=(
+		$(use_enable static-libs static)
+		$(use_with zlib)
+	)
+
+	if tc-is-cross-compiler; then
+		# Build system uses protoc when building, so protoc copy runnable on host is needed.
+		mkdir -p "${WORKDIR}/build" || die
+		pushd "${WORKDIR}/build" > /dev/null || die
+		ECONF_SOURCE="${S}" econf_build "${options[@]}"
+		options+=(--with-protoc="$(pwd)/src/protoc")
+		popd > /dev/null || die
+	fi
+
+	ECONF_SOURCE="${S}" econf "${options[@]}"
+}
+
+src_compile() {
+	multilib-minimal_src_compile
+
+	if use emacs; then
+		elisp-compile editors/protobuf-mode.el
+	fi
+}
+
+multilib_src_compile() {
+	if tc-is-cross-compiler; then
+		emake -C "${WORKDIR}/build/src" protoc
+	fi
+
+	default
+}
+
+multilib_src_test() {
+	emake check
+}
+
+multilib_src_install_all() {
+	find "${ED}" -name "*.la" -delete || die
+
+	if [[ ! -f "${ED}/usr/$(get_libdir)/libprotobuf.so.${SLOT#*/}" ]]; then
+		eerror "No matching library found with SLOT variable, currently set: ${SLOT}\n" \
+			"Expected value: ${ED}/usr/$(get_libdir)/libprotobuf.so.${SLOT#*/}"
+		die "Please update SLOT variable"
+	fi
+
+	insinto /usr/share/vim/vimfiles/syntax
+	doins editors/proto.vim
+	insinto /usr/share/vim/vimfiles/ftdetect
+	doins "${FILESDIR}/proto.vim"
+
+	if use emacs; then
+		elisp-install ${PN} editors/protobuf-mode.el*
+		elisp-site-file-install "${FILESDIR}/70${PN}-gentoo.el"
+	fi
+
+	if use examples; then
+		DOCS+=(examples)
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-libs/protobuf/protobuf-3.20.3.ebuild b/dev-libs/protobuf/protobuf-3.20.3.ebuild
new file mode 100644
index 000000000000..cade7f688a49
--- /dev/null
+++ b/dev-libs/protobuf/protobuf-3.20.3.ebuild
@@ -0,0 +1,148 @@
+# Copyright 2008-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools elisp-common flag-o-matic multilib-minimal toolchain-funcs
+
+if [[ "${PV}" == *9999 ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf.git"
+	EGIT_SUBMODULES=()
+else
+	SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+fi
+
+DESCRIPTION="Google's Protocol Buffers - Extensible mechanism for serializing structured data"
+HOMEPAGE="
+	https://developers.google.com/protocol-buffers/
+"
+
+LICENSE="BSD"
+SLOT="0/31"
+IUSE="emacs examples static-libs test zlib"
+RESTRICT="!test? ( test )"
+
+BDEPEND="emacs? ( app-editors/emacs:* )"
+DEPEND="test? ( >=dev-cpp/gtest-1.9[${MULTILIB_USEDEP}] )
+	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
+RDEPEND="emacs? ( app-editors/emacs:* )
+	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.19.0-disable_no-warning-test.patch"
+	"${FILESDIR}/${PN}-3.19.0-system_libraries.patch"
+	"${FILESDIR}/${PN}-3.20.2-protoc_input_output_files.patch"
+)
+
+DOCS=(CHANGES.txt CONTRIBUTORS.txt README.md)
+
+src_prepare() {
+	default
+
+	# https://github.com/protocolbuffers/protobuf/issues/7413
+	sed -e "/^AC_PROG_CXX_FOR_BUILD$/d" -i configure.ac || die
+
+	# https://github.com/protocolbuffers/protobuf/issues/8082
+	sed -e "/^TEST_F(IoTest, LargeOutput) {$/,/^}$/d" -i src/google/protobuf/io/zero_copy_stream_unittest.cc || die
+
+	# https://github.com/protocolbuffers/protobuf/issues/8459
+	sed \
+		-e "/^TEST(ArenaTest, BlockSizeSmallerThanAllocation) {$/a\\  if (sizeof(void*) == 4) {\n    GTEST_SKIP();\n  }" \
+		-e "/^TEST(ArenaTest, SpaceAllocated_and_Used) {$/a\\  if (sizeof(void*) == 4) {\n    GTEST_SKIP();\n  }" \
+		-i src/google/protobuf/arena_unittest.cc || die
+
+	# https://github.com/protocolbuffers/protobuf/issues/8460
+	sed -e "/^TEST(AnyTest, TestPackFromSerializationExceedsSizeLimit) {$/a\\  if (sizeof(void*) == 4) {\n    GTEST_SKIP();\n  }" -i src/google/protobuf/any_test.cc || die
+
+	# https://github.com/protocolbuffers/protobuf/issues/9433
+	sed -e "/^[[:space:]]*static_assert(alignof(U) <= 8, \"\");$/d" -i src/google/protobuf/descriptor.cc || die
+
+	eautoreconf
+}
+
+src_configure() {
+	append-cppflags -DGOOGLE_PROTOBUF_NO_RTTI
+
+	if tc-ld-is-gold; then
+		# https://sourceware.org/bugzilla/show_bug.cgi?id=24527
+		tc-ld-disable-gold
+	fi
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local options=(
+		$(use_enable static-libs static)
+		$(use_with zlib)
+	)
+
+	if tc-is-cross-compiler; then
+		# Build system uses protoc when building, so protoc copy runnable on host is needed.
+		mkdir -p "${WORKDIR}/build" || die
+		pushd "${WORKDIR}/build" > /dev/null || die
+		ECONF_SOURCE="${S}" econf_build "${options[@]}"
+		options+=(--with-protoc="$(pwd)/src/protoc")
+		popd > /dev/null || die
+	fi
+
+	ECONF_SOURCE="${S}" econf "${options[@]}"
+}
+
+src_compile() {
+	multilib-minimal_src_compile
+
+	if use emacs; then
+		elisp-compile editors/protobuf-mode.el
+	fi
+}
+
+multilib_src_compile() {
+	if tc-is-cross-compiler; then
+		emake -C "${WORKDIR}/build/src" protoc
+	fi
+
+	default
+}
+
+multilib_src_test() {
+	emake check
+}
+
+multilib_src_install_all() {
+	find "${ED}" -name "*.la" -delete || die
+
+	if [[ ! -f "${ED}/usr/$(get_libdir)/libprotobuf.so.${SLOT#*/}" ]]; then
+		eerror "No matching library found with SLOT variable, currently set: ${SLOT}\n" \
+			"Expected value: ${ED}/usr/$(get_libdir)/libprotobuf.so.${SLOT#*/}"
+		die "Please update SLOT variable"
+	fi
+
+	insinto /usr/share/vim/vimfiles/syntax
+	doins editors/proto.vim
+	insinto /usr/share/vim/vimfiles/ftdetect
+	doins "${FILESDIR}/proto.vim"
+
+	if use emacs; then
+		elisp-install ${PN} editors/protobuf-mode.el*
+		elisp-site-file-install "${FILESDIR}/70${PN}-gentoo.el"
+	fi
+
+	if use examples; then
+		DOCS+=(examples)
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-libs/protobuf/protobuf-9999.ebuild b/dev-libs/protobuf/protobuf-9999.ebuild
index 0e620717ec44..9f84c789877f 100644
--- a/dev-libs/protobuf/protobuf-9999.ebuild
+++ b/dev-libs/protobuf/protobuf-9999.ebuild
@@ -5,24 +5,23 @@ EAPI=8
 
 inherit autotools elisp-common flag-o-matic multilib-minimal toolchain-funcs
 
-if [[ "${PV}" == "9999" ]]; then
+if [[ "${PV}" == *9999 ]]; then
 	inherit git-r3
 
-	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf"
+	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf.git"
 	EGIT_SUBMODULES=()
-fi
-
-DESCRIPTION="Google's Protocol Buffers - Extensible mechanism for serializing structured data"
-HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
-if [[ "${PV}" == "9999" ]]; then
-	SRC_URI=""
 else
-	SRC_URI="https://github.com/protocolbuffers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 fi
 
+DESCRIPTION="Google's Protocol Buffers - Extensible mechanism for serializing structured data"
+HOMEPAGE="
+	https://developers.google.com/protocol-buffers/
+"
+
 LICENSE="BSD"
-SLOT="0/31"
+SLOT="0/32"
 IUSE="emacs examples static-libs test zlib"
 RESTRICT="!test? ( test )"
 
@@ -116,6 +115,12 @@ multilib_src_test() {
 multilib_src_install_all() {
 	find "${ED}" -name "*.la" -delete || die
 
+	if [[ ! -f "${ED}/usr/$(get_libdir)/libprotobuf.so.${SLOT#*/}" ]]; then
+		eerror "No matching library found with SLOT variable, currently set: ${SLOT}\n" \
+			"Expected value: ${ED}/usr/$(get_libdir)/libprotobuf.so.${SLOT#*/}"
+		die "Please update SLOT variable"
+	fi
+
 	insinto /usr/share/vim/vimfiles/syntax
 	doins editors/proto.vim
 	insinto /usr/share/vim/vimfiles/ftdetect
diff --git a/dev-libs/tree-sitter/Manifest b/dev-libs/tree-sitter/Manifest
index 00b10db9ca43..ecbc4918c63c 100644
--- a/dev-libs/tree-sitter/Manifest
+++ b/dev-libs/tree-sitter/Manifest
@@ -2,6 +2,6 @@ AUX tree-sitter-No-static-libs-gentoo.patch 793 BLAKE2B 9f80752bff2b5d327889702b
 DIST tree-sitter-0.20.6.tar.gz 2924556 BLAKE2B 17348717441497ea7fc91419a0e8796d077b9acda2b584e9c3e1ac4a7a3f1fa3f84d5b749f21144d0593aaa7bf2e7ff9665539e91c6e81cda4359850e0fcdb14 SHA512 f0fb1e0073867c2a6e69b230e07e5eec32a2b30d3c711ec188526e287d6a1ef06de266d476482f900ec7c9ff6c11909899fd35a802e96f0befc6e99815502377
 DIST tree-sitter-0.20.7.tar.gz 2928761 BLAKE2B 280083381ce4f5949ab1ca1412026cac79bcf28b488147150d934b70cdc7804466c8032d50254f1ff4457b55a33fe0dceef66fd053cd32bbf844dc8280e896ab SHA512 dd306f7304cb5f87c05eab3bf5c9c4c13bfed7766a164eafe3159adbc6cca4e66fbdb6880f48dfc668408fbefc14b0147aa2231db085a72f526ac51b681b7c26
 EBUILD tree-sitter-0.20.6.ebuild 1021 BLAKE2B b36aa0a4a1563751dd8315f27f01203693f543f22513d21e269087050898d5a9cfc67c856147ef407718257634214678e12e820af645217a52deb26229a4ce3c SHA512 c229498f68a38d73b7ed14c3d0ecb8261c789651b858a6c73a70056a6b12b36d1dac69f1af82258052dd309543aa0da2dcff6329b08715bb3c7127732a316f97
-EBUILD tree-sitter-0.20.7.ebuild 1072 BLAKE2B ff88e4f1884d5ac236ea24cec31223b548cda9c49bb715f86224c891ab47d9261614cab66dd6a26061a601da078a434865c37607b131a5634edadbe091586034 SHA512 8b33ce3c9d3c0491e0882db496cec0369dd91f243158ddecc92022d5a18aa270a5fd97c85bfd0a00d549198ebb71efce8fd7bb3a1772d074c6474c98669ee00f
+EBUILD tree-sitter-0.20.7.ebuild 1070 BLAKE2B b5e2bb5e52321fc9cabcade413fb5dd9bb819498e03172a3d725ee9f61998ca64321842c202779f8c7cb20aefa38dd05199528d380877b114c9ceef19c652167 SHA512 895c65fbaaa7e81dcc3fe7a25fa797e582f148d879f4777ba143312e3aa4b1a3090c5d670212d5ec8106bacb0cec1cbe8e96bf3a3a1a00bf8cbe774f9b46f8dc
 EBUILD tree-sitter-9999.ebuild 1029 BLAKE2B c335042cf6c9155c2fad5c9c3eb9b508956b077cb22ee9e20f2f612a4afb2e0ec3797b149bb2b085c70e9d9110b6cdcb818aa4b66afff9d8fe54b40a5921699a SHA512 3284675110336a56485f5b4577e5461cbcf2e400deb4a4de5b107b248d8271f5e382dd247d1679c0be70e0ffb5f8820592e54c83f37807ae301b21f63d17b3de
 MISC metadata.xml 927 BLAKE2B 1b94b1e0f323461151d82920b4185cdee4aff41ff751f170d893b80f62423545adfd5efd8cc920c933f599089fbd72423ffdb4e43dc51f975bbc4eebe601abd1 SHA512 88e936a507fbd1154c1c167f6fc343ded2e3e6d2c073d2efce9a2e1c98ac1877e5c1197a903a597b403b444189cf2e4b519c4cf144a8eb1ad050c0a8b07ae101
diff --git a/dev-libs/tree-sitter/tree-sitter-0.20.7.ebuild b/dev-libs/tree-sitter/tree-sitter-0.20.7.ebuild
index a197f675a992..d1e6245b923f 100644
--- a/dev-libs/tree-sitter/tree-sitter-0.20.7.ebuild
+++ b/dev-libs/tree-sitter/tree-sitter-0.20.7.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/${PN}/${PN}"
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 fi
 
 LICENSE="MIT"
diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index 9f4407e3494f..d36d9f68d896 100644
Binary files a/dev-ml/Manifest.gz and b/dev-ml/Manifest.gz differ
diff --git a/dev-ml/llvm-ocaml/Manifest b/dev-ml/llvm-ocaml/Manifest
index b0cb2119ddc2..98df0d4e440c 100644
--- a/dev-ml/llvm-ocaml/Manifest
+++ b/dev-ml/llvm-ocaml/Manifest
@@ -7,8 +7,8 @@ DIST llvm-project-b34ea582774c057d9bf5591174d683fd3d8aa02b.tar.gz 169735900 BLAK
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
 EBUILD llvm-ocaml-13.0.1.ebuild 2596 BLAKE2B 4125904f29738c9d1df5dda7737d2edb1e68512f66b561d4ab4b24ebaa457da1a13ab830ab911b5016e05cb48696aff0f6cd1753615e33e8b06f5b086deb020f SHA512 7b80a864207d4c0ef50725a5e9e64c6ff0956b4dfd3f6c55f4363f44703a7113205a39a53624e288562b08ca3191bd11cd7615ecb53395e07777ae7161a173c4
 EBUILD llvm-ocaml-14.0.6.ebuild 2594 BLAKE2B 60511c8fbe6fb601e25db4cd2241c0539f829c7c13b55cc142348fa2ac7feff500ddaa00929e7c0152f114cc3dd257f20063290d40a725a5cf05fa51c3ef7072 SHA512 a323d719faa75764be7ae4e663beaf806836b8388521c3aec93ea07a2f3e001a130c7881a15137a7199660a3e0e7baf646391817b09921dab693adbe03c2d173
-EBUILD llvm-ocaml-15.0.3.9999.ebuild 2582 BLAKE2B 941dc173e32fcd3333cd3b8bc0424bfb52ddaab4430a384105d70b03e7a861bf7174c41662faba29e80924d14d874774c5ee5caf163df88d208acd109fa09787 SHA512 05eb8f496fc5bdcc5faa98fc1705af700855264fd0bc033bfde2bd267082dd3c849ba58c0893b427196d04fbffce9b0ec98090b51472bb36e206c86b2904b578
 EBUILD llvm-ocaml-15.0.3.ebuild 2598 BLAKE2B d04e4d0567e251d2499de4e696d6f0d93083cf821662a6f38e17ac3e34d43062acc3599ed5d36a4fbd301c8de95a8d9a6e59506baec477806b92ec88204fc8c2 SHA512 bde4b047ac38ca30c616f2ced8da379e43c770aa6d6985435e444da0602f7f73f03adefe06a58f140e16f5b436ca4ba895601dc9936ff5f21866a5b95c65db8a
+EBUILD llvm-ocaml-15.0.4.9999.ebuild 2582 BLAKE2B 941dc173e32fcd3333cd3b8bc0424bfb52ddaab4430a384105d70b03e7a861bf7174c41662faba29e80924d14d874774c5ee5caf163df88d208acd109fa09787 SHA512 05eb8f496fc5bdcc5faa98fc1705af700855264fd0bc033bfde2bd267082dd3c849ba58c0893b427196d04fbffce9b0ec98090b51472bb36e206c86b2904b578
 EBUILD llvm-ocaml-16.0.0.9999.ebuild 2516 BLAKE2B 5d42fd7ca1194bfc7fabd05d12d29b793e468ba9d46e36d80f50b1f3e654dfd01a122422ff42ba0616f6654155987be8c23999da1da422467f09ca75a7865d90 SHA512 c9fe4add6b74299cc13c961ff6d9e027d0861dda038130553ccef72189a5df19f408a8e3cb936864fa8f4a3437e1f9c71fb6fe62761c43e5d9ba9b7bd18edd0e
 EBUILD llvm-ocaml-16.0.0_pre20221016.ebuild 2516 BLAKE2B 5d42fd7ca1194bfc7fabd05d12d29b793e468ba9d46e36d80f50b1f3e654dfd01a122422ff42ba0616f6654155987be8c23999da1da422467f09ca75a7865d90 SHA512 c9fe4add6b74299cc13c961ff6d9e027d0861dda038130553ccef72189a5df19f408a8e3cb936864fa8f4a3437e1f9c71fb6fe62761c43e5d9ba9b7bd18edd0e
 EBUILD llvm-ocaml-16.0.0_pre20221023.ebuild 2516 BLAKE2B 5d42fd7ca1194bfc7fabd05d12d29b793e468ba9d46e36d80f50b1f3e654dfd01a122422ff42ba0616f6654155987be8c23999da1da422467f09ca75a7865d90 SHA512 c9fe4add6b74299cc13c961ff6d9e027d0861dda038130553ccef72189a5df19f408a8e3cb936864fa8f4a3437e1f9c71fb6fe62761c43e5d9ba9b7bd18edd0e
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-15.0.3.9999.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-15.0.4.9999.ebuild
similarity index 100%
rename from dev-ml/llvm-ocaml/llvm-ocaml-15.0.3.9999.ebuild
rename to dev-ml/llvm-ocaml/llvm-ocaml-15.0.4.9999.ebuild
diff --git a/dev-perl/GD/GD-2.760.0.ebuild b/dev-perl/GD/GD-2.760.0.ebuild
new file mode 100644
index 000000000000..f722bb933ed8
--- /dev/null
+++ b/dev-perl/GD/GD-2.760.0.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=RURBAN
+DIST_VERSION=2.76
+DIST_EXAMPLES=("demos/*")
+inherit perl-module
+
+DESCRIPTION="Interface to Thomas Boutell's gd library"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="animgif fcgi test truetype xpm"
+
+RDEPEND="
+	>=media-libs/gd-2.2.3[png,jpeg]
+	media-libs/giflib
+	media-libs/libjpeg-turbo
+	media-libs/libpng
+	sys-libs/zlib
+	truetype? (
+		media-libs/gd[truetype]
+		media-libs/freetype:2
+	)
+	xpm? (
+		media-libs/gd[xpm]
+		x11-libs/libXpm
+	)
+	fcgi? (
+		dev-libs/fcgi
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	${RDEPEND}
+	>=virtual/perl-ExtUtils-Constant-0.230.0
+	dev-perl/ExtUtils-PkgConfig
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		>=dev-perl/Test-Fork-0.20.0
+		>=virtual/perl-Test-Simple-0.880.0
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.760.0-respect-libdir.patch
+)
+
+src_configure() {
+	local myconfargs=(
+		VERSION_33
+		GD_UNCLOSEDPOLY
+		GD_FTCIRCLE
+
+		JPEG
+		PNG
+		GIF
+	)
+
+	# The following flags do not work properly. This is why we force-enable
+	# at least some of them. See bug 787404 as tracker.
+	use animgif && myconfargs+=( ANIMGIF )
+	use truetype && myconfargs+=( FT )
+	use xpm && myconfargs+=( XPM )
+
+	# Per line 284 of Makefile.PL
+	local myconf="--lib_gd_path ${ESYSROOT}/usr/$(get_libdir) -options '$(printf '%s,' ${myconfargs[@]})'"
+	use fcgi && myconf+=" --fcgi"
+
+	perl-module_src_configure
+}
+
+src_test() {
+	# The 'GD' format itself is long-obsolete and gone in >=media-libs/gd-2.3.3
+	perl_rm_files t/z_*.t t/GD.t
+	perl-module_src_test
+}
diff --git a/dev-perl/GD/Manifest b/dev-perl/GD/Manifest
index f2b41ca89398..e6b40e6edce0 100644
--- a/dev-perl/GD/Manifest
+++ b/dev-perl/GD/Manifest
@@ -1,3 +1,6 @@
+AUX GD-2.760.0-respect-libdir.patch 1416 BLAKE2B 63ee4ce7af705624e7e52f5ccd36d521de5f78d4bb079a79661106d31a726eb64fd5069d6888dcec1e3ae46d83bb44ef88ae6c2fd5ad95a97c92d51d7afd8d07 SHA512 93bced05b6643681a9e566fa12fe259e7345a4de4101b2d9827bf81602544178dc7b17f0918d827ba5135c9e055a92707c802b8989e9518e8ed94e1482aa8df3
 DIST GD-2.73.tar.gz 261203 BLAKE2B 088cb4d3c846d61e89631c7fef6b0273489297f0613e1ebb98c33b404a613431c79a5e72c2b757450496ef8d86aabe387b102a4c8d22d69532b8d8e989bac9bf SHA512 0c360c86307c8a2484bd8e1fb4cf24e27f7976bcfd830d9070fdc3775d233845734c59796082d498276aa715f30c9452c492b0d5bd75e488c1e9c5fa76490709
+DIST GD-2.76.tar.gz 264364 BLAKE2B 4cfe36f74aae50141f00cd8d3a6eddbf819dafd76ecfc1fbf219c3ae40009b9e4c1e6b94a33416842846dead17bfc1f883324757fd66124aae8e2cbae2bcfef3 SHA512 31c2d61440a7fef9804aed677ee5568f6c237e678cf5a2b7f48e98326ef7cddbf3624ce3965e6711ef9cec4148881a0cb4352c19b91ead4b78835fafaeefbe4d
 EBUILD GD-2.730.0-r1.ebuild 1601 BLAKE2B 8c92e9a553a1af58731441adc324e3c751370b3aec5182b57c6d1731152a277c1d0d4888bdcdc573f1252108b8fa9ad72836c99ee66d59755ae2f2482e011578 SHA512 1f962ebe6a9a9e1d499ad4fe298c57997913fc7a1594d7f54b3df1ad1ff6e6eb5e6b6c14f7261c9fd8119e075570c60a9cfd0a3e23af422531bf15d20e41119c
+EBUILD GD-2.760.0.ebuild 1648 BLAKE2B 064964e4ca345b09107f0d5dc1f2f07d867082fe6b3a2a38077fd530c3904f43c73caf4a0bca3279c7b7187e3c22cc938b59004a150ea2e7e40e37880505e456 SHA512 f76e5b4d2e7bb72e32407dfe24110f03e33cf818a599c6cd23714d2cdb6a625485c3951f9087387f3dc1436ef5d4b81abcab62cfab2f6e2e76a51cc581153e86
 MISC metadata.xml 853 BLAKE2B 4332a510e17993dbfe948ad2ab9bd2a87fed7336a9fb536e933ea81d595674b019a4fc4312e61306ed224996fdcc9e9131ced244ede1823d19270b72e7d0e43f SHA512 e96e747f74b628c306f4a28b36d40da109bf6b580c2dcf09426717a77e77620e63f3c559f83662f221e2ba95c9d317856c80e5e0f438edb82ef89b6d1d9879fa
diff --git a/dev-perl/GD/files/GD-2.760.0-respect-libdir.patch b/dev-perl/GD/files/GD-2.760.0-respect-libdir.patch
new file mode 100644
index 000000000000..3651cc3283e2
--- /dev/null
+++ b/dev-perl/GD/files/GD-2.760.0-respect-libdir.patch
@@ -0,0 +1,39 @@
+--- a/Makefile.PL
++++ b/Makefile.PL
+@@ -56,12 +56,6 @@ END
+ 
+ @LIBS    = qw(-lgd) unless @LIBS;
+ 
+-# support for AMD64 libraries
+-if (-d '/usr/lib64') {
+-  my @libs64 = map {my $a = $_; $a=~ s/lib$/lib64/; $a} @LIBPATH;
+-  @LIBPATH = (@LIBPATH,@libs64);
+-}
+-
+ #############################################################################################
+ # Build options passed in to script to support reproducible builds via Makefiles
+ #############################################################################################
+@@ -219,12 +213,6 @@ if( ! defined($lib_gd_path) )
+   $PREFIX = prompt('Where is libgd installed?','/usr/lib');
+ }
+ 
+-unless ($AUTOCONFIG || $PREFIX eq '/usr/lib') {
+-  $PREFIX =~ s!/lib$!!;
+-  unshift @INC,"-I$PREFIX/include";
+-  unshift @LIBPATH,"-L$PREFIX/lib";
+-}
+-
+ # FEATURE FLAGS
+ 
+ ##################################################################################################################
+--- a/Makefile.PL
++++ b/Makefile.PL
+@@ -514,7 +514,7 @@ sub try_to_autoconfigure {
+   unless ($config) {
+       my %config;
+       require ExtUtils::PkgConfig;
+-      %config = ExtUtils::PkgConfig->find ("$prefix/lib/pkgconfig/gdlib.pc") if $prefix;
++      %config = ExtUtils::PkgConfig->find ("$lib_gd_path/pkgconfig/gdlib.pc") if $prefix;
+       %config = ExtUtils::PkgConfig->find ("gdlib") unless %config;
+       return unless %config;
+       $version  = $config{modversion};
diff --git a/dev-perl/Manifest.gz b/dev-perl/Manifest.gz
index 42b44296d0c4..d48695a2e8bf 100644
Binary files a/dev-perl/Manifest.gz and b/dev-perl/Manifest.gz differ
diff --git a/dev-perl/Net-AMQP-RabbitMQ/Manifest b/dev-perl/Net-AMQP-RabbitMQ/Manifest
index 1e84fb533387..561dc98ed7c7 100644
--- a/dev-perl/Net-AMQP-RabbitMQ/Manifest
+++ b/dev-perl/Net-AMQP-RabbitMQ/Manifest
@@ -1,3 +1,5 @@
 DIST Net-AMQP-RabbitMQ-2.40009.tar.gz 198363 BLAKE2B 35aea3ba96b6b9cfaf8b8fa14d2a00326e4d64cc74d438ab59b6773f7ce67fd2ea7ded91a487eb20cdbe174c68825434839a8d7afb8e764e4a228e7088bba875 SHA512 2c0f53d59858e777fbc712c3bd06e3464783559dd9424c58a8fe586747e1d43aa4a607268484ec8bf4f10e979788ed5ea9558208096187c6e0c12a473e465459
+DIST Net-AMQP-RabbitMQ-2.40010.tar.gz 206449 BLAKE2B c7b3e8b9841fb10519da063088dd1f8b2aa9791d459ce88198610394d284c182147f22bf260c7291e36a9b56903499bc43991d029e02ff009709b38557b43bff SHA512 1e0256a3903379031059723ca0d11182ed4ef5a4ae4053d47f57ae1d4c5f42b3a9c48b7fd3dceb057c492c179bc01484651bb063fb5bca4542185fdca7471b06
 EBUILD Net-AMQP-RabbitMQ-2.40009.ebuild 1095 BLAKE2B ce8e7ceb5812cfe232811635a38a187a1d141bc5ef2195e85e73c82ad29049cb080f9e1fbdb4dddc9aed55e92ae9f4765b799c9ed9a9b706177edd0a9c8a02d7 SHA512 9f13b847d0a2615ed0095ea1cd5eb48764894d0741dcaa55f5d007028217df349d2ac1031a6bbcdebd2ccc14d8e441a85d139c7444816d81092d535de4e5d810
+EBUILD Net-AMQP-RabbitMQ-2.40010.ebuild 1095 BLAKE2B ce8e7ceb5812cfe232811635a38a187a1d141bc5ef2195e85e73c82ad29049cb080f9e1fbdb4dddc9aed55e92ae9f4765b799c9ed9a9b706177edd0a9c8a02d7 SHA512 9f13b847d0a2615ed0095ea1cd5eb48764894d0741dcaa55f5d007028217df349d2ac1031a6bbcdebd2ccc14d8e441a85d139c7444816d81092d535de4e5d810
 MISC metadata.xml 505 BLAKE2B d62dec2c43dbdb447305841145f339f353322e4191b3c9c88683013db6a734a53479dea77de1c6dd086a3bd81c0b80d70489460a2c278b17f4dec1a8c985302d SHA512 fc9e8ca0552cc6c5f638afaa918602f5fbd008c6a88afea0fc21366b3f2fa7289f1fef57a91111376bdb14566a826474dd0765ee9a9a88fa8e1bbfd3c9ba435c
diff --git a/dev-perl/Net-AMQP-RabbitMQ/Net-AMQP-RabbitMQ-2.40010.ebuild b/dev-perl/Net-AMQP-RabbitMQ/Net-AMQP-RabbitMQ-2.40010.ebuild
new file mode 100644
index 000000000000..dc9f888eecc1
--- /dev/null
+++ b/dev-perl/Net-AMQP-RabbitMQ/Net-AMQP-RabbitMQ-2.40010.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR="MSTEMLE"
+
+inherit perl-module
+
+DESCRIPTION="interact with RabbitMQ over AMQP using librabbitmq"
+
+LICENSE="|| ( Artistic GPL-1 GPL-2 GPL-3 )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-perl/Math-Int64-0.540.0"
+
+BDEPEND="${RDEPEND}
+	>=virtual/perl-ExtUtils-MakeMaker-6.660.0
+	test? (
+		net-misc/rabbitmq-server
+	)
+"
+
+src_test() {
+	einfo "Starting rabbitmq"
+	local -x RABBITMQ_LOG_BASE="${T}/rabbitmq/log"
+	local -x RABBITMQ_MNESIA_BASE="${T}/rabbitmq/mnesia"
+	local -x RABBITMQ_LOGS="${T}/rabbitmq.log"
+	local -x RABBITMQ_PID_FILE="${T}/rabbitmq.pid"
+	local -x RABBITMQ_ENABLED_PLUGINS_FILE="${T}/rabbitmq/enabled_plugins"
+	/usr/libexec/rabbitmq/rabbitmq-server -p 5672:5672 &
+
+	einfo "Waiting for rabbitmq to fully load"
+	while ! { echo >/dev/tcp/localhost/5672 ; } &> /dev/null; do
+		sleep 1
+	done
+	einfo "rabbitmq is ready"
+
+	perl-module_src_test
+
+	einfo "Stopping rabbitmq"
+	kill "$(<"${RABBITMQ_PID_FILE}")" || die
+}
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 69c2568adf1d..8acee88e92d8 100644
Binary files a/dev-python/Manifest.gz and b/dev-python/Manifest.gz differ
diff --git a/dev-python/aiohttp/Manifest b/dev-python/aiohttp/Manifest
index 4be3ab4c5300..95a26e3e6682 100644
--- a/dev-python/aiohttp/Manifest
+++ b/dev-python/aiohttp/Manifest
@@ -1,5 +1,5 @@
 DIST aiohttp-3.8.1.tar.gz 7324180 BLAKE2B 99f85b8510782a31de2d2f6c8efa65ef5c5cde600a5c5f49d6362d5833a0443b9adcaed9beb27c5d8502aca37af154b06017f48836b73d4c61d78204b62b7f05 SHA512 3611549393e50c8d30426aee9ddd23794a71ddefe4384eb549049b93e452fafb38de7ad900737213b61fbe717bd85035a780c1622593eae250328f17d484a0a7
 DIST aiohttp-3.8.3.tar.gz 7337480 BLAKE2B 28d2b5bf6dd6f19506127747511e006c22fcb59959ab090bdc53ca5ee0f7f186aedb0c8b4103c2ea52399dc998fa2e6d3f872239223cf72629a1168e3950f1f8 SHA512 248c232604c91442b2fc9fa55fbf7df8e3af56dcf4cd9c516414a3a738c5c60a8a06395cd9c6e2c8ea9884728aea757423735c7b9be889e6f17e3ee6395a2f64
 EBUILD aiohttp-3.8.1-r1.ebuild 3657 BLAKE2B 2da81b97e0b3f1d167557b6d675acd9a857e45b45166e924493900eaf395e77cee71d45b2f0c7e428ce7a0f22bd47cbfabc49fbb9e462216029a271a57dc5f7c SHA512 d9b644e44be853ab68704d175ac8a99bb292fd09fc8097c356ee0f8b06335420c3cec66bee3d20a554c0413d278e35c25cda08251fc5e00fcca20f2f68cb0e69
-EBUILD aiohttp-3.8.3.ebuild 2930 BLAKE2B 4263aa0e93bba3c8ad8b304c1e876784e82d9a5731c74919627162aeafc6e45743f05eda133e2f5522b3c297e95de46cdf11a8a801249aa8058b3bbd447aafb5 SHA512 b38fa068f3ef3dcae065476fd61223173302dabdd767f798b767b4af4f24de875fb458d08b0a4f28b71b4a0f94d96f011d331303614dd3e1b313d4a596e81bb1
+EBUILD aiohttp-3.8.3.ebuild 2923 BLAKE2B 216eb0c9e1f095b71c942193d191aebd087fb87c4ac1b8d03886af1faf07a3cb552227bd1652a47287fc26974cc32719a5893496f00a43a06beac380102d7ec9 SHA512 59bbaf9271ca864c76fe116d2a7f61d6c74bcf10fe9b2a2d8b68e5cd5976a93595cb93d58841ed358de68d8c31926ce0b7711ce4e3f3f1da13e9d67d7a37224e
 MISC metadata.xml 490 BLAKE2B 5233af0b5e2668b1eb62278b05b62f24f1ab90f6d05b20dd9f1c5b54b846919c3fa28b843df28f5bfa320996d46de0e74c7a28bd0bef02aaaca14b1cec52baba SHA512 9b701c5c5a22b6aa94977a67bc40f3dc9df8337556952658a2a17ecaaa471cd7f7b5b8bf3a0088208087677555f0cbb8760c091b03b96ee70affe3e2b84cf6d5
diff --git a/dev-python/aiohttp/aiohttp-3.8.3.ebuild b/dev-python/aiohttp/aiohttp-3.8.3.ebuild
index cc7d83ae9c0a..8cf3486e7213 100644
--- a/dev-python/aiohttp/aiohttp-3.8.3.ebuild
+++ b/dev-python/aiohttp/aiohttp-3.8.3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-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"
 IUSE="test-rust"
 
 RDEPEND="
diff --git a/dev-python/aws-sam-translator/Manifest b/dev-python/aws-sam-translator/Manifest
index 647ec95ad709..cbb3b970ce81 100644
--- a/dev-python/aws-sam-translator/Manifest
+++ b/dev-python/aws-sam-translator/Manifest
@@ -1,9 +1,3 @@
-DIST aws-sam-translator-1.50.0.gh.tar.gz 1103467 BLAKE2B 8d9408b7e92a5c515da47075a0722c937223e73dfa99d92d6daf91997a2edf4e1854afb88f7020fdab3457453d1c54ea77cf7e3466ec71ede36bfb3fc9c469fa SHA512 2f8f494218a1ac018893de59e7bede88b73ce446b29cc818d9309275851b080608656f69c422a9b49c885a6e6cbe7f34826f31cf4da9f2ee0667a1663dbee32a
-DIST aws-sam-translator-1.51.0.gh.tar.gz 1107033 BLAKE2B be5d46fa4caa7619c0b959eeec65d0902fdb197369c84c930618398a9b4110c2b1e281c80e63c659be266bb6b2f191495c40578fde73ab31c93bd05906bd55e3 SHA512 d21f3d0b3d4947ad25811f0274e5807089a8d1e2aab76310a80a92f48cfe9ac683bcecea3c833692948f94934be5662cf7585aab0a4a949fcf368901d2e1b9a8
-DIST aws-sam-translator-1.52.0.gh.tar.gz 1155351 BLAKE2B 523b7b8b31ee001da05b43a1a9ca17da30d3a4a63ebfefdd7dcb9e4a67088f8b6d51da3eefa241e4330bf901a7cd3544094d58b1b512fb8d967198a7d7b92ab0 SHA512 d6108086143d76bce810ec0276763dac944381ad22bb89f8ed5ed5197168bf9139808c5177655c6d59b57017b398cb8220acfb69d14d25883753e3b695b456f4
 DIST aws-sam-translator-1.53.0.gh.tar.gz 1158682 BLAKE2B 4bc8430936a1b180dc04637e540ecad7eb82cd7a5da5254f2b823075878a03ad3e63422c183b365b0dad927bcdf063b8ab40984ab23abe1d91d8bc3c411aa2f1 SHA512 292259bf8d4002b72be51db0358673eee61fe368be5db15e7faff195baae8fa194bef882fd0f5a9b5c46379fe5f9593d101a212121da8d0636aca709dd087f05
-EBUILD aws-sam-translator-1.50.0.ebuild 2255 BLAKE2B 48a47eaf224f0cf84d7d2ee0aa3e3e7ec62844b593e6aa14f6b8b5dc1e46934294fc4454f1c2666dc5d4148a9403c499f3ae43a1d522f5e9a3df929b52613b3f SHA512 8454a7fc31df79581066a995cc7c323e52eb70b29e2c2f9766a4cccba444e910763a51eec5f3920601b7e3d8023807a7558e8e6e083435ff66a0dc3403df187c
-EBUILD aws-sam-translator-1.51.0.ebuild 2257 BLAKE2B fd134b743ab8affdd452652ccabccb31122939c458dcd52f2019a0290c4a2725ac5a0b10fd102e71929f41d17037a2b7f10c3ef2019a022b94d5a80b79e691fc SHA512 756fb5f4baa0b7647d7af262ff895fcc5605cfe8fca0d8089f90d62e5ff846b60d0432a8df5e4a47487b289f10b20b3b4e7f9ec8a1927cc6b17cdbb245cec13b
-EBUILD aws-sam-translator-1.52.0.ebuild 2257 BLAKE2B fd134b743ab8affdd452652ccabccb31122939c458dcd52f2019a0290c4a2725ac5a0b10fd102e71929f41d17037a2b7f10c3ef2019a022b94d5a80b79e691fc SHA512 756fb5f4baa0b7647d7af262ff895fcc5605cfe8fca0d8089f90d62e5ff846b60d0432a8df5e4a47487b289f10b20b3b4e7f9ec8a1927cc6b17cdbb245cec13b
-EBUILD aws-sam-translator-1.53.0.ebuild 2257 BLAKE2B fd134b743ab8affdd452652ccabccb31122939c458dcd52f2019a0290c4a2725ac5a0b10fd102e71929f41d17037a2b7f10c3ef2019a022b94d5a80b79e691fc SHA512 756fb5f4baa0b7647d7af262ff895fcc5605cfe8fca0d8089f90d62e5ff846b60d0432a8df5e4a47487b289f10b20b3b4e7f9ec8a1927cc6b17cdbb245cec13b
+EBUILD aws-sam-translator-1.53.0.ebuild 2255 BLAKE2B 48a47eaf224f0cf84d7d2ee0aa3e3e7ec62844b593e6aa14f6b8b5dc1e46934294fc4454f1c2666dc5d4148a9403c499f3ae43a1d522f5e9a3df929b52613b3f SHA512 8454a7fc31df79581066a995cc7c323e52eb70b29e2c2f9766a4cccba444e910763a51eec5f3920601b7e3d8023807a7558e8e6e083435ff66a0dc3403df187c
 MISC metadata.xml 603 BLAKE2B 89556267393186cf69a585c58efeb6fa599bfb42ef221bea955ea807a28edee89036a2ee0d0ca81ae55d96702a01b171b837754dabf38047ecc2789157bb7116 SHA512 106b6d241eadf7807dadf03329073703f8b51e7443eddc4db8752878b6dd84cc4357689cd4b796b3a083192e9d98eacbe9e7b8af0273160c7b89846e78230a88
diff --git a/dev-python/aws-sam-translator/aws-sam-translator-1.50.0.ebuild b/dev-python/aws-sam-translator/aws-sam-translator-1.50.0.ebuild
deleted file mode 100644
index 0a009ad6cfeb..000000000000
--- a/dev-python/aws-sam-translator/aws-sam-translator-1.50.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="A library that transform SAM templates into AWS CloudFormation templates"
-HOMEPAGE="
-	https://github.com/aws/serverless-application-model/
-	https://pypi.org/project/aws-sam-translator/
-"
-SRC_URI="
-	https://github.com/aws/serverless-application-model/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/serverless-application-model-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	<dev-python/boto3-2[${PYTHON_USEDEP}]
-	>=dev-python/boto3-1.19.5[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.2[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/parameterized[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	tests/validator/test_validator_api.py::TestValidatorApi::test_errors_13_error_definitionuri
-	tests/unit/test_region_configuration.py::TestRegionConfiguration::test_is_service_supported_positive_4_ec2
-	tests/plugins/application/test_serverless_app_plugin.py::TestServerlessAppPlugin_on_before_transform_template_translate::test_sar_success_one_app
-	tests/plugins/application/test_serverless_app_plugin.py::TestServerlessAppPlugin_on_before_transform_template_translate::test_sar_throttling_doesnt_stop_processing
-	tests/plugins/application/test_serverless_app_plugin.py::TestServerlessAppPlugin_on_before_transform_template_translate::test_sleep_between_sar_checks
-	tests/plugins/application/test_serverless_app_plugin.py::TestServerlessAppPlugin_on_before_transform_template_translate::test_unexpected_sar_error_stops_processing
-	tests/plugins/application/test_serverless_app_plugin.py::TestServerlessAppPlugin_on_before_and_on_after_transform_template::test_time_limit_exceeds_between_combined_sar_calls
-)
-
-python_prepare_all() {
-	# remove pytest-cov dependency
-	sed -i -e '/addopts/d' pytest.ini || die
-
-	# deps are installed by ebuild, don't try to reinstall them via pip
-	truncate --size=0 requirements/*.txt || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/aws-sam-translator/aws-sam-translator-1.51.0.ebuild b/dev-python/aws-sam-translator/aws-sam-translator-1.51.0.ebuild
deleted file mode 100644
index 4194237c6fc3..000000000000
--- a/dev-python/aws-sam-translator/aws-sam-translator-1.51.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="A library that transform SAM templates into AWS CloudFormation templates"
-HOMEPAGE="
-	https://github.com/aws/serverless-application-model/
-	https://pypi.org/project/aws-sam-translator/
-"
-SRC_URI="
-	https://github.com/aws/serverless-application-model/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/serverless-application-model-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	<dev-python/boto3-2[${PYTHON_USEDEP}]
-	>=dev-python/boto3-1.19.5[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.2[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/parameterized[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	tests/validator/test_validator_api.py::TestValidatorApi::test_errors_13_error_definitionuri
-	tests/unit/test_region_configuration.py::TestRegionConfiguration::test_is_service_supported_positive_4_ec2
-	tests/plugins/application/test_serverless_app_plugin.py::TestServerlessAppPlugin_on_before_transform_template_translate::test_sar_success_one_app
-	tests/plugins/application/test_serverless_app_plugin.py::TestServerlessAppPlugin_on_before_transform_template_translate::test_sar_throttling_doesnt_stop_processing
-	tests/plugins/application/test_serverless_app_plugin.py::TestServerlessAppPlugin_on_before_transform_template_translate::test_sleep_between_sar_checks
-	tests/plugins/application/test_serverless_app_plugin.py::TestServerlessAppPlugin_on_before_transform_template_translate::test_unexpected_sar_error_stops_processing
-	tests/plugins/application/test_serverless_app_plugin.py::TestServerlessAppPlugin_on_before_and_on_after_transform_template::test_time_limit_exceeds_between_combined_sar_calls
-)
-
-python_prepare_all() {
-	# remove pytest-cov dependency
-	sed -i -e '/addopts/d' pytest.ini || die
-
-	# deps are installed by ebuild, don't try to reinstall them via pip
-	truncate --size=0 requirements/*.txt || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/aws-sam-translator/aws-sam-translator-1.52.0.ebuild b/dev-python/aws-sam-translator/aws-sam-translator-1.52.0.ebuild
deleted file mode 100644
index 4194237c6fc3..000000000000
--- a/dev-python/aws-sam-translator/aws-sam-translator-1.52.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="A library that transform SAM templates into AWS CloudFormation templates"
-HOMEPAGE="
-	https://github.com/aws/serverless-application-model/
-	https://pypi.org/project/aws-sam-translator/
-"
-SRC_URI="
-	https://github.com/aws/serverless-application-model/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/serverless-application-model-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	<dev-python/boto3-2[${PYTHON_USEDEP}]
-	>=dev-python/boto3-1.19.5[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.2[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/parameterized[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	tests/validator/test_validator_api.py::TestValidatorApi::test_errors_13_error_definitionuri
-	tests/unit/test_region_configuration.py::TestRegionConfiguration::test_is_service_supported_positive_4_ec2
-	tests/plugins/application/test_serverless_app_plugin.py::TestServerlessAppPlugin_on_before_transform_template_translate::test_sar_success_one_app
-	tests/plugins/application/test_serverless_app_plugin.py::TestServerlessAppPlugin_on_before_transform_template_translate::test_sar_throttling_doesnt_stop_processing
-	tests/plugins/application/test_serverless_app_plugin.py::TestServerlessAppPlugin_on_before_transform_template_translate::test_sleep_between_sar_checks
-	tests/plugins/application/test_serverless_app_plugin.py::TestServerlessAppPlugin_on_before_transform_template_translate::test_unexpected_sar_error_stops_processing
-	tests/plugins/application/test_serverless_app_plugin.py::TestServerlessAppPlugin_on_before_and_on_after_transform_template::test_time_limit_exceeds_between_combined_sar_calls
-)
-
-python_prepare_all() {
-	# remove pytest-cov dependency
-	sed -i -e '/addopts/d' pytest.ini || die
-
-	# deps are installed by ebuild, don't try to reinstall them via pip
-	truncate --size=0 requirements/*.txt || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/aws-sam-translator/aws-sam-translator-1.53.0.ebuild b/dev-python/aws-sam-translator/aws-sam-translator-1.53.0.ebuild
index 4194237c6fc3..0a009ad6cfeb 100644
--- a/dev-python/aws-sam-translator/aws-sam-translator-1.53.0.ebuild
+++ b/dev-python/aws-sam-translator/aws-sam-translator-1.53.0.ebuild
@@ -21,7 +21,7 @@ S="${WORKDIR}/serverless-application-model-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	<dev-python/boto3-2[${PYTHON_USEDEP}]
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index d6968e57d6b5..5bc60fe787db 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -1,20 +1,10 @@
-DIST boto3-1.24.80.gh.tar.gz 539716 BLAKE2B ccbbfa84e4e2274eb0275b9b2dcc0a4a78b139007829c4e3f880909f71e404be22c4461b687596bf12675c1212c6cf5b59c4383a042f60cb7919a10581fdc612 SHA512 aa3340e4bb9ae80f02fc70cf2be49d245e3dcc941b0b682c2827c1b8bb51d02e72ab7bf561e7d39397af8ca7ead7e115766fd4fd2eca18db2c551f55afb3e3b6
 DIST boto3-1.24.88.gh.tar.gz 543896 BLAKE2B 9dd2a18e3fb8d0a9f3a3a1fd7d0cceb491765690f99c7bd4200f37c66cbdb1e86dcdcdd09669d3175b97e762e6faabac3a2e5cba49136f42cba459e45f3ab67f SHA512 676528ca180c23834d1666b69292754e551a339914362da2708ff3f937c2eb04fe3b3dd1d4c6960eb8f5f7f58b1e0bcf13b1f52cc16a7c8d3bd025e9ea4ee109
-DIST boto3-1.24.89.gh.tar.gz 544293 BLAKE2B 53854b91c1c4c677eee743776a67e552bd2e11947839c442d81c1983930d6ff16d6bc5483c29b9a14b99a7cef09f3b9cd74cea9edb1cb76ff5458be3c9743164 SHA512 ef3b503b1313b8b7d84f5e4afdbe4e3d9e95ce3fbba81d400191295c71d4237e764f87ab6ebf2b29536248a520ab1273bee43bedd746596224f7400ce04c2c02
-DIST boto3-1.24.90.gh.tar.gz 545802 BLAKE2B 04148b878266a9d541a6fe8a4b4e8088fa2af11fd88b0fd9bac064bf493a9e787958d61c721254c1cf72edea72d761cd3583370f587c925f70c099027e94f72c SHA512 92c9da4559fdef7a7ee68eda9f1e9f70d652ec383471b9d1fafcf260b1456e84b7cc86347c3a0c44990f38aa87632885b1df65aafdae3c7f5948c0223ffe6981
-DIST boto3-1.24.91.gh.tar.gz 545914 BLAKE2B 763b39653d7de6ce27bb2a429ae0856a077f490e2c61b648ad89bde3c79731578272ffb558479517fd8a5235c41280413812b91f22604e6671cc1c941459fc90 SHA512 5b86a1518e8e6a9972d62dbcd8cd2f784d03e9e9fe7dc76ae4fc28b7c5151b277774bf01fce0473a3ff88af736132c389df5f7ae33c54f895b4c447e8cc19135
-DIST boto3-1.24.92.gh.tar.gz 546140 BLAKE2B 308f170f83a8cdc66c0423721e3fc9a2a58fe11f3b5bc7290e85aa637714ce10bd728ae69ff9e09a6e62bcf76a178e1f118e78e85c0c845d925be1937402ca87 SHA512 a8968f780a6b2929368f8696c83e501d42f17219e5015f668734e3a66146ca3e4cb539a2cd47525ba5a8376ee4cd4b180b9a362fd221f8fe75b78bfa17b92894
-DIST boto3-1.24.93.gh.tar.gz 546679 BLAKE2B edb3324c20fae7a0f7811d56c865c161dbd8f329a2bf2411641255439f6b046a773d414e884e1ec22cad7169e8b02f4644b7a39c4062fb9c845f2a42710263e2 SHA512 bd02644d14a3eb2b39b38269e503f3e7ef58a39ac69445306f23e7ddc56103c1cb7f5a2b7383ffa6eb65a5fb658bf67780ff2062840f018384df80d950ac4b46
-DIST boto3-1.24.95.gh.tar.gz 547598 BLAKE2B 0f648681e3b434a866763a72b936a3e43f83ff85d18c9e89646874cde81773cd8dad730f252f887c641a6bbb394fce743a2607d1a153a84319d3970875e6e5d6 SHA512 ab196e9a4d1be4cfa9b42d3172236d86e768bc2ac1ccbe4099b2c609cf6c20542b1c6dfb463d2984c8c87608892e5e347bd18d20989f947e32bd09973e769fc2
 DIST boto3-1.24.96.gh.tar.gz 547933 BLAKE2B 63c347b3abb383f36e4109b2695014dda6b4dd159b8f0e878ea17bcd24c9605dcf403a120b15f63e9a335065a1e3254813998a435d5eb1663f0066f2e7797be6 SHA512 9c3ac6dba99904a54e4b06b02531c2388d235b1926cb5bd7b767c679632b613db4a0d453030295e5f4101efdb7a3df8aca08e3c2e92a6725dc3df733cef37d72
-EBUILD boto3-1.24.80.ebuild 1579 BLAKE2B 394d8a1bb7a1036ab4821bc789c9eea285f8a6a7c21e751d60c94a53d5fdd37119eab54bfd19bfe0856b7557df04340f50c7cebbe631234e8f582e7d62af13ec SHA512 beee3b634e3b1d66365beb2e97b9d09188fa795e00d9d05f2101de423128741ee1f8ad8ae4b0c35f1e6c6473ce73cc3acf47d9141029b4435d39a9803a5fe1b2
+DIST boto3-1.25.0.gh.tar.gz 548321 BLAKE2B 46371869420a12b067594efbaa0d0f6b8003e813c5c85511fdead9841489bd333fe1207cc5310fd663628560a3c570ce495f0234ecc72eb93dfa20b79532390f SHA512 7cd6443fdb67a7e2df440c9b1ec84f7d37040549ddcdfaf5ca41fbee3d47e99d995f0be8690f22c25422391734d664746d00c88bd59aa269285f8c0e038836f9
+DIST boto3-1.25.1.gh.tar.gz 548647 BLAKE2B 84a6560e39ea526d1a4fa744bb4cb8fc2f934254c5949a08e0f40f34c363b6cf077dec4f6325da61fd06f5e2d2e021494bc29bf5993213fedc43f5914e18f062 SHA512 dbd0606e2aa4bd4eb3a836fe8e6da20eec97f5c62b5b43009f7296d1a51eaf7eaec7ca8246be8e3db2181e574d5672d72ea18deb4fc73a7cf3f0fca64ab1dacc
 EBUILD boto3-1.24.88.ebuild 1579 BLAKE2B 394d8a1bb7a1036ab4821bc789c9eea285f8a6a7c21e751d60c94a53d5fdd37119eab54bfd19bfe0856b7557df04340f50c7cebbe631234e8f582e7d62af13ec SHA512 beee3b634e3b1d66365beb2e97b9d09188fa795e00d9d05f2101de423128741ee1f8ad8ae4b0c35f1e6c6473ce73cc3acf47d9141029b4435d39a9803a5fe1b2
-EBUILD boto3-1.24.89.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
-EBUILD boto3-1.24.90.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
-EBUILD boto3-1.24.91.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
-EBUILD boto3-1.24.92.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
-EBUILD boto3-1.24.93.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
-EBUILD boto3-1.24.95.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
 EBUILD boto3-1.24.96.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
+EBUILD boto3-1.25.0.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
+EBUILD boto3-1.25.1.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
 EBUILD boto3-9999.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
 MISC metadata.xml 493 BLAKE2B 7d6324fc877ffe1d20c5369c2af0b09a7028f94d28f1841188913d0d8be7ea699c9d3f92c624992c4c96bd69615d3a1211a2483c76c56b7d3082492e43512523 SHA512 44420d8c03d5986f990b76369edfa8dfd7659b4952db3ad946fd05392ec594628a28745ad888d055d4f074d5214f61fcffafe6c04c4ab54109d45ac0371582bd
diff --git a/dev-python/boto3/boto3-1.24.80.ebuild b/dev-python/boto3/boto3-1.24.80.ebuild
deleted file mode 100644
index c93eb5e2d7c0..000000000000
--- a/dev-python/boto3/boto3-1.24.80.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..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.24.91.ebuild b/dev-python/boto3/boto3-1.24.91.ebuild
deleted file mode 100644
index 6edcc751d54b..000000000000
--- a/dev-python/boto3/boto3-1.24.91.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..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.24.92.ebuild b/dev-python/boto3/boto3-1.24.92.ebuild
deleted file mode 100644
index 6edcc751d54b..000000000000
--- a/dev-python/boto3/boto3-1.24.92.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..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.24.93.ebuild b/dev-python/boto3/boto3-1.24.93.ebuild
deleted file mode 100644
index 6edcc751d54b..000000000000
--- a/dev-python/boto3/boto3-1.24.93.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..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.24.95.ebuild b/dev-python/boto3/boto3-1.24.95.ebuild
deleted file mode 100644
index 6edcc751d54b..000000000000
--- a/dev-python/boto3/boto3-1.24.95.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..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.24.89.ebuild b/dev-python/boto3/boto3-1.25.0.ebuild
similarity index 100%
rename from dev-python/boto3/boto3-1.24.89.ebuild
rename to dev-python/boto3/boto3-1.25.0.ebuild
diff --git a/dev-python/boto3/boto3-1.24.90.ebuild b/dev-python/boto3/boto3-1.25.1.ebuild
similarity index 100%
rename from dev-python/boto3/boto3-1.24.90.ebuild
rename to dev-python/boto3/boto3-1.25.1.ebuild
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index 580a5d33f891..0da366fb294a 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -1,20 +1,10 @@
-DIST botocore-1.27.80.gh.tar.gz 9643079 BLAKE2B feec0b34c39b358eaff7f947fe83fc6dcd9926771b465c092e8071c334382d07d51a88fda775fc9fadae2544ac2f3e37c814bc9b8729730955b95d3efdf16b7b SHA512 f38ee5b252051a8208964387ff1550489c5900605d2aa5c69dc2d1229411015af1edaa51e9df4d56895c3fd2b4a56cca5179c1fd5aecbf5032ab80ce4c8f8b8e
 DIST botocore-1.27.88.gh.tar.gz 9703393 BLAKE2B b7152546ffd44fccc3607ce4fb0df586e192a68431d68f40063d6397d6005507118c49197e3bb0215ccc4ce6b075a2e95919dc0b2352da3562ba8b5675274ca4 SHA512 0cca62a8e357c8c345afa2ebfa8fa931aa75e323b93ecd63857db05fac7fcd83118012ee7f93921a31895721189995af3179f6ae62ee61cef68eda84edc88132
-DIST botocore-1.27.89.gh.tar.gz 9704257 BLAKE2B f7c0f34d93940aea72337c1cfb229ba79b06c15c99c7c1b719fcad9c2131cc98e084a14f8988e77e0627fac994bd4bfe539bcbcedd318b9bc861311772a5e99b SHA512 ddebfa73a4fee423ee7ead3e7d28ff9e8160f8459ea7cc341b1194759894aee24b07cec25030dedc4570416146d96159f532b7ec2e22d5279e4390bef3330a13
-DIST botocore-1.27.90.gh.tar.gz 9712235 BLAKE2B 3140dd97ed33b368bf605ff77e15ada2b0ace21d8816f7ea0b614f822a4f6ab1fe7640c52c08087cc3d12a8a6a2e15cde0895eb65d643441398b743800ed8296 SHA512 4ba1d0cc82ee0f0d77da2613b8dae20aeeb49d0ce6c87c074800e4887fa341948292a4fb9eec605c5a3f9ed9ff7773e4c8b46ff286d8b2d9588b125f5d3fcac9
-DIST botocore-1.27.91.gh.tar.gz 9712617 BLAKE2B 3317a45a297e1903d43d608760fb9e12c68d132f979bf4c76d73592aaa42a5f2d29a8c20bfa1f868365e962573bfa16986858dca2078b1fa797c58e71ab9a642 SHA512 0e2895cded36c3a9583c38ad018683556e26faa066d930c37a754798c31f0b510a86362357c66d13fbc141d04c30ae4f3d518ec46c95a1e37ed0e9912ab96a1e
-DIST botocore-1.27.92.gh.tar.gz 9758222 BLAKE2B 4f3c04b9822dfb84eacf758c6768e3e278cd53148041982ca89f7bba451cb287b23e0f13198543766caa9719e5010b0e5ee0cf1b072caf6c49602d07dac6c1ca SHA512 107f36ef2bfb2fb98f2b8b5db04d3f5c345b1a4e7c03f2e949da5b4eb3694bfdf8d711c6a154df4bd248ef98be3868d69ba5a429037e3be61db4d3a4aa7df9e0
-DIST botocore-1.27.93.gh.tar.gz 9759939 BLAKE2B 4d0afb73e8d0cd7bf14191ae104c28d5d0999db3542bf9ba7be1612ea616aeb446d13b13a91ecc0698471fad49b3623708d5d716229ad0f95fd17ff12809b466 SHA512 31fb75ccccc83a8235fdda36b09e2348f9698eb8999363ce8cba085ff91ff1ae505c20206c6c553a3fbad5a802b6888e02390203926b145909c86a92bc1c1180
-DIST botocore-1.27.95.gh.tar.gz 9790732 BLAKE2B 79d41a99a27b0dd01f9de1c722aba6a0826a2be7ef4f4114d9d20525b8110bed663a7c2a0613eb02c48b9b90ed3ee19e33015d63400b7b149e3ce76888632b82 SHA512 3831c3f389776c6beb18b0cf19e92af74974e54c4526224ab23904f43bef7f1a197fef8a8ee0e304bd3f114b9206daf0d720720b98b461cdee62aa0992ff654f
 DIST botocore-1.27.96.gh.tar.gz 9792299 BLAKE2B 7d4b388e0dd45a41c794ad8527287fb326c5e828c15998393936b817333055dfbc59f85365f074f6b3017715341d30fed4ea0de8e1ee24ee08d13eff36b369bf SHA512 1050c23a207d089af16e86404db0367936d186c23b8e1fcfa8ebb07737ad411c2771344d535edd5dde43f8473e45ad85c8e5c39f2ddb03449ead3c9daa746a22
-EBUILD botocore-1.27.80.ebuild 1801 BLAKE2B 224b9b1ebd6786f36115c25699b06ef4ace30f13c8c97fbac20f37ec3dec7219e89fae3fdc70ef2b808342e7dab564755b758952cd565f06ef68b1e387c1ee7e SHA512 f26fd77fbbc424dc20e7844807bb7650e73e989e15fa5c20c9733e3bc322f4a2fffda47fcd29f82490be7262648582b162f86b4951c8d338d9ebbb1312df8294
+DIST botocore-1.28.0.gh.tar.gz 9815905 BLAKE2B 40c7a5eb9aaa851b682c85d4045f4e3fbdbf34f2933e5a97cd84109e71d6b442c1075122b83870da20cba79a84dfeb213e1df62bf761efbc60d729d672e9224f SHA512 a9700867564d07024527a27c13a9a1fc5a014865afe9fa2f39401abbefeb16fae753fbaf97e81536de946fbb515724d6bdde864868077fd40b4fdfa2b7a35b9c
+DIST botocore-1.28.1.gh.tar.gz 9820975 BLAKE2B 76e578cb3b41e923ced56b12b79b36c589ad64324b6057168c4e0d92c7165f7df3709a2ba968e593d004b43320ca94c3a4a118f91ae1ce8420703c5c6bcd1100 SHA512 8a7ef4a209f145f39f6305fb5ed118849d46dc1bd10be2d0ef9dcd066f4b3dd78e2b3d391903b3d1db3f8ef3c8bc880c40dc3f7a02b4555845fb20f2ceb75ef4
 EBUILD botocore-1.27.88.ebuild 1801 BLAKE2B 224b9b1ebd6786f36115c25699b06ef4ace30f13c8c97fbac20f37ec3dec7219e89fae3fdc70ef2b808342e7dab564755b758952cd565f06ef68b1e387c1ee7e SHA512 f26fd77fbbc424dc20e7844807bb7650e73e989e15fa5c20c9733e3bc322f4a2fffda47fcd29f82490be7262648582b162f86b4951c8d338d9ebbb1312df8294
-EBUILD botocore-1.27.89.ebuild 1808 BLAKE2B 720965dfc40c51389a8ca4ac210039f79bbe3047f583cb1bd4d52bdb9720cb2283a13a9f4337a62aca6869cd75d78dac6cc07436524e9720386177c733d686f3 SHA512 d3a3fbc0f957b58e8161ae3fffedb44462000077aa368dd2fb183bf6a084771bff4db46344a4d0b451833ea05d326b452155af92d190c313e1d982da7d72fc10
-EBUILD botocore-1.27.90.ebuild 1808 BLAKE2B 720965dfc40c51389a8ca4ac210039f79bbe3047f583cb1bd4d52bdb9720cb2283a13a9f4337a62aca6869cd75d78dac6cc07436524e9720386177c733d686f3 SHA512 d3a3fbc0f957b58e8161ae3fffedb44462000077aa368dd2fb183bf6a084771bff4db46344a4d0b451833ea05d326b452155af92d190c313e1d982da7d72fc10
-EBUILD botocore-1.27.91.ebuild 1808 BLAKE2B 720965dfc40c51389a8ca4ac210039f79bbe3047f583cb1bd4d52bdb9720cb2283a13a9f4337a62aca6869cd75d78dac6cc07436524e9720386177c733d686f3 SHA512 d3a3fbc0f957b58e8161ae3fffedb44462000077aa368dd2fb183bf6a084771bff4db46344a4d0b451833ea05d326b452155af92d190c313e1d982da7d72fc10
-EBUILD botocore-1.27.92.ebuild 1808 BLAKE2B 720965dfc40c51389a8ca4ac210039f79bbe3047f583cb1bd4d52bdb9720cb2283a13a9f4337a62aca6869cd75d78dac6cc07436524e9720386177c733d686f3 SHA512 d3a3fbc0f957b58e8161ae3fffedb44462000077aa368dd2fb183bf6a084771bff4db46344a4d0b451833ea05d326b452155af92d190c313e1d982da7d72fc10
-EBUILD botocore-1.27.93.ebuild 1808 BLAKE2B 720965dfc40c51389a8ca4ac210039f79bbe3047f583cb1bd4d52bdb9720cb2283a13a9f4337a62aca6869cd75d78dac6cc07436524e9720386177c733d686f3 SHA512 d3a3fbc0f957b58e8161ae3fffedb44462000077aa368dd2fb183bf6a084771bff4db46344a4d0b451833ea05d326b452155af92d190c313e1d982da7d72fc10
-EBUILD botocore-1.27.95.ebuild 1808 BLAKE2B 720965dfc40c51389a8ca4ac210039f79bbe3047f583cb1bd4d52bdb9720cb2283a13a9f4337a62aca6869cd75d78dac6cc07436524e9720386177c733d686f3 SHA512 d3a3fbc0f957b58e8161ae3fffedb44462000077aa368dd2fb183bf6a084771bff4db46344a4d0b451833ea05d326b452155af92d190c313e1d982da7d72fc10
 EBUILD botocore-1.27.96.ebuild 1808 BLAKE2B 720965dfc40c51389a8ca4ac210039f79bbe3047f583cb1bd4d52bdb9720cb2283a13a9f4337a62aca6869cd75d78dac6cc07436524e9720386177c733d686f3 SHA512 d3a3fbc0f957b58e8161ae3fffedb44462000077aa368dd2fb183bf6a084771bff4db46344a4d0b451833ea05d326b452155af92d190c313e1d982da7d72fc10
+EBUILD botocore-1.28.0.ebuild 1808 BLAKE2B 720965dfc40c51389a8ca4ac210039f79bbe3047f583cb1bd4d52bdb9720cb2283a13a9f4337a62aca6869cd75d78dac6cc07436524e9720386177c733d686f3 SHA512 d3a3fbc0f957b58e8161ae3fffedb44462000077aa368dd2fb183bf6a084771bff4db46344a4d0b451833ea05d326b452155af92d190c313e1d982da7d72fc10
+EBUILD botocore-1.28.1.ebuild 1808 BLAKE2B 720965dfc40c51389a8ca4ac210039f79bbe3047f583cb1bd4d52bdb9720cb2283a13a9f4337a62aca6869cd75d78dac6cc07436524e9720386177c733d686f3 SHA512 d3a3fbc0f957b58e8161ae3fffedb44462000077aa368dd2fb183bf6a084771bff4db46344a4d0b451833ea05d326b452155af92d190c313e1d982da7d72fc10
 EBUILD botocore-9999.ebuild 1808 BLAKE2B 720965dfc40c51389a8ca4ac210039f79bbe3047f583cb1bd4d52bdb9720cb2283a13a9f4337a62aca6869cd75d78dac6cc07436524e9720386177c733d686f3 SHA512 d3a3fbc0f957b58e8161ae3fffedb44462000077aa368dd2fb183bf6a084771bff4db46344a4d0b451833ea05d326b452155af92d190c313e1d982da7d72fc10
 MISC metadata.xml 499 BLAKE2B e5aaa7da26f200c09adfdf38b68f656bbccbec627cb5d966b280ac2165334e7eec659c89075bcace748f58e2ec3e7d2998e54a688d56ecea2d30653c67dfd35a SHA512 103c554d5dbd967bf9b6e418b3913d9235e7e910d012160909ce0715134ed2e37b06e6a345395f9d16ce08d1cf51f3ce458bce93c6a978fd3dca6610f2acdbd0
diff --git a/dev-python/botocore/botocore-1.27.80.ebuild b/dev-python/botocore/botocore-1.27.80.ebuild
deleted file mode 100644
index fb557be6c315..000000000000
--- a/dev-python/botocore/botocore-1.27.80.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..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
-	)
-
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/botocore/botocore-1.27.91.ebuild b/dev-python/botocore/botocore-1.27.91.ebuild
deleted file mode 100644
index d1a6948e70e5..000000000000
--- a/dev-python/botocore/botocore-1.27.91.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..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
-	)
-
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/botocore/botocore-1.27.92.ebuild b/dev-python/botocore/botocore-1.27.92.ebuild
deleted file mode 100644
index d1a6948e70e5..000000000000
--- a/dev-python/botocore/botocore-1.27.92.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..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
-	)
-
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/botocore/botocore-1.27.93.ebuild b/dev-python/botocore/botocore-1.27.93.ebuild
deleted file mode 100644
index d1a6948e70e5..000000000000
--- a/dev-python/botocore/botocore-1.27.93.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..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
-	)
-
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/botocore/botocore-1.27.95.ebuild b/dev-python/botocore/botocore-1.27.95.ebuild
deleted file mode 100644
index d1a6948e70e5..000000000000
--- a/dev-python/botocore/botocore-1.27.95.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..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
-	)
-
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/botocore/botocore-1.27.89.ebuild b/dev-python/botocore/botocore-1.28.0.ebuild
similarity index 100%
rename from dev-python/botocore/botocore-1.27.89.ebuild
rename to dev-python/botocore/botocore-1.28.0.ebuild
diff --git a/dev-python/botocore/botocore-1.27.90.ebuild b/dev-python/botocore/botocore-1.28.1.ebuild
similarity index 100%
rename from dev-python/botocore/botocore-1.27.90.ebuild
rename to dev-python/botocore/botocore-1.28.1.ebuild
diff --git a/dev-python/brotlicffi/Manifest b/dev-python/brotlicffi/Manifest
index a537d5b5ea92..f16d0ab1e20c 100644
--- a/dev-python/brotlicffi/Manifest
+++ b/dev-python/brotlicffi/Manifest
@@ -1,4 +1,4 @@
 DIST brotli-46c1a881b41bb638c76247558aa04b1591af3aa7.tar.gz 19840371 BLAKE2B b9a1c3c2e5b62bd63b392debe54bd1732ac1cb31f88500f0142108b453649d96901d9a03b6db98642cb9abaf9188c06d440f2b8bd3cf57fbbb52196a931f5079 SHA512 dc573c90491032a205f32f0ce9c93e95b06c70a3107caa9501e038a212226c37117d63709a29843367344bf7d18cf32d0c0578b11166387198e12b38b1522406
 DIST brotlicffi-1.0.9.2.gh.tar.gz 22714 BLAKE2B 463cff7aed04718d1c77e6b3477dbbdb40cf61f0e045a7759bf1e8656e3b07e7b9f3ff5c5356069e752d750774a6ab203588a4094d27ad7ab9ae80f091c6ea3a SHA512 3d200f606c9851f0049835b53dd1f117727786505b5887e246934f41a978d375e1fa5a078e0811f130c009931e41c51575bd9d55b602ee7b6daebe9759ed15d5
-EBUILD brotlicffi-1.0.9.2-r1.ebuild 1472 BLAKE2B fad5c16ddbff176fc54d6fa14168ed546cac15dc64e2fc072cfb902f928ad30bf02801df13085daaf38eae4bf2d1f190c8c8e54ec4793f707e332d27551a926a SHA512 312ed9581a6bbda38c5a7f55b02f078b09e4146462d729edb0719b68e2770429a0c902b80d9803eb6fbd977836cf8236c8492217e1c4afb7134f360884b9c2b5
+EBUILD brotlicffi-1.0.9.2-r2.ebuild 1484 BLAKE2B 47168536662ab5c345bc38f01a819983325a54f198909aee6d5a8c217398f32e80995a43c311d29f4eb77134e0e2cbae370fff30a4ddd530554bc8e571bc60ec SHA512 cf0b50d8dd8e1313be31e91d1148e49969a19f00621319bbcc11b550ec9999e0afc40c10755b8f879c584a62f6e4fefc35216c1ca3abef027cbf6ef5406c7b6a
 MISC metadata.xml 377 BLAKE2B 13782cfbd514306140bb23753666679d94d15f89f0c2c84c13972151bd17d5c4ccd88930d60d732632f5e9a263d864b7aa5dcd741aae60508240e0f6d6f29230 SHA512 e440ae16d42ea9ab96317d26d88bf2955e0d8d5b4a6c41aca96a46c4f1e1c149d710d4cf52a569d6eb6d34ead71007fc2b2a7f67ff3c241e83d9573fe4d41e38
diff --git a/dev-python/brotlicffi/brotlicffi-1.0.9.2-r1.ebuild b/dev-python/brotlicffi/brotlicffi-1.0.9.2-r2.ebuild
similarity index 99%
rename from dev-python/brotlicffi/brotlicffi-1.0.9.2-r1.ebuild
rename to dev-python/brotlicffi/brotlicffi-1.0.9.2-r2.ebuild
index 4ea6fd766724..480f252b6009 100644
--- a/dev-python/brotlicffi/brotlicffi-1.0.9.2-r1.ebuild
+++ b/dev-python/brotlicffi/brotlicffi-1.0.9.2-r2.ebuild
@@ -37,6 +37,7 @@ RDEPEND="
 	' 'python*')
 "
 DEPEND="
+	${RDEPEND}
 	test? (
 		dev-python/hypothesis[${PYTHON_USEDEP}]
 	)
diff --git a/dev-python/brython/Manifest b/dev-python/brython/Manifest
index c7838318b1fa..3b690b0d7bae 100644
--- a/dev-python/brython/Manifest
+++ b/dev-python/brython/Manifest
@@ -1,5 +1,7 @@
 DIST brython-3.10.5.tar.gz 11106672 BLAKE2B 4219bdb99efd666e37ee08283e58f288e06dac52454931f72bcb4f3bf61a380fb1e01d724f49e598f6d7a95260609767d4536b5f04531939daaf93db6cdb23ad SHA512 7d2f50f94c9762d6587a9b0ed76805b14a5c2c89c0d27c7e181a3e3abdcdd28c9691fb80cd472f635f5bc6c36c884becd9a5625da4825d551b57b6b0779d3529
+DIST brython-3.11.gh.tar.gz 11684005 BLAKE2B d2ec61082787bbb571fa3a7239bad4e5d633e20f392684c532477d23ab7480dc0c3cd30a837c32fae57c88fa1779afec71bc7adb63bb4abd8f6d2d78717d55ef SHA512 98ee9c8cf1b3f8103310cf08b639fcea6675d178aedde5f425d3b44eac74552e569a8abca8cb6935cfcfc43a009ea73abbc646557a2bda916e5328a8933bea0d
 DIST brython-3.9.0.tar.gz 10232037 BLAKE2B 4dc70efa14174f90cddd72ba9c07afd7be4fc81cde3f9ace7b5f015acd4cc18e9ab222aded496523f7298cb7ecb93c1d691fda818ef9fe15fabbb876143af487 SHA512 fcacc6f5e959afd2c84980eb0a650028ad018f4ebda05c53ef0a73ef5a8e1b4a28b2940c08f6b5e82bb52975b671610ad47e42de0d6d3030a6b9f5af02784c20
 EBUILD brython-3.10.5.ebuild 792 BLAKE2B eba0c38e889b3eba79382ed812234b62261a49132e7e636b9ba90142071b32a8d5d3eb130b221d6827d6e868d582dd2500c1bb62dcda73b9e91711b1419d486d SHA512 84a248175e06b7ee43818844f5e71f0c3a08ba7ca830abe6df1811ae2f9746ab5b2b545d53caec1834a7373acdaf711cc20cdb2f3c3f6ebd4bb475568cf77011
+EBUILD brython-3.11.ebuild 800 BLAKE2B 02031743cdf108e0951244d9c5c4f117a8251fea01fa198010ce3fbf4b2757526ead39f4f189b0cfc03560e0e41962259c5b717be56c5063125278cca9ed8c37 SHA512 fc6901a79eb1632c1a1440042ef6f6775edfb74f4380125ad814a2b9bccabe45e9158dbce5286faee8dcf8270e2507bbe80d4c1a2377a8ee8f27d39e631a887e
 EBUILD brython-3.9.0.ebuild 761 BLAKE2B 8994e3c54de9d6855e703ad61b38cba69cfc68f34a2699be873e5f3d61650ab5bc749a9a3a9a2ab44eed93746ca4e5902c0f382894f7a8390dfabbafd56d5900 SHA512 e08e84a14f0b1f1e76b3328f4ee198bdeb981b626d88474321510bc961680fb7c2ee8722f45d842b820c60b7a1f98e4e349a7f33d2e711c143072f82d470d85c
 MISC metadata.xml 381 BLAKE2B ed49c3862223d1919202f08010e8e350d8231c33924c8b664a4cb03a09a5c75f3915840ce0b8f7d36c73809340fe3493f748b0f90bf02022f6d62b591a12ccc0 SHA512 7e5d3ac1d9ef869107f56816adb1b09c0c78772c4560fd9ada43a88bdf15fa9d3e53cfd8c4e8b814016faec0ac78fe2f2725f94c24e2c8453a184fcf0a4f123c
diff --git a/dev-python/brython/brython-3.11.ebuild b/dev-python/brython/brython-3.11.ebuild
new file mode 100644
index 000000000000..22a048a8d943
--- /dev/null
+++ b/dev-python/brython/brython-3.11.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+inherit webapp python-single-r1
+
+DESCRIPTION="Python 3 implementation for client-side web programming"
+HOMEPAGE="http://www.brython.info"
+SRC_URI="
+	https://github.com/${PN}-dev/${PN}/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}"
+
+need_httpd_cgi
+
+pkg_setup() {
+	webapp_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+src_install() {
+	dodoc LICENCE.txt README.md
+	rm -v LICENCE.txt README.md bower.json .{git*,tra*} server.py || die
+
+	webapp_src_preinst
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+
+	webapp_src_install
+}
diff --git a/dev-python/canonicaljson/Manifest b/dev-python/canonicaljson/Manifest
index ff612070e8de..9c17844b4471 100644
--- a/dev-python/canonicaljson/Manifest
+++ b/dev-python/canonicaljson/Manifest
@@ -1,5 +1,3 @@
-DIST canonicaljson-1.6.2.gh.tar.gz 10311 BLAKE2B 7460b99d8e95b223e4d092ee4158c13b5b101d7001fe111fed021c15128d040ef657ee03dbfba14d2e3df0a61f82a072e171a87312f47f524baad1603c6e47bb SHA512 5dfcf76e80814e65b897e216e18cbe69b3f44e7676fe433cefdcfa15dc18a004dc7586c16bf95b7457cb8e9268dedf2e7b1b92247b7c65afef30888b1c89bde5
 DIST canonicaljson-1.6.3.gh.tar.gz 10400 BLAKE2B 9d97ad9f8c0803fdfd1f4d2f85291fb175d19be23fb9c3bdf717030b9dae30f810329118c484cdf9dab5d77f01ea41b08653559fa188c90305126bdf3f4e5f9d SHA512 4b2cb7524425b8a4dde2359273f60110ca01081d31b0add158f106ff1f8874366978d6a15baed53a948503d4013b87a0b75ad7f6e8ea6ce42f3f9fc95672280f
-EBUILD canonicaljson-1.6.2.ebuild 601 BLAKE2B 3ff985939a122c56320f52a6f81ea7a44ad3747d0efd1fc46193392ae3cef408c60d562b3872267bad953dad519bc56dab14eec4754e70e7b7930ad10e5dbc1d SHA512 e21272bb03e037c723a0e476f51f9cb6da4862d37aaf6f655489411a5c3d247da13886ce63f11dbfe734e91ce5465351ca7a5283b1c7727090ecdfb221efb11c
-EBUILD canonicaljson-1.6.3.ebuild 607 BLAKE2B db66951148e1ab3836dbf6fb63db093177d5e723262d2f49b61aff7bf6aa5428d9dc2444036cdcef0c47d5a4f5bb95d258d47d6d67729c6dadb4e66d27a7f9ed SHA512 44fb4ce00a39788c204d68ebc4b3bef9eb8b8fd0504bd62af69a339692df16a6e670c7d1f565afb679d5c6b0a037bc7831c15e887e6d5fceca0253bfea2a279d
+EBUILD canonicaljson-1.6.3.ebuild 606 BLAKE2B 03a03d128b260bb43c081a6e70fc771d6478b2880d37832bc81fd52cc0e0b9a343273963c9d62634e2e81ec54b16a29f3dadcdaa6c636efb6457386c4ce05d2b SHA512 af5c6138a30308a8693104fcef490bf2732f60f7d97d753f3775ec15fc2ce2bc128e136bbcb57b72de6662688c0bd0a9185719c8df84b5b08cc7d14d7e9689e1
 MISC metadata.xml 562 BLAKE2B 09eeef3180d91d94572ed2095300f0a9638110d9fe6e2ebd9ab1bac29a10062dd630088ccc5774d49ecb1a83ee3f76f711b7c7166cd56497586fda6261114f8b SHA512 e459cb2290e3d64f41ebaf72ee51ab70c6a1638860a8be30e77451cbda03cbfa50a77088d2369d1fdf1c4984c8c04ac35c5e4005af3f429c1d2697beca6ef0b7
diff --git a/dev-python/canonicaljson/canonicaljson-1.6.2.ebuild b/dev-python/canonicaljson/canonicaljson-1.6.2.ebuild
deleted file mode 100644
index 8c050cdb8e11..000000000000
--- a/dev-python/canonicaljson/canonicaljson-1.6.2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 2022 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="Canonical JSON"
-HOMEPAGE="
-	https://github.com/matrix-org/python-canonicaljson/
-	https://pypi.org/project/canonicaljson/
-"
-SRC_URI="https://github.com/matrix-org/python-canonicaljson/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-S="${WORKDIR}/python-${P}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64"
-
-RDEPEND="dev-python/simplejson[${PYTHON_USEDEP}]"
-
-distutils_enable_tests unittest
diff --git a/dev-python/canonicaljson/canonicaljson-1.6.3.ebuild b/dev-python/canonicaljson/canonicaljson-1.6.3.ebuild
index 6862f00c53be..ef2341b08bb7 100644
--- a/dev-python/canonicaljson/canonicaljson-1.6.3.ebuild
+++ b/dev-python/canonicaljson/canonicaljson-1.6.3.ebuild
@@ -22,7 +22,7 @@ S="${WORKDIR}/python-${P}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64"
+KEYWORDS="amd64 ~ppc64"
 
 RDEPEND="dev-python/simplejson[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/cfn-lint/Manifest b/dev-python/cfn-lint/Manifest
index 26a964ccb9ea..c6602cd9fa93 100644
--- a/dev-python/cfn-lint/Manifest
+++ b/dev-python/cfn-lint/Manifest
@@ -1,15 +1,9 @@
-DIST cfn-lint-0.64.1.gh.tar.gz 9792758 BLAKE2B 95bc86fa41c17498575abfd4eb7e16d9e8a8dfc36d4304aa216890773e52d1e43f4deb178f2bd69c8edc445a417ca37ef53069ac9d398ccf27e3b9a6d90ee8c9 SHA512 edd7296e74db943c6ae818c2ae8f5220c4d8834eb7858c474e38f7852c1a7839b89ba949c105a3d2044f4b952e56fdc9e7a08493ed74e06b29ec9c0ea0b48a6a
-DIST cfn-lint-0.65.1.gh.tar.gz 9670213 BLAKE2B 22a627dc417f8df76fef9228eb4139210f693b0f5723e70f0dcb3651a18c921e8f174b8c97709016b2c184f3e12e03e49ad7e7a720415ad5cb820aecdfba4616 SHA512 391db28d47caa5cb66f3994944766f9ba6a0500ac5c8c474cef0a60e44236aedde7bceefb78cbc48cef3109ddf9206960a212df3ebdf7eb82b84940ca7202b7c
-DIST cfn-lint-0.66.0.gh.tar.gz 9710208 BLAKE2B e4d333d9ac0e05b9b6a7030ca63f2feb019d0b18d271f5e3d6a6176ac3c3c99c207709447be4397aecd831933f3938249786f6b043131b584432c04bcc2c1304 SHA512 05580c6602becd1b2545c1a87ffdbd3abf21026f76de2c476c986da3972a4dbb2a4ecc31f53dc23732bcfdd52a9c7ceb620f88c12a0b4b22536b6cb692e55f06
-DIST cfn-lint-0.66.1.gh.tar.gz 9738245 BLAKE2B e4b546d2f8543699e134ab33f2c06f71c48ff4685a50ac81d43e5089cceec45023499b30069ced9bdb7b76f56a6e7f2eb68efae0c59f3e82fe1fd2c31bf07cf5 SHA512 869f300d865b969e8203a071bee149e859b70a8d6bac0696ef65d73b523d0f7fb14c83b19243ff3f9eb0b5080bf008d905085e240a9d3b6c8804940c7f6e8f04
 DIST cfn-lint-0.67.0.gh.tar.gz 9787161 BLAKE2B 5299c956e7ca7c63c0c7608d51b01487cf4669f7af54c33f3d9917feae85565a2ce73a96a8d0a5d32cfe1c0a6db6d61b118f2994bb66700145787b650eefe6ea SHA512 35d4686da1f610a970dc1976d7a72ff58c884446f5967b069cc4826b2d9a1b75e2b8a10e676585009c918317186b4dac1c6dc78bf26215eefd5aadd4dce03e0e
-DIST cfn-lint-0.68.0.gh.tar.gz 9805426 BLAKE2B 6d7bb80943180fd1f11378db3d49d2705b68b60b5afc014db59d013d8e2be22469978060940e106ee5cf504cc10663e6427aa480ae1bbac22c3e52dc157e5403 SHA512 fb0c74ddd356cf95f04e9b86130aa56f6ef17a91c04027329d425fa83bbcf245dfc6f37fc1790c32c6d683e44512e06dabc9730d19687df470aaa390d3831395
 DIST cfn-lint-0.68.1.gh.tar.gz 9858724 BLAKE2B 469a23daa717add95140913d85861df44445464d80291430ec42aa2a83c2e125fc395428033c5b82c571297200b28412cc8531bf8e26a0491acfbc5536037cd6 SHA512 a81a1877b9efea411b71d485e66965ca6427998ea13d088c67849a2e8c3f9dd1c125ba0531cb48a27ad75638bde54270654b6da8576fc2fdb15088a0bfb543fe
-EBUILD cfn-lint-0.64.1.ebuild 1638 BLAKE2B aac7fa1a1a77be545e0198503a3557beff145ac1eff3615039ba66a994189f6de72f6062d2a6829199cb071bd03a3b23234992a293546178dc59af5bfc77ef74 SHA512 9eef4abcf551f313e508f2c3f1ffdae56142b2aa933942c0e9733d7e80a9d8324edd870d03a225683586a06fbd3a78dda5f95e81aac648e7864dcfc785797225
-EBUILD cfn-lint-0.65.1.ebuild 1640 BLAKE2B 02c81bbb43b8d2d2f9c56982e3b8ca13f7eb0c7e94eb7565a93c78df387ab1d2a9980f52d8a2f8f843fc816dbdf92f855eed49ec7b82620f6f1f1f722f015032 SHA512 e0a42d3d67973996bda7a3f283c93479be102a8c05097a4cb03d3b91ccb9fb9f446dcc4e1fca7752ad9f3b63f546f871f1f6d99d903ee186faf97fbcfa5dbe77
-EBUILD cfn-lint-0.66.0.ebuild 1640 BLAKE2B 02c81bbb43b8d2d2f9c56982e3b8ca13f7eb0c7e94eb7565a93c78df387ab1d2a9980f52d8a2f8f843fc816dbdf92f855eed49ec7b82620f6f1f1f722f015032 SHA512 e0a42d3d67973996bda7a3f283c93479be102a8c05097a4cb03d3b91ccb9fb9f446dcc4e1fca7752ad9f3b63f546f871f1f6d99d903ee186faf97fbcfa5dbe77
-EBUILD cfn-lint-0.66.1.ebuild 1640 BLAKE2B 02c81bbb43b8d2d2f9c56982e3b8ca13f7eb0c7e94eb7565a93c78df387ab1d2a9980f52d8a2f8f843fc816dbdf92f855eed49ec7b82620f6f1f1f722f015032 SHA512 e0a42d3d67973996bda7a3f283c93479be102a8c05097a4cb03d3b91ccb9fb9f446dcc4e1fca7752ad9f3b63f546f871f1f6d99d903ee186faf97fbcfa5dbe77
-EBUILD cfn-lint-0.67.0.ebuild 1640 BLAKE2B 63dd864e85c9b5285085148ae9333b7f37fbfd315781d2c29c76fc44c31d8224bcf28d82f5ade7624d03edadbd98a10bbdfe9712b0893535e21f64258a5488c7 SHA512 0e7c486093354f630615e4cba7d3248f68f67c296ad24e87b607450cfb8b2467748a707fef6c1d8938b53daa95f196efc92f59561ff4c8526b9a3378aaf9bd6e
-EBUILD cfn-lint-0.68.0.ebuild 1640 BLAKE2B ec6a9bdbdbb86461f0f2acb66fd1734ea65367182fef0d7b0baf080350972f8c701fa18d7b52bc4b243f5565c5b1ef0f98232bc8e9fcab71d19ffef9d413f016 SHA512 2bf2da99cc45b67e70c61127f855007d89bf82af5e39af3d48099da70794b83e1b2e959c1d89cf832fef080beee3d80a8f758cdb0a2b30a8f41c55d323cd97b7
+DIST cfn-lint-0.69.0.gh.tar.gz 9862506 BLAKE2B 68e6e5e93d7f07bda3eedda71d79943ef97fd0c2e972f475380f7943f88d843effa8cd23b4534bcf4ce0918ca7a634ecf32cef7c309711f9dbc6f899324f3f97 SHA512 9972fb1be897451116e269245d7302af31a53e54c1615daa65bd6b71b9a0ff3f62c1068d86c239510737ac95a6ab3ba2746838792680f701a404008f35857c64
+DIST cfn-lint-0.69.1.gh.tar.gz 9871037 BLAKE2B a6c4d1b3b892eee01231771dfbe7831737f8f6f89cf096a4ea0c1b945aa47574a51938d4b8ecdd7e3c2cd18df87ba343c07f3e379b49b78b07d7ec676f12e0d1 SHA512 1823485a0d2273a6a1c6632944a095bc4f9b7999f4e0dc81a47cb8673a3d02f822865b08ca3dfcf518b38a9c68a0f0bc5c3235904aca5ce94919ec627b9c3ddc
+EBUILD cfn-lint-0.67.0.ebuild 1638 BLAKE2B a439d73d2d83ca8489c2bcbf2c1034f650ad4216d6600e2163c60976ef0133fba36316e9cb263dbb7c3d12d756d8cad188c762732952d0392371a8e74bb58743 SHA512 1426c30e2dc1d63b765a109ee707fa8d466046789694cc1d3afa111c3263b3da11560c72ec6fdd180f213bd5619d9bc5f9b23bd0e9d230eef66d24b647fd2acf
 EBUILD cfn-lint-0.68.1.ebuild 1640 BLAKE2B ec6a9bdbdbb86461f0f2acb66fd1734ea65367182fef0d7b0baf080350972f8c701fa18d7b52bc4b243f5565c5b1ef0f98232bc8e9fcab71d19ffef9d413f016 SHA512 2bf2da99cc45b67e70c61127f855007d89bf82af5e39af3d48099da70794b83e1b2e959c1d89cf832fef080beee3d80a8f758cdb0a2b30a8f41c55d323cd97b7
+EBUILD cfn-lint-0.69.0.ebuild 1640 BLAKE2B ec6a9bdbdbb86461f0f2acb66fd1734ea65367182fef0d7b0baf080350972f8c701fa18d7b52bc4b243f5565c5b1ef0f98232bc8e9fcab71d19ffef9d413f016 SHA512 2bf2da99cc45b67e70c61127f855007d89bf82af5e39af3d48099da70794b83e1b2e959c1d89cf832fef080beee3d80a8f758cdb0a2b30a8f41c55d323cd97b7
+EBUILD cfn-lint-0.69.1.ebuild 1640 BLAKE2B ec6a9bdbdbb86461f0f2acb66fd1734ea65367182fef0d7b0baf080350972f8c701fa18d7b52bc4b243f5565c5b1ef0f98232bc8e9fcab71d19ffef9d413f016 SHA512 2bf2da99cc45b67e70c61127f855007d89bf82af5e39af3d48099da70794b83e1b2e959c1d89cf832fef080beee3d80a8f758cdb0a2b30a8f41c55d323cd97b7
 MISC metadata.xml 583 BLAKE2B 9f73e2b92e5cfa2ad59f5c8e5d91bdd3aa9eba3fa722b93b388cffea42020db7e7441bab5749432812934a4514d3e9104e6d897e1d115afa5ed237757bd48c03 SHA512 1866a349855ae4e248498b7aabd6ce4c4e10ea58731df4bfa13500f61dc041da6dbd7420e7d6a78fad46d5cf00bd7ef2d0c4c7d6819a21b3a5031b0d49588a19
diff --git a/dev-python/cfn-lint/cfn-lint-0.64.1.ebuild b/dev-python/cfn-lint/cfn-lint-0.64.1.ebuild
deleted file mode 100644
index efe7cae9474b..000000000000
--- a/dev-python/cfn-lint/cfn-lint-0.64.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="CloudFormation Linter"
-HOMEPAGE="
-	https://github.com/aws-cloudformation/cfn-lint/
-	https://pypi.org/project/cfn-lint/
-"
-SRC_URI="
-	https://github.com/aws-cloudformation/cfn-lint/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/aws-sam-translator-1.47.0[${PYTHON_USEDEP}]
-	dev-python/jsonpatch[${PYTHON_USEDEP}]
-	>=dev-python/jschema_to_python-1.2.3[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
-	dev-python/junit-xml[${PYTHON_USEDEP}]
-	dev-python/networkx[${PYTHON_USEDEP}]
-	>dev-python/pyyaml-5.4[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.15.0[${PYTHON_USEDEP}]
-	>=dev-python/sarif_om-1.0.4[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# TODO
-	test/unit/module/test_template.py::TestTemplate::test_build_graph
-	# requires git repo
-	test/unit/module/maintenance/test_update_documentation.py::TestUpdateDocumentation::test_update_docs
-	# Internet
-	test/unit/module/formatters/test_formatters.py::TestFormatters::test_sarif_formatter
-	test/unit/module/maintenance/test_update_resource_specs.py::TestUpdateResourceSpecs::test_update_resource_specs_python_2
-	test/unit/module/maintenance/test_update_resource_specs.py::TestUpdateResourceSpecs::test_update_resource_specs_python_3
-)
-
-src_prepare() {
-	# unpin the deps
-	sed -e 's:~=[0-9.]*::' -i setup.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/cfn-lint/cfn-lint-0.65.1.ebuild b/dev-python/cfn-lint/cfn-lint-0.65.1.ebuild
deleted file mode 100644
index d9b9960e1574..000000000000
--- a/dev-python/cfn-lint/cfn-lint-0.65.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="CloudFormation Linter"
-HOMEPAGE="
-	https://github.com/aws-cloudformation/cfn-lint/
-	https://pypi.org/project/cfn-lint/
-"
-SRC_URI="
-	https://github.com/aws-cloudformation/cfn-lint/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-
-RDEPEND="
-	>=dev-python/aws-sam-translator-1.51.0[${PYTHON_USEDEP}]
-	dev-python/jsonpatch[${PYTHON_USEDEP}]
-	>=dev-python/jschema_to_python-1.2.3[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
-	dev-python/junit-xml[${PYTHON_USEDEP}]
-	dev-python/networkx[${PYTHON_USEDEP}]
-	>dev-python/pyyaml-5.4[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.15.0[${PYTHON_USEDEP}]
-	>=dev-python/sarif_om-1.0.4[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# TODO
-	test/unit/module/test_template.py::TestTemplate::test_build_graph
-	# requires git repo
-	test/unit/module/maintenance/test_update_documentation.py::TestUpdateDocumentation::test_update_docs
-	# Internet
-	test/unit/module/formatters/test_formatters.py::TestFormatters::test_sarif_formatter
-	test/unit/module/maintenance/test_update_resource_specs.py::TestUpdateResourceSpecs::test_update_resource_specs_python_2
-	test/unit/module/maintenance/test_update_resource_specs.py::TestUpdateResourceSpecs::test_update_resource_specs_python_3
-)
-
-src_prepare() {
-	# unpin the deps
-	sed -e 's:~=[0-9.]*::' -i setup.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/cfn-lint/cfn-lint-0.66.1.ebuild b/dev-python/cfn-lint/cfn-lint-0.66.1.ebuild
deleted file mode 100644
index d9b9960e1574..000000000000
--- a/dev-python/cfn-lint/cfn-lint-0.66.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="CloudFormation Linter"
-HOMEPAGE="
-	https://github.com/aws-cloudformation/cfn-lint/
-	https://pypi.org/project/cfn-lint/
-"
-SRC_URI="
-	https://github.com/aws-cloudformation/cfn-lint/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-
-RDEPEND="
-	>=dev-python/aws-sam-translator-1.51.0[${PYTHON_USEDEP}]
-	dev-python/jsonpatch[${PYTHON_USEDEP}]
-	>=dev-python/jschema_to_python-1.2.3[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
-	dev-python/junit-xml[${PYTHON_USEDEP}]
-	dev-python/networkx[${PYTHON_USEDEP}]
-	>dev-python/pyyaml-5.4[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.15.0[${PYTHON_USEDEP}]
-	>=dev-python/sarif_om-1.0.4[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# TODO
-	test/unit/module/test_template.py::TestTemplate::test_build_graph
-	# requires git repo
-	test/unit/module/maintenance/test_update_documentation.py::TestUpdateDocumentation::test_update_docs
-	# Internet
-	test/unit/module/formatters/test_formatters.py::TestFormatters::test_sarif_formatter
-	test/unit/module/maintenance/test_update_resource_specs.py::TestUpdateResourceSpecs::test_update_resource_specs_python_2
-	test/unit/module/maintenance/test_update_resource_specs.py::TestUpdateResourceSpecs::test_update_resource_specs_python_3
-)
-
-src_prepare() {
-	# unpin the deps
-	sed -e 's:~=[0-9.]*::' -i setup.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/cfn-lint/cfn-lint-0.67.0.ebuild b/dev-python/cfn-lint/cfn-lint-0.67.0.ebuild
index 86e3c9ea0c3d..06aae2e797f0 100644
--- a/dev-python/cfn-lint/cfn-lint-0.67.0.ebuild
+++ b/dev-python/cfn-lint/cfn-lint-0.67.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/aws-sam-translator-1.52.0[${PYTHON_USEDEP}]
diff --git a/dev-python/cfn-lint/cfn-lint-0.68.0.ebuild b/dev-python/cfn-lint/cfn-lint-0.69.0.ebuild
similarity index 100%
rename from dev-python/cfn-lint/cfn-lint-0.68.0.ebuild
rename to dev-python/cfn-lint/cfn-lint-0.69.0.ebuild
diff --git a/dev-python/cfn-lint/cfn-lint-0.66.0.ebuild b/dev-python/cfn-lint/cfn-lint-0.69.1.ebuild
similarity index 94%
rename from dev-python/cfn-lint/cfn-lint-0.66.0.ebuild
rename to dev-python/cfn-lint/cfn-lint-0.69.1.ebuild
index d9b9960e1574..0916420e1790 100644
--- a/dev-python/cfn-lint/cfn-lint-0.66.0.ebuild
+++ b/dev-python/cfn-lint/cfn-lint-0.69.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
@@ -23,7 +23,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 
 RDEPEND="
-	>=dev-python/aws-sam-translator-1.51.0[${PYTHON_USEDEP}]
+	>=dev-python/aws-sam-translator-1.53.0[${PYTHON_USEDEP}]
 	dev-python/jsonpatch[${PYTHON_USEDEP}]
 	>=dev-python/jschema_to_python-1.2.3[${PYTHON_USEDEP}]
 	>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
diff --git a/dev-python/clang-python/Manifest b/dev-python/clang-python/Manifest
index 148c2876042c..ce74e0d3de31 100644
--- a/dev-python/clang-python/Manifest
+++ b/dev-python/clang-python/Manifest
@@ -7,8 +7,8 @@ DIST llvm-project-b34ea582774c057d9bf5591174d683fd3d8aa02b.tar.gz 169735900 BLAK
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
 EBUILD clang-python-13.0.1.ebuild 925 BLAKE2B 1dab0cbb672643072e7d824a262c81505d19e555f24f97f82156473affc2f5ba6fc34ec493ffeedbc82feb1245fc6a39126e1b81fcdc8f8b4ddd0b7fe108e4bb SHA512 11eaf5c7a484d756f01986eacce19c912666518892f3213ff42367c126c2d8474abf6608cca24e6250c64e7423464e7cb3e58c2b069c7febf4893b249f2ee304
 EBUILD clang-python-14.0.6.ebuild 956 BLAKE2B 491c8335c64484034663fd84ca2397e13afdd8cab6d3b4adfcc9317379e7a3620372ffe5996d4a0029a7d412f11a0d598f741a6893803ebadba85d330e49682a SHA512 4ef0d1ab2cbc3d277d4cced33fa87de7c3d43295a60a3b418ad4a95399e8de8c2e1e5c594681bf7ce1bfc465732d34b2db3a9e8636c0ed124ddf79c8ed7a5750
-EBUILD clang-python-15.0.3.9999.ebuild 1145 BLAKE2B 2c0006ee4c9c1d509374c1ec3673c162736786cf5d869ea7611fe5f34ac781a0e955b1da61576e40f945a1b8965142954ee2b30a30f496c94965af52c3202674 SHA512 9380040980974d397c5a38be33bbc932826b2adcbfd89abb95e67c26027459ee160b59a5b47466816fdda44cca3d89fa8177642a30404c6c4dcd695c20a81156
 EBUILD clang-python-15.0.3.ebuild 1168 BLAKE2B b393d5cbb5e01f46da90232e0dd5b265e01643a33085108fe6ada27b6407742814d6c61d37d23cbb93ed1cbe47bd2b4301d37d8e03ae5243e13fe0b92df4b492 SHA512 1337fb232189df580021eaa06c732bf5f2e5f59a506cc28e674913c048e81053d440eff05332510ecb4ab3596fb88ffae6d6eb9fecf9732424d83865b853c6c4
+EBUILD clang-python-15.0.4.9999.ebuild 1145 BLAKE2B 2c0006ee4c9c1d509374c1ec3673c162736786cf5d869ea7611fe5f34ac781a0e955b1da61576e40f945a1b8965142954ee2b30a30f496c94965af52c3202674 SHA512 9380040980974d397c5a38be33bbc932826b2adcbfd89abb95e67c26027459ee160b59a5b47466816fdda44cca3d89fa8177642a30404c6c4dcd695c20a81156
 EBUILD clang-python-16.0.0.9999.ebuild 1145 BLAKE2B 2c0006ee4c9c1d509374c1ec3673c162736786cf5d869ea7611fe5f34ac781a0e955b1da61576e40f945a1b8965142954ee2b30a30f496c94965af52c3202674 SHA512 9380040980974d397c5a38be33bbc932826b2adcbfd89abb95e67c26027459ee160b59a5b47466816fdda44cca3d89fa8177642a30404c6c4dcd695c20a81156
 EBUILD clang-python-16.0.0_pre20221016.ebuild 1145 BLAKE2B 2c0006ee4c9c1d509374c1ec3673c162736786cf5d869ea7611fe5f34ac781a0e955b1da61576e40f945a1b8965142954ee2b30a30f496c94965af52c3202674 SHA512 9380040980974d397c5a38be33bbc932826b2adcbfd89abb95e67c26027459ee160b59a5b47466816fdda44cca3d89fa8177642a30404c6c4dcd695c20a81156
 EBUILD clang-python-16.0.0_pre20221023.ebuild 1145 BLAKE2B 2c0006ee4c9c1d509374c1ec3673c162736786cf5d869ea7611fe5f34ac781a0e955b1da61576e40f945a1b8965142954ee2b30a30f496c94965af52c3202674 SHA512 9380040980974d397c5a38be33bbc932826b2adcbfd89abb95e67c26027459ee160b59a5b47466816fdda44cca3d89fa8177642a30404c6c4dcd695c20a81156
diff --git a/dev-python/clang-python/clang-python-15.0.3.9999.ebuild b/dev-python/clang-python/clang-python-15.0.4.9999.ebuild
similarity index 100%
rename from dev-python/clang-python/clang-python-15.0.3.9999.ebuild
rename to dev-python/clang-python/clang-python-15.0.4.9999.ebuild
diff --git a/dev-python/colorama/Manifest b/dev-python/colorama/Manifest
index f0bb20f2a6d5..14bed51e2a5c 100644
--- a/dev-python/colorama/Manifest
+++ b/dev-python/colorama/Manifest
@@ -1,3 +1,5 @@
 DIST colorama-0.4.5.gh.tar.gz 113373 BLAKE2B d7b071b1efa585c26c48f26af7a0df9bff25e3986f2615889fd25c34d785c256ac3c4655375f13e7d1bc6972f7fa64bd48a819d988160ceb75fda356d645876d SHA512 d4d3b2a4c6a0966b5c15a12cd789e4b68e5b632c4d745d93fcff5e250fe10e5d45dd2a8bd25f4399cca31a358aecf99f354aa3e1b74369ae382b51bd6c87644f
+DIST colorama-0.4.6.gh.tar.gz 116300 BLAKE2B 5b8f013a0cfa227dc750456d28af83dd6322000a3982e680d0cf051f6ae964b630f2889a0f1b78fe1cab465b25a52db07516cee9cbd99575dae38a86c5b69bd0 SHA512 2b269b190041398a1808b0b5147e47422b4451a1bc91841d0957572214ba8addd731c8932afdc60bfbba9833a0fe6c9c5c2ecb150613f13498f661799d625e4f
 EBUILD colorama-0.4.5.ebuild 1150 BLAKE2B 104fb49ae64ebb9224d0e66492c3351a08cbb5e5538defd75e0ae9afc998512a97f781c0e83b59f0c564d13b51f361c19d7cead18832b92251b643ca522b066f SHA512 749e7ddbaf1fc67c4b5c7cdccdc411789811afdc6d10c2b46806d0cccdb4d9ea018b3858bc354cd72d19db077cdc76174876dab68339d2feab1f21e772b9a512
+EBUILD colorama-0.4.6.ebuild 1157 BLAKE2B d0938b8e91910b78d5b9446833f0367b0c7d05c5427e01f75ac2e2302f0e7aa9552199b67b2c540f5e96e5f6470e9d7c5eeeff02b31369554d692ace7b9bc1f2 SHA512 4c66adab78df857a3b23bfac44d169dd1e97a5f37fa08cc4a602aefe924247257538d894b0f071210078adae532ef9b0d51aba4a06fa3a09ba6e217afa9960b1
 MISC metadata.xml 526 BLAKE2B f8f74b3797df9f8b0ab5ea81b6318d099a041cc3aac741084802272fdc7aaffdabc1269025f5e2b819cfe4608391a0857d208c487cc8f018578610faaad9f401 SHA512 dee4a202781edd36049ee9738dc9e90ffa63aa3874b389b5d0285147fbf86a577c15d55a868c0714ef982f78a2054636f464d6609af0693639d2449ae3d2ea53
diff --git a/dev-python/colorama/colorama-0.4.6.ebuild b/dev-python/colorama/colorama-0.4.6.ebuild
new file mode 100644
index 000000000000..08425bfd8fbf
--- /dev/null
+++ b/dev-python/colorama/colorama-0.4.6.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="ANSI escape character sequences for colored terminal text & cursor positioning"
+HOMEPAGE="
+	https://pypi.org/project/colorama/
+	https://github.com/tartley/colorama/
+"
+SRC_URI="
+	https://github.com/tartley/colorama/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples"
+
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	if use examples; then
+		docinto examples
+		dodoc -r demos/.
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	# Some tests require stdout to be a TTY
+	# https://github.com/tartley/colorama/issues/169
+	script -eqc "${EPYTHON} -m pytest -vv -s" /dev/null \
+		|| die "tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/cssselect2/Manifest b/dev-python/cssselect2/Manifest
index f271b41e0388..062a96deaa98 100644
--- a/dev-python/cssselect2/Manifest
+++ b/dev-python/cssselect2/Manifest
@@ -1,5 +1,3 @@
-DIST cssselect2-0.6.0.tar.gz 35442 BLAKE2B eb42c6abed531d9ece07ae5aa442be0c0ca926f982987ede1c5ba3e391950fcf88b1c322da5933842993ad5d98488e2a29aa714d1ca65b672cecbe425bac9bd7 SHA512 10cb55ebaaa16b755d85f1e511ae0281fb017d6937750392ae1da7f32d51ff944fb14c6d1c9ea5f42734450b719157ded116dc14ef471a9a20fcc43fb6682308
 DIST cssselect2-0.7.0.tar.gz 35888 BLAKE2B 14ad79878b7dbd9ce56fa9597a0678b3dc774fc81f599cd8eb28d67af5eb07914ff6f72dd6210d1e34787c78f85ebb22c8096c3a642f1c0092384e4f22a9e59c SHA512 e3c975fe159d3bec53002bda31c72d9cb346f40529272d8d5bef6aa13142ce60f1e8aa20b039d93ff5ff3d2cd34119b8b2d406f889964eded69e770e4f04e949
-EBUILD cssselect2-0.6.0.ebuild 737 BLAKE2B 31878e5b4c0ea50f469d162656a3a4b5734eb06678d37e71a249a283121137e217daac1d7de63448cd2daf9cc2c3e948427375d1b7fcde3776f064b6758aee81 SHA512 76d21bb2e1cc1f700ba58f0905667e3fc5a780794a2f824725d9cee360305d0dc7685825e86552db6d8cbdda034a51d45cab5e22c449d64cfe496cd9235118a4
-EBUILD cssselect2-0.7.0.ebuild 739 BLAKE2B 730dbe5fea17fd73f0e3ae02af17cbb1b9ce1628b3d641e31d64eca9b979407f124b729a0f2c6d13cd0f7b9a6a70b50b75a6e75e6a6bf43ee1b0d4cd78b4d973 SHA512 900266f5810bc161547d9cf39a6cc21a471e105c3c4dcf18e01b06543a112f2930fa5ae21c7d501128e4ba6b2999dbdf4a67c8e67feae0cd36eab0ab7d6d63ee
+EBUILD cssselect2-0.7.0.ebuild 737 BLAKE2B 31878e5b4c0ea50f469d162656a3a4b5734eb06678d37e71a249a283121137e217daac1d7de63448cd2daf9cc2c3e948427375d1b7fcde3776f064b6758aee81 SHA512 76d21bb2e1cc1f700ba58f0905667e3fc5a780794a2f824725d9cee360305d0dc7685825e86552db6d8cbdda034a51d45cab5e22c449d64cfe496cd9235118a4
 MISC metadata.xml 394 BLAKE2B 23a6ce3791a44c2a50b0a1853f1860ec76c15ca2a437e8406ef8459941921f8f92905933b59841ab9e3ef429a40435e2e480de38311f9bb078af747105d6eb41 SHA512 1c7692aebe1ec93fddf5e536af98a4be44c6610f8bfaff1f58ace0562916c24c5bc67db8455c1cc75eba3296b34a4fce3e72dd770abe4f51c1e83798ee9887eb
diff --git a/dev-python/cssselect2/cssselect2-0.6.0.ebuild b/dev-python/cssselect2/cssselect2-0.6.0.ebuild
deleted file mode 100644
index f5154b04c974..000000000000
--- a/dev-python/cssselect2/cssselect2-0.6.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Parses CSS3 Selectors and translates them to XPath 1.0"
-HOMEPAGE="
-	https://doc.courtbouillon.org/cssselect2/stable/
-	https://pypi.org/project/cssselect2/
-	https://github.com/Kozea/cssselect2/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
-
-RDEPEND="
-	dev-python/tinycss2[${PYTHON_USEDEP}]
-	dev-python/webencodings[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e '/addopts/d' pyproject.toml || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/cssselect2/cssselect2-0.7.0.ebuild b/dev-python/cssselect2/cssselect2-0.7.0.ebuild
index fccb1c1149ae..f5154b04c974 100644
--- a/dev-python/cssselect2/cssselect2-0.7.0.ebuild
+++ b/dev-python/cssselect2/cssselect2-0.7.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 
 RDEPEND="
 	dev-python/tinycss2[${PYTHON_USEDEP}]
diff --git a/dev-python/dask/Manifest b/dev-python/dask/Manifest
index 6d2199365649..9164db2792a5 100644
--- a/dev-python/dask/Manifest
+++ b/dev-python/dask/Manifest
@@ -1,9 +1,5 @@
 DIST dask-2022.10.0.gh.tar.gz 8778168 BLAKE2B d352f574cbf478747a95896c8b074c40c9bb413ccc6cd7b12d344b0dc7dc89bdc0613bf5b142e000b85f1c2a5a02e6eb8ac00b6db459a8580927cb4d7c54cf46 SHA512 d35ee0c710f4cccbdddca028a33f3f855ea26f94bebae1dd2a8c761cd0d116324daa03fd7fb5a4cb57d040f549f922b7373a0c089c9667b4da25fbb3b83efa02
-DIST dask-2022.9.0.gh.tar.gz 8762083 BLAKE2B 60c7a37124b61b49fc06a754b5842695fd63d234e087ec44a40793aeb330034e0d5e3caaedd239fd498a9b01c2bc450f62cdc22848bfd654bfdab6a07d9be7de SHA512 a88f71b9e8cdc69ce3a4babbc2434f830110df284d56eec37cadb6b81add3cd5f2e751ea5e9b390d112d16ee0952c296368851889fec202e3601c2fcf8f52a97
-DIST dask-2022.9.1.gh.tar.gz 8766675 BLAKE2B da4735dd860b96d691bbe3782ce04fb4e53a265984dc52593ecd1cbd1a1e536ad2677998e01bcfa99d783255ce053a44c4ed4cb0ce83128520755c20530bca3f SHA512 944d333bbe2f946b85173d289e287737816359a959b61d9bf2b9ef0f75173482a2912355fd71f8a8aa29e58f5b66a91909dc53c1cd269ab2bc569bad62a67f6c
 DIST dask-2022.9.2.gh.tar.gz 8767605 BLAKE2B ad0d9b7f849f984316768f1d1983e13177c3263b6803ce6d861b15b8d88c21c7dce4dae917ca28f8688797573503c6fd518816ca7d993d67c56172ef2adc73ec SHA512 467411933432821413f8440e6434b18c2bf76c616a92ec990bc71c141ea2cab235c1330e888ed77f429b6d00d588042928cd3b06d9b693d51302cf8c114700dd
 EBUILD dask-2022.10.0.ebuild 1780 BLAKE2B 24148b6128c95f1b700b3a5f1d53cf1e05147bc234a7092d8d64991c99af531e18664e413d4c35124f6062a25f32da5112846297650c54d719f48a5aa7cd3761 SHA512 559f6e575414a68c1e2db39a355120abd40d60d17ac9bda60919d508e0414776c5a0abeea2e70adf6f19a6039edf101dd20cbccd9079b18cc2b7dcef9f6ad767
-EBUILD dask-2022.9.0.ebuild 1779 BLAKE2B 4dea87e8411ff0ecb0aa0f647a0ca84f6b95f3289be3e9cf232bb66108bc1ecfbda8327960712df44cbdf1dcc6713c1a11cc3294ac6d8df7a700de5c058d9fd7 SHA512 4de6ded112a26208ef4c4ac039a2aa55464a47431d48b040c198e0e3fba3dc167af2a8786220cc8b1744ee2ffcaa0869eba90c187f1c481aa89e2fc5604f2f84
-EBUILD dask-2022.9.1.ebuild 1780 BLAKE2B 0af473bd7b44c26022591b631cae4f656a861b33cd415b78336658692d589712373058e7e82bf288959df7819ade2b941af7c84bdea97bf40ba20489e4fd78f6 SHA512 de374eabcd08502dde1c0a39819e21cac7903756bfcaff74d83cc75be2341c2e67359f25ad2d255978a3dc71e8fcc519a762c519c6051d6a942343abd7505aab
-EBUILD dask-2022.9.2.ebuild 1780 BLAKE2B 0af473bd7b44c26022591b631cae4f656a861b33cd415b78336658692d589712373058e7e82bf288959df7819ade2b941af7c84bdea97bf40ba20489e4fd78f6 SHA512 de374eabcd08502dde1c0a39819e21cac7903756bfcaff74d83cc75be2341c2e67359f25ad2d255978a3dc71e8fcc519a762c519c6051d6a942343abd7505aab
+EBUILD dask-2022.9.2.ebuild 1779 BLAKE2B 4dea87e8411ff0ecb0aa0f647a0ca84f6b95f3289be3e9cf232bb66108bc1ecfbda8327960712df44cbdf1dcc6713c1a11cc3294ac6d8df7a700de5c058d9fd7 SHA512 4de6ded112a26208ef4c4ac039a2aa55464a47431d48b040c198e0e3fba3dc167af2a8786220cc8b1744ee2ffcaa0869eba90c187f1c481aa89e2fc5604f2f84
 MISC metadata.xml 724 BLAKE2B 9af7553cec2b66228a21f146372d86b8d620048d68f94c1fd09006c8ee7ddaa4e212c2a359b937a5ee37ac23df01e10af0796e8b4cf952237cb4c73a2dff7ca0 SHA512 89b83402c13b06f7adf10cd1cc08b96b90dbc2ca3b5c0c6c422b6e2394e03fd51346306479557c11fcfdbd4a81a574890f2367228ea38531b5f05c02a30b8dcb
diff --git a/dev-python/dask/dask-2022.9.0.ebuild b/dev-python/dask/dask-2022.9.0.ebuild
deleted file mode 100644
index a25e140d6003..000000000000
--- a/dev-python/dask/dask-2022.9.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Task scheduling and blocked algorithms for parallel processing"
-HOMEPAGE="
-	https://www.dask.org/
-	https://github.com/dask/dask/
-	https://pypi.org/project/dask/
-"
-SRC_URI="
-	https://github.com/dask/dask/archive/${PV}.tar.gz -> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/cloudpickle-0.2.2[${PYTHON_USEDEP}]
-	>=dev-python/fsspec-0.6.0[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.15.1[${PYTHON_USEDEP}]
-	>=dev-python/pandas-0.25.0[${PYTHON_USEDEP}]
-	>=dev-python/packaging-20.0[${PYTHON_USEDEP}]
-	>=dev-python/partd-0.3.10[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-5.3.1[${PYTHON_USEDEP}]
-	>=dev-python/toolz-0.8.2[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/toolz[${PYTHON_USEDEP}]
-	test? (
-		dev-python/moto[${PYTHON_USEDEP}]
-		dev-python/numexpr[${PYTHON_USEDEP}]
-		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
-		dev-python/scipy[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# another test relying on -Werror
-	"dask/array/tests/test_overlap.py::test_map_overlap_no_depth[None]"
-	# TODO
-	dask/array/tests/test_reductions.py::test_mean_func_does_not_warn
-	dask/tests/test_config.py::test__get_paths
-	dask/array/tests/test_linalg.py::test_solve_assume_a
-	"dask/dataframe/tests/test_dataframe.py::test_repartition_npartitions[<lambda>0-float-5-1-True]"
-	"dask/dataframe/tests/test_dataframe.py::test_repartition_npartitions[<lambda>1-float-5-1-True]"
-)
-
-python_test() {
-	epytest -p no:flaky -m "not network"
-}
diff --git a/dev-python/dask/dask-2022.9.1.ebuild b/dev-python/dask/dask-2022.9.1.ebuild
deleted file mode 100644
index 6ad6f0bd45e1..000000000000
--- a/dev-python/dask/dask-2022.9.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Task scheduling and blocked algorithms for parallel processing"
-HOMEPAGE="
-	https://www.dask.org/
-	https://github.com/dask/dask/
-	https://pypi.org/project/dask/
-"
-SRC_URI="
-	https://github.com/dask/dask/archive/${PV}.tar.gz -> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/cloudpickle-0.2.2[${PYTHON_USEDEP}]
-	>=dev-python/fsspec-0.6.0[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.15.1[${PYTHON_USEDEP}]
-	>=dev-python/pandas-0.25.0[${PYTHON_USEDEP}]
-	>=dev-python/packaging-20.0[${PYTHON_USEDEP}]
-	>=dev-python/partd-0.3.10[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-5.3.1[${PYTHON_USEDEP}]
-	>=dev-python/toolz-0.8.2[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/toolz[${PYTHON_USEDEP}]
-	test? (
-		dev-python/moto[${PYTHON_USEDEP}]
-		dev-python/numexpr[${PYTHON_USEDEP}]
-		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
-		dev-python/scipy[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# another test relying on -Werror
-	"dask/array/tests/test_overlap.py::test_map_overlap_no_depth[None]"
-	# TODO
-	dask/array/tests/test_reductions.py::test_mean_func_does_not_warn
-	dask/tests/test_config.py::test__get_paths
-	dask/array/tests/test_linalg.py::test_solve_assume_a
-	"dask/dataframe/tests/test_dataframe.py::test_repartition_npartitions[<lambda>0-float-5-1-True]"
-	"dask/dataframe/tests/test_dataframe.py::test_repartition_npartitions[<lambda>1-float-5-1-True]"
-)
-
-python_test() {
-	epytest -p no:flaky -m "not network"
-}
diff --git a/dev-python/dask/dask-2022.9.2.ebuild b/dev-python/dask/dask-2022.9.2.ebuild
index 6ad6f0bd45e1..a25e140d6003 100644
--- a/dev-python/dask/dask-2022.9.2.ebuild
+++ b/dev-python/dask/dask-2022.9.2.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/cloudpickle-0.2.2[${PYTHON_USEDEP}]
diff --git a/dev-python/deepmerge/Manifest b/dev-python/deepmerge/Manifest
index 5efa1ccf70e5..2e9b5c5a5f40 100644
--- a/dev-python/deepmerge/Manifest
+++ b/dev-python/deepmerge/Manifest
@@ -1,3 +1,5 @@
 DIST deepmerge-1.0.1.gh.tar.gz 15004 BLAKE2B bc1d972f40485d02665fb6cd53875fa0f35e387192a9b0cc65f092966dc760a3ccc7eae6515693f39e58d7bb0a071aaac970873738a99b6962561eed641ef48b SHA512 689c9cc99c3770e27ae131bff65486ca02555840ae3fbeec1e36d08e425842e50ac7005d63ccf053627806c39578b2c9fb84fb10ca76731d17136cea61b87bbd
+DIST deepmerge-1.1.0.gh.tar.gz 15533 BLAKE2B 30fc1cdd7a5ce81783fa0804c20f44d4d7d62a1a6481a6defab3a2b5f542596fb4ab0d4ede5a7d4d128d188b56d17f260c67690deb89b55fb2fc76e1fbcffebc SHA512 f658518c11e0ea8b4e59a686e2e6ce90916c5e798c3521ef91a1fc09ec59badd9cddb74f51973cfe50891c5e8d054909e7a8acf2156cbb884492a059196a8d97
 EBUILD deepmerge-1.0.1.ebuild 741 BLAKE2B dde49f26d06074d3c2e7fec238037a16b8ffbf5c63e11ed0f1791fbc85a7c978dd7320ebd5da77efe874ea18cd71af028db99ca0f018d50f8bda2d07c6c520a9 SHA512 19618c67c3b74f790d5c563a6563446caa59a2f0dd49f4133239de219e0c72a8e496141f63d94201e304074e0696c2d200e70cc0ec72e57a7df8f0cb493be5be
+EBUILD deepmerge-1.1.0.ebuild 749 BLAKE2B df2a43abbee2fde3a9153b7916623bad0d758d120bfe0a503bb93b0e736cb8dd9e8a247c9b63e1a19726634d82c5254de502c7a2a4c0de7e2a5cf6ca51a5a3d5 SHA512 96d65427d01665d0f63428f8a6c44ca073f47f583d30548c04c955a7a893fafcebc3a7eece059a722a7224fd6c1c8695da5cf605a0ea208ba334c4aff38ae5b2
 MISC metadata.xml 337 BLAKE2B c9bffeb85e875d5beb45ed90ef00be6e559be49d8a7a8f437394b111d9a0d352b95ddb8925746a8de5fc68b27ddb72d382bf5fbdb25876efc4e2c657102d9d4b SHA512 5dd47098dff36f4b698b9ee5d1aeb2cd963bd099d4a256bc08ad7354967457310f4c316ccb3524576b751b0f26193752d8a7f31b67e70de1bfaed038d5ecacf5
diff --git a/dev-python/deepmerge/deepmerge-1.1.0.ebuild b/dev-python/deepmerge/deepmerge-1.1.0.ebuild
new file mode 100644
index 000000000000..92cc1a6e03b4
--- /dev/null
+++ b/dev-python/deepmerge/deepmerge-1.1.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Tools to handle merging of nested data structures in python"
+HOMEPAGE="
+	https://deepmerge.readthedocs.io/en/latest/
+	https://github.com/toumorokoshi/deepmerge/
+	https://pypi.org/project/deepmerge/
+"
+SRC_URI="
+	https://github.com/toumorokoshi/deepmerge/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/fakeredis/Manifest b/dev-python/fakeredis/Manifest
index 6cadbc7a14a2..eb67249415ad 100644
--- a/dev-python/fakeredis/Manifest
+++ b/dev-python/fakeredis/Manifest
@@ -1,7 +1,9 @@
+DIST fakeredis-py-1.10.0.gh.tar.gz 88305 BLAKE2B 71ffec7f872c8021914e24ee83f250e1e27bf2117fabb3513b54ad635692f43cefaf565090d3829ee189844a83ccc517016d8a4f9c31da82b2188d8d951c4dcf SHA512 8fb32917c70931de50ef90526854ee7c0d888c04582a284864c19956868961cd689db0a7b3ad39e783f53741efde5a33cc600faf09fdeac7046fe29e9cd75933
 DIST fakeredis-py-1.9.1.gh.tar.gz 86742 BLAKE2B aa3f0b05f486219cb6eb560f561ab3e39cc32286cdc3f4f9aba667e256528b9338dcc03f3ddb00c0db30ddb181afe535e209f6ee0e98c56a0cad445e2181ec67 SHA512 27b4c95e596fdd69cecc737897edfedd6f55e7c5610394b1532e4b2aededaed6ad15763582ce6cc20821ac7ea096f60204f7080d247359d8e8d0d360a61c8e39
 DIST fakeredis-py-1.9.2.gh.tar.gz 87038 BLAKE2B 89ae3059d58fc9649979b787339a98eaedccd2b29814090e1bf0cb2c54836ed722d829b9965d3d0a92ff4d8ee714f6a455b85f68b383a5ba6a67aefd20f70410 SHA512 6a4d90c0c327787b7505542a3615f383735bffb021cbfc0a2adf2cfb87326c517d67c1df2f318cd84b60b8d0f1dcb20faea05529a856bf81b0f3ae6cc16823ed
 DIST fakeredis-py-1.9.3.gh.tar.gz 87068 BLAKE2B ee657bd0b04f5701c9e6445ca646fcc510dc3235407372fec9891f7d1adc5cacbd7a52e2d520c930f53491c2a18f5578d1b5186337953439f93fbb69a5e65ef8 SHA512 5255a75bae15ac325a41a273c70a467c8622d5992d40967e4ac21920c0563dbad808e9b82af203e72e3404f74a7bbfd2c12f5d854f9d353defec5b0333843266
 DIST fakeredis-py-1.9.4.gh.tar.gz 87232 BLAKE2B b02b14960071ed38f6144b60d845d31d0d102f4d061dd2f156610f90385f35ff3128ab293fbf24049fd1f18a7558e9e13cc2f7179230a9837313acb2a7121053 SHA512 2fe74c5cc798edeef391136f8b09a651381faa04b7dd1e5a07007e6f89596e45970977b435e6fbdad03b73e9826a439da2e105ca9592fb3733547789d106182e
+EBUILD fakeredis-1.10.0.ebuild 2004 BLAKE2B 67f4176b7ce6141071c05d4f2ee007eb006c3c0a672e37980f56e027b0983effe2f317b2d03d8bdc35a680f5b274007ce9e0a18a40d409c4a9c2d35a045966fb SHA512 0e3f8edc71ce23ce6b28b63b80861eed4fec6f3c8ed8d627f9b6873b2a99af62c5e5c37796eb8fb7c46183a49311db21dcf6936bfee710ca4eda96eba8c4bae6
 EBUILD fakeredis-1.9.1.ebuild 2043 BLAKE2B c0b6eae42e2772b56ae73167087ee821aaa4c0631ec1d75feff85c5beb75148419185113f6ab98374462cb8336ebb073823490ff72b3a41d36da1fa6a3d6b7db SHA512 3e14b07b470537ed4b5ba6532fa183512ff138fd79bd357be43d5dbd7cd2939f18fe6caf4dd6e290a925328a1261f619d5bc8f1abc7eeb3f7ebbdc4b89886e7e
 EBUILD fakeredis-1.9.2.ebuild 2047 BLAKE2B 9ec125cf45e65b8c3ed480aec2cd6a2b86b192d053a0891e7b383aae488edb33f73a9361c51fceb7dd2c36d2fcdddc6be4b22867e8b12d7aaf34d0ea99cf6cf9 SHA512 9eb14c9878866aa8e2cbb3de940e5c694e5229855857ed72b488679d327e935800688ca54f47098ba59d7b28685ae96d5fd80c8eb3047e5976a892d2ec5ee89c
 EBUILD fakeredis-1.9.3.ebuild 2004 BLAKE2B 67f4176b7ce6141071c05d4f2ee007eb006c3c0a672e37980f56e027b0983effe2f317b2d03d8bdc35a680f5b274007ce9e0a18a40d409c4a9c2d35a045966fb SHA512 0e3f8edc71ce23ce6b28b63b80861eed4fec6f3c8ed8d627f9b6873b2a99af62c5e5c37796eb8fb7c46183a49311db21dcf6936bfee710ca4eda96eba8c4bae6
diff --git a/dev-python/fakeredis/fakeredis-1.10.0.ebuild b/dev-python/fakeredis/fakeredis-1.10.0.ebuild
new file mode 100644
index 000000000000..315d3ed64771
--- /dev/null
+++ b/dev-python/fakeredis/fakeredis-1.10.0.ebuild
@@ -0,0 +1,87 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( pypy3 python3_{8..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-py-4.2[${PYTHON_USEDEP}]
+	<dev-python/redis-py-4.4[${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
+
+src_prepare() {
+	# unpin redis
+	sed -i -e '/redis/s:<[0-9.]*:*:' pyproject.toml || die
+	distutils-r1_src_prepare
+}
+
+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]"
+	)
+	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/flask-compress/Manifest b/dev-python/flask-compress/Manifest
index 0420c719ef1e..beaa718dcc32 100644
--- a/dev-python/flask-compress/Manifest
+++ b/dev-python/flask-compress/Manifest
@@ -1,5 +1,3 @@
-DIST Flask-Compress-1.12.tar.gz 12581 BLAKE2B 5c925c19756730beaf5ac24b492e8bffcf7dd7c80df3c8440a8dfeca67e9756c50839246081b01b2da8c4b05839ee35b21b30f8e007734bbfcc1f056770ef3de SHA512 5712aff44aaaa379656e03f7b63fdef727721245cb9329e698a2e25aefca21a77202f5eb0c5f5828395647c694a5b417778a7b5db9eb592753a979d3994603a5
 DIST Flask-Compress-1.13.tar.gz 12675 BLAKE2B 252c63500e5ba2adbe857a52fcffe2dc8280198c79210d64ae8439c8e0daaeaa4e295002a5fdacb6724971018f7e3322c00bab85bfd0ad2291f53103f01f3ee1 SHA512 e910971f94966f14d4657f7fa1c92a4e73ca7afd08959ed5d5694228851f06e614873f3202d19c6a06be2c277136f097d88eb578773dd7b5e9130456c9828ed0
-EBUILD flask-compress-1.12.ebuild 666 BLAKE2B 01d83678fcceed6cff6e41aa64952430231e114c7b8351947136e53f269cef4b2cf84c3b45b5bb09a12444dd4a953a200d746f387576b24c5407d5396451ff78 SHA512 241580442e571b962a4eeb0c04683ff23298bd5501adcb43a3c92e3ac5d74754daca47934c12d3ddb37dae15b8e842995e0c862625a216d23f1b9217346be108
-EBUILD flask-compress-1.13.ebuild 668 BLAKE2B 5cf4f6b394bfd109cada5698ab7b95ef3841b35e657c929900e837d0c87ebb9749309e07219f38707608367b7b8065f711b48a37a526c09c1a96dec816f45594 SHA512 78f7ad6e575a000d259be04d4c30164d16520f60cfab4f45baf9174a9ff1f358fb82cbacdfbdcb557da78e9c8251fd4a8189c1a5bbe26f498c809a1eb06f3eb2
+EBUILD flask-compress-1.13.ebuild 666 BLAKE2B 01d83678fcceed6cff6e41aa64952430231e114c7b8351947136e53f269cef4b2cf84c3b45b5bb09a12444dd4a953a200d746f387576b24c5407d5396451ff78 SHA512 241580442e571b962a4eeb0c04683ff23298bd5501adcb43a3c92e3ac5d74754daca47934c12d3ddb37dae15b8e842995e0c862625a216d23f1b9217346be108
 MISC metadata.xml 525 BLAKE2B 3d7d87c0c376b9fef9f88f976b29adb728c0c6dd8102e413de5f7c9d0116bc040b7dce813c945b9b25d62dee5054425b34264b432725201a828858f63d62eafb SHA512 39d1a786add6c53c2a86cbe41bfcc41490e22a094d0f5741368249f08618725efad2cd7edaa172bd0ee7648d9b320c453180ec77d3e9b88ea8573aea3d982cd5
diff --git a/dev-python/flask-compress/flask-compress-1.12.ebuild b/dev-python/flask-compress/flask-compress-1.12.ebuild
deleted file mode 100644
index 9d5901c77d5c..000000000000
--- a/dev-python/flask-compress/flask-compress-1.12.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1
-
-MY_PN="Flask-Compress"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Compress responses in your Flask app with gzip"
-HOMEPAGE="
-	https://github.com/colour-science/flask-compress/
-	https://pypi.org/project/Flask-Compress/
-"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	app-arch/brotli[python,${PYTHON_USEDEP}]
-	dev-python/flask[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/flask-compress/flask-compress-1.13.ebuild b/dev-python/flask-compress/flask-compress-1.13.ebuild
index 4464bc0c4ec8..9d5901c77d5c 100644
--- a/dev-python/flask-compress/flask-compress-1.13.ebuild
+++ b/dev-python/flask-compress/flask-compress-1.13.ebuild
@@ -21,7 +21,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	app-arch/brotli[python,${PYTHON_USEDEP}]
diff --git a/dev-python/flask-htmlmin/Manifest b/dev-python/flask-htmlmin/Manifest
index 07941be381aa..a444aca44992 100644
--- a/dev-python/flask-htmlmin/Manifest
+++ b/dev-python/flask-htmlmin/Manifest
@@ -1,3 +1,5 @@
 DIST Flask-HTMLmin-2.2.0.gh.tar.gz 17637 BLAKE2B 541ae212ba5bfd5e5881adb108d62c994248a7f851512d0fddedb001737620433cb46e267cdd66de73a353c6b357802eb89ea33c771153bc0acf3937c06f83c3 SHA512 24287ef93e99a16e7dde35ba6b7b8fefa06f11ce30fb47969313c3e0e1135ac8a2685aac06bc430d3253162f4f2bc7e8eed90ddda2092bbad092d4e0d09cb4fc
+DIST Flask-HTMLmin-2.2.1.gh.tar.gz 17550 BLAKE2B 30393f6739ba8bdcfc17586e0955dff4341707b3c5bc27e30e9f9ddd5d4ff5b5b1b71b512b034b3b09cab3bfbcfb47c1651bc8cedba597de8aca5f2c7cfc0907 SHA512 34d5c9e2393901b32ab43c4333d87d75b489a410af2fdb019c180d0cb7bac01074616125486b49ef577782311a394bde6444ce311d5ab4f2ae2852a3ea92f4cd
 EBUILD flask-htmlmin-2.2.0.ebuild 707 BLAKE2B 6478442db22f1b259efe2db803693c4d56947ca89f2549e5f544d8330be00074c0b9c42dd24d48c408db7d9d4a13db73dbb82b59f0475fe0a7fbe85a971f3491 SHA512 edd35e44fe95acc70d3010dca3d8bf63852892cb74d9bc364519fc8e9fd7a757e825ccaca64a9feb926849416f1da8e3e0d3e745e97b637918c3af15ebf2586a
+EBUILD flask-htmlmin-2.2.1.ebuild 694 BLAKE2B 65ade5fb5b44bba6e56bfc6a8c00689b4c9a16ca8b83a4caed837c2d6f5781862fe7680b0a9e0660f7e77ef5e40d52996eb030e91cd7e6fa00c07bbda03c49d3 SHA512 fee76464c5f37f6b895aeee13e7c37496da5c7c26f6a5f0f961630e4a8c99f413c84f3233bde636f7ab26e74b6d2315276bc9eb26a1e44fe25d2f504ef75963d
 MISC metadata.xml 517 BLAKE2B e22522b2f2578e000de4127d3c6cd5d6f08b3974aef72644e51ae39e074eed3d42cba247b2dff4090e930cd9ecb5354f7094a763c116989d425672d109fdd408 SHA512 6393c0fb4084501989d12c24f7e56269780423d675761e48da3ed159db639df3639e5a68cfcfaa8a53d1e111474d05656f227137af2ee7950f4ec88f1393216c
diff --git a/dev-python/flask-htmlmin/flask-htmlmin-2.2.1.ebuild b/dev-python/flask-htmlmin/flask-htmlmin-2.2.1.ebuild
new file mode 100644
index 000000000000..a19920f25153
--- /dev/null
+++ b/dev-python/flask-htmlmin/flask-htmlmin-2.2.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+MY_P="Flask-HTMLmin-${PV}"
+DESCRIPTION="Minimize your flask rendered html"
+HOMEPAGE="
+	https://github.com/hamidfzm/Flask-HTMLmin/
+	https://pypi.org/project/Flask-HTMLmin/
+"
+SRC_URI="
+	https://github.com/hamidfzm/Flask-HTMLmin/archive/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	app-text/cssmin[${PYTHON_USEDEP}]
+	app-text/htmlmin[${PYTHON_USEDEP}]
+	dev-python/flask[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/fonttools/Manifest b/dev-python/fonttools/Manifest
index 3f11ef5f98a1..07e54e96e06e 100644
--- a/dev-python/fonttools/Manifest
+++ b/dev-python/fonttools/Manifest
@@ -1,11 +1,5 @@
-DIST fonttools-4.36.0.gh.tar.gz 3567028 BLAKE2B 45c2481680a314e101ed3a14915585b503a15853937846a5ceadd15e524f053663e0c6876bb105b0f2593ac790029da48cbede8139be98809764e5a6e3e2b11a SHA512 48a07548f72e9818292c1552675fce94b8ecb876172cd7adb429426c1d987f54a6e0482b7847e48c3b9854821567023cce402c613488d9e17277eff8a615d3c2
-DIST fonttools-4.37.2.gh.tar.gz 3593663 BLAKE2B d0e6e7beb370a8611f6c92cb3c0d253cda1a946985dee12d1e911a33d45415e15ecdadd2be3eef3d121ffc27a450ed19bcea7c5b19f562af206ea6207b0c7dee SHA512 5850c31f68a6a7e1476644938ccb69d1213eb218a966a67c72f41fbbbc63cf5ed2f9638ce9497fd0702308ebf5637fc471b32a44b2ebcfbb9f4d3c2898dd626b
-DIST fonttools-4.37.3.gh.tar.gz 3594598 BLAKE2B bd2c347e1542c2be4136c75804d95ddc1514c4b131f6754467e4229928391f607d206b6edff1fbce62d270801adac3d53fa187a06983dec6d44c699029a8e47e SHA512 7e8f9d68d59e6e842f2cc7acabd4188a1f5b1beb3437148ecb4ced1144eca5ae6af64c501b8ffedb780c72d84c73d7363d7d6ef3b3fc829bad27cba0c15c5ca9
 DIST fonttools-4.37.4.gh.tar.gz 3595501 BLAKE2B 0b3e9e40ca73e1a612d632116c57d1ef9d641a759bdc570c3389ee603b0d8d98974a41fc0339e6dd4ec0cdbfdb9c5905afcf28b33e39eac6c4dcdba6fe64e860 SHA512 9e9c49732ca1e16a8d5b294423939297278d544456b37f5fd3b1f3eece8d9100834f8d7a8dee5908006a27419fbda06180ac588de5046a59fb243d728314939c
 DIST fonttools-4.38.0.gh.tar.gz 3603281 BLAKE2B 8ec558c35cc10b32760eb199dce7c40934210db9ba8c9b0ad7a8cd2ca206260d2d73769bd1ff4cb597dd46cd50a42d733c967199120366e22abc5ee2b81e0919 SHA512 438694e7a4c19ee63ab504763793c0219d96fdc58095fe55a4f44726e96a3ec8ae63066aa47a341a059c7a2c9893b9bbbdfc8ab4d75c177cbd90986debc31431
-EBUILD fonttools-4.36.0.ebuild 1516 BLAKE2B 7b9540de8ab5c231b1cd133b014e9e0d0a265ea2452ffa5326dc84902708319bbbb02a001216cc0c1f8e1d84cfebcdf1d08ee2710741fdc816d3aca033e7ebca SHA512 2d6f905463b5049d4b95fb0e317c263a2dc8b098c432f2169230070a018eeb4bbd2308a99ba5ee4645e67f6b945fd3ee3b95fb1c47e59a001355f48d8996fae0
-EBUILD fonttools-4.37.2.ebuild 1524 BLAKE2B 006a2e378c259889001bb01a0ef51350d34fbc3c59d9445d3669317e66916f6d546ca7be3dfffab3b56505bad8bf9a738f6e093829eedbedde2162e5cfda798b SHA512 30d8c62dc7dc26a9218f1cf7e0a4c9553299b4268bdc6a68556d565598ceda574ba194a090390e46a88606ade224c96ba5f49d4143f6ac79074fdfcb1bba97d0
-EBUILD fonttools-4.37.3.ebuild 1562 BLAKE2B 2bb7e510ffad7508d3eab0d98b08a740c60c9d981bcd1934d6b4069604628e481c43f39dd1837b39f32637402fb1148b86018afa8983f40a2454be746d8a67d3 SHA512 11833f0747c5676be2823f60cc28dba9f054f37fa1afeba2c958fdcf3a3d7e5644a09be0470bc6ce8c28b28f743f3271f5e24f6592f7f81ff5b037b3112f6e2f
-EBUILD fonttools-4.37.4.ebuild 1556 BLAKE2B fb40586d0e2c622847e9e08823fe38d4d48b350ac5e799f05ee993018ff1f8c904c589a9f78bb45d7b98c82caf299133e58b0b9c0bd5088b5d7543e522a30e70 SHA512 4b4d948ab28deef8645889c662cc133a81c313c84f941fb160e6f90cc32f44f6f041eeab3d2018075fda387b44fae5f4b16acb15fc0bfc8ff7c4af5fd50531c3
+EBUILD fonttools-4.37.4.ebuild 1554 BLAKE2B 44f95549cba24882b10fa630004815545734caff372c187b63fc57170f9a4f5c4220b50af937b052aa1575d2bf0778cd24405bba11c67f7feb13b760687461dc SHA512 65783ae6ccbb1d98ee53826d316a8fcde2d373a4259ed1d370b3e54e88027311d4594f5ccb193a93e4a4b90d49cbcbed8b34909a2a35898378e97afcdf15dda5
 EBUILD fonttools-4.38.0.ebuild 1562 BLAKE2B 2bb7e510ffad7508d3eab0d98b08a740c60c9d981bcd1934d6b4069604628e481c43f39dd1837b39f32637402fb1148b86018afa8983f40a2454be746d8a67d3 SHA512 11833f0747c5676be2823f60cc28dba9f054f37fa1afeba2c958fdcf3a3d7e5644a09be0470bc6ce8c28b28f743f3271f5e24f6592f7f81ff5b037b3112f6e2f
 MISC metadata.xml 372 BLAKE2B 950ec78bf127250847c6513c22a5108b251afdb000d361068edf9d00d64a5baf6925ba4058bb889724febb28d92abc044c29af5936a48d8e8951b12314b64357 SHA512 03e76e28959bab83fe41c3ee4b55692ced9b1360e73e38a6e8f6e5c06fd1185dcbe0214aea2edff18d248abf252c1877d0d2c2b78b8e088e606c09c34e93e7ac
diff --git a/dev-python/fonttools/fonttools-4.36.0.ebuild b/dev-python/fonttools/fonttools-4.36.0.ebuild
deleted file mode 100644
index 979b917eb321..000000000000
--- a/dev-python/fonttools/fonttools-4.36.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Library for manipulating TrueType, OpenType, AFM and Type1 fonts"
-HOMEPAGE="https://github.com/fonttools/fonttools/"
-SRC_URI="https://github.com/fonttools/fonttools/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-RDEPEND=">=dev-python/fs-2.4.9[${PYTHON_USEDEP}]"
-BDEPEND="${RDEPEND}
-	dev-python/cython[${PYTHON_USEDEP}]
-	test? (
-		app-arch/brotli[python,${PYTHON_USEDEP}]
-		app-arch/zopfli
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# When dev-python/pytest-shutil is installed, we get weird import errors.
-	# This is due to incomplete nesting in the Tests/ tree:
-	#
-	#   Tests/feaLib/__init__.py
-	#   Tests/ufoLib/__init__.py
-	#   Tests/svgLib/path/__init__.py
-	#   Tests/otlLib/__init__.py
-	#   Tests/varLib/__init__.py
-	#
-	# This tree requires an __init__.py in Tests/svgLib/ too, bug #701148.
-	touch Tests/svgLib/__init__.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-src_configure() {
-	export FONTTOOLS_WITH_CYTHON=1
-}
-
-src_test() {
-	# virtualx used when matplotlib is installed causing plot module tests to run
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	epytest Tests fontTools || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/fonttools/fonttools-4.37.2.ebuild b/dev-python/fonttools/fonttools-4.37.2.ebuild
deleted file mode 100644
index 0de6a64f356a..000000000000
--- a/dev-python/fonttools/fonttools-4.37.2.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Library for manipulating TrueType, OpenType, AFM and Type1 fonts"
-HOMEPAGE="https://github.com/fonttools/fonttools/"
-SRC_URI="https://github.com/fonttools/fonttools/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-
-RDEPEND=">=dev-python/fs-2.4.9[${PYTHON_USEDEP}]"
-BDEPEND="${RDEPEND}
-	dev-python/cython[${PYTHON_USEDEP}]
-	test? (
-		app-arch/brotli[python,${PYTHON_USEDEP}]
-		app-arch/zopfli
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# When dev-python/pytest-shutil is installed, we get weird import errors.
-	# This is due to incomplete nesting in the Tests/ tree:
-	#
-	#   Tests/feaLib/__init__.py
-	#   Tests/ufoLib/__init__.py
-	#   Tests/svgLib/path/__init__.py
-	#   Tests/otlLib/__init__.py
-	#   Tests/varLib/__init__.py
-	#
-	# This tree requires an __init__.py in Tests/svgLib/ too, bug #701148.
-	touch Tests/svgLib/__init__.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-src_configure() {
-	export FONTTOOLS_WITH_CYTHON=1
-}
-
-src_test() {
-	# virtualx used when matplotlib is installed causing plot module tests to run
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	epytest Tests fontTools || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/fonttools/fonttools-4.37.3.ebuild b/dev-python/fonttools/fonttools-4.37.3.ebuild
deleted file mode 100644
index 75d1f33eb4b3..000000000000
--- a/dev-python/fonttools/fonttools-4.37.3.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Library for manipulating TrueType, OpenType, AFM and Type1 fonts"
-HOMEPAGE="
-	https://github.com/fonttools/fonttools/
-	https://pypi.org/project/fonttools/
-"
-SRC_URI="
-	https://github.com/fonttools/fonttools/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-
-RDEPEND="
-	>=dev-python/fs-2.4.9[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-	test? (
-		app-arch/brotli[python,${PYTHON_USEDEP}]
-		app-arch/zopfli
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# When dev-python/pytest-shutil is installed, we get weird import errors.
-	# This is due to incomplete nesting in the Tests/ tree:
-	#
-	#   Tests/feaLib/__init__.py
-	#   Tests/ufoLib/__init__.py
-	#   Tests/svgLib/path/__init__.py
-	#   Tests/otlLib/__init__.py
-	#   Tests/varLib/__init__.py
-	#
-	# This tree requires an __init__.py in Tests/svgLib/ too, bug #701148.
-	touch Tests/svgLib/__init__.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-src_configure() {
-	export FONTTOOLS_WITH_CYTHON=1
-}
-
-src_test() {
-	# virtualx used when matplotlib is installed causing plot module tests to run
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	epytest Tests fontTools || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/fonttools/fonttools-4.37.4.ebuild b/dev-python/fonttools/fonttools-4.37.4.ebuild
index d52e9285c19f..2dafd3b2f154 100644
--- a/dev-python/fonttools/fonttools-4.37.4.ebuild
+++ b/dev-python/fonttools/fonttools-4.37.4.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	>=dev-python/fs-2.4.9[${PYTHON_USEDEP}]
diff --git a/dev-python/google-auth-oauthlib/Manifest b/dev-python/google-auth-oauthlib/Manifest
index 8d8bf1e8cdf6..6a48d0731dc1 100644
--- a/dev-python/google-auth-oauthlib/Manifest
+++ b/dev-python/google-auth-oauthlib/Manifest
@@ -1,5 +1,9 @@
 DIST google-auth-library-python-oauthlib-0.5.2.gh.tar.gz 53842 BLAKE2B 7adcd9f339ec9a5528308fcc0fee1cbbe96440e1bfe5c7cc9c94808668e22801b612d291a2419333888194c3224838ac40f9d0656381825bd660067470f58910 SHA512 eaf296a0e0504e8249637a8db7531c10b120f28abeeab3e1fe8f366b4279c396509188e83f8a0ec56be85063430ceb691d6d926cee33d4f166bbcc4425e538db
 DIST google-auth-library-python-oauthlib-0.5.3.gh.tar.gz 69613 BLAKE2B 74338894f35fd1cd8802ea56952561ce0e801fecb2f994b71caf3c6b62a22e8b85f8a5b40f5571b05225a565b373865377d321625aeea2dafcc0cafb89da1492 SHA512 76c855e9becd57d3cb3bb0b203ad77ef17dc04e8be8b96d17a9c1f29474a8b180edb725e835d0552c5eddbb387cc463e88b076dd6d11635e6d45798224f09188
+DIST google-auth-library-python-oauthlib-0.6.0.gh.tar.gz 70025 BLAKE2B 2d87390a629d967b0f2aef5f56712d3defc2b460a67f2bf633bb628875161f9ddbb4f229426ce2b42dcf805feefe8101ed3bacd72ced630c0be4fe40bd926c7e SHA512 1aa42498a5875812db922b30eb20cdf124935f95f5cabd224acfb82c9ed61714cfc3c6af2168e75cf11aaa8550e41c48f30fc1d467d1b7be511bf5cb522104e8
+DIST google-auth-library-python-oauthlib-0.7.0.gh.tar.gz 70179 BLAKE2B d0e70d796c11a0f3a9be8dba58dc030ef1dfd6dc3dd13e3dc74530c5d1edba3863b7a9bb4c1f90879b70a585f1d193344dea96aa45fbb08a7e28a25a31a22b6f SHA512 fe33b0a4528f6f6602b73de50c017779e7aba5d8891ef43cb3350d337e3e62a78a4126479fae0a8732dd7c4bd35210182f4a1b7f61da06af043dfff7d91ffe24
 EBUILD google-auth-oauthlib-0.5.2.ebuild 876 BLAKE2B 97153977e671f5a8e24315290ce154c41bf478add7b9103141df177381631adfb7a4e7001888a8362ee09f11213c1d461b480436d649d59f9f089ff95c1a25db SHA512 eb04ca36f3939bf0f76b0118ba8c629e39b9bec056c5afd322a2d73b3d655d9af6c2786db17b16f0f7010e0e9f150c14f11cc56671b43e3f876e4477f8ed48b9
 EBUILD google-auth-oauthlib-0.5.3.ebuild 876 BLAKE2B 97153977e671f5a8e24315290ce154c41bf478add7b9103141df177381631adfb7a4e7001888a8362ee09f11213c1d461b480436d649d59f9f089ff95c1a25db SHA512 eb04ca36f3939bf0f76b0118ba8c629e39b9bec056c5afd322a2d73b3d655d9af6c2786db17b16f0f7010e0e9f150c14f11cc56671b43e3f876e4477f8ed48b9
+EBUILD google-auth-oauthlib-0.6.0.ebuild 876 BLAKE2B 97153977e671f5a8e24315290ce154c41bf478add7b9103141df177381631adfb7a4e7001888a8362ee09f11213c1d461b480436d649d59f9f089ff95c1a25db SHA512 eb04ca36f3939bf0f76b0118ba8c629e39b9bec056c5afd322a2d73b3d655d9af6c2786db17b16f0f7010e0e9f150c14f11cc56671b43e3f876e4477f8ed48b9
+EBUILD google-auth-oauthlib-0.7.0.ebuild 877 BLAKE2B e01c55a12bf9897a5df0d230a0e9d9266b3de3a1c2c6b1a5623bc94f46c5ab5435a6e26acd88fd5bb952bfb7a68b08d7fd56948511852fd4b0587519014a29b6 SHA512 043abcce2d9143bd5c029b9eb7ebeb006bcc4153f7d2adffccbcd2d381325432d76cfd6d553c4dc0f25a760944d828ce3b10b2ed80713df6dd256f5dbcbe3542
 MISC metadata.xml 410 BLAKE2B 23af42a2aa614f119e10cf5d57c3c37abb69ad8d9b1e16445fb92c9f00bdd78f6b1a6a51dff4ebb98bbb03e0002e73eb68cffcf857372dd94848187637c60219 SHA512 c19dd3af098644d5068ec677be51615885bb1267ba9bfb867609725e2a824a74934e2fe25909ea7406c91ca405d44e4c7191a14d3d1bc7b3a60c29445456d3d1
diff --git a/dev-python/google-auth-oauthlib/google-auth-oauthlib-0.6.0.ebuild b/dev-python/google-auth-oauthlib/google-auth-oauthlib-0.6.0.ebuild
new file mode 100644
index 000000000000..9aa755ca297b
--- /dev/null
+++ b/dev-python/google-auth-oauthlib/google-auth-oauthlib-0.6.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+MY_P=google-auth-library-python-oauthlib-${PV}
+DESCRIPTION="Google Authentication Library"
+HOMEPAGE="
+	https://github.com/googleapis/google-auth-library-python-oauthlib/
+	https://pypi.org/project/google-auth-oauthlib/
+"
+SRC_URI="
+	https://github.com/googleapis/google-auth-library-python-oauthlib/archive/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/click-6.0.0[${PYTHON_USEDEP}]
+	>=dev-python/google-auth-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-oauthlib-0.7.0[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/google-auth-oauthlib/google-auth-oauthlib-0.7.0.ebuild b/dev-python/google-auth-oauthlib/google-auth-oauthlib-0.7.0.ebuild
new file mode 100644
index 000000000000..9f0dd721dba7
--- /dev/null
+++ b/dev-python/google-auth-oauthlib/google-auth-oauthlib-0.7.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+MY_P=google-auth-library-python-oauthlib-${PV}
+DESCRIPTION="Google Authentication Library"
+HOMEPAGE="
+	https://github.com/googleapis/google-auth-library-python-oauthlib/
+	https://pypi.org/project/google-auth-oauthlib/
+"
+SRC_URI="
+	https://github.com/googleapis/google-auth-library-python-oauthlib/archive/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/click-6.0.0[${PYTHON_USEDEP}]
+	>=dev-python/google-auth-2.13.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-oauthlib-0.7.0[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/google-auth/Manifest b/dev-python/google-auth/Manifest
index a95a3e9bfc86..3fccae68e3fb 100644
--- a/dev-python/google-auth/Manifest
+++ b/dev-python/google-auth/Manifest
@@ -1,9 +1,5 @@
-DIST google-auth-2.11.0.tar.gz 205568 BLAKE2B 76f43804c117006141e46291eaa35b49e73f4eec81307b7c3c6fdf82faf1a1f3101ef1a652c5dff05ca6686ded0859c6a3bee8d38cd584fd5cacef9598aae9b1 SHA512 0b2c8653184d95b1f0981326721a8604bee6737e2e4fb68c12d695c74e03406e6d189b00740c34ee74d6ae4032581bd099018f8eaf1d65759e4c5fa4127305cf
-DIST google-auth-2.11.1.tar.gz 205716 BLAKE2B 06cf90b915c82bb53795427fc971c6a979baa34d3e32d43db20c0df86df9ef39d0ee80c4026dd502ff1d5233f1d80b0a4fa9750aafe9f0d427013a2d8ad34054 SHA512 f89fc2ec2d130156132f7e7290f4237ee9adf832f6b1914a39ea7d56943bb26fa02e940e826eb9c4e5351aa91ebf03cc5969c25e5020a89a09ea8f92535a0c07
 DIST google-auth-2.12.0.tar.gz 209325 BLAKE2B a6f754262dd7b75796dd63f4b7a2161ba959a3103c51cacb3d5f4ba3d17efdd36e1836ce360fa108b5dbce710743bfacf3b8b054de0e235590ba15eae8f3cdf3 SHA512 59209299631b7ea7d11e6787c33a304bbed5bca2173148d8c69595fc573f8915f6e3b601ed96686568f517cbbea71e18be228874334733629fbdd030976821cb
 DIST google-auth-2.13.0.tar.gz 216209 BLAKE2B 4e88062d89ca9976e0d87a93012c8ca318f9068452fde365970aab1d6ab4985aad378a038e36e0a82aca4665a196c412287a84b58c831edc9483d02fa4ed2489 SHA512 253dd17466850b20212c8cbbeb29c35dbffb2f3205867c7fdf74e400e4f2f9bf3c9ca6ffc814e5c3e9c7cc918a6cc60e696bc98c5d969761101dee4109b7018e
-EBUILD google-auth-2.11.0.ebuild 1525 BLAKE2B 0559fae14e6b27d48b0a8cf5babe40d71283d26581e6bc1c2efb0e9c20b7757ba820fbed34dd73b32198cbde9f2b3a620b9d27156ef9847a875908ce663a3e63 SHA512 e9ade71009eea68d39214942b376aff7aa4c1660e29cc2bbc535f7e0f40fdbe0ec30140dd4a21dd503531577ee6c183ec78fcf433f4898f819c620be02dceda1
-EBUILD google-auth-2.11.1.ebuild 1527 BLAKE2B 6a9c5ae6fe4de702e737e491d692c91e0b44ba3961a2f965489614220fd641cf0416ced1ee0bfd910730268c14406d27e12a224499004a9d2a41f258726c33b7 SHA512 e64349d2b54a4be4fc33d37faec791ac61459ae7cc4143758bc47b3d593f8c440ea4114dea463318f2706d1c597c6c248a81117908ab5b6f5304e0ea63ae521d
-EBUILD google-auth-2.12.0.ebuild 1527 BLAKE2B 6a9c5ae6fe4de702e737e491d692c91e0b44ba3961a2f965489614220fd641cf0416ced1ee0bfd910730268c14406d27e12a224499004a9d2a41f258726c33b7 SHA512 e64349d2b54a4be4fc33d37faec791ac61459ae7cc4143758bc47b3d593f8c440ea4114dea463318f2706d1c597c6c248a81117908ab5b6f5304e0ea63ae521d
+EBUILD google-auth-2.12.0.ebuild 1525 BLAKE2B 0559fae14e6b27d48b0a8cf5babe40d71283d26581e6bc1c2efb0e9c20b7757ba820fbed34dd73b32198cbde9f2b3a620b9d27156ef9847a875908ce663a3e63 SHA512 e9ade71009eea68d39214942b376aff7aa4c1660e29cc2bbc535f7e0f40fdbe0ec30140dd4a21dd503531577ee6c183ec78fcf433f4898f819c620be02dceda1
 EBUILD google-auth-2.13.0.ebuild 1527 BLAKE2B 6a9c5ae6fe4de702e737e491d692c91e0b44ba3961a2f965489614220fd641cf0416ced1ee0bfd910730268c14406d27e12a224499004a9d2a41f258726c33b7 SHA512 e64349d2b54a4be4fc33d37faec791ac61459ae7cc4143758bc47b3d593f8c440ea4114dea463318f2706d1c597c6c248a81117908ab5b6f5304e0ea63ae521d
 MISC metadata.xml 521 BLAKE2B 784282f6a173e7746a408556d77e1277f65a41eae545b6b26054c1e506642e683c1c7d91798f3b7b690bc4f9d2f642a51c1395593177eebf1770d2a0c0ba589e SHA512 c2624ebca3dc42961e61531db4724b2b354a722f71cd7f2c194680fee50125d2251f4b94cc7e31b008a2792e74b0f55f407a1230d3f59572df9cf32ee49d2fb7
diff --git a/dev-python/google-auth/google-auth-2.11.0.ebuild b/dev-python/google-auth/google-auth-2.11.0.ebuild
deleted file mode 100644
index 37c2ffef06a9..000000000000
--- a/dev-python/google-auth/google-auth-2.11.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Google Authentication Library"
-HOMEPAGE="
-	https://github.com/googleapis/google-auth-library-python/
-	https://pypi.org/project/google-auth/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-RDEPEND="
-	<dev-python/cachetools-6.0.0[${PYTHON_USEDEP}]
-	>=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]
-	>=dev-python/pyasn1-modules-0.2.1[${PYTHON_USEDEP}]
-	>=dev-python/rsa-3.1.4[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	!dev-python/namespace-google
-"
-BDEPEND="
-	test? (
-		dev-python/cryptography[${PYTHON_USEDEP}]
-		dev-python/flask[${PYTHON_USEDEP}]
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/grpcio[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/moto[${PYTHON_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		dev-python/pytest-localserver[${PYTHON_USEDEP}]
-		dev-python/pyu2f[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-		dev-python/urllib3[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	# these are compatibility tests with oauth2client
-	# disable them to unblock removal of that package
-	tests/test__oauth2client.py
-)
-
-python_compile() {
-	distutils-r1_python_compile
-	find "${BUILD_DIR}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/google-auth/google-auth-2.11.1.ebuild b/dev-python/google-auth/google-auth-2.11.1.ebuild
deleted file mode 100644
index de5188c8fdb8..000000000000
--- a/dev-python/google-auth/google-auth-2.11.1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Google Authentication Library"
-HOMEPAGE="
-	https://github.com/googleapis/google-auth-library-python/
-	https://pypi.org/project/google-auth/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-RDEPEND="
-	<dev-python/cachetools-6.0.0[${PYTHON_USEDEP}]
-	>=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]
-	>=dev-python/pyasn1-modules-0.2.1[${PYTHON_USEDEP}]
-	>=dev-python/rsa-3.1.4[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	!dev-python/namespace-google
-"
-BDEPEND="
-	test? (
-		dev-python/cryptography[${PYTHON_USEDEP}]
-		dev-python/flask[${PYTHON_USEDEP}]
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/grpcio[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/moto[${PYTHON_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		dev-python/pytest-localserver[${PYTHON_USEDEP}]
-		dev-python/pyu2f[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-		dev-python/urllib3[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	# these are compatibility tests with oauth2client
-	# disable them to unblock removal of that package
-	tests/test__oauth2client.py
-)
-
-python_compile() {
-	distutils-r1_python_compile
-	find "${BUILD_DIR}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/google-auth/google-auth-2.12.0.ebuild b/dev-python/google-auth/google-auth-2.12.0.ebuild
index de5188c8fdb8..37c2ffef06a9 100644
--- a/dev-python/google-auth/google-auth-2.12.0.ebuild
+++ b/dev-python/google-auth/google-auth-2.12.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 RDEPEND="
 	<dev-python/cachetools-6.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/gssapi/Manifest b/dev-python/gssapi/Manifest
index cb80b7cbf13b..525554d85be5 100644
--- a/dev-python/gssapi/Manifest
+++ b/dev-python/gssapi/Manifest
@@ -1,3 +1,5 @@
 DIST gssapi-1.8.1.gh.tar.gz 114888 BLAKE2B c3e56d00c2266e16eca05262d513e62f30cece88aaea8cd6f0d65059777f55bc1d5218990698855dc2069c6c7d8ca93972a033554d114dce608201404f7f46b4 SHA512 baea4e5cc123006c77e23f6bf2e30bb755df70761a0e5af711594fad6fdbf1b8747cfce45810aa24336f7f7d2171404e9ec137984cb48c59f5df302711f1b185
+DIST gssapi-1.8.2.gh.tar.gz 112521 BLAKE2B d7e14c73c346066a58ae3b3cf1faeec2ef7df3d4da3f2c9e3198928225d81d99466185a9dfa06a59ae50beeeed58d4e73f8a668e1ac605e5b9806ed7a0019831 SHA512 6587f1947dc396bf608ba71e77388e6f7d161753005b9b82ea9f3b174c898bb18409a27e9aa035fc782e15fcd2efe7ca5c497d4687d69023034cea59d6a003df
 EBUILD gssapi-1.8.1.ebuild 896 BLAKE2B 144d1b92ada4591c1c71e2235486d2be1136266a207910f466569e049aa5437ad10f1e9ced23cdcbc036cc8c850f497f6738465aa18d1e4beea5e06feb5e090a SHA512 31287de9c66ede1f592936929f204c0bc5bee23b688be52bf73c13025c65db04c2c9a24a7071dd20fc1f89b37a8062f53eb082813f5d6ca098cabc82045d4dda
+EBUILD gssapi-1.8.2.ebuild 899 BLAKE2B 88a797b2eba3e406f2d882dd246cadca9472daee1e29a6e42bc3c2f1760ad9f35e47964e5a2ce1c35ca6f2f65a1ede078b624623afe4696c8158efb1b295f127 SHA512 b0c2d38c124364b64ab8b5eab5b788a83187204e905dd80ed8745592311e414b33d763e1499b7ae6cf8453b5bb0af46295bac8de8772f8f881cf981abe63ae0a
 MISC metadata.xml 508 BLAKE2B 546d1ff6df79f22a0cde8d19a5718f834301630cda7700c73f2e6943c1634662bb216f79e290d6efe681e96f24f791785e104a2fbfe4af4d7632899db33edde4 SHA512 3ed7272bbd046d2ca4f8e0b67d005a7a676e4998acba2f7fe70d8f9022d3bb0bdc3c845ed666db3c23e4bd118fb4d762af21d94b47ae664de568fb277b7da033
diff --git a/dev-python/gssapi/gssapi-1.8.2.ebuild b/dev-python/gssapi/gssapi-1.8.2.ebuild
new file mode 100644
index 000000000000..1c7d320855eb
--- /dev/null
+++ b/dev-python/gssapi/gssapi-1.8.2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Low and high level wrappers around the GSSAPI C libraries"
+HOMEPAGE="https://github.com/pythongssapi/python-gssapi https://pypi.org/project/gssapi/"
+SRC_URI="
+	https://github.com/pythongssapi/python-gssapi/releases/download/v${PV}/python-${P}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S="${WORKDIR}"/python-${P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	dev-python/decorator[${PYTHON_USEDEP}]
+	virtual/krb5
+"
+
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	virtual/krb5
+	test? (
+		dev-python/k5test[${PYTHON_USEDEP}]
+		dev-python/parameterized[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	cd "${T}" || die
+	epytest --pyargs gssapi
+}
diff --git a/dev-python/hcloud-python/Manifest b/dev-python/hcloud-python/Manifest
index c3f6e3fbc17b..b5b5e68e9e1b 100644
--- a/dev-python/hcloud-python/Manifest
+++ b/dev-python/hcloud-python/Manifest
@@ -1,3 +1,5 @@
 DIST hcloud-python-1.18.0.gh.tar.gz 99047 BLAKE2B c32b048653bea1910ed8a82d0e08603a154dc89208c0cf8b9e046078277460fedffe6568c7c3cf56a8408bb0423d38464c4fd57dded4523886560823e3ee65da SHA512 8339b5da4df7f5e1f38fbd7a3f205387bfd7a65a7c4eaa757c4c35056b70c06230fe9b8a597b54bac082af975184bd5ef33a6e2747b60a67cc34d6771435452c
+DIST hcloud-python-1.18.1.gh.tar.gz 99042 BLAKE2B 159b2fb29021ca7993f75c4731867ed1bc57e2c9a3cf68a45acf43bb45e9a0862717907d1dfce45c960064ad82b71422e76b290db3516ea3744be95797db5e1e SHA512 6d172c214d25ae846b5561e4caa6b70d4f4e765e064ae971d5b216ceb743ab269f735e2c9adb68f1cf99ef429621b6998a34c8c7befa6d527dc3b774c0639bae
 EBUILD hcloud-python-1.18.0.ebuild 942 BLAKE2B 273b6e0a3dbb1d2d6d58d76a47e15c91f4bbd308f5229b50d108507541fb4dd2e15529356600e176e3050a9342820b785bd934c749514e0a9ad18f09e5bdaee1 SHA512 3b9854433067aa9e4835def83e102a2c49b58ccfc8420ba5aa23392e8964a3fc6195d702f5d452d0d0bd7faaace877a6cbd58ee26465132700743040f32edb5e
+EBUILD hcloud-python-1.18.1.ebuild 955 BLAKE2B 323d181fd16af30b73a5d63217c87a23fd5d04bb6cd537d639a5300a597ede9ea7707a6c23ed2dedabf39913fdf6bceaf4a178fb881764bec91c97c48415e546 SHA512 f827c2ce86dfbeda231fe73cc784e16f5aea37678713a79e0dfdf5b4a39a98153402273c88494ea881af919b782da7c5b7f2aa0b798027ee18e17bd229898ea8
 MISC metadata.xml 483 BLAKE2B c945a22b776b5bf73deabf93718a1dea3a9b98f7257467e845106f71910347a803f96ef969227d7c10a119f1e35b904bcb7501b9672bf3ce5a2bef112d903e56 SHA512 4a6540a06d57eb3bc8c455d982531427157fbf1a85abf4b909032b0880c9e2847b295b3c9b02378be35e88f74876357503dd04bbe544ff9a9612df2b1c321b1c
diff --git a/dev-python/hcloud-python/hcloud-python-1.18.1.ebuild b/dev-python/hcloud-python/hcloud-python-1.18.1.ebuild
new file mode 100644
index 000000000000..aaae59edb2ea
--- /dev/null
+++ b/dev-python/hcloud-python/hcloud-python-1.18.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+inherit distutils-r1
+
+DESCRIPTION="Official Hetzner Cloud python library"
+HOMEPAGE="https://github.com/hetznercloud/hcloud-python"
+SRC_URI="
+	https://github.com/hetznercloud/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="examples"
+
+RDEPEND="
+	>=dev-python/future-0.17.1[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.7.5[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.20[${PYTHON_USEDEP}]
+"
+
+distutils_enable_sphinx docs \
+	dev-python/sphinx_rtd_theme
+distutils_enable_tests pytest
+
+EPYTEST_IGNORE=(
+	# Integration tests need docker:
+	# https://github.com/hetznercloud/hcloud-python/blob/master/.travis.yml#L16
+	tests/integration
+)
+
+python_install_all() {
+	use examples && dodoc -r examples
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/humanize/Manifest b/dev-python/humanize/Manifest
index c7d1fe424415..4e9a8e697b62 100644
--- a/dev-python/humanize/Manifest
+++ b/dev-python/humanize/Manifest
@@ -1,5 +1,3 @@
-DIST humanize-4.3.0.tar.gz 78035 BLAKE2B 03cea639879165453becc41f62e7b6e34a62ac3a74c37141e0c3f7e9d855b2727710ab5ac231a3829d03c413b297449dccbfc8b804b3f5ddcd402dd813adbf57 SHA512 b8713fa9ec2c2210f93e06436a5bef390937b85ccd0bc95520e53d5c0f49354b94a7957ef50dd9e391d8377d1faf43003c47028b19cef42885fd083cbda1ac46
 DIST humanize-4.4.0.tar.gz 78519 BLAKE2B f61b654e201995479ace22b5aac106b08304ed9212cf5c6c7f87731d861c42c5e0243f7bb0b7f2c29b870421fa81fba0c36e4ead90ff90f207bc984286ac119a SHA512 bbbd386d9af82d9db0f2edc4653928654203c4239419232abfc15c51ccd865b355366549c46651e1291d4222ca8b2a297ffc0fce3cc32be4ae2f904ae308a8e4
-EBUILD humanize-4.3.0.ebuild 586 BLAKE2B f89d881fd19e60a8eb9c2ffd5d53e8b0e6ac16672c16f441b2bf8e776b81b7a20218af77eb61fb4a1d9ae744906e361fd953da37b7e94542fd5e2e0c3bd329e7 SHA512 3f7f0f0239a899ab1445277b7944da5763d5585e287ccad072a0aa6b86d8bc2c5e0557c255f7d8e29d630ce681b2c95985dfdbbb72127a886df1a6cd79a85e1c
-EBUILD humanize-4.4.0.ebuild 588 BLAKE2B 7ccbcefd9b985a2eb85773993629bec0fdab43f09a9f092c67a520b123639a8272f01296153b0ef38a9ae498032807af089e4536b2482adbc033a5a4468f6a97 SHA512 53444dd98c6898caf5158cc5e5a55355ba7269cf7e1d130a5788ae246c7f0e1af06e53d2c99b094985583e2f472d28027d724a47bfb0c57f18ee1e2daa0fb5f7
+EBUILD humanize-4.4.0.ebuild 586 BLAKE2B f89d881fd19e60a8eb9c2ffd5d53e8b0e6ac16672c16f441b2bf8e776b81b7a20218af77eb61fb4a1d9ae744906e361fd953da37b7e94542fd5e2e0c3bd329e7 SHA512 3f7f0f0239a899ab1445277b7944da5763d5585e287ccad072a0aa6b86d8bc2c5e0557c255f7d8e29d630ce681b2c95985dfdbbb72127a886df1a6cd79a85e1c
 MISC metadata.xml 506 BLAKE2B c00c304481f8bd5d2309a1fa72a19bd8405d2f8d55e68a9e688435dec5410db728537362d6fc090f448738fa462ad62d03cfdb82fda8702b91aced4ecd6c05d5 SHA512 71905cfb331f60723b2b3dc02b1a5cbc2712ea9a411692d8ce12e62ea90a4ebef41bb4806b90f9bc0706d8dfb6a3ebb69d23ef16f0177eaddcfbdf07612d8614
diff --git a/dev-python/humanize/humanize-4.3.0.ebuild b/dev-python/humanize/humanize-4.3.0.ebuild
deleted file mode 100644
index 5887ac380442..000000000000
--- a/dev-python/humanize/humanize-4.3.0.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
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Common humanization utilities"
-HOMEPAGE="
-	https://github.com/python-humanize/humanize/
-	https://pypi.org/project/humanize/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/humanize/humanize-4.4.0.ebuild b/dev-python/humanize/humanize-4.4.0.ebuild
index b471878fc311..5887ac380442 100644
--- a/dev-python/humanize/humanize-4.4.0.ebuild
+++ b/dev-python/humanize/humanize-4.4.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 BDEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index 02f7f3b0c5ab..678a77bb50dd 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -1,5 +1,5 @@
 DIST hypothesis-6.56.2.gh.tar.gz 9333277 BLAKE2B 6c75b48cd6e7300c05bd020003340aa8c868ba2d25402c7599b0e4e6f8774df38e3b3c3a4b589cf08f44fb43b04cfdbc2a3e69f894c3ccaffef705896c6c0a98 SHA512 10d4cdd343b63bc17b3e813309911fa70dfee24fac5d355e6ed907740103177da9be461d4d25e27d5190867664c64f28a7827d6ffd15fa4519ea38fbcdf629e8
 DIST hypothesis-6.56.3.gh.tar.gz 9333288 BLAKE2B 9608542d8dbe97fec147eae1f9b2f06af2b08e3cc0807fefcfa97b0a8c1aa30a15df9f1114a13f5c719701a4d13ab09a808d0d09e271d9e0d69168ebc4183af4 SHA512 f410455e77c6e9dc3b9003ef3d4c21bd204d85bc567dfd0d420986dc255d8c1ff9f41d809d837286f02064f546a08eff0f89389906ab7023581cc1f5a5d18947
-EBUILD hypothesis-6.56.2.ebuild 2091 BLAKE2B 1c091c6e695dddd96a8ce37a2291c4678350aa99903719f46d0be402308c1d1fedf3957864a3d1dffe008b9fd310f94ee5f39ef9b5fc9c62edd35081943229e2 SHA512 9d05e96fdc44aa5175e4b974a0f81170d73300896f19c13ec1e6801642d325543311df89e490d4b7a80c2c5109701e23bdbe856a06349254c02a3a4f4c0fcc21
-EBUILD hypothesis-6.56.3.ebuild 2132 BLAKE2B 949f41664cd920791b94bf39a053e3ef8d443231d34619f9f7873929d6829d261c9fe99000e274dce706f71ca5eea93fdfb62325a6ad881cfa0941420548ef5f SHA512 a04252a6ec505ddd8acb26d47d30180ce656ea8f79b06e6ab5d465092898a53ca1a83ed4f97e4d9dece274e4a40678938dde4308243acc8221927cabd2f3c9bc
+EBUILD hypothesis-6.56.2.ebuild 2132 BLAKE2B 46f1d1c0f69606e55673a002c305f72655f44ac456ea0e8cde03e7cfd12a074d915f00b29280637b150a4faa596dcd28e2527fc6762aa53893f245530c5a7eef SHA512 bb0602862ac4175e49605bb095ca8d9a027a964cda6e0cc51f03910f5186436646e25f25621cbfec777dbbf0e5fbb4f7a5a01ef646fc20bb84f75980daddf1b8
+EBUILD hypothesis-6.56.3.ebuild 2140 BLAKE2B b805e367bbbe90dc2037a89f3488677ea9eed9052283c25a2562d3a5af85b73d2e11a2019cf64a4a8c8d7dd180f8636f03519b0681afb61a38a6057bc707d097 SHA512 dfeb6198d076546f2654edc67fd6f0fcfaf1cdc65385ad90e01901c54e06f565a48d23af2ca48d1acfcd91cfbdc2b5072fb211f2fe02237b2bb6935a0682d07c
 MISC metadata.xml 756 BLAKE2B 26e40ab96ddcbd5751023e3c0cc9aa86e96d73ba02bca750ad15eb4301beb0318d3d694c54c2c2a2cb50937731af727411e8afb67e1a21e58e0ff611eeea9149 SHA512 cd48d35c5fe41aa9efcfea9eb7b2d78a4646658b5aab7533ca6492d4700032099fd34ca2dc45a6198c27351650c9e901c8b7c4d53ade2b56695d5e26ca371238
diff --git a/dev-python/hypothesis/hypothesis-6.56.2.ebuild b/dev-python/hypothesis/hypothesis-6.56.2.ebuild
index 6d6bc2aac3e0..8b831543982e 100644
--- a/dev-python/hypothesis/hypothesis-6.56.2.ebuild
+++ b/dev-python/hypothesis/hypothesis-6.56.2.ebuild
@@ -46,6 +46,7 @@ BDEPEND="
 		dev-python/mock[${PYTHON_USEDEP}]
 		dev-python/pexpect[${PYTHON_USEDEP}]
 		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		!!<dev-python/requests-toolbelt-0.10.1
 	)
 "
 
diff --git a/dev-python/hypothesis/hypothesis-6.56.3.ebuild b/dev-python/hypothesis/hypothesis-6.56.3.ebuild
index e1015cf08f6e..bbb3ede19663 100644
--- a/dev-python/hypothesis/hypothesis-6.56.3.ebuild
+++ b/dev-python/hypothesis/hypothesis-6.56.3.ebuild
@@ -46,7 +46,7 @@ BDEPEND="
 		dev-python/mock[${PYTHON_USEDEP}]
 		dev-python/pexpect[${PYTHON_USEDEP}]
 		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		!!dev-python/requests-toolbelt
+		!!<dev-python/requests-toolbelt-0.10.1
 	)
 "
 
diff --git a/dev-python/identify/Manifest b/dev-python/identify/Manifest
index 7bf1fe1c45a2..79ada94174dc 100644
--- a/dev-python/identify/Manifest
+++ b/dev-python/identify/Manifest
@@ -1,5 +1,7 @@
 DIST identify-2.5.5.gh.tar.gz 101461 BLAKE2B b3a4dc2273435cf9244af64b08b9a9a922025f7d32f479fb2641fcdd9f8a05d2778db126104b1e3b765b82af7ecc1660163de1f71098900296135cd1ccd129c5 SHA512 e02688805310a4f92d0435af562383a10297afa7fc468e44f73be40118c73e2ceac1b4ba7525c375fd0b671ea2700ba66307115c78558a370c525de8cba33c83
 DIST identify-2.5.6.gh.tar.gz 101460 BLAKE2B c540934d4a482521758a64a1eb5e84b346eef0e0cccecbb9ad06e53e4b6872acb9c6fc94fccab9b75a7cf5658af78ad319d808a17f7ec44dfd08ae9c9a3b9f58 SHA512 9a35eb42767b0d2365b8da7c5aa5d7644272de5b65a505c5876cce0781222d8e52937b5c2d5594e560c5ab2fbbf4329555df15443b8f6110ac48880691af9089
+DIST identify-2.5.7.gh.tar.gz 101472 BLAKE2B 519f35e08258dac5ff4b897f4ee55cf432641e57c55ff1d05d3fdf564aa7eed441ba839f222b430eae96f55a8e6a5d14a9c25fc78b3536dad59c3604a3bff7c2 SHA512 186a0c36e3abadd4b2db1439daa837fed55db706c4eb1821d9ecf1288cd667706b708e1251f84d67a480cdd28e6a57960443b707c327e19a9342f5e2afdb1a7c
 EBUILD identify-2.5.5.ebuild 588 BLAKE2B eff914d7f68c76704a11dcdbfef21c51f52f0abcb6d29f669ba173106369d2eaedc818e9d89ed2d35e765184b07fe471c3d9c86db84f0093ebe87e46bf951152 SHA512 2ff5036390cf415ad56c87cc4bc7e1c2fbf0992ebf92ef3cbdf44ed40832a0326bb5f946e4fa432d4e429f8b224c7e6b37fb3ebac56d2388201df754205bd42e
 EBUILD identify-2.5.6.ebuild 590 BLAKE2B 9903b2478df4f9ce56ff68e2877d9b8e5d86a814e3c021b0533f3db6a1aabc5709c5cda6a719e47126c1ffac7ef34bfac74531395e035055a856a9427b9ca179 SHA512 b9c852d73351dc0386609a4db9072467a47fcf768205fbcfdc7798d0acac40de383315a734547acf4b3fc46cc1c21c66fabc0d97583c2fa0ad946ad89551be03
+EBUILD identify-2.5.7.ebuild 590 BLAKE2B 9903b2478df4f9ce56ff68e2877d9b8e5d86a814e3c021b0533f3db6a1aabc5709c5cda6a719e47126c1ffac7ef34bfac74531395e035055a856a9427b9ca179 SHA512 b9c852d73351dc0386609a4db9072467a47fcf768205fbcfdc7798d0acac40de383315a734547acf4b3fc46cc1c21c66fabc0d97583c2fa0ad946ad89551be03
 MISC metadata.xml 501 BLAKE2B da95534590927f7290f78f47e30484e3349c9058048c15522e7346a74d9a2c96141a18897b10b230adf966d3c237217ef1d2dcfe59814ccfffd58ab4c38c1ebf SHA512 8d78245bbd2e14016eb70f1d8f8d6129e6b265084f7da95bd915f01ce5af94f86bd69c33c1514195de70d0f834332d9ca968a18afb59a7016c8cb58681d04d24
diff --git a/dev-python/identify/identify-2.5.7.ebuild b/dev-python/identify/identify-2.5.7.ebuild
new file mode 100644
index 000000000000..8ce2bd5b0e7d
--- /dev/null
+++ b/dev-python/identify/identify-2.5.7.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="File identification library for Python"
+HOMEPAGE="
+	https://github.com/pre-commit/identify/
+	https://pypi.org/project/identify/
+"
+SRC_URI="
+	https://github.com/pre-commit/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	dev-python/ukkonen[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/immutables/Manifest b/dev-python/immutables/Manifest
index b3f395591834..6da0115d4e2d 100644
--- a/dev-python/immutables/Manifest
+++ b/dev-python/immutables/Manifest
@@ -1,5 +1,3 @@
-DIST immutables-0.18.gh.tar.gz 84891 BLAKE2B 2e800e1b7b354781ef221315b80877e57ef446753c4a42e411196379e2bc921f71918c5ecd5cc693ca54cb7c401bef31161e9d249407b705626fe95d0e4e9fcc SHA512 1477ff6d9a6c02c3619b209352096abefb913cf53d392748e0940160067ecdcf2b89ad9ce807161ededaa5062105a2e5c5a3303bd02752a5f07b5f68f1c1044c
 DIST immutables-0.19.gh.tar.gz 85695 BLAKE2B b6457bd4e61c79ffc4ae83c1be3845ea1914ef6604ee8b0886c1ab24dba96e226444af5adc1032dc36e6f3058acac8a8f0289ce97f97874b02aae85eb3bc2ee1 SHA512 b1027e9ab4a304dcb953037a1ea4af082d0524255bcf3f3f368deda85b9a9e5b1c556638aab7a10cbf200fc14b85c8b739f212035f8ead1dff941b8f6da09668
-EBUILD immutables-0.18.ebuild 811 BLAKE2B 4fa65ad7440492d0113f3801a968af96840cfba36f24f45780c1ac3265184c82b0c3de2948b63886cdb9f63fe87ce18109bdd2eb6011c49a25984334393980af SHA512 d4156d40e6b4fa634d16781aad141b18bb3de8cc85bfcee0537369c76086024dc51dc6004f6dda9b6af0f8ec069c1db17784ff892eba87b997e78dd61787703b
-EBUILD immutables-0.19.ebuild 813 BLAKE2B e69af3ac8e980c23ae3b81e182c1ac46ac3a064d8fd8bbe497a1e8142c3e466fea5892adccbcaccd46b2bc7c57aaa6faae58dd9c47c655371eaf63c7e21562ad SHA512 1ce3807ad0bd1ce6c9af2098dd699686707ae487e03a50538e509e672673199c8cf092852915ad7db1c2a0c50ca6de7533efcdd89b7f8b5b97e6af43c048eb93
+EBUILD immutables-0.19.ebuild 811 BLAKE2B 4fa65ad7440492d0113f3801a968af96840cfba36f24f45780c1ac3265184c82b0c3de2948b63886cdb9f63fe87ce18109bdd2eb6011c49a25984334393980af SHA512 d4156d40e6b4fa634d16781aad141b18bb3de8cc85bfcee0537369c76086024dc51dc6004f6dda9b6af0f8ec069c1db17784ff892eba87b997e78dd61787703b
 MISC metadata.xml 353 BLAKE2B 5ba3a63b6d65aa989535ec78a5e097fb15e6bcb392e846471fb01efd4a4b546a3ba861cc3829d13e71f1f5c31b582a99e1f5e4adf6b60c2b6fb17bdfb9265c99 SHA512 ede81f3aec8f6ee374c8d39d60f4193cfb701f2561858f2ddfadbe68d531849cec13fb8c13cc671e14d8ab1f18b08759d030c562cc496f959517c6ce67ac9781
diff --git a/dev-python/immutables/immutables-0.18.ebuild b/dev-python/immutables/immutables-0.18.ebuild
deleted file mode 100644
index e34f68e5dd8a..000000000000
--- a/dev-python/immutables/immutables-0.18.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 2019-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="A high-performance immutable mapping type for Python"
-HOMEPAGE="
-	https://github.com/MagicStack/immutables/
-	https://pypi.org/project/immutables/
-"
-SRC_URI="
-	https://github.com/MagicStack/${PN}/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e '/mypy/d' tests/conftest.py || die
-	distutils-r1_src_prepare
-}
-
-src_test() {
-	local EPYTEST_IGNORE=(
-		tests/test_mypy.py
-	)
-
-	rm -r immutables || die
-	distutils-r1_src_test
-}
diff --git a/dev-python/immutables/immutables-0.19.ebuild b/dev-python/immutables/immutables-0.19.ebuild
index c45d9591f332..e34f68e5dd8a 100644
--- a/dev-python/immutables/immutables-0.19.ebuild
+++ b/dev-python/immutables/immutables-0.19.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-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"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/ipykernel/Manifest b/dev-python/ipykernel/Manifest
index 4ff4440502c8..04f8b9d643c2 100644
--- a/dev-python/ipykernel/Manifest
+++ b/dev-python/ipykernel/Manifest
@@ -1,7 +1,9 @@
 DIST ipykernel-6.15.3.tar.gz 136470 BLAKE2B 45279a6cfc85c3c2bafe9913b78077a3212bc61b961824f449cdf6ed6a34fe777e0fef1585bc7e4062f4e73124efd24a1c6a16e4168a03d31420836105c3ba55 SHA512 52e9b20b4b9ce691a42a64f535b41b9567a9849c87c0c9903d0b14dc6a00c57ab42d93b6bca8d955be8a31354722268006ce8b576664eb8a4b7f6a3400164c1d
 DIST ipykernel-6.16.0.tar.gz 136212 BLAKE2B efb779c4585d5594dcf8beaf03f2cd0174aa3b22e184a4c5f54e0e9e97f5bcb81af27c19f503a8b8883720a4380bfb483a952858a75c5b08b19030cc84c0cbec SHA512 04c43c83d17f451b7139e3f7301b35598ff3644ac1542bed9eb2584a558ee202e66c3e36553f96484bb4ee5cc369cfe2ad2bf0054799ad29ffd0e065bdcade98
 DIST ipykernel-6.16.1.tar.gz 136501 BLAKE2B 01f335319a7fe3749f770a721bd287f357dd9d5a948368d6495642607eb43f085f529be8759cfaa72acddc4973b814599492b9a87632d48373564f668696264c SHA512 748e538a99db913bf5fa8a3bfd83f59f4209e84e262f0fbb93d65100dd70502315ba7fafa7e55445c58f5de38c09e6d155b4ec9ed12e2ac53214e041e7345aa5
+DIST ipykernel-6.16.2.tar.gz 136606 BLAKE2B 596cae97c6e4d170c51a2f2f481c306a93833cf62959837bde129ed080f70e730cb083ff0a608b7539f633898b7f79f8c5ee3495580fe2821382f0be10417ccc SHA512 3a3bae6cc8ace33b7b8c9d335c7da73c1983824b74b29b77c14cbe24239d556c9c967a759a37a60745823cb6ab698a21262457082464cf33ec1b02ebbe2240d9
 EBUILD ipykernel-6.15.3.ebuild 2058 BLAKE2B 324e8d1609ee1eb272589138f8f22822a9fafbd836dbfbbfc2e710fb3e9cbb602564071c3e2f8904cf0a6f3c6770279517fd51152dfdddc7b13e001084020d85 SHA512 3f757852e4ca13da13ccdfa0615fe6342d3605ca447431eb35c80b44cb8cb36f57bef1bd12f0afbd2175dca461d0d23d8f9ccf194227634cf4fdfb0fb735aa79
 EBUILD ipykernel-6.16.0.ebuild 2107 BLAKE2B 1c64d458e4fbf2f3775c635a1a7e575a03a3b597ec02df0f545c2525a62a5d67ef16ee2c010d0de8b4899848197783977a466fdfdb449eaada78b5c134881e1f SHA512 f88cfc3f92a72f8b06b7ca89874c8ee650a2cfbe738fcb6e7d6a820cb7ddd5500f9442dd82c1d01bc5862ab84e9c7e49abb22625e7d346e61b6ea2ae883b799e
 EBUILD ipykernel-6.16.1.ebuild 2107 BLAKE2B 1c64d458e4fbf2f3775c635a1a7e575a03a3b597ec02df0f545c2525a62a5d67ef16ee2c010d0de8b4899848197783977a466fdfdb449eaada78b5c134881e1f SHA512 f88cfc3f92a72f8b06b7ca89874c8ee650a2cfbe738fcb6e7d6a820cb7ddd5500f9442dd82c1d01bc5862ab84e9c7e49abb22625e7d346e61b6ea2ae883b799e
+EBUILD ipykernel-6.16.2.ebuild 2107 BLAKE2B 1c64d458e4fbf2f3775c635a1a7e575a03a3b597ec02df0f545c2525a62a5d67ef16ee2c010d0de8b4899848197783977a466fdfdb449eaada78b5c134881e1f SHA512 f88cfc3f92a72f8b06b7ca89874c8ee650a2cfbe738fcb6e7d6a820cb7ddd5500f9442dd82c1d01bc5862ab84e9c7e49abb22625e7d346e61b6ea2ae883b799e
 MISC metadata.xml 527 BLAKE2B 4a24cb9d5b801bf94c71c47d0c90b04bc249fb41a794c7b688a5762f08545d1fcfe9e4976aa4f583ecb456458b5f6dfc394349633959444584c0abad0da4be42 SHA512 ed9f0ef12ec5de67a646783243555f1737604a84c78c57b9f7c65137cec8cbc396991411501927f92bd393daad2238c27363ecc9c115031450231c2a4fb2cbb9
diff --git a/dev-python/ipykernel/ipykernel-6.16.2.ebuild b/dev-python/ipykernel/ipykernel-6.16.2.ebuild
new file mode 100644
index 000000000000..d474b45cde71
--- /dev/null
+++ b/dev-python/ipykernel/ipykernel-6.16.2.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="IPython Kernel for Jupyter"
+HOMEPAGE="
+	https://github.com/ipython/ipykernel/
+	https://pypi.org/project/ipykernel/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/debugpy-1.0[${PYTHON_USEDEP}]
+	>=dev-python/ipython-7.23.1[${PYTHON_USEDEP}]
+	>=dev-python/jupyter_client-6.1.12[${PYTHON_USEDEP}]
+	>=dev-python/matplotlib-inline-0.1[${PYTHON_USEDEP}]
+	dev-python/nest_asyncio[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	>=dev-python/pyzmq-17[${PYTHON_USEDEP}]
+	>=dev-python/tornado-6.1[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-5.1.0[${PYTHON_USEDEP}]
+"
+# RDEPEND seems specifically needed in BDEPEND, at least jupyter
+# bug #816486
+BDEPEND="
+	${RDEPEND}
+	test? (
+		dev-python/flaky[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+		dev-python/ipyparallel[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# TODO
+	ipykernel/inprocess/tests/test_kernel.py::InProcessKernelTestCase::test_pylab
+	ipykernel/tests/test_debugger.py::test_attach_debug
+	ipykernel/tests/test_debugger.py::test_breakpoint_in_cell_with_leading_empty_lines
+	ipykernel/tests/test_debugger.py::test_rich_inspect_at_breakpoint
+	ipykernel/tests/test_debugger.py::test_rich_inspect_not_at_breakpoint
+	ipykernel/tests/test_debugger.py::test_set_breakpoints
+	ipykernel/tests/test_debugger.py::test_stop_on_breakpoint
+)
+
+src_prepare() {
+	sed -i -e 's:^TIMEOUT = .*:TIMEOUT = 120:' ipykernel/tests/*.py || die
+	distutils-r1_src_prepare
+}
+
+python_compile() {
+	distutils-r1_python_compile
+	# Use python3 in kernel.json configuration, bug #784764
+	sed -i -e '/python3.[0-9]\+/s//python3/' \
+		"${BUILD_DIR}/install${EPREFIX}/usr/share/jupyter/kernels/python3/kernel.json" || die
+}
diff --git a/dev-python/jc/Manifest b/dev-python/jc/Manifest
index 8ac7169b3959..88f2de68a909 100644
--- a/dev-python/jc/Manifest
+++ b/dev-python/jc/Manifest
@@ -1,7 +1,3 @@
-DIST jc-1.21.0.gh.tar.gz 11910267 BLAKE2B 7d02f6b574dc2171daca9682ef5cfe2ccdba6230320fc331c086c47b147e49efbd11fcb7b7f26bf4d448d4462f051b5b6892eff16e853cdb6cc4927f5cffddba SHA512 5382aba5c6ea0409fae31097516912d07133d2c14eb529e9df742f2efe4682c7e36e934786c9b12454d23e4c3acd5bdce3e97f410303b761f695db787058b034
-DIST jc-1.21.2.gh.tar.gz 11910311 BLAKE2B ece8651c55f62821e30574cc208f3e1a569a2408ae1c637329556d49aae894afd7a57cdb7c70a0fdd16136fddd7329a1cefab493848376f22d5fae553c0231eb SHA512 3860e429a11131b888fa0689dd627016d3e9c052908979c22eca604281f13ba3df7164cdfa04ff6e4e08146b42d7bd76888efdcce65a549d5c904ecd207209f0
-DIST jc-1.22.0.gh.tar.gz 12062944 BLAKE2B 8a4f301c563cabb5ee780280d3aa3caa64a8cbab7972c67854e0c7fb53ba86c6cae12682f6bc8559d51ef692e0352378c01a223848249c0f8f3b664bad63e7ce SHA512 832ef3d209bbf6e3d3a4b7b038e80fc0dcb99d4ba38732ad393fdbe59be4f5d86428cfbbdb81f48d5902b31bdea635996a99aeada19361d74c991e711560767e
-EBUILD jc-1.21.0.ebuild 674 BLAKE2B 4cb873aab7d621f36a62bb1d4a25be0d981dbc3c80cfddf795a47a0ddda6e962091f8aa46166cbf88b32d5372879cd9f8329036d27fa99bbbedceba47f4877de SHA512 6bf52b03223276c5b94ddfbc3a28822246bcfdaf9c75840570f36cb63b45a05b01995e09a4ff3cd22f9f5d10b8660b31e115e70e2826c5d7bf2614566d4aa7ba
-EBUILD jc-1.21.2.ebuild 674 BLAKE2B 4cb873aab7d621f36a62bb1d4a25be0d981dbc3c80cfddf795a47a0ddda6e962091f8aa46166cbf88b32d5372879cd9f8329036d27fa99bbbedceba47f4877de SHA512 6bf52b03223276c5b94ddfbc3a28822246bcfdaf9c75840570f36cb63b45a05b01995e09a4ff3cd22f9f5d10b8660b31e115e70e2826c5d7bf2614566d4aa7ba
-EBUILD jc-1.22.0.ebuild 674 BLAKE2B 4cb873aab7d621f36a62bb1d4a25be0d981dbc3c80cfddf795a47a0ddda6e962091f8aa46166cbf88b32d5372879cd9f8329036d27fa99bbbedceba47f4877de SHA512 6bf52b03223276c5b94ddfbc3a28822246bcfdaf9c75840570f36cb63b45a05b01995e09a4ff3cd22f9f5d10b8660b31e115e70e2826c5d7bf2614566d4aa7ba
+DIST jc-1.22.1.gh.tar.gz 12676358 BLAKE2B dbea5d19f28abf7773787275b8e5c64b8ceee07e56474336b37e35d76bf3cb3b6bbbad0d4e129fd118dc2eba03dca7f12d07c41f469f6d0e81fad1e4acb8af88 SHA512 67fba63921b9c8bc6b47a6d8405a693ce68c7338ad0d05565a0a4b4f7872ff83d27a97241daa8bd5eeb27299e630154b7a9d923bcd00fb121c25ac61f70d3faa
+EBUILD jc-1.22.1.ebuild 674 BLAKE2B 4cb873aab7d621f36a62bb1d4a25be0d981dbc3c80cfddf795a47a0ddda6e962091f8aa46166cbf88b32d5372879cd9f8329036d27fa99bbbedceba47f4877de SHA512 6bf52b03223276c5b94ddfbc3a28822246bcfdaf9c75840570f36cb63b45a05b01995e09a4ff3cd22f9f5d10b8660b31e115e70e2826c5d7bf2614566d4aa7ba
 MISC metadata.xml 492 BLAKE2B 100e7421c33b90fb9180a3412206cdc2355b26dcacf988f1157a725ca8ee6eff44288ec12f8274360f086272ad3bd06e9df6a93288edeb9102551c65256a47f4 SHA512 cb0abbd0c1b02b1fd4c74034e1f41a53ed0b7f297dcfad4e9f6b2a4960e16790b5d879f407ab18f73c81684d3a0436327949bd628a1d1d146958f01e34206688
diff --git a/dev-python/jc/jc-1.21.2.ebuild b/dev-python/jc/jc-1.21.2.ebuild
deleted file mode 100644
index 7b7bbfc30991..000000000000
--- a/dev-python/jc/jc-1.21.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Converts the output of popular command-line tools and file-types to JSON"
-HOMEPAGE="
-	https://github.com/kellyjonbrazil/jc/
-	https://pypi.org/project/jc/
-"
-SRC_URI="
-	https://github.com/kellyjonbrazil/jc/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64"
-
-RDEPEND="
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/ruamel-yaml[${PYTHON_USEDEP}]
-	dev-python/xmltodict[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests unittest
diff --git a/dev-python/jc/jc-1.22.0.ebuild b/dev-python/jc/jc-1.22.0.ebuild
deleted file mode 100644
index 7b7bbfc30991..000000000000
--- a/dev-python/jc/jc-1.22.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Converts the output of popular command-line tools and file-types to JSON"
-HOMEPAGE="
-	https://github.com/kellyjonbrazil/jc/
-	https://pypi.org/project/jc/
-"
-SRC_URI="
-	https://github.com/kellyjonbrazil/jc/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64"
-
-RDEPEND="
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/ruamel-yaml[${PYTHON_USEDEP}]
-	dev-python/xmltodict[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests unittest
diff --git a/dev-python/jc/jc-1.21.0.ebuild b/dev-python/jc/jc-1.22.1.ebuild
similarity index 100%
rename from dev-python/jc/jc-1.21.0.ebuild
rename to dev-python/jc/jc-1.22.1.ebuild
diff --git a/dev-python/jupyter_client/Manifest b/dev-python/jupyter_client/Manifest
index ec23a118488e..d767facd208d 100644
--- a/dev-python/jupyter_client/Manifest
+++ b/dev-python/jupyter_client/Manifest
@@ -2,7 +2,9 @@ AUX jupyter_client-7.0.6-test-timeout.patch 1270 BLAKE2B c039b22d8f0c2893738a1b8
 DIST jupyter_client-7.3.5.tar.gz 326758 BLAKE2B c2ac76eb6511b29c38d7e7441e1191bae1f931da27f2eb95d6cb842a0e36f36a6f7a1421253b62abf52243f9fdad36b34828e6d5cd13a0411fa4ce09b447c3bc SHA512 5a3471fe03f44671fc2a06f8c78c11197084c8c951a1f8b55b89d651a6aea2ae1bdbb451ed463e52519954e7dba99b4e2298a6511eef2a3618f095dc864758d9
 DIST jupyter_client-7.4.2.tar.gz 327079 BLAKE2B 71e1f2d7a84a308b37105887ab7851e1f8a8e1f3019d937ec2c48493396dd757f3b7bcd75be180187f2a2855f20f5c0db924b058d316a34d503a2964c63b65c9 SHA512 4e22cb0dccdc96d16c560dba2f9b19616015143d5bd709b9dafed9fa2419ab3d8e6f9091f8a94ab78a0a1d16db2db86def23300b6a39485c0c978f145da4eb47
 DIST jupyter_client-7.4.3.tar.gz 327186 BLAKE2B 04b601d0b492879b2a5f06c53610a354c640376707188fb75394df42ee4ea426ff87a9df5537e242115ea86a9db64bb625b0911407bfe5b00d667843cd78118a SHA512 620ebd31518b6161a32503c1fbb1f18c11e50c15bafd6a46747cc5de682d025aad626fae226ddcf9f2843fa9eb3580825c08474f7309906738da7a02c8d75193
+DIST jupyter_client-7.4.4.tar.gz 327373 BLAKE2B 02f70be181779352706f86515f705addbf68383f16d899a4d30c9d6cb0970e955435a8c934f611f93c9fe2eeb5c0fe3b124f31571ae396995564fb450bf03201 SHA512 6de3b271be03ff90d906fc176ce107799abbf8ac882d32d26d86ab91fd3f8a6fa09e5df4f3955e00bc939a31472d423a0d74396f8ba473440c4bc17cc1a28c2f
 EBUILD jupyter_client-7.3.5.ebuild 1201 BLAKE2B 1bb5254e1b8e6abacb76347519bdc9f253266d78a73632b6e59e96ab78e06f5f4f374f0a714cfbebaa8af1d846832f2d2858829c2d71168753612839cc739ff0 SHA512 25b1ca50613961e8c2160d105dd5639a3314ee1d306a4008fe79d377e5f5fcad496ecfd6c55cce976898fa680792c867bb26c45f3ffdbcff2eef4d03c8fa4f58
 EBUILD jupyter_client-7.4.2.ebuild 1209 BLAKE2B 4a526660630dfef0bd566a2139f6738cf40fd16e899d65a2f626c0c51ce9b50e6ac427bf74e91508081302b87eb06b743c524f29f46223f70a90760c2c07bf81 SHA512 684fadb1a2c4512f97fe576c44fa8a1baf8ee0b30529c26a2c615ac3989e2d77196fb3d6f303463e770be767109d3f0a47ba1000604bdf033a748ff8ffdb7181
 EBUILD jupyter_client-7.4.3.ebuild 1210 BLAKE2B 3b5fff2fc4927e1a7ec473e07203f8d476ee22f088e5ab66def6771b2e7f4019d3ac3dbb2c0c0abfd35bf68003558bbfa93b5142596764ece4d981974b815855 SHA512 021767266d1ab448bfb0fe09c1a7987469d2938d545a8c3c3d850419bc1043374baaf490b549b021d463db0c7a5703132a058ed56323246a6d3b06d5da048755
+EBUILD jupyter_client-7.4.4.ebuild 1210 BLAKE2B 3b5fff2fc4927e1a7ec473e07203f8d476ee22f088e5ab66def6771b2e7f4019d3ac3dbb2c0c0abfd35bf68003558bbfa93b5142596764ece4d981974b815855 SHA512 021767266d1ab448bfb0fe09c1a7987469d2938d545a8c3c3d850419bc1043374baaf490b549b021d463db0c7a5703132a058ed56323246a6d3b06d5da048755
 MISC metadata.xml 844 BLAKE2B 8beea01f144f8e28b58b1bd4d0d2a32eda4b5e50e479c83ed940cd6894d581aa22418bc2733910465cb6980134c3a29b63a6e31f595d037b9492337285837ac6 SHA512 73f427cc561e728c6f941052a4b6f9c6ec5c9d6ba3bb601bc58313687dfc8d6ed3602e1fb2f7f0ea00aec4360c8c1200334675917d22092ed79585b117865ebd
diff --git a/dev-python/jupyter_client/jupyter_client-7.4.4.ebuild b/dev-python/jupyter_client/jupyter_client-7.4.4.ebuild
new file mode 100644
index 000000000000..58a093cf850d
--- /dev/null
+++ b/dev-python/jupyter_client/jupyter_client-7.4.4.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Jupyter protocol implementation and client libraries"
+HOMEPAGE="
+	https://jupyter.org/
+	https://github.com/jupyter/jupyter_client/
+	https://pypi.org/project/jupyter-client/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/entrypoints[${PYTHON_USEDEP}]
+	>=dev-python/jupyter_core-4.9.2[${PYTHON_USEDEP}]
+	>=dev-python/nest_asyncio-1.5.4[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.8.2[${PYTHON_USEDEP}]
+	>=dev-python/pyzmq-23.0[${PYTHON_USEDEP}]
+	>=dev-python/tornado-6.0[${PYTHON_USEDEP}]
+	dev-python/traitlets[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		>=dev-python/ipykernel-6.12[${PYTHON_USEDEP}]
+		dev-python/ipython[${PYTHON_USEDEP}]
+		>=dev-python/pytest-asyncio-0.18[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-7.0.6-test-timeout.patch
+)
+
+distutils_enable_tests pytest
diff --git a/dev-python/jupyterlab/Manifest b/dev-python/jupyterlab/Manifest
index cea376d3c647..a0452f6456ae 100644
--- a/dev-python/jupyterlab/Manifest
+++ b/dev-python/jupyterlab/Manifest
@@ -2,8 +2,10 @@ DIST jupyterlab-3.4.3.tar.gz 17074198 BLAKE2B 08a0aa4ddaeb6b48a742ef78e1b8cefb95
 DIST jupyterlab-3.4.5.tar.gz 17108960 BLAKE2B 83f4e99a1f98265df50857988dcd011862a0be4212abd8217cc330b3b536f5c7de2486f5c19e692c78eb8305f73c11a11772b510847ec25d756c81c828425ce3 SHA512 17428899b577a9e661ea755e3d6e2e3d640ca4ae28cd51e197520b9a388088e2a0d52a799f14b128d94f0c1ee2ec7580e309586c63e1d2e3b6019ae1075abc1c
 DIST jupyterlab-3.4.7.tar.gz 17111219 BLAKE2B 8e1246b56d75f2336ab46ca66f371dde275327a445563a8c41dcb528b58558c902776008f25b28e8a4fb299e9692c20b08c224f71304aa6f16143a757548814a SHA512 16a6e38fafbe3f8daa7f2e65b511e30b65800a1b21ee5e6360faae4cc1806472268297582f12a45d39d482ed5f25fc9c6874299e5e05efed5f50e8f2a3986c66
 DIST jupyterlab-3.4.8.tar.gz 17104727 BLAKE2B 7de7d899caff7e3a9641b7568ef63a9f07c739e474cb998cf62cf62abe2d51e488d52a644ffb4d0b5bdd46cadbd15d53020c28ba9602019db1e4b25d1fb696cd SHA512 244a38077e752d5e7066da6a312fa75ac3810bffda62b89133b7cebe459b35fedaaf320999c8ecf452c98ced6e80a16e290c4df9c8f741e1662aafa10785f9e0
+DIST jupyterlab-3.5.0.tar.gz 17110889 BLAKE2B 89b20734dea44419af023b88c85b243fa3f8ac0c7272600729da8690eb53cd4286d9c9bb90e95e291644de3675a9daae63898d6621cc4c21b4fc8e0d965242b4 SHA512 43b893127b5b4f1ccd472dfe9152d4ac8f89192411d1fa6045e3ecfb5f8f16819d1cf4b6fd70d9656d25d10cafff55055da98d36d2c8537d5b07e29e2d157799
 EBUILD jupyterlab-3.4.3.ebuild 2450 BLAKE2B 715a8a45fc654a503eb336dfe5fd53724de72ad0cf5465ca69b2b1bd7f53c7c86fc62d49fedcd6d99c758b3f91276bd87151267ed58190a16e21f428e4313c93 SHA512 e37a8693fb4ae9d0699b5720250e91e5b9d792c9e48c23ffa13cce9a5a2d4cd090fa406e70f644d07e24a863074ff6c1877ac117eb82382b4531c50817ee482e
 EBUILD jupyterlab-3.4.5.ebuild 2492 BLAKE2B 6f0bd7b02b89902235e79f685e85a50f7a939a807c095585def3a5289e36365dbb4651914903d0a3d2e45882f3ea36d89c38618c10a9f7a43bd2321eaae6e8af SHA512 53d169aa9e79573d136e1f181160beefca13d4969084110b7ead88447cc0b9dd34e605285e80f230c2561b6ecc28d767ccf3cdfc5019fbb9dc441dc9e6bd6a2d
 EBUILD jupyterlab-3.4.7.ebuild 2528 BLAKE2B 47b3da2d0bf1ce023ff593b02d416e6a4cc0f9c94e701f3bd4cb10676b840a1dace3cca3c8adb12ec5236c4dce9c3a080d03debc98e2d632bdaad4b183e552bb SHA512 e3e77a91f0a41270a5ac058c4898c6032730c728abee2e64f650ce71c4ca18cc68d45f8daeea091009f784b8659f3fa5a0deb55bc8a9b3413697b41c5884da94
 EBUILD jupyterlab-3.4.8.ebuild 2533 BLAKE2B fe6d8794e22332956920182ee42d98cfd748dc9d59966c9ab2914083ec7af12d1828e2a2dab515adc245e96522beddb541714b488d3f7fe98c7f8f9120d617e0 SHA512 e72f0dee548a2db97bc3d938005e723bd791f3023dbb1496be863ad5902a590a7e2bf8bd88c5e2d870ed737734aa9cc3ab03e0ebffbdce66b4a08552d2e6da08
+EBUILD jupyterlab-3.5.0.ebuild 2533 BLAKE2B fe6d8794e22332956920182ee42d98cfd748dc9d59966c9ab2914083ec7af12d1828e2a2dab515adc245e96522beddb541714b488d3f7fe98c7f8f9120d617e0 SHA512 e72f0dee548a2db97bc3d938005e723bd791f3023dbb1496be863ad5902a590a7e2bf8bd88c5e2d870ed737734aa9cc3ab03e0ebffbdce66b4a08552d2e6da08
 MISC metadata.xml 412 BLAKE2B f0b40e19f8ba9dc116f0e4a882cabab6376f22d1eaeb3eac58ecff465ee2aff3564ddbf55e4ffb8971807a39945109a164037a954419671a274d3ac558b102ea SHA512 b6149a03585ca04bc3bf6f3ea6055e8e1fcb620a771359d150df7c22ee16bf09f57c8037df2161021fac0c194be0ac5ec79a31f0511d785e0c5b1ca96d817e42
diff --git a/dev-python/jupyterlab/jupyterlab-3.5.0.ebuild b/dev-python/jupyterlab/jupyterlab-3.5.0.ebuild
new file mode 100644
index 000000000000..1491c0f13490
--- /dev/null
+++ b/dev-python/jupyterlab/jupyterlab-3.5.0.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_USE_PEP517=jupyter
+inherit distutils-r1
+
+DESCRIPTION="JupyterLab computational environment"
+HOMEPAGE="https://jupyter.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD MIT GPL-3 Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="dev-python/jupyter_packaging[${PYTHON_USEDEP}]"
+
+RDEPEND="
+	dev-python/ipython[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	dev-python/jupyter_core[${PYTHON_USEDEP}]
+	>=dev-python/jupyterlab_server-2.10[${PYTHON_USEDEP}]
+	>=dev-python/jupyter_server-1.16[${PYTHON_USEDEP}]
+	>=dev-python/nbclassic-0.2[${PYTHON_USEDEP}]
+	<dev-python/notebook-7[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.1[${PYTHON_USEDEP}]
+	>=dev-python/tornado-6.1[${PYTHON_USEDEP}]
+	dev-python/tomli[${PYTHON_USEDEP}]
+	net-libs/nodejs
+"
+
+BDEPEND="test? (
+	dev-python/check-manifest[${PYTHON_USEDEP}]
+	dev-python/ipykernel[${PYTHON_USEDEP}]
+	dev-python/jupyterlab_server[${PYTHON_USEDEP}]
+	dev-python/openapi-core[${PYTHON_USEDEP}]
+	dev-python/openapi-spec-validator[${PYTHON_USEDEP}]
+	dev-python/pytest-console-scripts[${PYTHON_USEDEP}]
+	dev-python/pytest-tornasync[${PYTHON_USEDEP}]
+	dev-python/pytest-timeout[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/ruamel-yaml[${PYTHON_USEDEP}]
+	dev-python/requests-cache[${PYTHON_USEDEP}]
+	dev-python/strict-rfc3339[${PYTHON_USEDEP}]
+	dev-python/virtualenv[${PYTHON_USEDEP}]
+)"
+
+EPYTEST_DESELECT=(
+	# These tests call npm and want internet
+	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_uninstall_core_extension
+	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_install_and_uninstall_pinned_folder
+	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_install_and_uninstall_pinned
+	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_build_custom_minimal_core_config
+	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_build_custom
+	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_build_check
+	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_build
+	jupyterlab/tests/test_build_api.py::TestBuildAPI::test_clear
+	jupyterlab/tests/test_build_api.py::TestBuildAPI::test_build
+)
+
+distutils_enable_tests pytest
+# TODO: package sphinx_copybutton
+#distutils_enable_sphinx docs/source dev-python/sphinx_rtd_theme dev-python/myst_parser
+
+python_install_all() {
+	distutils-r1_python_install_all
+	mv "${ED}/usr/etc" "${ED}/etc" || die
+}
diff --git a/dev-python/jwcrypto/Manifest b/dev-python/jwcrypto/Manifest
index 3d555c6f20f5..461fe927a9f8 100644
--- a/dev-python/jwcrypto/Manifest
+++ b/dev-python/jwcrypto/Manifest
@@ -1,5 +1,3 @@
-DIST jwcrypto-1.3.1.gh.tar.gz 91903 BLAKE2B 49fb3cb9548c85d406d47074a410f6bc89cbc32f16a0244b4ac5e3fa219bc66fc1e4ed32056f5c9885608b5225c2ed3423555813938465924e60dabb8f39749b SHA512 bc43a1acdb12a4e25251a3c5f9c85286c5a4234bd098efe69b7e3bd3da9ec72e80d7239cc20b1f971e17218cce9a7febe6a92efca33da2f2e1479fe64150bb71
 DIST jwcrypto-1.4.2.gh.tar.gz 94465 BLAKE2B 23b3a18694793cdbdd1875bd9b107ecab8248ac2c6cbf1bf142144633f7dc6efea91b693b808a4a6153b78c1117dbb2fe1f831f7f2558d2476e146961a501c17 SHA512 9967e626bc4a13a12ef09bbf3dada589c2c5374f4addff743c3ca9762c66659f59ca2e0f495cda6bc5821b6ed62aae95d478bf14de0acd6b2696bf0e1a9e7a49
-EBUILD jwcrypto-1.3.1.ebuild 842 BLAKE2B d81c732703a83443f1bab3668256170a4c3a44691c891d6dcf06c68c1fa7283268bba5a5005fca7db7ca9af3785bc5ad056282fed4c3e6fd23a135b3f3a8d126 SHA512 9f8f2f49bbb7704f477a4a7eb9bed40e63261348c0d972e91d7b991ed5da168955c10787ea85865032bb033f81d983046fc15da8060dde557dab52b8a201b42e
-EBUILD jwcrypto-1.4.2.ebuild 847 BLAKE2B a1aa7608405aa4fbcf1763ebfb46c9f904431dda31978a6ae474919012b94f6a0fab40dd5d5642c4bded38d4b075b31c4090d6803abf3fed447f83dade868925 SHA512 55947c42faea78a660ff9fb17a8f900a169a2a1884cd7feaf4f0da44bc1d8fa096293e7d5c7f366913f093b2e755b29e35c313023456599a179504d6262aff9d
+EBUILD jwcrypto-1.4.2.ebuild 845 BLAKE2B 7349ff5efb3058c96522a4a03336fac07dd02169b1da080b7f53ce591fb2b341954690899a92ad90b58062bdab937c2590a3cff5aeb502e3a5201d9762bdc507 SHA512 1ae9253827bb6def1997efcb4fbc11274d8298873345b0bad1fa99fd540d73f12d4b13a5c347d3ef8532b0dbf9e3ae3922542dbfe66ded42b027ea7c40cd8401
 MISC metadata.xml 369 BLAKE2B c7868e0b20a2875964290642cddb457b71628e361f0e032875ac45f4405abeb76c8c53bcfe623c9a2e49ea6e184505503b4e43f34c456528ff3250aea5110b10 SHA512 a1fec6ac31bbb096e508b0ebd644aa8a96418e6972d852512d4b7702b67f241f858610235dbd68430c588d8b837c7a0866f333c8aab182e7cd01e10325031d34
diff --git a/dev-python/jwcrypto/jwcrypto-1.3.1.ebuild b/dev-python/jwcrypto/jwcrypto-1.3.1.ebuild
deleted file mode 100644
index 6517479a9113..000000000000
--- a/dev-python/jwcrypto/jwcrypto-1.3.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Implements JWK,JWS,JWE specifications using python-cryptography"
-HOMEPAGE="
-	https://github.com/latchset/jwcrypto/
-	https://pypi.org/project/jwcrypto/
-"
-SRC_URI="
-	https://github.com/latchset/jwcrypto/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/cryptography-2.3[${PYTHON_USEDEP}]
-	dev-python/deprecated[${PYTHON_USEDEP}]
-"
-
-distutils_enable_sphinx docs/source
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# Do not install doc in non-standard paths
-	sed -i "/data_files/d" setup.py || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/jwcrypto/jwcrypto-1.4.2.ebuild b/dev-python/jwcrypto/jwcrypto-1.4.2.ebuild
index e6056edc5f0d..ac6f46ca1bdc 100644
--- a/dev-python/jwcrypto/jwcrypto-1.4.2.ebuild
+++ b/dev-python/jwcrypto/jwcrypto-1.4.2.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/cryptography-2.3[${PYTHON_USEDEP}]
diff --git a/dev-python/k5test/Manifest b/dev-python/k5test/Manifest
index 741d9de34986..aa7c5dbe65a7 100644
--- a/dev-python/k5test/Manifest
+++ b/dev-python/k5test/Manifest
@@ -1,3 +1,4 @@
+AUX k5test-0.10.1-which.patch 1399 BLAKE2B 0ddd4f99103c94c4e73eb3be54c1844206b366e99bcc1a026ee6981fb1a02f09e98061ee79a03dff91f8fba16945141cb64025b1416f4ded03c1d672768d4b88 SHA512 fd699ffe140a90a961a18b1df30eec08b7fb4d4ade24a23d5d6586bd76dbc15e4c2b5a9b342346d81eab0d7d3bcbae9a62489423de641c26414cc964c9586009
 DIST k5test-0.10.1.tar.gz 13664 BLAKE2B 4be24a8c9b154f5ec7b83b6743d0f756cb813bdfe4496c6f8ed873a2fc5a725c17b34f7b243d106d7a985aa53351f9bdc354fabba6a8c5fa3d25927513441cb4 SHA512 eaf451f0a932fdb8758f23e17ec52b2c1617074f186dddfba1d9c6844291fb2f4b003e05f4a0e02ce1bae37ee4251ea8295d2ebc8d9002c83d3179000fa4785e
-EBUILD k5test-0.10.1-r1.ebuild 479 BLAKE2B 01ae8e651203cf165a4dc7f7a163ce5036a00aaf0d2638533feb7b9353d8c0ff7ca10c86770f2315d21d56a7d8cf41a8ed5ed9b5bbcd6df093a2aeac8d15317c SHA512 de3422fb304b01735cc2d26bd1d6fa44e29e20f1b6475809881abaa17fc6aa56697caf47377efdfe2ef7d2dcba0fbe75c85e93a146e3296414fe66a6811de0e4
+EBUILD k5test-0.10.1-r2.ebuild 530 BLAKE2B a4c87827876715a4135958971a8c5dd6c572cfaa9dea1a2e38023602d5840a5977ff7311f37300f367651d486d507331383f7bb92c2b214e1b31f8cac500a81d SHA512 fcc787ef30afae89d07e4fe4776b36bb641ce4e2e3e88decd48db4890221862021f4038862f71d10c04e96f6ff150e9f5c778a439ab178563567f37524c0bb62
 MISC metadata.xml 393 BLAKE2B dc1fec37db82ae2baa97fe324533b9105879142442ac6072b20721dc5233981d726fa56dbefaa0d51b85917ba64110395c2f7c57a9d8e88cb8ecb5bd9d116996 SHA512 b8dd2d38e1d2d95d9fac8a77be33973457a64afc771f3122f161db721b2b1ed71a9e569e498bd85494e498dba340e9a7d3137ea1c239d9ba8d8c19332ebfb1be
diff --git a/dev-python/k5test/files/k5test-0.10.1-which.patch b/dev-python/k5test/files/k5test-0.10.1-which.patch
new file mode 100644
index 000000000000..c5a72b5dc091
--- /dev/null
+++ b/dev-python/k5test/files/k5test-0.10.1-which.patch
@@ -0,0 +1,41 @@
+From cff2138124cb7461fe2b1a270d0c0132e6f66f6b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Wed, 26 Oct 2022 05:31:22 +0200
+Subject: [PATCH] Use built-in shutil.which() instead of which(1) tool
+
+Use the built-in shutil.which() function that is available since Python
+3.3 instead of the external which(1) program.  The latter is not part
+of POSIX and may be missing entirely (Gentoo is activately working
+towards removing it)>
+---
+ k5test/realm.py | 11 ++++-------
+ 1 file changed, 4 insertions(+), 7 deletions(-)
+
+diff --git a/k5test/realm.py b/k5test/realm.py
+index 8b24141..2260258 100644
+--- a/k5test/realm.py
++++ b/k5test/realm.py
+@@ -68,16 +68,13 @@ def _cfg_merge(cfg1, cfg2):
+ 
+ 
+ def _discover_path(name, default, paths):
+-    stderr_out = subprocess.DEVNULL
+-    try:
+-        path = subprocess.check_output(["which", name], stderr=stderr_out).strip()
+-        path = path.decode(sys.getfilesystemencoding() or sys.getdefaultencoding())
++    path = shutil.which(name)
++    if path is not None:
+         _LOG.debug(f"Using discovered path for {name} ({path})")
+-        return path
+-    except subprocess.CalledProcessError as e:
++    else:
+         path = paths.get(name, default)
+         _LOG.debug(f"Using default path for {name} ({path}): {e}")
+-        return path
++    return path
+ 
+ 
+ class K5Realm(metaclass=abc.ABCMeta):
+-- 
+2.38.1
+
diff --git a/dev-python/k5test/k5test-0.10.1-r1.ebuild b/dev-python/k5test/k5test-0.10.1-r2.ebuild
similarity index 74%
rename from dev-python/k5test/k5test-0.10.1-r1.ebuild
rename to dev-python/k5test/k5test-0.10.1-r2.ebuild
index cd681b4fed98..aa48a24cd102 100644
--- a/dev-python/k5test/k5test-0.10.1-r1.ebuild
+++ b/dev-python/k5test/k5test-0.10.1-r2.ebuild
@@ -5,12 +5,20 @@ EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{8..11} )
+
 inherit distutils-r1
 
 DESCRIPTION="Library for testing Python applications in Kerberos 5 environments"
-HOMEPAGE="https://pypi.org/project/k5test/ https://github.com/pythongssapi/k5test"
+HOMEPAGE="
+	https://github.com/pythongssapi/k5test/
+	https://pypi.org/project/k5test/
+"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 ~arm arm64 ~riscv x86"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-which.patch
+)
diff --git a/dev-python/kgb/Manifest b/dev-python/kgb/Manifest
index 3f6078f54e7e..58eda617934b 100644
--- a/dev-python/kgb/Manifest
+++ b/dev-python/kgb/Manifest
@@ -1,3 +1,3 @@
 DIST kgb-7.1.1.tar.gz 61504 BLAKE2B 37aa4c78e0e74c2ad10db047453229d903c72dc9f359ce916f66b24ddc390e89126869e8e52942854911952e995b45f9a304e48574c7c79319f388d0f70d148f SHA512 29e5d78270f55b82b917a1e448307397f813502cc3a262fd6af082417f3875c88732b3f7c11c6001120bb0cba4079c2c6351b2b24287b1f5a3b3c891cf3f8d55
-EBUILD kgb-7.1.1.ebuild 622 BLAKE2B 92b469a51da23a3327bcca2ccf8ee32572443f7ad5303c569fd7d088cf558744c00b10b565f1ce9aa4943f2c2665689bf5e78893aa5b03684a6b99d1bef11d3f SHA512 cbcf89bc8b5ca4fa5c97baefdc978ab5ad3812524de30fcc9c2ddac0450dc1b405e90a4fdd622171a244106c370d68535c93ff352c03d1e30a3e7f5e519fcd8a
+EBUILD kgb-7.1.1.ebuild 620 BLAKE2B 9309fe04445f3452b8812f9e52c143f7aa0bd1d8713e1e1a16ef3d1eb40b9d386f75f86b04e74fcc55ddde0292996685d1f664499614a35bd6db5867059b20b3 SHA512 a99be8986e26f73cddfa89a30ee0affb7a7d232d26aa0ee6ba6d7c61af882fee8c7c05b5cd11b175d355ff1d2a8c1601bbc2183e94f64a70e167628bb3f31c66
 MISC metadata.xml 385 BLAKE2B a36cb8262ed3d2fd3114e8c84bdd732dbbb661b8fea7a9705ff329f56659c020e5b9e00756a9e9dbbf073b894ddf5f811367b8c4d9b11dddd7c866588987e96e SHA512 5ee33147dec8e3fee8dc4856ca8a363674cd1854f36e9a01559751ec6799d8f8c995c8d0f82dcf794161b1f91acec387d7a18d7cdee2638fddbc177f0a069c81
diff --git a/dev-python/kgb/kgb-7.1.1.ebuild b/dev-python/kgb/kgb-7.1.1.ebuild
index c7f92d10cca2..72b37f451fd4 100644
--- a/dev-python/kgb/kgb-7.1.1.ebuild
+++ b/dev-python/kgb/kgb-7.1.1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/krb5/Manifest b/dev-python/krb5/Manifest
index 77ff9c51d223..9904413c3d09 100644
--- a/dev-python/krb5/Manifest
+++ b/dev-python/krb5/Manifest
@@ -1,3 +1,5 @@
 DIST krb5-0.4.0.tar.gz 218774 BLAKE2B 44bfe2226eda7b9175b059d4e634c64870ad03a34dcc6595bf7770e21e83b11b000a2bf076a749f88cfb0912b3dcc28974db1ba1273c03bcfab63a868c2165ed SHA512 d51b58b84985ccbb5440bea71a09c23889dd8ee2b14fa594f0f2330b0e318993e8c9627f5cc568585fe5e86847a3eb5f4a4775ea07d7936c03f69ce0fd141950
+DIST krb5-0.4.1.tar.gz 218745 BLAKE2B 8b7e6ab921462ec03c4ca23d83dcfbb8f03b2538edac1a920e68bc3f53c518c942a5f54a96c201a11667e0f4d82882d321808683efa0e5ed1d00df569aa73f2f SHA512 089b3abf3a9402248ed04ab4b47672e0de88c5c73c0c705ac129e499ff53931ffcf7fc6a6bdf9b0f9e03e9010f25dcc61b9a2d33c6b67f5b741a477fb5199265
 EBUILD krb5-0.4.0.ebuild 595 BLAKE2B aeb73041409fe9acc2b19a75bc89c773e8ef088c12471866600bd18432d85703775e515c49019de9624570fc52d6d13e95ecc9aae27251c2433e4ef579bcc9d0 SHA512 cfb552fe44a27bf7e4935d1c6b0e49419394775e1dbb1fcf5bd0d8a567de654455c320b9712083da5bcaa4a4a24ffc24366309162731f0ea5beaa48cc1b92361
+EBUILD krb5-0.4.1.ebuild 606 BLAKE2B 9b0d464687995e75ec99f7f9a0f3d950d43529f26418e2ccd448d84d06b7a8e6828c688ee05be0fbfb60bcb8dee5ffc2b404cb88cc982833e8117e9a239f6b1d SHA512 69d8efe92ae56125e3acb183387ff9b450011c650b3aff37aa77b2572c8d1a268fe83f216340f17f69c4992223c20fdb1496d210a17297a1da00ed4e9ccab975
 MISC metadata.xml 364 BLAKE2B e69a14082c08f32db33234a5738190f54374c13a2f114d65e26a8e224c96f23be90e0cf602830b757fdadfaa058d723ab2cd51e6980f08fb090ca7b014416935 SHA512 f65eb368468d221f55e0701f8ae3790dbf083be2d3f210e9688b27db892b6d3e566a0cea3912d45a4e1e6da7aa092bc82eb6a4b861b459bb8decf914c5192d6a
diff --git a/dev-python/krb5/krb5-0.4.1.ebuild b/dev-python/krb5/krb5-0.4.1.ebuild
new file mode 100644
index 000000000000..ab0d23e77af0
--- /dev/null
+++ b/dev-python/krb5/krb5-0.4.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Kerberos API bindings for Python"
+HOMEPAGE="
+	https://github.com/jborean93/pykrb5/
+	https://pypi.org/project/krb5/
+"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	virtual/krb5
+"
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	test? (
+		dev-python/k5test[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/linkify-it-py/Manifest b/dev-python/linkify-it-py/Manifest
index 9c3d79e402cb..e91249d19195 100644
--- a/dev-python/linkify-it-py/Manifest
+++ b/dev-python/linkify-it-py/Manifest
@@ -1,3 +1,3 @@
 DIST linkify-it-py-2.0.0.gh.tar.gz 76363 BLAKE2B dc04c1445b86998bd59d452cb86afdfa91d1165cbfe4148b5f9f0234b2f9f9e71fa3c41c36749e96f1269eda20fb81ed55fb63b18947e5c38bb233cdff06f9ca SHA512 7d2a66d5f0e33aece5b8d2737f20bd83f6cb2b7958b681c293f5996263f65f525862ce0cb0f7be9df1597844e58ed804b5b604c257e4d84cbf05677fd2733dda
-EBUILD linkify-it-py-2.0.0.ebuild 658 BLAKE2B 5d8cfb80ad2d55c39c457d17e42e9db209c800e7bcaee1a543c7ad4152a3fcc17a452fd39b3881a493bf52de95af14329e96a5fd177485551c16b159e6043d7f SHA512 7cedb120e6375a538c5d32502c1db7742144433f21f552dcbf23b3d4ac954efdb22708b5211a7678ddcd0107fde52e83dced6049d0e421fcd3d53528bb636fef
+EBUILD linkify-it-py-2.0.0.ebuild 656 BLAKE2B 1421c65a95f8dc5c3ad8c20c42b0328ca47cb6a5f21b53877849f49643f6f38b5447c7b2f25e2a44ceda40ce5e7280dd8c71c677c81b0bb2b5a8c33832cae2c8 SHA512 897ef88de41e4618086db3e59d71a38101ff27cccd6caf2dd69bcfe3d5103df088800ea876e6e341c085817454fa2a78071ad1341e6871b05c8fb8130cf6aa7d
 MISC metadata.xml 402 BLAKE2B f743f7ee6ccc16f6ae09861fa1712b456d7d7796afea37616781f3c40c33633a4571c78cfe41a9fb9b7e6370b8d2c03197e57ada0a0c5a2f80c1a21bbcab52cf SHA512 783959f08e822d432f30348ff5a7f4fc0713d0d273286cb840c43165141b12d28d812dce0958105561bb2a9d02e0034199d1405b4b83579de2283e133a03eef1
diff --git a/dev-python/linkify-it-py/linkify-it-py-2.0.0.ebuild b/dev-python/linkify-it-py/linkify-it-py-2.0.0.ebuild
index afb562424721..2f1758698e37 100644
--- a/dev-python/linkify-it-py/linkify-it-py-2.0.0.ebuild
+++ b/dev-python/linkify-it-py/linkify-it-py-2.0.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/uc-micro-py[${PYTHON_USEDEP}]
diff --git a/dev-python/lit/Manifest b/dev-python/lit/Manifest
index ca3f1d024ccd..00aaa33c5b1d 100644
--- a/dev-python/lit/Manifest
+++ b/dev-python/lit/Manifest
@@ -7,8 +7,8 @@ DIST llvm-project-b34ea582774c057d9bf5591174d683fd3d8aa02b.tar.gz 169735900 BLAK
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
 EBUILD lit-13.0.1.ebuild 907 BLAKE2B 786bc45254014c19e47997b263eba9245fc44459a6f12d46e69803fdf57c1b8f3d07d7e0354ea23ab17471771f57af8e792ca942b9f195462a26629d8d6bfb8b SHA512 ca254f8d0d3af0e01b24e73de8e15b77d687fd0f23a4848dd4e85522426e7dbdcd8ae77e25d8f88e637e390131fe78362ae7ba4ecd192a4c970cc3311b371dfa
 EBUILD lit-14.0.6.ebuild 914 BLAKE2B 80f1bb1010f71ff835aef8e87cc0bca5de0dd97e74debaee4e26d698e530468b755bc632884c11616a0ae082befa75a7b6c11043c70c3bb5679b0dae1c985d0a SHA512 77eafef2378be28fdcaa87f07fec8b1907f8c491b4a600b47d9f5970148f6684e6b4733ad6dafb753aa7a56ed1834b10ff30afc5995812c895749ea0c7294e47
-EBUILD lit-15.0.3.9999.ebuild 871 BLAKE2B 5ab6cc094e95685501304ebac41e07a919505fb6ce9b2db04e0c671e6a494df35ba81f6a43d8448cb2f94e982e32850658085daa98ca60e652da887dffc400a6 SHA512 d4cf8c7c2bc71376c998ff0d9796c6713b20e972014f13369d7658667f23cd97ec237df2818aa96add88cb4e2c36d1f272494fbab8d6b15014d5529d95616186
-EBUILD lit-15.0.3.ebuild 920 BLAKE2B 44ddfc3adf60ca1c1a328ecda0d28b7fcbc416a0d472cdf31f978fa25beebec533686b71292a7b36be1654633026e029f04e2b496c06845e088bd9b416b1b6c0 SHA512 d4a2442ead255c0664f4a4946034632658d39dd36ccf3d88b5aaad7f7ebe25b0969dbfb368ad6a487c277f845c47a54f8f548df79db2da84bf3714883ec0fbea
+EBUILD lit-15.0.3.ebuild 919 BLAKE2B adf8eb983f08a1ba6b3ec432c8ce75579649562d7786c6614f07919c5742274e4fe028eae5faea0d9b3b83e9ab3d0b2f9c8cc8c0b1c811dcedf3d9fecdec1223 SHA512 4f34c0519214f9d4e69e9a034b17d24562f66fe7138b3c7628eaf15652f2b56c5bfcabe9fb2d37fc204b28790f2629283a733a9ce2bf413f154c6e7a2afa733d
+EBUILD lit-15.0.4.9999.ebuild 871 BLAKE2B 5ab6cc094e95685501304ebac41e07a919505fb6ce9b2db04e0c671e6a494df35ba81f6a43d8448cb2f94e982e32850658085daa98ca60e652da887dffc400a6 SHA512 d4cf8c7c2bc71376c998ff0d9796c6713b20e972014f13369d7658667f23cd97ec237df2818aa96add88cb4e2c36d1f272494fbab8d6b15014d5529d95616186
 EBUILD lit-16.0.0.9999.ebuild 871 BLAKE2B 5ab6cc094e95685501304ebac41e07a919505fb6ce9b2db04e0c671e6a494df35ba81f6a43d8448cb2f94e982e32850658085daa98ca60e652da887dffc400a6 SHA512 d4cf8c7c2bc71376c998ff0d9796c6713b20e972014f13369d7658667f23cd97ec237df2818aa96add88cb4e2c36d1f272494fbab8d6b15014d5529d95616186
 EBUILD lit-16.0.0_pre20221016.ebuild 871 BLAKE2B 5ab6cc094e95685501304ebac41e07a919505fb6ce9b2db04e0c671e6a494df35ba81f6a43d8448cb2f94e982e32850658085daa98ca60e652da887dffc400a6 SHA512 d4cf8c7c2bc71376c998ff0d9796c6713b20e972014f13369d7658667f23cd97ec237df2818aa96add88cb4e2c36d1f272494fbab8d6b15014d5529d95616186
 EBUILD lit-16.0.0_pre20221023.ebuild 871 BLAKE2B 5ab6cc094e95685501304ebac41e07a919505fb6ce9b2db04e0c671e6a494df35ba81f6a43d8448cb2f94e982e32850658085daa98ca60e652da887dffc400a6 SHA512 d4cf8c7c2bc71376c998ff0d9796c6713b20e972014f13369d7658667f23cd97ec237df2818aa96add88cb4e2c36d1f272494fbab8d6b15014d5529d95616186
diff --git a/dev-python/lit/lit-15.0.3.ebuild b/dev-python/lit/lit-15.0.3.ebuild
index a79ebb91d54a..1573302cb8be 100644
--- a/dev-python/lit/lit-15.0.3.ebuild
+++ b/dev-python/lit/lit-15.0.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/lit/lit-15.0.3.9999.ebuild b/dev-python/lit/lit-15.0.4.9999.ebuild
similarity index 100%
rename from dev-python/lit/lit-15.0.3.9999.ebuild
rename to dev-python/lit/lit-15.0.4.9999.ebuild
diff --git a/dev-python/mako/Manifest b/dev-python/mako/Manifest
index 2db44fec9e5b..19ae4464f81e 100644
--- a/dev-python/mako/Manifest
+++ b/dev-python/mako/Manifest
@@ -1,5 +1,3 @@
-DIST Mako-1.2.2.tar.gz 490741 BLAKE2B 88408c10c6cae891969d67b204ade6bead6ff8f8bc4521d0a48c049b97594deb286acbddf1135caae77813d8ea075c3825ff5c738b6dc3406b12fe2048099bdd SHA512 4a9303b18710ad8111f4a83e963289df490cf1d01bf3b262e89fb2e9bb98a96fe2c83f8900597d836411d136b6ccb686f67b6e1554c4fe4868e68af1c864bcfe
 DIST Mako-1.2.3.tar.gz 491336 BLAKE2B 75a393bc91e40adf65b584f829e8f454ec894b6f09581d7511e8d5a3d534c301b8e06418a3aa896953270e54e70282afa6692b43debb8abdf122fcaeb754f1ed SHA512 904b12826b3fc74dec069e1fd4afb67a8a1962d72962c4ee8c9360deb728b8deb40c21e7bf831122ad6b095172a8de015222a97f47675d48d595c8eabd98a14b
-EBUILD mako-1.2.2.ebuild 1079 BLAKE2B 5bdab1d2d11422fbbb8a6a915f089c244c1bad9ec99c5b076b8cdf994441aa7eb1dc154b4ffc7765176426d6befbb93ba21232f2295d4bc5960de7073852a8fc SHA512 13d1644d606f0bb5406d5e2939c61556a7bc6d322d3daa1e9a25a85245782d1ef7f6286f9f071d4736131c3a44a20be8c8056727b8ef01830a0d6a3f1b3761e3
-EBUILD mako-1.2.3.ebuild 1087 BLAKE2B 70e3c032f6cf43c69bdefed725ef4cc57eefce352c310653a696bb930015deadb87869bfc3d5e6e369464f1bb8f02b88f026f6905afa218e74ec2c30a3b79ea7 SHA512 75c4547af99db5c19ed40a1aca9d963aa73314e74f01f1be79d4f98143c6ef440c4256e1ec48ab9344ddfcb1e99ef4c904f6c83eb02cad7de6190700980769b5
+EBUILD mako-1.2.3.ebuild 1079 BLAKE2B 5bdab1d2d11422fbbb8a6a915f089c244c1bad9ec99c5b076b8cdf994441aa7eb1dc154b4ffc7765176426d6befbb93ba21232f2295d4bc5960de7073852a8fc SHA512 13d1644d606f0bb5406d5e2939c61556a7bc6d322d3daa1e9a25a85245782d1ef7f6286f9f071d4736131c3a44a20be8c8056727b8ef01830a0d6a3f1b3761e3
 MISC metadata.xml 450 BLAKE2B 271e9801e0361eb9cf222fa9aca34f641e6118e17707469a87c1b41a6de34c67ec6a19576a86cc3c7ba1f671f8a28f9df8e994b3f232fe224eda85f4b8cf8b8b SHA512 d168ca10d7759129088a0d10ad73e4d0973ccaed1e649828077158aee55a8640db2446c9d874ef0da4fba5b27a6a0eacdc9d9ff4ec04a19cd1b9699542b5b0c1
diff --git a/dev-python/mako/mako-1.2.2.ebuild b/dev-python/mako/mako-1.2.2.ebuild
deleted file mode 100644
index 458c821b2cb4..000000000000
--- a/dev-python/mako/mako-1.2.2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{8..11} )
-
-inherit distutils-r1
-
-MY_P=${P^}
-DESCRIPTION="A Python templating language"
-HOMEPAGE="
-	https://www.makotemplates.org/
-	https://github.com/sqlalchemy/mako/
-	https://pypi.org/project/Mako/
-"
-SRC_URI="mirror://pypi/${MY_P:0:1}/${PN^}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="MIT"
-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="doc"
-
-RDEPEND="
-	>=dev-python/markupsafe-0.9.2[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/Babel[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=()
-	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
-		test/test_exceptions.py::ExceptionsTest::test_alternating_file_names
-	)
-	epytest
-}
-
-python_install_all() {
-	rm -r doc/build || die
-
-	use doc && local HTML_DOCS=( doc/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/mako/mako-1.2.3.ebuild b/dev-python/mako/mako-1.2.3.ebuild
index a0e0b665671b..458c821b2cb4 100644
--- a/dev-python/mako/mako-1.2.3.ebuild
+++ b/dev-python/mako/mako-1.2.3.ebuild
@@ -20,7 +20,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="doc"
 
 RDEPEND="
diff --git a/dev-python/markdown-it-py/Manifest b/dev-python/markdown-it-py/Manifest
index 955374ef2eeb..c8dbc4268796 100644
--- a/dev-python/markdown-it-py/Manifest
+++ b/dev-python/markdown-it-py/Manifest
@@ -1,4 +1,3 @@
 DIST markdown-it-py-2.1.0.gh.tar.gz 265858 BLAKE2B 0d1bb789ed9a8d08b16c753f7ecc7cc6a6b1fd59fc39d303a0de15276a0a0f93dc8c8bc952de60450741f26770dd3955ae0e6aaa358bacf1003e5eb9124d3a54 SHA512 04e90538c8693f795aed2ed0a5bef4eaf0c12fac32cc0c2049c563e974b229940b9ceaea849ce86fa9804ccdd7be93145f3b6fc8d0774e96fafa0484368d0a88
-EBUILD markdown-it-py-2.1.0-r1.ebuild 940 BLAKE2B b0cedc3fad75106c214baa72beb5f1fb515740616385833aa2252e13406acaf2f8ae7601d8eaa94449608775afedd69ef062caff88826e4a3c7c72e74b2ddf73 SHA512 f5c21e569860963c03b36f4189dbc8c0081c1b6664c49349b6a48e4a4115f83b2ea7642c5b5a9bee7e494f79d6b7f4df19cd85d4050d0ffcdbe9f0509fe070f8
-EBUILD markdown-it-py-2.1.0-r2.ebuild 834 BLAKE2B c0eae681f964d47dd105f6108abcedfc39f00c30620d984a890fe0850f3cad8cc9e54ce653b3e9f84198270f77005e505691379e6fe60b55d62dc44c579e9384 SHA512 22f468c0c2689cf807379cbb0febe3316af50cbe19a3bb106f1df867603236cad4dd34c864607af1feea85e733a7f22e0354bd76ffef10ca147f5b706c975d7e
+EBUILD markdown-it-py-2.1.0-r2.ebuild 832 BLAKE2B d6242e6372983e90640b0648cefcfae79e8dbb497b69b5e8390b544a32b6182436adf3f5a369da928b3f68747e6ea5a4c2a9ffa605830d15f397ff1f8bed182b SHA512 b188f06b1adaea1fe7582d15a604d53a4c74d8a2f3f648ccb05f69851d5c1494a8b7c19cbb226d364afba98d0e71eed2f1d89c9246640c7d190ea744520867c3
 MISC metadata.xml 412 BLAKE2B bffaf51dbd0a94b09d07650e49e9bee76015ab4358c36db207713d82387a1d729e7f6576d824b02ccfd786353762e623e3dd657fb3d7c42f8467c8165da61ed3 SHA512 88b86fad883100895db6feee193102cc93ead665e1283d02f9f57a4bb228acfc738cef11af2ba02cab9b02fdfe8ba35861347a19e5b0de22f546e8e0a297e173
diff --git a/dev-python/markdown-it-py/markdown-it-py-2.1.0-r1.ebuild b/dev-python/markdown-it-py/markdown-it-py-2.1.0-r1.ebuild
deleted file mode 100644
index 67c9b522c408..000000000000
--- a/dev-python/markdown-it-py/markdown-it-py-2.1.0-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{8..11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python port of markdown-it, Markdown parser"
-HOMEPAGE="
-	https://pypi.org/project/markdown-it-py/
-	https://github.com/executablebooks/markdown-it-py/
-"
-SRC_URI="
-	https://github.com/executablebooks/markdown-it-py/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	dev-python/mdurl[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-regressions[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# Unimportant tests needing a new dep linkify
-	tests/test_linkify.py::test_token_levels
-	tests/test_port/test_fixtures.py::test_linkify
-)
-
-EPYTEST_IGNORE=(
-	# No need to benchmark
-	benchmarking/
-)
diff --git a/dev-python/markdown-it-py/markdown-it-py-2.1.0-r2.ebuild b/dev-python/markdown-it-py/markdown-it-py-2.1.0-r2.ebuild
index dbe1f15c8c05..d50832e41c7c 100644
--- a/dev-python/markdown-it-py/markdown-it-py-2.1.0-r2.ebuild
+++ b/dev-python/markdown-it-py/markdown-it-py-2.1.0-r2.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/linkify-it-py[${PYTHON_USEDEP}]
diff --git a/dev-python/matplotlib/Manifest b/dev-python/matplotlib/Manifest
index 49c23b79f20b..e196d2d95c1d 100644
--- a/dev-python/matplotlib/Manifest
+++ b/dev-python/matplotlib/Manifest
@@ -1,16 +1,9 @@
 AUX matplotlib-3.3.3-disable-lto.patch 828 BLAKE2B 2044ef633091f27080d20e3e1b2c74605e13e99c9d044e97accde3b0a7946ef656f10c9bf5c036745f8ec85380e48cfd5e3d6fe8a023fa60e408d270f45a1da5 SHA512 81562749756b0415c6ce333d3cbbc197306dc9c2c425ec761767271c974badd13fe9a497c74231cd1bf9347f03ef0593bceff9b597289a8328e7c0211c7047ed
-AUX matplotlib-3.5.0-test.patch 10430 BLAKE2B 26f07224ad540c6fdaeec05d901ddb70c55bc3c8ba21e71fe2739e109cfad513f5a4231e99dcf65a00bbbe626b8966b46be1f4a53f80e03a7fd1ca8d3ed87b0a SHA512 560653a1a2ab311e3041e872cb9d1e82125fe4b98208160ddedfd3f6f26a9488714039736ebbf256d190307354a7a513609ea5e9b8876d8c6afef8bde034d3f9
 AUX matplotlib-3.5.2-test.patch 10981 BLAKE2B cd7406a1452b22d5782ef293b10e1fbed819c0fd832a7e4d5104020250f207bb87186a95815e2357379b2dc3bc87ae2f37387c7c423bdf41122ec330712ad53f SHA512 551d3ec3fb2bb14ccecee8056d78511e9b739af8b00f41d60be9a840b661725ff2eb4b22d72d8a9ccafa22e61c99db8dff216d7fb8ce537446a95056abea4d93
 AUX matplotlib-3.6.0-test.patch 10781 BLAKE2B 797fe4c86d94ecbfa5b7699c63f68e663ab842cb0a5bdedb059103bd62bc91e73bf135d3fca49ba93bf246e0fc68012b8ee85a20c83582823cf210d238ec8d0c SHA512 195fdf5f6af23ba5eb72fbd65ded1066c7e400af73e5c64fe989a231c6a3a32f0eb8a2196b48a7ba39079e3815d4a6c346dcc41175b80a673c7beefaa85bbb53
 DIST freetype-2.6.1.tar.gz 2302080 BLAKE2B 6a5fb98e5fa6cf4b7d7533ad44e364227d8c2f7dded4c552d6e22e204c32b7858f20d41d1e809ecdad6e5353d6cec81bea0e0b06a4533363a41ecab83ce3f7ca SHA512 ff2daed64d712737085924c50e75862fafbcbb24eef6d72dac9eaae63bb656d7245397fd828f5d3e47ac847f7ff83d73dedfdd61fde1f7d6e0f0cdeb49bcf83b
-DIST matplotlib-3.5.1.tar.gz 35320470 BLAKE2B ebf69b62ac587c61ecf8442abaab302019f63a3c9d8db6f7f7fb32f4d14da554fd8305ea6dfed2ff86a5af4e7e4d2b81f14802692fe50c986f7da8545bd26c00 SHA512 a317dbd748e5fc1fafcf80020cb6d38a8888431487beded97acd59d759e67e54f59506b642e4a03d4351c1ac050d15e3f2e2b5443433debc78ddad52881c8d82
-DIST matplotlib-3.5.2.tar.gz 35210006 BLAKE2B e3f90a0cf1d28f041a8cdd6920a8a4efe16169bb4acf85f7b2562196db306eeb692218728ea33c7b62214e7894e83a104954cbef38c45ccbb4f630bd35c0c36b SHA512 32844dfa85dbc43360c1773d748a58d2ab089111c51c825da62956c778a0eeaf10ca33a5c6c094295388a80d5873a2e1b17484e02b653e9e8e5ba98659329974
 DIST matplotlib-3.5.3.tar.gz 35236343 BLAKE2B 0d3f4e15295afe2c737e441325206e77c520a514bc87ab1eebef624f89896a2cf609e8d57b8fa8ef28ecf8c836e20cb296adaa95f81dbfcf3f2a45631e3dd02c SHA512 f431d3046e9c5fbe5d44a16a762e9a178ba34380974964660eaf3681671178866a63b3bad9aad8d3ad423926f7db2965d514e9b1489e3a824a4532a01f0e0670
-DIST matplotlib-3.6.0.tar.gz 35749946 BLAKE2B 1e2e80e124ef1a0a1843ba077c3c933b55a77062fd5cc49d304dd2d12f6323ff60f32113dc0c57388796682841367734283ea5c82e149d6fa3f379516800d131 SHA512 ea8cb274b9aacb4cc9c3b52cf5eaf881074dc73840cba160289e85173d763e96d3ea3628c5cb53f765092f53b9e3d05977281cc0c9d6756529601ca336ec0e27
 DIST matplotlib-3.6.1.tar.gz 35826557 BLAKE2B b30710436a773298dcdf233e592656d9815f55f0daab0cc28811b9adbfd3b2ede08f4c13e0dfa43c5fb283bc1ba96ea793084f3d65ba13b9697d14ffa406a273 SHA512 40b148fe4574eea88e7e74c2844a4811c71651602bd7e0a863482571bfa216c01d4f5fcd36add14af82c5cacdb6ae9d441ed251ee5239d06bcc8d40c9ee8841b
-EBUILD matplotlib-3.5.1-r2.ebuild 7230 BLAKE2B 003f7562ce03d398eecf1bc7cb9485b9109e6ab88a8277dcc26e34ecaee2e452f4af6ab34ff5c8de06c3c1548032cda3ecda9bf8bae635cceb4b4d2d8039b1a7 SHA512 7a325460d335521a132eb30594ea36a910c153f19ecac66303402e2821d0ab130f1fa91a69ae90a6a1746378876234f54d8c05c0695c09a827453c83e7d0b345
-EBUILD matplotlib-3.5.2-r3.ebuild 7391 BLAKE2B 59b395f4d3384793dd72c633e98ea71f64656042b398a2af2d25689285534c047e572779f4e966913c912870c747488d6e9d062766d980e7dd53fdad01647188 SHA512 2dc2ca8a5a7cd7fd679800bfef9208e7679b9bcb4bd267993d9369f00a2c09e6ca0f1abd30d9dfd3712e869b205e1945f29f008f41c5c77e7c506c10fd2fdea2
-EBUILD matplotlib-3.5.3.ebuild 7446 BLAKE2B c49d5f0ce2d14d6c621746217415103d06a1cc6d0c0d682c373eec20d0af0167a55b00ba582df7d7f3745de00692e254547e721aa25dc363261ffd6297424274 SHA512 a474eafc8ec34b70535e889b4ce5606a2ad3a682308346bb5b26868f13a84e31291fdd77b3f522883faefafa1f4f0d6ce2cf399bc9bacbc584ced8a3fabf07da
-EBUILD matplotlib-3.6.0-r1.ebuild 7488 BLAKE2B 83c3401cb7d1bb2d67f2930186ab777bb01f7054677b345ccdaae018fde7637dd492ed447c883f0c020a1cf6eeede3b7b4b09c860413e8236b5278444b3da907 SHA512 27e71506da65ca7bf88bb8b13e276711f3229f9bf8f5b7b2c7e5cd7fe8b420ad9183841b354d0bb89edacfa951eaa1e7085380b176bdd999ed98779334b55f9c
+EBUILD matplotlib-3.5.3.ebuild 7442 BLAKE2B d836df9fd184d6f55100527f9ff037e8707e2dd23c76b69beeafcff68c78d1bbbfc3de803b1a7ccdb6e4231d56fd97366495f162f2f9d1142979febf282f4eb3 SHA512 524ced6de727064ed0d2171dc410af864621842d189436941d90761abd3e7318d1704c7f8801ced1049235ab61c0548107805d3d6342f0dd3d085fe4fe657ced
 EBUILD matplotlib-3.6.1.ebuild 7493 BLAKE2B 12e64e26d7f46136281a97b780e8c11e2c611d2e242977dafde4e1f0e4fba09cc336e8b399efdf4353715f395b82ae8af0ea9262380ed4cd66fd5e306ca0b2d7 SHA512 7abb86a401f296ed6a9fd1ff526fa86ae3fcbd4f55c55facaba8e395d1cf19efe14e786e3eb181b272285b1227da7c94f63973c5c543dd5d99fb3b6ce66cc663
 MISC metadata.xml 1074 BLAKE2B 1d7dce116e09939378872c2eaf5153948b7e934626110eb4899d0dfc2781429522328f1c4efd2c40f829da64e19bed8f9fbd1b8907a6e74a5fd54587c1d29e5b SHA512 e344bfc813e09c24a8edfa9c062eb2a6c44535559370f508a27a2de20c6ab92aeb48bc8daf9c357178e513eb2474a33782e4098c0f3bcbb84b11f7388ef1a704
diff --git a/dev-python/matplotlib/files/matplotlib-3.5.0-test.patch b/dev-python/matplotlib/files/matplotlib-3.5.0-test.patch
deleted file mode 100644
index 214117d772ca..000000000000
--- a/dev-python/matplotlib/files/matplotlib-3.5.0-test.patch
+++ /dev/null
@@ -1,248 +0,0 @@
-From 5487db555adb0385892216e7819a1bf6cea41116 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Fri, 26 Mar 2021 13:42:49 +0100
-Subject: [PATCH] Increase image comparison limits
-
-Most of the tests require exact match which apparently doesn't always
-happen in non-pristine environments.  Some of them have very big
-differences due to texlive font rendering changes.
----
- lib/matplotlib/tests/test_arrow_patches.py | 6 +++---
- lib/matplotlib/tests/test_axes.py          | 4 ++--
- lib/matplotlib/tests/test_backend_pgf.py   | 2 +-
- lib/matplotlib/tests/test_contour.py       | 2 +-
- lib/matplotlib/tests/test_figure.py        | 5 +++--
- lib/matplotlib/tests/test_image.py         | 2 +-
- lib/matplotlib/tests/test_legend.py        | 6 +++---
- lib/matplotlib/tests/test_lines.py         | 3 ++-
- lib/matplotlib/tests/test_streamplot.py    | 3 ++-
- lib/matplotlib/tests/test_units.py         | 4 ++--
- lib/mpl_toolkits/tests/test_axes_grid1.py  | 2 +-
- lib/mpl_toolkits/tests/test_mplot3d.py     | 2 +-
- 12 files changed, 22 insertions(+), 19 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 17f8e5c631..b44cd454ef 100644
---- a/lib/matplotlib/tests/test_axes.py
-+++ b/lib/matplotlib/tests/test_axes.py
-@@ -868,7 +868,7 @@ def test_imshow():
-     ax.imshow("r", data=data)
- 
- 
--@image_comparison(['imshow_clip'], style='mpl20')
-+@image_comparison(['imshow_clip'], style='mpl20', 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
-@@ -4163,7 +4163,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_backend_pgf.py b/lib/matplotlib/tests/test_backend_pgf.py
-index 9b5b0b28ee..a374be0333 100644
---- a/lib/matplotlib/tests/test_backend_pgf.py
-+++ b/lib/matplotlib/tests/test_backend_pgf.py
-@@ -80,7 +80,7 @@ def test_common_texification(plain_text, escaped_text):
- # test compiling a figure to pdf with xelatex
- @needs_xelatex
- @pytest.mark.backend('pgf')
--@image_comparison(['pgf_xelatex.pdf'], style='default')
-+@image_comparison(['pgf_xelatex.pdf'], style='default', tol=0.8)
- def test_xelatex():
-     rc_xelatex = {'font.family': 'serif',
-                   'pgf.rcfonts': False}
-diff --git a/lib/matplotlib/tests/test_contour.py b/lib/matplotlib/tests/test_contour.py
-index 6396105f12..45b7022d03 100644
---- a/lib/matplotlib/tests/test_contour.py
-+++ b/lib/matplotlib/tests/test_contour.py
-@@ -341,7 +341,7 @@ def test_contourf_log_extension():
- 
- 
- @image_comparison(['contour_addlines.png'],
--                  remove_text=True, style='mpl20', tol=0.03)
-+                  remove_text=True, style='mpl20', tol=0.1)
- # 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 cb8f63893a..ef56c50d25 100644
---- a/lib/matplotlib/tests/test_figure.py
-+++ b/lib/matplotlib/tests/test_figure.py
-@@ -23,7 +23,7 @@ import matplotlib.gridspec as gridspec
- 
- 
- @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(tight_layout=True)
-     gs = gridspec.GridSpec(3, 3)
-@@ -1000,7 +1000,8 @@ def test_subfigure_tightbbox():
- 
- @image_comparison(['test_subfigure_ss.png'], style='mpl20',
-                   savefig_kwarg={'facecolor': 'teal'},
--                  remove_text=False)
-+                  remove_text=False,
-+                  tol=0.013)
- def test_subfigure_ss():
-     # test assigning the subfigure via subplotspec
-     np.random.seed(19680801)
-diff --git a/lib/matplotlib/tests/test_image.py b/lib/matplotlib/tests/test_image.py
-index 719b190578..ee2263a88e 100644
---- a/lib/matplotlib/tests/test_image.py
-+++ b/lib/matplotlib/tests/test_image.py
-@@ -1324,7 +1324,7 @@ def test_nonuniform_and_pcolor():
- 
- 
- @image_comparison(["rgba_antialias.png"], style="mpl20",
--                  remove_text=True)
-+                  remove_text=True, tol=0.005)
- 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 21c8ab748d..a05cb4c571 100644
---- a/lib/matplotlib/tests/test_legend.py
-+++ b/lib/matplotlib/tests/test_legend.py
-@@ -102,7 +102,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)
-@@ -111,7 +111,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)
-@@ -137,7 +137,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 f6917a134b..4a14abb74d 100644
---- a/lib/matplotlib/tests/test_lines.py
-+++ b/lib/matplotlib/tests/test_lines.py
-@@ -162,7 +162,8 @@ def test_set_drawstyle():
-     assert len(line.get_path().vertices) == len(x)
- 
- 
--@image_comparison(['line_collection_dashes'], remove_text=True, style='mpl20')
-+@image_comparison(['line_collection_dashes'], remove_text=True, style='mpl20',
-+                  tol=0.58)
- def test_set_line_coll_dash_image():
-     fig, ax = plt.subplots()
-     np.random.seed(0)
-diff --git a/lib/matplotlib/tests/test_streamplot.py b/lib/matplotlib/tests/test_streamplot.py
-index 88c3ec2768..b536ba3ff0 100644
---- a/lib/matplotlib/tests/test_streamplot.py
-+++ b/lib/matplotlib/tests/test_streamplot.py
-@@ -34,7 +34,8 @@ def test_startpoints():
-     plt.plot(start_x, start_y, 'ok')
- 
- 
--@image_comparison(['streamplot_colormap'], remove_text=True, style='mpl20')
-+@image_comparison(['streamplot_colormap'], remove_text=True, style='mpl20',
-+                  tol=0.002)
- def test_colormap():
-     X, Y, U, V = velocity_field()
-     plt.streamplot(X, Y, U, V, color=U, density=0.6, linewidth=2,
-diff --git a/lib/matplotlib/tests/test_units.py b/lib/matplotlib/tests/test_units.py
-index a6f6b44c97..ab5ad8b5cf 100644
---- a/lib/matplotlib/tests/test_units.py
-+++ b/lib/matplotlib/tests/test_units.py
-@@ -76,7 +76,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'], remove_text=False, 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
-@@ -103,7 +103,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/mpl_toolkits/tests/test_axes_grid1.py b/lib/mpl_toolkits/tests/test_axes_grid1.py
-index 3c4aa9a9eb..94ad419ceb 100644
---- a/lib/mpl_toolkits/tests/test_axes_grid1.py
-+++ b/lib/mpl_toolkits/tests/test_axes_grid1.py
-@@ -324,7 +324,7 @@ def test_zooming_with_inverted_axes():
- 
- 
- @image_comparison(['anchored_direction_arrows.png'],
--                  tol=0 if platform.machine() == 'x86_64' else 0.01)
-+                  tol=0.02)
- def test_anchored_direction_arrows():
-     fig, ax = plt.subplots()
-     ax.imshow(np.zeros((10, 10)), interpolation='nearest')
-diff --git a/lib/mpl_toolkits/tests/test_mplot3d.py b/lib/mpl_toolkits/tests/test_mplot3d.py
-index 5fee82f519..ed55a7bf68 100644
---- a/lib/mpl_toolkits/tests/test_mplot3d.py
-+++ b/lib/mpl_toolkits/tests/test_mplot3d.py
-@@ -1357,7 +1357,7 @@ def test_errorbar3d():
- 
- 
- @image_comparison(['stem3d.png'], style='mpl20',
--                  tol=0.0 if platform.machine() == 'x86_64' else 0.003)
-+                  tol=0.003)
- def test_stem3d():
-     fig, axs = plt.subplots(2, 3, figsize=(8, 6),
-                             constrained_layout=True,
--- 
-2.34.0
-
diff --git a/dev-python/matplotlib/matplotlib-3.5.1-r2.ebuild b/dev-python/matplotlib/matplotlib-3.5.1-r2.ebuild
deleted file mode 100644
index af0fa9dd9ef1..000000000000
--- a/dev-python/matplotlib/matplotlib-3.5.1-r2.ebuild
+++ /dev/null
@@ -1,289 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE='tk?,threads(+)'
-
-inherit distutils-r1 flag-o-matic virtualx toolchain-funcs prefix
-
-FT_PV=2.6.1
-DESCRIPTION="Pure python plotting library with matlab like syntax"
-HOMEPAGE="https://matplotlib.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
-	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="amd64 arm arm64 hppa ~ia64 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/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.18.2[${PYTHON_USEDEP}]
-	>=dev-python/packaging-20.0[${PYTHON_USEDEP}]
-	>=dev-python/pillow-7.1.1[jpeg,${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-2.2.1[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.7[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
-	>=dev-python/six-1.14.0[${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]
-	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? (
-		dev-python/wxpython:*[${PYTHON_USEDEP}]
-	)
-"
-
-BDEPEND="
-	${RDEPEND}
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm_git_archive[${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/flaky[${PYTHON_USEDEP}]
-		dev-python/mock[${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]
-	)
-"
-
-# A few C++ source files are written to srcdir.
-# Other than that, the ebuild shall be fit for out-of-source build.
-DISTUTILS_IN_SOURCE_BUILD=1
-
-distutils_enable_tests pytest
-
-pkg_setup() {
-	unset DISPLAY # bug #278524
-}
-
-use_supported() {
-	case ${1} in
-		wxwidgets)
-			[[ ${EPYTHON} == python3.[678] ]]
-			;;
-	esac
-
-	return 0
-}
-
-use_setup() {
-	local uword="${2:-${1}}"
-	if use_supported "${1}" && 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
-
-#	cat > lib/${PN}/externals/six.py <<-EOF
-#	from __future__ import absolute_import
-#	from six import *
-#	EOF
-
-	# 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.5.0-test.patch
-	)
-
-	# requires jupyter-nbconvert
-	rm lib/matplotlib/tests/test_backend_nbagg.py || die
-
-	sed \
-		-e 's/matplotlib.pyparsing_py[23]/pyparsing/g' \
-		-i lib/matplotlib/{mathtext,fontconfig_pattern}.py \
-		|| die "sed pyparsing failed"
-
-	sed -e 's:\(@pytest.mark.flaky\)(reruns=3):\1:' \
-		-i lib/matplotlib/tests/test_*.py || die
-
-	hprefixify setupext.py
-
-	rm -rf libqhull || die
-
-	export XDG_RUNTIME_DIR="${T}/runtime-dir"
-	mkdir "${XDG_RUNTIME_DIR}" || die
-	chmod 0700 "${XDG_RUNTIME_DIR}" || 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
-}
-
-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 = $(usex test True False)
-		[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 --build-lib="${BUILD_DIR}"/lib
-}
-
-python_compile_all() {
-	if use doc; then
-		cd doc || die
-
-		# necessary for in-source build
-		local -x PYTHONPATH="${BUILD_DIR}"/build/lib:${PYTHONPATH}
-
-		VARTEXFONTS="${T}"/fonts \
-		emake SPHINXOPTS= O=-Dplot_formats=png:100 html
-	fi
-}
-
-src_test() {
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	# 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
-	ln -s "${WORKDIR}/freetype-${FT_PV}" "${BUILD_DIR}" || die
-	distutils-r1_python_compile -j1 --build-lib="${BUILD_DIR}"/test-lib
-	local -x PYTHONPATH=${BUILD_DIR}/test-lib:${PYTHONPATH}
-
-	"${EPYTHON}" -c "import sys, matplotlib as m; sys.exit(m.test(argv=['-m', 'not network'], verbosity=2))" || die
-}
-
-python_install() {
-	wrap_setup distutils-r1_python_install
-
-	# mpl_toolkits namespace
-	python_moduleinto mpl_toolkits
-	python_domodule lib/mpl_toolkits/__init__.py
-}
-
-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
-
-	find "${D}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/matplotlib/matplotlib-3.5.2-r3.ebuild b/dev-python/matplotlib/matplotlib-3.5.2-r3.ebuild
deleted file mode 100644
index 841c96b346dd..000000000000
--- a/dev-python/matplotlib/matplotlib-3.5.2-r3.ebuild
+++ /dev/null
@@ -1,282 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-PYTHON_REQ_USE='tk?,threads(+)'
-
-inherit distutils-r1 flag-o-matic multiprocessing prefix 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="
-	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
-	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="amd64 arm ~arm64 hppa ~ia64 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/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.18.2[${PYTHON_USEDEP}]
-	>=dev-python/packaging-20.0[${PYTHON_USEDEP}]
-	>=dev-python/pillow-7.1.1[jpeg,${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-2.2.1[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.7[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
-	>=dev-python/six-1.14.0[${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]
-	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[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm_git_archive[${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
-
-#	cat > lib/${PN}/externals/six.py <<-EOF
-#	from __future__ import absolute_import
-#	from six import *
-#	EOF
-
-	# 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.5.2-test.patch
-	)
-
-	sed \
-		-e 's/matplotlib.pyparsing_py[23]/pyparsing/g' \
-		-i lib/matplotlib/{mathtext,fontconfig_pattern}.py \
-		|| die "sed pyparsing failed"
-
-	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
-	)
-	[[ ${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/matplotlib/matplotlib-3.5.3.ebuild b/dev-python/matplotlib/matplotlib-3.5.3.ebuild
index 161714fd0fee..d2ff210428bf 100644
--- a/dev-python/matplotlib/matplotlib-3.5.3.ebuild
+++ b/dev-python/matplotlib/matplotlib-3.5.3.ebuild
@@ -30,7 +30,7 @@ SRC_URI="
 # Fonts: BitstreamVera, OFL-1.1
 LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"
 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"
 IUSE="cairo doc excel examples gtk3 latex qt5 tk webagg wxwidgets"
 
 # internal copy of pycxx highly patched
diff --git a/dev-python/matplotlib/matplotlib-3.6.0-r1.ebuild b/dev-python/matplotlib/matplotlib-3.6.0-r1.ebuild
deleted file mode 100644
index b448a4981beb..000000000000
--- a/dev-python/matplotlib/matplotlib-3.6.0-r1.ebuild
+++ /dev/null
@@ -1,284 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-PYTHON_REQ_USE='tk?,threads(+)'
-
-inherit distutils-r1 flag-o-matic multiprocessing prefix 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="
-	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
-	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 ~ppc ~ppc64 ~riscv"
-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.19[${PYTHON_USEDEP}]
-	>=dev-python/packaging-20.0[${PYTHON_USEDEP}]
-	>=dev-python/pillow-7.1.1[jpeg,webp,${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-2.2.1[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.7[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
-	>=dev-python/six-1.14.0[${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]
-	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}]
-	dev-python/setuptools_scm_git_archive[${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
-
-#	cat > lib/${PN}/externals/six.py <<-EOF
-#	from __future__ import absolute_import
-#	from six import *
-#	EOF
-
-	# 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.6.0-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
-	)
-	[[ ${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/mediafile/Manifest b/dev-python/mediafile/Manifest
index 488bee8976d5..1b1711d0b1f1 100644
--- a/dev-python/mediafile/Manifest
+++ b/dev-python/mediafile/Manifest
@@ -1,5 +1,7 @@
 DIST mediafile-0.10.0.gh.tar.gz 568779 BLAKE2B 26e8fed5a0c590bf1d5de1b28c3576573f795a3df74186361318745a6efc375685be95676d3cb6d331cb2fa3db63018dc660dc82ff4f6652d62fb4e14c48ca4a SHA512 b753bc0c97fd47df4626f21199eef5f22bc3d0a08f780524103e2f33a4008a64e2a25556650eb1c1a14e093cb4d3e704ef51910818fab30be723f7aece382b3c
+DIST mediafile-0.10.1.gh.tar.gz 568722 BLAKE2B 4da5fe76cc6e3e41d8591c962d9cfde1e16a64b57192d795714955aeab4d49d608a977685352de8e55ac83d1dde56435a31c4577a4a4743499393c051c471c7c SHA512 db9d82d23eb3f1a6b2e19f1b635805e84ed54ed06641a0e1ab80d7350415d1297cec64f18c66b38a7552abdaf2c1a8bfc6bb0c8543d9c618368184e6d6bb6405
 DIST mediafile-0.9.0.tar.gz 568726 BLAKE2B 22466b54c890c8a1bef88a0d08e729d0b1efab12309299c64ea227a5662c263402e8e4ace4b7c9d2d0d06ba41b6f74465ebf88d090f0fd4f41d91fb6cba941ef SHA512 8b432d81c7c1fc8340a2003220a0d96b448ac64e551b0b95528a37fa5923a97358fac574573dece344cda88f4f206f1cf7bc457bdd310a7a003c395908864218
 EBUILD mediafile-0.10.0.ebuild 645 BLAKE2B 4552bc8bfda59197594023c47e42f67e422172f257b6fff1235e4f77fe887447bba19345e55fd0eeacd16e95d6a33f6939a006e4d5cc6781adbd0e5897656196 SHA512 b60009437474029feb342f2067caed570c60427c39fad1481ea5cd6d5197e64d4cdc45d1fd01ab65d886ec4fa00a8ac067a92bfd2148b8e4f61f46ac66520a79
+EBUILD mediafile-0.10.1.ebuild 645 BLAKE2B c76f7fe256e3b51e5412b1d1f0e53dbd2d69323aa86f41393c2b733a29c300a7b11f2192dd63f4c7669d32aae6373e7c5e9e2fde8ba528819dcd81d5860bb154 SHA512 491edbb98d7807bf1473702671cb6232e1e40612b10fa439364df6896d8bc4ce755c2f7a9bcdb7cb4192d8bd3206ddf1f3bbfc523c34b22f85e874bbaffa84e3
 EBUILD mediafile-0.9.0-r1.ebuild 590 BLAKE2B 0cf76f278b68239bb0e9ca568420ddfbbf9e42dae61e750d5c9c0fd8f1740e23e8f9de968c3e8bb733ca1f2a544b4f61541b75a1b6e79bbb5a7ca9a1c08a8824 SHA512 6e7299345d2ff4adba8eb317a9a24d40b981ef23db07aec52e16fcdcc8f151b23dd03e420d6c1e206f1bf2fcc35a6575f34c58f4e7b3e5a17606fa394acc2070
 MISC metadata.xml 680 BLAKE2B 0b6b669509378e4377452e3f0020f16f41cb1c162b5596aaca7459c794b7f5c818df76969b5829d3b2e72ca0a4463a5d8b946c133acdbc063e5c4cb6a55ee1b6 SHA512 70109bda3921ac9eb6f0f09f748d3afdb977b6cb6699a457e5ad439d341a88cca2a28c229c0a7c5cbc50937ce7e8b2448156f829b9603f911b5c07807e3eebd1
diff --git a/dev-python/mediafile/mediafile-0.10.1.ebuild b/dev-python/mediafile/mediafile-0.10.1.ebuild
new file mode 100644
index 000000000000..4129f0a02852
--- /dev/null
+++ b/dev-python/mediafile/mediafile-0.10.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Read and write audio files' tags in Python"
+HOMEPAGE="
+	https://github.com/beetbox/mediafile/
+	https://pypi.org/project/mediafile/
+"
+SRC_URI="
+	https://github.com/beetbox/mediafile/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=media-libs/mutagen-1.46.0[${PYTHON_USEDEP}]
+"
+
+distutils_enable_sphinx docs
+distutils_enable_tests unittest
diff --git a/dev-python/meson-python/Manifest b/dev-python/meson-python/Manifest
index 96ca9c5812c2..183e5908c60a 100644
--- a/dev-python/meson-python/Manifest
+++ b/dev-python/meson-python/Manifest
@@ -1,6 +1,6 @@
 AUX meson-python-0.7.0-defaults.patch 506 BLAKE2B 404c8d4803f4e6ca5244dc27c84f2c0440999e3fff87febeb12d1d304c7ed9f9358f6b958b5975d171995960bbf7681003180765d2bdb88e694e52c518a8381d SHA512 43b9825b9facdcf72f0b4b80a72aac8544ec1cedb14a79c53dbe37b190af170584acbb0d281d89ddeb199ea5ba720eb0de04c5294a3e7197019c58d7ee14d786
 DIST meson-python-0.10.0.gh.tar.gz 37739 BLAKE2B 028cbb191076b49946576b02d26a84079f412a178d9829bf85d579b8d3624e192e9394ade31524faf972ef4d105b7bf703e750529a7fafcbadf9a52d3c4876c6 SHA512 50d4d0bbf810948b4f218f25815058778b2a3ac8ff811d4d7cc699d1cfbcb75612d28789080b4e5ec3a47be03636389b7bf313366273abb733f77644758747cb
 DIST meson-python-0.9.0.gh.tar.gz 37253 BLAKE2B 29aa875dfc1c275ee4edab48bd2d46c783969fc0ab58f108be1a6443d5519028a2d36f666dc57c45d68ba77334cca2d11a0d4bfb8abb3822b537252c71b77286 SHA512 ae0927876533af65c5b1d8278ff6db3726f0551c160bfedcc602189fcad44c9412faa589738718aac2f10cf9497db8c632d89ccf1fb8519e6e7f4add78d8e52d
-EBUILD meson-python-0.10.0.ebuild 1005 BLAKE2B 927c2796ce70a0fb5216db118a728e6b7980016d8758822d57ffb4eaade86b3ee8281dbc88ffef432ebf0c13bc2823ececd74a30eeaba680fba1b8c4f8e4ef87 SHA512 dc160c9affef6ddd1f4e11317dcc408d8bce7e885c96ab137c4253a36b77f01ae8d3487d39e2c8d3591093fe1a36cd8142632228321bdd05887c44d590bd1199
+EBUILD meson-python-0.10.0.ebuild 1003 BLAKE2B 1670b8be0013fbb67787a92be6d65671821d9a0597e865ec84a2a92e22d31bb5fdd0fac760e2e3b91070bf9564ada05267618ddbd3e17f32d570c063e9d4838c SHA512 5f0a071573a1ca0e8a49e91cdf04c5f587a37ccc0751abd4891af9c40434144fc3e70296a40578abe561e70c463e7fbdf5a0f067f404f4ab09392e93eca6281a
 EBUILD meson-python-0.9.0.ebuild 988 BLAKE2B 6e2465b93b4de894ced85af09ff9e227c0a466a99551f51ef5c8f8f72475c6c9fe28c4a707c2f3ce8a3a393de2ec3ac80d26d477bab9584a91b533dd13206953 SHA512 9b5affd60de454a84150808d87c13b85ceb778558f5dd4c1a6fe74d37868aaccca355e4d6a4991420bf6444a1afed476791012745a85a4fa2fe5f657c7670b58
 MISC metadata.xml 352 BLAKE2B 581fd656bf2da3af0cb7a9f50ef99effc9c2fc54c5012a363a3aaf4cb5cb1715c8626aed86ea176ebbbc22ece33e8b0f76d5c818b4533f99b3bac5b92f75fff1 SHA512 7e57debaea115565ade7e8ab87af065c4580506225df1a203c92fea877a9b918ebfce6fd172412bf318be07a8a4548be492318e5626b31688ed2714f00594d54
diff --git a/dev-python/meson-python/meson-python-0.10.0.ebuild b/dev-python/meson-python/meson-python-0.10.0.ebuild
index 7ebf2dce84f0..f6bd5fa67ca2 100644
--- a/dev-python/meson-python/meson-python-0.10.0.ebuild
+++ b/dev-python/meson-python/meson-python-0.10.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 arm arm64 ppc ppc64 ~riscv ~s390 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~s390 x86"
 
 RDEPEND="
 	>=dev-python/pyproject-metadata-0.6.1[${PYTHON_USEDEP}]
diff --git a/dev-python/mkdocs-material/Manifest b/dev-python/mkdocs-material/Manifest
index 5799a112d3ca..151c029fe81a 100644
--- a/dev-python/mkdocs-material/Manifest
+++ b/dev-python/mkdocs-material/Manifest
@@ -1,8 +1,6 @@
 AUX mkdocs-material-8.5.7-simplify-build.patch 742 BLAKE2B b6ef8704ca360e2076f0855e39d1a8abd2a8ee0581375d9842ffaac0cf2077be228614cd2a85b281e0b8ae49c409e1262d9150239e119cbcec838dac8d8b91a5 SHA512 02e3e06442bd59e9921894bf24147211deb692d0989d96a2a858786c0d3800a2dd131530b98ee41dfddd0219263142007dfa0c2262f12c3275015a69946289e0
-DIST mkdocs-material-8.4.3.gh.tar.gz 9999624 BLAKE2B e7dbe0b3cd2e385db1882b5bdf90efbe7f1d528b38fe0764b5aee78546427bde939054a61f36e7d8769099fe3615c36c13d6d29ebf30e4faff123380a5793eaa SHA512 ea5601d4f846315c71b0eaa0c8309c0d351530bdfcdee4ba7f9734f92314b66613984c41af6b0387e7186e2f915150aa6981e16511af6f7bb67bf94fb33b88e7
 DIST mkdocs-material-8.5.2.gh.tar.gz 10262607 BLAKE2B 16fe2e9d377cf8361ddcf5bdd1f5b461783ef03a26894abd9cfe8ba3c88e4d89e5ee8da3e566b996ea1595a6600933d4140ca698f3a303e6fc4c2b32e208af1e SHA512 74066b3b85be3dc5f4380ab73a98dd07fc8430a65b6ec9a51f1513fa3f0703f3eff4567344642710bf8e91e8cf9193b552a58f865b86367f397d0c884e1849f8
 DIST mkdocs-material-8.5.7.gh.tar.gz 10362881 BLAKE2B 833e05a67570f7c341681f6fcc0b54f145044ae60512aef4fc6c366022700c6f257418a502cf0fd7c8a25f4be4c37f9ca591b5063e424ab2f6ef17b3fce01129 SHA512 d47866faed2c993d3e8daca0213cf9052a2e31449c2aa968c6a4451eaf2528094fdebda1ee7c6a12f1a0c502ef1c16a2aceaf03e7ec195117391beda8535a127
-EBUILD mkdocs-material-8.4.3.ebuild 1044 BLAKE2B bae6282cd8a771c6c6d9f11205442841ba82f970b1a0ce8490902931670a45fa0ff1b8ba08d2d4c9b819ab43a668b9acbbc4f84aa7c35f854519cd609b2472f8 SHA512 7aaf4b2f7e3f75e579300424d9d8c2418c96a96ca61c085b53ae15f152abbe142dbf13924b24d36eddf1321f6de1dc6d3d5a018e19612b2245cd860eb03818c6
-EBUILD mkdocs-material-8.5.2.ebuild 1045 BLAKE2B f973f72b347a875d6fe5e90915e7749217957554a6edbaee65ec27290db1de9b3631a6efd3ea5fa09680edede53351241fe33de203568cca45cd8d835dcce955 SHA512 bc18c7d13133c5a0c57475c90e97840cbd8d9ce3b067e29df10bed31da00b39b71f25caf7602e07316117d6c7dfacbda3a6216a027cb15f094f02cdd90be4a02
+EBUILD mkdocs-material-8.5.2.ebuild 1043 BLAKE2B 64de41e9ee9ed57b3648e038b535deac4f1750fd0dacc4efeb2ad9a465cf47276a58eacf5681ad5d6f8aaff10e5697b795baa32d92bd9210da7e0cfb94db6075 SHA512 7b6f13f3af4a5d5df020a5b40534e2a711d073cf139469be47217eede03efca4645c5c28e89f72921be478da080af9a5cce42985b95093b7f362dfc06aeb1854
 EBUILD mkdocs-material-8.5.7.ebuild 1262 BLAKE2B b53e7383ae9694fc31aff1a223003b346ab54b6fdc0840b0ed8c8b57b5e2d49685f191ed85d89d6a16c91e4a26e9ade7610286146efb44a00d6be3098722e2dc SHA512 5e23a1076f90df7ffb7d531deb11442420e3a51b7fd5ba20c6d32fa9df71483add41448c7444ee85cc8ba24df3ce942e972954d7b032497c525ec976eeb5f0bf
 MISC metadata.xml 1037 BLAKE2B 6997d0f85e31152c58092081b697d8934c54f933e188082eb55e5e9f252f57274f673e1d8e5b657907da2d1658f969cd67bdb32bdc05324746f211b718f3a4b2 SHA512 ccd4f4aa6e6e780d0aff5894b260eedb602d29cc25427c202561525d27de4a31d1e13f59267d8d732d0e12f3ca0485996bca6ef2a114e96b030259899e8ad47c
diff --git a/dev-python/mkdocs-material/mkdocs-material-8.4.3.ebuild b/dev-python/mkdocs-material/mkdocs-material-8.4.3.ebuild
deleted file mode 100644
index 65c7c88b4dd1..000000000000
--- a/dev-python/mkdocs-material/mkdocs-material-8.4.3.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-DOCS_BUILDER="mkdocs"
-DOCS_DEPEND="
-	dev-python/mkdocs-material-extensions
-	dev-python/mkdocs-minify-plugin
-	dev-python/mkdocs-redirects
-"
-
-inherit distutils-r1 docs
-
-DESCRIPTION="A Material Design theme for MkDocs"
-HOMEPAGE="
-	https://github.com/squidfunk/mkdocs-material/
-	https://pypi.org/project/mkdocs-material/
-"
-SRC_URI="
-	https://github.com/squidfunk/${PN}/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/jinja-2.11.1[${PYTHON_USEDEP}]
-	>=dev-python/markdown-3.2[${PYTHON_USEDEP}]
-	>=dev-python/mkdocs-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.12[${PYTHON_USEDEP}]
-	>=dev-python/pymdown-extensions-9.4[${PYTHON_USEDEP}]
-"
-
-# mkdocs-material-extensions depends on mkdocs-material creating a circular dep
-PDEPEND=">=dev-python/mkdocs-material-extensions-1.0.3[${PYTHON_USEDEP}]"
diff --git a/dev-python/mkdocs-material/mkdocs-material-8.5.2.ebuild b/dev-python/mkdocs-material/mkdocs-material-8.5.2.ebuild
index 0cb9c4691195..770d63466a9d 100644
--- a/dev-python/mkdocs-material/mkdocs-material-8.5.2.ebuild
+++ b/dev-python/mkdocs-material/mkdocs-material-8.5.2.ebuild
@@ -27,7 +27,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/jinja-3.0.2[${PYTHON_USEDEP}]
diff --git a/dev-python/mkdocs-minify-plugin/Manifest b/dev-python/mkdocs-minify-plugin/Manifest
index eeeafe107b37..719187ac0d64 100644
--- a/dev-python/mkdocs-minify-plugin/Manifest
+++ b/dev-python/mkdocs-minify-plugin/Manifest
@@ -1,5 +1,7 @@
 DIST mkdocs-minify-plugin-0.5.0.tar.gz 3387 BLAKE2B bce05582eab831976b430d5c331c0e51cecf790f4db6f3bd089ff6f0f5421c0b824c9bf6637a6b00555eee203b23cbd5fc3a0e81fcb5a8697ab7c06e94a9d2e0 SHA512 a31770c9de39439ba5eb4e35acd088aa7df2d7fa39f7942819c0b25429abb7b2b0626765f26f4d4fc77fd11e48dfdf90f9eb93e999cf7b641bb630c852eec50a
 DIST mkdocs-minify-plugin-0.6.0.gh.tar.gz 8069 BLAKE2B 7b2860ecdd1778cc51fca7357fd699578d6805176e9aa21013aec3650b40fa28381350d6690c2188cd04e25259ac71e3c9ca4e005fcc81c33182eb898a218aef SHA512 ad045fe6643de1d979051c58f89ffc5e98eb2063152a3301073864fb2bf3e5a0c183b4362ee175b8fc14be0335d0e76c509b9b6b721cdb78d9add632a46d72e9
+DIST mkdocs-minify-plugin-0.6.1.gh.tar.gz 8346 BLAKE2B 130495cc2dcc2b71c6dd715c1ed277df0d8fac5aef8fc49094bf05b324d692e41e3db85175df5455eed21f2cf413d57225a1baafe14770a77ffd3c2bb77ff3d8 SHA512 f1611b1a8f946e27450c9825f65e77e798200b22d08b5957417ae060cc2d6cb40c6edd2a6ace08eff2b32b59c9aca3020e26da35917aaddae293047d9cc8f86b
 EBUILD mkdocs-minify-plugin-0.5.0-r2.ebuild 709 BLAKE2B 0fe20ea91a73c81c4a6fc218fc04fe1306bc56d640e5d238638aa2b84ed5605d31db6f100b808f61d8acb37bf31839f3b7f3997c8228d5e8df94f97bcf138cca SHA512 6f39651d52c31858271aeb4478c201ac6fa16a4de6ea78170fb83b23cffcb606c06571bb3e34abe5a265dbf7b42b36ab5699476e22062be93ab9ba3d28c00989
 EBUILD mkdocs-minify-plugin-0.6.0.ebuild 879 BLAKE2B bf92429873eb8e01ddc0f863a6f8c83c34690e26c9fee36450a3a7969ae76c8d6760e3eaef2e77ad2e895d53133321229d0242cedfe9a4ab2ae74ed2ebd4bba3 SHA512 b032eb9698c365c53f4916f880890390e4847c4cb1611e3f3a51df5db177a01c3641ba0d49f67f8ac8615217a747c9418227a3bf1208cf421b76ad1bfe34d0e0
+EBUILD mkdocs-minify-plugin-0.6.1.ebuild 879 BLAKE2B bf92429873eb8e01ddc0f863a6f8c83c34690e26c9fee36450a3a7969ae76c8d6760e3eaef2e77ad2e895d53133321229d0242cedfe9a4ab2ae74ed2ebd4bba3 SHA512 b032eb9698c365c53f4916f880890390e4847c4cb1611e3f3a51df5db177a01c3641ba0d49f67f8ac8615217a747c9418227a3bf1208cf421b76ad1bfe34d0e0
 MISC metadata.xml 437 BLAKE2B 0b089b896a3b9458b03573a6f2870ee98c194a76969cb730508582aaae75cd5ae3fc46739ba12850a2388cf588aa68c6a45e31a59a8f1894e7eb02fe78d74992 SHA512 f238ac7d118776d582d880a4355d0786dc5d9b3f82e9139d5668fa9be009eeb7228a0bc0b2d5254e76b167ec30457241b808917a910b8d2037c781e46a871946
diff --git a/dev-python/mkdocs-minify-plugin/mkdocs-minify-plugin-0.6.1.ebuild b/dev-python/mkdocs-minify-plugin/mkdocs-minify-plugin-0.6.1.ebuild
new file mode 100644
index 000000000000..c439b9402e5b
--- /dev/null
+++ b/dev-python/mkdocs-minify-plugin/mkdocs-minify-plugin-0.6.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1
+
+DESCRIPTION="An MkDocs plugin to minify HTML and/or JS files prior to being written to disk"
+HOMEPAGE="
+	https://github.com/byrnereese/mkdocs-minify-plugin
+	https://pypi.org/project/mkdocs-minify-plugin/
+"
+SRC_URI="
+	https://github.com/byrnereese/mkdocs-minify-plugin/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/csscompressor-0.9.5[${PYTHON_USEDEP}]
+	>=dev-python/mkdocs-1.4.1[${PYTHON_USEDEP}]
+	>=app-text/htmlmin-0.1.12[${PYTHON_USEDEP}]
+	>=dev-python/jsmin-3.0.1[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		~dev-python/mkdocs-minify-plugin-${PV}[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/mkdocs-redirects/Manifest b/dev-python/mkdocs-redirects/Manifest
index 8aa0fb44970c..4737140a5bc8 100644
--- a/dev-python/mkdocs-redirects/Manifest
+++ b/dev-python/mkdocs-redirects/Manifest
@@ -1,5 +1,3 @@
-DIST mkdocs-redirects-1.1.0.gh.tar.gz 7000 BLAKE2B 7bb98549613926fd7ff3fd9ddf6469703589bb38051358baffc2989bc496df38b270f859f9f40a21d688a7a453d0a4d1532af339d4e43d1144324729ab84824f SHA512 4ccda56bc26fd005ed0a1b0651c65883ad1f87912fc1c61fa9089a0e84bf1d124e943d1fae6f5bac4a521676419dcd8d409524926334f2ea5ae8b0d2f2d4ee52
 DIST mkdocs-redirects-1.2.0.gh.tar.gz 7434 BLAKE2B cba7252865135c66ca467473e5c373b1779131dc0fdea47092d97d97d4222e6e9b38f9b312f0341af90b8a05a24c3c33250b060c2b3029d49dc970da0b2fc48e SHA512 e26260277f56005d8fab3a7e6d05187796356909d7ab4f8d6cd6edd535b0ee944e49faf5b6366269bfface1a855f399e3d95275a5f0967134f6c8e1256bef220
-EBUILD mkdocs-redirects-1.1.0.ebuild 708 BLAKE2B fcbd4e20062509d811174a6ca849fba6432c36163816acde5059fdf028b0a6993bd1ccccfe741af9c52340838f24b4336d7cc8f3d30822ecffb086802bf103a8 SHA512 a4d72cb9f7f8e5c09e364a15c7593dca6466a87d681f99e287f7c81b261550c727bf24faa5925bd73d846b85155a75629cf5e153160ad96722980cf5a13111f2
-EBUILD mkdocs-redirects-1.2.0.ebuild 710 BLAKE2B 78c9ecd5430897c885b5dfd7d23fafb3d8dc4177afa62aaef053397dd2415b1d77be7f62a0a41cd355ef36698e48aaeb6166cadc0d4ff740607649e19531fcaf SHA512 c8c86bad174b12776cb6ae74861729250938ac5c7a6b893753a7b12756ed64fa2c27c6492b062d05a97db867506a71c4af783f651899c74c228cb23b7da1ebe7
+EBUILD mkdocs-redirects-1.2.0.ebuild 708 BLAKE2B fcbd4e20062509d811174a6ca849fba6432c36163816acde5059fdf028b0a6993bd1ccccfe741af9c52340838f24b4336d7cc8f3d30822ecffb086802bf103a8 SHA512 a4d72cb9f7f8e5c09e364a15c7593dca6466a87d681f99e287f7c81b261550c727bf24faa5925bd73d846b85155a75629cf5e153160ad96722980cf5a13111f2
 MISC metadata.xml 425 BLAKE2B 0dba3e4e60feb48ee0e2b7bf308a6f8ba4f4c6bd6acf3f1cd9e61015fc550c1bc1dcfced21d42ae722286afa65a40b7491a73a159bc3d6244aead5104ab5fa68 SHA512 13a924e44d6c9689783e1c01473c055992a2b2b2357523e587ce1603c71928265045c306ecdee95de524f80dd5581a4dccd49e048369f128c37236744d1345d0
diff --git a/dev-python/mkdocs-redirects/mkdocs-redirects-1.1.0.ebuild b/dev-python/mkdocs-redirects/mkdocs-redirects-1.1.0.ebuild
deleted file mode 100644
index 6a3ecfd21ba6..000000000000
--- a/dev-python/mkdocs-redirects/mkdocs-redirects-1.1.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..11} )
-DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1
-
-DESCRIPTION="Plugin for Mkdocs page redirects"
-HOMEPAGE="
-	https://github.com/mkdocs/mkdocs-redirects
-	https://pypi.org/project/mkdocs-redirects/
-"
-SRC_URI="
-	https://github.com/mkdocs/mkdocs-redirects/archive/refs/tags/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/mkdocs-1.0.4[${PYTHON_USEDEP}]
-	<dev-python/mkdocs-2[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/twine[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/mkdocs-redirects/mkdocs-redirects-1.2.0.ebuild b/dev-python/mkdocs-redirects/mkdocs-redirects-1.2.0.ebuild
index a1097be70143..6a3ecfd21ba6 100644
--- a/dev-python/mkdocs-redirects/mkdocs-redirects-1.2.0.ebuild
+++ b/dev-python/mkdocs-redirects/mkdocs-redirects-1.2.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/mkdocs-1.0.4[${PYTHON_USEDEP}]
diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index 6e5c277670d4..1283c493f5ab 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -1,30 +1,18 @@
-AUX numpy-1.21.0-no-hardcode-blasv2.patch 2839 BLAKE2B fcb8c6d538b00a1a5796ac58b06af2ee586200744e58fd8ba588f1ed4faba53fd3b4202a9469186db394eb3648b59240ab1304e233a6575d9f168e9d3e37b92c SHA512 8a88a34b8610771018cac7ac3fcad75b61a317a21423be7914473a4b9e2f40b18e80be486140da2e85c73544c2ed1cf030b23a1fbbd6815894a83b3536589125
-AUX numpy-1.21.4-build-compiler-args-ceph.patch 2033 BLAKE2B 63aae1b73e41332d5179d822aeefd5da3289505e9d6f6d7755a34746af5506113fb81eaccc08f1582ac5820d6fb2a1d00ee4ba98ef482f4adc72c7288069c6d1 SHA512 ffad960980048603012c0d435013f0f3326a8ecd26eba8ad27c1287b3eb624733c53ddeb270108c1d26339fefc1cb8faaea233ec6e2ac7a072a023ddb12868d0
 AUX numpy-1.22.0-no-hardcode-blasv2.patch 2710 BLAKE2B 71da07805e25acc58120da2b8d8692ec5893040eee3c2842620e2a9186062936082f34610d3056c44e44a921116f99158dfb7481c4eccc82d33b3b18a63b379e SHA512 87bcecee3435dedcd87128c81d0002a786b4b23928973216f32c8d12b797d6a9948c3e7b41142235abe35734683e6ef84c02ffe255ba492a0ad43626071dc5a9
 AUX numpy-1.22.4-py311.patch 1150 BLAKE2B b07b61133b70f59f350759d94fa45e9fe7ec6e9d795c9de5e374fc135dc2dc146a72b3b7f88c61ade00b511ae34ad304453d062c96a0278c153899229240788f SHA512 f55de836c2d9d379bb5ed7a87826143b1f54845d9eb0e215d416936096b2a0a6d4195857cd4dc2be1238c638059bff3e826d9b655acde7be859f00d93347382c
-DIST numpy-1.21.5.zip 10652289 BLAKE2B c5bded91e5d06670ea3ace51560411c61985dd89ff0455b833838320f1714cf788a21a60aefd7a0ff30ad0abb93c9d296f60e637944000efa090b6c259c1f47c SHA512 03affa9d0bbf42a8d35f5454f1527df28539e306dc2b313fa775625201a5fe9eb7376f443bba5d50e08567546708811beb7201819eeb2af5a0653b7d91249f78
 DIST numpy-1.22.4.zip 11458830 BLAKE2B c999a42119e8d71942e4df4802ea22eef6c1ab65e11ad1f8364dd811c3df0eae1c7499055e76b523dc011bc9574f4060e17ecc3ea8bd35f5247fa17e3e188364 SHA512 bb2993459157c43f8c419de98be1c832f108b4eb6b96e1d20f406eccd782681ad8d0f8653637962ac592abe7d75719c17678ec97f035f6c87d4c7f939a1a8a48
-DIST numpy-1.23.1.tar.gz 10716841 BLAKE2B c8b17bc6f1626a32fd62ac3e952f6ee4a5886ba9ab9721be540831d3cdb19c4ea7cefcb422b12384fd4804d12f6f4b0d8f1e0110306e426a2b92d5f98acd62f7 SHA512 b34fb627e0e548bae3cf4555c4c71ab4a170ade86a9ff4011a5dfac6aba29e2e04b1151b9364cd1efff004efc1c04b3bab111facbcdc3297f8c38d7a09c83e17
 DIST numpy-1.23.3.tar.gz 10726039 BLAKE2B 4b6d38fc0363ea89f173a0cd65368b7c154b45f7f661098378f7ef31208008d5ff17ae58eab72bed921d166d630a4eca3441fc3097cd41a4a945b8f8180375cc SHA512 e690ea2906c91e567df2c801fbfe41652dabd37208faa99d6e068bda423dcc9f88be013478e9b6c1a339c36ef4c44b07a067d44e4e9c4b2e4f1344cbcb0598a9
 DIST numpy-1.23.4.tar.gz 10728765 BLAKE2B bbac44cc8a09a36537e25f90833c2ad7d1e4025e7d3eebd3c73ae2f12f1109520b58d2a779324f542aa1f2787f8b6c50ea907eb5ab7b7b84ebe3f3342c3d8a09 SHA512 727ca8950b0fbd5670e939b1c9c5cea852781ec4254d56a1659a91dc0430fc10b01ffdd16e1bb28a62319f91029e087024f4c6298bfc859a6050bfb507edcff8
-DIST numpy-html-1.21.5.zip 24270531 BLAKE2B 8a7a531afa559aebeb7a7b7ef94b2248df60a60fdfc190ca002dda625003df8b432fed393d6dd0c0c00fafbeb5064a61e3d99bba1a6c41e1e6e34ce091a43c89 SHA512 a165b95729a13806a03464cf39c20a0e18cfcf7701f05cd7777cd115bfaf0972f7155d201c7bd8d4177c5761f8800c982b3e3c29729a5e9ed356059842a44dcc
 DIST numpy-html-1.22.4.zip 23724824 BLAKE2B 44ea3da0a703a024a629c8413dfffaf760458b185d19452da0e7e23c819e19833291e10ebd07bdda794077574b8852a368036dda8335c2753cd481740497502a SHA512 4077d9974bfd7f2c189025c3740350652e6f8e0b5727fbc9711a1c0118c1e4ecc281d4876baf1c6a5dc802d20178d6b04a2922f14e9c321cd3b68228b1e295c3
-DIST numpy-html-1.23.1.zip 27964271 BLAKE2B 0aa26d7c39f2d6b119e404dfb9642967770881ee0d640157a9ed11d16f21cd43109bed3c08f89fda457ec470292d945e2bf8b2dab56e4b36192d5e8eb3757b44 SHA512 218a2e893816af767c7cedd1f2256e05f68e59491c29277c95de653a206aaff35c5fe3bc6afd6d6d5ea7957748ec565593eb30d004e36e94c894ea4a6884902a
 DIST numpy-html-1.23.3.zip 27964271 BLAKE2B 0aa26d7c39f2d6b119e404dfb9642967770881ee0d640157a9ed11d16f21cd43109bed3c08f89fda457ec470292d945e2bf8b2dab56e4b36192d5e8eb3757b44 SHA512 218a2e893816af767c7cedd1f2256e05f68e59491c29277c95de653a206aaff35c5fe3bc6afd6d6d5ea7957748ec565593eb30d004e36e94c894ea4a6884902a
 DIST numpy-html-1.23.4.zip 27964271 BLAKE2B 0aa26d7c39f2d6b119e404dfb9642967770881ee0d640157a9ed11d16f21cd43109bed3c08f89fda457ec470292d945e2bf8b2dab56e4b36192d5e8eb3757b44 SHA512 218a2e893816af767c7cedd1f2256e05f68e59491c29277c95de653a206aaff35c5fe3bc6afd6d6d5ea7957748ec565593eb30d004e36e94c894ea4a6884902a
-DIST numpy-ref-1.21.5.pdf 7326979 BLAKE2B 3c1130a576c46e0705ca1f12e7a3345beb1acdd23de2a81448e4e9755636dec313e277a0d3167dc3b211332b3fc415ac0d96e7c99e859b51a16a589426814182 SHA512 5dd37ca03f1f098fffce80aa6a1a6eb8ec66df4322da1c620bd1f507e89ee2ceb222de32c9b7974f085ddf146f0a789ea8eb27d792a13c1aa8a893c00f94f75f
 DIST numpy-ref-1.22.4.pdf 7537013 BLAKE2B 702398fddde349901f9303f4788a3ae3cc4bb78b4d310e169fcc6193fd62b33947c89ede45ba9aaea55e74f6a6abc755d3d94428adce9a8163678c6718aec2da SHA512 c1617817f94ccdfe2bbdebdc9c6869beefa1369d5ab0897c1573d8fb5cb3de153f90d5588aae84a0f498fba57ad6bc5c0c5c2c3aefb119e2913e4ddf007cc8e1
-DIST numpy-ref-1.23.1.pdf 7715485 BLAKE2B 7fbb0ce29e86fc7cd4932a6a9f0221b579b6cae695231edfebf863e5b4c2920796d802ccf9ae3e05b331964ac7c4f51099578d91b6b7fb357c6de2110a5f7cba SHA512 6036c6a36f332b83f371c7530a6ba6f354b1334d667d2a52993a1e52aa9d94d524e216f768928a006c717ed4b4131879f6e491a294ecfd3a0d1b0f9f937a887a
 DIST numpy-ref-1.23.3.pdf 7715485 BLAKE2B 7fbb0ce29e86fc7cd4932a6a9f0221b579b6cae695231edfebf863e5b4c2920796d802ccf9ae3e05b331964ac7c4f51099578d91b6b7fb357c6de2110a5f7cba SHA512 6036c6a36f332b83f371c7530a6ba6f354b1334d667d2a52993a1e52aa9d94d524e216f768928a006c717ed4b4131879f6e491a294ecfd3a0d1b0f9f937a887a
 DIST numpy-ref-1.23.4.pdf 7715485 BLAKE2B 7fbb0ce29e86fc7cd4932a6a9f0221b579b6cae695231edfebf863e5b4c2920796d802ccf9ae3e05b331964ac7c4f51099578d91b6b7fb357c6de2110a5f7cba SHA512 6036c6a36f332b83f371c7530a6ba6f354b1334d667d2a52993a1e52aa9d94d524e216f768928a006c717ed4b4131879f6e491a294ecfd3a0d1b0f9f937a887a
-DIST numpy-user-1.21.5.pdf 5142404 BLAKE2B d670f1eb0f060599a640c52bdeba53b1758007fc2090a5b8fb6e135e71114149a0085811e4bc21396eabb1123ffb9edd39f8192d0165ab42dd066a9747eb3a3f SHA512 dde264abff1787efd50e913b6facf83522b3344ed88fd15d6fe73ecd44c6a3db1e4ce4251c9674bbcb122f72ab86c64142b2f4f992a6449405041f8e1f5f1ace
 DIST numpy-user-1.22.4.pdf 3978348 BLAKE2B 87cc73cb1c406446eb9d86ea6cbaeac6ba13c7d2b2ffd47524483af1698c3efdfaafe61e987624c5ce01939494861413b271e9a96f49abbbe69d634b9be55c95 SHA512 8e04c0c90255038471de6ef0f8f4ed9e356d646b028bb16f667f3c59170eddaa0d86d48226462c5c17b8123b2a28a09982764979e9e76658b4e26cd0a976f3a1
-DIST numpy-user-1.23.1.pdf 4123384 BLAKE2B d4587c9f979e1ef4734768598d6e106f2b4b0c8222f901a6c4caf0920e41622201252c5bd172b16346e0357138b5ff27c59e56c851be5ae3b7712624bd9cc5b4 SHA512 58e1ab96d2cfbd96df205c86f0a1a09e204349f70d21df7f8481c21ded8b46f4b9ede3216d5cce6c2b9bfc0aacbecdfa198bdb2d4c258a0dd4acb6e3ba421f9c
 DIST numpy-user-1.23.3.pdf 4123384 BLAKE2B d4587c9f979e1ef4734768598d6e106f2b4b0c8222f901a6c4caf0920e41622201252c5bd172b16346e0357138b5ff27c59e56c851be5ae3b7712624bd9cc5b4 SHA512 58e1ab96d2cfbd96df205c86f0a1a09e204349f70d21df7f8481c21ded8b46f4b9ede3216d5cce6c2b9bfc0aacbecdfa198bdb2d4c258a0dd4acb6e3ba421f9c
 DIST numpy-user-1.23.4.pdf 4123384 BLAKE2B d4587c9f979e1ef4734768598d6e106f2b4b0c8222f901a6c4caf0920e41622201252c5bd172b16346e0357138b5ff27c59e56c851be5ae3b7712624bd9cc5b4 SHA512 58e1ab96d2cfbd96df205c86f0a1a09e204349f70d21df7f8481c21ded8b46f4b9ede3216d5cce6c2b9bfc0aacbecdfa198bdb2d4c258a0dd4acb6e3ba421f9c
-EBUILD numpy-1.21.5.ebuild 4250 BLAKE2B 566a16851c2b64a2960c578dd462380573c861ce31aae4ae04f298caa7be278a1d81bb315ae45d6d616d9169ce8c83c4e8308e979149b069f7aee909ef114fa5 SHA512 73185b6fb426e2c0851796ec9487992dfc5655f7b2e862ee881e9af2b9e8121beab5b81f315c91faf287f8aa50215956f5ae9298c8a16e7ad0ba8f5fd675bc50
-EBUILD numpy-1.22.4.ebuild 5018 BLAKE2B a3295f9dad57cd39b62c9095bc5c1e51274821e9747b8147559aab6a572e2761ecabfd10fa77c160e7c0bfd694dfb2ad0b51e2c6a4c1f8b89cb8db73af0c0af9 SHA512 1d8ceb254e27795b592aba6a1347047528d5e1990a339c94b480b0b59cd5470107efa9c61793dee5d0f75de84bd13016d59d837df7d52995f5a4a4540e7ef18f
-EBUILD numpy-1.23.1.ebuild 5066 BLAKE2B 4f5adb42a2631323eb676097ef6cfa343bd53944de342f382e76d4c93e7b9578dbe2f04959a00d17bb8b1a58ea08c4af2503e19bda6f6c1f1b5caab21a33e514 SHA512 d8d3e30fb62933b0907ef322bf5dec7331077cba94fc7cfe32dffdacf3f187d2575ccb85f3bc86eb34d4a085692f4f753153364ec05dbca734f369ffd943d734
-EBUILD numpy-1.23.3.ebuild 4898 BLAKE2B 7723f9258750349af1c391eb58741408aa6dae98b78a40052a4ebb7bd0e79c9e6ee35ebfd2a92d1cdad75ea569cf8830e3279e6e76b300fcf47ab6a797a44544 SHA512 1c295a8ae4ef69f3afa0022ef93912a33100315710ea3a2beaca4c7bd57b837e635b612e5ab3cf5565d78b6e68893a5b6c73e83f6ce20e7e396c4b67db2dbfcc
+EBUILD numpy-1.22.4.ebuild 5017 BLAKE2B f96fc50d46976f644412066a0ca32f3f6cbe68e3af54076bd9567a827d2929cc5789483c54656f51cee2f3153f28382a3901ad0a79ddaef84e552be2ebe8e961 SHA512 368980e6e319284d242669515c225766c56805f95d53ee259b0e88b394132a9d1b0fdaa58c0577c5e12a9282755ce39701f6a8d463792d7a5cc0dd3d3340c6c6
+EBUILD numpy-1.23.3.ebuild 4896 BLAKE2B cb89f6fd839ea412a25830cc3c94f5b3faa6fc7b2db52ef9d7e5852ccd1825774e1d9df8de918bb0113877bc4a3d8acf56de5c74073db54ef9a7914e550fa61e SHA512 634586d63cdd62f6286a54109b2ca1e699668e8698ca4e21ee9e6726b2f46f2b47304036d3c87177b415c5657a0385792aef0c6a53da81364b9ca6a25a5af520
 EBUILD numpy-1.23.4.ebuild 4904 BLAKE2B dc24a0d2a22d985086a49bdaf0333cdae749fa6ea344252636eb0279dfb6a706cf9574cff1529b64918bc99b0bf0184f76fad4228aa25df22c34dae8ac328a73 SHA512 c4771518334b27985b86b1fc41d322e4523b8a35309052a07a506400b1355e48abe88667550dd69e8c0e6fb9d6481eb1c24cd6edd1aa08b603dc1bd433de087e
 MISC metadata.xml 932 BLAKE2B 7a4af31f613bab05ff542da48bf6ff1484d9df2459f559516e71329451dd739d3df0fead507c8033d94ab9ed516b68efe7f21819a8cd6ca303643d8c8bc34e86 SHA512 32cb8c1ab61521a02cbec38f6ea383f074e50d46aa3462ddcb85710f9d348e8e628cf2a5725e3cd921cc32f02885a1b5f02125639f0ec885384eeeff7f468a06
diff --git a/dev-python/numpy/files/numpy-1.21.0-no-hardcode-blasv2.patch b/dev-python/numpy/files/numpy-1.21.0-no-hardcode-blasv2.patch
deleted file mode 100644
index 73c5cae90d00..000000000000
--- a/dev-python/numpy/files/numpy-1.21.0-no-hardcode-blasv2.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-Originally added in: https://gitweb.gentoo.org/repo/gentoo.git/commit/dev-python/numpy/files?id=e5ce90a04e79f6413604e96e4803cb95ada7c859
-https://bugs.gentoo.org/567938
-diff --git a/numpy/distutils/system_info.py b/numpy/distutils/system_info.py
-index 82e864a5c..1d77e5854 100644
---- a/numpy/distutils/system_info.py
-+++ b/numpy/distutils/system_info.py
-@@ -501,33 +501,7 @@ def get_info(name, notfound_action=0):
-       1 - display warning message
-       2 - raise error
-     """
--    cl = {'atlas': atlas_info,  # use lapack_opt or blas_opt instead
--          'atlas_threads': atlas_threads_info,                # ditto
--          'atlas_blas': atlas_blas_info,
--          'atlas_blas_threads': atlas_blas_threads_info,
--          'lapack_atlas': lapack_atlas_info,  # use lapack_opt instead
--          'lapack_atlas_threads': lapack_atlas_threads_info,  # ditto
--          'atlas_3_10': atlas_3_10_info,  # use lapack_opt or blas_opt instead
--          'atlas_3_10_threads': atlas_3_10_threads_info,                # ditto
--          'atlas_3_10_blas': atlas_3_10_blas_info,
--          'atlas_3_10_blas_threads': atlas_3_10_blas_threads_info,
--          'lapack_atlas_3_10': lapack_atlas_3_10_info,  # use lapack_opt instead
--          'lapack_atlas_3_10_threads': lapack_atlas_3_10_threads_info,  # ditto
--          'flame': flame_info,          # use lapack_opt instead
--          'mkl': mkl_info,
--          # openblas which may or may not have embedded lapack
--          'openblas': openblas_info,          # use blas_opt instead
--          # openblas with embedded lapack
--          'openblas_lapack': openblas_lapack_info, # use blas_opt instead
--          'openblas_clapack': openblas_clapack_info, # use blas_opt instead
--          'blis': blis_info,                  # use blas_opt instead
--          'lapack_mkl': lapack_mkl_info,      # use lapack_opt instead
--          'blas_mkl': blas_mkl_info,          # use blas_opt instead
--          'accelerate': accelerate_info,      # use blas_opt instead
--          'openblas64_': openblas64__info,
--          'openblas64__lapack': openblas64__lapack_info,
--          'openblas_ilp64': openblas_ilp64_info,
--          'openblas_ilp64_lapack': openblas_ilp64_lapack_info,
-+    cl = {'flame': flame_info,          # use lapack_opt instead
-           'x11': x11_info,
-           'fft_opt': fft_opt_info,
-           'fftw': fftw_info,
-@@ -947,10 +921,7 @@ def get_libs(self, key, default):
-         return [b for b in [a.strip() for a in libs.split(',')] if b]
- 
-     def get_libraries(self, key='libraries'):
--        if hasattr(self, '_lib_names'):
--            return self.get_libs(key, default=self._lib_names)
--        else:
--            return self.get_libs(key, '')
-+        return self.get_libs(key, '')
- 
-     def library_extensions(self):
-         c = customized_ccompiler()
diff --git a/dev-python/numpy/files/numpy-1.21.4-build-compiler-args-ceph.patch b/dev-python/numpy/files/numpy-1.21.4-build-compiler-args-ceph.patch
deleted file mode 100644
index 6a31d2efe970..000000000000
--- a/dev-python/numpy/files/numpy-1.21.4-build-compiler-args-ceph.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-https://github.com/numpy/numpy/commit/689d905f501b7abbddf0fdef241fa586a83e5cd6
-https://github.com/numpy/numpy/pull/20116
-https://bugs.gentoo.org/802150
-
-From 7dcf62379f41407d8f9583d1c2016e3d8ec48384 Mon Sep 17 00:00:00 2001
-From: Hector Martin <marcan@marcan.st>
-Date: Thu, 14 Oct 2021 14:58:52 +0900
-Subject: [PATCH] MAINT: Fix issue with C compiler args containing spaces
-
-Instead of doing a dumb string split, use shlex to make sure args
-containing spaces are handled properly.
----
- numpy/distutils/unixccompiler.py | 13 +++++++------
- 1 file changed, 7 insertions(+), 6 deletions(-)
-
-diff --git a/numpy/distutils/unixccompiler.py b/numpy/distutils/unixccompiler.py
-index 733a9fc5094..4884960fdf2 100644
---- a/numpy/distutils/unixccompiler.py
-+++ b/numpy/distutils/unixccompiler.py
-@@ -5,6 +5,7 @@
- import os
- import sys
- import subprocess
-+import shlex
- 
- from distutils.errors import CompileError, DistutilsExecError, LibError
- from distutils.unixccompiler import UnixCCompiler
-@@ -30,15 +31,15 @@ def UnixCCompiler__compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts
-     if 'OPT' in os.environ:
-         # XXX who uses this?
-         from sysconfig import get_config_vars
--        opt = " ".join(os.environ['OPT'].split())
--        gcv_opt = " ".join(get_config_vars('OPT')[0].split())
--        ccomp_s = " ".join(self.compiler_so)
-+        opt = shlex.join(shlex.split(os.environ['OPT']))
-+        gcv_opt = shlex.join(shlex.split(get_config_vars('OPT')[0]))
-+        ccomp_s = shlex.join(self.compiler_so)
-         if opt not in ccomp_s:
-             ccomp_s = ccomp_s.replace(gcv_opt, opt)
--            self.compiler_so = ccomp_s.split()
--        llink_s = " ".join(self.linker_so)
-+            self.compiler_so = shlex.split(ccomp_s)
-+        llink_s = shlex.join(self.linker_so)
-         if opt not in llink_s:
--            self.linker_so = llink_s.split() + opt.split()
-+            self.linker_so = self.linker_so + shlex.split(opt)
- 
-     display = '%s: %s' % (os.path.basename(self.compiler_so[0]), src)
- 
diff --git a/dev-python/numpy/numpy-1.21.5.ebuild b/dev-python/numpy/numpy-1.21.5.ebuild
deleted file mode 100644
index cb8783f8a5e6..000000000000
--- a/dev-python/numpy/numpy-1.21.5.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="threads(+)"
-
-FORTRAN_NEEDED=lapack
-
-inherit distutils-r1 flag-o-matic fortran-2 toolchain-funcs
-
-DOC_PV=${PV}
-DESCRIPTION="Fast array and numerical python library"
-HOMEPAGE="https://numpy.org/"
-SRC_URI="
-	mirror://pypi/${PN:0:1}/${PN}/${P}.zip
-	doc? (
-		https://numpy.org/doc/$(ver_cut 1-2 ${DOC_PV})/numpy-html.zip -> numpy-html-${DOC_PV}.zip
-		https://numpy.org/doc/$(ver_cut 1-2 ${DOC_PV})/numpy-ref.pdf -> numpy-ref-${DOC_PV}.pdf
-		https://numpy.org/doc/$(ver_cut 1-2 ${DOC_PV})/numpy-user.pdf -> numpy-user-${DOC_PV}.pdf
-	)"
-LICENSE="BSD"
-SLOT="0"
-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 ~x64-solaris ~x86-solaris"
-IUSE="doc lapack"
-
-RDEPEND="
-	lapack? (
-		>=virtual/cblas-3.8
-		>=virtual/lapack-3.8
-	)
-"
-BDEPEND="
-	${RDEPEND}
-	app-arch/unzip
-	>=dev-python/cython-0.29.24[${PYTHON_USEDEP}]
-	lapack? ( virtual/pkgconfig )
-	test? (
-		>=dev-python/hypothesis-5.8.0[${PYTHON_USEDEP}]
-		>=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
-		>=dev-python/cffi-1.14.0[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/numpy-1.21.0-no-hardcode-blasv2.patch
-	"${FILESDIR}"/numpy-1.21.4-build-compiler-args-ceph.patch
-)
-
-distutils_enable_tests pytest
-
-src_unpack() {
-	default
-	if use doc; then
-		unzip -qo "${DISTDIR}"/numpy-html-${DOC_PV}.zip -d html || die
-	fi
-}
-
-python_prepare_all() {
-	if use lapack; then
-		local incdir="${EPREFIX}"/usr/include
-		local libdir="${EPREFIX}"/usr/$(get_libdir)
-		cat >> site.cfg <<-EOF || die
-			[blas]
-			include_dirs = ${incdir}
-			library_dirs = ${libdir}
-			blas_libs = cblas,blas
-			[lapack]
-			library_dirs = ${libdir}
-			lapack_libs = lapack
-		EOF
-	else
-		export {ATLAS,PTATLAS,BLAS,LAPACK,MKL}=None
-	fi
-
-	export CC="$(tc-getCC) ${CFLAGS}"
-
-	append-flags -fno-strict-aliasing
-
-	# See progress in http://projects.scipy.org/scipy/numpy/ticket/573
-	# with the subtle difference that we don't want to break Darwin where
-	# -shared is not a valid linker argument
-	if [[ ${CHOST} != *-darwin* ]]; then
-		append-ldflags -shared
-	fi
-
-	# only one fortran to link with:
-	# linking with cblas and lapack library will force
-	# autodetecting and linking to all available fortran compilers
-	append-fflags -fPIC
-	if use lapack; then
-		NUMPY_FCONFIG="config_fc --noopt --noarch"
-		# workaround bug 335908
-		[[ $(tc-getFC) == *gfortran* ]] && NUMPY_FCONFIG+=" --fcompiler=gnu95"
-	fi
-
-	# don't version f2py, we will handle it.
-	sed -i -e '/f2py_exe/s: + os\.path.*$::' numpy/f2py/setup.py || die
-
-	# disable fuzzed tests
-	find numpy/*/tests -name '*.py' -exec sed -i \
-		-e 's:def \(.*_fuzz\):def _\1:' {} + || die
-	# very memory- and disk-hungry
-	sed -i -e 's:test_large_zip:_&:' numpy/lib/tests/test_io.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	export MAKEOPTS=-j1 #660754
-
-	distutils-r1_python_compile ${NUMPY_FCONFIG}
-}
-
-python_test() {
-	local deselect=(
-		numpy/typing/tests/test_typing.py::test_reveal[arrayterator.py]
-	)
-
-	if use arm && [[ $(uname -m || echo "unknown") == "armv8l" ]] ; then
-		# Degenerate case. arm32 chroot on arm64.
-		# bug #774108
-		deselect+=(
-			numpy/core/tests/test_cpu_features.py::Test_ARM_Features::test_features
-		)
-	fi
-
-	if use x86 ; then
-		deselect+=(
-			# https://github.com/numpy/numpy/issues/18388
-			numpy/core/tests/test_umath.py::TestRemainder::test_float_remainder_overflow
-			# https://github.com/numpy/numpy/issues/18387
-			numpy/random/tests/test_generator_mt19937.py::TestRandomDist::test_pareto
-		)
-	fi
-
-	distutils_install_for_testing --single-version-externally-managed \
-		--record "${TMPDIR}/record.txt" ${NUMPY_FCONFIG}
-
-	cd "${TEST_DIR}/lib" || die
-	epytest ${deselect[@]/#/--deselect }
-}
-
-python_install() {
-	# https://github.com/numpy/numpy/issues/16005
-	local mydistutilsargs=( build_src )
-	distutils-r1_python_install ${NUMPY_FCONFIG}
-	python_optimize
-}
-
-python_install_all() {
-	local DOCS=( LICENSE.txt README.md THANKS.txt )
-
-	if use doc; then
-		local HTML_DOCS=( "${WORKDIR}"/html/. )
-		DOCS+=( "${DISTDIR}"/${PN}-{user,ref}-${DOC_PV}.pdf )
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/numpy/numpy-1.22.4.ebuild b/dev-python/numpy/numpy-1.22.4.ebuild
index 7f1805a8fb6d..2be8c1d0c0d3 100644
--- a/dev-python/numpy/numpy-1.22.4.ebuild
+++ b/dev-python/numpy/numpy-1.22.4.ebuild
@@ -24,7 +24,7 @@ SRC_URI="
 	)"
 LICENSE="BSD"
 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="doc lapack"
 
 RDEPEND="
diff --git a/dev-python/numpy/numpy-1.23.1.ebuild b/dev-python/numpy/numpy-1.23.1.ebuild
deleted file mode 100644
index 329105563e47..000000000000
--- a/dev-python/numpy/numpy-1.23.1.ebuild
+++ /dev/null
@@ -1,192 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..11} )
-PYTHON_REQ_USE="threads(+)"
-
-FORTRAN_NEEDED=lapack
-
-inherit distutils-r1 flag-o-matic fortran-2 toolchain-funcs
-
-DOC_PV=${PV}
-# For when docs aren't ready yet, set to last version
-#DOC_PV=1.23.0
-DESCRIPTION="Fast array and numerical python library"
-HOMEPAGE="
-	https://numpy.org/
-	https://github.com/numpy/numpy/
-	https://pypi.org/project/numpy/
-"
-SRC_URI="
-	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
-	doc? (
-		https://numpy.org/doc/$(ver_cut 1-2 ${DOC_PV})/numpy-html.zip -> numpy-html-${DOC_PV}.zip
-		https://numpy.org/doc/$(ver_cut 1-2 ${DOC_PV})/numpy-ref.pdf -> numpy-ref-${DOC_PV}.pdf
-		https://numpy.org/doc/$(ver_cut 1-2 ${DOC_PV})/numpy-user.pdf -> numpy-user-${DOC_PV}.pdf
-	)
-"
-LICENSE="BSD"
-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"
-IUSE="doc lapack"
-
-RDEPEND="
-	lapack? (
-		>=virtual/cblas-3.8
-		>=virtual/lapack-3.8
-	)
-"
-BDEPEND="
-	${RDEPEND}
-	>=dev-python/cython-0.29.30[${PYTHON_USEDEP}]
-	lapack? (
-		virtual/pkgconfig
-	)
-	doc? (
-		app-arch/unzip
-	)
-	test? (
-		>=dev-python/hypothesis-5.8.0[${PYTHON_USEDEP}]
-		>=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
-		>=dev-python/cffi-1.14.0[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/numpy-1.22.0-no-hardcode-blasv2.patch
-)
-
-distutils_enable_tests pytest
-
-src_unpack() {
-	default
-	if use doc; then
-		unzip -qo "${DISTDIR}"/numpy-html-${DOC_PV}.zip -d html || die
-	fi
-}
-
-python_prepare_all() {
-	# Allow use with setuptools 60.x
-	# See numpy-1.22.1-revert-setuptools-upper-bound.patch for details
-	export SETUPTOOLS_USE_DISTUTILS=stdlib
-
-	if use lapack; then
-		local incdir="${EPREFIX}"/usr/include
-		local libdir="${EPREFIX}"/usr/$(get_libdir)
-		cat >> site.cfg <<-EOF || die
-			[blas]
-			include_dirs = ${incdir}
-			library_dirs = ${libdir}
-			blas_libs = cblas,blas
-			[lapack]
-			library_dirs = ${libdir}
-			lapack_libs = lapack
-		EOF
-	else
-		export {ATLAS,PTATLAS,BLAS,LAPACK,MKL}=None
-	fi
-
-	export CC="$(tc-getCC) ${CFLAGS}"
-
-	append-flags -fno-strict-aliasing
-
-	# See progress in http://projects.scipy.org/scipy/numpy/ticket/573
-	# with the subtle difference that we don't want to break Darwin where
-	# -shared is not a valid linker argument
-	if [[ ${CHOST} != *-darwin* ]]; then
-		append-ldflags -shared
-	fi
-
-	# only one fortran to link with:
-	# linking with cblas and lapack library will force
-	# autodetecting and linking to all available fortran compilers
-	append-fflags -fPIC
-	if use lapack; then
-		NUMPY_FCONFIG="config_fc --noopt --noarch"
-		# workaround bug 335908
-		[[ $(tc-getFC) == *gfortran* ]] && NUMPY_FCONFIG+=" --fcompiler=gnu95"
-	fi
-
-	# don't version f2py, we will handle it.
-	sed -i -e '/f2py_exe/s: + os\.path.*$::' numpy/f2py/setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	export MAKEOPTS=-j1 #660754
-
-	distutils-r1_python_compile ${NUMPY_FCONFIG}
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# very disk- and memory-hungry
-		numpy/lib/tests/test_io.py::test_large_zip
-
-		# precision problems
-		numpy/core/tests/test_umath_accuracy.py::TestAccuracy::test_validate_transcendentals
-
-		# runs the whole test suite recursively, that's just crazy
-		numpy/core/tests/test_mem_policy.py::test_new_policy
-
-		# very slow, unlikely to be practically useful
-		numpy/typing/tests/test_typing.py
-	)
-
-	if use arm && [[ $(uname -m || echo "unknown") == "armv8l" ]] ; then
-		# Degenerate case. arm32 chroot on arm64.
-		# bug #774108
-		EPYTEST_DESELECT+=(
-			numpy/core/tests/test_cpu_features.py::Test_ARM_Features::test_features
-		)
-	fi
-
-	if use x86 ; then
-		EPYTEST_DESELECT+=(
-			# https://github.com/numpy/numpy/issues/18388
-			numpy/core/tests/test_umath.py::TestRemainder::test_float_remainder_overflow
-			# https://github.com/numpy/numpy/issues/18387
-			numpy/random/tests/test_generator_mt19937.py::TestRandomDist::test_pareto
-			# more precision problems
-			numpy/core/tests/test_einsum.py::TestEinsum::test_einsum_sums_int16
-		)
-	fi
-	if use arm || use x86 ; then
-		EPYTEST_DESELECT+=(
-			# too large for 32-bit platforms
-			numpy/core/tests/test_ufunc.py::TestUfunc::test_identityless_reduction_huge_array
-		)
-	fi
-
-	[[ ${EPYTHON} == python3.11 ]] && EPYTEST_DESELECT+=(
-		# known problem
-		'numpy/typing/tests/test_generic_alias.py::TestGenericAlias::test_pass[__dir__-<lambda>]'
-	)
-
-	distutils_install_for_testing --single-version-externally-managed \
-		--record "${TMPDIR}/record.txt" ${NUMPY_FCONFIG}
-
-	cd "${TEST_DIR}/lib" || die
-	epytest -k "not _fuzz"
-}
-
-python_install() {
-	# https://github.com/numpy/numpy/issues/16005
-	local mydistutilsargs=( build_src )
-	distutils-r1_python_install ${NUMPY_FCONFIG}
-	python_optimize
-}
-
-python_install_all() {
-	local DOCS=( LICENSE.txt README.md THANKS.txt )
-
-	if use doc; then
-		local HTML_DOCS=( "${WORKDIR}"/html/. )
-		DOCS+=( "${DISTDIR}"/${PN}-{user,ref}-${DOC_PV}.pdf )
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/numpy/numpy-1.23.3.ebuild b/dev-python/numpy/numpy-1.23.3.ebuild
index 4d97df85fe96..2026f4e14c27 100644
--- a/dev-python/numpy/numpy-1.23.3.ebuild
+++ b/dev-python/numpy/numpy-1.23.3.ebuild
@@ -29,7 +29,7 @@ SRC_URI="
 "
 LICENSE="BSD"
 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="doc lapack"
 
 RDEPEND="
diff --git a/dev-python/pandas/Manifest b/dev-python/pandas/Manifest
index dbf8ffad54f2..c695ddd3fd38 100644
--- a/dev-python/pandas/Manifest
+++ b/dev-python/pandas/Manifest
@@ -1,8 +1,6 @@
-DIST pandas-1.4.4.tar.gz 4949620 BLAKE2B 7ce236ae28ed6c6857a3acf6936aad2b1dc53a048986809d8dedbb9595dd2234bacbe114b74d8a171a6b31254372ea262566b134e7b5b24d5d4666938c7e6154 SHA512 a12e92dd751ed2342d9291724833732cdadbc9791e59533b9efded570b9893bacbe2f10e6bc70d673adb9356dcb0ae3d64d8a1dfe6ae8a3c70e474556ded4d91
 DIST pandas-1.5.0.tar.gz 5191537 BLAKE2B c7dec1d0197e6ac860667177f0f255bb327dbd48fe4501280d578b93f4496e61c0847dc478effeb8c5729d7a9d3e8a643c01db095a9843d6d211a9420f94d42c SHA512 8d340da1e0dff9b64c8993359b35ddcfc796fa15fee1bf1a27ea5a12e33f8b20d45bfac0ff9275b16ff0d4f7855a73962629e06c62bc08ca5e21b4ef1ea29ec2
 DIST pandas-1.5.1.tar.gz 5199286 BLAKE2B 17d98870f3397d7a9289a18708021a614b1d456e2ea99dae8927727aabb8aab73bd31f25c3035947f8f4c38404e7d971bf999500b300307b19a2cf6029763d0e SHA512 e5f25f21f17f36c6488f14fbfa391beb9f1989652de01cb8346d2826dead9331fea27295ee1e6f42d0875f2f1a91fcd23d606edd339432589bca5ba8d89e5ecd
-EBUILD pandas-1.4.4.ebuild 6486 BLAKE2B 65421968a776be789bd034222242ec3ed5a43b25e0fbe7f136b20ed46d16f8bf99af85673a1544aceef25997fc761f7a558c10f9358b06061a654772529861b3 SHA512 78f9a087894510b87e777e6ed0c64d3c75b640858f8be52332767985dd111dca46d4338d40bfd662d0785d06e8f5609657108eae740442ae6edd0e8cdac9f5e7
-EBUILD pandas-1.5.0-r1.ebuild 6752 BLAKE2B cdf46e171d595990224a00261be8a70cf03c7bf4860d55ac04edf2a8fce8c92d77cc542814023ef9f1f775ed1689f98cbc3fa07dc09e4416a5ecf605e3be844f SHA512 3cb71918734101adf9c27ec6e3f72e41edb086b0a14fc48876bdb0c132f6aee8adc6914c86344319d4888050ad431f18481409198d5bcf7c15e546dac3204101
-EBUILD pandas-1.5.0.ebuild 6579 BLAKE2B 215cbfefa2456ab577cb13e687a034325afc4fdc184d3810dc8495e38588257c8f90f5a4de116f43072b808a1c6716b40759134ac6394cdb526fab5c041a45e4 SHA512 58a27b293a7da2ecf84631789357c22c32e108ee9d12b8385d3d0c4101d887f2d413db17e4013860589c0ccd4700a8d2232a659e16d5c278b8e71ae3ce2726dd
+EBUILD pandas-1.5.0-r1.ebuild 6749 BLAKE2B 24a084d7b7cd8074743e9b4b0aa12bce17fc65c25873f44485c59d388ace4a77ffc13cf1b588407167b2d89b2480ab86a0de51807e9a58192ece939b735e138b SHA512 c6a04878173dc01d7b2d823af04058b0932148270282e37b999249f00a0039e0273fb4a5eec476875715b86a5c7bcd52612453c02dcc7de05f6d20ced2c75913
+EBUILD pandas-1.5.0.ebuild 6573 BLAKE2B 3a9802fed6b00bc865b8fdf3ceeb68c537979f83e38b4aab3fd06e8ddd66e41c88a5b7c87cafc214c25139dcddbf44484c1fd0b9f0647ba6f14a468a256a903a SHA512 db1eec6bc4a5309daae1752f41cd6c8476528a812fe9d3f948b1392e155202ca6711d7244db7d7c7f88998b557ccfdfd214f2ae3c79ba5b730d9f08c45d0954a
 EBUILD pandas-1.5.1.ebuild 6837 BLAKE2B d1e6ba85ce3fecfa09420bdab447bc213e7cddb16a34e10135f1d04c734c3fde91caa298fdfdf4c7b9935af623f9a6a4e6cc85cb73498c9f68a54f04bd40e652 SHA512 186326daf4876ca1762fef866b08694c834a41ee18132f14e9e8ec7f7dee40bdb932e833192ba1a3c9888e894feb91652bbb4676d96c4e2dd2981b3bbeebc942
 MISC metadata.xml 920 BLAKE2B d6bd854acdd851d578038657d91adaedf4f220dbdc5905ebba5e35e74437c6d5bc2384061f7796a6f359aa128c526485635debfd0e1a9646d09daed740167c87 SHA512 dcd949e89cae9df918acb3cf8be5ad8c396ee5e646d2179aa2b646fafa15ffc11e9ccf853df8d7fdcc787f88ce7063639d8d87715aaba943774edc8ad98b540a
diff --git a/dev-python/pandas/pandas-1.4.4.ebuild b/dev-python/pandas/pandas-1.4.4.ebuild
deleted file mode 100644
index 15cb8dde1586..000000000000
--- a/dev-python/pandas/pandas-1.4.4.ebuild
+++ /dev/null
@@ -1,198 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="threads(+)"
-
-VIRTUALX_REQUIRED="manual"
-
-inherit distutils-r1 multiprocessing optfeature virtualx
-
-DESCRIPTION="Powerful data structures for data analysis and statistics"
-HOMEPAGE="https://pandas.pydata.org/
-	https://github.com/pandas-dev/pandas/"
-SRC_URI="
-	https://github.com/pandas-dev/pandas/releases/download/v${PV}/${P}.tar.gz
-"
-S="${WORKDIR}/${P/_/}"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86"
-IUSE="doc full-support minimal test X"
-RESTRICT="!test? ( test )"
-
-RECOMMENDED_DEPEND="
-	>=dev-python/bottleneck-1.2.1[${PYTHON_USEDEP}]
-	>=dev-python/numexpr-2.7.0[${PYTHON_USEDEP}]
-"
-
-# TODO: add pandas-gbq to the tree
-OPTIONAL_DEPEND="
-	dev-python/beautifulsoup4[${PYTHON_USEDEP}]
-	dev-python/blosc[${PYTHON_USEDEP}]
-	|| (
-		dev-python/html5lib[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-	)
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/matplotlib[${PYTHON_USEDEP}]
-	|| (
-		dev-python/openpyxl[${PYTHON_USEDEP}]
-		dev-python/xlsxwriter[${PYTHON_USEDEP}]
-	)
-	>=dev-python/pytables-3.2.1[${PYTHON_USEDEP}]
-	>=dev-python/xarray-0.12.3[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/xlrd-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/xlwt-1.3.0[${PYTHON_USEDEP}]
-	!hppa? (
-		dev-python/statsmodels[${PYTHON_USEDEP}]
-		>=dev-python/scipy-1.1[${PYTHON_USEDEP}]
-	)
-	X? (
-		|| (
-			dev-python/PyQt5[${PYTHON_USEDEP}]
-			x11-misc/xclip
-			x11-misc/xsel
-		)
-	)
-"
-COMMON_DEPEND="
-	>=dev-python/numpy-1.21.0[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.8.1-r3[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2020.1[${PYTHON_USEDEP}]
-"
-DEPEND="
-	${COMMON_DEPEND}
-	>=dev-python/cython-0.29.32[${PYTHON_USEDEP}]
-	doc? (
-		${VIRTUALX_DEPEND}
-		app-text/pandoc
-		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
-		dev-python/html5lib[${PYTHON_USEDEP}]
-		dev-python/ipython[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		dev-python/nbsphinx[${PYTHON_USEDEP}]
-		>=dev-python/numpydoc-0.9.1[${PYTHON_USEDEP}]
-		>=dev-python/openpyxl-1.6.1[${PYTHON_USEDEP}]
-		>=dev-python/pytables-3.0.0[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-		dev-python/rpy[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/xlrd[${PYTHON_USEDEP}]
-		dev-python/xlwt[${PYTHON_USEDEP}]
-		dev-python/scipy[${PYTHON_USEDEP}]
-		x11-misc/xclip
-	)
-	test? (
-		${VIRTUALX_DEPEND}
-		${RECOMMENDED_DEPEND}
-		${OPTIONAL_DEPEND}
-		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
-		>=dev-python/hypothesis-5.5.3[${PYTHON_USEDEP}]
-		dev-python/openpyxl[${PYTHON_USEDEP}]
-		dev-python/pymysql[${PYTHON_USEDEP}]
-		>=dev-python/pytest-6[${PYTHON_USEDEP}]
-		>=dev-python/pytest-xdist-1.31[${PYTHON_USEDEP}]
-		dev-python/psycopg:2[${PYTHON_USEDEP}]
-		dev-python/xlsxwriter[${PYTHON_USEDEP}]
-		x11-misc/xclip
-		x11-misc/xsel
-	)
-"
-# dev-python/statsmodels invokes a circular dep
-#  hence rm from doc? ( ), again
-RDEPEND="
-	${COMMON_DEPEND}
-	!minimal? ( ${RECOMMENDED_DEPEND} )
-	full-support? ( ${OPTIONAL_DEPEND} )
-"
-
-python_prepare_all() {
-	# Prevent un-needed download during build
-	sed -e "/^              'sphinx.ext.intersphinx',/d" \
-		-i doc/source/conf.py || die
-
-	# requires package installed
-	sed -e '/extra_compile_args =/s:"-Werror"::' \
-		-i setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	distutils-r1_python_compile -j1
-}
-
-python_compile_all() {
-	# To build docs the need be located in $BUILD_DIR,
-	# else PYTHONPATH points to unusable modules.
-	if use doc; then
-		cd "${BUILD_DIR}"/lib || die
-		cp -ar "${S}"/doc . && cd doc || die
-		LANG=C PYTHONPATH=. virtx ${EPYTHON} make.py html
-	fi
-}
-
-src_test() {
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# test for rounding errors, fails if we have better precision
-		# e.g. on amd64 with FMA or on arm64
-		# https://github.com/pandas-dev/pandas/issues/38921
-		pandas/tests/window/test_rolling.py::test_rolling_var_numerical_issues
-
-		# TODO
-		pandas/tests/api/test_api.py::TestTesting::test_util_testing_deprecated
-		pandas/tests/api/test_api.py::TestTesting::test_util_testing_deprecated_direct
-		pandas/tests/io/test_clipboard.py::TestClipboard::test_raw_roundtrip
-
-		# TODO: these require a running db server
-		pandas/tests/io/test_sql.py::TestMySQLAlchemy
-		pandas/tests/io/test_sql.py::TestMySQLAlchemyConn
-		pandas/tests/io/test_sql.py::TestPostgreSQLAlchemy
-		pandas/tests/io/test_sql.py::TestPostgreSQLAlchemyConn
-	)
-
-	local -x LC_ALL=C.UTF-8
-	cd "${BUILD_DIR}/install$(python_get_sitedir)" || die
-	"${EPYTHON}" -c "import pandas; pandas.show_versions()" || die
-	epytest pandas --skip-slow --skip-network -m "not single" \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" ||
-		die "Tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	if use doc; then
-		dodoc -r "${BUILD_DIR}"/lib/doc/build/html
-		einfo "An initial build of docs is absent of references to statsmodels"
-		einfo "due to circular dependency. To have them included, emerge"
-		einfo "statsmodels next and re-emerge pandas with USE doc"
-	fi
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature "accelerating certain types of NaN evaluations, using specialized cython routines to achieve large speedups." dev-python/bottleneck
-	optfeature "accelerating certain numerical operations, using multiple cores as well as smart chunking and caching to achieve large speedups" ">=dev-python/numexpr-2.1"
-	optfeature "needed for pandas.io.html.read_html" dev-python/beautifulsoup4 dev-python/html5lib dev-python/lxml
-	optfeature "for msgpack compression using blosc" dev-python/blosc
-	optfeature "Template engine for conditional HTML formatting" dev-python/jinja
-	optfeature "Plotting support" dev-python/matplotlib
-	optfeature "Needed for Excel I/O" ">=dev-python/openpyxl-3.0.0" dev-python/xlsxwriter dev-python/xlrd dev-python/xlwt
-	optfeature "necessary for HDF5-based storage" ">=dev-python/pytables-3.2.1"
-	optfeature "R I/O support" dev-python/rpy
-	optfeature "Needed for parts of pandas.stats" dev-python/statsmodels
-	optfeature "SQL database support" ">=dev-python/sqlalchemy-1.3.0"
-	optfeature "miscellaneous statistical functions" dev-python/scipy
-	optfeature "necessary to use pandas.io.clipboard.read_clipboard support" dev-python/PyQt5 dev-python/pygtk x11-misc/xclip x11-misc/xsel
-}
diff --git a/dev-python/pandas/pandas-1.5.0-r1.ebuild b/dev-python/pandas/pandas-1.5.0-r1.ebuild
index b2de50f560c0..6f20e3a52481 100644
--- a/dev-python/pandas/pandas-1.5.0-r1.ebuild
+++ b/dev-python/pandas/pandas-1.5.0-r1.ebuild
@@ -21,7 +21,7 @@ S="${WORKDIR}/${P/_/}"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ppc64 ~riscv ~s390 ~x86"
 IUSE="doc full-support minimal test X"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pandas/pandas-1.5.0.ebuild b/dev-python/pandas/pandas-1.5.0.ebuild
index c4c60fd4f595..47ce821852a3 100644
--- a/dev-python/pandas/pandas-1.5.0.ebuild
+++ b/dev-python/pandas/pandas-1.5.0.ebuild
@@ -21,7 +21,7 @@ S="${WORKDIR}/${P/_/}"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="doc full-support minimal test X"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/peewee/Manifest b/dev-python/peewee/Manifest
index 91575c096d73..3b9d74640182 100644
--- a/dev-python/peewee/Manifest
+++ b/dev-python/peewee/Manifest
@@ -1,5 +1,3 @@
-DIST peewee-3.15.2.gh.tar.gz 905707 BLAKE2B 7441586c8da5080a50964a4d8e5c73f28b8e1adeb45b4ced675c70f55cb3264460014dbab36f097fbacfc2fce8cf3f42ef36a6c1737a671ecd8bfede6af82c8e SHA512 6fa574161cdd224104bb428b9935574d3dc69ec574e5887ab68c7686d63af856787e3411e27703773c0e2f75f51915da569538662a908c225ace3c14c78892b9
 DIST peewee-3.15.3.gh.tar.gz 906883 BLAKE2B 4cc76b4288e8b8e36b4df2f42e31c8eeec314b2af28612d272699e6cc79d836fdc8800f18883e721fd98ca04bf58b0ed26ba61ab36280d28a32d1ca18ab6577c SHA512 bf297423178fca432add6e1ef2aba41ebd87d2bdc34e47872b5c35573dd9eedd42a290cad53dfce68e0bc0e07bb537064c25bf6b43b43d678302d6345eaa35a4
-EBUILD peewee-3.15.2.ebuild 793 BLAKE2B 778fd78312c5195d849b0c256370841eb7e6932c65709b7a47654ca5306330607bb433a853c2858c662d244a272b85d290677c531303f0a7857dcaa3c58f9467 SHA512 9a703a8aa38f152abfcceb24f1dbc1b26aaf50a5951a65fbb3d4efac8e2d0309197398823e1846191ff56ac78ac591d41c77bed40e1a39433abbd0a5be5b9f1b
-EBUILD peewee-3.15.3.ebuild 795 BLAKE2B 47791866b281534ea68bd6fb010e0b65710bf536d07150dfe35d0b6efe477e6b78aa3bd0b6e9788bfee318fcb251bf83d7ddfd37daa9ca5bfad41f7a3866a95f SHA512 c05561a8165b10933de8a922a0552f03418b0a8509fb5115bda18545652410e1c5802c0480030081dc108ee258b329b6b255ebc93d70f89704acf6effaec71dc
+EBUILD peewee-3.15.3.ebuild 793 BLAKE2B 778fd78312c5195d849b0c256370841eb7e6932c65709b7a47654ca5306330607bb433a853c2858c662d244a272b85d290677c531303f0a7857dcaa3c58f9467 SHA512 9a703a8aa38f152abfcceb24f1dbc1b26aaf50a5951a65fbb3d4efac8e2d0309197398823e1846191ff56ac78ac591d41c77bed40e1a39433abbd0a5be5b9f1b
 MISC metadata.xml 365 BLAKE2B 144b870f5470e3de971f47316313980f95a3453c684fb7c326da025bef8a4e29dc0731808eefdecbb059a49ad77dd4166b3595554ac42d0578bda75c17fc06bf SHA512 9445bc6cf059e5c95c1e9ce5eebad887a43133ea0fad3fb7b70f60395e79bf30a42d893aa65d4c328e7c304b24a86fbdf3939b9ecccad318db01e95c3b4521f3
diff --git a/dev-python/peewee/peewee-3.15.2.ebuild b/dev-python/peewee/peewee-3.15.2.ebuild
deleted file mode 100644
index f02e5148a095..000000000000
--- a/dev-python/peewee/peewee-3.15.2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-PYTHON_REQ_USE="sqlite"
-
-inherit distutils-r1
-
-DESCRIPTION="Small Python ORM"
-HOMEPAGE="
-	https://github.com/coleifer/peewee/
-	https://pypi.org/project/peewee/
-"
-SRC_URI="
-	https://github.com/coleifer/${PN}/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-IUSE="examples test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-"
-
-distutils_enable_sphinx docs
-
-python_test() {
-	"${EPYTHON}" runtests.py -v 2 || die "tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use examples && DOCS=( examples/ )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/peewee/peewee-3.15.3.ebuild b/dev-python/peewee/peewee-3.15.3.ebuild
index 82b01219bc7a..f02e5148a095 100644
--- a/dev-python/peewee/peewee-3.15.3.ebuild
+++ b/dev-python/peewee/peewee-3.15.3.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 IUSE="examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/priority/Manifest b/dev-python/priority/Manifest
index 9e65793e5a5a..4b7019e37f43 100644
--- a/dev-python/priority/Manifest
+++ b/dev-python/priority/Manifest
@@ -1,7 +1,6 @@
 AUX priority-1.3.0-test-timeout.patch 716 BLAKE2B b48691b508a4116c9656acaa3a31871e5c8a66c45d6724506590c95e09eac027969def8198c5bdaa14e50cd77ea105881b7ddb7f36c95665502799f5ea751b6d SHA512 9e809600bc972baf4e1f5366c65db5e5d050bcfd0df23da3d1f75f653a0fdc27f7e4a59e96e13bd42636360653dfdc1de1991e6684e95bfffbf0c4384d7dc550
 DIST priority-1.3.0.tar.gz 13827 BLAKE2B 8c100eb44ed42f4f624bfb37dd6f698a3da84812783bd44ba82afef565562379a7677b3cbc9e16c4ea5a5dcc91d0897fa47c341a81bc1875461a72aff328fcff SHA512 cefb13b15e99ef98c37fdd1486466c9e1d7d04b4574cbca1665fde7b7b44cc7d66964bed41184315a9b51bd6f9d0e02bbe113bfa004a754ac270170309b71e0a
 DIST priority-2.0.0.tar.gz 24792 BLAKE2B c230f74aba3153edafba4bf85965a726ac3d3f5e2293d7c496b65fda260722cc44e4582666eee9d715e0d0686695434f8e0cbbd089c105bb45b777bf6eb4d72c SHA512 f90648a3ff1ee4131f30e99ecd8c36110abf484733f507edefcede8fdcb9ec3a618b9278e85724855709f41facee438061e4c5cae201b6e916c22f4a451db575
-EBUILD priority-1.3.0-r1.ebuild 771 BLAKE2B 03f1e1e7622b96eee80e37a991ad03b622a2a00e61bfc82eaf79ef7f04dcac7d5e436a0abe05f4ebc18654c28453d9caca6b0fdc6f873cdb6e8782092c3ca357 SHA512 50e3ae2d7604c32d36f81d6c31c8614a81b778782503f808eb64f3545af6419d7428d2deb85bad4f736f80b49eef62ce832e72c5348dd75e8545f5f78dce9fe6
-EBUILD priority-1.3.0.ebuild 718 BLAKE2B 31df88a983cca618ab29ea6e17efc147a7e3c9b76e4648e3070e58ee0ebc71ab99848090b2f5640ef73e79fee515164f82c15bf4fed3a336d045c141b8cd5d72 SHA512 f0e97a067ebb736e5a50e840ab39618455730cda04991a31f9cc1905f55753635ccc5daf1e2738c654d557ef751ad16580910b531d39115dec6ab83bb3c31ea0
+EBUILD priority-1.3.0-r1.ebuild 763 BLAKE2B ccc0e43cd0cff1ffa1ed46838f205654782b17f8b942a7267b5dd78461a376ad4bfce984340ae702bf05004b39032116d3dd99000117762f24413ea32b29cf4e SHA512 4a7d47528242cc50c09f8ee1c11e953adb7c64f182d2763c520e7970327e6701be7461744c4b474a1965145a93e0581e0945b29ab5be5e6301f713f6f11d6e4d
 EBUILD priority-2.0.0-r1.ebuild 701 BLAKE2B 4f965add99cf3b4e05740b8e4658900897c19147e8103ebb908c144b6859a8fd65efc5639a18c30a409764229f4d9b1d87999254e9a7808a8b5fbe46a0d98978 SHA512 410e923e0e0bfbf4c4fa3b9e38d2b762068b8e997462d587f701bd7f227e3c2779092de77b58ce199b70de3b3401bd6eb54ccd9af5fbaba810859a2cb72f9bb8
-MISC metadata.xml 840 BLAKE2B f06ec0d98208bec42462213928f2f312649ff7765747b591e4ec0b68fecbc3666c0a99d328c11d0f0e8a086b2e82dc76a9f82503a6e70a2346c802f9026cc692 SHA512 cf9161bb9d3c488dbec74364385022a067b9911caa9bfc2499c00e49342303ffea899e67eb5dffc8fc5a4285209eb4806db2c28d16f91e8407879101a2d324fd
+MISC metadata.xml 864 BLAKE2B a4d4d8f4f8c2f4fa5223060a708f5ce75d8cb8c9bbee43e3c9a71eb4d06e0ae675e8864fb3538c971617f138cf4f548e2bc2884f930a0fb40bdb270aad0c2736 SHA512 4c9a614833f2e769551cd584cc80601ea7bd5a630afd4de760a6a219cf50bb65fba9db137dcd8ebed52a0a00e606a24288f347785a3e2fbce4777ade324e0080
diff --git a/dev-python/priority/metadata.xml b/dev-python/priority/metadata.xml
index d65b75c18cd3..d7497bdbcdda 100644
--- a/dev-python/priority/metadata.xml
+++ b/dev-python/priority/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<maintainer>
 			<email>cory@lukasa.co.uk</email>
diff --git a/dev-python/priority/priority-1.3.0-r1.ebuild b/dev-python/priority/priority-1.3.0-r1.ebuild
index 7d55561bc434..dc8588ddef73 100644
--- a/dev-python/priority/priority-1.3.0-r1.ebuild
+++ b/dev-python/priority/priority-1.3.0-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 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"
 
 BDEPEND="
 	test? ( >=dev-python/hypothesis-3.4.2[${PYTHON_USEDEP}] )
diff --git a/dev-python/priority/priority-1.3.0.ebuild b/dev-python/priority/priority-1.3.0.ebuild
deleted file mode 100644
index 3f3f8c48a67e..000000000000
--- a/dev-python/priority/priority-1.3.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A pure-Python implementation of the HTTP/2 priority tree"
-HOMEPAGE="https://python-hyper.org/priority/en/latest/
-	https://github.com/python-hyper/priority
-	https://pypi.org/project/priority/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-BDEPEND="
-	test? ( >=dev-python/hypothesis-3.4.2[${PYTHON_USEDEP}] )
-"
-
-PATCHES=(
-	"${FILESDIR}"/priority-1.3.0-test-timeout.patch
-)
-
-distutils_enable_tests pytest
diff --git a/dev-python/protobuf-python/Manifest b/dev-python/protobuf-python/Manifest
index 00112ba55fdb..25ad3bd0c713 100644
--- a/dev-python/protobuf-python/Manifest
+++ b/dev-python/protobuf-python/Manifest
@@ -1,8 +1,15 @@
 AUX protobuf-python-3.19.0-google.protobuf.pyext._message.PyUnknownFieldRef.patch 1743 BLAKE2B c21d80a6cd218068d2a910ccd12c314810bd2eb679b59f79ba8d4d694948841d0fd8a56e921fed6f347ae9235f33903d79a038e8ae8659ea65bb59dbf7d7d9ea SHA512 7822b826d62585c48acebf04083546a3ebf8f6570854da8bddac3cc40554e71eaf57e9579c314ada33cf5bd0837cae23a3ef1057e44f6234d1d4a591c8036678
+AUX protobuf-python-4.21.8-python311.patch 3717 BLAKE2B f3a0b1b06bdbc2222fd3817b87f9b80cf609e9eb410770af31a069396eb68417f37c06603229ac8fc6aca958a9f8c0deec6b5f0812df6d7dac214b3f8622da29 SHA512 dd03b34b06e67aa4dc16281902e4676ee55169343d062b9515195ff9c92fc9cca4aaa24f83309b7f150f67a49356c41e22380bd68231dab7df04ac1c127f096f
+DIST protobuf-21.8.tar.gz 5110670 BLAKE2B 3c1b0c857a86e9586481d63896341d0cb11290dbd710d87a6f7889d34f5f262abe2986a29ed19a730f8fa5df0b5c62d77a4db6aa415a72b239f7483ae8d6380c SHA512 cb17be759311e91172801add1f88fe7a0291b547170c40d2e3303f5c248570dddeade96bd48740edd628215f55269c97475e2f4c4a41c50f1018d525f52036cb
 DIST protobuf-3.19.3.tar.gz 5293258 BLAKE2B c05b70ffca97f7166ea6a511a36907eed125edf1ebf17f908718221d9b851be84dfb2b1b39973f2faf35f6ade630e6ba4f9e8b91b8fbc922c5db97079323ee6e SHA512 1c003e7cbc8eae6a038f46e688b401ee202ba47f502561e909df79770f6e8b7daf3dc1ccc727e31bfb5b52cd04cb4fef7d2d2a28d650c13f396872ad4aa076c6
+DIST protobuf-3.19.6.tar.gz 5299501 BLAKE2B 3121f76b95f83c5309ce49ce296b738eff7be9d3a5093c564fbe2339fb5f3729e406f1b44bfcc05feb0d31ab63838bb4f54685017977c73a33b91215a6776072 SHA512 8f92242f2be8e1bbfba41341c87709ad91ad83b8b3e3df88bb430411541d3399295f49291fd52b50e3487b0fce33181cb4d175685fd25aac72adfaee26a612d4
 DIST protobuf-3.20.1.tar.gz 5368262 BLAKE2B 1ce1aef2e4c4f3ea4863629cc75d89fe17d0c7ac0c342ac641c787456fd4a12756c2892a27ddadedc94a7201494ec84566638ce33a03cb0c867b04e9eee0edb3 SHA512 fde3eb9f13946887ddfd87df428c5615ad09aaf191e4478b24e98e5e13231feeff4e70b4ca6a2ff7d9b9b2e2c60bc1d5479526edeafa78f9a8ed3bef2e0bacb0
+DIST protobuf-3.20.3.tar.gz 5374320 BLAKE2B fb51f2a0ecf5b83235f5252051f8192ae377bb7a5e030c3f3e9435ccde25919c059830cf476e840fa6c970928a32c0075e213c9d5d4d9e3d3b24732c39a9fbfa SHA512 01d6703bdbe769a1200ee6e4ebcdcb99688ec21f576988c60d82ec36e0822820fb245fcb4ca53293143d53e666d748b5a0c6937bc659fb3cdc4cd9b05ed12a1c
 EBUILD protobuf-python-3.19.3-r2.ebuild 1521 BLAKE2B fa114bf35d495311e22ba3c14c5ddb7786b0841f490eea785e7f9d74b3106e9163d7f257a7807f02322391d467bedac1553b677ff6f6902d72731246bf6a8c8a SHA512 c018c87e6c104d9c30fa6aa8088bf67d241580dab165b3a7da1443ee715d372a2371e76741863310e85cb225cf23f42b468b1b1c46cae3c3d60409012d9702ff
 EBUILD protobuf-python-3.19.3-r3.ebuild 1598 BLAKE2B 081d83d76faa14c2937203a3aaa66c326b3d495ab5679e749ea4bcf55418d93da7eb80c98082930e539ea46afcfd118e9542f129f280b0d011990d5d262dfbff SHA512 d0d714420b8598fce1300d463c71c5455b1fe9afb14119527614bdb51ee4ff5665064dd918303acb636d548696de55ede2cf273be3d5988b8abfd925b714c45a
+EBUILD protobuf-python-3.19.6.ebuild 1745 BLAKE2B b4a48882580da78eb0544d211fb950be7da985b70bf906d81fefe3dcd7991d46ce937735261e64e7560153e13e524dbc2445409a987d9c0ec5bcb6bbdbe5ee43 SHA512 80c550e72d84f897189b9f3b97c466bbb2732976b2485ea20b5fe39b68eb9aee0e44aceed8a6956bcdb06da9e465dfa750531e31ec34d7c42f2a61060327e395
 EBUILD protobuf-python-3.20.1.ebuild 1512 BLAKE2B 9826dc63b7dd36a16b5ff21431466386dd7f853d19ea4ad20399ce4a1b9855f03ebc06cdc9c90b5270ac4919b4919832a520729e0c1db3df2e53f80383e7e4f4 SHA512 7a2047e3c7e2fb3ab24764deb24a0fd9cdb2343ed7d53a42a0aa5ac5e365590699477616a2e2961467872ed1951a1422d4d41a6d6ddff521c2ca8c4b5ee92afb
-EBUILD protobuf-python-9999.ebuild 1403 BLAKE2B a3212b6bd2f93ae71951e9ec8978394e660423d83cf937a3703e10ab6dfde0ebf2d5676b981c96d9dba5477a0d862b66a69cdde2ab3275134f12fc925301d1ee SHA512 6cf1111e3d591acd3642ee225d448e7887549e0a396cd94b3edd76b368a35b28b1d25ae5a946998c087309117890810b9ede95d6a170ad9926d8948d9819fc74
+EBUILD protobuf-python-3.20.3.ebuild 1662 BLAKE2B f8c5468fa201273c2ad2b28a6f6bf72b1bc1a037b84362495ac4aca6761229e8a708cdfc4507e7e34a0f85966973b5552eb9c956ce70abe9cd12997fc3ae451a SHA512 13df3aeb24a661ed515faa085cfc1d55a19291d2b529c2388ffa566e64a0fe836bac68aea1db60fa8c3424ccb522727776d8828c8b106a2b1d00d546b8214489
+EBUILD protobuf-python-4.21.8.ebuild 1706 BLAKE2B 867e59c78fde17bc29be66af090835bd6f6550619005ac35b196631036353a22711f97d167628138636ef78df484e279c979297e3255bd3ef985f3d98d858792 SHA512 1250ad6e565da0ee24774d1610cf6012b9e03f6b10d641f458f7a0c668629082474a4bba1bbec717a450654042b41c9cfa126032d37d304669cb976a02f919e9
+EBUILD protobuf-python-9999.ebuild 1723 BLAKE2B a09d187382486e66c363b03a441e45168f4bd9d57e83e1c3cae81874da623c70a67af9de4dd09d7405b9b95c6cad757087c53ca6739714831386a0e0eb921a6f SHA512 dbc65d2d16248ead6e9cdba28cf19afa509286cf3759cc2fa7285c66c025523219f0845e7fbefad0b6cee9ab2d1091d279bcc0ab89b29f9f5a0c31619e7660d3
 MISC metadata.xml 548 BLAKE2B 2468487e12d536d67daebf5b7a21cd63a9c4af321a8979132e63d9b8394bf577e347f891326c73bfa6907e82ca355ea0d4ec40a37bb297db0da1e55a62b6ef33 SHA512 c0c2556fbf8821f3a75ed344daa59b4fc355029f96efb8f9784f54c819916adeb46b2c5d8c2e8d405dc58395c2f18b30cda69c6d406948a066bd1d78a55df80b
diff --git a/dev-python/protobuf-python/files/protobuf-python-4.21.8-python311.patch b/dev-python/protobuf-python/files/protobuf-python-4.21.8-python311.patch
new file mode 100644
index 000000000000..b9aca40776c5
--- /dev/null
+++ b/dev-python/protobuf-python/files/protobuf-python-4.21.8-python311.patch
@@ -0,0 +1,132 @@
+https://github.com/protocolbuffers/protobuf/commit/2206b63c4649cf2e8a06b66c9191c8ef862ca519
+https://github.com/protocolbuffers/protobuf/pull/10403
+https://github.com/protocolbuffers/protobuf/issues/10305
+https://bugs.gentoo.org/844184
+
+From da973aff2adab60a9e516d3202c111dbdde1a50f Mon Sep 17 00:00:00 2001
+From: Alexander Shadchin <alexandr.shadchin@gmail.com>
+Date: Sun, 14 Aug 2022 21:13:49 +0300
+Subject: [PATCH] Fix build with Python 3.11
+
+The PyFrameObject structure members have been removed from the public C API.
+--- a/google/protobuf/pyext/descriptor.cc
++++ b/google/protobuf/pyext/descriptor.cc
+@@ -58,6 +58,37 @@
+               : 0)                                               \
+        : PyBytes_AsStringAndSize(ob, (charpp), (sizep)))
+ 
++#if PY_VERSION_HEX < 0x030900B1 && !defined(PYPY_VERSION)
++static PyCodeObject* PyFrame_GetCode(PyFrameObject *frame)
++{
++    Py_INCREF(frame->f_code);
++    return frame->f_code;
++}
++
++static PyFrameObject* PyFrame_GetBack(PyFrameObject *frame)
++{
++    Py_XINCREF(frame->f_back);
++    return frame->f_back;
++}
++#endif
++
++#if PY_VERSION_HEX < 0x030B00A7 && !defined(PYPY_VERSION)
++static PyObject* PyFrame_GetLocals(PyFrameObject *frame)
++{
++    if (PyFrame_FastToLocalsWithError(frame) < 0) {
++        return NULL;
++    }
++    Py_INCREF(frame->f_locals);
++    return frame->f_locals;
++}
++
++static PyObject* PyFrame_GetGlobals(PyFrameObject *frame)
++{
++    Py_INCREF(frame->f_globals);
++    return frame->f_globals;
++}
++#endif
++
+ namespace google {
+ namespace protobuf {
+ namespace python {
+@@ -96,48 +127,66 @@ bool _CalledFromGeneratedFile(int stacklevel) {
+   // This check is not critical and is somewhat difficult to implement correctly
+   // in PyPy.
+   PyFrameObject* frame = PyEval_GetFrame();
++  PyCodeObject* frame_code = nullptr;
++  PyObject* frame_globals = nullptr;
++  PyObject* frame_locals = nullptr;
++  bool result = false;
++
+   if (frame == nullptr) {
+-    return false;
++    goto exit;
+   }
++  Py_INCREF(frame);
+   while (stacklevel-- > 0) {
+-    frame = frame->f_back;
++    PyFrameObject* next_frame = PyFrame_GetBack(frame);
++    Py_DECREF(frame);
++    frame = next_frame;
+     if (frame == nullptr) {
+-      return false;
++      goto exit;
+     }
+   }
+ 
+-  if (frame->f_code->co_filename == nullptr) {
+-    return false;
++  frame_code = PyFrame_GetCode(frame);
++  if (frame_code->co_filename == nullptr) {
++    goto exit;
+   }
+   char* filename;
+   Py_ssize_t filename_size;
+-  if (PyString_AsStringAndSize(frame->f_code->co_filename,
++  if (PyString_AsStringAndSize(frame_code->co_filename,
+                                &filename, &filename_size) < 0) {
+     // filename is not a string.
+     PyErr_Clear();
+-    return false;
++    goto exit;
+   }
+   if ((filename_size < 3) ||
+       (strcmp(&filename[filename_size - 3], ".py") != 0)) {
+     // Cython's stack does not have .py file name and is not at global module
+     // scope.
+-    return true;
++    result = true;
++    goto exit;
+   }
+   if (filename_size < 7) {
+     // filename is too short.
+-    return false;
++    goto exit;
+   }
+   if (strcmp(&filename[filename_size - 7], "_pb2.py") != 0) {
+     // Filename is not ending with _pb2.
+-    return false;
++    goto exit;
+   }
+ 
+-  if (frame->f_globals != frame->f_locals) {
++  frame_globals = PyFrame_GetGlobals(frame);
++  frame_locals = PyFrame_GetLocals(frame);
++  if (frame_globals != frame_locals) {
+     // Not at global module scope
+-    return false;
++    goto exit;
+   }
+ #endif
+-  return true;
++  result = true;
++exit:
++  Py_XDECREF(frame_globals);
++  Py_XDECREF(frame_locals);
++  Py_XDECREF(frame_code);
++  Py_XDECREF(frame);
++  return result;
+ }
+ 
+ // If the calling code is not a _pb2.py file, raise AttributeError.
+
diff --git a/dev-python/protobuf-python/protobuf-python-3.19.6.ebuild b/dev-python/protobuf-python/protobuf-python-3.19.6.ebuild
new file mode 100644
index 000000000000..dc9a76ba6458
--- /dev/null
+++ b/dev-python/protobuf-python/protobuf-python-3.19.6.ebuild
@@ -0,0 +1,79 @@
+# Copyright 2008-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+PARENT_PN="${PN/-python/}"
+PARENT_PV="${PV}"
+PARENT_P="${PARENT_PN}-${PARENT_PV}"
+
+if [[ "${PV}" == *9999 ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf.git"
+	EGIT_SUBMODULES=()
+	EGIT_CHECKOUT_DIR="${WORKDIR}/${PARENT_P}"
+else
+	SRC_URI="
+		https://github.com/protocolbuffers/protobuf/archive/v${PARENT_PV}.tar.gz
+			-> ${PARENT_P}.tar.gz
+	"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+fi
+
+DESCRIPTION="Google's Protocol Buffers - Python bindings"
+HOMEPAGE="
+	https://developers.google.com/protocol-buffers/
+	https://pypi.org/project/protobuf/
+"
+
+LICENSE="BSD"
+SLOT="0/30"
+
+S="${WORKDIR}/${PARENT_P}/python"
+
+BDEPEND="
+"
+DEPEND="
+	${PYTHON_DEPS}
+"
+RDEPEND="
+	${BDEPEND}
+	dev-libs/protobuf:${SLOT}
+"
+
+distutils_enable_tests setup.py
+
+# Same than PATCHES but from repository's root directory,
+# please see function `python_prepare_all` below.
+# Simplier for users IMHO.
+PARENT_PATCHES=(
+	"${FILESDIR}/${PN}-3.19.0-google.protobuf.pyext._message.PyUnknownFieldRef.patch"
+)
+
+# Here for patches within "python/" subdirectory.
+PATCHES=(
+)
+
+python_prepare_all() {
+	pushd "${WORKDIR}/${PARENT_P}" > /dev/null || die
+	[[ -n "${PARENT_PATCHES[@]}" ]] && eapply "${PARENT_PATCHES[@]}"
+	eapply_user
+	popd > /dev/null || die
+
+	distutils-r1_python_prepare_all
+}
+
+src_configure() {
+	DISTUTILS_ARGS=( --cpp_implementation )
+}
+
+python_compile() {
+	distutils-r1_python_compile
+	find "${BUILD_DIR}/install" -name "*.pth" -type f -delete || die
+}
diff --git a/dev-python/protobuf-python/protobuf-python-3.20.3.ebuild b/dev-python/protobuf-python/protobuf-python-3.20.3.ebuild
new file mode 100644
index 000000000000..80c782e2fbdc
--- /dev/null
+++ b/dev-python/protobuf-python/protobuf-python-3.20.3.ebuild
@@ -0,0 +1,78 @@
+# Copyright 2008-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+PARENT_PN="${PN/-python/}"
+PARENT_PV="${PV}"
+PARENT_P="${PARENT_PN}-${PARENT_PV}"
+
+if [[ "${PV}" == *9999 ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf.git"
+	EGIT_SUBMODULES=()
+	EGIT_CHECKOUT_DIR="${WORKDIR}/${PARENT_P}"
+else
+	SRC_URI="
+		https://github.com/protocolbuffers/protobuf/archive/v${PARENT_PV}.tar.gz
+			-> ${PARENT_P}.tar.gz
+	"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+fi
+
+DESCRIPTION="Google's Protocol Buffers - Python bindings"
+HOMEPAGE="
+	https://developers.google.com/protocol-buffers/
+	https://pypi.org/project/protobuf/
+"
+
+LICENSE="BSD"
+SLOT="0/31"
+
+S="${WORKDIR}/${PARENT_P}/python"
+
+BDEPEND="
+"
+DEPEND="
+	${PYTHON_DEPS}
+"
+RDEPEND="
+	${BDEPEND}
+	dev-libs/protobuf:${SLOT}
+"
+
+distutils_enable_tests setup.py
+
+# Same than PATCHES but from repository's root directory,
+# please see function `python_prepare_all` below.
+# Simplier for users IMHO.
+PARENT_PATCHES=(
+)
+
+# Here for patches within "python/" subdirectory.
+PATCHES=(
+)
+
+python_prepare_all() {
+	pushd "${WORKDIR}/${PARENT_P}" > /dev/null || die
+	[[ -n "${PARENT_PATCHES[@]}" ]] && eapply "${PARENT_PATCHES[@]}"
+	eapply_user
+	popd > /dev/null || die
+
+	distutils-r1_python_prepare_all
+}
+
+src_configure() {
+	DISTUTILS_ARGS=( --cpp_implementation )
+}
+
+python_compile() {
+	distutils-r1_python_compile
+	find "${BUILD_DIR}/install" -name "*.pth" -type f -delete || die
+}
diff --git a/dev-python/protobuf-python/protobuf-python-4.21.8.ebuild b/dev-python/protobuf-python/protobuf-python-4.21.8.ebuild
new file mode 100644
index 000000000000..572a571542c6
--- /dev/null
+++ b/dev-python/protobuf-python/protobuf-python-4.21.8.ebuild
@@ -0,0 +1,79 @@
+# Copyright 2008-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+PARENT_PN="${PN/-python/}"
+PARENT_PV="$(ver_cut 2-)"
+PARENT_P="${PARENT_PN}-${PARENT_PV}"
+
+if [[ "${PV}" == *9999 ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf.git"
+	EGIT_SUBMODULES=()
+	EGIT_CHECKOUT_DIR="${WORKDIR}/${PARENT_P}"
+else
+	SRC_URI="
+		https://github.com/protocolbuffers/protobuf/archive/v${PARENT_PV}.tar.gz
+			-> ${PARENT_P}.tar.gz
+	"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+fi
+
+DESCRIPTION="Google's Protocol Buffers - Python bindings"
+HOMEPAGE="
+	https://developers.google.com/protocol-buffers/
+	https://pypi.org/project/protobuf/
+"
+
+LICENSE="BSD"
+SLOT="0/32"
+
+S="${WORKDIR}/${PARENT_P}/python"
+
+BDEPEND="
+"
+DEPEND="
+	${PYTHON_DEPS}
+"
+RDEPEND="
+	${BDEPEND}
+	dev-libs/protobuf:${SLOT}
+"
+
+distutils_enable_tests setup.py
+
+# Same than PATCHES but from repository's root directory,
+# please see function `python_prepare_all` below.
+# Simplier for users IMHO.
+PARENT_PATCHES=(
+)
+
+# Here for patches within "python/" subdirectory.
+PATCHES=(
+	"${FILESDIR}"/${P}-python311.patch
+)
+
+python_prepare_all() {
+	pushd "${WORKDIR}/${PARENT_P}" > /dev/null || die
+	[[ -n "${PARENT_PATCHES[@]}" ]] && eapply "${PARENT_PATCHES[@]}"
+	eapply_user
+	popd > /dev/null || die
+
+	distutils-r1_python_prepare_all
+}
+
+src_configure() {
+	DISTUTILS_ARGS=( --cpp_implementation )
+}
+
+python_compile() {
+	distutils-r1_python_compile
+	find "${BUILD_DIR}/install" -name "*.pth" -type f -delete || die
+}
diff --git a/dev-python/protobuf-python/protobuf-python-9999.ebuild b/dev-python/protobuf-python/protobuf-python-9999.ebuild
index 3541dfec56fd..21144493ec0e 100644
--- a/dev-python/protobuf-python/protobuf-python-9999.ebuild
+++ b/dev-python/protobuf-python/protobuf-python-9999.ebuild
@@ -4,57 +4,66 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
-if [[ "${PV}" == "9999" ]]; then
+PARENT_PN="${PN/-python/}"
+PARENT_PV="${PV}"
+PARENT_P="${PARENT_PN}-${PARENT_PV}"
+
+if [[ "${PV}" == *9999 ]]; then
 	inherit git-r3
 
-	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf"
+	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf.git"
 	EGIT_SUBMODULES=()
+	EGIT_CHECKOUT_DIR="${WORKDIR}/${PARENT_P}"
+else
+	SRC_URI="
+		https://github.com/protocolbuffers/protobuf/archive/v${PARENT_PV}.tar.gz
+			-> ${PARENT_P}.tar.gz
+	"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 fi
 
 DESCRIPTION="Google's Protocol Buffers - Python bindings"
 HOMEPAGE="
 	https://developers.google.com/protocol-buffers/
-	https://github.com/protocolbuffers/protobuf/
 	https://pypi.org/project/protobuf/
 "
-if [[ "${PV}" != "9999" ]]; then
-	SRC_URI="
-		https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz
-			-> protobuf-${PV}.tar.gz
-	"
-fi
-S="${WORKDIR}/protobuf-${PV}/python"
 
 LICENSE="BSD"
-SLOT="0/30"
-KEYWORDS=""
+SLOT="0/32"
+
+S="${WORKDIR}/${PARENT_P}/python"
 
 BDEPEND="
-	${PYTHON_DEPS}
-	~dev-libs/protobuf-${PV}
+	dev-libs/protobuf:${SLOT}
 	dev-python/six[${PYTHON_USEDEP}]
 "
 DEPEND="
 	${PYTHON_DEPS}
-	~dev-libs/protobuf-${PV}
+	dev-libs/protobuf:${SLOT}
 "
 RDEPEND="
 	${BDEPEND}
-	!dev-python/namespace-google
 "
 
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_CHECKOUT_DIR="${WORKDIR}/protobuf-${PV}"
-fi
-
 distutils_enable_tests setup.py
 
+# Same than PATCHES but from repository's root directory,
+# please see function `python_prepare_all` below.
+# Simplier for users IMHO.
+PARENT_PATCHES=(
+)
+
+# Here for patches within "python/" subdirectory.
+PATCHES=(
+)
+
 python_prepare_all() {
-	pushd "${WORKDIR}/protobuf-${PV}" > /dev/null || die
+	pushd "${WORKDIR}/${PARENT_P}" > /dev/null || die
+	[[ -n "${PARENT_PATCHES[@]}" ]] && eapply "${PARENT_PATCHES[@]}"
 	eapply_user
 	popd > /dev/null || die
 
@@ -62,7 +71,7 @@ python_prepare_all() {
 }
 
 src_configure() {
-	DISTUTILS_ARGS=(--cpp_implementation)
+	DISTUTILS_ARGS=( --cpp_implementation )
 }
 
 python_compile() {
diff --git a/dev-python/py-cpuinfo/Manifest b/dev-python/py-cpuinfo/Manifest
index f0dd7fe3ae5d..1ae08f4e9e8d 100644
--- a/dev-python/py-cpuinfo/Manifest
+++ b/dev-python/py-cpuinfo/Manifest
@@ -1,3 +1,5 @@
 DIST py-cpuinfo-8.0.0.tar.gz 99791 BLAKE2B 95024b488142e3bbb2eaa69ffef229ac27f1cb55e297fb8de050ec4c410c1b13dbf674936365d84c5c473158338dd047f6dfba58c2a7dde4e21232af356ab20c SHA512 77351f9f2fd33b09d0ee998dd2b3eb971bbe9094bee5636356d5a5a2747ebba3c112cccfdf929f77e3b7de3c745f98ecfac8edeb0d84fede100b637b554d4fd9
+DIST py-cpuinfo-9.0.0.tar.gz 104716 BLAKE2B 667f5d420fd7eeff74e5047ee05220717585332c0b8b2a61422c3b4505f9c71c6b3091bbf3ebe29a3460b574a873cea423cffb5a83c49ceec3654a1558e435af SHA512 c7711137d60ad52bcbef8738a70fb48ceaa69e1e1632d135d0ee95c282b02df6170c3dd88a1e14b3e9a386d3286a15ca9722fcfb596107da022161a7cf84509a
 EBUILD py-cpuinfo-8.0.0.ebuild 479 BLAKE2B 42b5bba08824cc62f278a9045f6e8db6b33f04abfbbe9fe47ebf04b51fc2face05a23577e1bb89200c50aa51ab4ec669e7ee60de06b188ea6defcf292e29827b SHA512 30164a051144fcc2d4f5878b1a789459414fb4341d4d567126cc1725004a42618650ebc7aa7388a25f005ae7882650e2e72895210551947e5c1fdd93f835eb5f
+EBUILD py-cpuinfo-9.0.0.ebuild 513 BLAKE2B 7bcf9fb5d63ac756d340f2eb0adc4281c1723634f5ef9c6525260698d7a7226fcbb2e354dcc466c07d301117cd396d4e591c90b203eee099a4bc5474abf7ab2b SHA512 d3e64604f136bfc2fd7f8af758790af91a054f4c445a6ba02f7e5e9120aa3b87549130075be93825d90807a40061646c5519f704f862e4c6b15e8e537f95545a
 MISC metadata.xml 532 BLAKE2B 32c0f690bf91102b46b486db560e99ee94400c0c1bfa5ae00d4dff415d92d9c57931571d6f4c233221c1a8ea82c1f16629ba68dfa76abd462d953152643d098a SHA512 88a5a900b83df3680f1f437329758489d0de63da450921397b4c3256decd455ad134da5a1311fddee4bf9843b3466a6c6e70b0e6bad6bb7d90de9b73c8e67dcb
diff --git a/dev-python/py-cpuinfo/py-cpuinfo-9.0.0.ebuild b/dev-python/py-cpuinfo/py-cpuinfo-9.0.0.ebuild
new file mode 100644
index 000000000000..44d377ce96c7
--- /dev/null
+++ b/dev-python/py-cpuinfo/py-cpuinfo-9.0.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Get CPU info with pure Python 2 & 3"
+HOMEPAGE="
+	https://github.com/workhorsy/py-cpuinfo/
+	https://pypi.org/project/py-cpuinfo/
+"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+
+distutils_enable_tests unittest
diff --git a/dev-python/pycups/Manifest b/dev-python/pycups/Manifest
index fe8a54b32f86..1e5eafe5ec52 100644
--- a/dev-python/pycups/Manifest
+++ b/dev-python/pycups/Manifest
@@ -1,4 +1,4 @@
 AUX pycups-2.0.1-py3.10.patch 576 BLAKE2B de0c617d24d18290c23fa7938a62db451dff69075ef180a781c285a7b6a6b4c6fdeb4010a0994c56dcff5c21cc902a59cede52aadc523b9d642c49cde0272a89 SHA512 31f025e9ee09530836a6efac6d7cbb39d2311fe4264dc245dc8f80314a3d03416395f66759f505d63119975a443a286b703b6e21f68dd0eedf320595d8ce68c4
 DIST pycups-2.0.1.tar.gz 62968 BLAKE2B c9d955b89f2e9746827721c875dfc97538bb4575ee3f78c41a94f06b361cd3d22c14d453bfbea210160026d33c6e161b1d14c4dffeaddd644c260779f56e1db7 SHA512 fdebf1cac8cc4fffb8a76a938aa91965dae4a3dcdb6d8ee26e8e6054809d26dd3fb20b10c2351fb9265c03b16d6bde011815111c452ccb058518372f22d9d617
-EBUILD pycups-2.0.1-r1.ebuild 800 BLAKE2B d25d8797edca94b195df58b1bbf4c366201de433b35b05fa9d37ec40c9fe53c960adc1fb25e90a62e7a38963b3d7aad8cec6c8cfa5780e5baa871d13d6d7f2e3 SHA512 6515713bedc834a3ed3cc87986137dfe483e8b1f53cced93fab80e83092f0a3add14c92504f424fb63f3c3295b6185dde05369e91258b36f48225cee5fbda30e
+EBUILD pycups-2.0.1-r1.ebuild 797 BLAKE2B 6223e117bcc462d07848ef434817c5c1f88e5f045187b980ec9942b980ad03b96d0bae0aebfd44b9f025f6ee25c8dbf8546b631a5d29f0e3da092d29ccbf9660 SHA512 6d6f459db792cc0a8a3f0de787d880fe3a11fdbf2b983ea5ad8be50c1e248c41161d9eec449efdeadb56174a392b8281fd9ece1a23110087fcfc0740c4fd8072
 MISC metadata.xml 567 BLAKE2B e0f8590318ffd3bf0963973f947ade6be086cf99f5f09b49cbc6ecef7ce397aecffd3cb534339a3a86ae98b88da8c60619a610bb8eac9ec1ccebfdcbc329408b SHA512 63e388902a77c052d0944b84805ec0905598e7f0126eb67813e4c75f3a11a51c2ba8ae46e0f8c3bd64f5c96806e0784c23b2b3e35d3261aba65b267fd28f6c71
diff --git a/dev-python/pycups/pycups-2.0.1-r1.ebuild b/dev-python/pycups/pycups-2.0.1-r1.ebuild
index 1fddc3ef337b..8e797cc3d9d0 100644
--- a/dev-python/pycups/pycups-2.0.1-r1.ebuild
+++ b/dev-python/pycups/pycups-2.0.1-r1.ebuild
@@ -4,8 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
+PYTHON_COMPAT=( python3_{8..11} )
 inherit distutils-r1
 
 DESCRIPTION="Python bindings for the CUPS API"
@@ -20,10 +19,8 @@ IUSE="examples"
 RDEPEND="net-print/cups"
 DEPEND="${RDEPEND}"
 
-PATCHES=(
-	# https://github.com/OpenPrinting/pycups/commit/8cbf6d40a0132764ad51e7416aa7034966875091
-	"${FILESDIR}/${P}-py3.10.patch"
-)
+# https://github.com/OpenPrinting/pycups/commit/8cbf6d40a0132764ad51e7416aa7034966875091
+PATCHES=( "${FILESDIR}/${P}-py3.10.patch" )
 
 python_install_all() {
 	if use examples; then
diff --git a/dev-python/pydiffx/Manifest b/dev-python/pydiffx/Manifest
index eacdac5f1264..7ab206c1f139 100644
--- a/dev-python/pydiffx/Manifest
+++ b/dev-python/pydiffx/Manifest
@@ -1,5 +1,5 @@
 DIST diffx-pydiffx-release-1.0.1.tar.gz 82838 BLAKE2B 80ac477ff6b72dd089f134afc988251b20f7675e05c429e12238800145ed70f57acca835ddfdd77a2b22e53767b77d741537aad02f93bdefcee06a44965c7904 SHA512 dcb6b9dad321c5bec940d13dcf64853587c4e7636d34ea3ac4bc2b54df8915e1ac9804932034c069fcfba5f10f05972cc7dc46ba0d37c2e08c684bcbb2c2409e
 DIST diffx-pydiffx-release-1.1.gh.tar.gz 83721 BLAKE2B fb38b40f4385e00bd8ac45111ac6308b8a5ba7148e74c020c9e7c6b5480466b2301e580f93c98d761087f443339394c124eee061edafd454f0d71839103a6caf SHA512 596d9d70134cadcbdb8fbdd10fe22f8922276d1a822c60430e765b70b0fba9cd16578c94743aef4afaae7ab8409cc2e171028a154cd1231ad6c54dbe229b93e3
-EBUILD pydiffx-1.0.1-r1.ebuild 855 BLAKE2B 40717678dd1d34802f14953f3cde16336ae8e80d233bc0147d6a6e6fdd667fefcd0fb60aedfe5ca54aebce0fd4367a9a952de746565c4a7cbb6379fff5955990 SHA512 accd8ffd126b6dfdd4f5500ff9c69a46126fafc7653ae6a8ad88b9c48dff98372fe3a523405be020a6eab03a25b62fcd82aa4f747ff0eceb7b77767d2de85785
+EBUILD pydiffx-1.0.1-r1.ebuild 853 BLAKE2B ed3077dd40aed16740e358bf4bfabe19a321af5191013b8f32c50bfdece1521888a5ae3b3b97ffb4306bf8f61ec4f3f6e5bd6266ff7057a231b23e1eeb88e4ee SHA512 6b446798dc901f1a1b190642ab464bda2876f92805524e4e56498dfa74ab775629887ce6a36347bbd5f8fdeabc1dfd751ff6cf399a30690018c87a49206e6d65
 EBUILD pydiffx-1.1.ebuild 858 BLAKE2B a81026d2922ebc38f20c3a24be68a832c8b761d8900e057308d13ba53a9095bf64122db7a28d2b1ba3396f668abc309824c7fc70df7cfe32bcf4a6d8f89616a2 SHA512 8b81a39fb024d1b9eae848ca9a50db5fb3297f384a222ead5493f18d53503cf3429ee0b94b8f0dfb40a1a3330facae76e76ca3511ab4f9fa2bd76b8ba5caa70a
 MISC metadata.xml 391 BLAKE2B 76c0b2eac63df75f2ad64518c4afff762891acab6983e22f7b5e7e270fc3eec64f5e8b05dfd82125cf2b9a251dd827eca9a5173852345dcf37cb5a7a41940ccb SHA512 2f15007d5da3fb592458d72cb0ad267f5fdc2e3cbb1c6df351fcf28f897ff7a98992d6ffd7e3c1050edcd57b1d40ef66874e8bb25178c01762feae62f23e436c
diff --git a/dev-python/pydiffx/pydiffx-1.0.1-r1.ebuild b/dev-python/pydiffx/pydiffx-1.0.1-r1.ebuild
index a5106d25a571..92f4b98b4615 100644
--- a/dev-python/pydiffx/pydiffx-1.0.1-r1.ebuild
+++ b/dev-python/pydiffx/pydiffx-1.0.1-r1.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/${MY_P}/python
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	dev-python/six[${PYTHON_USEDEP}]
diff --git a/dev-python/pyicu/Manifest b/dev-python/pyicu/Manifest
index 33d32b47cabd..e5fc6118e183 100644
--- a/dev-python/pyicu/Manifest
+++ b/dev-python/pyicu/Manifest
@@ -1,5 +1,9 @@
+DIST pyicu-v2.10.1.tar.bz2 192780 BLAKE2B 0a8dea0091e07b889fbe79895b1a1fd030e29f9be02303e9b70b7380defaea14eeecc87031e4c1e57bab4a56680fad51f1489d117f31492a50c0323eefaa288d SHA512 a542fafdd1c64971ac4cf7fe0189324969cc4039319950663819e7040d9406ea200a84d3f2821a9a94c944087d0dbfe74fecebb430a01476114b6963ba83c739
+DIST pyicu-v2.10.2.tar.bz2 192890 BLAKE2B b865e2777d922d7ec7ec1abab5e745670affa6e31704db7b23f906eab8ac99ac612c756f433119380a0fed2d180373dba05003722a1ba0990cafc7c4d9d3fbdd SHA512 687f48e0315cc72917b54c7431ee29d503ec79354842e5f6db564cc951a13d32cb4df97435d04c4b125a2a654f70429592ef2197e154624dd9a246b9bacfa4a9
 DIST pyicu-v2.10.tar.bz2 192789 BLAKE2B 824b83177b420bb78633a2d7b93bdcc781ec87ea105e7441be59547c6f56fadf292aa331decac96f095672a4d2741d709ed32dec4841b070bc056e7f0f8d65d0 SHA512 8f752ba97fc5ffc3004591826b47bd76c9b99d73a3784b2bba746cb611969a47a98971c89fe0b35dc817fd14b93b1bf0e85f4bf23986af22bcf5401485899c9e
 DIST pyicu-v2.9.tar.bz2 243533 BLAKE2B c2ea32f69637e2d12a57ded96b570ba7fd41c92aed4a0dea36ebe5c224b80fa8d1672251f8218e0a35d463957ab4291cff778c3e690f0763e465dc6f0a1af26d SHA512 f10025afe1a0de5a1726c3d4aaec5b10ba62064c33205117efe643185dcd3560e8971b600606e9699269cca795477bf86ed2f9e604e9c0e04bb75a86f31cd114
+EBUILD pyicu-2.10.1.ebuild 679 BLAKE2B 71d32386564aec1da6ffe1a59ed68ad9bd15693f5363ce51f4287cc8f1290055f69d79e9a79dc75943c29265ee3764f83f146232b081662968785a8045392baf SHA512 f06004ecf0a8eb878bee56049f3ceb84843f6179f45efcbdb5a07396b5e101af12df84decd3902b54582cd8ee05c613c0f676e7e610feab9c82c751769194696
+EBUILD pyicu-2.10.2.ebuild 679 BLAKE2B 71d32386564aec1da6ffe1a59ed68ad9bd15693f5363ce51f4287cc8f1290055f69d79e9a79dc75943c29265ee3764f83f146232b081662968785a8045392baf SHA512 f06004ecf0a8eb878bee56049f3ceb84843f6179f45efcbdb5a07396b5e101af12df84decd3902b54582cd8ee05c613c0f676e7e610feab9c82c751769194696
 EBUILD pyicu-2.10.ebuild 682 BLAKE2B 4c6fc8f74ba34a6f83fa9039e094e16d387acaa6ede225ac6a9709a197f29dc9377be3d8c4d01b7bbb07ce3c01a6106eb43529cbceae635245097fc8e99ce70c SHA512 3b954ad2a3bda2105ea90b95b61d082d7036eb9ca7140104521e0414a2c611711a85405810ad39b4eb3e5db234a07d9032fa27c262c4e69791f56e604ed0aaf1
 EBUILD pyicu-2.9.ebuild 681 BLAKE2B bf4d51d2df8c47b221d6e7c11a0bd7503b846a3f3f208dd8d7cfb7b6840ac476e486a42caf0466205c2e86a46509924a76938cdad64e8a7e5d966c7b54b4306f SHA512 c7fa76c08368699425e01e2bc22667a6541afc75c1c0400c409e7935c186f345c29e400c06ea35e6e43d19c880bee645ae308c5495ce2bbdf54d72995ee8e4f4
 MISC metadata.xml 415 BLAKE2B a96dc033850e25f2afcd4128d38becd7c86263e5bb366a701c88a2bc81118aef03217bbfe0c2ff0719f636104b2a12995815c36f2a3e6539136509c7900c25e4 SHA512 e8d901e2276b0a92ae8e0cdd4b0e1cacd29d9eda86491a31a2057d013b7c4f8c340d0e83dbfd53500906f79a827d837cc7e445c24e6cf5b50ee809ec2c35eb13
diff --git a/dev-python/pyicu/pyicu-2.10.1.ebuild b/dev-python/pyicu/pyicu-2.10.1.ebuild
new file mode 100644
index 000000000000..1759ece5b608
--- /dev/null
+++ b/dev-python/pyicu/pyicu-2.10.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+MY_P=${P/-/-v}
+DESCRIPTION="Python bindings for dev-libs/icu"
+HOMEPAGE="
+	https://gitlab.pyicu.org/main/pyicu/
+	https://pypi.org/project/PyICU/
+"
+SRC_URI="
+	https://gitlab.pyicu.org/main/pyicu/-/archive/v${PV}/${MY_P}.tar.bz2
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+
+DEPEND="
+	dev-libs/icu:=
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	test? (
+		dev-python/six[${PYTHON_USEDEP}]
+	)
+"
+
+DOCS=( CHANGES CREDITS README.md )
+
+distutils_enable_tests pytest
diff --git a/dev-python/pyicu/pyicu-2.10.2.ebuild b/dev-python/pyicu/pyicu-2.10.2.ebuild
new file mode 100644
index 000000000000..1759ece5b608
--- /dev/null
+++ b/dev-python/pyicu/pyicu-2.10.2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+MY_P=${P/-/-v}
+DESCRIPTION="Python bindings for dev-libs/icu"
+HOMEPAGE="
+	https://gitlab.pyicu.org/main/pyicu/
+	https://pypi.org/project/PyICU/
+"
+SRC_URI="
+	https://gitlab.pyicu.org/main/pyicu/-/archive/v${PV}/${MY_P}.tar.bz2
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+
+DEPEND="
+	dev-libs/icu:=
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	test? (
+		dev-python/six[${PYTHON_USEDEP}]
+	)
+"
+
+DOCS=( CHANGES CREDITS README.md )
+
+distutils_enable_tests pytest
diff --git a/dev-python/pykerberos/Manifest b/dev-python/pykerberos/Manifest
index f6f06a7e2a5e..5eba340297b5 100644
--- a/dev-python/pykerberos/Manifest
+++ b/dev-python/pykerberos/Manifest
@@ -1,5 +1,4 @@
 AUX pykerberos-1.3.1-python3.10.patch 1099 BLAKE2B afe1d4639bd3773f075453a4549c270450a5c89671b650e9ee76219abec84b6c1dd2fcc1b2b77db6937d5303f89e562deda1405a3963221259bec3ce506def5f SHA512 dae8c3f6419ecc22ec9f3385053275bd13f9468721c1a419c9166153e49251d5499582f184f2dbaa7a194a591436229d9bcbe558cedf46237dc5cc15929faa05
 DIST PyKerberos-1.3.1.tar.gz 41954 BLAKE2B b95a3473c5803ebcb461db7f2589caa03e92f4cb3ba3a4890a31db99b687aa4c77ae4e58f09ae2339a1fd8acf6fe9ab5797e3b7178dfeb2ee7a95bb851fff402 SHA512 dcadc5c3b095d8bba947a745ac84cc558d7eebad139a0e86260891966786506a7a62600fde93fa14683971e436da8cc5cd3795817b20ba45ce7e39f8c05deb53
-EBUILD pykerberos-1.3.1-r1.ebuild 1342 BLAKE2B 5346af5a57b23c571c34a314fa27a55cd93e2d58aa3f82c9fe5b0943b442f255634876f4108b2ce41ff6b589b98fe97bdf44f40b56eea34931e11cfa7bae5225 SHA512 874c0f660ef5cc84aa1417a173354f7f8c0fc6906d835c268bf23fb6222664f2c3cfd0a5695b3ccfdd63471a3da4dceaa18907a26e5724de4834bed138b7a6b3
-EBUILD pykerberos-1.3.1.ebuild 1283 BLAKE2B 19ecf428a0c437ddd2fb5786cc67913c884625be7c9eb220a6a40ec03a503f4cc2dd62e8940a644a99da808512bc1444da38b65bb109bdeeee48601ce689cb90 SHA512 9fa37d66f2c00937a1b23aa675d4faf15c65cb3dbb36e9821965140f65d257bc8d0ad866d1333050f6f9bba8712d301471046765da61dcadaa1e0bf43e696d8b
+EBUILD pykerberos-1.3.1-r1.ebuild 1340 BLAKE2B 4f96183d3c8180d04b30daf9a213f4f4b23eeebcd0500054a1c97114df282a59a30d9904bdf1b682debbd1e7944e99c79b1b05a8d06e5d2aa3afa4a5d9392f9d SHA512 b55fabd181d3476f2618c040a5b14034f1512398ea1fcc613f8049ce54f02ce6beb5a90cb93a6311209288c5dbd53ec9b448c53c37bd292c1dff74794ceb9d66
 MISC metadata.xml 372 BLAKE2B c666d6e6558e8c2ef8ec75b2125883e113dda896f01a9129c4e1fc0508946ad5a9e94f06cfd9deed11636779f1476c2e652dc445b6d8c3309056f6867d044eff SHA512 3db0bcddfd8d31b06fec3d1e3384b991a1018a5e491a61491aec3c3d3017d56c761f6078d12a533f8ad7c4094896be60e942f8e90409526eab40c1596f0a1aa1
diff --git a/dev-python/pykerberos/pykerberos-1.3.1-r1.ebuild b/dev-python/pykerberos/pykerberos-1.3.1-r1.ebuild
index 85c4d3730dfd..de86c98fefe7 100644
--- a/dev-python/pykerberos/pykerberos-1.3.1-r1.ebuild
+++ b/dev-python/pykerberos/pykerberos-1.3.1-r1.ebuild
@@ -18,7 +18,7 @@ S=${WORKDIR}/ccs-pykerberos-${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ~hppa ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc64 ~riscv x86"
 # test environment is non-trivial to set up, so just use docker
 # (see python_test below)
 # also for alpha/beta Python releases support:
diff --git a/dev-python/pykerberos/pykerberos-1.3.1.ebuild b/dev-python/pykerberos/pykerberos-1.3.1.ebuild
deleted file mode 100644
index 671c5af6453d..000000000000
--- a/dev-python/pykerberos/pykerberos-1.3.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-MY_P=PyKerberos-${PV}
-DESCRIPTION="A high-level Python wrapper for Kerberos/GSSAPI operations"
-HOMEPAGE="
-	https://www.calendarserver.org/PyKerberos.html
-	https://github.com/apple/ccs-pykerberos/
-	https://pypi.org/project/kerberos/"
-SRC_URI="
-	https://github.com/apple/ccs-pykerberos/archive/${MY_P}.tar.gz"
-S=${WORKDIR}/ccs-pykerberos-${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc64 ~riscv x86"
-# test environment is non-trivial to set up, so just use docker
-# (see python_test below)
-# also for alpha/beta Python releases support:
-# https://github.com/apple/ccs-pykerberos/pull/83/commits/5f1130a1305b5f6e7d7d8b41067c4713f0c8950f
-RESTRICT="test"
-
-RDEPEND="app-crypt/mit-krb5"
-DEPEND="${RDEPEND}"
-
-python_test() {
-	set -- docker run \
-		-v "${PWD}:/app" \
-		-w /app \
-		-e PYENV=$("${EPYTHON}" -c 'import sys; print(sys.version.split()[0])') \
-		-e KERBEROS_USERNAME=administrator \
-		-e KERBEROS_PASSWORD=Password01 \
-		-e KERBEROS_REALM=example.com \
-		-e KERBEROS_PORT=80 \
-		ubuntu:16.04 \
-		/bin/bash .travis.sh
-	echo "${@}" >&2
-	"${@}" || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/pylast/Manifest b/dev-python/pylast/Manifest
index a86a5ff8f5a1..14c3df9fe142 100644
--- a/dev-python/pylast/Manifest
+++ b/dev-python/pylast/Manifest
@@ -1,3 +1,5 @@
 DIST pylast-5.0.0.tar.gz 39868 BLAKE2B 0cb6d96ac74a2e62325b8a91cc3601ab4ea7ea629ef40c02ce1afe13fd067abc48f24092138fc4584382c9c7f8c62eb070f1a3173b39768ac4ff8e3904c255d2 SHA512 ebad77e66d39b5625d0afae3bba346769159f39dfbbca0fea6aa0e6ad683fea6ea04093dd4738e378ac419edcc9970e8070d7ff912cc08110a5f41f7993489ce
+DIST pylast-5.1.0.gh.tar.gz 40178 BLAKE2B f290afa72d71cb2f88793aaa31aa059a603375e91b310c3ca9180ed5626c589f3d91ae1961db15e256b01bd019b8e59dd48be45ff96683707c05ee9170dfed84 SHA512 64c71f5365638f3bdb435ac2d7405bd1e7a3ebe95fee97469c64bee63ad9850d45781756ebd59942c70780830fbb0519874908d2894e227acadedb5120c3b9ab
 EBUILD pylast-5.0.0.ebuild 773 BLAKE2B 4689bd56b0a492bbe89a755d170fd26ac093eba8e6188e82ccea5beee9ce01826c1805700d5a1d621d920efb31195c1b0d6ec437a32669da33be7cb736078012 SHA512 289710ed082564ca66a389bb2ecd226172a94b1431e4fd9209759fb58ca2c1032087d45aa1340e975c138254599de524dcf979a714e0a0288a7ae38558f91dfe
+EBUILD pylast-5.1.0.ebuild 776 BLAKE2B ecf5ebd5763f00837b3158438c556ba68f2dcc381347d2c821f72177d77d801a962fc91f4a67ff87be551cf0159a08c5a30cb2501802f86257efad4d8ceb7f0d SHA512 ecfe86f13d7b0ab5902f570d0e3d3f981b8fcb7cf084e6dea4a00e5a04ee91531f8c840f2023910cb70f5ba6c64ffac42dfed1723954d7961441cd4c4d0c9e6b
 MISC metadata.xml 907 BLAKE2B a4a6aee5b2e805d27d001b7c51dfb2a26b935c38380e85027059b02e75057fc02f9ad311fd21326f6f16e7528a15c0577aae31f695f8a74ac42d274c10e7ca17 SHA512 1d0b7327a4e9a24940cff7a27b64bf5a27d5e2a1391d31a99d3473fccd54e534722ba826a64bcfc5f0da7a505241e617d23aa1f7490218f1d39af4cd3aa29357
diff --git a/dev-python/pylast/pylast-5.1.0.ebuild b/dev-python/pylast/pylast-5.1.0.ebuild
new file mode 100644
index 000000000000..07ac0a967207
--- /dev/null
+++ b/dev-python/pylast/pylast-5.1.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python interface to last.fm and other api-compatible websites"
+HOMEPAGE="
+	https://pypi.org/project/pylast/
+	https://github.com/pylast/pylast/
+"
+SRC_URI="
+	https://github.com/pylast/pylast/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	dev-python/httpx[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/hatch-vcs[${PYTHON_USEDEP}]
+	test? (
+		dev-python/flaky[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/pyopencl/Manifest b/dev-python/pyopencl/Manifest
index 0348b4aa534c..a0307f81b645 100644
--- a/dev-python/pyopencl/Manifest
+++ b/dev-python/pyopencl/Manifest
@@ -2,4 +2,4 @@ DIST pyopencl-2022.1.6.tar.gz 455424 BLAKE2B 03c46bebc4d6093489b0a1501267d5d67b7
 DIST pyopencl-2022.2.3.tar.gz 468218 BLAKE2B d747014c4cdb4d4303aa03fa16606f032b193497cf20909fd9e449f3c02e3d61dce55e44e93e769e4ec8f9c5f859c8d0a0f13bca1f1350dd7a29f6d92bcc3429 SHA512 b16feaa6d8a00cebb4f8c87d2aabed3472c45484eb5ecd530cb8e3478cfc9a41386203ab8cac0450b211f3330c36b3c52846e73a31e346784182f2ca9e6f4123
 EBUILD pyopencl-2022.1.6.ebuild 1819 BLAKE2B af8e6793bee7f165fe7d2914351363c8202207d47a353055b320cd58ba0f8f08bf53c457007bf45e2e3bd7b13eb25b8c51e3f8abfa446d3be85a47b472e3aee8 SHA512 d686767bc8ba8b39e82465e2c10379f6f9e2704786a443177278091fe55c93856c126d1729fd92bf8da605942a94bb0b91cd63b215164b1649ad0ffba5281236
 EBUILD pyopencl-2022.2.3.ebuild 1773 BLAKE2B 99a8d3b18daf9a531726e30fd8d21b4bd201356485c4db5c7bd873e60d549bcb1539d14236d5f790581c40f082195577e9c0ad55bee49146d443eb7e0081eb89 SHA512 74134b7f2206b1e8ba38bcf68118e0c796e9ffacce652fd7b0a176425f74329f4c663896489e392eab03233fd4861b4483eb6d26c1a37d60c60586b991ad9325
-MISC metadata.xml 317 BLAKE2B ba532c522d5fd599dfd41180c9813f8124dc64cd3bc7a3a7b1ecdc121b216db4b43f6cae9c32c52a430fbf6e9a22c0cf27ffaf0041ca372d81666991bcf0e979 SHA512 845a8b83a5d7729ea0fca8b704de297b8b8c0d8f315fad0bea7c0c645bc79dd993209e9ca5e89ec9c8ddbe6db2b1f142c3e1f7e5b8e4b6259fe927527ce6a919
+MISC metadata.xml 373 BLAKE2B 0de89cb91a5dba1c34bacf04a95d4e2eb9e903bfb55e291f2ed20d579b9736a9a25f27620eed05d19c903c117e0dfbf410f408e9ff4008ce8c93f7b1b004141e SHA512 4ff5643089e5590d1ae4ef413a1ab0fa2772f71922a9da2c8b43ae375ba2e6e3d95ab90a13d51d22fdea49663c112c36352df609eceebd520fdc06590907b0e7
diff --git a/dev-python/pyopencl/metadata.xml b/dev-python/pyopencl/metadata.xml
index cd62150444f7..e86864baa3fd 100644
--- a/dev-python/pyopencl/metadata.xml
+++ b/dev-python/pyopencl/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="pypi">pyopencl</remote-id>
+		<remote-id type="github">inducer/pyopencl</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pyproj/Manifest b/dev-python/pyproj/Manifest
index 091eadc552f8..a52c73c1bf51 100644
--- a/dev-python/pyproj/Manifest
+++ b/dev-python/pyproj/Manifest
@@ -1,5 +1,6 @@
+AUX pyproj-3.4.0-proj-9.1.patch 1995 BLAKE2B 0ce5cbf73d8d231dc07a0c764787d9aa9da6b15b925d136bc6b9012b6d170fc7d9e13e6f206c22ef826a56ee6a770e0745eb7969207f346a33125569b3a15888 SHA512 09cd051caec9ac5dfdbf181ce626ded3cdaa5e8d643becefba52c43d399739deefda2abb1939fc41042756166475aa35b2aa1d05b8c1df2b1bdf7a43e312fcf2
 DIST pyproj-3.3.1.gh.tar.gz 238373 BLAKE2B 7996d253a35e3d64a343141179a88d2ab97e88f96447f3daf14c9f8d731099b506228c163fe460d3be30ae69c87e908879b3c0fe31eb7624c3bb8da157838337 SHA512 7175479f4ec526ada830d178bea77552d66aace4c7f6cde584aebef5fc4c6b7a46272eea2bd95f71910411c9ac8d8832d350891ffffda8a86eabb5449177a5eb
 DIST pyproj-3.4.0.gh.tar.gz 231365 BLAKE2B a62e02a33424583ffec1e1de603a0162ea187b4eb093be51b957fb720b3625c7e4b65162f1272fb4a057edfd92f8146d74c17f1ad68a3beb0ae199df8641e03b SHA512 d0e9425ea5a10ce1620c2a2b3279be786741e75ad698a2430e38237acb73e2cd7dbd16dbb4cf952f52c38810526f4528c08f9bb0795a34fdab2f39686e6914c9
 EBUILD pyproj-3.3.1.ebuild 917 BLAKE2B a68f8b2ae45515fed681b2e17f510187753e9b34fef78122f1d08ca541e8ec1b9139fffb61a80a97cc3b513a86268336a53046c05768ebd36fb4a14eb497ead0 SHA512 50e98ad158e47af5488161d92c8feb90e2a30888c341df9f2a251407495b702cee5b75c5503f8f9591cf0e495351814e1446115bd6ed1e7ebf53a01ba0de11e4
-EBUILD pyproj-3.4.0.ebuild 947 BLAKE2B 7557c6f8522e525e6eafb9175f8196889b1d560a11f6f7d2be44f061bcb255af62dc772f7c54d920952a4901a990860b0ced10a402b65066b1b7c1832adbc92d SHA512 be28c92f6ac6122bc92eaf65e1bc631eab53a10f1d2f651859511640e4014d32fd3b280845e2ec64357509b9007c7e5eda79b2098bc85f1862d48dcf261f24a1
+EBUILD pyproj-3.4.0.ebuild 995 BLAKE2B e36a786037940f5cc6d9d35d5991eae3f31856757cd1af288253294ff5e5378d9e926e7e0461511f65ca64b7d6936ed958ad9a8ac0cbc57de8a3cd0434980cc9 SHA512 57ff52b4667e8c3051a7706d8bd46ad647b75b7be7235f5d301eedc87c318295b878f2cd8c99012d8dea66c4521ec67ca2b06de0315014f3acd7d311d2a61c30
 MISC metadata.xml 415 BLAKE2B 4f3ab70bc72ca97a428c357257d3a59591b410f12276a42e141cd0a43072b79107529c95c6a313906129e8893c75b63a6ef11ddc2f3842a7f5e5e7f7349ec38e SHA512 7ca8a01534471dff67c42a96c524d166278e26da309b2c4d766045e38086cc0e52ccc990881ebed7ca81219d705d9e4a9c16e86b052a50867bb032457e354903
diff --git a/dev-python/pyproj/files/pyproj-3.4.0-proj-9.1.patch b/dev-python/pyproj/files/pyproj-3.4.0-proj-9.1.patch
new file mode 100644
index 000000000000..a2be9f58850b
--- /dev/null
+++ b/dev-python/pyproj/files/pyproj-3.4.0-proj-9.1.patch
@@ -0,0 +1,54 @@
+https://github.com/pyproj4/pyproj/commit/831209477286f55b6c3ac777e1df3e947cfb12be
+https://github.com/pyproj4/pyproj/commit/2c0abe3d8d2c1632751f093baf421b93f65783a8
+
+From 831209477286f55b6c3ac777e1df3e947cfb12be Mon Sep 17 00:00:00 2001
+From: "Alan D. Snow" <alansnow21@gmail.com>
+Date: Sat, 17 Sep 2022 11:23:10 -0500
+Subject: [PATCH] TST: update test_get_transform_grid_list__contains expectd
+ output (#1147)
+
+--- a/test/test_sync.py
++++ b/test/test_sync.py
+@@ -82,7 +82,7 @@ def test_get_transform_grid_list__contains():
+     source_ids = set()
+     for grid in grids:
+         source_ids.add(grid["properties"]["source_id"])
+-    assert sorted(source_ids) == ["no_kv", "nz_linz"]
++    assert sorted(source_ids) == ["nz_linz"]
+ 
+ 
+ @pytest.mark.network
+
+From 2c0abe3d8d2c1632751f093baf421b93f65783a8 Mon Sep 17 00:00:00 2001
+From: "Alan D. Snow" <alansnow21@gmail.com>
+Date: Sat, 17 Sep 2022 12:06:32 -0500
+Subject: [PATCH] TST: adjust test_transformer_group__get_transform_crs for
+ nl_nsgi_nlgeo2018 and PROJ 9.1 (#1148)
+
+--- a/test/test_transformer.py
++++ b/test/test_transformer.py
+@@ -695,12 +695,19 @@ def get_transformer_group():
+ @pytest.mark.grid
+ def test_transformer_group__get_transform_crs():
+     tg = TransformerGroup("epsg:4258", "epsg:7415")
+-    if not grids_available("nl_nsgi_rdtrans2018.tif"):
+-        assert len(tg.transformers) == 1
+-    elif PROJ_GTE_91:
++    if grids_available(
++        "nl_nsgi_nlgeo2018.tif", "nl_nsgi_rdtrans2018.tif", check_all=True
++    ):
++        if PROJ_GTE_91:
++            assert len(tg.transformers) == 2
++        else:
++            assert len(tg.transformers) == 6
++    elif not PROJ_GTE_91 and grids_available("nl_nsgi_rdtrans2018.tif"):
+         assert len(tg.transformers) == 2
++    elif not PROJ_GTE_91 and grids_available("nl_nsgi_nlgeo2018.tif"):
++        assert len(tg.transformers) == 4
+     else:
+-        assert len(tg.transformers) == 6
++        assert len(tg.transformers) == 1
+ 
+ 
+ def test_transformer__area_of_interest():
+
diff --git a/dev-python/pyproj/pyproj-3.4.0.ebuild b/dev-python/pyproj/pyproj-3.4.0.ebuild
index aa7eb95785a6..70379b19b4dd 100644
--- a/dev-python/pyproj/pyproj-3.4.0.ebuild
+++ b/dev-python/pyproj/pyproj-3.4.0.ebuild
@@ -39,6 +39,10 @@ BDEPEND="
 	)
 "
 
+PATCHES=(
+	"${FILESDIR}"/${P}-proj-9.1.patch
+)
+
 distutils_enable_sphinx docs \
 	dev-python/furo
 distutils_enable_tests pytest
diff --git a/dev-python/pyproject-metadata/Manifest b/dev-python/pyproject-metadata/Manifest
index e08856e9610c..f9cfddaf9f05 100644
--- a/dev-python/pyproject-metadata/Manifest
+++ b/dev-python/pyproject-metadata/Manifest
@@ -2,5 +2,5 @@ AUX pyproject-metadata-0.5.0-no-install-tests.patch 279 BLAKE2B 51598be4b5d055e8
 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
 EBUILD pyproject-metadata-0.5.0.ebuild 664 BLAKE2B 0ad4c61e0a704bbaf6d7d7c5dc178691908223b8329c34fbd4df1693ce4271cc6cd981cdbb862ef09f024639235f0d09a52df09947c75b21068f69607ac2b1da SHA512 666b3d87777b5b4307fc5dc5bc1743b4aa39294a454fea51eaef1d4e3f042d40b4cf1368259a09dff6cbcf189859ed09a208d131c60755d2df50e559fe319de9
-EBUILD pyproject-metadata-0.6.1.ebuild 649 BLAKE2B 6fa1c978e1c9bdea0f3d615d2ab9f5dad4aeac07f01c811c9c823c2347edb536f24becf33719693c61659f7ec96f70a142b45e9977dc92d0b1d435eb341c6180 SHA512 c5c46cdb8bb4ccd114755dc73e23bbf7aff1becc60f05dc6df39bf192e667bee6e782b13adb1ebc96d06c8f521487f8d2d7cb9f6d78f858655a24ad68197bf66
+EBUILD pyproject-metadata-0.6.1.ebuild 647 BLAKE2B 67a3cb9261eacb9bad1c4233f06c50afe762f846045cdd0e1f98627c5856ea123c39f5e32ac0713cabd85e22b0748b16451741de1a24b3840a253bfdbc97305d SHA512 65b8826019eb4f5a8fdbb73ff58027c7e14e521230b3d4476a7c01ecac036fea93cd8f1a2c89c985c8e23fdf150b33e1e888d69b05451c6b03717140c8245f73
 MISC metadata.xml 371 BLAKE2B 9495774fe62ac433fa655bb324c38b18242dfda38e0e331739b6c35b9a64563aa03b95395930ff8c2d20ff16aaaa1513673c27db973e88293fd6c8e09d2ef0e4 SHA512 5c8dec2e04b6f2e7ca0bead64c4987d3226e985085262870c9502b26f76270ffec818cc76271ccfca8c719e991884bc40e5da18d092cad801dffc8ccc5207b59
diff --git a/dev-python/pyproject-metadata/pyproject-metadata-0.6.1.ebuild b/dev-python/pyproject-metadata/pyproject-metadata-0.6.1.ebuild
index 2b29eeae69a2..8f4e508a72c3 100644
--- a/dev-python/pyproject-metadata/pyproject-metadata-0.6.1.ebuild
+++ b/dev-python/pyproject-metadata/pyproject-metadata-0.6.1.ebuild
@@ -21,7 +21,7 @@ S=${WORKDIR}/python-${P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 arm arm64 ppc ppc64 ~riscv ~s390 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~s390 x86"
 
 RDEPEND="
 	dev-python/packaging[${PYTHON_USEDEP}]
diff --git a/dev-python/pyspnego/Manifest b/dev-python/pyspnego/Manifest
index ceb266de0d6a..e1582959b45a 100644
--- a/dev-python/pyspnego/Manifest
+++ b/dev-python/pyspnego/Manifest
@@ -1,3 +1,5 @@
 DIST pyspnego-0.6.0.tar.gz 200621 BLAKE2B cb6b44ccfb87600c480f67ddae686a424ad75a7f16c8f78d3539159c523069b71c534a3dfb8ec06ee26b75261d87d54e8b96aaa2d0f477f2488438075d6212a5 SHA512 65f877a2fcff4671606063223d1499be19368040a0f70d0d9363dd84c0b09a195a5e6bc7da1d3745fbf81af822f20f3d903ca2a9372898a2973ba93b6661a708
+DIST pyspnego-0.6.1.tar.gz 200508 BLAKE2B e284b42da97919a63a5ff51687cdd0d8891492ab2e296686b88242fb4db6326ac56c5b04488e47be04764c75fefdf2a9073cc8983150f6d0e5d4819bd49fa86d SHA512 eab37ad3691da06e91221107483c2ae4504d4e7f3b7d288843387dbe2c8611b3839b6cf378b2418b977f835fc5a4ea4b9a8b9995d9ee07d25069fea05bc4b876
 EBUILD pyspnego-0.6.0.ebuild 959 BLAKE2B 0e327cdd2fb3d9e16f09f374bf0002b3395a009cf558b2935841781f2e778677802acf9d3176345a8b445b2ebd617c4307d72b7f53dcadddb7c01347125718aa SHA512 99ce279a54ff8dc4ff6eaadcf0850de1e91d764d6dcf5da30024168d27fd4dc50db7f70f7e222ba0b56fcd7ae74c7be0ee355dca68975fd42035ab979922ca4b
+EBUILD pyspnego-0.6.1.ebuild 962 BLAKE2B 4485e98511dc8b04baf037b35d29bb09f498161a2ad0754737ae15f7791eac27efae62ed8d1049038726f296c284acfe138b27ad8a24f050acebfdc3c1739170 SHA512 c9f62764d03e6baeb4ed3d01a7f1d816a017cf81f270fa36f4e3b6eb1bbdeee2f9e0f78328f344dbda2a252df979f732b904d060b4805de285607d412f74601a
 MISC metadata.xml 445 BLAKE2B 2d30af32987aa7118331cb4c199b44069f6a6efc62d73eab62a31b29308848b7f7e56e026327af6c2197ee31c05fbe1885524bba7b6a84cdc0d97cc58c5fb43b SHA512 c7bbe6f161ce61409f6865f998fb4c8bd77c39011f5bbd148379912e31805773a41451163517cb7ebef99a57d6abe8f13dcdc568408ce182c0def6adf35afc9c
diff --git a/dev-python/pyspnego/pyspnego-0.6.1.ebuild b/dev-python/pyspnego/pyspnego-0.6.1.ebuild
new file mode 100644
index 000000000000..372520083949
--- /dev/null
+++ b/dev-python/pyspnego/pyspnego-0.6.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Library to handle SPNEGO and CredSSP authentication"
+HOMEPAGE="
+	https://github.com/jborean93/pyspnego/
+	https://pypi.org/project/pyspnego/
+"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	dev-python/cryptography[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	test? (
+		dev-python/gssapi[${PYTHON_USEDEP}]
+		>=dev-python/krb5-0.3.0[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/ruamel-yaml[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+pkg_postinst() {
+	optfeature "Kerberos authentication" "dev-python/gssapi >=dev-python/krb5-0.3.0"
+	optfeature "YAML output support" "dev-python/ruamel-yaml"
+}
diff --git a/dev-python/pytest-env/Manifest b/dev-python/pytest-env/Manifest
index 5c6c694abd73..c6e58da9b364 100644
--- a/dev-python/pytest-env/Manifest
+++ b/dev-python/pytest-env/Manifest
@@ -1,3 +1,5 @@
 DIST pytest-env-0.6.2.tar.gz 1693 BLAKE2B b303b8b2b486cd5f6c6273fefe709e3986183a56b6758b05f8bde973c561ebba9646538d38783749305740d8bd637966966a109fcd600cd6f6ee059449ffb328 SHA512 0b3bb21fc881023c102b584593c6e28840400ce8190810f33f9a421df4141e17dcfad2943c4159aaab82376b7b47b07b45f97c9cb232a7d17c4d35b55966596d
+DIST pytest_env-0.8.1.tar.gz 6926 BLAKE2B 1d993947c5d67a57832e170e2cc2cbe56f5f1eef37d96790ec3965e5d7b9489771d1890ef7c6f4ae504e1d6d22845cf9b1b3fccf3caeacb3e6ff33d5f86b9279 SHA512 0c99db9c5467f5fe6f8655e540fff4b91884cef3553daf455298d2dc7bb51439418f3149b941d37a777199f28d82eccb2073fdd5e09bfb97cdf24d3ddb1d21bc
 EBUILD pytest-env-0.6.2-r1.ebuild 492 BLAKE2B 83b45fa4c8799fe025a6c1fdddee4ce7f695f03fc35e8e8677c9380ab7a56cd4c924aeef79e6d5c5197da8944ce650218b5681996bbe9ea3d274ed615169365d SHA512 4e80b35540a58eb1149a56c4c99f78d3e2eb2d0234b152a0aaf8c9b5feb66e66d8387e3f69a98c205ab2b5567fe9e9e36907c2d2f31e969746b0a0ba72e5f47e
-MISC metadata.xml 407 BLAKE2B 7353d52edf97f5667e7f3119b1896cc04ce6bb5f3e88eaca88091c7c24dc8a077b50c1b03bca5975c82cf70bf19af6e9a94a59043694980796ca8714850aa0dd SHA512 f0d9b4f02428c70f3d55f70d44f02dc198a363cbf7f00f7469af8cfdd729ef7467f115f98d84f038f6c65b58bbcbcaef5fb79b9992494b3ed598b64a94d9dc71
+EBUILD pytest-env-0.8.1.ebuild 598 BLAKE2B cef8adb2f051f0666e4371195df5e96353c5d690ecb1b14ada126bb60ee20c22a14e1a4224760fe874942dda4e62f3670a232278e804e8e59aab64e2d3a43026 SHA512 729cd4ff5721094e6ce69e2f603ce199506d2d693fb182a4e6ccecf786348e203209199af2a861c6b3beaba6f9986a98f7e59c8f98b0e9bd77ca6cec26e89872
+MISC metadata.xml 505 BLAKE2B 00369d63ea894a5d1b493461b41f5a211219dba4aee1e53a5bfcd4e37fb181ebb7f4934e721c186a5d631f3f03a8bbea2b1d732a1206b2347beb71b03f0c84a0 SHA512 78e7bf0e52d709686f0302ee3ffb2d11ff85860586a42aa23e974f60bf675de919d9d78fa0aa80d66b779b1575936686bf2846830ef4bea25e4ed87d2ce05835
diff --git a/dev-python/pytest-env/metadata.xml b/dev-python/pytest-env/metadata.xml
index ccf6121fada8..8995e4d03d6e 100644
--- a/dev-python/pytest-env/metadata.xml
+++ b/dev-python/pytest-env/metadata.xml
@@ -5,9 +5,13 @@
 		<email>marecki@gentoo.org</email>
 		<name>Marek Szuba</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
-		<remote-id type="github">MobileDynasty/pytest-env</remote-id>
+		<remote-id type="github">pytest-dev/pytest-env</remote-id>
 		<remote-id type="pypi">pytest-env</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pytest-env/pytest-env-0.8.1.ebuild b/dev-python/pytest-env/pytest-env-0.8.1.ebuild
new file mode 100644
index 000000000000..2c0cc5da7303
--- /dev/null
+++ b/dev-python/pytest-env/pytest-env-0.8.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{8..11} )
+inherit distutils-r1
+
+DESCRIPTION="py.test plugin that allows you to add environment variables"
+HOMEPAGE="https://github.com/pytest-dev/pytest-env"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P/-/_}.tar.gz"
+S="${WORKDIR}/${P/-/_}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+
+RDEPEND="dev-python/pytest[${PYTHON_USEDEP}]"
+BDEPEND="dev-python/hatch-vcs[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pytest-httpserver/Manifest b/dev-python/pytest-httpserver/Manifest
index b37912f39af7..c8de0ddf3b92 100644
--- a/dev-python/pytest-httpserver/Manifest
+++ b/dev-python/pytest-httpserver/Manifest
@@ -1,5 +1,3 @@
-DIST pytest-httpserver-1.0.5.gh.tar.gz 80395 BLAKE2B 68c075032c57f25854d390f73bf61b7efbe18f78d7f0b2a2a3be10d586ca9cc3ce4a1b390a2ba0da1e88558513782388069c419dae4908a0581e8d583f452bee SHA512 8275475bb044d54769e906571520fafbb9f6fa32fc003f4a00f72b9ff9930e4b80ee84564df1521569cc2a15f5d371c6315129263bc167d0621141004d509a25
 DIST pytest-httpserver-1.0.6.gh.tar.gz 83737 BLAKE2B d0db97227bcb3336a4bd944cf26e2d3e96132baee5991cdff901a1f546174e977b6472458911fc6b92bb13b6d3dae499e0bf3507be265385601e838c4781f0a3 SHA512 5eacfbf159f3a09d73f54da8f3ff885b8d2138e430af27df6039a30e63d7ebcbcf088efe8e7fa56ed50b66ea5b7e3ad7a61c0e8a57d5cb100c2a063df7b6f5c4
-EBUILD pytest-httpserver-1.0.5.ebuild 771 BLAKE2B 28e023ec39114a662c965a349ce49497c3d5728ed7135acdfcfc7ea4374ef273670d83ad46a94e4bb61d70d8eb121d2b8b7b8d3c6486c9e192f87f6d90b29c2e SHA512 d56a4522d74cc97f7521b59fb4e291ff987538582d00c7b96a9d0352416ab6bc483fcfb8552fde5e72542ff70bf97594ca8f46e617c5ee195d6d6c3eace898b3
-EBUILD pytest-httpserver-1.0.6.ebuild 852 BLAKE2B 0320ede25f1055d2d926cd476a686fe7a95a6233c2fd2d2e48f785a0baf207f1e3ef4830f6cf8d3bb04108b4b99ca6529ead99c4e1116693ad57901155a3578b SHA512 8a37a0058c37f1e0d0c05eceb33b78947250e1d8d69a9acaac73fc1e824ed8dce08b7bd3610ae3092eb196bdeb5f7ff62f22ae61e84dc384fd6b3fe0a48bdda0
+EBUILD pytest-httpserver-1.0.6.ebuild 850 BLAKE2B 6c248496d67d534248b60df85ef68e070e6d466d71e358344f276f9dcf76fd07c939596ec8acbfbd4b1c98bd700015f395a51a9b04aced8fab8807b566ba9767 SHA512 8a8ffbe7bd0856ac04b40a4a3f2e0c45738ae262276dd5b040a1ff6cf933234e17cd03aa228c4d203c71a2aa06276ee0854948ef34a06e65770759b2defed90a
 MISC metadata.xml 411 BLAKE2B f74c6327167acc706faa9d9e60e2f964e476f33cf33b525287850dcd46e1fd35d6a770d495c929b36bc288c6e2a08d32077bd5265c522598477bb61c4abdd367 SHA512 a536367a8872d3d722f7671d6824d05d1912e9ba53a25ade91bab5cfa4dca3cb2e3f669c7a70416c68a200f1272c5709509b37133886f0d64816b096918fb4f0
diff --git a/dev-python/pytest-httpserver/pytest-httpserver-1.0.5.ebuild b/dev-python/pytest-httpserver/pytest-httpserver-1.0.5.ebuild
deleted file mode 100644
index 434d89778a4f..000000000000
--- a/dev-python/pytest-httpserver/pytest-httpserver-1.0.5.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{8..11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="HTTP server for pytest to test HTTP clients"
-HOMEPAGE="https://github.com/csernazs/pytest-httpserver"
-SRC_URI="
-	https://github.com/csernazs/pytest-httpserver/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="dev-python/werkzeug[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/requests[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	sed -i -e '/^include = \[/,/\]/d' pyproject.toml || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	epytest -p no:localserver
-}
diff --git a/dev-python/pytest-httpserver/pytest-httpserver-1.0.6.ebuild b/dev-python/pytest-httpserver/pytest-httpserver-1.0.6.ebuild
index 041d42cbc468..379659ceb752 100644
--- a/dev-python/pytest-httpserver/pytest-httpserver-1.0.6.ebuild
+++ b/dev-python/pytest-httpserver/pytest-httpserver-1.0.6.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	dev-python/werkzeug[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-metadata/Manifest b/dev-python/pytest-metadata/Manifest
index 13afbd5e70c6..1cda6dc82987 100644
--- a/dev-python/pytest-metadata/Manifest
+++ b/dev-python/pytest-metadata/Manifest
@@ -1,5 +1,7 @@
 DIST pytest-metadata-2.0.1.gh.tar.gz 19945 BLAKE2B 931ede3b58471e3092eb26af38f380810140539c7c50b5e3e9a63bdddedd9577b1f23aafb24ce80de55078f772b0dae8715368559f79a3f31f33e15870134f45 SHA512 03981b4fbcd812cf5896d6db2b74cbc1e6c84cc13613f916248767cacfc7650580f668a5ea8892be85c87fa08101a8a2f440ee6e0cc1342d4fa9919d41153a6b
 DIST pytest-metadata-2.0.2.gh.tar.gz 19993 BLAKE2B 274ce5532fe96b6e4116d6ed1bf20911342f8b239b00a9b6cc1b553ad2819a619691e34bd93ef82676ffdcd4ba32adebba481c65168ce76eef2099eb7295d65d SHA512 b35c0b1a357a246aa12b65dd67b48b6c4201d75d4a23db9026659407583e97517971ba6af1054cff7812f2c6ae54019b26d1108664d632a45c0514a716b321b2
+DIST pytest-metadata-2.0.3.gh.tar.gz 20078 BLAKE2B 269f8b10aad3dda94ea3f1e2655d6e0be371211138774e8662395197f483917ec8098c3acb2b792f4dfe08d7ada21fd062754dbd2be49cfadb50823a32858e09 SHA512 423b61ffd038fe94b7d09a7e2cf2ef71782c8b41504831e0f9479b3423bdd24da730464ba5e90ea1c4dda32a9f2ad935448caf48427f08f7e93c9021f1e73625
 EBUILD pytest-metadata-2.0.1.ebuild 740 BLAKE2B ff12af000c7ee94f06b187a64b6174955b875eda17c5828997ad5705c93bb67bb5ecb4279dd0944ae7514ef528dd6a2857a5c6ac1c34e92616238bef15e08192 SHA512 a3ed0507ff666e97be6547d53b7d6d19f4c1657223a3de1ca120a068b9ab9477d29b670f6ff65c283e1928771949c0ab5860642716dc0e6a767fa3fe2127b26f
 EBUILD pytest-metadata-2.0.2.ebuild 740 BLAKE2B 1866863702a685214239761a41f942c183dcabc8005393d24b1ea579e6a0f2a166ccaf0415e3acc76a1e0c78e82a850ed24601fbddf1a9d6b484fdb4d43956ff SHA512 52b7c96b0786d0a7115e0feb5f8bdc1ced78e663de01cdb2bd5aab8eda8b17c21c5455895b40b22c7021eec0924c952d1ff121b229cf97da423171fa40b43e94
+EBUILD pytest-metadata-2.0.3.ebuild 786 BLAKE2B f7687b0e20151e2ed9c2f0be6f55449b93e3487b3202360c9b925f69e7dfa370b505d38062f5a7583f359e4cec7e6746febcda02fb31f25936b9a08e04c1798e SHA512 138ac38976762b11739a0a88e1c73039d60260067360754fe79b6e62b2fce5c56b051399173e9c9ef298cb12e7a97c95128f0a5f178aca9cee0ed7a9ccabcd42
 MISC metadata.xml 385 BLAKE2B a888886c89fe52cd8e209fc9638fc3cdbf9b7dde0114c46d57b4f9b91f1ef49ebdb3f967e913036109054547d3840c8bd5ca24e5b80ac541889c48ef63748233 SHA512 20094512c77c3ea6f5501aaff0fc9b6ef07aa0580c555e3da5d6ad25e1ecf2f9f42443b7a43256f3fb99aab029a83a2d2696e9a0c8b2ce81e95ef15ab0c33b23
diff --git a/dev-python/pytest-metadata/pytest-metadata-2.0.3.ebuild b/dev-python/pytest-metadata/pytest-metadata-2.0.3.ebuild
new file mode 100644
index 000000000000..9d0247fc2385
--- /dev/null
+++ b/dev-python/pytest-metadata/pytest-metadata-2.0.3.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A plugin for pytest that provides access to test session metadata"
+HOMEPAGE="
+	https://github.com/pytest-dev/pytest-metadata/
+	https://pypi.org/project/pytest-metadata/
+"
+SRC_URI="
+	https://github.com/pytest-dev/pytest-metadata/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+
+RDEPEND="
+	<dev-python/pytest-8[${PYTHON_USEDEP}]
+	>=dev-python/pytest-7.1.1[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/setuptools_scm-6.2.3[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/pytest-qt/Manifest b/dev-python/pytest-qt/Manifest
index f76b85617927..43523771667c 100644
--- a/dev-python/pytest-qt/Manifest
+++ b/dev-python/pytest-qt/Manifest
@@ -1,3 +1,5 @@
 DIST pytest-qt-4.1.0.tar.gz 119702 BLAKE2B 7c906c94761df6472ae65a6ebb38dff07de8156730e3e10615ea8e08f0bd9f9fee07127ee6e8616055117b1db1911bc9b4486345d84b249664d317561195ad77 SHA512 bfb56abbaac47bf9da26eb19d6913d59872f2a9923da339e9a30a2145d0a094ddec36bcfa21d39c4cf318f95a83c72c249fe70034294a6791f9d84345f77451d
+DIST pytest-qt-4.2.0.tar.gz 120749 BLAKE2B 1986bbf4ebc578ad548d2fcc8888b0d0fb42f75ad8a03f315f51c04ae466587d3299fca8ec3a49bc5d023fc8ca76cbe6c45728bc88609e20d6f68ea8c6ea204e SHA512 57e175bada0e33101eeb7d85579f6e804658d74168714b117b3a1ba564826405e70860b258caf28c917ddca7acd1842de2133a55b342862762fc37ca1a758b69
 EBUILD pytest-qt-4.1.0.ebuild 1693 BLAKE2B 33e32b2abcf8bc6cc3bf74dad84f5fef6644e66e8a8a7fe24a27b4c28c371aa35c410c2ac712dd0cc5722c504bdc323100c67b2e687f2726791712e23cdb7f53 SHA512 7003c9b7b2cdc7d0e91db559e55413361bae52046613c60004656860b229dbe18ce1118f9f305769444cb3609207da2f21c44088231cd9335559a0753c960a2d
+EBUILD pytest-qt-4.2.0.ebuild 1695 BLAKE2B 11efdcf4e0ce3ef578e9a803476c0928f94ed3a8fe41caba28c6263c3d1996896370002347b8c9b7dc109faa26986971e0950e705394a02b222c7ce1306ccbd6 SHA512 238e661ac00081736d35fa3284f83f7e57d72e21c5ba34a91ccb171de511cee4c566dc197a397e8e44471fe1c4f9d34f53911754ecdf41c52ea591e18e4bda82
 MISC metadata.xml 516 BLAKE2B be5241e39f672681b27a003d02eca0e047644cad7da57de6b3393f58760c094c1661b9d168e44bea4efd56b38225d49abd5be6e71031a0d854b878716286d3ed SHA512 77981d63d3214fd2c052f8a7eac1a439899318973807299237a9105730893ce01d4423b060f532bd4f4496418683fc5128508c7d8747ba6ee6ed0eae67e5569f
diff --git a/dev-python/pytest-qt/pytest-qt-4.2.0.ebuild b/dev-python/pytest-qt/pytest-qt-4.2.0.ebuild
new file mode 100644
index 000000000000..69dbc6a6d79f
--- /dev/null
+++ b/dev-python/pytest-qt/pytest-qt-4.2.0.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+PYSIDE2_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Pytest plugin for PyQt5 and PySide2 applications"
+HOMEPAGE="
+	https://pypi.org/project/pytest-qt/
+	https://github.com/pytest-dev/pytest-qt/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/QtPy[gui,testlib,widgets(+),${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/PyQt5[gui,testlib,widgets,${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/pyside2[gui,testlib,widgets,${PYTHON_USEDEP}]
+		' "${PYSIDE2_COMPAT[@]}")
+	)
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	# warnings from other plugins cause the test output matchers to fail
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=pytestqt.plugin
+
+	local EPYTEST_DESELECT=(
+		# requires the window to be activated; that doesn't seem
+		# to be possible inside Xvfb
+		"tests/test_basics.py::test_wait_window[waitActive-True]"
+
+		# we are forcing a specific module via envvar, effectively
+		# overriding the config
+		tests/test_basics.py::test_qt_api_ini_config
+		tests/test_basics.py::test_qt_api_ini_config_with_envvar
+	)
+
+	einfo "Testing with PyQt5"
+	PYTEST_QT_API="pyqt5" epytest || die
+	# Pyside2 is not compatible with python3.11
+	if has "${EPYTHON}" "${PYSIDE2_COMPAT[@]/_/.}"; then
+		einfo "Testing with PySide2"
+		PYTEST_QT_API="pyside2" epytest || die
+	fi
+}
diff --git a/dev-python/pytest-xdist/Manifest b/dev-python/pytest-xdist/Manifest
index a7b48e9a344c..2f4217714501 100644
--- a/dev-python/pytest-xdist/Manifest
+++ b/dev-python/pytest-xdist/Manifest
@@ -1,3 +1,5 @@
 DIST pytest-xdist-2.5.0.tar.gz 72455 BLAKE2B 4d7427e8a7d85d7b0dcae2697fae0f51913a3a2414fabbb192a8e3938431f5f121677dd43adecfb1fc7f3dd6feb94901e28b0a96787a2c2eadc1504aac55068f SHA512 22da4db7cdd6173fb8377b6adc30b5617ccb0bb308cb5d30980484dd7ddff87cf2a485ae8522c7957d8954dd2f8a5542b9f63b0fa7184cc44e50dbafc3f4e909
+DIST pytest-xdist-3.0.2.tar.gz 69590 BLAKE2B b7e471e1888f78e1c91a867cd1d06f373c255018f63daab4af30fe47df816721954f484006b59bb38d58f9525712a5bc7bb6f00d190bee3580b82baf9b2cb55d SHA512 8b03dd156b7ef82b3b0c78f8aeb83410ce3014e3764aeca4161d57fe2ad557f0316ca86dbf06ac79ddc677df3dc838161fe427b0d1d9ba9446612360eb99fbf2
 EBUILD pytest-xdist-2.5.0-r1.ebuild 1123 BLAKE2B 79d4a01654de1c96d9f12581b221e68b519e1e860858e9d836e2d636b6b93635f8b24f3ff8fb26034a55d6dfc799391a508e90dfeb2e420bbbc7f652de6f2ff7 SHA512 7a92a6e4eb4399a4837ca7453d8a4c9c56a9a05863c01bbce39e632b11d2e66ccec6f650a4c86df96a22b6a4bac52185f3bd93ce4e94261c2291cc9b10e001f5
+EBUILD pytest-xdist-3.0.2.ebuild 1131 BLAKE2B c7d846c8e378993ae77dd0f67264658ce09f748ae45eb0504afca76b0ef9bb4e91760ec4dd7c57ae4e55828b6e72941ac56ccd620a9528c115f4bc39bc7e81e8 SHA512 53dfa89a39676e42a3db1cdf785e45dba00cf8bd842f09a65fb67e8ed2f19e6bbb42061eaed90efe9ca49ff2e5da65a289e19f5fa427e4894b7c33cb147684c1
 MISC metadata.xml 403 BLAKE2B 0aef0787ad01d8e5e5a0588b95740ca54527c1f425d17cc6655308ca478597ebdbfc35165e88864163929104aba9820848b63c17c3d77b238c4f0e17d9b98261 SHA512 c12b3e2a13b6497f748b373753410df996955ddcb9631b310104f2ae31a1427d983462c242692c1b6f9a9b9cd36b7f4aaef58e408543572c040e3dbeb38848fe
diff --git a/dev-python/pytest-xdist/pytest-xdist-3.0.2.ebuild b/dev-python/pytest-xdist/pytest-xdist-3.0.2.ebuild
new file mode 100644
index 000000000000..1079a190886e
--- /dev/null
+++ b/dev-python/pytest-xdist/pytest-xdist-3.0.2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Distributed testing and loop-on-failing modes"
+HOMEPAGE="
+	https://pypi.org/project/pytest-xdist/
+	https://github.com/pytest-dev/pytest-xdist/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	dev-python/execnet[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	>=dev-python/pytest-6.2.0[${PYTHON_USEDEP}]
+	dev-python/pytest-forked[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/filelock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	# disable autoloading plugins in nested pytest calls
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	# since we disabled autoloading, force loading necessary plugins
+	local -x PYTEST_PLUGINS=xdist.plugin,xdist.looponfail,pytest_forked
+
+	epytest
+}
diff --git a/dev-python/python-cstruct/Manifest b/dev-python/python-cstruct/Manifest
index 6703a3b00091..8f367d691186 100644
--- a/dev-python/python-cstruct/Manifest
+++ b/dev-python/python-cstruct/Manifest
@@ -1,7 +1,9 @@
 DIST python-cstruct-3.0.gh.tar.gz 25950 BLAKE2B 7ea8c77ed87e4fb740c3f7a4ed53a7532ee5aca15ee46fbb40da7308ae62ceacd7ccc67a958e6355904604ae67c9594acc9cae5d18bfed0558b91f7e9c8ad0a9 SHA512 dd1c85363512edc4df0379dec40e7d7fe3ceff1cc4014eae8dab0e91c47ea9c3619211e1a637aeec134ce713d0681688630b7fde97f02c6bcd7103a32f258a73
 DIST python-cstruct-3.1.gh.tar.gz 26633 BLAKE2B 449510cc8cc6661270d2618cd347eea2044eacc8f665ed2f55bc6fcd95bcf79f29f8bce6498d372d8b5b78f854edb06afb89a3f3ef7f5de37582ebf68d178db1 SHA512 00e2165c14dcc4461600a8eeef5c71bcaa6e59955c23d08055aff2186b16f20d6c10fdb1a02f6e263e27070fda562c712df0c4ad2440a25dc5f23afaa9c88719
 DIST python-cstruct-3.2.gh.tar.gz 26876 BLAKE2B 084c4e3e1e5a48ee15c40e25a846b09dc1af1fe0ef9734bddad14ebac91e2bbdf78cffc39dd861f35d7ed307f1dfb14cb7b15dd47b900d3c943bf3245adb9ff3 SHA512 8b912bba7a31a8cacd77e07008ea1a0603c59c49e2cbb4a8fee158948b05166f2223c983f58c104d73c0fd868bfaebc9f38669277f27282486cfb064d9026ab5
+DIST python-cstruct-3.3.gh.tar.gz 27470 BLAKE2B 0403af7085622e26d5faf973bbfd0c7e35f5c51f0597abf079080800055058809a07a795bde37b796809ef13b6e1d030f36a42e45a7f4643202e37fe79df4730 SHA512 fd5d7d42f5458d37a44d5e792b56e5c4f3338ed656b248ec5f4f48e4ecb5b6be7e3561c697d67ce0c6a18fbef62ba4945e287754cb2d6a97fefd65c563d65774
 EBUILD python-cstruct-3.0.ebuild 636 BLAKE2B 7a4e7e53b2959d84b7fa9405c8cd6a0bd00d8a1b3823b31a220902d8b44107c0d0ec0f42e4e3d9871867dd56a5a50f0ca7f788f9ad4b14a3a0f813eb617d5345 SHA512 9d8bdec9c0059c57a53bac9ea3d2b45c4602b3460c1dd9ae2782153972ce3dbc429669d62577572961893ab7e304faa457e5b728dd26c3c0ab84a236e1c7dbec
 EBUILD python-cstruct-3.1.ebuild 636 BLAKE2B 7a4e7e53b2959d84b7fa9405c8cd6a0bd00d8a1b3823b31a220902d8b44107c0d0ec0f42e4e3d9871867dd56a5a50f0ca7f788f9ad4b14a3a0f813eb617d5345 SHA512 9d8bdec9c0059c57a53bac9ea3d2b45c4602b3460c1dd9ae2782153972ce3dbc429669d62577572961893ab7e304faa457e5b728dd26c3c0ab84a236e1c7dbec
 EBUILD python-cstruct-3.2.ebuild 636 BLAKE2B 7a4e7e53b2959d84b7fa9405c8cd6a0bd00d8a1b3823b31a220902d8b44107c0d0ec0f42e4e3d9871867dd56a5a50f0ca7f788f9ad4b14a3a0f813eb617d5345 SHA512 9d8bdec9c0059c57a53bac9ea3d2b45c4602b3460c1dd9ae2782153972ce3dbc429669d62577572961893ab7e304faa457e5b728dd26c3c0ab84a236e1c7dbec
+EBUILD python-cstruct-3.3.ebuild 636 BLAKE2B 7a4e7e53b2959d84b7fa9405c8cd6a0bd00d8a1b3823b31a220902d8b44107c0d0ec0f42e4e3d9871867dd56a5a50f0ca7f788f9ad4b14a3a0f813eb617d5345 SHA512 9d8bdec9c0059c57a53bac9ea3d2b45c4602b3460c1dd9ae2782153972ce3dbc429669d62577572961893ab7e304faa457e5b728dd26c3c0ab84a236e1c7dbec
 MISC metadata.xml 454 BLAKE2B 5138bc275b0b9e18cab52fb309283c6b6dab8be5dcc3c86dd6526f350b216c68bc94dd2aabc7a33a4879c23165924563396c6d5991f5c702a12e184067d25cdb SHA512 bb259a25444029d8ea63577f0576ab283282298d27987e276bf4eb6d4ef00853ed019ad199830e9bb4e738f9a151feb55d53e76917508f1033c2b3ecd246276f
diff --git a/dev-python/python-cstruct/python-cstruct-3.3.ebuild b/dev-python/python-cstruct/python-cstruct-3.3.ebuild
new file mode 100644
index 000000000000..7b8d01c50942
--- /dev/null
+++ b/dev-python/python-cstruct/python-cstruct-3.3.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+inherit distutils-r1
+
+DESCRIPTION="C-style structs for Python"
+HOMEPAGE="https://github.com/andreax79/python-cstruct
+	https://pypi.org/project/cstruct/"
+SRC_URI="
+	https://github.com/andreax79/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DOCS=( README.md )
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	distutils-r1_src_prepare
+
+	sed -e "/find_packages(/s@exclude=\[@&'tests', @" -i setup.py || die
+}
diff --git a/dev-python/python-docs/Manifest b/dev-python/python-docs/Manifest
index 764f42e586e4..037b626ae689 100644
--- a/dev-python/python-docs/Manifest
+++ b/dev-python/python-docs/Manifest
@@ -2,6 +2,7 @@ DIST python-2.7.18-docs-html.tar.bz2 4634932 BLAKE2B c48e2dede15d8186231acf65709
 DIST python-3.10.4-docs-html.tar.bz2 7267784 BLAKE2B 15ee98d9b4cd2b31e796dd53f38c127c54a0e76573bac1a1448fc0cd6774ee22d55480654b8933483e1bdbe0a283265b570aa6d8dc5c29d1559889d30adf5620 SHA512 765664aa3e292e63b8935492ff71ab1bb523e1390fc22d88cdde0be99eabc263bc1d8c1f12c58c448413dc8f5c60d61e6f7ef667e8078245b57149f8061260a3
 DIST python-3.10.7-docs-html.tar.bz2 7347443 BLAKE2B fbd2ddca4469fef92af35add0418c313a1148e5d312cb43995f8856562d4b7faafd9da69f4534aa0f92bcc7c49aaec6b965b838098787c25ba10f98b92c4a360 SHA512 cb976e67866e45ca531428e2969bd707bbcddb5928f9f15b40c9ebdb8b4968019b5d95e4da9eb5409d5d7d3c32a63d93761a8b6fbeda49dc0b980189752542cf
 DIST python-3.10.8-docs-html.tar.bz2 7362386 BLAKE2B 7d6b17f1aab2e39c21a0ce7efdcabf3dd1a561c4d1770f57b21d55bfed10cd0ebc68694ea9c14a33b3faa079c4633e79cd202d19f1860f33628b619eed3febe2 SHA512 20640ddad52fa18704942cef8469d750ef60f830d8380c39943af13705b99fc697629c8ee6a12d827bc8b9758a30773811fb0e37dd960e7a81f118cd3e8d4f02
+DIST python-3.11.0-docs-html.tar.bz2 7663300 BLAKE2B 5a0ba8d6691c96f5878f4f03238aaed09e9cf884a2f0aab65a70d5adec160318e3ff1ed89644ff9a6918d543ea310d88d7304dbca51ccb033d83f05c875a47c1 SHA512 0077e43f792925b8a01411243acd7862e1292e8740b4ae7ed734bd6f5d574120886e9ba37da28c057182a4504e5b4f53022818b80ecaefd2c4dfa7d8e5e446dd
 DIST python-3.8.13-docs-html.tar.bz2 6698035 BLAKE2B 4c26c4bca374a24c33cf67c8bce3b4443e5640be278b46cd9da2eaa8eb44ecb6fe796d1a546ed71412f203c71a43f241c4e9ea1d700758ac59e18ad71a82e8d2 SHA512 244a9236762523f9c9784d00892254c0a8ae824536a649d858a68babac664b6f840bddf3ea41cb55a4f2c00f38180a72060cf5811f01a91f342ef5c41ccbc6b3
 DIST python-3.8.14-docs-html.tar.bz2 6693920 BLAKE2B 985a260298c6352d17f921a0f0be4d432a5e845558cfec4c3798d820f0b354008f21276fca4fc0ad360d44e479e74fd245c2a824cbf6b9789c6d5b2408bb5c07 SHA512 a294dc94aea8776f183db1d2420bbe50cf1d1ae22f776015ad8e7fb1eac0f7d152fec5e5ea883a1607041e2798d99b512c820235c0f124bd5d2c2c25a92008f9
 DIST python-3.8.15-docs-html.tar.bz2 6695025 BLAKE2B 614bd68c7038887e4d8f1758b7396e11683121fa22b8b3335dc9425fb6991e398ee64cf07ed4ca0d7273dc4943e7c9fcefe36cf4dcb51dcaa439219011bbe4e1 SHA512 c05cdf16c59ef213872b08bd54d0ddcef5f11bd80cfa78be21c9e57828bd0c7a63b553f525b6e68c578d6098c427e84f5f609680a74421c6a9baa58186b46c34
@@ -12,6 +13,7 @@ EBUILD python-docs-2.7.18.ebuild 627 BLAKE2B 2146c6b420275e346d9b84a96d3318088c4
 EBUILD python-docs-3.10.4.ebuild 627 BLAKE2B 0280b92081a27130dc59996a404aa0a3e7a7457f4b0602460a5974b5b27b81b63f051fb230f92c24b49aa74c94b9f94508e2a4b2e99e7d9306b96cb40757583c SHA512 d29fbbc395ad6061d58ea1b4e5382e1050ab0b2573718bb87762addb6c4c623c4b4933c6b8894cd98d875f1404aef18c54e0645f9cb4cfff2de63a8dcef44c11
 EBUILD python-docs-3.10.7.ebuild 633 BLAKE2B 0e7da774e53563b6caf0d9799cc805374bb698da38b823b83be6cc5ec15991a39ce4ec6d06711ff8d25f997aca924a32d9fbad6b863b51ded72b30e9c24a7624 SHA512 42a621737a2351f2c7b186d1a08056a601e41a4defa2a792f7fe11774b3f1f45fe86a99dae3debcee2ba3cdbd091e0a39bf093c8ce913148ea517d6f1e8dc39b
 EBUILD python-docs-3.10.8.ebuild 627 BLAKE2B 0280b92081a27130dc59996a404aa0a3e7a7457f4b0602460a5974b5b27b81b63f051fb230f92c24b49aa74c94b9f94508e2a4b2e99e7d9306b96cb40757583c SHA512 d29fbbc395ad6061d58ea1b4e5382e1050ab0b2573718bb87762addb6c4c623c4b4933c6b8894cd98d875f1404aef18c54e0645f9cb4cfff2de63a8dcef44c11
+EBUILD python-docs-3.11.0.ebuild 635 BLAKE2B d39c4e43cbdc4c940acc9674bbf4a8fc6401f2798a526303f3259470e5b47a65fb0e397a794b561f1e529d50ac7a6ee790b199f961d16c59338e4800abdad5d5 SHA512 2519f14e72ce7a82bfe977bb01a85a62522fbc6075ac28165e365063b7012dc002a071adac590c2c436f3814af645b73fa195ab90aa188de5bec914f3feb1fa0
 EBUILD python-docs-3.8.13.ebuild 627 BLAKE2B 0280b92081a27130dc59996a404aa0a3e7a7457f4b0602460a5974b5b27b81b63f051fb230f92c24b49aa74c94b9f94508e2a4b2e99e7d9306b96cb40757583c SHA512 d29fbbc395ad6061d58ea1b4e5382e1050ab0b2573718bb87762addb6c4c623c4b4933c6b8894cd98d875f1404aef18c54e0645f9cb4cfff2de63a8dcef44c11
 EBUILD python-docs-3.8.14.ebuild 631 BLAKE2B eafda8f7f6ef13d10f2566e8507b0c7699bf61b61d73bd1ea8440e21601bcc8c84652108ac0d6c2c356c6c268e8fcf032a26176dfd8ac83064a0166ae99cbd09 SHA512 ace3e35c8374954638e177ba6ef3064f1c1d4eb34df4fe15f6a9fa73d37ea9f46885f43f8d9e01bca9e0632c34a680be75afa427a16be62face825d23fdfaa7f
 EBUILD python-docs-3.8.15.ebuild 627 BLAKE2B 0280b92081a27130dc59996a404aa0a3e7a7457f4b0602460a5974b5b27b81b63f051fb230f92c24b49aa74c94b9f94508e2a4b2e99e7d9306b96cb40757583c SHA512 d29fbbc395ad6061d58ea1b4e5382e1050ab0b2573718bb87762addb6c4c623c4b4933c6b8894cd98d875f1404aef18c54e0645f9cb4cfff2de63a8dcef44c11
diff --git a/dev-python/python-docs/python-docs-3.11.0.ebuild b/dev-python/python-docs/python-docs-3.11.0.ebuild
new file mode 100644
index 000000000000..db7df46c6ffb
--- /dev/null
+++ b/dev-python/python-docs/python-docs-3.11.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="HTML documentation for Python"
+HOMEPAGE="https://www.python.org/doc/"
+SRC_URI="https://www.python.org/ftp/python/doc/${PV}/python-${PV}-docs-html.tar.bz2"
+S="${WORKDIR}/python-${PV}-docs-html"
+
+LICENSE="PSF-2"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+src_install() {
+	rm -r _sources || die
+	docinto html
+	dodoc -r .
+
+	newenvd - 60python-docs-${SLOT} <<-EOF
+		PYTHONDOCS_${SLOT//./_}="${EPREFIX}/usr/share/doc/${PF}/html/library"
+	EOF
+}
diff --git a/dev-python/python-ldap/Manifest b/dev-python/python-ldap/Manifest
index 06939c1b96e7..2272a44de791 100644
--- a/dev-python/python-ldap/Manifest
+++ b/dev-python/python-ldap/Manifest
@@ -1,6 +1,4 @@
-DIST python-ldap-3.4.2.gh.tar.gz 377981 BLAKE2B 6efa768dd035f8867abacfd9cc1b9ceca1a468c79550d2529130bd8eaf7546e4474d5798cf9090a9a74f05286ca30a33b8e54821292b8aa2e27358f93d72cb7b SHA512 3a68dd2c160d7d74061d9c9eb060be6faeec1f607f3853722f969d7d1dc76c7da160aa20a4c139feb4d2eba6dbf2e2cfb02551cabd6fbf413654f32f73e94c15
 DIST python-ldap-3.4.3.gh.tar.gz 378215 BLAKE2B d5c165e668ed8bf1415e06e28e306bb757dea71ee7cc1ad380c35a5d911767fd08e249577aef0e5e888c1e9129072f93f499560e8b70e6848fbad4d7f9bb95a6 SHA512 a52403b7d9fc4d114b995640ff34f5aefd313d36cea5ff6de73ea9f46036694ebd43cd9d11382daf3be9da887f62c6675b49d684c05a7d5f0c93d446b16d1981
-EBUILD python-ldap-3.4.2.ebuild 1704 BLAKE2B 49a15455aa8afe1b2b4e9cf3c97212dd0d9364b4fd6f27bdecec856dc8cdcb502914db1b43acc195a6abac64e105097956571492dce7c040b7da1369b5811ad3 SHA512 d611b9039ac4bffb96e93c08ccf0653ac390c7498745466139b42507953b1c3e68ea681f889c85dd6a907a7ac49f0f5aa947477b0ba7e7ee77524bbe20af58f4
-EBUILD python-ldap-3.4.3.ebuild 1706 BLAKE2B 62c86ba817465066b12235eeebd56652bc078d29e8931d40c5d072ca371cbda6597d4740ff6e98735ef1a2f4980fabd2bf0184f1eff7749d1f91e31cc40505f3 SHA512 145b075e26130e6b7951ea8fc379f40de66abfc7d2069205979ef35c4720adb84dd1ede971acb8fccf4aaae9c2dc32f3b76847a1c7ba74df8feaf2a6be39682d
+EBUILD python-ldap-3.4.3.ebuild 1704 BLAKE2B 49a15455aa8afe1b2b4e9cf3c97212dd0d9364b4fd6f27bdecec856dc8cdcb502914db1b43acc195a6abac64e105097956571492dce7c040b7da1369b5811ad3 SHA512 d611b9039ac4bffb96e93c08ccf0653ac390c7498745466139b42507953b1c3e68ea681f889c85dd6a907a7ac49f0f5aa947477b0ba7e7ee77524bbe20af58f4
 EBUILD python-ldap-9999.ebuild 2000 BLAKE2B 1340f010714318a6a8e90ffa228a3c0799909ee1f70af5ec5cbd73449d6982a18df35353a3d356d559a89c43be1c44f097698236a6118ad66fac5630a75d57c8 SHA512 c58a4c82d5e18bb29b62024a826b063f0f47ee3f9e4a798251175b4115a31f5a5803962ec597c12d8855faba83c259f559083a6499524f41197d2ecfd0d3a9fb
 MISC metadata.xml 449 BLAKE2B 14ffa18ca09eb663d3ef4ff5bd0ebc8511fa408a4e96c93885ba2beaccdf3bb82a9733a01149e088c8b66d6cb938f94fc3940c0c0cca5685599191e772443cb6 SHA512 2f5c014e55f838b84abf6ba630b000620a01e2fca6d1f1bd1b30db309f820df50c2ef7feddc17c69ee0188c3cbc91a388933b4bccfc8d2ea0cb18c6dae85cda6
diff --git a/dev-python/python-ldap/python-ldap-3.4.2.ebuild b/dev-python/python-ldap/python-ldap-3.4.2.ebuild
deleted file mode 100644
index 11a39e58e3e2..000000000000
--- a/dev-python/python-ldap/python-ldap-3.4.2.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Various LDAP-related Python modules"
-HOMEPAGE="
-	https://www.python-ldap.org/en/latest/
-	https://pypi.org/project/python-ldap/
-	https://github.com/python-ldap/python-ldap/
-"
-SRC_URI="
-	https://github.com/python-ldap/python-ldap/archive/${P}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S=${WORKDIR}/${PN}-${P}
-
-LICENSE="MIT PSF-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv sparc x86 ~x86-solaris"
-IUSE="examples sasl ssl"
-
-RDEPEND="
-	>=dev-python/pyasn1-0.3.7[${PYTHON_USEDEP}]
-	>=dev-python/pyasn1-modules-0.1.5[${PYTHON_USEDEP}]
-	net-nds/openldap:=[sasl?,ssl?]
-"
-# We do not link against cyrus-sasl but we use some
-# of its headers during the build.
-DEPEND="
-	net-nds/openldap:=[sasl?,ssl?]
-	sasl? ( >=dev-libs/cyrus-sasl-2.1 )
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx Doc
-
-python_prepare_all() {
-	if ! use sasl; then
-		sed -i 's/HAVE_SASL//g' setup.cfg || die
-	fi
-	if ! use ssl; then
-		sed -i 's/HAVE_TLS//g' setup.cfg || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# Run all tests which don't require slapd
-	local EPYTEST_IGNORE=(
-		t_bind.py
-		t_cext.py
-		t_edit.py
-		t_ldapobject.py
-		t_ldap_options.py
-		t_ldap_sasl.py
-		t_ldap_schema_subentry.py
-		t_ldap_syncrepl.py
-		t_slapdobject.py
-	)
-	pushd Tests >/dev/null || die
-	epytest
-	popd > /dev/null || die
-}
-
-python_install_all() {
-	if use examples; then
-		docinto examples
-		dodoc -r Demo/.
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/python-ldap/python-ldap-3.4.3.ebuild b/dev-python/python-ldap/python-ldap-3.4.3.ebuild
index f4f3f6014077..11a39e58e3e2 100644
--- a/dev-python/python-ldap/python-ldap-3.4.3.ebuild
+++ b/dev-python/python-ldap/python-ldap-3.4.3.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${PN}-${P}
 
 LICENSE="MIT PSF-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv sparc ~x86 ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv sparc x86 ~x86-solaris"
 IUSE="examples sasl ssl"
 
 RDEPEND="
diff --git a/dev-python/python-nbxmpp/Manifest b/dev-python/python-nbxmpp/Manifest
index 9e5f7724c045..d95b32def16a 100644
--- a/dev-python/python-nbxmpp/Manifest
+++ b/dev-python/python-nbxmpp/Manifest
@@ -1,11 +1,5 @@
-DIST python-nbxmpp-3.2.1.tar.bz2 129362 BLAKE2B bbbeb5751fc5751cffe73c9a54c3330de9a1b48041c7a7964cefdfedbf8ae2966c8f5adaa7153386eebea44568af38ec1964d612b8baf48d6f318c83705e18d8 SHA512 3ebe1169475fcd65875cb2e6079f802a7f98717957e26e7dfcab5a71b1f94e967145a430f6d959a01b39842317d858c3b6275bcd909bf65f70699536e298b6e4
-DIST python-nbxmpp-3.2.2.tar.bz2 131769 BLAKE2B 51e6d090ad1461dfdb2d0f863ac31e72b1abe2e7ad273eed5105eb55cc11a0ce6ec989241d8d928400e55e7c61a720925104f92e32110e2124e63f396b68029f SHA512 bdbcdb3978c57ef6b62c9e0da57e624ab92f1d10521f5d8b096a1b654bfa0e0026eddd6814c037bf7342e2933eb76c1c67d8f7e309e3c770bd606153f09c8ebe
-DIST python-nbxmpp-3.2.3.tar.bz2 131789 BLAKE2B 7cdabe3357950b8694b85bfe1c23e8742575e37d066f61a741a017a0c96f32a9bba9c3cefcf0409b818ea366f806242c711d5bb3829c3275660e03592935f732 SHA512 7b444cf58a7abc8455d8cb2e720c77ae15fec3c0c4fc6984e51e587f122b842cbecd38f9ef225346e0fa86ccf5a4cdbc3452a78f302237f5069efb626554dd02
 DIST python-nbxmpp-3.2.4.tar.bz2 131867 BLAKE2B bfe0fe559b62e0ba526adac810bf9ed4e491349ce8535ea6ab3d476a1b1c18accfeb450a327b1e81994f2960a475b872169a61aac67d1f16767bad18f6e5e223 SHA512 4ac1c69741b4c202c463ade601bb027f4a5442da1052e2657b1319f2b9bb6dd723033b3dcf175d655205f2e918ef1b7e3e93410fc812c847d2da7ceb48420d37
 DIST python-nbxmpp-nbxmpp-2.0.6.tar.bz2 122203 BLAKE2B 925604002f4363f1e0b72f05c13742f4652ba565a9faa48faf8d47688f480a7f1d7585c593b0dcf07bded8c4aa3a1d02e9697742a07b9e815daec062dfb93104 SHA512 a536b25c8a6298892a51adef4b64b75ffab88ce02fb08fc07ecd1cfe2bc794262d4d58a93248439723e6e0544485da7351bb98189b0e422a1f77b01c6f6d238e
 EBUILD python-nbxmpp-2.0.6.ebuild 771 BLAKE2B d26169a1d21a1d512f27711653642514b64c644f6dc786d5b701e1651df0e3e3ccae11a25ab77641a8ea6244df6ed3f9bb28cd0224018859171d6a5aded3ad73 SHA512 df49ab8432177b1c35b72b8015a9f7f5184a8cca6172271c840f4c4c15a937d463946a16ce863787a2050e14b5e54ab81c2738565e002e9d9dc11c5eeeade72b
-EBUILD python-nbxmpp-3.2.1.ebuild 745 BLAKE2B fb76ccda9625fcfedcda1be5f950ed12b0bde5901fb7989b25055c1cf08e738b52473eb972d2b336230b08c2d013b0b7fd012daff7851517be5ee77f4c2b70dc SHA512 262c7f37244669ef510b105db6034712673d5234ce3cbf9faef7c2786c41e07f31c84d3c301447c77dea6eef82c903f4ce260e61ce7790992426c62462af7fd6
-EBUILD python-nbxmpp-3.2.2.ebuild 747 BLAKE2B 6ccf123262480eefb28bc977c298400bd530322ac9f078d1ccd0b774b5e2601efe1d5d883ce13af849528ab0ad33ee5c9593fa28c9d426caee25a9c8afce5e69 SHA512 b7b830733f566e9297804782c9d1d50a9641e6ff7ccac0e1ded9b3812b9e8e164ab580fb3978b3744520247888868e1bea6839b85b3994c2a9b8f4f57c0695a3
-EBUILD python-nbxmpp-3.2.3.ebuild 747 BLAKE2B 6ccf123262480eefb28bc977c298400bd530322ac9f078d1ccd0b774b5e2601efe1d5d883ce13af849528ab0ad33ee5c9593fa28c9d426caee25a9c8afce5e69 SHA512 b7b830733f566e9297804782c9d1d50a9641e6ff7ccac0e1ded9b3812b9e8e164ab580fb3978b3744520247888868e1bea6839b85b3994c2a9b8f4f57c0695a3
-EBUILD python-nbxmpp-3.2.4.ebuild 747 BLAKE2B 6ccf123262480eefb28bc977c298400bd530322ac9f078d1ccd0b774b5e2601efe1d5d883ce13af849528ab0ad33ee5c9593fa28c9d426caee25a9c8afce5e69 SHA512 b7b830733f566e9297804782c9d1d50a9641e6ff7ccac0e1ded9b3812b9e8e164ab580fb3978b3744520247888868e1bea6839b85b3994c2a9b8f4f57c0695a3
+EBUILD python-nbxmpp-3.2.4.ebuild 745 BLAKE2B fb76ccda9625fcfedcda1be5f950ed12b0bde5901fb7989b25055c1cf08e738b52473eb972d2b336230b08c2d013b0b7fd012daff7851517be5ee77f4c2b70dc SHA512 262c7f37244669ef510b105db6034712673d5234ce3cbf9faef7c2786c41e07f31c84d3c301447c77dea6eef82c903f4ce260e61ce7790992426c62462af7fd6
 MISC metadata.xml 426 BLAKE2B 2772501445c7b3f8db801d5d6c52c6004cc6c67527b30cfcd5f48b54c3e483f1ace9307632f0da179cc4462e3ffde741b66af38c76e248004ff7238a591a15bf SHA512 0f456e67e255e045d97f969ed16c7e304d07a6b9a60d938dded30e78235a2ef984f5883c08f655e14084a8d76f54cd578c3d1eb387f0cc4d8502a5188dac987d
diff --git a/dev-python/python-nbxmpp/python-nbxmpp-3.2.1.ebuild b/dev-python/python-nbxmpp/python-nbxmpp-3.2.1.ebuild
deleted file mode 100644
index fafffe2d9512..000000000000
--- a/dev-python/python-nbxmpp/python-nbxmpp-3.2.1.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
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library to use Jabber/XMPP networks in a non-blocking way"
-HOMEPAGE="
-	https://dev.gajim.org/gajim/python-nbxmpp/
-	https://pypi.org/project/nbxmpp/
-"
-SRC_URI="
-	https://dev.gajim.org/gajim/python-nbxmpp/-/archive/${PV}/${P}.tar.bz2
-"
-
-SLOT="0"
-LICENSE="GPL-3"
-KEYWORDS="amd64 ~arm64 ~riscv x86"
-
-RDEPEND="
-	dev-libs/gobject-introspection
-	net-libs/libsoup[introspection]
-	dev-python/idna[${PYTHON_USEDEP}]
-	dev-python/precis-i18n[${PYTHON_USEDEP}]
-	dev-python/pygobject[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests unittest
diff --git a/dev-python/python-nbxmpp/python-nbxmpp-3.2.2.ebuild b/dev-python/python-nbxmpp/python-nbxmpp-3.2.2.ebuild
deleted file mode 100644
index 20ab63a80429..000000000000
--- a/dev-python/python-nbxmpp/python-nbxmpp-3.2.2.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
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library to use Jabber/XMPP networks in a non-blocking way"
-HOMEPAGE="
-	https://dev.gajim.org/gajim/python-nbxmpp/
-	https://pypi.org/project/nbxmpp/
-"
-SRC_URI="
-	https://dev.gajim.org/gajim/python-nbxmpp/-/archive/${PV}/${P}.tar.bz2
-"
-
-SLOT="0"
-LICENSE="GPL-3"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-
-RDEPEND="
-	dev-libs/gobject-introspection
-	net-libs/libsoup[introspection]
-	dev-python/idna[${PYTHON_USEDEP}]
-	dev-python/precis-i18n[${PYTHON_USEDEP}]
-	dev-python/pygobject[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests unittest
diff --git a/dev-python/python-nbxmpp/python-nbxmpp-3.2.3.ebuild b/dev-python/python-nbxmpp/python-nbxmpp-3.2.3.ebuild
deleted file mode 100644
index 20ab63a80429..000000000000
--- a/dev-python/python-nbxmpp/python-nbxmpp-3.2.3.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
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library to use Jabber/XMPP networks in a non-blocking way"
-HOMEPAGE="
-	https://dev.gajim.org/gajim/python-nbxmpp/
-	https://pypi.org/project/nbxmpp/
-"
-SRC_URI="
-	https://dev.gajim.org/gajim/python-nbxmpp/-/archive/${PV}/${P}.tar.bz2
-"
-
-SLOT="0"
-LICENSE="GPL-3"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-
-RDEPEND="
-	dev-libs/gobject-introspection
-	net-libs/libsoup[introspection]
-	dev-python/idna[${PYTHON_USEDEP}]
-	dev-python/precis-i18n[${PYTHON_USEDEP}]
-	dev-python/pygobject[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests unittest
diff --git a/dev-python/python-nbxmpp/python-nbxmpp-3.2.4.ebuild b/dev-python/python-nbxmpp/python-nbxmpp-3.2.4.ebuild
index 20ab63a80429..fafffe2d9512 100644
--- a/dev-python/python-nbxmpp/python-nbxmpp-3.2.4.ebuild
+++ b/dev-python/python-nbxmpp/python-nbxmpp-3.2.4.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 SLOT="0"
 LICENSE="GPL-3"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~riscv x86"
 
 RDEPEND="
 	dev-libs/gobject-introspection
diff --git a/dev-python/python-poppler-qt5/Manifest b/dev-python/python-poppler-qt5/Manifest
index 360847f98d05..a96117d8b75b 100644
--- a/dev-python/python-poppler-qt5/Manifest
+++ b/dev-python/python-poppler-qt5/Manifest
@@ -1,5 +1,3 @@
-DIST python-poppler-qt5-0.75.0.tar.gz 23281 BLAKE2B 06b2b0899d2a3cfc84e623b98cc3379aa45ac9ca9267f25168cce04f2ed761fd897043376fda3386b2daff2b46850b24782cafd6aabb13a8e7d6f3920b55a02c SHA512 2f03036a2eaeb8e28875f19a813ff85a91c1e9a94301bdb736ecc50e7ececb4de2622728e6fecbf64e114435529f82b6afd23d772e2d3910ae03d5d2b5da3205
 DIST python-poppler-qt5-21.3.0.tar.gz 25641 BLAKE2B 5937f1ddc1493bb1ef1d98b91dd8ccec4bd8c835956d84c8d7ce7a1cedcbe16854861e1f13825812e0f74c335020f0d74aad2d2bbc7a5780c6eb3ac77437f13b SHA512 cc942a860c2c999ff04fb0468b1556b0e23e7aa19a0185a39c5e903e717dca64bcbd51b8fe34b6885bd789cbf5cc1080c2ca1dcee30b3e69fa1721618e8db278
-EBUILD python-poppler-qt5-0.75.0.ebuild 791 BLAKE2B 91f44f72522a0356983397fc7952bce9eec772e79e2e73c084468d33863ca78f6ca49344b5a1dab11ca68d2068bbc81aa8d6907f2895cb59047027c5cd551a10 SHA512 66e25ab4696e3a5f7806121888d5d696180d60edf473a8eb944692fc5611af399828e555eb2e63b14ea9b2892bc1bfdd892905cb699eada1777dad01511a1415
 EBUILD python-poppler-qt5-21.3.0.ebuild 726 BLAKE2B 56503f59e0c9116ef3025b22ab30601b1083fd5ea2d1e1971bb2cd7afc76b815d2419a9d861b906ea88e3da09490fdb126155623d7f6ec5d6de9369ea33e1d37 SHA512 7f6bef05c85f42d5544879caab2055feab070a5b06d3d70b616c71b36901119725b9b3a738c95baafd9bf4e2ad6b5f344f2467e53b9cc127342d226efc9517f8
 MISC metadata.xml 392 BLAKE2B 51992d04b5914b5248871f36659a45176628fe6e45f78b75ad1f64dadcbc5e2606a022498125cefcad2526a43b88e92dd115592b413b86245083fca038611fcb SHA512 6b356062a520973b99990be8f40ff7a5f705089988ebe889a09829fad92ff42d6ec4cddc406f39c6bb19bbf0d6c231557fd350348721c2d9feeb0d4808fc27fd
diff --git a/dev-python/python-poppler-qt5/python-poppler-qt5-0.75.0.ebuild b/dev-python/python-poppler-qt5/python-poppler-qt5-0.75.0.ebuild
deleted file mode 100644
index 6e7ff364efe6..000000000000
--- a/dev-python/python-poppler-qt5/python-poppler-qt5-0.75.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1 qmake-utils
-
-DESCRIPTION="Python binding for libpoppler-qt5"
-HOMEPAGE="https://github.com/frescobaldi/python-poppler-qt5"
-SRC_URI="https://github.com/frescobaldi/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	app-text/poppler[qt5]
-	dev-python/PyQt5[${PYTHON_USEDEP}]
-	>=dev-python/sip-4.19:=[${PYTHON_USEDEP}]
-	<dev-python/sip-5:=[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-python_compile() {
-	distutils-r1_python_compile build_ext --qmake-bin=$(qt5_get_bindir)/qmake
-}
-
-python_install() {
-	export PATH=$(qt5_get_bindir):$PATH
-	distutils-r1_python_install
-}
diff --git a/dev-python/python-xlib/Manifest b/dev-python/python-xlib/Manifest
index 82b9b4525536..d1781af329c7 100644
--- a/dev-python/python-xlib/Manifest
+++ b/dev-python/python-xlib/Manifest
@@ -1,4 +1,3 @@
 DIST python-xlib-0.31.tar.bz2 211425 BLAKE2B c0a15b11c264942479c86088d8d5bdc0c759ae71df8939feee200ff58ec30d3b2c0a99a119cc56e5c32279b26517e7925cf9124a367dc7d32fcaf0be4f7cd41e SHA512 f98978cd0058ae18f08f9da71b4ff31cd7811040ec1eb03ce065c187f312259d674dd76aad447752c8f508e585838948c90182eef5d5240e6c06b0a5dd1fbd33
-EBUILD python-xlib-0.31-r1.ebuild 924 BLAKE2B c7e2ade75a94f1f7fb7b8c8d6c4a26f93ea7a732a2ea864559fccb0afb9cb71569bf333d5f740c67aa4373f995cbc7ec0a0a5a64bf86a630179093d1f2d8b8cc SHA512 7f7448c0df7228e34de2a7fbc41c39ea3cf564af3d3f821312bf7afa059f9e9c55c0289f8efb0e9ece5532d984aae422da20e176cbc3cc73eb455f03294a137b
-EBUILD python-xlib-0.31.ebuild 891 BLAKE2B 4047fe5708424f0ebeedcdc94bb307218fe3e6faf494e15015a1adc6217fad84589e9451f4c95331523ebcae404e7bcc92e5cd19da7d299d058cca3b6eac770d SHA512 345e6deec4c0146fad01d9b004bb0629a58dc189424273e95f4a4c9d24201d9813fb04f27271bacee726b2e76381c0290760b931e6c2947026122e2b99772753
+EBUILD python-xlib-0.31-r1.ebuild 923 BLAKE2B 2ae27f4e486622488190da030e3f9df00d693e1ee26e29c70f1008f8db425cc6fc520059fc716deff6664ce787d51c268951c2c8511fbcaecff7c86ce2b96eb8 SHA512 c1ce2f17ff40bc0b09395666a391b59a4f9ef58433d3aa8cd5fb08a65712ca106d7f2a49ddc55031a27e4034a650e4a0ffad3e9dedc0c4cade2bda442f680e3b
 MISC metadata.xml 434 BLAKE2B 3fa5d4e6b3b0347d1872805cf074795e486fe64a6b5b3edf326e9a8f81c1f5b86472ec6d906e85ef11493e9aeff9ef8ecfbece69103df037c8237fee3bbbaac9 SHA512 38738c99171d5351a797b12384a0f29b38250bb62cb17ff6250e3215a580500eec3210e22ee9605356c71477b8574b9fde34c5dee944b8437b901adc9b417218
diff --git a/dev-python/python-xlib/python-xlib-0.31-r1.ebuild b/dev-python/python-xlib/python-xlib-0.31-r1.ebuild
index d9b2e3a959c6..6b3f020591e1 100644
--- a/dev-python/python-xlib/python-xlib-0.31-r1.ebuild
+++ b/dev-python/python-xlib/python-xlib-0.31-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.bz2"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ppc ~ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 ~riscv x86"
 IUSE="doc"
 
 RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
diff --git a/dev-python/python-xlib/python-xlib-0.31.ebuild b/dev-python/python-xlib/python-xlib-0.31.ebuild
deleted file mode 100644
index abe871e44760..000000000000
--- a/dev-python/python-xlib/python-xlib-0.31.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1 virtualx
-
-DESCRIPTION="A fully functional X client library for Python, written in Python"
-HOMEPAGE="https://github.com/python-xlib/python-xlib"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.bz2"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 ~riscv x86"
-IUSE="doc"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-BDEPEND="${RDEPEND}
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	doc? ( sys-apps/texinfo )
-	test? ( dev-python/mock[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_tests unittest
-
-python_compile_all() {
-	use doc && emake -C doc/info
-}
-
-src_test() {
-	virtx distutils-r1_src_test
-}
-
-python_install_all() {
-	use doc && doinfo doc/info/*.info
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pytoolconfig/Manifest b/dev-python/pytoolconfig/Manifest
index 9b1ac06ff5fe..9e60b97d4d87 100644
--- a/dev-python/pytoolconfig/Manifest
+++ b/dev-python/pytoolconfig/Manifest
@@ -1,3 +1,5 @@
+AUX pytoolconfig-1.2.2-fix-licence.patch 577 BLAKE2B d79330fa814c1f2039ac6b0b1b46a3d1f119ff4459f0491d316aadcf280f9d1c23cbd7026e83d8ab10d5fbf688f6d4d81bf9f5d707fa965c13d74f66a5db2564 SHA512 81dc0ff4b7dd620b5905cb3b31f802c352d401c47ad4a95075c34f192e3bb010a29766808359c3be49603fe8b6360ac50884908160b1115173ec8b0badff787d
 DIST pytoolconfig-1.2.2.tar.gz 16195 BLAKE2B 02434bf9bc815fe1beeb13496427d6735fd0eebca66371eaa1a8df5d318879584b9e27d7b2272535e41af91b46544264d570b2727e524e6ba52c4e4be475ad84 SHA512 5bcbf7f2fc7941e128b3e717ff213e1e43be417ca3b906fa75a40f822815a4ea79b55cbb3e297caa3abf9032fedda1a791165491f52d4bbce5f4d29eea3c3599
+EBUILD pytoolconfig-1.2.2-r1.ebuild 829 BLAKE2B 660650640cc81cd8f418684a986c2935b8bee629bc0f85c7eeabf29ccd45bd16dec3e896a87cf9577bdea0878ae5d22a5561f3b0ae109b42a68a401d6925b68a SHA512 c187eba9364ee5b140ff157f014f575625cb4d0833d382777ddfa6ed0b6c9174ee914b7a6aaf7762fbcba497e3827bf78cb03094517273dc3c4d9cc29d561aa4
 EBUILD pytoolconfig-1.2.2.ebuild 728 BLAKE2B 8922935d63dd065d0a3ffb5bcb9dbdc2c871339cbcd6ddf91e98058395e2cd582881c95cced867625695fe9dac30db677cd496fa7e498d62be11948972e7bd1a SHA512 81798221f46cfc1404efceaef26962b6ac8ff31743c9081259f4a1ba6abefed4f2b38170b0e78d58568ae23476bcb623374eb7c106238cf8640205a113c4d6a1
 MISC metadata.xml 423 BLAKE2B 3007e2ab50dfd0a5b91d18dfa30099586f14daf29583323da9b275fdfa8c8c2e1cfc575e78a0f5b7983c6d23b03767ebe8f2f2dfb83d35638c0577257e2de62f SHA512 556361958961c85b7f3fc8b5d15009329b0534db086c15392e0c8067357576848a5533fb5ad4d2b75295b7a245f69fd81de63cc5aad555e77211e8f46552e147
diff --git a/dev-python/pytoolconfig/files/pytoolconfig-1.2.2-fix-licence.patch b/dev-python/pytoolconfig/files/pytoolconfig-1.2.2-fix-licence.patch
new file mode 100644
index 000000000000..47c222fba143
--- /dev/null
+++ b/dev-python/pytoolconfig/files/pytoolconfig-1.2.2-fix-licence.patch
@@ -0,0 +1,21 @@
+https://github.com/bagel897/pytoolconfig/commit/7fbd830f1c302ed8151ecc2bd52c40cf70b1a580
+https://bugs.gentoo.org/878189
+--- a/pyproject.toml
++++ b/pyproject.toml
+@@ -2,7 +2,7 @@
+ name = "pytoolconfig"
+ version = "1.2.2"
+ description = "Python tool configuration"
+-license-expression = "LGPL-3.0-or-later"
++license = "LGPL-3.0-or-later"
+ dependencies = [
+     "tomli>=2.0; python_version < \"3.11\"",
+     "packaging>=21.3",
+@@ -70,6 +70,6 @@ strict = true
+ 
+ [build-system]
+ requires = [
+-    "pdm-pep517>=1.0.0",
++    "pdm-pep517>=1.0.5",
+ ]
+ build-backend = "pdm.pep517.api"
diff --git a/dev-python/pytoolconfig/pytoolconfig-1.2.2-r1.ebuild b/dev-python/pytoolconfig/pytoolconfig-1.2.2-r1.ebuild
new file mode 100644
index 000000000000..b664169b4b4d
--- /dev/null
+++ b/dev-python/pytoolconfig/pytoolconfig-1.2.2-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=pdm
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python tool configuration"
+HOMEPAGE="
+	https://pypi.org/project/pytoolconfig/
+	https://github.com/bageljrkhanofemus/pytoolconfig/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/packaging[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/tomli[${PYTHON_USEDEP}]
+	' 3.{8..10} )
+"
+BDEPEND="
+	>=dev-python/pdm-pep517-1.0.5[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/sphinx-4.5.0[${PYTHON_USEDEP}]
+		>=dev-python/tabulate-0.8.9[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-fix-licence.patch
+)
+
+distutils_enable_tests pytest
diff --git a/dev-python/qtawesome/Manifest b/dev-python/qtawesome/Manifest
index 75044b9ab9ff..130ee6595e4d 100644
--- a/dev-python/qtawesome/Manifest
+++ b/dev-python/qtawesome/Manifest
@@ -1,5 +1,7 @@
 DIST QtAwesome-1.1.1.tar.gz 2277767 BLAKE2B ca8668e0b6633087b7e09ffcec19809c8b7e12af2caa0beac896940cdbf3a113206f6952916fbe81c53899a56f8222e613df9c028f59907a2553174551ef9fcf SHA512 3cf04b822464c14f52f23499e64515f50f743aba40a8d22224d22315342cef760da476dc9b2ae42e901ac8ef8440e105a6bf6175efc6749250e0fbbbc255e08f
 DIST QtAwesome-1.2.0.tar.gz 2280428 BLAKE2B 15053a87ca4cf2c25b1633de67f54838b144db05f5165023c121fc84017cc4db6e24238d8518ee2494c0b21752b9b82007ef96f04e6d072b1f51ed84c12bcada SHA512 11307af5592da83fd357e33e5f679821cd16d070f0e751619c28ea29a5511dec7a1d62e81713c91660125899624d5700097d597c85e718f3738b4d47b6477b32
+DIST QtAwesome-1.2.1.tar.gz 2280937 BLAKE2B 4d54e8d9fabd833ca4a430ed9573da4feb6aeaae9090fbdf7874d68214de0c0548be18b2f5d2c643add754c748f6af97eaa821aa3d341ed6dd563b8769c1a5c7 SHA512 dd4ef533c5a7bc5fc7eba549c166653efb2352e12412d5678e30cc8865fe44684ca6e070ca61801910c3eefd5673325cb87555e0fb30007b5fd0b53d04dc1c44
 EBUILD qtawesome-1.1.1-r1.ebuild 939 BLAKE2B cdb36334f7aabfbc699b2a35e58af8ca0675b6523515312c3f355570b14cf0d21380b3f4e2f726415d179fd892ddc95dd40751f0bc238d7b3c886d1b80a352e1 SHA512 04227f83f62819d26ce53a4529ea4ed68bb3559d9dae4eac4522845eccdd8cd49e38f3a5b1fe90136abae6976382cb1fca852865ba5f0dddc185c8a55031ddfd
 EBUILD qtawesome-1.2.0.ebuild 975 BLAKE2B dc025dc6deb8c783c409db762176846d3458fc47b175762a16ccdf56a4d3586658c4cee1d551287d7159a8e1f093c1027a97e68585b8a848a8e835d9f7c5bcb8 SHA512 e76512918ba9e24e14a54781e11244a550bdf56d1dd84e29e19c1e37a8f00566a546b50f378d4986087ff01e49832b1c5e4816b9966baa49c5429d05bcfa3eb2
+EBUILD qtawesome-1.2.1.ebuild 975 BLAKE2B dc025dc6deb8c783c409db762176846d3458fc47b175762a16ccdf56a4d3586658c4cee1d551287d7159a8e1f093c1027a97e68585b8a848a8e835d9f7c5bcb8 SHA512 e76512918ba9e24e14a54781e11244a550bdf56d1dd84e29e19c1e37a8f00566a546b50f378d4986087ff01e49832b1c5e4816b9966baa49c5429d05bcfa3eb2
 MISC metadata.xml 810 BLAKE2B 7d9237109b80816eea90f955a2a7f4f989589b4b16aef6151017a68dc4808b5b13e524d0356f88ff57f05c40be268729f016ae3f9bd059eda6d06ba75ee03ef5 SHA512 9b15bd5c9e0486fc64d49c6a7a1ef2fafc4c7e9e25ac57ca5811e435cc49c24421ca695c7dbaaee7b317c4a90fd5e9f929c3f79d7e57ce8cac85c6267e103dab
diff --git a/dev-python/qtawesome/qtawesome-1.2.1.ebuild b/dev-python/qtawesome/qtawesome-1.2.1.ebuild
new file mode 100644
index 000000000000..4b24498382b2
--- /dev/null
+++ b/dev-python/qtawesome/qtawesome-1.2.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1 virtualx
+
+MY_PN="QtAwesome"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Enables iconic fonts such as Font Awesome in PyQt"
+HOMEPAGE="https://github.com/spyder-ide/qtawesome/ https://pypi.org/project/QtAwesome/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	media-fonts/fontawesome
+	dev-python/QtPy[pyqt5(+),gui,${PYTHON_USEDEP}]
+"
+BDEPEND="test? ( dev-python/pytest-qt[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs/source
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	# Tests fail with pyside2, so depend on QtPy[pyqt5] and explicitly run
+	# the tests with pyqt5
+	PYTEST_QT_API="pyqt5" epytest || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/rapidfuzz/Manifest b/dev-python/rapidfuzz/Manifest
index 59ca8c0c99c9..9308e8cc21b8 100644
--- a/dev-python/rapidfuzz/Manifest
+++ b/dev-python/rapidfuzz/Manifest
@@ -1,5 +1,7 @@
 DIST rapidfuzz-2.11.0.tar.gz 812669 BLAKE2B e7897b2770202d46cb70323d19a79c6f34c379cf43ab211e2ba4d05ef6f1630d49b3cef70ab52bba1ac0a9cc15cd934e86aab829ec84195a6b583a561efc8cb2 SHA512 df5e77248c2a005ff1e0fbd4b4ef15fbdb88a6738d66823ba9bf8c380943c59fe82ac317dab1e6279b33112d2484563d65c33e972d52ab82b083cd8a8aae7ce0
 DIST rapidfuzz-2.11.1.tar.gz 813221 BLAKE2B 1fab9b564396f820c9bd5c240df95a2e864b0e3efffb4239fa2ad719b92d2997d9519ccf906fe04c61a0fc1daf9ed0df734f95d4cdd19529e46716935182030b SHA512 19f6dbff31f11cc16f031f9bf53f7c60051a84f2f81dfc1c17fc83827a7d8551d708420b4116ab91e56b5d6de652b4d571f4055ebcb208e5dd57e8778050ca29
+DIST rapidfuzz-2.12.0.tar.gz 836008 BLAKE2B 7d8cb6637247711f2f6fed63c9f26e2d3b8871b9a4926b86e37f6d42fed0f5ac2af727a1b350f4b55787b6fd5a393c3b90ee91d122731bb3f64acb4edb5126f0 SHA512 06c5e46332c98ea8feb83a89b879efc12a737f58312a862ab426e899bdfd3661601d4a417f7bc518e1006a2f05fa31ce1003ae9dd67c1e7d58f903e65f9eb6e7
 EBUILD rapidfuzz-2.11.0.ebuild 918 BLAKE2B e0f99f5d8fcc95f2cfd4a29495f0aae2a2e18993a50fc6dfa39110ac0d3cb66cf369de990ed11e78e9104a91e35b12995e892c9140c76c2973fb31fcb4ff20fc SHA512 ed0a3809ffcc7f86b45f2f53c12cb24991ca3f99766381c5d2d08074fdee2928a3daafed49a12469710e8c5bb249c9188f24f910128e99ddac3bd0cd745accdf
 EBUILD rapidfuzz-2.11.1-r1.ebuild 1063 BLAKE2B 66f6e70028be5440193e8351136d0b274921c04f390e98aea20e0ba9bfcd705a8436d826d8e6504327ab09120c683855813ce725e31fdcad212fa470ffa38ab0 SHA512 714ddd5411bf8f1eb25117cfccdbe215baa7b0ac5e428414af456328d20bb48c47e63bb8c27c2e9bd6546f4b4b745aa6e014cd99fb1a9cd01120fe639b9a2f33
+EBUILD rapidfuzz-2.12.0.ebuild 1063 BLAKE2B fb1e264d9208e8687a165862c80b8b3b1e48db17bfa567c6ee310a089dd9aa96645ee6213c733ce11874bc826babbdf28470873f6dabe95ac8a2cd86f21c2438 SHA512 20595aceba65640f9bc5c365e7c839c1d5ace7f6a8ce637b76fce474e0c23c474930c03e2e1ea3659105e72d87395a3bdff822f006a32a89768bd769dba1b71b
 MISC metadata.xml 374 BLAKE2B e6ee89a9850276b8c22c9bc851ebea2cde2ea696d122d70c6465e09a9371c59f81d1976b3253e8ee90afae5e3e30e993481b402058bac0c58ec01f71a0b7c3b4 SHA512 9a39c4bcf8e8de0a6d6a356a9aeb415f8f49667caf5716eee50bf251f1fd53bb076e817fac0b15bf64e65c1b9625c78810da61a5d96b273a20b2669a18084d6e
diff --git a/dev-python/rapidfuzz/rapidfuzz-2.12.0.ebuild b/dev-python/rapidfuzz/rapidfuzz-2.12.0.ebuild
new file mode 100644
index 000000000000..96a84cdd08a5
--- /dev/null
+++ b/dev-python/rapidfuzz/rapidfuzz-2.12.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# custom wrapper over setuptools
+DISTUTILS_USE_PEP517=standalone
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Rapid fuzzy string matching in Python using various string metrics"
+HOMEPAGE="
+	https://github.com/maxbachmann/RapidFuzz/
+	https://pypi.org/project/rapidfuzz/
+"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv"
+
+# all these are header-only libraries
+DEPEND="
+	>=dev-cpp/taskflow-3.0.0
+	>=dev-cpp/rapidfuzz-cpp-1.9.0
+	dev-python/numpy[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/rapidfuzz_capi[${PYTHON_USEDEP}]
+	>=dev-python/scikit-build-0.13.0[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# sterilize build flags
+	sed -i -e '/CMAKE_INTERPROCEDURAL_OPTIMIZATION/d' CMakeLists.txt || die
+
+	distutils-r1_src_prepare
+
+	export RAPIDFUZZ_BUILD_EXTENSION=1
+}
diff --git a/dev-python/readthedocs-sphinx-ext/Manifest b/dev-python/readthedocs-sphinx-ext/Manifest
index ff34d9a88b32..a78897e49148 100644
--- a/dev-python/readthedocs-sphinx-ext/Manifest
+++ b/dev-python/readthedocs-sphinx-ext/Manifest
@@ -1,3 +1,5 @@
 DIST readthedocs-sphinx-ext-2.1.9.tar.gz 12465 BLAKE2B 2ee1e0a5e7202dbe57c0dcfc796f8019d057178b59cf832e77b742d5e1b039804aca830109ba10b393577549b5c55ab5707b8071b230f998ea2b91653be2176e SHA512 dc99335ce01a882d9e5509216d5830ef1b943b41f92836433c3a06592edc127a9ed2de39091d6a4fcad941f90be135293592394f4b2c4d8f13955cdbb92f3887
+DIST readthedocs-sphinx-ext-2.2.0.tar.gz 12721 BLAKE2B 3ac02a96a059e6d6b94af4318a5e816f8664e1164edb315d7540d1bfcce3b0edbbe9d567b0dc2931179cb309714175c64a3684b9d568551cc240ccbefc77a10a SHA512 8f7009a0716751de2fe2fed726aa08bb382d15ef6c4fb66e6c29537f985a92ab7cc137f81a4f6200e794cb7f495ebf561356194f57c694509b67e7686bef52c5
 EBUILD readthedocs-sphinx-ext-2.1.9.ebuild 823 BLAKE2B 0315f24a0f84660a5572569cd485559106953f0f13b66ab7a0d7a29b2b10948c720511ae623733a63afa1b4d5e2962f0a970793b9a34bde4d2797376f625078e SHA512 fe1ba4d670fed36c614e85dbf514c8cfc867da1aafde25a2b22ede98ab3e404b7b6bd8f902977b317344158cc14000c82760bd4851939ada06277e797e88f9c2
+EBUILD readthedocs-sphinx-ext-2.2.0.ebuild 831 BLAKE2B c269465fcd830134702ca6675b0d529b083f645d933852dd36fb9b64e2578c740caa1f8e01d9575acebf483cbd99050c7bffbbe83ef9f60ab0f6475d85638ad3 SHA512 0274c7639e327018b640dcd5de2cb0d0d029eeb008b66f5d0ef948fc52c250766a3bee9af246c4174c338f759bfed54351860eb73d85ab721f328f8694f27a16
 MISC metadata.xml 350 BLAKE2B 39fca03d3a995a65683f45a330e386123ae2efaa952f3bc0a6153708008941ddabff9045b480b85551c3fc26166db3aec9daafbe87a91d18dbb4041015d7ec66 SHA512 c116ddd2f8b70bb1c5d0bfc876e60ce35dff1fa7ee2c83a26992f96960beef17c0fb743a7ac5b5c41a3028422c2f342dd683ed503752f7f6390d9987ff8a3057
diff --git a/dev-python/readthedocs-sphinx-ext/readthedocs-sphinx-ext-2.2.0.ebuild b/dev-python/readthedocs-sphinx-ext/readthedocs-sphinx-ext-2.2.0.ebuild
new file mode 100644
index 000000000000..5daa4f214a46
--- /dev/null
+++ b/dev-python/readthedocs-sphinx-ext/readthedocs-sphinx-ext-2.2.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Code specific for Read the Docs and Sphinx"
+HOMEPAGE="
+	https://github.com/readthedocs/readthedocs-sphinx-ext/
+	https://pypi.org/project/readthedocs-sphinx-ext/
+"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/jinja-2.9[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/sphinx[${PYTHON_USEDEP}]
+"
+
+# unittest should be sufficient but tests are very verbose, so pytest's
+# output capture is most welcome
+distutils_enable_tests pytest
diff --git a/dev-python/regex/Manifest b/dev-python/regex/Manifest
index f997a642a655..839c8502b944 100644
--- a/dev-python/regex/Manifest
+++ b/dev-python/regex/Manifest
@@ -1,7 +1,5 @@
 AUX regex-2021.4.4-pypy3-fix-test_empty_array.patch 1103 BLAKE2B 2498de0ebaa68fcb99653a40bfbb9a1009519a79244fa3193ca43b9b8b3ef714f066fdac68f32d7f24c275690cb24bd1deca6b30120519b99a3402db7b4d4d48 SHA512 d55643d7ca251f465d14d8cffab60e6f2c8fb18ec6f9032a5318fab17a8b8e5ae5c98d22e0eff28aacd5bb8ec2ff606022921f73f3c9f7e54ee0853de262cfa7
 AUX regex-2021.4.4-pypy3-fix-test_issue_18468.patch 1078 BLAKE2B 3545ee5167790fbb1d068afdac3f6dbba28ea92d6c1d4ef31b60a8406061deb8609d7fd9a659b45715d4af0f2deb1da0ef9865aebe58919c2b392e2a1a833cae SHA512 182628709ef0f373037acf197c2ade3215684b2c805a96a600a3dfcb092e6fd134c261330ed76c7c248e72f439e464ccde432444bfe4a9610bd36c777bf45c9d
-DIST regex-2022.8.17.tar.gz 385777 BLAKE2B c4425e01fea5c25b9ad77e645d3671d65e747a6ee9bd7b8c1870396b4bd989c3a3ec73c33b72eb5e00f24b8e9fff2cef8c229280d2b98a13df7dd8a07bd1b2c9 SHA512 6a305c00a6355dfb9293876292e7d22de58cc00f15d7beadfaf49b49b5ef512404ad5d689f4b90f6302c5246610cb08ebd8ad6a4739818a43c6eb84fc5bc6421
 DIST regex-2022.9.13.tar.gz 391531 BLAKE2B 83e8f1aabe15e65fb4f96072be3ccd5ddf1dcbffeeecb9d7a2889fb910d4095e902bfd45f43184b0df115b1116ddfc3e67d68a2fa903f19a8cbc6844ce023a3b SHA512 a991d6358001297db2b57855e76b8de680941ddefe9d18af1e9ee033da4e519df7b4553d138e7adf32b30593290284c91a954363bcc30b215409efe121e41e69
-EBUILD regex-2022.8.17.ebuild 889 BLAKE2B 2f4739ef643cd8ce3dce81e94160c6943bfb5f5309f62306bad54dbdf0ff0035fdac591d776c5da341060b4da89d12396b54e2436855bb85e4e449c454e6552d SHA512 e95dc22617b73dcd0e01504dd8e974f09260c79f0935fe9cc9d6a2842640556ed1f34d619fdf31917ae2d466dda860ed02fb9539178c5700ed26ec1132c738b0
-EBUILD regex-2022.9.13.ebuild 891 BLAKE2B b4b113b21cfb13bdbd552e8adcd2cd565c0f34468d3146612810f67ecf6e078f5ad2675685c6f2e7bac1b86fa241004fc645f4a7142237138e7fd96d783d807c SHA512 c3f61e5c1157943e53471217a251cfabedf7bd7d7f513858325c652abe420eaef8da177e6ccacb7791959b6a32ce3c00713d60dcd250288878ca9bf16869ee95
+EBUILD regex-2022.9.13.ebuild 889 BLAKE2B 2f4739ef643cd8ce3dce81e94160c6943bfb5f5309f62306bad54dbdf0ff0035fdac591d776c5da341060b4da89d12396b54e2436855bb85e4e449c454e6552d SHA512 e95dc22617b73dcd0e01504dd8e974f09260c79f0935fe9cc9d6a2842640556ed1f34d619fdf31917ae2d466dda860ed02fb9539178c5700ed26ec1132c738b0
 MISC metadata.xml 385 BLAKE2B 90c9075dcf3be9bd447746b249c438f50bc84a7c6c63051e808c5feb19b2c6208f85a681e449a025fe43cd0d5b2ab541752966b04b787052d78b92d5230d8e62 SHA512 f554035e72bcfff83e693f3651198f09fd354babfbadd5fef26dca3015ef8cc00c47072648794123c69bbd12c637eeaf9e9471680bab847ec701da2146462817
diff --git a/dev-python/regex/regex-2022.8.17.ebuild b/dev-python/regex/regex-2022.8.17.ebuild
deleted file mode 100644
index df6875fb35c8..000000000000
--- a/dev-python/regex/regex-2022.8.17.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Alternative regular expression module to replace re"
-HOMEPAGE="
-	https://bitbucket.org/mrabarnett/mrab-regex/
-	https://pypi.org/project/regex/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-IUSE="doc"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2021.4.4-pypy3-fix-test_empty_array.patch"
-	"${FILESDIR}/${PN}-2021.4.4-pypy3-fix-test_issue_18468.patch"
-)
-
-distutils_enable_tests unittest
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/Features.html )
-	local DOCS=( README.rst docs/*.rst )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/regex/regex-2022.9.13.ebuild b/dev-python/regex/regex-2022.9.13.ebuild
index 1f24743362c3..df6875fb35c8 100644
--- a/dev-python/regex/regex-2022.9.13.ebuild
+++ b/dev-python/regex/regex-2022.9.13.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 IUSE="doc"
 
 PATCHES=(
diff --git a/dev-python/requests-toolbelt/Manifest b/dev-python/requests-toolbelt/Manifest
index d13cf1090588..d7cc36283074 100644
--- a/dev-python/requests-toolbelt/Manifest
+++ b/dev-python/requests-toolbelt/Manifest
@@ -2,7 +2,9 @@ AUX requests-toolbelt-0.8.0-test-tracebacks.patch 1428 BLAKE2B 6f9645f2a456cde3a
 AUX requests-toolbelt-0.9.1-py310.patch 1470 BLAKE2B 864c496f712b9667de991afe7d8db0071b15e6c546fb495c3df5aa25d354bb2873f697d5777f5e6f1a9890289bad192a5c5053d11ab71eb0967762b30c35a977 SHA512 3780eeef7835319d5696f1ac8273c682c4b2a97171b7fed889c1960e3887f1fa6eecf13d4c961a9c2aa9e02e919e885f18bfde8eeabf452e16267ff671d07703
 AUX requests-toolbelt-0.9.1-tests.patch 5781 BLAKE2B ff7339a1daf0ba2df49914847000f0b8b5ff2d097a59bcb02bcb2b20a885f18223a1da1f44a99d846dcff423239108411c193da5092bbb27fdf50bf211dd59f7 SHA512 86919154164274efe8bceb42eb9fc17524d4e144a541e82bc10692da66e533220cdc7186362d77fd4f3acdc639744cdf5273c2e4e2091eb4d33c1fdc6c631ec5
 DIST requests-toolbelt-0.10.0.tar.gz 211210 BLAKE2B 73196e33d42ff6f4532cd2904537451cc237627a149fa759fca7a66e360c0ddb8baf8c4537c880baf03a25065226380788449bae05434aad37962034e1324acb SHA512 75e3a3e609625254e1f078d3c48c664b3118f5a406c84e59c4e9acdeb20a79b5d38ceaaf9578920063f063aa8385139310c06331499aaa92d3c51146f908f1a1
+DIST requests-toolbelt-0.10.1.gh.tar.gz 201504 BLAKE2B 48c5b9f46000d9809e482278626bbce805b93ed2a4a5d074bad4f7fbda75984dd55919eca31909c98c9a74ca7b323e73c90691dced0734964621d4ba5748d464 SHA512 ad6dfe3329c8be5a4521d223d25ec303201e706b34199c084efd0a30b8bc8cfb3382e80a502dc25bd5f7e5b2774a119d2255c49408979aaec45e221f412a7b52
 DIST requests-toolbelt-0.9.1.tar.gz 207286 BLAKE2B 6123677a9abafebddf7dffde2150b2426b5132ebe0c330ff891322ecc3d69232a5b15a0c66e3e1fb4832dc04f5a636a939613fba041e499e9fbca9814f548c7e SHA512 12229928df5df71cb57bc65ef453dc0e4a2bbe190c1579811b2c2823673bd81aeba856b00000fa20b253d0f0fa4fff55ea1e750794ca3785f71c376b1df7fd93
 EBUILD requests-toolbelt-0.10.0.ebuild 1237 BLAKE2B 9b0e5ce0fbecf76dbe13094860c77cb79fcec54fe7ee79ea3e8c42a8396850bee3d1cb1e64d15596221e79fc3ffbafe92e445c6ae0a6abc86c257463d1916a18 SHA512 22b05a4b17fde32b56a4c4b43bdc655e3a7b31c3f8f765c3575cbd00cde45831c8b1ef4314113e374ac094110ec77acf4d753e87d10220617b0123ec12c29052
+EBUILD requests-toolbelt-0.10.1.ebuild 1304 BLAKE2B 85926d28401972dd9f6cb450847a21bfed0426ebd35f9883898895452585256bc99454066cec937fa3cc6935511a99a9a45f052278837cafd37c65fd27b5a061 SHA512 1c8d9dccc756423895eee66dcb1c5d015d9785ddb41459c8468efd5805b1d9ca04ec1ede90cd90fe0d060369a09f47594223789bea0255bc33c3a8bf224a0f22
 EBUILD requests-toolbelt-0.9.1-r1.ebuild 1441 BLAKE2B ed064f4ee21e74de5a5474fd741e6fd047d4def4f1ce3c887dfb643d965a18105c4914395d9156353218b5a9e160dbe3ad6e84f7896f64ff8ffa4cd059a7cd7b SHA512 567bb53929f4e20ee443f882510f6c53a635e648206120a15da32c345fac935bb39eb8acc36fe6ddcd9f2f78f601458e14d3b6aead926e7be293dccca63bcc3f
 MISC metadata.xml 423 BLAKE2B 71af8f087b4bf8d805a70aed1dcb46128b0252f68a1e892530c5393bc6666c8d203e147558214935803a34b5be32bc90f6bb3fa103af4406c0fe6d974acbd739 SHA512 1c875ab992aa1d463fdd52468597f5bebb7aff54c6d665660d2b4df1d41b78e78575be4629b11eef10b783ef1dd4b048b86742ce20eb4584558bc8d87b17988f
diff --git a/dev-python/requests-toolbelt/requests-toolbelt-0.10.1.ebuild b/dev-python/requests-toolbelt/requests-toolbelt-0.10.1.ebuild
new file mode 100644
index 000000000000..0a202b6dec23
--- /dev/null
+++ b/dev-python/requests-toolbelt/requests-toolbelt-0.10.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A utility belt for advanced users of python-requests"
+HOMEPAGE="
+	https://toolbelt.readthedocs.io/
+	https://github.com/requests/toolbelt/
+	https://pypi.org/project/requests-toolbelt/
+"
+SRC_URI="
+	https://github.com/requests/toolbelt/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S=${WORKDIR}/${P#requests-}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	<dev-python/requests-3.0.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/betamax[${PYTHON_USEDEP}]
+	)
+"
+
+DOCS=( AUTHORS.rst HISTORY.rst README.rst )
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# Internet
+	tests/test_multipart_encoder.py::TestFileFromURLWrapper::test_no_content_length_header
+	tests/test_multipart_encoder.py::TestFileFromURLWrapper::test_read_file
+	tests/test_multipart_encoder.py::TestMultipartEncoder::test_reads_file_from_url_wrapper
+)
+
+EPYTEST_IGNORE=(
+	# certs have expired
+	# (if you ever fix this, look into git history for proper
+	# cryptography/pyopenssl logic)
+	tests/test_x509_adapter.py
+)
diff --git a/dev-python/scipy/Manifest b/dev-python/scipy/Manifest
index 7dc1d73def6f..71f836232011 100644
--- a/dev-python/scipy/Manifest
+++ b/dev-python/scipy/Manifest
@@ -7,7 +7,7 @@ DIST scipy-html-1.8.1.zip 37060661 BLAKE2B 2fa617c58eb47463f8a61f9798b32c6da255d
 DIST scipy-ref-1.8.1.pdf 35025868 BLAKE2B 9221755d2dc69b8623271f75ff3078a0a4410fe9ff69ee317b40bf145af7da21a7f5f4b6b67820d8bb2878f83b7014f1ea7c2f0e026afb716da0479d394505e2 SHA512 8f27dcb9dd1030e15266389af21a1475ecfec5ea777fb2dbcf8db8d3398ac6e45c7040b8d6dbaffd29be3920925427be7c55efdc8094d670c857edfdab7f7728
 EBUILD scipy-1.8.1.ebuild 5275 BLAKE2B 0b2f1bb8c37c253aae87941aa9cb15352d82ff5bc34089ae7cf93cad7d264b0ceaecd7f8f0ff02670d24282a61032eaa52bf16de03e1d25d8a18fbfe7d63c981 SHA512 d7ed5f3bc61e27f898937387f88cd934147149ba40ccc01b160571db97074ccba2eb68510899bb4ee70083e47cf3e2c5c6e53435f56933cc5652e9b21a231763
 EBUILD scipy-1.9.1.ebuild 2287 BLAKE2B 01f8dbe3bc789af389da8f7eb4853f3f1c84329368f7baa8542ec3da0ea8f13abcb7ea9b7048ade6c8978ed877abe7b305711123046000c6bead9eec9d2774a4 SHA512 9a328fa90b73836e297f975e9a67faf359a581ba5021c91fedc99d1054704fe8f63e1bb199e15749fd54f2f3f5641ca7f13ecf3b0955b2870ee32edbe99f0fb9
-EBUILD scipy-1.9.2.ebuild 2356 BLAKE2B af2b689a25267748c97854b268c89ccd8b437cdf88f5cec5e9f2d35ac61be5320fed45743da85e7b27b6add471379a82f70c4d0e5348ea2103b28882169b2650 SHA512 193261870ecfff15d086872b4c3645fdf558380c34830222c092af9b049bb0cef239367acf5cdc25a4b6d270373753225be09dfe4c376de38f5184a0a85be691
+EBUILD scipy-1.9.2.ebuild 2354 BLAKE2B c013d3f8f9ddf0ba89246c9af4d4285f06b6aefdafb3c988924c93b3f70e97486c352933a6855e0b33d2d62dca49a6a58a0202b590f0b32f7834894a4e97db55 SHA512 dc72624aefd000730f8b8837e0ee7f4b56f57905e211c5eff186d3b9b21d891f8eda4484235edaccbf2505bbb02e25d5945b49f51265dedc9b4fe6ec0fc18b0f
 EBUILD scipy-1.9.3.ebuild 2360 BLAKE2B 4461feef60a9df1d573a4dc523f28c5b5a69c623921bf54427d2fbbf9fee9845506464b6902c177b20f00af653099f6a8d497dfaf07575815ba5278c7c978d0b SHA512 0b27f11b9c104ce37d69217f0fecb7ba0e63eb7f76bee4b1eaa1badcbf896b1b323aebe023b5db0e64c426df61f21f542ddd3cb1365a950e6337750080ebc1fa
 EBUILD scipy-1.9.9999.ebuild 2339 BLAKE2B 8b34952534298e156de44cffe5552c1895c343095bf4ec0e9d199fc915dcff549ac9b44cae9255634b244f207396b31428f817b8a4920dcf8c8bafc6c89ac7d2 SHA512 fbdfaabc2de08aa51f6d27ca230c69c812590de18adaca11fb956ebac77d56e98c88a710f9916b88f1ae9e783ed4a89b4ed763fa5fd4b109829cddacbaa76da1
 MISC metadata.xml 1148 BLAKE2B bd532eb47b00da1ff18e9bb5be287ef32136412fd7542e92a522c9d3d9d9663d2312b74fd2fc6d4239e4fc581c8e881ac6e682fcfd14b0debb08210237878398 SHA512 a913d7013caece759f2fd36f8814589a512e7650afca19edf444694b1fceeeda02f0bffb4ced81a46a376b2d6d54b292257a236549418aecf20d99e70715babb
diff --git a/dev-python/scipy/scipy-1.9.2.ebuild b/dev-python/scipy/scipy-1.9.2.ebuild
index 1a242c77f427..ad4e9d5107c0 100644
--- a/dev-python/scipy/scipy-1.9.2.ebuild
+++ b/dev-python/scipy/scipy-1.9.2.ebuild
@@ -38,7 +38,7 @@ else
 	S="${WORKDIR}"/${MY_P}
 
 	if [[ ${PV} != *rc* ]] ; then
-		KEYWORDS="~amd64 arm arm64 -hppa ppc ppc64 ~riscv ~s390 ~x86"
+		KEYWORDS="amd64 arm arm64 -hppa ppc ppc64 ~riscv ~s390 x86"
 	fi
 fi
 
diff --git a/dev-python/setuptools-rust/Manifest b/dev-python/setuptools-rust/Manifest
index 9d2722e50d9e..6916fe99595a 100644
--- a/dev-python/setuptools-rust/Manifest
+++ b/dev-python/setuptools-rust/Manifest
@@ -81,5 +81,5 @@ DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9d
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 EBUILD setuptools-rust-1.5.1.ebuild 3212 BLAKE2B aded7568d241e6ae09bcffd5378365a395e472ee33a3ca3a0c1040a3e7036361e14aca32f6d2cba46bf6b61b9ea52098ba66bd7311a0bda8ff8b283984cd7acc SHA512 5cf29bffae0f68610bb7498820f87a42a10b1cdc9cc707d9282e8ae33610c19c716a56d5063a146d302389b9f45b56cb98105ff83e115657305b6c3c30e87e18
-EBUILD setuptools-rust-1.5.2.ebuild 3246 BLAKE2B 0e7630a585f7560a0e106c610bb85f52aedd2f797161e313cbadb57811846bd3a0b5ded55eca33e53f9c7adbda705dc35a3d5ffc72c73fba9a114f44fe5e700b SHA512 f5f6bb43fe184d60477c0e218d725735182a83ee170217b5d0da392770fea6c8d63757e65195570cb7086c358329d8bedf5e5c2685e44f6c34e57be4b00e8932
+EBUILD setuptools-rust-1.5.2.ebuild 3245 BLAKE2B 1604ffc9368081e51132168417e071ff0552221e0205867bad6bb7f11693a87f771f4c34b5c91ed1f153bab52a3e3e8eb765bea51f9b21514d4b1cb0551d62b8 SHA512 46df285b68dfbd8bfd756b463dda23f6fa20d7289c08c42c7e93bc7857719bd5c17e079f46d9cc119124a1cd51b53e4c47559b02a6562f66e46904431edbd555
 MISC metadata.xml 476 BLAKE2B c8f0ef0779f0a4412a7d9b97e1bb03e3bfb3c031209f489a100b30402d99224014e379712989afd0cb76c85be301dcf9a51e21e8f9195262c5920dd1db0703d1 SHA512 af74755e9e8fb61cbded2dc3e63cd20f95393ef2650bed9f81e299f7759ae79c63b45df8048cd0fe25397ec7db10156be681fa5278606a20481f78d5279b815b
diff --git a/dev-python/setuptools-rust/setuptools-rust-1.5.2.ebuild b/dev-python/setuptools-rust/setuptools-rust-1.5.2.ebuild
index 998a0e76ed15..b483598201a3 100644
--- a/dev-python/setuptools-rust/setuptools-rust-1.5.2.ebuild
+++ b/dev-python/setuptools-rust/setuptools-rust-1.5.2.ebuild
@@ -100,7 +100,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 arm arm64 ppc ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~s390 sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/spur/Manifest b/dev-python/spur/Manifest
index 668de22fa54a..b25637a7334f 100644
--- a/dev-python/spur/Manifest
+++ b/dev-python/spur/Manifest
@@ -1,5 +1,4 @@
 DIST spur-0.3.22-nose2pytest.diff 31953 BLAKE2B 6ff1ab74215df036101720ca7b1ed5c7f0f9e6dc000a55175da85024d771354cad33d967c7d5ce63bf47dc2009d82147d3da8091a8b605176040f1cef274429e SHA512 ed8617021fe3ea43d8e53dc601b3778026f20e472e7bea2ee9a7565ccc4568a29cb669d7892cb0e16afeb64cb04d0f3973b85a151b20e94ef7b7df4210b17f9d
 DIST spur.py-0.3.22.gh.tar.gz 17760 BLAKE2B 676484e73fa38ebcd3bcc2ace21853590b652d0ec2dc31f7635a55a8bbb213e559fbdd7b70e545091e7e28e6000862ef45eba748e13c546b765756b41c352028 SHA512 36518a080d3fff97fdab5af8e7e3045c58ad6b1acad9fb79e11da688d484565ee4d50868f3c3ee10299e135f2c01bd35348256df7bb1b4f6200aa175cafc7f0a
-EBUILD spur-0.3.22-r1.ebuild 902 BLAKE2B 07a6a0597a759296dfbeb9b36977154541b447b9735e989e0cea7f3a6413dd27e31e6ad8d95f9e246bd2263ddd4439f9be77b9e4ebce8b23858ad8b7359394c5 SHA512 2037f58c6f88da3e88d6f060c16d0acbb3976c614bbf086b5ec81e06aa8d54c31d9e59f1e1979fcfec35c9e08d37f8365d5c07506b323e6e3b8efcd8f427673d
-EBUILD spur-0.3.22.ebuild 1195 BLAKE2B 3b9c00dbf50ecac6ac5c4ebac350b4897bf9bbbe2c55f1b20675fc156cbf68f66b852a71a2a015c2168fbe8ea33d638095fb31e75a81e6fa5dc0b4756ce5b660 SHA512 77ee31dee19770962a3296d398925963ac35ce5b5c6a894c0b14ea1fcbd8e6c72802f4fc823ff5b0c602f2dfecbde874f11b51ad5a5d1ba85747efe58fcb76e4
+EBUILD spur-0.3.22-r1.ebuild 900 BLAKE2B ecd498de40f2da5dffc416abd519efaaac37d5d8609742c7165ad1c6075f323fe9188a6880efea8967aeff5f50d70af189f43a8120197377418e8fe43ddddec5 SHA512 b3c00891b945e9e61f810a619e29090df66d97439abcb0e8ab1a832ddc98f9e867e32a825b6f4f23b6b5a9f21bb10ef89f747be5a3e5286462ff33d7d1858cbd
 MISC metadata.xml 310 BLAKE2B 79198594601ed73656452cab90b2989e68ce1bb1ee3f93fa0b68a99e5952122244426f6dd8e5bed3d85adcdc6540ebec2d2b7e98c36c1f88762a876af18c7a90 SHA512 11b496bc054b786a938911ef5c5813168872af2646fa187bd8fbb45555f30d192207befa6e633033e94d841d1e7ef291b25243d13860b4bf0a66d8cc76565419
diff --git a/dev-python/spur/spur-0.3.22-r1.ebuild b/dev-python/spur/spur-0.3.22-r1.ebuild
index 3ae202674b5d..0ab6ca76649e 100644
--- a/dev-python/spur/spur-0.3.22-r1.ebuild
+++ b/dev-python/spur/spur-0.3.22-r1.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 
 RDEPEND="
 	dev-python/paramiko[${PYTHON_USEDEP}]
diff --git a/dev-python/spur/spur-0.3.22.ebuild b/dev-python/spur/spur-0.3.22.ebuild
deleted file mode 100644
index 0b5e31be2505..000000000000
--- a/dev-python/spur/spur-0.3.22.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-MY_P=spur.py-${PV}
-DESCRIPTION="Run commands locally or over SSH using the same interface"
-HOMEPAGE="https://github.com/mwilliamson/spur.py"
-SRC_URI="
-	https://github.com/mwilliamson/spur.py/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
-
-RDEPEND="
-	dev-python/paramiko[${PYTHON_USEDEP}]"
-
-distutils_enable_tests nose
-
-src_prepare() {
-	# TODO: set up a local SSH server?
-	rm tests/{ssh_tests,testing}.py || die
-
-	# does random guesswork on top of exceptions that stopped working
-	# in py3.8;  this only causes a different exception to be raised
-	# https://github.com/mwilliamson/spur.py/issues/85
-	sed -e 's:spawning_command_that_uses_path_env_variable_asks_if_command_is_installed:_&:' \
-		-e 's:spawning_non_existent_command_raises_specific_no_such_command_exception:_&:' \
-		-e 's:using_non_existent_command_and_correct_cwd_raises_no_such_command_exception:_&:' \
-		-i tests/process_test_set.py || die
-
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/stestr/Manifest b/dev-python/stestr/Manifest
index 946226396f94..1deffb40d919 100644
--- a/dev-python/stestr/Manifest
+++ b/dev-python/stestr/Manifest
@@ -1,5 +1,3 @@
-DIST stestr-3.2.1.tar.gz 118139 BLAKE2B dedb63767adfab26d837ce92762dcc44a482b1772aecbc31d12beb22f2c3c08368475cd110de7376f4df7fa8ce03c5b8e3b04436296ad4bd11c2fc3a4243695b SHA512 43187ca0d81e3b31e16ed60a1db561dc49c34f679594d11cad8cb0e658bf790af0b3d606bf99233a5767e2511675d3aedb6a476046d2f5483ffab05eaae393ed
 DIST stestr-4.0.1.tar.gz 111695 BLAKE2B e9ced9237f3c889c2eb116b51645a6d8b86d8085e2991b421b8955772225342325eb66276f43e710a57d79392974cc42072e0a05b7022c666181b9ca66d51735 SHA512 a74b9278b1941da62af58a087a10e5a0624901ceb81dcdd25eab3a05f003756773551fe6eec46dfb371f7b726cf296abfe0116444fb32c94fb6811440ee22a58
-EBUILD stestr-3.2.1.ebuild 1107 BLAKE2B a4eb293e9c65627a47372f876ab606164ee573ca81ae77c5d9616d8f20b2609708659af0a7fcc80f86d679593e94fc73690f12ddaee452356722d58a25bcaa62 SHA512 291bd705b5993023020772362e141a7b5ea4b9091bb05fe6cd543cb161d60ca0af29b07a32ac71e1eac758b695cf1d53c5429e1f5aa23930a9895b7e0f85d9bb
-EBUILD stestr-4.0.1.ebuild 1111 BLAKE2B 2e22c45f72de89e4e22df105357407d99f9a2495db495856aa52870d9b6f077a3d96b53e5812dca6bc3b5c71b950e4408adf998e54f87547352343abdf2975cc SHA512 9f4c21ba8baf1be1c8581d0f724458f481f555f717f61089cd43523c2122c887579bf4b95a17f24e29ec4e1cee1be9a0bd0a3d42188239ad435eef83cc216903
+EBUILD stestr-4.0.1.ebuild 1107 BLAKE2B a4eb293e9c65627a47372f876ab606164ee573ca81ae77c5d9616d8f20b2609708659af0a7fcc80f86d679593e94fc73690f12ddaee452356722d58a25bcaa62 SHA512 291bd705b5993023020772362e141a7b5ea4b9091bb05fe6cd543cb161d60ca0af29b07a32ac71e1eac758b695cf1d53c5429e1f5aa23930a9895b7e0f85d9bb
 MISC metadata.xml 640 BLAKE2B 2f6a2d6b549da3bdde1994544d2ed3a5a96ba08e1675394112643544d6afbb64162fd0bf8c72d39f1fbc43c3e120577e9d23506d9b51e1889308e670aa7d0775 SHA512 5fa6c1132aab62f72ff471ee8b551852e6ce84d66ca50c71f11c25f228b2c6de65e9d6dfcf464a7b826d9f0ce8768109cc4e475842c39bb7a6647fed662821a1
diff --git a/dev-python/stestr/stestr-3.2.1.ebuild b/dev-python/stestr/stestr-3.2.1.ebuild
deleted file mode 100644
index e9eab5e48fd1..000000000000
--- a/dev-python/stestr/stestr-3.2.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..11} )
-inherit distutils-r1
-
-DESCRIPTION="A parallel Python test runner built around subunit"
-HOMEPAGE="https://github.com/mtreinish/stestr"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	dev-python/future[${PYTHON_USEDEP}]
-	>=dev-python/cliff-2.8.0[${PYTHON_USEDEP}]
-	>=dev-python/subunit-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.10.0[${PYTHON_USEDEP}]
-	>=dev-python/voluptuous-0.8.9[${PYTHON_USEDEP}]"
-BDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/ddt-1.0.1[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	distutils_install_for_testing
-	stestr init || die
-	stestr run || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/stestr/stestr-4.0.1.ebuild b/dev-python/stestr/stestr-4.0.1.ebuild
index 76e25799861d..e9eab5e48fd1 100644
--- a/dev-python/stestr/stestr-4.0.1.ebuild
+++ b/dev-python/stestr/stestr-4.0.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/tenacity/Manifest b/dev-python/tenacity/Manifest
index 62bd62dbc2e9..e5f45db81fd9 100644
--- a/dev-python/tenacity/Manifest
+++ b/dev-python/tenacity/Manifest
@@ -1,5 +1,3 @@
-DIST tenacity-8.0.1.tar.gz 37492 BLAKE2B 10438b3877862baa88d164837b201773c287e7ce11b6213c677c227cbddda02434b423c0f331746495e68ab130ff9a9c720cccd2def3efa8ca6df8eef441eee9 SHA512 b5a615306e25c93d2734d408cc73f4db5361d92b713c1e7bbb57cd7bf635f82c5ccffafe9c0a6bc0da4057d11c92012d2337a5e4f15465bf4e6839d1fa97b877
 DIST tenacity-8.1.0.tar.gz 37658 BLAKE2B 4f9e2ea44ac0f0ed8b694b0f60e938fadbcf65bd989e9d641f7a40750f499aa9635a70d80e406aa2ebf436ebd37cde0d88e8ecb6cb3436ba755c2d921541c8e8 SHA512 194312e80233d6edcdf30496a355b272a4de4809bbe187948a7ce9c1382958845d12401498569f2b8d4251ede2857317820779f13a65bb2e69dcb97dde9bb501
-EBUILD tenacity-8.0.1-r1.ebuild 813 BLAKE2B ef4522a950cbd2a2ea88d1e7a2189682d3b59aace1e385ebe36577bba27fb6db1aa4620d254a2e77c443df90129615e75fd65092f7ba02498557fcf730878e04 SHA512 b7b2e54b6271c7bb4aed7cc20ba1e3b7c41c06db027a74eae8a8f9786b46a9a24c776d8f22f3bc0f7c9b7199b2f093bd81b690cb16c9ae14d54312cabae9b388
-EBUILD tenacity-8.1.0.ebuild 815 BLAKE2B ad7bdd9ad4068a7be40366ed141058c8b3043b40ee6de5ad493a5ba3c8e0c70378e4b39856ef7245c88ec4a6249534d14ac36c74875f18280cecbe3878d427c2 SHA512 dd08f0f6fd5a83bfb8178f1d7a13e854066da1dbb788683ead582fdf0735cf841598f4b8efc624a326dda434db1a4a8aa456615d5de53ee54d43036b5149eac0
+EBUILD tenacity-8.1.0.ebuild 813 BLAKE2B ef4522a950cbd2a2ea88d1e7a2189682d3b59aace1e385ebe36577bba27fb6db1aa4620d254a2e77c443df90129615e75fd65092f7ba02498557fcf730878e04 SHA512 b7b2e54b6271c7bb4aed7cc20ba1e3b7c41c06db027a74eae8a8f9786b46a9a24c776d8f22f3bc0f7c9b7199b2f093bd81b690cb16c9ae14d54312cabae9b388
 MISC metadata.xml 856 BLAKE2B af0d5417912404af6b5be19c32d150db197d27b55681871cbd45f983d1caf8b8ba7c8c44936b1465ecf00b4d185552399d0023bbfc16e84451e4fbf006eefcab SHA512 1fe2c8617bfaeba198a8b5430c2b38acf60f17c29fc89599d198037310589b4a5bb1170919e2f57c3e27951288d06ab281ec5a55ae64e6a0a33296a89be17839
diff --git a/dev-python/tenacity/tenacity-8.0.1-r1.ebuild b/dev-python/tenacity/tenacity-8.0.1-r1.ebuild
deleted file mode 100644
index 763a7ee97acb..000000000000
--- a/dev-python/tenacity/tenacity-8.0.1-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="General-purpose retrying library"
-HOMEPAGE="
-	https://github.com/jd/tenacity/
-	https://pypi.org/project/tenacity/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~riscv x86"
-
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/tornado[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=()
-
-	if ! has_version "dev-python/typeguard[${PYTHON_USEDEP}]"; then
-		EPYTEST_DESELECT+=(
-			tests/test_tenacity.py::TestRetryTyping::test_retry_type_annotations
-		)
-	fi
-
-	epytest
-}
diff --git a/dev-python/tenacity/tenacity-8.1.0.ebuild b/dev-python/tenacity/tenacity-8.1.0.ebuild
index 052487637fd9..763a7ee97acb 100644
--- a/dev-python/tenacity/tenacity-8.1.0.ebuild
+++ b/dev-python/tenacity/tenacity-8.1.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~riscv x86"
 
 BDEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
diff --git a/dev-python/terminado/Manifest b/dev-python/terminado/Manifest
index cb3634d9d470..b93a0f804043 100644
--- a/dev-python/terminado/Manifest
+++ b/dev-python/terminado/Manifest
@@ -1,5 +1,7 @@
 DIST terminado-0.15.0.tar.gz 29599 BLAKE2B b287e5c28fccbf9116d727e11e0a9d3d89f45a16374c7ee950b30427c8f52064dbb59c36fdb7b4d1457a3526e51254708ee13ef3505303c6052da050460046d1 SHA512 9aa00b7e6d442a7358f007be9d45c6a5326243e64d51a2e9fda863ab5ac8f12b72b1684aed91da376e2c45347635fe64a66da5ff2792b2b15d538080fa6f832b
 DIST terminado-0.16.0.tar.gz 28839 BLAKE2B d74846455e1a91e1c16c7cabb42be4e6915d130149a660ac3d555f6bf5a9ce47c7af1f802eb5c065ca99e9cd733b51b31df2bb799c82cc482ba0d0e3c0b36265 SHA512 1b52d6c60b0bd21d19633ae586c7a974035f43dafbf711fc86d667f965de783efc6712e8fe586685ab65b63b3a689b01f730cac6c68a9517e5421b1814f9f897
+DIST terminado-0.17.0.tar.gz 29184 BLAKE2B 2c86d69e08bebe54f451ed2ad0786397e8ef6fb320c233b6361209e9c4e7a996c5b55824a853ec3a9668b265f02f7cde2ed124a6615e0f364cdddaa6270e39e8 SHA512 41e5ee052e8b688d136fd494db3897d703f3666a0b02df71ce3488f2e462ca2e79c631f251cd7721892035c97e7a29662238293010897d7c5fab10f9290adfc9
 EBUILD terminado-0.15.0.ebuild 830 BLAKE2B 7057e5b326c7ccf9d6161d605305649e2e5d40ede784d545d78cc643744a3635a9ca5816902b61031499e4eb5be680a8b92242f73ba2ac41ed67fe2fe73a8383 SHA512 661d79d5eee9d676a19161118105178a2c7db5ac11c32497ecd4851b3abb9e7862275cb2e5b427726ad4e9d8779faf8dc54401d540584cfb956fc92f270cd254
 EBUILD terminado-0.16.0.ebuild 838 BLAKE2B 04a0470130e47523e8fa82cc795bccc9b241b173c0566c3e04baba80e28ab98456e4eeea2e246a80ca0f3169899b19d2781823848492608e7b6f5e6d67f56f07 SHA512 3de45b9c351e2b351d0c3eadc5f2a76809b44edb3622c31529e4baded2dec2abdd3a645d969a6c30572a4bad948a82893f529ae792753bae2e849f5d5b2ecf88
+EBUILD terminado-0.17.0.ebuild 838 BLAKE2B 04a0470130e47523e8fa82cc795bccc9b241b173c0566c3e04baba80e28ab98456e4eeea2e246a80ca0f3169899b19d2781823848492608e7b6f5e6d67f56f07 SHA512 3de45b9c351e2b351d0c3eadc5f2a76809b44edb3622c31529e4baded2dec2abdd3a645d969a6c30572a4bad948a82893f529ae792753bae2e849f5d5b2ecf88
 MISC metadata.xml 407 BLAKE2B 11da32addf98212561629b99650880eca0a6c057414d8a97f535f40b046c6587d326e3193eab264f439caf38e5d6d8f3f5d1a5891746262494ced39effb2651f SHA512 6c993bf16c0413aea33e06efef79dc6189d3b62b71574fffb2bdce7ddb27b4b12f1d5c0d2a3a80a51ae8894c60efb83a9966cabd53662d358f3f1ec52d27590b
diff --git a/dev-python/terminado/terminado-0.17.0.ebuild b/dev-python/terminado/terminado-0.17.0.ebuild
new file mode 100644
index 000000000000..c0e795c0426f
--- /dev/null
+++ b/dev-python/terminado/terminado-0.17.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Terminals served to term.js using Tornado websockets"
+HOMEPAGE="
+	https://github.com/jupyter/terminado/
+	https://pypi.org/project/terminado/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	dev-python/ptyprocess[${PYTHON_USEDEP}]
+	dev-python/tornado[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+src_test() {
+	# workaround new readline defaults
+	echo "set enable-bracketed-paste off" > "${T}"/inputrc || die
+	local -x INPUTRC="${T}"/inputrc
+	distutils-r1_src_test
+}
diff --git a/dev-python/textdistance/Manifest b/dev-python/textdistance/Manifest
index 54d4686260c7..32e1f6799c43 100644
--- a/dev-python/textdistance/Manifest
+++ b/dev-python/textdistance/Manifest
@@ -1,5 +1,3 @@
-DIST textdistance-4.4.0.gh.tar.gz 45542 BLAKE2B ae144cb7179b589f4106ea378e538e0d0240e6e2ac74dc5de8222ec2f671fcd09c4705cb5b30308fdb2f6071578d337c0f88983511229d9f7eb86c924d65bf56 SHA512 727696b76ee8fdfc9bcf028a93baad38882893f62612fa08725e5e8cd104b9450977e3682995c4aa7d997afcc8fdb73e3c72ea6c1a097a9a19dbce98957d4798
 DIST textdistance-4.5.0.gh.tar.gz 46674 BLAKE2B 5bac2690c48fc518b56f7d781803684c1ccccbb54e62c613f87a58f2acf81d28b405be5ffc41c7a304e62bd19732cdf99a03816c00765698439073b76c5be6c0 SHA512 ae51a2a0b69acd5fd64cab9509ad58713044a1307eee884ecf00508f406a9442414b1d8c71798f2c3ed0e9f5b22cca0a467f6d5a5928510adda43c6997ea497c
-EBUILD textdistance-4.4.0.ebuild 838 BLAKE2B 6d7dc0949a8d10a700e19c78ccd3b0c7f4a3a5797be2f1998dd79ef1ed87d6a3bca769b0f5c5bd8cafb602dbf2768de362c3d2c5700d9b234b79fcf461f40cea SHA512 4522f9bf017e67ec047486897286957ac49bfab696f3b01450d10afab4bed7b8bdf1ef80bbaf2c3942ec997f414f7b8bc53b08b5ca1320b7b468054a8c653a47
-EBUILD textdistance-4.5.0.ebuild 840 BLAKE2B 8d6e2ee67118d70c73b27cdc7913bde4ce73cf03ed36658a9f94ce9ac21d89d946457777584d5f4496b27b696b99df06867185d51b723a39b44722c0a481188c SHA512 46aeccc5fb7204836c72d26fa069bb5c267f89f908fb05437c76ae946ebb0c73282a87d891a63935bc733efccf1b73984ae44099da3583cce6fc8965f14f5514
+EBUILD textdistance-4.5.0.ebuild 838 BLAKE2B 6d7dc0949a8d10a700e19c78ccd3b0c7f4a3a5797be2f1998dd79ef1ed87d6a3bca769b0f5c5bd8cafb602dbf2768de362c3d2c5700d9b234b79fcf461f40cea SHA512 4522f9bf017e67ec047486897286957ac49bfab696f3b01450d10afab4bed7b8bdf1ef80bbaf2c3942ec997f414f7b8bc53b08b5ca1320b7b468054a8c653a47
 MISC metadata.xml 517 BLAKE2B a429684151f5700f148c5350b16026e797fdedc80b950d3c79c050a4d7418763918a05936eaeeed07b9756d9ec39602128570cd8c27049234bbda27e006ff00f SHA512 be445c2c21f5fd0bee241f8f76094b51c2fcbd7fe0d2175f7455beb881c3b83e8070c8a14817695d2b7a7dfabcdb856e12d7749aadc91ca31f7af8187e9a409e
diff --git a/dev-python/textdistance/textdistance-4.4.0.ebuild b/dev-python/textdistance/textdistance-4.4.0.ebuild
deleted file mode 100644
index fb039fa7c401..000000000000
--- a/dev-python/textdistance/textdistance-4.4.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Compute distance between the two texts"
-HOMEPAGE="https://github.com/life4/textdistance"
-SRC_URI="
-	https://github.com/life4/textdistance/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-
-BDEPEND="
-	test? (
-		dev-python/abydos[${PYTHON_USEDEP}]
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/isort[${PYTHON_USEDEP}]
-		dev-python/jellyfish[${PYTHON_USEDEP}]
-		dev-python/Levenshtein[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pyxDamerauLevenshtein[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	tests/test_external.py
-)
diff --git a/dev-python/textdistance/textdistance-4.5.0.ebuild b/dev-python/textdistance/textdistance-4.5.0.ebuild
index 427ee9e48841..fb039fa7c401 100644
--- a/dev-python/textdistance/textdistance-4.5.0.ebuild
+++ b/dev-python/textdistance/textdistance-4.5.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/tox/Manifest b/dev-python/tox/Manifest
index 4c679e16e173..70b77f39d7d6 100644
--- a/dev-python/tox/Manifest
+++ b/dev-python/tox/Manifest
@@ -1,3 +1,5 @@
 DIST tox-3.26.0.gh.tar.gz 308035 BLAKE2B 745d1aef11c230971a7b6b1df919440c2be1b9b0f726ab314e1a27fe6fa72b568efc8e336058249721028cc18d2c3453e4806079abb8099baa608bf6b1e98ad7 SHA512 8c2635a640bcc221735f59da633b3ae696d97c076280400f6086703c2e00d8dbad943073e0c63618e5e041199dfebd010a16a00b1498ca9ea8e884648ed40ae5
+DIST tox-3.27.0.gh.tar.gz 308774 BLAKE2B efb3d40aa3045f984fd2534124de506c166fc8fde46d655c608ffcb7a85637ebda5c8bdef6cf4d414d84433fd361143fb91f98877d8112489c479049ec4f01be SHA512 e42cb0c203afb053c8bd6b29e90384fe6c32ab2ee3fb64fe0323474ca0b7f94d3e035d9d15218da28bc93d852c5f266c04b89d4b38db7d843d1098207f99a9bf
 EBUILD tox-3.26.0.ebuild 1916 BLAKE2B ab2496317d588c05936d57132d1c759c9a14f18c10fb50d6188b7bee5bd20de9f06b5d8945a908cbf021f4b7036ba6d23dcf19aad63af9d6cd6bf6baa598ad32 SHA512 b038f9976de8af46ac663faa169a06fad1bd28ef61738679fd70faa5e655c0c85ed3a8e4efddee2dd2aff8cc3fe9f5ec133311d122c6bab15c487a5a074a6c11
+EBUILD tox-3.27.0.ebuild 1924 BLAKE2B d2a5ac59691e8ad704bb64840925d192df827d533c2b17bafa31b95da83a235c28109e911f78e294b12924a99114adad5bbe44cbba67fe8d2d584c9839a70d59 SHA512 aa919c8b15403b9992a772bf0296f4cae2bef39c4ded509f732a13869504f7af15cf43f26c9f401e31794c481a5e1dc4e91c18e65c31a4e159d7b9a2cb1c99ea
 MISC metadata.xml 382 BLAKE2B 7c0704c5c187ce4a7972fe0372b23c5537a81a8d62fd83436d9558a61761f10764adb5a4d5f6795f0dd1fe905afa604c0be77fe1d48d291847f6ae65dc1b032c SHA512 9d0ced4df9352a81034a50d5766a01534ae8fa889985d99cc9e2a8d0889e31c6c11550677d9a5a74e2aab57c320192ce3a42708a6d23b0419ee34a6054398344
diff --git a/dev-python/tox/tox-3.27.0.ebuild b/dev-python/tox/tox-3.27.0.ebuild
new file mode 100644
index 000000000000..87ba6799d964
--- /dev/null
+++ b/dev-python/tox/tox-3.27.0.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+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
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/filelock[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	>=dev-python/pluggy-0.12[${PYTHON_USEDEP}]
+	dev-python/py[${PYTHON_USEDEP}]
+	>=dev-python/six-1.14[${PYTHON_USEDEP}]
+	>=dev-python/virtualenv-20.1.0[${PYTHON_USEDEP}]
+	dev-python/pip[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/tomli-1.0.0[${PYTHON_USEDEP}]
+	' 3.8 3.9 3.10)
+"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/flaky-3.4.0[${PYTHON_USEDEP}]
+		>=dev-python/freezegun-0.3.11[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# broken without Internet
+		tests/unit/session/test_provision.py::test_provision_non_canonical_dep
+		tests/integration/test_provision_int.py::test_provision_interrupt_child
+
+		# expects python2 to exist
+		tests/unit/interpreters/test_interpreters.py::test_tox_get_python_executable
+	)
+
+	[[ ${EPYTHON} != pypy3 ]] && EPYTEST_DESELECT+=(
+		# capfd doesn't seem to work for some non-obvious reason
+		tests/unit/test_z_cmdline.py::TestSession::test_summary_status
+		tests/unit/session/test_provision.py::test_provision_bad_requires
+
+		# TODO?
+		tests/unit/interpreters/test_interpreters.py::test_find_alias_on_path
+	)
+
+	epytest --no-network
+}
diff --git a/dev-python/trimesh/Manifest b/dev-python/trimesh/Manifest
index 9be42660b38a..ae08a45973f4 100644
--- a/dev-python/trimesh/Manifest
+++ b/dev-python/trimesh/Manifest
@@ -3,9 +3,11 @@ DIST trimesh-3.15.2.gh.tar.gz 11956076 BLAKE2B 4ec701056efd29eb24eaf4edc82d07af4
 DIST trimesh-3.15.3.gh.tar.gz 11955970 BLAKE2B 050a1330ff0d3d308f3f54bee9080907b839e8cfcc9bdc831d3c5033225a9868aefe2ceb39313949288c779a1af577911a7e43fe2745f50c4983c178dcf02742 SHA512 e01192496af519be7f4d04b6268f82227a0d00c2feebf294572cdd6cce151d10d271cb8b8558c48200338d2f6ea4137fe75d92d115ea8b42f0117ad135566d05
 DIST trimesh-3.15.4.gh.tar.gz 11956349 BLAKE2B 5d67b4e7ce0183fb9031c4cf032caf56e366b0ff05713a22d83258d13283b5bca5b08174044aa29af1d02112717c21be668315d99ea3ce203f318416b9eff583 SHA512 98e2711d46f8299132f0fd32b347393a4fc300f08c93f81e6e82b662bac57044678c425455549899ef839467d9a0dc249a4a03c14c816f0377545b74e6523e00
 DIST trimesh-3.15.5.gh.tar.gz 11956403 BLAKE2B 5e36a7fd57689f5151ee710a707bf44ff4c9538c3f541cd3d29bb08722b4bfeead7f138dab02a58a80d18b4831044d1ac674e3defd0e378420540976c422fc22 SHA512 4433480ff96be561d32412870c71420699713c53d34b2f84eabb1fa1eaa9e70d74940674e62a547c31e22dd941bb036179785a35ff2c8d27288300033497d5ac
+DIST trimesh-3.15.7.gh.tar.gz 11972453 BLAKE2B 0f1c10d096289122bb1cc853f4879718f3e03dd9b4297a25be4db2a232a08b0e8d496ec5cc98b2d4c4214ba296666291fe24b7dcc5d2e430105ba46cb4fb5838 SHA512 c09862de650829e853d7d4f2b53b72ddeac48ad313975dc2919c0bbb11d16d0fe5aa69810d488291b187e827b63caeb03847c143cd6812ae09c2d98d51e42270
 EBUILD trimesh-3.14.1.ebuild 1863 BLAKE2B 7b8f0fc5c878d18b0ac6ff779474555e6ce2eef6f86fdf2da2e8e547351de67485d6d7c0092bc19e0e0be29ea9e0eb9c9180fb387c3075b8ee3f38869d4848d2 SHA512 f015e4269fa2282a8827c764d5d23c5fbbf5f1de5c509e651e29fb91983157114b13fb832c80a3600b6ae2ccf48a0e9b1ac15dd0880d56443c24632980e2b3e7
 EBUILD trimesh-3.15.2.ebuild 1864 BLAKE2B 6342098e247117e1d01b4709787765b5a12c9ae1e74fc0b7f028f397bb72ce8478ffa7364add4d5886ac1dd1a9d1e2e167f25d55cf9109dcc0d11148bed89e2e SHA512 7518ddb6538df22b9b56e1e097e597f276d12b8e333051c88fc5c9370b745e72feaf355495268003ee9001a8c57f88aa7822cf80635525ff295f1e3f241ca7e9
 EBUILD trimesh-3.15.3.ebuild 1864 BLAKE2B 6342098e247117e1d01b4709787765b5a12c9ae1e74fc0b7f028f397bb72ce8478ffa7364add4d5886ac1dd1a9d1e2e167f25d55cf9109dcc0d11148bed89e2e SHA512 7518ddb6538df22b9b56e1e097e597f276d12b8e333051c88fc5c9370b745e72feaf355495268003ee9001a8c57f88aa7822cf80635525ff295f1e3f241ca7e9
 EBUILD trimesh-3.15.4.ebuild 1864 BLAKE2B 6342098e247117e1d01b4709787765b5a12c9ae1e74fc0b7f028f397bb72ce8478ffa7364add4d5886ac1dd1a9d1e2e167f25d55cf9109dcc0d11148bed89e2e SHA512 7518ddb6538df22b9b56e1e097e597f276d12b8e333051c88fc5c9370b745e72feaf355495268003ee9001a8c57f88aa7822cf80635525ff295f1e3f241ca7e9
 EBUILD trimesh-3.15.5.ebuild 1864 BLAKE2B 6342098e247117e1d01b4709787765b5a12c9ae1e74fc0b7f028f397bb72ce8478ffa7364add4d5886ac1dd1a9d1e2e167f25d55cf9109dcc0d11148bed89e2e SHA512 7518ddb6538df22b9b56e1e097e597f276d12b8e333051c88fc5c9370b745e72feaf355495268003ee9001a8c57f88aa7822cf80635525ff295f1e3f241ca7e9
+EBUILD trimesh-3.15.7.ebuild 1864 BLAKE2B 6342098e247117e1d01b4709787765b5a12c9ae1e74fc0b7f028f397bb72ce8478ffa7364add4d5886ac1dd1a9d1e2e167f25d55cf9109dcc0d11148bed89e2e SHA512 7518ddb6538df22b9b56e1e097e597f276d12b8e333051c88fc5c9370b745e72feaf355495268003ee9001a8c57f88aa7822cf80635525ff295f1e3f241ca7e9
 MISC metadata.xml 495 BLAKE2B b8b403f7bfbac53ed234c2ba50324041502a28465d70e9406867f05741e0313845307491fcfd85f05e2993b21daf14117a4b6863b45422fd4c62c6e28902e3ff SHA512 3deec8ab4b513536a7fe182be8f1b96e06fd06b2480d3e516c2b3462cc26fcbdeb1d165b4d0297465e93c0cce584ab40a8f905b81a59dcb4040a39655028783d
diff --git a/dev-python/trimesh/trimesh-3.15.7.ebuild b/dev-python/trimesh/trimesh-3.15.7.ebuild
new file mode 100644
index 000000000000..11e1a73dfac5
--- /dev/null
+++ b/dev-python/trimesh/trimesh-3.15.7.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1 multiprocessing optfeature
+
+DESCRIPTION="Python library for loading and using triangular meshes"
+HOMEPAGE="
+	https://trimsh.org/
+	https://github.com/mikedh/trimesh/
+	https://pypi.org/project/trimesh/
+"
+SRC_URI="
+	https://github.com/mikedh/${PN}/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/chardet[${PYTHON_USEDEP}]
+	dev-python/colorlog[${PYTHON_USEDEP}]
+	dev-python/jsonschema[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/msgpack[${PYTHON_USEDEP}]
+	dev-python/networkx[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/pycollada[${PYTHON_USEDEP}]
+	dev-python/pyglet[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/scipy[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/shapely-1.8.2[${PYTHON_USEDEP}]
+	dev-python/svg-path[${PYTHON_USEDEP}]
+	dev-python/sympy[${PYTHON_USEDEP}]
+	dev-python/xxhash[${PYTHON_USEDEP}]
+	sci-libs/rtree[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	epytest -n "$(makeopts_jobs)"
+}
+
+pkg_postinst() {
+	optfeature_header "${PN} functionality can be extended by installing the following packages:"
+	optfeature "making GUI applications with 3D stuff" dev-python/glooey
+	optfeature "2D triangulations of polygons" dev-python/mapbox_earcut
+	optfeature "loading a number of additional mesh formats" dev-python/meshio
+	optfeature "figuring out how much memory we have" dev-python/psutil
+	optfeature "marching cubes and other nice stuff" sci-libs/scikit-image
+}
diff --git a/dev-python/uc-micro-py/Manifest b/dev-python/uc-micro-py/Manifest
index 9c9bde9d9468..52c1d84733f0 100644
--- a/dev-python/uc-micro-py/Manifest
+++ b/dev-python/uc-micro-py/Manifest
@@ -1,3 +1,3 @@
 DIST uc.micro-py-1.0.1.gh.tar.gz 6235 BLAKE2B 7ba5935e97d9926789cde37491ce09235f467781ddd99dc841f70bd42a13c87bdc3a7970684cab81684620c1c49e1bc316faa0d4e8664293c76cf7c86e24c446 SHA512 c6747943bd4ac9a3b7bf8d02a52947df04d4d4986311da7fa77d6ae010d512de9ad429d78a436a2f8e11c6f2d8dde00bea70ea0b1237a35e5b16ed4ad6b430fe
-EBUILD uc-micro-py-1.0.1.ebuild 645 BLAKE2B 2185ed84a1efe11dc3c6e55bde8052a1a59091cb7cd6023fb23e8a267afab8e908bdb1c616a056254d541040c75dc29eb978d214664e06ffd700ab097d88093c SHA512 e627899ccd71b5ce940c941a0a36e69a7e3e16684c1e1f76c51d8f46ef549124b2bd9ec89ce83f33971f816b0bd1e82a239304a5c28d63936334dd0906a3ee1d
+EBUILD uc-micro-py-1.0.1.ebuild 643 BLAKE2B 317374c2619d4cd6744e39c309e52b7582de73e46957124491cd2e822e3f67cfd1372cf28dd98b5041a3fc7e1d5902ad6bdf489764a88c64728c4a4be2f1633b SHA512 27865de48a1d5efdb6dc70a5f4907e5b14f5c621ab26fc05037a1243506892ae94f9fdbe7259cb3e2d3c4265bd178cbfcf78129df23e4f473372d3fe3e49d2a2
 MISC metadata.xml 398 BLAKE2B 50edd762e30f62e95f9dcb2adf2e41ff274dc211503ce4da4bd2bd44730c4d23e8eb35acf76ad00cf7207f197d277eea2dfedcfec776a09157d0975d00738fd2 SHA512 4b4e9fbc1618864bb5007f8d10b4d54768152e09a043f719559063ef4799ce87bf500580cd68694988b3d42e4c43bd21b728f2c37de48b59d968718292726ce6
diff --git a/dev-python/uc-micro-py/uc-micro-py-1.0.1.ebuild b/dev-python/uc-micro-py/uc-micro-py-1.0.1.ebuild
index 393dd5290f80..3643ec606c64 100644
--- a/dev-python/uc-micro-py/uc-micro-py-1.0.1.ebuild
+++ b/dev-python/uc-micro-py/uc-micro-py-1.0.1.ebuild
@@ -22,6 +22,6 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/ujson/Manifest b/dev-python/ujson/Manifest
index 852787c56a4c..348d100fac61 100644
--- a/dev-python/ujson/Manifest
+++ b/dev-python/ujson/Manifest
@@ -1,5 +1,3 @@
-DIST ujson-5.4.0.tar.gz 7139576 BLAKE2B d3bd6bcc4dc733cafc47e613e2dc503e8cf7faf562d2fad91ea66b1a62dd4a8d67a2c80c392eba0c224f382280e58ff3fff51308c22862aaae5e671b5183027c SHA512 9622e872391d5467455b32e324d7b680487664ca486bfc56ba8c3969853e5db94725cd45e81b535dca80af4a3c718af171ce7adb6dcb9b98a37a8068824f89c6
 DIST ujson-5.5.0.tar.gz 7140414 BLAKE2B cca99fbb8cec447500c0dec34a952c4474acd0149783c887ee713cee60859570e41c9e349d49ff7eeba645d0c04a7e368da2ec8c42b6f55f59e971f834449e3a SHA512 883c0bd8b933557fc98556af1679de6df0372ee83a5533d8ea3f994dc13cd9bcd3140e2532ea1ad24419dab9ffbb59027e00f0a5e7ca285bf68358205a07bcd5
-EBUILD ujson-5.4.0.ebuild 879 BLAKE2B f58b2f5d57429fd3d899023579443447348e2784052777267ccc86c5ab53e79ee72aa09effc370a8ed5fdd43b7d98fe08bb00ccb3e3083e6c3ddfb1d890cd542 SHA512 25da7256c33440a0f8577ebaf46900254fa66be01651895609ca28d2cf244262d2164bcf2f8f550e163bfa6cbc6a2c63c77ebbdbca315b7c354e77f9457869dd
-EBUILD ujson-5.5.0.ebuild 883 BLAKE2B 53b31100105961b8be57f353de9c24919f93410a9c6f8869786ad7d24e007e6e472886a50f47758581c76f76031173f3ab8abd33c91d3feafda97c8428f89fd0 SHA512 af0ff62802e67cba5dfd7fa869b68ee47f7f693607998f26890e6e83f0fd1d8b112cc618224774a1cf4aade2b53e90ee5c9f6d1eb6fc2f442e7d3624f0c319c1
+EBUILD ujson-5.5.0.ebuild 879 BLAKE2B f58b2f5d57429fd3d899023579443447348e2784052777267ccc86c5ab53e79ee72aa09effc370a8ed5fdd43b7d98fe08bb00ccb3e3083e6c3ddfb1d890cd542 SHA512 25da7256c33440a0f8577ebaf46900254fa66be01651895609ca28d2cf244262d2164bcf2f8f550e163bfa6cbc6a2c63c77ebbdbca315b7c354e77f9457869dd
 MISC metadata.xml 494 BLAKE2B 8e20150926d62643e7ff2110cba22313db0c0e3112290ce08302d57103aa35c42a56921d0b46e0acca2ef83756eb4f7384f23ddb06fe41ef6c4a28921f11ec33 SHA512 d9c0a59f916b84d50e51a21152c1815fea90a909dc9bd44ea620b2a33ca6a92ee237aafe29debcc9d1a2bf63c84112300845309eb0ab1265e5d2b0c05dd313f0
diff --git a/dev-python/ujson/ujson-5.4.0.ebuild b/dev-python/ujson/ujson-5.4.0.ebuild
deleted file mode 100644
index 3c98bbb8b172..000000000000
--- a/dev-python/ujson/ujson-5.4.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Ultra fast JSON encoder and decoder for Python"
-HOMEPAGE="
-	https://github.com/ultrajson/ultrajson/
-	https://pypi.org/project/ujson/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
-
-DEPEND="
-	dev-libs/double-conversion:=
-"
-RDEPEND="
-	${DEPEND}
-"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytz[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_configure() {
-	export UJSON_BUILD_DC_INCLUDES="${EPREFIX}/usr/include/double-conversion"
-	export UJSON_BUILD_DC_LIBS="-ldouble-conversion"
-	export UJSON_BUILD_NO_STRIP=1
-}
diff --git a/dev-python/ujson/ujson-5.5.0.ebuild b/dev-python/ujson/ujson-5.5.0.ebuild
index ca2f1fe67e94..3c98bbb8b172 100644
--- a/dev-python/ujson/ujson-5.5.0.ebuild
+++ b/dev-python/ujson/ujson-5.5.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
 
 DEPEND="
 	dev-libs/double-conversion:=
diff --git a/dev-python/uvloop/Manifest b/dev-python/uvloop/Manifest
index fc5baad5bcc5..5e51b575d429 100644
--- a/dev-python/uvloop/Manifest
+++ b/dev-python/uvloop/Manifest
@@ -5,5 +5,5 @@ DIST uvloop-0.17.0.tar.gz 2279973 BLAKE2B 7ccbf3b8e723e36c1010a70e256de0ad1a9728
 EBUILD uvloop-0.15.3-r1.ebuild 1393 BLAKE2B 025fce332c25bb7e1fb1188ad9257a8d807da11c71a3b6bcf02b3bcdb54b22b0522cbe0ebf3ee7a2bacc90342d6820ea6952473e45baf9dd92e7638dc1a545ae SHA512 b6e13f27b6b06046c133c0af0d55a03a211c5a56cbf8eb37fe8f6b33b4e8a3440f2353f50485dfe415145f0c17b1b6f24329d5fa16524d86baae68cba3ab4a64
 EBUILD uvloop-0.15.3.ebuild 1193 BLAKE2B fc992ae7c17888c29828b7cd7b56c77c8465e914b85b62935e1b2392448a9c5bd6ba19b59d10168ab7255761aea277922d56522007ba8212e4b774072d3124a0 SHA512 779c79417e4b2ef607e96619600c2a4f996957408e0ebebb9fa900e144aa20f409ae72ea9b9c05ab3dd90711a67edf3f424187551eedafdbd77ebae6e950c62c
 EBUILD uvloop-0.16.0.ebuild 1418 BLAKE2B 5ee1d50ac599e891886a6a2b9e72a93a2e0da3d327cb6d645e01b0ee02ddf05c5ca3a941144a5b98af6618c313dae561a5903f2099be11de8b82044d7d386014 SHA512 9ca8fadb5a77f5888479828f225b378c9f501e2fa520a646cfa46c7b44cba8981f846d9862c983fffadb0db7e7f2f7d33656a665d95ee8fff1e391e8c73266cb
-EBUILD uvloop-0.17.0.ebuild 1844 BLAKE2B 17955a3da62ec9c657aca7d0475c3013af363c92f5d5145885545f1882a98f29ee779bb96d87f2004f085bf143ae37f3b1fbbd5bed64b1919cbe1528e7a9fc0b SHA512 1e473fdeca939f589c92943649a999c1940073f19fe6bff3620b2e2a4c232113e71973d8b8aea865a5736f503a28c03feb950c6abe5297569923d348a9883a86
+EBUILD uvloop-0.17.0.ebuild 1843 BLAKE2B e5c5f751d69dbd6e65896956d924fc76ab82f6ef2d0646867bcefbbf6f08ce9805381fcfe1e83668525c3deded1e1488d56219132465d5e20b2e311ccfe1ce81 SHA512 f31a077473e6f9da18b0e69bafb1c8a7b4cd832151ff0c37df14552e6781dc50e9dc41edcc3fa444610617a1ab2159f542a0f04d192783b3fa198c3392c11a47
 MISC metadata.xml 527 BLAKE2B 2db44bdfb681fcce35ef35f13155293ac3fdffa12a695b654ed8acc608cf1f769243136e66b6b2c1afd57caa7e59a66a60d34631c37a4b98a474bd0635fcbaa3 SHA512 02540835a23405c467293395fa7984741e02ca1aca75f527edd3b988d307b41db0f729d5cc0b3a826a652fb7104dec7be86a9a57f4d5646d2af87255cc2d90de
diff --git a/dev-python/uvloop/uvloop-0.17.0.ebuild b/dev-python/uvloop/uvloop-0.17.0.ebuild
index a3880a3bf1b2..8435741ffde1 100644
--- a/dev-python/uvloop/uvloop-0.17.0.ebuild
+++ b/dev-python/uvloop/uvloop-0.17.0.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="
 "
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
-KEYWORDS="~amd64 arm arm64 ppc ppc64 -riscv sparc ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 -riscv sparc ~x86"
 LICENSE="MIT"
 SLOT="0"
 IUSE="examples"
diff --git a/dev-python/versioningit/Manifest b/dev-python/versioningit/Manifest
index 0d1e746d9663..b94f293e4c9e 100644
--- a/dev-python/versioningit/Manifest
+++ b/dev-python/versioningit/Manifest
@@ -1,5 +1,7 @@
 DIST versioningit-2.0.0.tar.gz 735138 BLAKE2B 59247c0a2ec85f828b1b36c7f7ff6981fdd430b242c262f7325586e8ab35410083e0a795e72204c9ad9c0c50bb02c047f8baa01c556f74d69a8ddfc9e911474b SHA512 d700e25f3b58efd87943a950ede66ad8814e3aeea1927bb68b51312a636684b16695c44492f4357595305a5a85a3fc8c411d80a02e9b157162844d731dcab93f
 DIST versioningit-2.0.1.tar.gz 735415 BLAKE2B 92aefa4c565ba1e7e707e7ea53a139c64e645ca5e68c74f8ee516122996037061174f703b566458d947e131ed56cc0a9922ce23bf82680607591900a7cc88e36 SHA512 b6f8c578d36607731429e43a7bd349ac69e44943a7b9a79c9f70e1dd44201ee6af239a575ebb36a44e870ee2a121a91d1d63c8e63dadaac71139431ef2eb36e5
+DIST versioningit-2.1.0.tar.gz 735718 BLAKE2B edceb4b5a76ecc5e4f5549a348cd5c72bd1c77be1fb6d8c1694af4c94ff38e773b2e288ad22cecd93a3cd14d602dd6c50634db74a51e486856472098cf18bf89 SHA512 0cea71e8b21edefba008d947d8527810e1e38c8e2f208707dbc913b3734b51a57b20444fa4dd703574f0106068518057496292ae5997d85ba047ff4795ba64fa
 EBUILD versioningit-2.0.0.ebuild 860 BLAKE2B 5b99a6099f118843506107b7738b12588971c23e63a73f9394457b364bbd852cb9af74d69db6226d94ab219cde4549bba8a6e4887b5ff6df9956fbc01e7cd1cc SHA512 fa0ad9816f14251306d7564691737a54e1f29a59be9f420a307737092c774a53eb920d3f0c5380f8c5c6b7381b0fb276be0efecc81201af7fc90f49c08350ef9
 EBUILD versioningit-2.0.1.ebuild 929 BLAKE2B 8199783dd855462257cabbf7a9e0cd4410c56ebdacebe366942d96419e1166f8e46efa17057c7d42f2ac9b0cb5d2e8b3f78b7fc665be5ec79ad5d9b148136103 SHA512 48a02043ff2dc4ac192f968dd73fd562bb3f1b190beff1e667b4e6dd7ae5e0dd103785310047f1bc45347f1178c1c7ee94c3da3004750787bf4c6fc232653573
+EBUILD versioningit-2.1.0.ebuild 1070 BLAKE2B 1c30c64ad22abf66d00c0af9928e8a0c2dc3e6282ea1003be1873c514e5bbb5a419af988872d4a1ef97c28879396506d9a3de420ded558e09808516e95de833b SHA512 fa96caba1dba1107d7a7b0f7fbf4b237fedb04172d4c255e3c9e6aa94ec0a765529c87f4808323c43e5e52e14b5cf22feec12f1425e9b2034ff9711842e35fed
 MISC metadata.xml 400 BLAKE2B 96934adb9ade5b51537765da51d530a644f87328688415cfd5b239048adede18db1ec7cbb2a234cc2e28fea368aa9c815176bb22262c9053fdc2c85c6c6e3f56 SHA512 9070b850fff35058a11cc7504bbc5fbef17cc9154df5419a64bae10fd3cb160a043ffd0880fc3c5054bd1d2eb4891bcbf5764c56f2441ab79366336caf91e379
diff --git a/dev-python/versioningit/versioningit-2.1.0.ebuild b/dev-python/versioningit/versioningit-2.1.0.ebuild
new file mode 100644
index 000000000000..0cf6927c80d4
--- /dev/null
+++ b/dev-python/versioningit/versioningit-2.1.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="A setuptools plugin for versioning based on git tags"
+HOMEPAGE="
+	https://github.com/jwodder/versioningit/
+	https://pypi.org/project/versioningit/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/packaging-17.1[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/importlib_metadata[${PYTHON_USEDEP}]
+	' 3.8 3.9)
+	$(python_gen_cond_dep '
+		<dev-python/tomli-3[${PYTHON_USEDEP}]
+	' 3.8 3.9 3.10)
+"
+BDEPEND="
+	test? (
+		dev-python/pydantic[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_IGNORE=(
+	# Tries to do wheel/pip installs
+	test/test_end2end.py
+)
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	sed -i -e '/-cov/d' tox.ini || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	epytest -p no:pytest-describe
+}
diff --git a/dev-python/virtualenv/Manifest b/dev-python/virtualenv/Manifest
index 72b8eff7d8bd..b13789cdb145 100644
--- a/dev-python/virtualenv/Manifest
+++ b/dev-python/virtualenv/Manifest
@@ -1,3 +1,5 @@
 DIST virtualenv-20.16.5.tar.gz 12223925 BLAKE2B 4f87f955d2d2c2b722d7a3699a74dc06aff7f2898203e87e607d1cabf182954fdf5eb2ba847d7b5641ded88e068d6e133441082703f8d874fbb92583f72eb6b1 SHA512 2d4f96057eb8fea5da07126bbc656306b8ebc2db1c82a84b784fcb82cd1959a571dc1f016dead9561e1d073a8b06e10f2e225d6484b363b960adaa64239826d3
+DIST virtualenv-20.16.6.tar.gz 12233333 BLAKE2B 3165de2c5350185f06ad2c1b105987b6bca421d5172a07dbef6486a285c2c5e7f8e095901241c894daec11f2e9bc565ddb2a7605eb5ff5ec9f84ea77296ab206 SHA512 24ca5038cc4e9cd72cf99a8bd4b96bda10cdc8deae2e6e7a0bef5000fd8fbeda87c4fda21aeb3b109a3763e47e0a7c7a5f383914a1bb1edcd8ed6791117d91cb
 EBUILD virtualenv-20.16.5.ebuild 4831 BLAKE2B cba04409dcadfcf6c9b740b8b2fa86fc9df4556976a59ae709ec9a4ecf6313c82aa8dd33bc0c21fddf9b60c52315cb41df2d0beee85d2f0e22c7d766fb6fe882 SHA512 f18f48920f7115b97b7ce4bc2a1f179a47f5a52956b4ad0190c15e1181a987e0cf2a8de4347016d4e7ba593790ad6125d763f20250fc5fe0f6c46631b74163fe
+EBUILD virtualenv-20.16.6.ebuild 4839 BLAKE2B 259bdef9e234b3bca21b50185633b6965e193ccdb9e09d7dcd2efcd88d8727f75bd3324efb6f0520735b3bef65c2e1f464a10fe0b899c7c29a874e3a82c2d843 SHA512 75d3fa99788c16f6688aec27f6e60f6cddb24e41c1a34f521b1cc4e5817580791050a900e78de126d826914bb2d5872c265ac4ad469c42a9c25f9f378d30023d
 MISC metadata.xml 406 BLAKE2B 97fee04c2662c5c36b6e16538284def46eb2454424770f42edf2567ed804ca15c4e969c714c57573f897b0946246577ab6e35204ed1f3f1735713d8ab5d24667 SHA512 356d42db463b63a3b3a55c1e98eb661de0a10aa6a5fde4f8b3f888ec73020c6679e86efd8dbb0b3e4a5a720af95e658612ba460fe548e081a90beec75fb9c1b2
diff --git a/dev-python/virtualenv/virtualenv-20.16.6.ebuild b/dev-python/virtualenv/virtualenv-20.16.6.ebuild
new file mode 100644
index 000000000000..23c6be3b691c
--- /dev/null
+++ b/dev-python/virtualenv/virtualenv-20.16.6.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Virtual Python Environment builder"
+HOMEPAGE="
+	https://virtualenv.pypa.io/en/stable/
+	https://pypi.org/project/virtualenv/
+	https://github.com/pypa/virtualenv/
+"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+SLOT="0"
+
+RDEPEND="
+	>=dev-python/distlib-0.3.6[${PYTHON_USEDEP}]
+	>=dev-python/filelock-3.4.1[${PYTHON_USEDEP}]
+	>=dev-python/platformdirs-2.4[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-63.2.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+"
+# coverage is used somehow magically in virtualenv, maybe it actually
+# tests something useful
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/flaky[${PYTHON_USEDEP}]
+		>=dev-python/pip-22.2.1[${PYTHON_USEDEP}]
+		>=dev-python/pytest-freezegun-0.4.2[${PYTHON_USEDEP}]
+		>=dev-python/pytest-mock-3.6.1[${PYTHON_USEDEP}]
+		>=dev-python/pytest-timeout-2.1[${PYTHON_USEDEP}]
+		dev-python/wheel[${PYTHON_USEDEP}]
+		>=dev-python/packaging-20.0[${PYTHON_USEDEP}]
+	)
+"
+
+# (unpackaged deps)
+#distutils_enable_sphinx docs \
+#	dev-python/sphinx-argparse \
+#	dev-python/sphinx_rtd_theme \
+#	dev-python/towncrier
+distutils_enable_tests pytest
+
+src_configure() {
+	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		tests/unit/activation/test_xonsh.py
+		tests/unit/seed/embed/test_bootstrap_link_via_app_data.py::test_seed_link_via_app_data
+		tests/unit/create/test_creator.py::test_cross_major
+		# tests failing without python2 installed
+		"tests/unit/create/test_creator.py::test_py_pyc_missing[True-False]"
+		"tests/unit/create/test_creator.py::test_py_pyc_missing[False-False]"
+	)
+	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
+		'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-isolated]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-global]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-isolated]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-global]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[root-venv-copies-isolated]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[root-venv-copies-global]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[venv-venv-copies-isolated]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[venv-venv-copies-global]'
+		'tests/unit/create/test_creator.py::test_zip_importer_can_import_setuptools'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.10-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.10--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.9-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.9--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.10-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.10--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3--bin-]'
+	)
+	[[ ${EPYTHON} == python3.11 ]] && EPYTEST_DESELECT+=(
+		# TODO
+		tests/unit/discovery/py_info/test_py_info.py::test_py_info_setuptools
+		tests/unit/discovery/py_info/test_py_info.py::test_custom_venv_install_scheme_is_prefered
+	)
+
+	epytest
+}
+
+pkg_postinst() {
+	elog "Please note that while virtualenv package no longer supports"
+	elog "Python 2.7, you can still create py2.7 virtualenvs via:"
+	elog "  $ virtualenv -p 2.7 ..."
+}
diff --git a/dev-python/vpython/Manifest b/dev-python/vpython/Manifest
index 8ac77d84d2c2..c9b8d57743d4 100644
--- a/dev-python/vpython/Manifest
+++ b/dev-python/vpython/Manifest
@@ -1,3 +1,5 @@
 DIST vpython-7.6.3.tar.gz 4461187 BLAKE2B 4698396fb9f846db59233bb6795748cadf7a0c8c4b1969dfe439965fa29db703806197a6e91b5d91935b8fdcf5c626dac6613a73e06b88c899bdddd0b19ef69e SHA512 0270103eb5c67ecbf7461e1821e3502295976f430d290fbefc5281643802963bf6ccd729eb37b19e50b2403f7cf0dc09f869d4cd30726ccd086bacb6180f868e
+DIST vpython-7.6.4.tar.gz 4504204 BLAKE2B 941eff8f9e5ca636001785b21e914194a4a84b910b8e329a45e2c0f0857c46c7658f9d0db128b524a0b760aa04d523617b473e73438d88ffb13e6ffdcc4419fe SHA512 997a6e351e0ae86938e557029a4888a508cdd7ae6aaa25dc578a772a5bbee857edc7c4414d48a9a6a48eff1e0ba435cfd24b98c47a6286cf0bb43e48db2b57c9
 EBUILD vpython-7.6.3.ebuild 785 BLAKE2B af2a51fa6bd5201efee6ae144db9dd3a95cbec1a2860067e34caaca772a0d517b3ab2b326dce7c613e581208e54ae2fedf8f20ec618566140b0f940058a320bb SHA512 9bb052adaa29f1fc50a434bd893782a9aec1b3d748a10ad399e2b508aff4db3f8107be7669102c0bc6d9cfa95b74a577e3cc926c817df8e51d55ceb31c4cb3e4
+EBUILD vpython-7.6.4.ebuild 707 BLAKE2B 8782be60f25d271cc9d24a1a0422efc3330a7c65b2339e5d40372f391dec7fa11f71763835bdd92349d11ebb95658bc3f9c8338a5304307f5b408d932aeee680 SHA512 99da11b0c5f5f94034487d19fa9a42600bf97e34529673333f745277f154952ed5daf1d30a9f27444a575ec117be7a9dda8be0d7ae01f1763eaa56bffd85edc6
 MISC metadata.xml 755 BLAKE2B 5dcd80ebf6280ce667a184f4126adb8302cffbd498395a3c2c53e0774c3b3633b97ea498cc1456a318cb9640f845690b99dac23f154a1045ed0342eb6d068eb1 SHA512 99adc64719b3b0691e83aa1b6140ce3a5ea8894572405c86eac365dfe3009bbe73ec7694be78887250de81fa718a20ba3246a7dedbddc97a4ccdd3523904e20d
diff --git a/dev-python/vpython/vpython-7.6.4.ebuild b/dev-python/vpython/vpython-7.6.4.ebuild
new file mode 100644
index 000000000000..f72ecbdce015
--- /dev/null
+++ b/dev-python/vpython/vpython-7.6.4.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="VPython for Jupyter notebook"
+HOMEPAGE="https://www.vpython.org/ https://pypi.org/project/vpython/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/autobahn-18.8.2[${PYTHON_USEDEP}]
+	dev-python/ipykernel[${PYTHON_USEDEP}]
+	dev-python/jupyter[${PYTHON_USEDEP}]
+	dev-python/jupyter-server-proxy[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+"
+
+RESTRICT="test"
+
+distutils_enable_tests pytest
diff --git a/dev-python/websockets/Manifest b/dev-python/websockets/Manifest
index 00868d572959..45f1372bc8e9 100644
--- a/dev-python/websockets/Manifest
+++ b/dev-python/websockets/Manifest
@@ -1,4 +1,6 @@
 AUX websockets-10.3-py311.patch 1065 BLAKE2B 16e66f28b0b1bd68b28bafd91ff83fd72d295ff52fa53420ec4a9be31ae66c4b0f4e515b8c62feba616cd6d3650af30566c97f157dec469f2f3de5e584eb0b7f SHA512 94c34e96b9d6ee75599be33bb246ac21a41763f51dc59255632273f8d46d0553f275c9e888615adda93047ab65eeb577dab64a5153c1cb3155c27f9618c0c961
 DIST websockets-10.3.gh.tar.gz 304375 BLAKE2B db6075304613ff74ad5928a0c57e90a7d418ac0b9532adba4c6a17b3c3f1982cc94db8ac4c0da5f65343a915f3b2e7ccedce4e6d5d4960cb72fc93c3db6e041c SHA512 75a11dd7605808954c5f59decda5b115db73de96ed4023d8d7ee3c9966551a9ded2d771f76b086c76f49b0787f19349dadcd9010eb5fea8eeddf3d9bba1c6cbb
+DIST websockets-10.4.gh.tar.gz 309611 BLAKE2B f3a739368ff9d78fef79324af59d1e77b3fb654b8b1a847373a29f19b11ae9266b9a938d235ee27d12b59d9b4cf29825fc7298ff2f35e5b260df2c7a41a1bd78 SHA512 087b1920ff26e21b8d3b80b53249d44b841fc45a4992df1ad725112404f724a41aaa2d759a2bd521dfe337459f8bf0d2ae048c423489f527c68f6825f928b582
 EBUILD websockets-10.3.ebuild 871 BLAKE2B b97e0aee91257ce1bb254f0e81017bc49d488d332d6206ad3dd9a429218f6d7f9ba0d185b6bc59160f638a4e0d1b81caa046e70afa9829bd3f615a1006f420c6 SHA512 d25050228fe2fcffad26943fa4b54e4cefedb73e4894cdab4e301e5f5d942e53edb769daa7cea808e09c29c85f0da202f52fa209339dd6ada1e87e56a2682154
+EBUILD websockets-10.4.ebuild 834 BLAKE2B d4e9f008874c530ac2bec8b35045011a4e70a28cfea69521aa4a5d53da0131366d194edc94140fb4e18ab21050d6ebc30601283318e558b74c1bf68885fbdcd6 SHA512 31377f86cd37787f32a8e049afd59e28510a2f23746927d2530374bf5a9267721b36958d162896827975904411a847ae7ca195b3383b9c6b911c7aa2011c7312
 MISC metadata.xml 488 BLAKE2B 06ed81aa4ffa49d1951a8ef639752bc701d798fa531737d4cb367ca198e65178f430d6b1e7f3b24ffcc332343dd58a0cc8ff5f2632a225e6c0f36ee50148aebd SHA512 8335bde47d396c018b32db406e18636edd7f3fe5704c901888d56690ec726aeb7d6f9e42fb7dbb1869c78b494c9cbc17ded3ca78b7576d6fdc0a8097bf996f60
diff --git a/dev-python/websockets/websockets-10.4.ebuild b/dev-python/websockets/websockets-10.4.ebuild
new file mode 100644
index 000000000000..12d175fce31a
--- /dev/null
+++ b/dev-python/websockets/websockets-10.4.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Library for building WebSocket servers and clients in Python"
+HOMEPAGE="
+	https://websockets.readthedocs.io/
+	https://github.com/aaugustin/websockets/
+	https://pypi.org/project/websockets/
+"
+SRC_URI="
+	https://github.com/aaugustin/websockets/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# very fragile to speed
+		tests/legacy/test_protocol.py::ServerTests::test_local_close_receive_close_frame_timeout
+	)
+
+	epytest tests
+}
diff --git a/dev-python/zope-hookable/Manifest b/dev-python/zope-hookable/Manifest
index 2d78ac11a68d..d53d470bd421 100644
--- a/dev-python/zope-hookable/Manifest
+++ b/dev-python/zope-hookable/Manifest
@@ -1,5 +1,3 @@
-DIST zope.hookable-5.1.0.tar.gz 21922 BLAKE2B c8bb0c6fb20718127fc2b3d7a2654035a14f87a52b41331ec3d564fe7dd175a977911e1a5847e544e30eeeb473b1fdb5d75ece7ece4b5a4212fec8f6d85a3d44 SHA512 af63fd7c83bbaf2c6c1faaefc7081a9a739b835fb5f1fe48f8f6b66a82596d52d0559df8de1beceb129578ee2ed9711ee05a9aa2dd0eec98dca6db40b45a4665
 DIST zope.hookable-5.2.tar.gz 24004 BLAKE2B f1b64a906a849442437a3829d509210280066b41bc97fbedcd02b462fa9c7761910a7a71ed00430679f7c3ec9648c8a9ab5e88d4e8143018e44194d56611353a SHA512 b04107acedcc245fa99a59de71ffeaabe270ec15eaac32df1f5433ca16ea568d60c272349c8c8d7e512dfadef4fc8fcebf63a62ee9c8607fc02505a4457e1ed3
-EBUILD zope-hookable-5.1.0.ebuild 973 BLAKE2B d1325d1ae489dd9c7c9f757eab994cf01a2bfcde734b841b5cb771d7970eb5086fd3144786ecd8db19a667ce54700acbccd4859369bbd279b08d8287eda2ec1b SHA512 13b12baf36909a19225011ffbea033a4de5fa4176649c41dfcbb57acd9dc38dc7083538e40bbe11def7051c3bd3b983c3287834029d46aea5d7a72c8d60e28dd
-EBUILD zope-hookable-5.2.ebuild 974 BLAKE2B 53a6b36ec8f18de09db6ef8b25888469efddbfa2e7c862a31030991182a6ab97dca53dd6bff8172216435ce014e1e1420e1b7bfcbcf2dc10290b2b49a95ac006 SHA512 eac06b5af5e634509998e86df57dc6c98293942dfee2bca33eb67d1af0d82a0a61b6e3451fe60c31bfe025fea9d1f20a1a1d3cb5cf40211949288355bbc381c4
+EBUILD zope-hookable-5.2.ebuild 973 BLAKE2B d1325d1ae489dd9c7c9f757eab994cf01a2bfcde734b841b5cb771d7970eb5086fd3144786ecd8db19a667ce54700acbccd4859369bbd279b08d8287eda2ec1b SHA512 13b12baf36909a19225011ffbea033a4de5fa4176649c41dfcbb57acd9dc38dc7083538e40bbe11def7051c3bd3b983c3287834029d46aea5d7a72c8d60e28dd
 MISC metadata.xml 363 BLAKE2B 292afad5ddaa2ae9ea128a842934b751d16d84aebd617a9e5f6c2165245137f11089670fc78791ce46ccb260c5acbf0527030889d709725f6f89532f3972c0c2 SHA512 40afd7e868b05d352bc5f268d056f3550e924e22b07b1f0e41afd25429017cb28fd5b6caf565df04bfcecf5cc1c183d12a122a906affd813542ef32cbbc230a3
diff --git a/dev-python/zope-hookable/zope-hookable-5.1.0.ebuild b/dev-python/zope-hookable/zope-hookable-5.1.0.ebuild
deleted file mode 100644
index 6907af03c507..000000000000
--- a/dev-python/zope-hookable/zope-hookable-5.1.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1
-
-MY_PN=${PN/-/.}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Efficient creation of 'hookable' objects"
-HOMEPAGE="
-	https://pypi.org/project/zope.hookable/
-	https://github.com/zopefoundation/zope.hookable/
-"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="ZPL"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv ~x86"
-
-BDEPEND="
-	test? (
-		dev-python/zope-testing[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	# strip rdep specific to namespaces
-	sed -i -e "/'setuptools'/d" setup.py || die
-	distutils-r1_src_prepare
-}
-
-python_compile() {
-	distutils-r1_python_compile
-	find "${BUILD_DIR}" -name '*.pth' -delete || die
-}
-
-python_test() {
-	eunittest -s "${BUILD_DIR}/install$(python_get_sitedir)/zope/hookable/tests"
-}
diff --git a/dev-python/zope-hookable/zope-hookable-5.2.ebuild b/dev-python/zope-hookable/zope-hookable-5.2.ebuild
index 486c9f59477e..6907af03c507 100644
--- a/dev-python/zope-hookable/zope-hookable-5.2.ebuild
+++ b/dev-python/zope-hookable/zope-hookable-5.2.ebuild
@@ -21,7 +21,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="ZPL"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv ~x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-ros/Manifest.gz b/dev-ros/Manifest.gz
index 17b7069fbd26..249ae61098a9 100644
Binary files a/dev-ros/Manifest.gz and b/dev-ros/Manifest.gz differ
diff --git a/dev-ros/gencpp/Manifest b/dev-ros/gencpp/Manifest
index 9128bfc0bb4e..1a436b0dd90b 100644
--- a/dev-ros/gencpp/Manifest
+++ b/dev-ros/gencpp/Manifest
@@ -1,4 +1,4 @@
-DIST gencpp-0.6.5.tar.gz 9803 BLAKE2B 3f22693cf8924a9c6c88aea287eb44f15670c0289c441a4dc631e9386d28702be074551ce2f0585cfc8f237a4d3925206c56d9cd760aae63655c9e7fc6bd82d2 SHA512 37f8869f2671a2dbbaf2d6fe9517cf0675639b3d1ce1940cb3ae3ce40432a61cafbe8e272a71b49cc1068f33dd5201cf3e0a2e0bed1c9ed1a5053669e35596aa
-EBUILD gencpp-0.6.5.ebuild 419 BLAKE2B e9ee054671d8be3df2d2a8f652ca7610add0b067843a51a4916009e8455c5b92cd77d871979d114c95ba3e19b8fcf71f02fc23d869b8d08ea195c912c11bf609 SHA512 09ae8a02e185c3c6a3ec3698169d2cde259e0359c5167f4e463d7b9ede123675b9f3167dc72eb9270524121588c3401e3de5f61bf583c42bdb1564bd09c67791
+DIST gencpp-0.7.0.tar.gz 9914 BLAKE2B 79a259768be409d4d05a6b7f71a709761ac9c49aeb82a2910045c205eb6600a08e20c6457c36cb3d7b27865c8fcb4e90f65e5c622ee24567c36d6fc04ca0dff7 SHA512 5fc73ef7e03b1712ddb071ba3d6f49b6657eca3ebadb8384f19efe457f3de2fb799c02a603ea32960c265acd2bd752a0a020db753bf0f2c4d00fdd102da4519f
+EBUILD gencpp-0.7.0.ebuild 419 BLAKE2B bf93d5cfe1f10bf53d1b7388ca73f9c0575fdf808d5032a151b2f252dad757904577ed8223102c6e1130f2f1d83a78a72b17c3616008ad11eda6ac5a15075df1 SHA512 826d3ab1fe58f46630b3d8321e81c49e59b80ef06fc144d2debad1ece8c0caceab2e320893c41183c40670e618c60fc2ae13c4af07a6c9717882d4fee2ca5c08
 EBUILD gencpp-9999.ebuild 419 BLAKE2B e9ee054671d8be3df2d2a8f652ca7610add0b067843a51a4916009e8455c5b92cd77d871979d114c95ba3e19b8fcf71f02fc23d869b8d08ea195c912c11bf609 SHA512 09ae8a02e185c3c6a3ec3698169d2cde259e0359c5167f4e463d7b9ede123675b9f3167dc72eb9270524121588c3401e3de5f61bf583c42bdb1564bd09c67791
 MISC metadata.xml 325 BLAKE2B bd01d794167f45d5860b3022b18d57a360570f6863c45b8d1d6c5f3f6c7ae024fad4407fec94c3ad5030bfa2f67d58b5fc8ce3cc093432adabab2a890697e79d SHA512 f5adf69f5c684d1bcbdbede7c27ce5c20aa2b53c16a1d62c45b415a9b8993ab4ce9e46edf5146ab3108f5794e5f03b2ecc9b2dfc6644db99a5c0c6fd667bd09e
diff --git a/dev-ros/gencpp/gencpp-0.6.5.ebuild b/dev-ros/gencpp/gencpp-0.7.0.ebuild
similarity index 91%
rename from dev-ros/gencpp/gencpp-0.6.5.ebuild
rename to dev-ros/gencpp/gencpp-0.7.0.ebuild
index dca06b5f534d..44bc8f1377ba 100644
--- a/dev-ros/gencpp/gencpp-0.6.5.ebuild
+++ b/dev-ros/gencpp/gencpp-0.7.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/dev-ros/genmsg/Manifest b/dev-ros/genmsg/Manifest
index 34771ff1bafc..7f9659d30511 100644
--- a/dev-ros/genmsg/Manifest
+++ b/dev-ros/genmsg/Manifest
@@ -1,4 +1,4 @@
-DIST genmsg-0.5.16.tar.gz 60357 BLAKE2B 5d26540123606cac3590d54848f5999fc470008fe5c71abeaac01108f7b22a4d5b0282ebc109e747d1caf459daa88bce26ce206b480f63626205adba7decb1ed SHA512 6a658cc3a895f546592a540f2bcbfb3819321242ddaf47eabbf02207994af4cf4152bce042846d4ae3fcdda2664b6b255702a2cebfcaa80892b964a6822a5390
-EBUILD genmsg-0.5.16.ebuild 420 BLAKE2B ca149b07462e5685ecb165a60dc5051390fd0a2b571eff994e1676515ca007054d315ffb4897fa6d89f5447a4e3265feb4815b8b87a836d9fef92b35a1bcbcc2 SHA512 00ee8810e797c1b4525310e3a19e8071a58f4339441ce4826541fc9065cd08e7b5d447e086f83045851ac5302d3f34b1445c3d9e6b2e7efa6a45decd98e99021
+DIST genmsg-0.6.0.tar.gz 60465 BLAKE2B d4b3fb69b540d5ae152ea9ba99f8a95f3ec0f2327abc3358c3f7e98710791d6cef7537a1c1de2229e103ffe80e7c67fadcbc1b781e3df2430dc379a14cc9a5a2 SHA512 73e0f16dfa0096c358c7b19fb5d5126af32ea24240611c4b45857a79d44d5a4aa77f34e4f0b4e2f38592f23b127ac1ffe74794be0b622921fd76353d9e42ea0d
+EBUILD genmsg-0.6.0.ebuild 420 BLAKE2B eb2bff8a10c307d298249bea738d89389518f762a89a53df427a212275f117c4e63ab8d69decb4c9800bf468548082843433751a0e9e358fce0f3eaf764e8994 SHA512 fa2612c88b0d1fb53852ae819c76994ed165cfc2b2b8fe2cdd8fe8f632660efc4b883feac1e32ed34bae4d199ada90edfe5661c9140d2978475eabc51430b9d0
 EBUILD genmsg-9999.ebuild 420 BLAKE2B ca149b07462e5685ecb165a60dc5051390fd0a2b571eff994e1676515ca007054d315ffb4897fa6d89f5447a4e3265feb4815b8b87a836d9fef92b35a1bcbcc2 SHA512 00ee8810e797c1b4525310e3a19e8071a58f4339441ce4826541fc9065cd08e7b5d447e086f83045851ac5302d3f34b1445c3d9e6b2e7efa6a45decd98e99021
 MISC metadata.xml 325 BLAKE2B 3e3786038456f5b774bc801719a505629abf8f617388d983cac1b976649593dbbbedd6e3037b92297b030f3fc7f28df8d599c0a340f8bd00c80372848908e426 SHA512 f219d532fbb81af5b68f9800c3ec3c285d628cc2830c94e2efa5e16299f8ad66929c0816220cb6659b1aa9f4e35549039f91433bf0614e951aa0e804003e546c
diff --git a/dev-ros/genmsg/genmsg-0.5.16.ebuild b/dev-ros/genmsg/genmsg-0.6.0.ebuild
similarity index 91%
rename from dev-ros/genmsg/genmsg-0.5.16.ebuild
rename to dev-ros/genmsg/genmsg-0.6.0.ebuild
index 7ae92b459ca2..7747d17bdcd2 100644
--- a/dev-ros/genmsg/genmsg-0.5.16.ebuild
+++ b/dev-ros/genmsg/genmsg-0.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/dev-ros/test_tf2/Manifest b/dev-ros/test_tf2/Manifest
index 9630e8c274e9..c262f6551dfe 100644
--- a/dev-ros/test_tf2/Manifest
+++ b/dev-ros/test_tf2/Manifest
@@ -1,4 +1,6 @@
 DIST geometry2-0.7.5.tar.gz 176126 BLAKE2B 56f2062ca86b3573e9df59df4c400fd5eee35c7e30abb1f0d94b1e117a224fcb1272eaf9de14dc257d8c8438a414fd8d121d314e560e6712ca4db0da190075d5 SHA512 b3413282d2ad0aae54b0093607eee106cdd7ed23f4e5fbb1728ed4f848ee081257b9217696301e9f7860369dc98679d8abff12213ff3a69b39b061f02f5da8c9
+DIST geometry2-0.7.6.tar.gz 176927 BLAKE2B c18a8be79a17194e339188b938d51d69deb70ac4bbc3038349d5fd4ac4a63c4d812bf6dc1f4ce6bcf64545e0abaa88e7eede008f3f6c5590cc860148f8dd8e39 SHA512 dec7c618da9eec07b202b1d67b367c8e71451a05b4ffa15d1e86651857054e7e43682ef7a95580853ee9767f17229b623fd73a495a184e4e9e3fdf024be2d440
 EBUILD test_tf2-0.7.5-r1.ebuild 792 BLAKE2B cd9b0f163e6552c709b4342fe66d1ef95a8e09b66b8eff24ad9adbd638a26db2069ed0bd67ded44690c99fb3223bf177bb989d9d93163e2b9f512760c4f38975 SHA512 9209e30d6e676c8c62cc760aeceb26aa087311947432c776d19edb8dac6ff2dd84107d1b87420d2774d3a28eef7d0b1c8fa58d8756980ece7ea7cb76c55780e7
+EBUILD test_tf2-0.7.6.ebuild 792 BLAKE2B cd9b0f163e6552c709b4342fe66d1ef95a8e09b66b8eff24ad9adbd638a26db2069ed0bd67ded44690c99fb3223bf177bb989d9d93163e2b9f512760c4f38975 SHA512 9209e30d6e676c8c62cc760aeceb26aa087311947432c776d19edb8dac6ff2dd84107d1b87420d2774d3a28eef7d0b1c8fa58d8756980ece7ea7cb76c55780e7
 EBUILD test_tf2-9999.ebuild 792 BLAKE2B cd9b0f163e6552c709b4342fe66d1ef95a8e09b66b8eff24ad9adbd638a26db2069ed0bd67ded44690c99fb3223bf177bb989d9d93163e2b9f512760c4f38975 SHA512 9209e30d6e676c8c62cc760aeceb26aa087311947432c776d19edb8dac6ff2dd84107d1b87420d2774d3a28eef7d0b1c8fa58d8756980ece7ea7cb76c55780e7
 MISC metadata.xml 328 BLAKE2B 5d01fb15d8c37e69075781dd7bef78b9869406d861b88cbbf91590293271ddc1ae9a34b5337a04784eecd84ee0bafd6510bc898f01b5544b1c62cb84d17bc2bc SHA512 cbd2de98ae5d8e11f22b1a35f28e4731210cfe819422d4ca22ac925532c453396b37b37b4be59369133558d9ce35158ce3a2c0c826626ab784bbc3ee66d76019
diff --git a/dev-ros/test_tf2/test_tf2-0.7.6.ebuild b/dev-ros/test_tf2/test_tf2-0.7.6.ebuild
new file mode 100644
index 000000000000..3482393f54a3
--- /dev/null
+++ b/dev-ros/test_tf2/test_tf2-0.7.6.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros/geometry2"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="TF2 unit tests"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="
+	dev-ros/rosconsole
+	dev-ros/roscpp
+	dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/tf
+	dev-ros/tf2
+	dev-ros/tf2_bullet
+	dev-ros/tf2_eigen
+	dev-ros/tf2_ros[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/tf2_geometry_msgs[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/tf2_kdl[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/tf2_msgs
+	dev-ros/rosbash
+	sci-libs/orocos_kdl
+	$(python_gen_cond_dep "dev-python/python_orocos_kdl[\${PYTHON_USEDEP}]")
+	dev-libs/boost:=
+	dev-cpp/gtest
+"
+
+mycatkincmakeargs=( "-DCATKIN_ENABLE_TESTING=ON" )
diff --git a/dev-ros/tf2/Manifest b/dev-ros/tf2/Manifest
index e950ab67fb56..8a9096b3c6ec 100644
--- a/dev-ros/tf2/Manifest
+++ b/dev-ros/tf2/Manifest
@@ -1,8 +1,10 @@
 DIST geometry2-0.7.2.tar.gz 174319 BLAKE2B 0f319055cf0a4c8a425c31abc981ee1aee3c77b9dae8e0ddae6a0c4bdf09c31373b8005cb05177374ae5a2139c0f49a4cfdd5b966f8e991827ca2c6e471dcdd2 SHA512 8c2ad4e67d4d7509c3d9a7ef781d454eeb570fbc29d201ece7d2613258b7bed2ba00398655901e2b5856b59acad94422dbb6ae1f0bd545b3a41353204c31d00b
 DIST geometry2-0.7.3.tar.gz 175974 BLAKE2B a0edbeea6db30f07d5cf6ddd4d0a8a1ce0221c8b0ad01929aa6a73a7a49e2e5bd08dfd01cef6cd964ea93b6e8f5aa1dd6ec395e8e4bbafa1117eb3436cae9c10 SHA512 20d207218000905a17411ee9c662778b3022481e84b903ca616cdfc439b2af55c7182988dc843103edc471d564e988fa311be916d0810ec86228585500ed532e
 DIST geometry2-0.7.5.tar.gz 176126 BLAKE2B 56f2062ca86b3573e9df59df4c400fd5eee35c7e30abb1f0d94b1e117a224fcb1272eaf9de14dc257d8c8438a414fd8d121d314e560e6712ca4db0da190075d5 SHA512 b3413282d2ad0aae54b0093607eee106cdd7ed23f4e5fbb1728ed4f848ee081257b9217696301e9f7860369dc98679d8abff12213ff3a69b39b061f02f5da8c9
+DIST geometry2-0.7.6.tar.gz 176927 BLAKE2B c18a8be79a17194e339188b938d51d69deb70ac4bbc3038349d5fd4ac4a63c4d812bf6dc1f4ce6bcf64545e0abaa88e7eede008f3f6c5590cc860148f8dd8e39 SHA512 dec7c618da9eec07b202b1d67b367c8e71451a05b4ffa15d1e86651857054e7e43682ef7a95580853ee9767f17229b623fd73a495a184e4e9e3fdf024be2d440
 EBUILD tf2-0.7.2-r1.ebuild 552 BLAKE2B a076447ad7962cc19e4a9dd66f777a614b1030e55cd1c7380b4012dd4ea83ba7abed3d5c1fd8d62d2cde72247c41bce2ac27443e1e7e7b1c17ed559e7c903450 SHA512 ee3cba17202bf25aad5204218677a12479f2d303ab0a0b800eddd6dd7c09ad9f5755620862f387c301d45225ade5ed23ca233e522b0c299df6faf5e65d428a1b
 EBUILD tf2-0.7.3-r1.ebuild 552 BLAKE2B a076447ad7962cc19e4a9dd66f777a614b1030e55cd1c7380b4012dd4ea83ba7abed3d5c1fd8d62d2cde72247c41bce2ac27443e1e7e7b1c17ed559e7c903450 SHA512 ee3cba17202bf25aad5204218677a12479f2d303ab0a0b800eddd6dd7c09ad9f5755620862f387c301d45225ade5ed23ca233e522b0c299df6faf5e65d428a1b
 EBUILD tf2-0.7.5-r1.ebuild 552 BLAKE2B a076447ad7962cc19e4a9dd66f777a614b1030e55cd1c7380b4012dd4ea83ba7abed3d5c1fd8d62d2cde72247c41bce2ac27443e1e7e7b1c17ed559e7c903450 SHA512 ee3cba17202bf25aad5204218677a12479f2d303ab0a0b800eddd6dd7c09ad9f5755620862f387c301d45225ade5ed23ca233e522b0c299df6faf5e65d428a1b
+EBUILD tf2-0.7.6.ebuild 552 BLAKE2B a076447ad7962cc19e4a9dd66f777a614b1030e55cd1c7380b4012dd4ea83ba7abed3d5c1fd8d62d2cde72247c41bce2ac27443e1e7e7b1c17ed559e7c903450 SHA512 ee3cba17202bf25aad5204218677a12479f2d303ab0a0b800eddd6dd7c09ad9f5755620862f387c301d45225ade5ed23ca233e522b0c299df6faf5e65d428a1b
 EBUILD tf2-9999.ebuild 552 BLAKE2B a076447ad7962cc19e4a9dd66f777a614b1030e55cd1c7380b4012dd4ea83ba7abed3d5c1fd8d62d2cde72247c41bce2ac27443e1e7e7b1c17ed559e7c903450 SHA512 ee3cba17202bf25aad5204218677a12479f2d303ab0a0b800eddd6dd7c09ad9f5755620862f387c301d45225ade5ed23ca233e522b0c299df6faf5e65d428a1b
 MISC metadata.xml 328 BLAKE2B 5d01fb15d8c37e69075781dd7bef78b9869406d861b88cbbf91590293271ddc1ae9a34b5337a04784eecd84ee0bafd6510bc898f01b5544b1c62cb84d17bc2bc SHA512 cbd2de98ae5d8e11f22b1a35f28e4731210cfe819422d4ca22ac925532c453396b37b37b4be59369133558d9ce35158ce3a2c0c826626ab784bbc3ee66d76019
diff --git a/dev-ros/tf2/tf2-0.7.6.ebuild b/dev-ros/tf2/tf2-0.7.6.ebuild
new file mode 100644
index 000000000000..401a57c0c955
--- /dev/null
+++ b/dev-ros/tf2/tf2-0.7.6.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros/geometry2"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="The second generation Transform Library in ROS"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-libs/console_bridge:=
+	dev-ros/rostime
+	dev-libs/boost:=
+"
+DEPEND="${RDEPEND}
+	dev-ros/tf2_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	test? ( dev-ros/roscpp dev-cpp/gtest )
+"
diff --git a/dev-ros/tf2_bullet/Manifest b/dev-ros/tf2_bullet/Manifest
index 1fd8f72d500d..12b5af56da98 100644
--- a/dev-ros/tf2_bullet/Manifest
+++ b/dev-ros/tf2_bullet/Manifest
@@ -1,8 +1,10 @@
 DIST geometry2-0.7.2.tar.gz 174319 BLAKE2B 0f319055cf0a4c8a425c31abc981ee1aee3c77b9dae8e0ddae6a0c4bdf09c31373b8005cb05177374ae5a2139c0f49a4cfdd5b966f8e991827ca2c6e471dcdd2 SHA512 8c2ad4e67d4d7509c3d9a7ef781d454eeb570fbc29d201ece7d2613258b7bed2ba00398655901e2b5856b59acad94422dbb6ae1f0bd545b3a41353204c31d00b
 DIST geometry2-0.7.3.tar.gz 175974 BLAKE2B a0edbeea6db30f07d5cf6ddd4d0a8a1ce0221c8b0ad01929aa6a73a7a49e2e5bd08dfd01cef6cd964ea93b6e8f5aa1dd6ec395e8e4bbafa1117eb3436cae9c10 SHA512 20d207218000905a17411ee9c662778b3022481e84b903ca616cdfc439b2af55c7182988dc843103edc471d564e988fa311be916d0810ec86228585500ed532e
 DIST geometry2-0.7.5.tar.gz 176126 BLAKE2B 56f2062ca86b3573e9df59df4c400fd5eee35c7e30abb1f0d94b1e117a224fcb1272eaf9de14dc257d8c8438a414fd8d121d314e560e6712ca4db0da190075d5 SHA512 b3413282d2ad0aae54b0093607eee106cdd7ed23f4e5fbb1728ed4f848ee081257b9217696301e9f7860369dc98679d8abff12213ff3a69b39b061f02f5da8c9
+DIST geometry2-0.7.6.tar.gz 176927 BLAKE2B c18a8be79a17194e339188b938d51d69deb70ac4bbc3038349d5fd4ac4a63c4d812bf6dc1f4ce6bcf64545e0abaa88e7eede008f3f6c5590cc860148f8dd8e39 SHA512 dec7c618da9eec07b202b1d67b367c8e71451a05b4ffa15d1e86651857054e7e43682ef7a95580853ee9767f17229b623fd73a495a184e4e9e3fdf024be2d440
 EBUILD tf2_bullet-0.7.2.ebuild 457 BLAKE2B 4f01b20c3e90a32f0e0f303e7baa7fd23c47563efe7438dd9565aa011383e9ab4790c2d64af4a6fd673e68420caa9847982050d7ba022cf11855ec46a2a41c2f SHA512 09de7347d738dcb12c1376c133ff7bdc6a53942f06e4f816755d1be77d5f27baecdd18e2cb2cb81ad6309125a103e1b339a7677effca9736f53e49a3a0264d9e
 EBUILD tf2_bullet-0.7.3.ebuild 457 BLAKE2B 4f01b20c3e90a32f0e0f303e7baa7fd23c47563efe7438dd9565aa011383e9ab4790c2d64af4a6fd673e68420caa9847982050d7ba022cf11855ec46a2a41c2f SHA512 09de7347d738dcb12c1376c133ff7bdc6a53942f06e4f816755d1be77d5f27baecdd18e2cb2cb81ad6309125a103e1b339a7677effca9736f53e49a3a0264d9e
 EBUILD tf2_bullet-0.7.5.ebuild 457 BLAKE2B 4f01b20c3e90a32f0e0f303e7baa7fd23c47563efe7438dd9565aa011383e9ab4790c2d64af4a6fd673e68420caa9847982050d7ba022cf11855ec46a2a41c2f SHA512 09de7347d738dcb12c1376c133ff7bdc6a53942f06e4f816755d1be77d5f27baecdd18e2cb2cb81ad6309125a103e1b339a7677effca9736f53e49a3a0264d9e
+EBUILD tf2_bullet-0.7.6.ebuild 457 BLAKE2B 1de38d726609c6569109189ac8d1bfb48482d7e90bc8d365b700e1ec22a69d7b172e15a41669e20739a67401913c05295b5d059caa3dad2514a035386d37edf7 SHA512 6889b9578544e58b21e68e051c754fe40fb2bc485869995858f3065b3ca033d48ca241d357952e17a35b40cfdc1672e9b712c3efbd336940916e62cab61d0342
 EBUILD tf2_bullet-9999.ebuild 457 BLAKE2B 4f01b20c3e90a32f0e0f303e7baa7fd23c47563efe7438dd9565aa011383e9ab4790c2d64af4a6fd673e68420caa9847982050d7ba022cf11855ec46a2a41c2f SHA512 09de7347d738dcb12c1376c133ff7bdc6a53942f06e4f816755d1be77d5f27baecdd18e2cb2cb81ad6309125a103e1b339a7677effca9736f53e49a3a0264d9e
 MISC metadata.xml 328 BLAKE2B 5d01fb15d8c37e69075781dd7bef78b9869406d861b88cbbf91590293271ddc1ae9a34b5337a04784eecd84ee0bafd6510bc898f01b5544b1c62cb84d17bc2bc SHA512 cbd2de98ae5d8e11f22b1a35f28e4731210cfe819422d4ca22ac925532c453396b37b37b4be59369133558d9ce35158ce3a2c0c826626ab784bbc3ee66d76019
diff --git a/dev-ros/tf2_bullet/tf2_bullet-0.7.6.ebuild b/dev-ros/tf2_bullet/tf2_bullet-0.7.6.ebuild
new file mode 100644
index 000000000000..27a56c4a1f9b
--- /dev/null
+++ b/dev-ros/tf2_bullet/tf2_bullet-0.7.6.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros/geometry2"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="TF2 bullet support"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/tf2
+	sci-physics/bullet
+"
+DEPEND="${RDEPEND}
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	test? ( dev-cpp/gtest )
+"
+BDEPEND="
+	virtual/pkgconfig
+"
diff --git a/dev-ros/tf2_eigen/Manifest b/dev-ros/tf2_eigen/Manifest
index b190dd35be1a..7c62d57bbc84 100644
--- a/dev-ros/tf2_eigen/Manifest
+++ b/dev-ros/tf2_eigen/Manifest
@@ -1,8 +1,10 @@
 DIST geometry2-0.7.2.tar.gz 174319 BLAKE2B 0f319055cf0a4c8a425c31abc981ee1aee3c77b9dae8e0ddae6a0c4bdf09c31373b8005cb05177374ae5a2139c0f49a4cfdd5b966f8e991827ca2c6e471dcdd2 SHA512 8c2ad4e67d4d7509c3d9a7ef781d454eeb570fbc29d201ece7d2613258b7bed2ba00398655901e2b5856b59acad94422dbb6ae1f0bd545b3a41353204c31d00b
 DIST geometry2-0.7.3.tar.gz 175974 BLAKE2B a0edbeea6db30f07d5cf6ddd4d0a8a1ce0221c8b0ad01929aa6a73a7a49e2e5bd08dfd01cef6cd964ea93b6e8f5aa1dd6ec395e8e4bbafa1117eb3436cae9c10 SHA512 20d207218000905a17411ee9c662778b3022481e84b903ca616cdfc439b2af55c7182988dc843103edc471d564e988fa311be916d0810ec86228585500ed532e
 DIST geometry2-0.7.5.tar.gz 176126 BLAKE2B 56f2062ca86b3573e9df59df4c400fd5eee35c7e30abb1f0d94b1e117a224fcb1272eaf9de14dc257d8c8438a414fd8d121d314e560e6712ca4db0da190075d5 SHA512 b3413282d2ad0aae54b0093607eee106cdd7ed23f4e5fbb1728ed4f848ee081257b9217696301e9f7860369dc98679d8abff12213ff3a69b39b061f02f5da8c9
+DIST geometry2-0.7.6.tar.gz 176927 BLAKE2B c18a8be79a17194e339188b938d51d69deb70ac4bbc3038349d5fd4ac4a63c4d812bf6dc1f4ce6bcf64545e0abaa88e7eede008f3f6c5590cc860148f8dd8e39 SHA512 dec7c618da9eec07b202b1d67b367c8e71451a05b4ffa15d1e86651857054e7e43682ef7a95580853ee9767f17229b623fd73a495a184e4e9e3fdf024be2d440
 EBUILD tf2_eigen-0.7.2.ebuild 450 BLAKE2B 6453f8e86a3cfeff6b756287a6b1e80131ba9de5e92071e843d043b9f9b57269d3f6a045160798f1f5000d1f20e41aeab1d2f9c5f6e672d8813f75829c24fd9c SHA512 39491cb43bfe97e7045424656c5fbd26df5e0ac2ecd970c33e30dac4920b2ddbe8291d6b59693f6327a0d5e7501337512390b949ffae189d119c1d1ab55cb4bb
 EBUILD tf2_eigen-0.7.3.ebuild 450 BLAKE2B 6453f8e86a3cfeff6b756287a6b1e80131ba9de5e92071e843d043b9f9b57269d3f6a045160798f1f5000d1f20e41aeab1d2f9c5f6e672d8813f75829c24fd9c SHA512 39491cb43bfe97e7045424656c5fbd26df5e0ac2ecd970c33e30dac4920b2ddbe8291d6b59693f6327a0d5e7501337512390b949ffae189d119c1d1ab55cb4bb
 EBUILD tf2_eigen-0.7.5.ebuild 450 BLAKE2B 6453f8e86a3cfeff6b756287a6b1e80131ba9de5e92071e843d043b9f9b57269d3f6a045160798f1f5000d1f20e41aeab1d2f9c5f6e672d8813f75829c24fd9c SHA512 39491cb43bfe97e7045424656c5fbd26df5e0ac2ecd970c33e30dac4920b2ddbe8291d6b59693f6327a0d5e7501337512390b949ffae189d119c1d1ab55cb4bb
+EBUILD tf2_eigen-0.7.6.ebuild 450 BLAKE2B 9d73585249b715aac23b767606ed5ae3fe3e03be53a2fda8c626d0b4737db1f88f4f7a1420ad1f03ff873d47b017c104e18243276ce730e8cc365d37ca60a47a SHA512 3321e9d47ac19ee98ff9277c7014c33e056b3b9ea8f6ab9cec4ce718be9808c7587ff0bd1b11fa80b2eae404843a5243ecb0ecaf2ad5501477f8400851b41f8f
 EBUILD tf2_eigen-9999.ebuild 450 BLAKE2B 6453f8e86a3cfeff6b756287a6b1e80131ba9de5e92071e843d043b9f9b57269d3f6a045160798f1f5000d1f20e41aeab1d2f9c5f6e672d8813f75829c24fd9c SHA512 39491cb43bfe97e7045424656c5fbd26df5e0ac2ecd970c33e30dac4920b2ddbe8291d6b59693f6327a0d5e7501337512390b949ffae189d119c1d1ab55cb4bb
 MISC metadata.xml 328 BLAKE2B 5d01fb15d8c37e69075781dd7bef78b9869406d861b88cbbf91590293271ddc1ae9a34b5337a04784eecd84ee0bafd6510bc898f01b5544b1c62cb84d17bc2bc SHA512 cbd2de98ae5d8e11f22b1a35f28e4731210cfe819422d4ca22ac925532c453396b37b37b4be59369133558d9ce35158ce3a2c0c826626ab784bbc3ee66d76019
diff --git a/dev-ros/tf2_eigen/tf2_eigen-0.7.6.ebuild b/dev-ros/tf2_eigen/tf2_eigen-0.7.6.ebuild
new file mode 100644
index 000000000000..71831bfac320
--- /dev/null
+++ b/dev-ros/tf2_eigen/tf2_eigen-0.7.6.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros/geometry2"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="TF2 eigen support"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/tf2
+"
+DEPEND="${RDEPEND}
+	dev-ros/cmake_modules
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-cpp/eigen:3
+	test? ( dev-cpp/gtest )
+"
diff --git a/dev-ros/tf2_geometry_msgs/Manifest b/dev-ros/tf2_geometry_msgs/Manifest
index 5a010d2b0abb..8116bd688a90 100644
--- a/dev-ros/tf2_geometry_msgs/Manifest
+++ b/dev-ros/tf2_geometry_msgs/Manifest
@@ -1,8 +1,10 @@
 DIST geometry2-0.7.2.tar.gz 174319 BLAKE2B 0f319055cf0a4c8a425c31abc981ee1aee3c77b9dae8e0ddae6a0c4bdf09c31373b8005cb05177374ae5a2139c0f49a4cfdd5b966f8e991827ca2c6e471dcdd2 SHA512 8c2ad4e67d4d7509c3d9a7ef781d454eeb570fbc29d201ece7d2613258b7bed2ba00398655901e2b5856b59acad94422dbb6ae1f0bd545b3a41353204c31d00b
 DIST geometry2-0.7.3.tar.gz 175974 BLAKE2B a0edbeea6db30f07d5cf6ddd4d0a8a1ce0221c8b0ad01929aa6a73a7a49e2e5bd08dfd01cef6cd964ea93b6e8f5aa1dd6ec395e8e4bbafa1117eb3436cae9c10 SHA512 20d207218000905a17411ee9c662778b3022481e84b903ca616cdfc439b2af55c7182988dc843103edc471d564e988fa311be916d0810ec86228585500ed532e
 DIST geometry2-0.7.5.tar.gz 176126 BLAKE2B 56f2062ca86b3573e9df59df4c400fd5eee35c7e30abb1f0d94b1e117a224fcb1272eaf9de14dc257d8c8438a414fd8d121d314e560e6712ca4db0da190075d5 SHA512 b3413282d2ad0aae54b0093607eee106cdd7ed23f4e5fbb1728ed4f848ee081257b9217696301e9f7860369dc98679d8abff12213ff3a69b39b061f02f5da8c9
+DIST geometry2-0.7.6.tar.gz 176927 BLAKE2B c18a8be79a17194e339188b938d51d69deb70ac4bbc3038349d5fd4ac4a63c4d812bf6dc1f4ce6bcf64545e0abaa88e7eede008f3f6c5590cc860148f8dd8e39 SHA512 dec7c618da9eec07b202b1d67b367c8e71451a05b4ffa15d1e86651857054e7e43682ef7a95580853ee9767f17229b623fd73a495a184e4e9e3fdf024be2d440
 EBUILD tf2_geometry_msgs-0.7.2.ebuild 743 BLAKE2B 55c997a7bea8455aa43fc5e6f90fcba98394c0e6272063db8cda7f3fd44af650022caa2a04dbc5e422c90574031b04c5ae2d32ce964b3da4999a83d45fad8d38 SHA512 da8a273299becc67a333f1949cb90a389c6328e9a78fd8fa4998e242fabddbbe9b535d4c39bfd4ba97ed7a2b6ef794b327dc628abced8b4c3bf1f4bcda6a9995
 EBUILD tf2_geometry_msgs-0.7.3.ebuild 743 BLAKE2B 55c997a7bea8455aa43fc5e6f90fcba98394c0e6272063db8cda7f3fd44af650022caa2a04dbc5e422c90574031b04c5ae2d32ce964b3da4999a83d45fad8d38 SHA512 da8a273299becc67a333f1949cb90a389c6328e9a78fd8fa4998e242fabddbbe9b535d4c39bfd4ba97ed7a2b6ef794b327dc628abced8b4c3bf1f4bcda6a9995
 EBUILD tf2_geometry_msgs-0.7.5.ebuild 743 BLAKE2B 55c997a7bea8455aa43fc5e6f90fcba98394c0e6272063db8cda7f3fd44af650022caa2a04dbc5e422c90574031b04c5ae2d32ce964b3da4999a83d45fad8d38 SHA512 da8a273299becc67a333f1949cb90a389c6328e9a78fd8fa4998e242fabddbbe9b535d4c39bfd4ba97ed7a2b6ef794b327dc628abced8b4c3bf1f4bcda6a9995
+EBUILD tf2_geometry_msgs-0.7.6.ebuild 743 BLAKE2B 4dc74fb75c95ad7065cf2334aa6eed5ee20e584e2264bd28792254eb15be04f0fb0a33b38c696b936d867534a25f59e63cf163f5ecd33b45d9f7490981e8b826 SHA512 608bd221bf30dafd9714c4be90523dc663c40ba88ce8860ec53ab676256b0a4619a4be9bf0350606647c576410c54b8a64c0c6c1114c19c282b684d5d2680a8f
 EBUILD tf2_geometry_msgs-9999.ebuild 743 BLAKE2B 55c997a7bea8455aa43fc5e6f90fcba98394c0e6272063db8cda7f3fd44af650022caa2a04dbc5e422c90574031b04c5ae2d32ce964b3da4999a83d45fad8d38 SHA512 da8a273299becc67a333f1949cb90a389c6328e9a78fd8fa4998e242fabddbbe9b535d4c39bfd4ba97ed7a2b6ef794b327dc628abced8b4c3bf1f4bcda6a9995
 MISC metadata.xml 328 BLAKE2B 5d01fb15d8c37e69075781dd7bef78b9869406d861b88cbbf91590293271ddc1ae9a34b5337a04784eecd84ee0bafd6510bc898f01b5544b1c62cb84d17bc2bc SHA512 cbd2de98ae5d8e11f22b1a35f28e4731210cfe819422d4ca22ac925532c453396b37b37b4be59369133558d9ce35158ce3a2c0c826626ab784bbc3ee66d76019
diff --git a/dev-ros/tf2_geometry_msgs/tf2_geometry_msgs-0.7.6.ebuild b/dev-ros/tf2_geometry_msgs/tf2_geometry_msgs-0.7.6.ebuild
new file mode 100644
index 000000000000..3c795fbda7d4
--- /dev/null
+++ b/dev-ros/tf2_geometry_msgs/tf2_geometry_msgs-0.7.6.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros/geometry2"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+CATKIN_HAS_MESSAGES=yes
+
+inherit ros-catkin
+
+DESCRIPTION="The second generation Transform Library in ROS"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/tf2_ros[${PYTHON_SINGLE_USEDEP}]
+	$(python_gen_cond_dep "dev-python/python_orocos_kdl[\${PYTHON_USEDEP}]")
+	dev-ros/tf2
+	sci-libs/orocos_kdl
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	test? (
+		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
+		dev-cpp/gtest
+	)
+"
diff --git a/dev-ros/tf2_kdl/Manifest b/dev-ros/tf2_kdl/Manifest
index 8ac442af053e..87464f0c8033 100644
--- a/dev-ros/tf2_kdl/Manifest
+++ b/dev-ros/tf2_kdl/Manifest
@@ -1,8 +1,10 @@
 DIST geometry2-0.7.2.tar.gz 174319 BLAKE2B 0f319055cf0a4c8a425c31abc981ee1aee3c77b9dae8e0ddae6a0c4bdf09c31373b8005cb05177374ae5a2139c0f49a4cfdd5b966f8e991827ca2c6e471dcdd2 SHA512 8c2ad4e67d4d7509c3d9a7ef781d454eeb570fbc29d201ece7d2613258b7bed2ba00398655901e2b5856b59acad94422dbb6ae1f0bd545b3a41353204c31d00b
 DIST geometry2-0.7.3.tar.gz 175974 BLAKE2B a0edbeea6db30f07d5cf6ddd4d0a8a1ce0221c8b0ad01929aa6a73a7a49e2e5bd08dfd01cef6cd964ea93b6e8f5aa1dd6ec395e8e4bbafa1117eb3436cae9c10 SHA512 20d207218000905a17411ee9c662778b3022481e84b903ca616cdfc439b2af55c7182988dc843103edc471d564e988fa311be916d0810ec86228585500ed532e
 DIST geometry2-0.7.5.tar.gz 176126 BLAKE2B 56f2062ca86b3573e9df59df4c400fd5eee35c7e30abb1f0d94b1e117a224fcb1272eaf9de14dc257d8c8438a414fd8d121d314e560e6712ca4db0da190075d5 SHA512 b3413282d2ad0aae54b0093607eee106cdd7ed23f4e5fbb1728ed4f848ee081257b9217696301e9f7860369dc98679d8abff12213ff3a69b39b061f02f5da8c9
+DIST geometry2-0.7.6.tar.gz 176927 BLAKE2B c18a8be79a17194e339188b938d51d69deb70ac4bbc3038349d5fd4ac4a63c4d812bf6dc1f4ce6bcf64545e0abaa88e7eede008f3f6c5590cc860148f8dd8e39 SHA512 dec7c618da9eec07b202b1d67b367c8e71451a05b4ffa15d1e86651857054e7e43682ef7a95580853ee9767f17229b623fd73a495a184e4e9e3fdf024be2d440
 EBUILD tf2_kdl-0.7.2.ebuild 609 BLAKE2B 1962ca94f2970ef169d403288751f5e1a7403589b306f86388097fba065bd95d9e5ee98a141671879b900aa4c5c6e4e61fa3fa5c78100dbcfc0da5b54e1d763e SHA512 142dcf9f02a689fe0a0332700bb5c0698616809886465010040722f63e1bc3991ec3f402988ba219e1a9fe2b89eba23a4135beb8bbf49a4193b94353b2a09d03
 EBUILD tf2_kdl-0.7.3.ebuild 609 BLAKE2B 1962ca94f2970ef169d403288751f5e1a7403589b306f86388097fba065bd95d9e5ee98a141671879b900aa4c5c6e4e61fa3fa5c78100dbcfc0da5b54e1d763e SHA512 142dcf9f02a689fe0a0332700bb5c0698616809886465010040722f63e1bc3991ec3f402988ba219e1a9fe2b89eba23a4135beb8bbf49a4193b94353b2a09d03
 EBUILD tf2_kdl-0.7.5.ebuild 609 BLAKE2B 1962ca94f2970ef169d403288751f5e1a7403589b306f86388097fba065bd95d9e5ee98a141671879b900aa4c5c6e4e61fa3fa5c78100dbcfc0da5b54e1d763e SHA512 142dcf9f02a689fe0a0332700bb5c0698616809886465010040722f63e1bc3991ec3f402988ba219e1a9fe2b89eba23a4135beb8bbf49a4193b94353b2a09d03
+EBUILD tf2_kdl-0.7.6.ebuild 609 BLAKE2B e1949ce0e6c71cc2a547a71b207719488f07ce32f363e2e45628acc2d81c284359a5eaeddf544db00528bbb423ffd32718e3471d10d989a783eaae3827593a1c SHA512 2caebe19a5fb96d39700bb9c6b1abb8f470e005a6eff52d00f5cdca8bb87772140244d706591318f1ce136e0e8b973296414d172ad66e7dee3aefc602ba6a110
 EBUILD tf2_kdl-9999.ebuild 609 BLAKE2B 1962ca94f2970ef169d403288751f5e1a7403589b306f86388097fba065bd95d9e5ee98a141671879b900aa4c5c6e4e61fa3fa5c78100dbcfc0da5b54e1d763e SHA512 142dcf9f02a689fe0a0332700bb5c0698616809886465010040722f63e1bc3991ec3f402988ba219e1a9fe2b89eba23a4135beb8bbf49a4193b94353b2a09d03
 MISC metadata.xml 328 BLAKE2B 5d01fb15d8c37e69075781dd7bef78b9869406d861b88cbbf91590293271ddc1ae9a34b5337a04784eecd84ee0bafd6510bc898f01b5544b1c62cb84d17bc2bc SHA512 cbd2de98ae5d8e11f22b1a35f28e4731210cfe819422d4ca22ac925532c453396b37b37b4be59369133558d9ce35158ce3a2c0c826626ab784bbc3ee66d76019
diff --git a/dev-ros/tf2_kdl/tf2_kdl-0.7.6.ebuild b/dev-ros/tf2_kdl/tf2_kdl-0.7.6.ebuild
new file mode 100644
index 000000000000..63d78e6201ce
--- /dev/null
+++ b/dev-ros/tf2_kdl/tf2_kdl-0.7.6.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros/geometry2"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="KDL binding for tf2"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/tf2
+	dev-ros/tf2_ros
+	$(python_gen_cond_dep "dev-python/python_orocos_kdl[\${PYTHON_USEDEP}]")
+	sci-libs/orocos_kdl:=
+	dev-ros/tf2_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-ros/cmake_modules
+	dev-cpp/eigen:3
+	test? (
+		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
+		dev-cpp/gtest
+	)"
diff --git a/dev-ros/tf2_msgs/Manifest b/dev-ros/tf2_msgs/Manifest
index 3131be802e5c..7a5d74f6d6d1 100644
--- a/dev-ros/tf2_msgs/Manifest
+++ b/dev-ros/tf2_msgs/Manifest
@@ -1,8 +1,10 @@
 DIST geometry2-0.7.2.tar.gz 174319 BLAKE2B 0f319055cf0a4c8a425c31abc981ee1aee3c77b9dae8e0ddae6a0c4bdf09c31373b8005cb05177374ae5a2139c0f49a4cfdd5b966f8e991827ca2c6e471dcdd2 SHA512 8c2ad4e67d4d7509c3d9a7ef781d454eeb570fbc29d201ece7d2613258b7bed2ba00398655901e2b5856b59acad94422dbb6ae1f0bd545b3a41353204c31d00b
 DIST geometry2-0.7.3.tar.gz 175974 BLAKE2B a0edbeea6db30f07d5cf6ddd4d0a8a1ce0221c8b0ad01929aa6a73a7a49e2e5bd08dfd01cef6cd964ea93b6e8f5aa1dd6ec395e8e4bbafa1117eb3436cae9c10 SHA512 20d207218000905a17411ee9c662778b3022481e84b903ca616cdfc439b2af55c7182988dc843103edc471d564e988fa311be916d0810ec86228585500ed532e
 DIST geometry2-0.7.5.tar.gz 176126 BLAKE2B 56f2062ca86b3573e9df59df4c400fd5eee35c7e30abb1f0d94b1e117a224fcb1272eaf9de14dc257d8c8438a414fd8d121d314e560e6712ca4db0da190075d5 SHA512 b3413282d2ad0aae54b0093607eee106cdd7ed23f4e5fbb1728ed4f848ee081257b9217696301e9f7860369dc98679d8abff12213ff3a69b39b061f02f5da8c9
+DIST geometry2-0.7.6.tar.gz 176927 BLAKE2B c18a8be79a17194e339188b938d51d69deb70ac4bbc3038349d5fd4ac4a63c4d812bf6dc1f4ce6bcf64545e0abaa88e7eede008f3f6c5590cc860148f8dd8e39 SHA512 dec7c618da9eec07b202b1d67b367c8e71451a05b4ffa15d1e86651857054e7e43682ef7a95580853ee9767f17229b623fd73a495a184e4e9e3fdf024be2d440
 EBUILD tf2_msgs-0.7.2.ebuild 414 BLAKE2B 8bd31f8ab8712c9834a05050f16076cc57a15a8f4570d229591da065c3faa658cb3ba1eda92feb314bbe4c2efe498086b5f2a6ea776c6346a939bb9ed59f509a SHA512 b086610badf63d44fb9508fa2a0dc5afb3b617053991ec5dc87672088b94818b0a3272ee6e4f9acdfff269147dda2987d630f1427567159f3558985f8f3f1663
 EBUILD tf2_msgs-0.7.3.ebuild 414 BLAKE2B 8bd31f8ab8712c9834a05050f16076cc57a15a8f4570d229591da065c3faa658cb3ba1eda92feb314bbe4c2efe498086b5f2a6ea776c6346a939bb9ed59f509a SHA512 b086610badf63d44fb9508fa2a0dc5afb3b617053991ec5dc87672088b94818b0a3272ee6e4f9acdfff269147dda2987d630f1427567159f3558985f8f3f1663
 EBUILD tf2_msgs-0.7.5.ebuild 414 BLAKE2B 8bd31f8ab8712c9834a05050f16076cc57a15a8f4570d229591da065c3faa658cb3ba1eda92feb314bbe4c2efe498086b5f2a6ea776c6346a939bb9ed59f509a SHA512 b086610badf63d44fb9508fa2a0dc5afb3b617053991ec5dc87672088b94818b0a3272ee6e4f9acdfff269147dda2987d630f1427567159f3558985f8f3f1663
+EBUILD tf2_msgs-0.7.6.ebuild 414 BLAKE2B acf9d1f5fe53343c6e84e19a5ea7859b012c77b4484267653a60e08d533ec74afbb94f744ee305b60c7873f65311eb15c7113983f1245965ce9ef1e1f869b127 SHA512 9f1c1db891501862f1865e577e759140ea47ba48d43680c2570e3c6e0d11919fe4da45877a2c9832d26d130c495d491477b3e06648b4e823925875ae5d4da080
 EBUILD tf2_msgs-9999.ebuild 414 BLAKE2B 8bd31f8ab8712c9834a05050f16076cc57a15a8f4570d229591da065c3faa658cb3ba1eda92feb314bbe4c2efe498086b5f2a6ea776c6346a939bb9ed59f509a SHA512 b086610badf63d44fb9508fa2a0dc5afb3b617053991ec5dc87672088b94818b0a3272ee6e4f9acdfff269147dda2987d630f1427567159f3558985f8f3f1663
 MISC metadata.xml 328 BLAKE2B 5d01fb15d8c37e69075781dd7bef78b9869406d861b88cbbf91590293271ddc1ae9a34b5337a04784eecd84ee0bafd6510bc898f01b5544b1c62cb84d17bc2bc SHA512 cbd2de98ae5d8e11f22b1a35f28e4731210cfe819422d4ca22ac925532c453396b37b37b4be59369133558d9ce35158ce3a2c0c826626ab784bbc3ee66d76019
diff --git a/dev-ros/tf2_msgs/tf2_msgs-0.7.6.ebuild b/dev-ros/tf2_msgs/tf2_msgs-0.7.6.ebuild
new file mode 100644
index 000000000000..e3ab05052c74
--- /dev/null
+++ b/dev-ros/tf2_msgs/tf2_msgs-0.7.6.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+CATKIN_HAS_MESSAGES=yes
+ROS_REPO_URI="https://github.com/ros/geometry2"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/actionlib_msgs dev-ros/geometry_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="TF2 messages"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/tf2_py/Manifest b/dev-ros/tf2_py/Manifest
index a61a12d42dd5..541a16138725 100644
--- a/dev-ros/tf2_py/Manifest
+++ b/dev-ros/tf2_py/Manifest
@@ -1,8 +1,10 @@
 DIST geometry2-0.7.2.tar.gz 174319 BLAKE2B 0f319055cf0a4c8a425c31abc981ee1aee3c77b9dae8e0ddae6a0c4bdf09c31373b8005cb05177374ae5a2139c0f49a4cfdd5b966f8e991827ca2c6e471dcdd2 SHA512 8c2ad4e67d4d7509c3d9a7ef781d454eeb570fbc29d201ece7d2613258b7bed2ba00398655901e2b5856b59acad94422dbb6ae1f0bd545b3a41353204c31d00b
 DIST geometry2-0.7.3.tar.gz 175974 BLAKE2B a0edbeea6db30f07d5cf6ddd4d0a8a1ce0221c8b0ad01929aa6a73a7a49e2e5bd08dfd01cef6cd964ea93b6e8f5aa1dd6ec395e8e4bbafa1117eb3436cae9c10 SHA512 20d207218000905a17411ee9c662778b3022481e84b903ca616cdfc439b2af55c7182988dc843103edc471d564e988fa311be916d0810ec86228585500ed532e
 DIST geometry2-0.7.5.tar.gz 176126 BLAKE2B 56f2062ca86b3573e9df59df4c400fd5eee35c7e30abb1f0d94b1e117a224fcb1272eaf9de14dc257d8c8438a414fd8d121d314e560e6712ca4db0da190075d5 SHA512 b3413282d2ad0aae54b0093607eee106cdd7ed23f4e5fbb1728ed4f848ee081257b9217696301e9f7860369dc98679d8abff12213ff3a69b39b061f02f5da8c9
+DIST geometry2-0.7.6.tar.gz 176927 BLAKE2B c18a8be79a17194e339188b938d51d69deb70ac4bbc3038349d5fd4ac4a63c4d812bf6dc1f4ce6bcf64545e0abaa88e7eede008f3f6c5590cc860148f8dd8e39 SHA512 dec7c618da9eec07b202b1d67b367c8e71451a05b4ffa15d1e86651857054e7e43682ef7a95580853ee9767f17229b623fd73a495a184e4e9e3fdf024be2d440
 EBUILD tf2_py-0.7.2.ebuild 390 BLAKE2B f8092b0d322aab05e480b605a70027631127ef858a2f2d3b88143c700991cb6a32ba8239724f9f2191558192eb1297ef00a3848c739ff93922002f4dd6bd92e1 SHA512 6ad78616d5d1ebc061b189812c10e8cadf58092e7290ba093547471f20eac3f25987ad2e59d76fc62fbd795cf866bcf331d799f3339c67d86535c350e718192e
 EBUILD tf2_py-0.7.3.ebuild 390 BLAKE2B f8092b0d322aab05e480b605a70027631127ef858a2f2d3b88143c700991cb6a32ba8239724f9f2191558192eb1297ef00a3848c739ff93922002f4dd6bd92e1 SHA512 6ad78616d5d1ebc061b189812c10e8cadf58092e7290ba093547471f20eac3f25987ad2e59d76fc62fbd795cf866bcf331d799f3339c67d86535c350e718192e
 EBUILD tf2_py-0.7.5.ebuild 390 BLAKE2B f8092b0d322aab05e480b605a70027631127ef858a2f2d3b88143c700991cb6a32ba8239724f9f2191558192eb1297ef00a3848c739ff93922002f4dd6bd92e1 SHA512 6ad78616d5d1ebc061b189812c10e8cadf58092e7290ba093547471f20eac3f25987ad2e59d76fc62fbd795cf866bcf331d799f3339c67d86535c350e718192e
+EBUILD tf2_py-0.7.6.ebuild 390 BLAKE2B cb79575cab1de6ff45b4b9a0648fc8409da5e06a13dc033a2c43f81667374c660cdba12de8cf45d218cc80cfbe74c2d82cb0f79a4abdf01022a0a427f708b5aa SHA512 044260cfc67be10cf00fb6694f2f9334253f89e1677f4065d839ba50b7f4d6a72ba0fed5cff0b46e05c4d451ea7978f2805c971bfeb6cc4effa2db7b1be9531e
 EBUILD tf2_py-9999.ebuild 390 BLAKE2B f8092b0d322aab05e480b605a70027631127ef858a2f2d3b88143c700991cb6a32ba8239724f9f2191558192eb1297ef00a3848c739ff93922002f4dd6bd92e1 SHA512 6ad78616d5d1ebc061b189812c10e8cadf58092e7290ba093547471f20eac3f25987ad2e59d76fc62fbd795cf866bcf331d799f3339c67d86535c350e718192e
 MISC metadata.xml 328 BLAKE2B 5d01fb15d8c37e69075781dd7bef78b9869406d861b88cbbf91590293271ddc1ae9a34b5337a04784eecd84ee0bafd6510bc898f01b5544b1c62cb84d17bc2bc SHA512 cbd2de98ae5d8e11f22b1a35f28e4731210cfe819422d4ca22ac925532c453396b37b37b4be59369133558d9ce35158ce3a2c0c826626ab784bbc3ee66d76019
diff --git a/dev-ros/tf2_py/tf2_py-0.7.6.ebuild b/dev-ros/tf2_py/tf2_py-0.7.6.ebuild
new file mode 100644
index 000000000000..77c587eae514
--- /dev/null
+++ b/dev-ros/tf2_py/tf2_py-0.7.6.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros/geometry2"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="TF2 python bindings"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/tf2
+	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
+	dev-libs/boost:=
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/tf2_ros/Manifest b/dev-ros/tf2_ros/Manifest
index 7fecc7ea87f1..517400f8379a 100644
--- a/dev-ros/tf2_ros/Manifest
+++ b/dev-ros/tf2_ros/Manifest
@@ -1,8 +1,10 @@
 DIST geometry2-0.7.2.tar.gz 174319 BLAKE2B 0f319055cf0a4c8a425c31abc981ee1aee3c77b9dae8e0ddae6a0c4bdf09c31373b8005cb05177374ae5a2139c0f49a4cfdd5b966f8e991827ca2c6e471dcdd2 SHA512 8c2ad4e67d4d7509c3d9a7ef781d454eeb570fbc29d201ece7d2613258b7bed2ba00398655901e2b5856b59acad94422dbb6ae1f0bd545b3a41353204c31d00b
 DIST geometry2-0.7.3.tar.gz 175974 BLAKE2B a0edbeea6db30f07d5cf6ddd4d0a8a1ce0221c8b0ad01929aa6a73a7a49e2e5bd08dfd01cef6cd964ea93b6e8f5aa1dd6ec395e8e4bbafa1117eb3436cae9c10 SHA512 20d207218000905a17411ee9c662778b3022481e84b903ca616cdfc439b2af55c7182988dc843103edc471d564e988fa311be916d0810ec86228585500ed532e
 DIST geometry2-0.7.5.tar.gz 176126 BLAKE2B 56f2062ca86b3573e9df59df4c400fd5eee35c7e30abb1f0d94b1e117a224fcb1272eaf9de14dc257d8c8438a414fd8d121d314e560e6712ca4db0da190075d5 SHA512 b3413282d2ad0aae54b0093607eee106cdd7ed23f4e5fbb1728ed4f848ee081257b9217696301e9f7860369dc98679d8abff12213ff3a69b39b061f02f5da8c9
+DIST geometry2-0.7.6.tar.gz 176927 BLAKE2B c18a8be79a17194e339188b938d51d69deb70ac4bbc3038349d5fd4ac4a63c4d812bf6dc1f4ce6bcf64545e0abaa88e7eede008f3f6c5590cc860148f8dd8e39 SHA512 dec7c618da9eec07b202b1d67b367c8e71451a05b4ffa15d1e86651857054e7e43682ef7a95580853ee9767f17229b623fd73a495a184e4e9e3fdf024be2d440
 EBUILD tf2_ros-0.7.2-r1.ebuild 1052 BLAKE2B e88ab5c82ac3a6a9dd1d842a44c3a51f58de08ce9749a21046bdb49375c2891e4381dc3be29148baa09873a4afde39b1eede53125e49a7113ef2f054d0f2f727 SHA512 a2c966bcb922b15f07fc8a552dc0970d741c4b88493695e7047574f9a9661020796a79542d8ee8dd1b4488712e3dd97aab862c33513c6ff2f06ab6d60363969f
 EBUILD tf2_ros-0.7.3-r1.ebuild 1052 BLAKE2B e88ab5c82ac3a6a9dd1d842a44c3a51f58de08ce9749a21046bdb49375c2891e4381dc3be29148baa09873a4afde39b1eede53125e49a7113ef2f054d0f2f727 SHA512 a2c966bcb922b15f07fc8a552dc0970d741c4b88493695e7047574f9a9661020796a79542d8ee8dd1b4488712e3dd97aab862c33513c6ff2f06ab6d60363969f
 EBUILD tf2_ros-0.7.5-r1.ebuild 1052 BLAKE2B e88ab5c82ac3a6a9dd1d842a44c3a51f58de08ce9749a21046bdb49375c2891e4381dc3be29148baa09873a4afde39b1eede53125e49a7113ef2f054d0f2f727 SHA512 a2c966bcb922b15f07fc8a552dc0970d741c4b88493695e7047574f9a9661020796a79542d8ee8dd1b4488712e3dd97aab862c33513c6ff2f06ab6d60363969f
+EBUILD tf2_ros-0.7.6.ebuild 1052 BLAKE2B e88ab5c82ac3a6a9dd1d842a44c3a51f58de08ce9749a21046bdb49375c2891e4381dc3be29148baa09873a4afde39b1eede53125e49a7113ef2f054d0f2f727 SHA512 a2c966bcb922b15f07fc8a552dc0970d741c4b88493695e7047574f9a9661020796a79542d8ee8dd1b4488712e3dd97aab862c33513c6ff2f06ab6d60363969f
 EBUILD tf2_ros-9999.ebuild 1052 BLAKE2B e88ab5c82ac3a6a9dd1d842a44c3a51f58de08ce9749a21046bdb49375c2891e4381dc3be29148baa09873a4afde39b1eede53125e49a7113ef2f054d0f2f727 SHA512 a2c966bcb922b15f07fc8a552dc0970d741c4b88493695e7047574f9a9661020796a79542d8ee8dd1b4488712e3dd97aab862c33513c6ff2f06ab6d60363969f
 MISC metadata.xml 328 BLAKE2B 5d01fb15d8c37e69075781dd7bef78b9869406d861b88cbbf91590293271ddc1ae9a34b5337a04784eecd84ee0bafd6510bc898f01b5544b1c62cb84d17bc2bc SHA512 cbd2de98ae5d8e11f22b1a35f28e4731210cfe819422d4ca22ac925532c453396b37b37b4be59369133558d9ce35158ce3a2c0c826626ab784bbc3ee66d76019
diff --git a/dev-ros/tf2_ros/tf2_ros-0.7.6.ebuild b/dev-ros/tf2_ros/tf2_ros-0.7.6.ebuild
new file mode 100644
index 000000000000..fd5e26d28f9f
--- /dev/null
+++ b/dev-ros/tf2_ros/tf2_ros-0.7.6.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros/geometry2"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="ROS bindings for the tf2 library, for both Python and C++"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/actionlib[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/message_filters
+	dev-ros/roscpp
+	dev-ros/rosgraph
+	dev-libs/boost:=
+	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/tf2
+	dev-ros/tf2_py[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/actionlib_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/tf2_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
+		dev-cpp/gtest
+	)
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/tf2_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
+
+src_test() {
+	# Needed for tests to find internal launch file
+	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
+	ros-catkin_src_test
+}
diff --git a/dev-ros/tf2_sensor_msgs/Manifest b/dev-ros/tf2_sensor_msgs/Manifest
index da73fd5b5a2b..bee00e7f93c6 100644
--- a/dev-ros/tf2_sensor_msgs/Manifest
+++ b/dev-ros/tf2_sensor_msgs/Manifest
@@ -1,8 +1,10 @@
 DIST geometry2-0.7.2.tar.gz 174319 BLAKE2B 0f319055cf0a4c8a425c31abc981ee1aee3c77b9dae8e0ddae6a0c4bdf09c31373b8005cb05177374ae5a2139c0f49a4cfdd5b966f8e991827ca2c6e471dcdd2 SHA512 8c2ad4e67d4d7509c3d9a7ef781d454eeb570fbc29d201ece7d2613258b7bed2ba00398655901e2b5856b59acad94422dbb6ae1f0bd545b3a41353204c31d00b
 DIST geometry2-0.7.3.tar.gz 175974 BLAKE2B a0edbeea6db30f07d5cf6ddd4d0a8a1ce0221c8b0ad01929aa6a73a7a49e2e5bd08dfd01cef6cd964ea93b6e8f5aa1dd6ec395e8e4bbafa1117eb3436cae9c10 SHA512 20d207218000905a17411ee9c662778b3022481e84b903ca616cdfc439b2af55c7182988dc843103edc471d564e988fa311be916d0810ec86228585500ed532e
 DIST geometry2-0.7.5.tar.gz 176126 BLAKE2B 56f2062ca86b3573e9df59df4c400fd5eee35c7e30abb1f0d94b1e117a224fcb1272eaf9de14dc257d8c8438a414fd8d121d314e560e6712ca4db0da190075d5 SHA512 b3413282d2ad0aae54b0093607eee106cdd7ed23f4e5fbb1728ed4f848ee081257b9217696301e9f7860369dc98679d8abff12213ff3a69b39b061f02f5da8c9
+DIST geometry2-0.7.6.tar.gz 176927 BLAKE2B c18a8be79a17194e339188b938d51d69deb70ac4bbc3038349d5fd4ac4a63c4d812bf6dc1f4ce6bcf64545e0abaa88e7eede008f3f6c5590cc860148f8dd8e39 SHA512 dec7c618da9eec07b202b1d67b367c8e71451a05b4ffa15d1e86651857054e7e43682ef7a95580853ee9767f17229b623fd73a495a184e4e9e3fdf024be2d440
 EBUILD tf2_sensor_msgs-0.7.2.ebuild 950 BLAKE2B 8b3b0b8e5d2881e6be69be4f591ebf8ad8ed8650a0b7a42d2602cf585afa0ef55d155a32dbe6576385cf7a641123aa9acf96827c036996f1ebd6c772bf9bed32 SHA512 0954452ac651c00dcf005aecce75c6e839735cf3dcc48df90f8c4d152000841596bbc5749e8c7198665c0c9f13c6a7af9bc1814a8ffd7dd1e1c8842a492434af
 EBUILD tf2_sensor_msgs-0.7.3.ebuild 950 BLAKE2B 8b3b0b8e5d2881e6be69be4f591ebf8ad8ed8650a0b7a42d2602cf585afa0ef55d155a32dbe6576385cf7a641123aa9acf96827c036996f1ebd6c772bf9bed32 SHA512 0954452ac651c00dcf005aecce75c6e839735cf3dcc48df90f8c4d152000841596bbc5749e8c7198665c0c9f13c6a7af9bc1814a8ffd7dd1e1c8842a492434af
 EBUILD tf2_sensor_msgs-0.7.5.ebuild 950 BLAKE2B 8b3b0b8e5d2881e6be69be4f591ebf8ad8ed8650a0b7a42d2602cf585afa0ef55d155a32dbe6576385cf7a641123aa9acf96827c036996f1ebd6c772bf9bed32 SHA512 0954452ac651c00dcf005aecce75c6e839735cf3dcc48df90f8c4d152000841596bbc5749e8c7198665c0c9f13c6a7af9bc1814a8ffd7dd1e1c8842a492434af
+EBUILD tf2_sensor_msgs-0.7.6.ebuild 950 BLAKE2B fd907359db741a3482e4ca30db85b5e44404861486c4fcfdeef52d2099894b93b4599bc776a496b857e785e2a445ef2fb5da18348ec8529381718e2b6c4743ac SHA512 21453243cbb1a44e4b808b06a4cc0a8eba69c687ef2bef5cec170ba6426e8655e2f0170f1dd0201b0148627970b25db15ebe5161ab871db24d323030ce99776f
 EBUILD tf2_sensor_msgs-9999.ebuild 950 BLAKE2B 8b3b0b8e5d2881e6be69be4f591ebf8ad8ed8650a0b7a42d2602cf585afa0ef55d155a32dbe6576385cf7a641123aa9acf96827c036996f1ebd6c772bf9bed32 SHA512 0954452ac651c00dcf005aecce75c6e839735cf3dcc48df90f8c4d152000841596bbc5749e8c7198665c0c9f13c6a7af9bc1814a8ffd7dd1e1c8842a492434af
 MISC metadata.xml 328 BLAKE2B 5d01fb15d8c37e69075781dd7bef78b9869406d861b88cbbf91590293271ddc1ae9a34b5337a04784eecd84ee0bafd6510bc898f01b5544b1c62cb84d17bc2bc SHA512 cbd2de98ae5d8e11f22b1a35f28e4731210cfe819422d4ca22ac925532c453396b37b37b4be59369133558d9ce35158ce3a2c0c826626ab784bbc3ee66d76019
diff --git a/dev-ros/tf2_sensor_msgs/tf2_sensor_msgs-0.7.6.ebuild b/dev-ros/tf2_sensor_msgs/tf2_sensor_msgs-0.7.6.ebuild
new file mode 100644
index 000000000000..e7dd2d1b54d3
--- /dev/null
+++ b/dev-ros/tf2_sensor_msgs/tf2_sensor_msgs-0.7.6.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros/geometry2"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Transform sensor_msgs with tf. Most notably, PointCloud2"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/tf2_ros[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/tf2
+	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
+	$(python_gen_cond_dep "dev-python/python_orocos_kdl[\${PYTHON_USEDEP}]")
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? (
+		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
+		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
+		dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+		dev-cpp/gtest
+	)
+	dev-ros/cmake_modules
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-cpp/eigen:3
+"
+
+src_test() {
+	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
+	ros-catkin_src_test
+}
diff --git a/dev-ros/tf2_tools/Manifest b/dev-ros/tf2_tools/Manifest
index 9ed528762c8f..96f89f4ca010 100644
--- a/dev-ros/tf2_tools/Manifest
+++ b/dev-ros/tf2_tools/Manifest
@@ -1,8 +1,10 @@
 DIST geometry2-0.7.2.tar.gz 174319 BLAKE2B 0f319055cf0a4c8a425c31abc981ee1aee3c77b9dae8e0ddae6a0c4bdf09c31373b8005cb05177374ae5a2139c0f49a4cfdd5b966f8e991827ca2c6e471dcdd2 SHA512 8c2ad4e67d4d7509c3d9a7ef781d454eeb570fbc29d201ece7d2613258b7bed2ba00398655901e2b5856b59acad94422dbb6ae1f0bd545b3a41353204c31d00b
 DIST geometry2-0.7.3.tar.gz 175974 BLAKE2B a0edbeea6db30f07d5cf6ddd4d0a8a1ce0221c8b0ad01929aa6a73a7a49e2e5bd08dfd01cef6cd964ea93b6e8f5aa1dd6ec395e8e4bbafa1117eb3436cae9c10 SHA512 20d207218000905a17411ee9c662778b3022481e84b903ca616cdfc439b2af55c7182988dc843103edc471d564e988fa311be916d0810ec86228585500ed532e
 DIST geometry2-0.7.5.tar.gz 176126 BLAKE2B 56f2062ca86b3573e9df59df4c400fd5eee35c7e30abb1f0d94b1e117a224fcb1272eaf9de14dc257d8c8438a414fd8d121d314e560e6712ca4db0da190075d5 SHA512 b3413282d2ad0aae54b0093607eee106cdd7ed23f4e5fbb1728ed4f848ee081257b9217696301e9f7860369dc98679d8abff12213ff3a69b39b061f02f5da8c9
+DIST geometry2-0.7.6.tar.gz 176927 BLAKE2B c18a8be79a17194e339188b938d51d69deb70ac4bbc3038349d5fd4ac4a63c4d812bf6dc1f4ce6bcf64545e0abaa88e7eede008f3f6c5590cc860148f8dd8e39 SHA512 dec7c618da9eec07b202b1d67b367c8e71451a05b4ffa15d1e86651857054e7e43682ef7a95580853ee9767f17229b623fd73a495a184e4e9e3fdf024be2d440
 EBUILD tf2_tools-0.7.2.ebuild 614 BLAKE2B d900623fa09a8f2629c5f824975e1b6e404c873ffe81683b2058701167724c83e0d4c433b8fa34e338adac8b46315ab046f906e2cedd0c8a9a1411a58e706f41 SHA512 071ee475fa740b630eb2a08e094eb47e9c83d0568657a3981bb5fc247d2d89e22acd34609ba5b71748dc4d284cb0e9f78d078f94a82acbb4ad9d8ccb759aee1e
 EBUILD tf2_tools-0.7.3.ebuild 614 BLAKE2B d900623fa09a8f2629c5f824975e1b6e404c873ffe81683b2058701167724c83e0d4c433b8fa34e338adac8b46315ab046f906e2cedd0c8a9a1411a58e706f41 SHA512 071ee475fa740b630eb2a08e094eb47e9c83d0568657a3981bb5fc247d2d89e22acd34609ba5b71748dc4d284cb0e9f78d078f94a82acbb4ad9d8ccb759aee1e
 EBUILD tf2_tools-0.7.5.ebuild 614 BLAKE2B d900623fa09a8f2629c5f824975e1b6e404c873ffe81683b2058701167724c83e0d4c433b8fa34e338adac8b46315ab046f906e2cedd0c8a9a1411a58e706f41 SHA512 071ee475fa740b630eb2a08e094eb47e9c83d0568657a3981bb5fc247d2d89e22acd34609ba5b71748dc4d284cb0e9f78d078f94a82acbb4ad9d8ccb759aee1e
+EBUILD tf2_tools-0.7.6.ebuild 614 BLAKE2B 332cb3280d992975adc852ebbdeec97fba835bbc6b8edd3c30ee75b3500983aeee33f2edf496b6cab56b0714e8e2a9d5069a35fb0bbc682c5ad5a7e132dd6a58 SHA512 7b5c0de56b648a33e698938e1839c7009af5dec9cd32616e65d5c3fe63d64b0961c1d0baf6d0a3a8b0eadef10b8b9d40cbd1a1851a9acc7917ed7a0b6a59475d
 EBUILD tf2_tools-9999.ebuild 614 BLAKE2B d900623fa09a8f2629c5f824975e1b6e404c873ffe81683b2058701167724c83e0d4c433b8fa34e338adac8b46315ab046f906e2cedd0c8a9a1411a58e706f41 SHA512 071ee475fa740b630eb2a08e094eb47e9c83d0568657a3981bb5fc247d2d89e22acd34609ba5b71748dc4d284cb0e9f78d078f94a82acbb4ad9d8ccb759aee1e
 MISC metadata.xml 328 BLAKE2B 5d01fb15d8c37e69075781dd7bef78b9869406d861b88cbbf91590293271ddc1ae9a34b5337a04784eecd84ee0bafd6510bc898f01b5544b1c62cb84d17bc2bc SHA512 cbd2de98ae5d8e11f22b1a35f28e4731210cfe819422d4ca22ac925532c453396b37b37b4be59369133558d9ce35158ce3a2c0c826626ab784bbc3ee66d76019
diff --git a/dev-ros/tf2_tools/tf2_tools-0.7.6.ebuild b/dev-ros/tf2_tools/tf2_tools-0.7.6.ebuild
new file mode 100644
index 000000000000..3a969500d193
--- /dev/null
+++ b/dev-ros/tf2_tools/tf2_tools-0.7.6.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros/geometry2"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Tools for 2nd gen Transform library"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/tf2_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/tf2_py[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/tf2_ros[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
+	$(python_gen_cond_dep "dev-python/pyyaml[\${PYTHON_USEDEP}]")
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 588543af077e..39a5d18d97b0 100644
Binary files a/dev-util/Manifest.gz and b/dev-util/Manifest.gz differ
diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest
index fa8db61bf52c..e291ba567ba6 100644
--- a/dev-util/ccache/Manifest
+++ b/dev-util/ccache/Manifest
@@ -6,9 +6,12 @@ AUX ccache-config-3 2147 BLAKE2B 6e703e12b6a2f83b838f8b1d1e534de3366b6e2994990b3
 DIST ccache-4.5.1.tar.xz 513008 BLAKE2B 637b6d36c169bc742efd165569879a47405c2884918ed3731186e8176c926fa0e8e9cd648756d501ae3b741c671e2399cfdb0bc216410bc64826d4fe00d69498 SHA512 267dcc6b41270eeffe029d13e58eca3399540037cc19dc58bb5ebeb7dcc51b201fbde91c9824eaee5b14fbf28bb7304b78d1340118bc72e56b80ff148575bc56
 DIST ccache-4.6.3.tar.xz 531184 BLAKE2B b23c22876cd3f31bcd67b9120fd5e605441508478f40267d654a281c00e28e3021b135cda04ace6da9fb39d3c144c92a259e69287be73043730240f32982b6a9 SHA512 b8cee0a466e76d5551c9785836c66ac5a98b51624e9f919adf820265ec19c3429c99ed332aecdafcd03cf32c71074121c63ec56762259921c3762a011be24966
 DIST ccache-4.6.3.tar.xz.asc 833 BLAKE2B 064d7bdf474540992180372c4c011b5bdeb98834803abcdec474f0988cac0339281c388545f9d28ae22b740268c338e092d618c0a4664c62c307d9a9ec1dff5e SHA512 ecba59c8089848737f37ef9bae4f631fae7eb2fedfc62879cd181ce37d412fbd883cc9dee52850757258009d75ef06477441cbf17d39db7b9d955300737e7f89
+DIST ccache-4.7.1.tar.xz 545788 BLAKE2B 0d96b7d7739329cb86f749cac756998af648f512c2be0a88b35cda8dcc1160a2eb37a02e6bfde34810451b66bb99b56bc91ad64d67c8305c7af620a2075464b7 SHA512 9a17f550e9a70067c55405a0832769cf367e96b21256631f9b0e638574f2c4c90106be0fcef04e868cf4b069668fe09f13cf71539e9f85752f7869da6a9abd0a
+DIST ccache-4.7.1.tar.xz.asc 833 BLAKE2B 3735876dd9a4e9a7105480b55154baaff269f1a4564c82d5d95a36c4a085e95386f21a971e6349a0b9043dc0208ddd464f120bdd8127c20dd33909c7e70c449d SHA512 2ad6be6805254d5d4f24d89801f6338431118d948ee90f38f4eeecb282e99c8f90294e6cd4f8f582d01e2ac138d7ac233e71fa985dd73dc43869606f841faba9
 DIST ccache-4.7.tar.xz 545560 BLAKE2B 20d08092e775354f84699ed48a88f8212517e7202ff2bc1bc381164341d4058b598d2a4981e35059ac10fc46ada183c35056732f1a61c9d14185cd41839a7485 SHA512 af7010de1f44bf5be9ba62a3af54af6b19e01b6dddf986a52c37106676bc3a5bd2298cccd2337cccbacfd1c148de177612c2bf24d254c6ade9dec253a0a62efd
 DIST ccache-4.7.tar.xz.asc 833 BLAKE2B 4c868467e53fb21021e5f553b6660b94f7fc93ba66d1798c09f09a281124f8351cbe29fcb621637e29c1f6f24468f0a9a6423a33a1691c220f929a595e961a56 SHA512 e88e8cf2ee8ce9015a93eefe3a7c8dab58da3e50536b5af8ee5013f6cb2af9928f82b4a6d9c4af2880e14698819f63c434324e45aa667e63e9fd309aaef448a6
 EBUILD ccache-4.5.1.ebuild 2295 BLAKE2B 8b89808a850d5bb512a9672d719a800c9f17fd23dddc3bb5b1c0626b4160910bead0ca27137d734340ca9a60783349b97730376d5cb35473698b843203758d7c SHA512 96c0b4dbe479a0383fb28fda5f262e4490625e0ba137e5435ba8ee9702d14fe68c42a04a462792ff96aa176e3676a819602e2e50cb989d5061842c188d8fc5ba
 EBUILD ccache-4.6.3.ebuild 2583 BLAKE2B becd6116917e1e64e1b6d7168cf99af6503196a0d414735f926b72b66757fc649e0f68df851d39eb7733deeb0b339dadea320b2a33fa3976fb1c180a5aa14c5a SHA512 b917373e3f5bf306aad19dba9df0200bf0a20b2a15a16ca91d87fdef05adcc16eb7f87999884bd83751ba3bc9f98c883cb0f0627f28fa740d0403eb7fc915c7c
+EBUILD ccache-4.7.1.ebuild 2545 BLAKE2B 5d914716fa1f62164e9408564682e2b89b19557f682e1cb1ba8d470b9bc68f97248630c034ff8adf988e3aa407b40853d51e25a375a27f00a04cbf32596ee30a SHA512 5b1a858ae8c027cd4381d94eb82c285dddc116d3081424428887856cd0c9ce6940b5d40c77f9ac7446f06ef209e64f6124ddcdf8e8800100286c9253255d47e4
 EBUILD ccache-4.7.ebuild 2545 BLAKE2B 5d914716fa1f62164e9408564682e2b89b19557f682e1cb1ba8d470b9bc68f97248630c034ff8adf988e3aa407b40853d51e25a375a27f00a04cbf32596ee30a SHA512 5b1a858ae8c027cd4381d94eb82c285dddc116d3081424428887856cd0c9ce6940b5d40c77f9ac7446f06ef209e64f6124ddcdf8e8800100286c9253255d47e4
 MISC metadata.xml 710 BLAKE2B 0a93cf3dd4222eb2fd500c3cafdff3c01eacecc489a471270922fc5dd1daf58cd1398ddfb7ab4d271a6e84d5a3da5c3e7a341b1e7994af7b10fd432318de7c5e SHA512 dbfa6b8d8f435e25887b25ce25df65184a7f315986ee60a1c723d0e6592ca73bc7414b6650014812eb882e7e39bed953eaa21139a414043c50c018a7b780e6f1
diff --git a/dev-util/ccache/ccache-4.7.1.ebuild b/dev-util/ccache/ccache-4.7.1.ebuild
new file mode 100644
index 000000000000..57b53e31e44a
--- /dev/null
+++ b/dev-util/ccache/ccache-4.7.1.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/joelrosdahl.asc
+inherit cmake toolchain-funcs flag-o-matic verify-sig
+
+DESCRIPTION="Fast compiler cache"
+HOMEPAGE="https://ccache.dev/"
+SRC_URI="https://github.com/ccache/ccache/releases/download/v${PV}/${P}.tar.xz"
+SRC_URI+=" verify-sig? ( https://github.com/ccache/ccache/releases/download/v${PV}/${P}.tar.xz.asc )"
+
+LICENSE="GPL-3 LGPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+# Enable 'static-c++' by default to make 'gcc' ebuild Just Work: bug #761220
+IUSE="doc redis +static-c++ test"
+RESTRICT="!test? ( test )"
+
+DEPEND="app-arch/zstd:=
+	redis? ( dev-libs/hiredis:= )"
+RDEPEND="${DEPEND}
+	dev-util/shadowman
+	sys-apps/gentoo-functions"
+# Needed for eselect calls in pkg_*
+IDEPEND="dev-util/shadowman"
+
+# clang-specific tests use dev-libs/elfutils to compare objects for equality.
+# Let's pull in the dependency unconditionally.
+DEPEND+=" test? ( dev-libs/elfutils )"
+BDEPEND=" doc? ( dev-ruby/asciidoctor )
+	verify-sig? ( sec-keys/openpgp-keys-joelrosdahl )"
+
+DOCS=( doc/{AUTHORS,MANUAL,NEWS}.adoc CONTRIBUTING.md README.md )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.5-nvcc-test.patch
+	"${FILESDIR}"/${PN}-4.0-objdump.patch
+	"${FILESDIR}"/${PN}-4.6.2-avoid-run-user.patch
+)
+
+src_prepare() {
+	cmake_src_prepare
+
+	sed \
+		-e "/^EPREFIX=/s:'':'${EPREFIX}':" \
+		"${FILESDIR}"/ccache-config-3 > ccache-config || die
+}
+
+src_configure() {
+	# Mainly used in tests
+	tc-export CC OBJDUMP
+
+	# Avoid dependency on libstdc++.so. Useful for cases when
+	# we would like to use ccache to build older gcc which injects
+	# into ccache locally built (possibly outdated) libstdc++
+	# See bug #761220 for examples.
+	#
+	# Ideally gcc should not use LD_PRELOAD to avoid this type of failure.
+	use static-c++ && append-ldflags -static-libstdc++
+
+	local mycmakeargs=(
+		-DENABLE_DOCUMENTATION=$(usex doc)
+		-DENABLE_TESTING=$(usex test)
+		-DZSTD_FROM_INTERNET=OFF
+		-DHIREDIS_FROM_INTERNET=OFF
+		-DREDIS_STORAGE_BACKEND=$(usex redis)
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	dobin ccache-config
+	insinto /usr/share/shadowman/tools
+	newins - ccache <<<"${EPREFIX}/usr/lib/ccache/bin"
+}
+
+pkg_prerm() {
+	if [[ -z ${REPLACED_BY_VERSION} && -z ${ROOT} ]] ; then
+		eselect compiler-shadow remove ccache
+	fi
+}
+
+pkg_postinst() {
+	if [[ -z ${ROOT} ]] ; then
+		eselect compiler-shadow update ccache
+	fi
+}
diff --git a/dev-util/clazy/Manifest b/dev-util/clazy/Manifest
index 50608c282a3b..f1a5bbad0cba 100644
--- a/dev-util/clazy/Manifest
+++ b/dev-util/clazy/Manifest
@@ -1,3 +1,6 @@
+AUX clazy-1.11-fix-llvm-15.patch 12053 BLAKE2B d329cb3a93a7b9cf6256590e281c6f13955eb8a83a9c0ef17a8d5fe719ff1f09164aec56ea8a31391adb5a9490ce6a4e8336a32dc22f872182e5491d81b89e70 SHA512 285e73848d9fc7bf8eada208660cb8d42c245617205be9bae708e6f9e0d8b06ba814a305b33d641589f8a0ee17a71156cea2450fd2e7d5a342389eada5421e34
+AUX clazy-1.11-fix-regex-detect.patch 859 BLAKE2B 6a953c3927dcc1a3aac5aab55c01eb1eaf977f40c96c26f57032608de8e0d709ae6bf67f5d04f991ee14ded80023a8faf19b9ea18f9a2e2dd9dc19b2831ff58c SHA512 8bd1ab72bf36620250a228f9cb45fe403853d16c5eec8704c6980405ffca71cfcea82f9587b3b3f748ab623ecee757cb8adc54c7a137c5070eb04e26d06fab36
 DIST clazy-1.11.tar.xz 404088 BLAKE2B 1a69fe07ef81a0efe3c9db9129083247d60943592967f705d62d3859039cec250673eecc06184f70d134cbab85708d957b0a085beff8b3e46325a69547e005b7 SHA512 6a7c162392dd30aea29669275cea814d6daccf7931b8cdb20997f9bbff5619832d5461a6d0f854ecbc4726e52b6937c4f9cb8651087ffe73676c04239a38ca2b
 EBUILD clazy-1.11-r1.ebuild 1169 BLAKE2B 941ab83e4ee06ec2da6b81f20299262124f120ce8196b0b81ceac6fdd0eb878492428cf29926b648399e5ef252831bbb2cb09cbe2c0b4b44220d554d51b02112 SHA512 e466bc654f1a3fca0ab13f1dcaf604350f7ab300e15d31ed6ade12efe3bbf41908242c00b8dffb3029173b59d74916b1432212f0b95e754625d9b7a48dc39eac
+EBUILD clazy-1.11-r2.ebuild 1265 BLAKE2B 13214e3943139d9945a6a238717edc9bc50e130f658ed1fd573b69b1b7c995f686d8fb6f81085709e283961bf2193bb68b8dd5497c3f563a198a6ef4c86ed3a4 SHA512 3f37a4009c65e348bd4e79ab9a8db6e13b7011c3688bf4cca6083579a3c79d20e7a1461f9b596a6ec393b6128aee803db8e53e7f5404ec923cf14fcf67c483ae
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/dev-util/clazy/clazy-1.11-r2.ebuild b/dev-util/clazy/clazy-1.11-r2.ebuild
new file mode 100644
index 000000000000..331c221f4408
--- /dev/null
+++ b/dev-util/clazy/clazy-1.11-r2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LLVM_MAX_SLOT=15
+PYTHON_COMPAT=( python3_{8..11} )
+inherit cmake llvm python-any-r1
+
+DESCRIPTION="Compiler plugin which allows clang to understand Qt semantics"
+HOMEPAGE="https://apps.kde.org/clazy"
+SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="<sys-devel/clang-$((${LLVM_MAX_SLOT} + 1)):="
+DEPEND="${RDEPEND}"
+BDEPEND="test? ( ${PYTHON_DEPS} )"
+
+PATCHES=(
+	"${FILESDIR}/${P}-fix-regex-detect.patch"
+	"${FILESDIR}/${P}-fix-llvm-15.patch"
+)
+
+llvm_check_deps() {
+	has_version "sys-devel/clang:${LLVM_SLOT}" && has_version "sys-devel/llvm:${LLVM_SLOT}"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+
+	llvm_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	sed -e '/install(FILES README.md COPYING-LGPL2.txt checks.json DESTINATION/d' \
+		-i CMakeLists.txt || die
+}
+
+src_configure() {
+	export LLVM_ROOT="$(get_llvm_prefix -d ${LLVM_MAX_SLOT})"
+
+	cmake_src_configure
+}
+
+src_test() {
+	# Run tests against built copy, not installed
+	# bug #811723
+	PATH="${BUILD_DIR}/bin:${PATH}" LD_LIBRARY_PATH="${BUILD_DIR}/lib" cmake_src_test
+}
diff --git a/dev-util/clazy/files/clazy-1.11-fix-llvm-15.patch b/dev-util/clazy/files/clazy-1.11-fix-llvm-15.patch
new file mode 100644
index 000000000000..b98e4b1c2fee
--- /dev/null
+++ b/dev-util/clazy/files/clazy-1.11-fix-llvm-15.patch
@@ -0,0 +1,223 @@
+From 20fca52da739ebefa47e35f6b338bb99a0da3cfe Mon Sep 17 00:00:00 2001
+From: Cristian Adam <cristian.adam@qt.io>
+Date: Tue, 6 Sep 2022 16:30:02 +0200
+Subject: [PATCH] Build fixes for LLVM/Clang 15.0.0
+
+Change-Id: Icc39a0b1acffb5a6a4798b1259d8ad4e7dd47bc5
+---
+ CMakeLists.txt                              |  6 ++++++
+ src/PreProcessorVisitor.cpp                 |  2 +-
+ src/PreProcessorVisitor.h                   |  2 +-
+ src/SourceCompatibilityHelpers.h            | 15 +++++++++++++++
+ src/Utils.cpp                               |  3 ++-
+ src/checkbase.cpp                           |  4 ++--
+ src/checkbase.h                             |  4 ++--
+ src/checks/manuallevel/qt6-fwd-fixes.cpp    |  2 +-
+ src/checks/manuallevel/qt6-fwd-fixes.h      |  2 +-
+ src/checks/manuallevel/qt6-header-fixes.cpp |  2 +-
+ src/checks/manuallevel/qt6-header-fixes.h   |  2 +-
+ 11 files changed, 33 insertions(+), 11 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3c780b0d..100135af 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -114,6 +114,10 @@ else()
+     set(clang_tooling_refactoring_lib clangToolingRefactor)
+ endif()
+ 
++if (${LLVM_VERSION} VERSION_GREATER_EQUAL "15.0.0")
++  set(clang_support_lib clangSupport)
++endif()
++
+ macro(link_to_llvm name is_standalone)
+   if (CLAZY_LINK_CLANG_DYLIB)
+     target_link_libraries(${name} clang-cpp)
+@@ -131,6 +135,7 @@ macro(link_to_llvm name is_standalone)
+ 
+       target_link_libraries(${name} ${clang_lib})
+     endforeach()
++    target_link_libraries(${name} ${clang_support_lib})
+     target_link_libraries(${name} clangTooling)
+     target_link_libraries(${name} clangToolingCore)
+     target_link_libraries(${name} ${clang_tooling_refactoring_lib})
+@@ -302,6 +307,7 @@ else()
+     clangFrontendTool
+     clangRewrite
+     clangSerialization
++    ${clang_support_lib}
+     clangTooling
+     clangStaticAnalyzerCheckers
+     clangStaticAnalyzerCore
+diff --git a/src/PreProcessorVisitor.cpp b/src/PreProcessorVisitor.cpp
+index 5e63a131..5fdfe5f3 100644
+--- a/src/PreProcessorVisitor.cpp
++++ b/src/PreProcessorVisitor.cpp
+@@ -185,7 +185,7 @@ void PreProcessorVisitor::MacroExpands(const Token &MacroNameTok, const MacroDef
+ 
+ void PreProcessorVisitor::InclusionDirective (clang::SourceLocation, const clang::Token &,
+                                               clang::StringRef FileName, bool IsAngled, clang::CharSourceRange FilenameRange,
+-                                              const clang::FileEntry *, clang::StringRef, clang::StringRef,
++                                              clazy::OptionalFileEntryRef, clang::StringRef, clang::StringRef,
+                                               const clang::Module *, clang::SrcMgr::CharacteristicKind)
+ {
+    if (m_ci.getPreprocessor().isInPrimaryFile() && !clazy::endsWith(FileName.str(), ".moc")) {
+diff --git a/src/PreProcessorVisitor.h b/src/PreProcessorVisitor.h
+index dc80ff36..1bb17a5e 100644
+--- a/src/PreProcessorVisitor.h
++++ b/src/PreProcessorVisitor.h
+@@ -71,7 +71,7 @@ protected:
+                       clang::SourceRange range, const clang::MacroArgs *) override;
+     void InclusionDirective (clang::SourceLocation HashLoc, const clang::Token &IncludeTok,
+                              clang::StringRef FileName, bool IsAngled, clang::CharSourceRange FilenameRange,
+-                             const clang::FileEntry *File, clang::StringRef SearchPath, clang::StringRef RelativePath,
++                             clazy::OptionalFileEntryRef File, clang::StringRef SearchPath, clang::StringRef RelativePath,
+                              const clang::Module *Imported, clang::SrcMgr::CharacteristicKind FileType) override;
+ private:
+     std::string getTokenSpelling(const clang::MacroDefinition &) const;
+diff --git a/src/SourceCompatibilityHelpers.h b/src/SourceCompatibilityHelpers.h
+index 4ea923a2..c1a23a4b 100644
+--- a/src/SourceCompatibilityHelpers.h
++++ b/src/SourceCompatibilityHelpers.h
+@@ -144,6 +144,21 @@ inline bool contains_lower(clang::StringRef haystack, clang::StringRef needle)
+ #endif
+ }
+ 
++#if LLVM_VERSION_MAJOR >= 15
++using OptionalFileEntryRef = clang::Optional<clang::FileEntryRef>;
++#else
++using OptionalFileEntryRef = const clang::FileEntry*;
++#endif
++
++inline bool isAscii(clang::StringLiteral *lt)
++{
++#if LLVM_VERSION_MAJOR >= 15
++    return lt->isOrdinary();
++#else
++    return lt->isAscii();
++#endif
++}
++
+ }
+ 
+ #endif
+diff --git a/src/Utils.cpp b/src/Utils.cpp
+index 3cdf7876..70e0577c 100644
+--- a/src/Utils.cpp
++++ b/src/Utils.cpp
+@@ -25,6 +25,7 @@
+ #include "Utils.h"
+ #include "StringUtils.h"
+ #include "HierarchyUtils.h"
++#include "SourceCompatibilityHelpers.h"
+ #include "StmtBodyRange.h"
+ #include "clazy_stl.h"
+ 
+@@ -670,7 +671,7 @@ const CXXRecordDecl *Utils::recordForMemberCall(CXXMemberCallExpr *call, string
+ bool Utils::isAscii(StringLiteral *lt)
+ {
+     // 'é' for some reason has isAscii() == true, so also call containsNonAsciiOrNull
+-    return lt && lt->isAscii() && !lt->containsNonAsciiOrNull();
++    return lt && clazy::isAscii(lt) && !lt->containsNonAsciiOrNull();
+ }
+ 
+ bool Utils::isInDerefExpression(Stmt *s, ParentMap *map)
+diff --git a/src/checkbase.cpp b/src/checkbase.cpp
+index f5936dfd..dcc7c999 100644
+--- a/src/checkbase.cpp
++++ b/src/checkbase.cpp
+@@ -105,7 +105,7 @@ void ClazyPreprocessorCallbacks::MacroDefined(const Token &macroNameTok, const M
+ }
+ 
+ void ClazyPreprocessorCallbacks::InclusionDirective(clang::SourceLocation HashLoc, const clang::Token &IncludeTok, clang::StringRef FileName, bool IsAngled,
+-                                                    clang::CharSourceRange FilenameRange, const clang::FileEntry *File, clang::StringRef SearchPath,
++                                                    clang::CharSourceRange FilenameRange, clazy::OptionalFileEntryRef File, clang::StringRef SearchPath,
+                                                     clang::StringRef RelativePath, const clang::Module *Imported, clang::SrcMgr::CharacteristicKind FileType)
+ {
+     check->VisitInclusionDirective(HashLoc, IncludeTok, FileName, IsAngled, FilenameRange, File, SearchPath, RelativePath, Imported, FileType);
+@@ -182,7 +182,7 @@ void CheckBase::VisitEndif(SourceLocation, SourceLocation)
+ }
+ 
+ void CheckBase::VisitInclusionDirective(clang::SourceLocation , const clang::Token &, clang::StringRef , bool ,
+-                        clang::CharSourceRange , const clang::FileEntry *, clang::StringRef ,
++                        clang::CharSourceRange , clazy::OptionalFileEntryRef, clang::StringRef ,
+                         clang::StringRef , const clang::Module *, clang::SrcMgr::CharacteristicKind )
+ {
+     // Overriden in derived classes
+diff --git a/src/checkbase.h b/src/checkbase.h
+index c5db2daf..02f6a6bf 100644
+--- a/src/checkbase.h
++++ b/src/checkbase.h
+@@ -91,7 +91,7 @@ public:
+     void Else(clang::SourceLocation loc, clang::SourceLocation ifLoc) override;
+     void Endif(clang::SourceLocation loc, clang::SourceLocation ifLoc) override;
+     void InclusionDirective(clang::SourceLocation HashLoc, const clang::Token &IncludeTok, clang::StringRef FileName, bool IsAngled,
+-                            clang::CharSourceRange FilenameRange, const clang::FileEntry *File, clang::StringRef SearchPath,
++                            clang::CharSourceRange FilenameRange, clazy::OptionalFileEntryRef File, clang::StringRef SearchPath,
+                             clang::StringRef RelativePath, const clang::Module *Imported, clang::SrcMgr::CharacteristicKind FileType) override;
+ private:
+     CheckBase *const check;
+@@ -151,7 +151,7 @@ protected:
+     virtual void VisitElse(clang::SourceLocation loc, clang::SourceLocation ifLoc);
+     virtual void VisitEndif(clang::SourceLocation loc, clang::SourceLocation ifLoc);
+     virtual void VisitInclusionDirective(clang::SourceLocation HashLoc, const clang::Token &IncludeTok, clang::StringRef FileName, bool IsAngled,
+-                            clang::CharSourceRange FilenameRange, const clang::FileEntry *File, clang::StringRef SearchPath,
++                            clang::CharSourceRange FilenameRange, clazy::OptionalFileEntryRef File, clang::StringRef SearchPath,
+                             clang::StringRef RelativePath, const clang::Module *Imported, clang::SrcMgr::CharacteristicKind FileType);
+ 
+     void enablePreProcessorCallbacks();
+diff --git a/src/checks/manuallevel/qt6-fwd-fixes.cpp b/src/checks/manuallevel/qt6-fwd-fixes.cpp
+index 83bf81ee..c87d9ca0 100644
+--- a/src/checks/manuallevel/qt6-fwd-fixes.cpp
++++ b/src/checks/manuallevel/qt6-fwd-fixes.cpp
+@@ -166,7 +166,7 @@ void Qt6FwdFixes::VisitDecl(clang::Decl *decl)
+ }
+ 
+ void Qt6FwdFixes::VisitInclusionDirective(clang::SourceLocation HashLoc, const clang::Token &IncludeTok, clang::StringRef FileName, bool IsAngled,
+-                        clang::CharSourceRange FilenameRange, const clang::FileEntry *File, clang::StringRef SearchPath,
++                        clang::CharSourceRange FilenameRange, clazy::OptionalFileEntryRef File, clang::StringRef SearchPath,
+                         clang::StringRef RelativePath, const clang::Module *Imported, clang::SrcMgr::CharacteristicKind FileType)
+ {
+     auto current_file = m_sm.getFilename(HashLoc);
+diff --git a/src/checks/manuallevel/qt6-fwd-fixes.h b/src/checks/manuallevel/qt6-fwd-fixes.h
+index 37b59d95..bb928ba6 100644
+--- a/src/checks/manuallevel/qt6-fwd-fixes.h
++++ b/src/checks/manuallevel/qt6-fwd-fixes.h
+@@ -47,7 +47,7 @@ public:
+     explicit Qt6FwdFixes(const std::string &name, ClazyContext *context);
+     void VisitDecl(clang::Decl *decl) override;
+     void VisitInclusionDirective(clang::SourceLocation HashLoc, const clang::Token &IncludeTok, clang::StringRef FileName, bool IsAngled,
+-                            clang::CharSourceRange FilenameRange, const clang::FileEntry *File, clang::StringRef SearchPath,
++                            clang::CharSourceRange FilenameRange, clazy::OptionalFileEntryRef File, clang::StringRef SearchPath,
+                             clang::StringRef RelativePath, const clang::Module *Imported, clang::SrcMgr::CharacteristicKind FileType) override;
+     bool m_including_qcontainerfwd = false;
+     std::set<clang::StringRef> m_qcontainerfwd_included_in_files;
+diff --git a/src/checks/manuallevel/qt6-header-fixes.cpp b/src/checks/manuallevel/qt6-header-fixes.cpp
+index d458b77c..aaa28093 100644
+--- a/src/checks/manuallevel/qt6-header-fixes.cpp
++++ b/src/checks/manuallevel/qt6-header-fixes.cpp
+@@ -270,7 +270,7 @@ Qt6HeaderFixes::Qt6HeaderFixes(const std::string &name, ClazyContext *context)
+ }
+ 
+ void Qt6HeaderFixes::VisitInclusionDirective(clang::SourceLocation HashLoc, const clang::Token &IncludeTok, clang::StringRef FileName, bool IsAngled,
+-                        clang::CharSourceRange FilenameRange, const clang::FileEntry *File, clang::StringRef SearchPath,
++                        clang::CharSourceRange FilenameRange, clazy::OptionalFileEntryRef File, clang::StringRef SearchPath,
+                         clang::StringRef RelativePath, const clang::Module *Imported, clang::SrcMgr::CharacteristicKind FileType)
+ {
+     if (shouldIgnoreFile(HashLoc))
+diff --git a/src/checks/manuallevel/qt6-header-fixes.h b/src/checks/manuallevel/qt6-header-fixes.h
+index ae09f7ad..8ffbb100 100644
+--- a/src/checks/manuallevel/qt6-header-fixes.h
++++ b/src/checks/manuallevel/qt6-header-fixes.h
+@@ -46,7 +46,7 @@ class Qt6HeaderFixes
+ public:
+     explicit Qt6HeaderFixes(const std::string &name, ClazyContext *context);
+     void VisitInclusionDirective(clang::SourceLocation HashLoc, const clang::Token &IncludeTok, clang::StringRef FileName, bool IsAngled,
+-                            clang::CharSourceRange FilenameRange, const clang::FileEntry *File, clang::StringRef SearchPath,
++                            clang::CharSourceRange FilenameRange, clazy::OptionalFileEntryRef File, clang::StringRef SearchPath,
+                             clang::StringRef RelativePath, const clang::Module *Imported, clang::SrcMgr::CharacteristicKind FileType) override;
+ 
+ };
+-- 
+GitLab
+
diff --git a/dev-util/clazy/files/clazy-1.11-fix-regex-detect.patch b/dev-util/clazy/files/clazy-1.11-fix-regex-detect.patch
new file mode 100644
index 000000000000..a60206365ea1
--- /dev/null
+++ b/dev-util/clazy/files/clazy-1.11-fix-regex-detect.patch
@@ -0,0 +1,25 @@
+From 336b54f28250938cc2a8d7bb78e638e79b6467d5 Mon Sep 17 00:00:00 2001
+From: Hannah von Reth <vonreth@kde.org>
+Date: Fri, 8 Jul 2022 11:19:22 +0000
+Subject: [PATCH] Fix regex detection
+
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 434a57c9..3c780b0d 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -81,7 +81,7 @@ endif()
+ 
+ # Look for std::regex support
+ message("Looking for std::regex support...")
+-try_run(REGEX_RUN_RESULT COMPILE_RESULT ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_LIST_DIR}/.cmake_has_regex_test.cpp)
++try_run(REGEX_RUN_RESULT COMPILE_RESULT ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_LIST_DIR}/.cmake_has_regex_test.cpp CXX_STANDARD 17 CXX_STANDARD_REQUIRED true)
+ 
+ if(NOT REGEX_RUN_RESULT EQUAL 0)
+   message("Using boost::regex instead of std::regex")
+-- 
+GitLab
+
diff --git a/dev-util/dbus-test-runner/Manifest b/dev-util/dbus-test-runner/Manifest
index fdfab4d8c690..5f991fa41f56 100644
--- a/dev-util/dbus-test-runner/Manifest
+++ b/dev-util/dbus-test-runner/Manifest
@@ -1,4 +1,4 @@
 AUX dbus-test-runner-19.04.0-fix-deprecation-warnings.patch 1197 BLAKE2B 47323d9a859b24e478732be15a33ad5f96cb692d03132ee2923bca041bfef38b40cb54e3fc16f0ecc2232029fee80d5fbd03410a32dc93dc3acc580bd099118c SHA512 41c283e256df1d2436d1d3cb1ebdb1e89971dba17eec588800cba5f65da10766de523f0f891e559c405c6fa05ae020525ee30d7b15f57e55dd9681d5ad2ae78c
 DIST dbus-test-runner-19.04.0.tar.gz 444289 BLAKE2B dc3b11c8d376103b320d98d211bf1ace035a2de5a1caceadd946bfdc46a6aab3fcf69fae15c7142500b9487a9832275a6157f887c8efcbbb56d13c8841609dd0 SHA512 5906225f0ce429ea218d7eb4c67281b7ef368d6a173965b214f4f4501e729002ca3293a94fd8afd3002f301cd1f2208cba01c733f678c2d51661220e8a7ce971
-EBUILD dbus-test-runner-19.04.0-r2.ebuild 1353 BLAKE2B b3ecc2d39b1d805e5ef3e97122d5fa8b3dabcdb6b76c48f423e5250bc92ba4131cf704f440c87c6568c4d4d232804831c6d09faabf1f3e1c125e6a08202e0220 SHA512 d01acd413c25e381404da2f9a5c3f291e0fdfd72a33a8eb2ac96f86e25db8dce88d2ae83da61204a4046ad1d2b53a1a82b4b471ea1cc4e32c3612a3d03f0d2c8
+EBUILD dbus-test-runner-19.04.0-r2.ebuild 1353 BLAKE2B 8829eca8effb3e134233c9265ae02a2456d29e683e6c3f2731fd8e4c6c6933b8dd127bd049b433f3395edaec32aac913127e61b9ada171754e2d6f13e6bf66e2 SHA512 2261da83da9f81ee571bdb555aff7e6c7a59addb6f96ac8feef453b2ed4dd5e1e21f5eba23eb89f6834323f5b7e305a565811513b834acacc4f33538aa7edc6a
 MISC metadata.xml 334 BLAKE2B 27ab7a8e8a84b7a33f23751ebe0957ee5275e95f97ace2983a3b1f05235cc5aff143b18ab4ce6deb611fabb34d2ab749cf110e682cbc250f5170ef72bfc66439 SHA512 a3208a00f3d7eda6ed24c70fde9eae4ce763c2ae20225fd41e430362e14ad6796ac43c5a9ae1926f44c2210fb4eb81885b6f37031197e34358398a4072b1d93d
diff --git a/dev-util/dbus-test-runner/dbus-test-runner-19.04.0-r2.ebuild b/dev-util/dbus-test-runner/dbus-test-runner-19.04.0-r2.ebuild
index 0b62cdc9c08f..db7277dba83f 100644
--- a/dev-util/dbus-test-runner/dbus-test-runner-19.04.0-r2.ebuild
+++ b/dev-util/dbus-test-runner/dbus-test-runner-19.04.0-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 inherit python-single-r1
 
 DESCRIPTION="Run executables under a new DBus session for testing"
diff --git a/dev-util/gdbus-codegen/Manifest b/dev-util/gdbus-codegen/Manifest
index 7ef92c527574..58ea0f14af7e 100644
--- a/dev-util/gdbus-codegen/Manifest
+++ b/dev-util/gdbus-codegen/Manifest
@@ -2,6 +2,8 @@ AUX gdbus-codegen-2.56.1-sitedir.patch 1898 BLAKE2B 2d3530f2c0e249254d170a7c0f19
 AUX setup.py-2.32.4 192 BLAKE2B 574320d89095d1452a3eee4404b5ebb19fbed32febf2a15422d276bc8dfb6790c41b7214aad3f88ee4927b58de639146cbf633f735df693bd437ea19eae79435 SHA512 45e823f507db103543f024ad557d35f7c09fb51db8a78b978c762ca77d941cdecc5837d2b248fc2c5da6a93b56fe8ded359efd98fb0a74fdf9533783d8eebcfa
 DIST glib-2.72.3.tar.xz 4893484 BLAKE2B 1360c887b07ede3de3a7d31589f3dfc07ada2fe3e7901d3f30048ab9a1379357753ae142c6c107b3fcd6dd61e1401fbe6db22f0e89ea617db2c1073f1900cbe6 SHA512 8834ab7498577c2f659d135b87c27b34e1157be27f6c1fe5af0d64a94654f78cbe6a87e6868966849674c34e88a9d51d2de8d89f78f86aa1e1af3482761f0638
 DIST glib-2.74.0.tar.xz 5183072 BLAKE2B b21e5a72e2ce3390cbf13601aa902104f1ac1cfbd75181d30cd340f24b5875753f898b229f99c71d47d499be86cddb0191a0072c0c2decc82956a46c16255905 SHA512 5cdadd2f4568c0c3d45083b4d39699abf651e42e020f7bc880cce3ff33d28943118388d17a0632777e843f48009c1f97d5634fde3cb8c69c7c7f35b278ac8225
+DIST glib-2.74.1.tar.xz 5189452 BLAKE2B 58d977a5d2a100aa9125f2009ae66c6f27232dff70159433076552bdb64f9a6a93d7cb705feba890ee43d6f16d4766f6f1d5502c2e01eeb7e88d5ed0dd205d5c SHA512 21176cb95fcab49a781d02789bf21191a96a34a6391f066699b3c20b414b3169c958bd86623deb34ca55912083862885f7a7d12b67cc041467da2ba94d9e83c3
 EBUILD gdbus-codegen-2.72.3.ebuild 2193 BLAKE2B 5bbd1717305885363c6221e48488dd2d3aa23ea8bc49c561f420f5029c63cdf528fb027027d00b42dc54386c1ec3be6958b56289ed71287d28f04224cdf908cd SHA512 54a411c57910e57f033b92a437d44f1af9f4d7fb72b361b86ecb69fc38f39cac44aa45e95dae7fccbbed94f5043e703a2c71ff9464f54cdc3a3c274559ba3684
 EBUILD gdbus-codegen-2.74.0.ebuild 2205 BLAKE2B bfafd9b08250c6a2ecdcf43150ce1e73a5830dd5b3b25d8095e60cdf2396d871698f23525a7aa9395669191a5a507c9f8cd53d2215e9b83e6d907eef2315c963 SHA512 2d7fdca3ea1983f1fde3b6b1759c68faa515995030586cb62dc4e836d7b62da0ae03686c5316fe4b8ec66e320d7cc7cd58c159b9a8009c665be51600e0134da7
+EBUILD gdbus-codegen-2.74.1.ebuild 2205 BLAKE2B bfafd9b08250c6a2ecdcf43150ce1e73a5830dd5b3b25d8095e60cdf2396d871698f23525a7aa9395669191a5a507c9f8cd53d2215e9b83e6d907eef2315c963 SHA512 2d7fdca3ea1983f1fde3b6b1759c68faa515995030586cb62dc4e836d7b62da0ae03686c5316fe4b8ec66e320d7cc7cd58c159b9a8009c665be51600e0134da7
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.74.1.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.74.1.ebuild
new file mode 100644
index 000000000000..6964fb9fd48a
--- /dev/null
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.74.1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GNOME_ORG_MODULE="glib"
+PYTHON_COMPAT=( python3_{8..11} )
+PYTHON_REQ_USE="xml(+)"
+DISTUTILS_USE_PEP517=setuptools
+DISTUTILS_SINGLE_IMPL=1
+
+inherit gnome.org distutils-r1
+
+DESCRIPTION="GDBus code and documentation generator"
+HOMEPAGE="https://www.gtk.org/"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+RDEPEND="${PYTHON_DEPS}"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-libs/libxslt
+	app-text/docbook-xsl-stylesheets
+"
+
+S="${WORKDIR}/glib-${PV}/gio/gdbus-2.0/codegen"
+
+python_prepare_all() {
+	PATCHES=(
+		"${FILESDIR}/${PN}-2.56.1-sitedir.patch"
+	)
+	distutils-r1_python_prepare_all
+
+	local MAJOR_VERSION=$(ver_cut 1)
+	local MINOR_VERSION=$(ver_cut 2)
+	sed -e 's:@PYTHON@:python:' gdbus-codegen.in > gdbus-codegen || die
+	sed -e "s:@VERSION@:${PV}:" \
+		-e "s:@MAJOR_VERSION@:${MAJOR_VERSION}:" \
+		-e "s:@MINOR_VERSION@:${MINOR_VERSION}:" config.py.in > config.py || die
+	cp "${FILESDIR}/setup.py-2.32.4" setup.py || die "cp failed"
+	sed -e "s/@PV@/${PV}/" -i setup.py || die "sed setup.py failed"
+}
+
+do_xsltproc_command() {
+	# Taken from meson.build for manual manpage building - keep in sync (also copied to dev-util/glib-utils)
+	xsltproc \
+		--nonet \
+		--stringparam man.output.quietly 1 \
+		--stringparam funcsynopsis.style ansi \
+		--stringparam man.th.extra1.suppress 1 \
+		--stringparam man.authors.section.enabled 0 \
+		--stringparam man.copyright.section.enabled 0 \
+		-o "${2}" \
+		http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl \
+		"${1}" || die "manpage generation failed"
+}
+
+src_compile() {
+	distutils-r1_src_compile
+	do_xsltproc_command "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.xml" "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.1"
+}
+
+src_test() {
+	einfo "Skipping tests. This package is tested by dev-libs/glib"
+	einfo "when merged with FEATURES=test"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all # no-op, but prevents QA warning
+	doman "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.1"
+}
diff --git a/dev-util/geany-plugins/Manifest b/dev-util/geany-plugins/Manifest
index 1250d851c6fb..6e1fde0c6839 100644
--- a/dev-util/geany-plugins/Manifest
+++ b/dev-util/geany-plugins/Manifest
@@ -1,5 +1,5 @@
 AUX geany-plugins-1.38-libgit2-1.4.patch 4854 BLAKE2B 5605f5776186adaadbc0f861a1de217587a0cadcbd5f0844a0071246e5622ac830f759de4b1c7a5a3540d809c40822b619d0985561cb0f05c557c6d4d06a4a37 SHA512 9b35a656171a6183bbc8764622903d2e7767fafb548c3f2d3cb4e072a01c0bdbbfbeee20b65d42dc36f30bbfde28c5c2899e14f5ccdde1c8e96c877670889977
 DIST geany-plugins-1.38.tar.gz 4783970 BLAKE2B 386a05d7136183799059ef6d73b28a0d67d738939b0dc57649ac68f1049104568fe7c8453ebf2144277f60ee0834564b19bf4e756168864f1551962ba2411c14 SHA512 82d04331e23c5d81765b11e081a960a7a17172184cabe94efd2ddb37ac94668349b036e6083f77c867ac650fa7b251ba3970ae26b562b4568d6e313652763339
 EBUILD geany-plugins-1.38-r1.ebuild 2910 BLAKE2B 76181571b98ee1e7296a5f2859aea3b0acb51cda51fb729e670ea9c4d3818377b5d9d54d8399a9af866a0451b82fea5198cc13eb9b233682357b64849a14bbbb SHA512 e7f18ef4f0f9ba326050e9ff48aed4bd3a493be4d71ede5e76da1952c870b78c8c56d1d9cb5401b8fdec0cf0cf2248e11e84cb5aee7f32c266dbe24441460f89
-EBUILD geany-plugins-1.38-r2.ebuild 2958 BLAKE2B cf55e5bf55e7e3abe417876185f54ee8055dcbf7177a2ecb2a1639440801a5d5497667a0f84774b9d80e65b7ac91b0b1a7b7dab1c9ef754a731c16615d364deb SHA512 6276cfcb3d879bc4fd68f4d59689a0224ddc7a60daee342678cc9bd84a6d1b4c072601e6b49c22f645a1666eaf7c067b632b2ddf9727c37a753ddf7b65ecff9c
+EBUILD geany-plugins-1.38-r2.ebuild 2955 BLAKE2B e479aa2a95a584f6692734cbf2e99710c70cc0ba171969493531aff02b81e00fc9474e22974ec62432e0d9cab88fd265623e6f24eeb5f8199618a3eb16f9e0f8 SHA512 afb4c425c29fdbb50cbcee22fb1a55da925cdf9364d451ae42407745fc9e31677e5ecd631c0ced5df7cb6d5252b7f16d8b38bc12b5eca8db657a3e8bd3d95b11
 MISC metadata.xml 1201 BLAKE2B 4ee72164edb11f331607e02bc93f143214ca497d7ef461e6bb621d1dae99d128bc2243ec712707d63a935969bdacc6309ce4edb5d4f30eda08b2827c8674aa79 SHA512 5180861ae35b043f48125ac03dc6f28864f83186c84b6a3b0111da3b264537553ddb296e960dd2bbb8b7626b8bb842e4ff76931837210d39ab885213608ef51a
diff --git a/dev-util/geany-plugins/geany-plugins-1.38-r2.ebuild b/dev-util/geany-plugins/geany-plugins-1.38-r2.ebuild
index 2fb44f8f7dc1..6de03c67623f 100644
--- a/dev-util/geany-plugins/geany-plugins-1.38-r2.ebuild
+++ b/dev-util/geany-plugins/geany-plugins-1.38-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://plugins.geany.org/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 arm ~ppc ppc64 ~sparc x86"
 
 IUSE="ctags debugger enchant git gpg gtkspell lua markdown nls pretty-printer scope soup workbench"
 REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
diff --git a/dev-util/glib-utils/Manifest b/dev-util/glib-utils/Manifest
index 4e7f9178aea2..3950abcc1013 100644
--- a/dev-util/glib-utils/Manifest
+++ b/dev-util/glib-utils/Manifest
@@ -1,5 +1,7 @@
 DIST glib-2.72.3.tar.xz 4893484 BLAKE2B 1360c887b07ede3de3a7d31589f3dfc07ada2fe3e7901d3f30048ab9a1379357753ae142c6c107b3fcd6dd61e1401fbe6db22f0e89ea617db2c1073f1900cbe6 SHA512 8834ab7498577c2f659d135b87c27b34e1157be27f6c1fe5af0d64a94654f78cbe6a87e6868966849674c34e88a9d51d2de8d89f78f86aa1e1af3482761f0638
 DIST glib-2.74.0.tar.xz 5183072 BLAKE2B b21e5a72e2ce3390cbf13601aa902104f1ac1cfbd75181d30cd340f24b5875753f898b229f99c71d47d499be86cddb0191a0072c0c2decc82956a46c16255905 SHA512 5cdadd2f4568c0c3d45083b4d39699abf651e42e020f7bc880cce3ff33d28943118388d17a0632777e843f48009c1f97d5634fde3cb8c69c7c7f35b278ac8225
+DIST glib-2.74.1.tar.xz 5189452 BLAKE2B 58d977a5d2a100aa9125f2009ae66c6f27232dff70159433076552bdb64f9a6a93d7cb705feba890ee43d6f16d4766f6f1d5502c2e01eeb7e88d5ed0dd205d5c SHA512 21176cb95fcab49a781d02789bf21191a96a34a6391f066699b3c20b414b3169c958bd86623deb34ca55912083862885f7a7d12b67cc041467da2ba94d9e83c3
 EBUILD glib-utils-2.72.3.ebuild 2332 BLAKE2B eae0be3ecd001de535ff7db1483b93bdcc5405ed13935073cec2c4c92755bbe6628f86c9477396b54280384f16487af9b842dd92b7214e8e127e7affbfd68520 SHA512 2095a7aa280bbff2ce40745fc1e349fcc8fd890634b4303ff1b65b7410d0f8f30e6ff05f7f580650b48dbdc2c682a82475d0cf1c6e791da6c20eea2a259f9ea1
 EBUILD glib-utils-2.74.0.ebuild 2340 BLAKE2B 76f931baf38bb3e77988477867d576576aef408a629a10b20e5ae6a7fae2b4c8ff8f108d7f4cd23efc1a17c4f8809c537190394fc7cbfb3c3a777d7b9df18fcb SHA512 ad137f2ee9ea091e5ddb4d2ba7455cba82b003d748ffa0ae56cf53e6e443b029f0558b9b7632c4d50ae36a55904dff54cec99bc2d49ee609054fadac9c79f144
+EBUILD glib-utils-2.74.1.ebuild 2340 BLAKE2B 76f931baf38bb3e77988477867d576576aef408a629a10b20e5ae6a7fae2b4c8ff8f108d7f4cd23efc1a17c4f8809c537190394fc7cbfb3c3a777d7b9df18fcb SHA512 ad137f2ee9ea091e5ddb4d2ba7455cba82b003d748ffa0ae56cf53e6e443b029f0558b9b7632c4d50ae36a55904dff54cec99bc2d49ee609054fadac9c79f144
 MISC metadata.xml 333 BLAKE2B 70d0e83f8a0437baadea4b6771019a55d0d6f6a292bcb4263a7d811ec0b63a2ee4838b94371e03d62c4c43678eb7ae542b611166e2aecdea8c5194955ef1cda3 SHA512 0eab24184eba31bfda9752b62211472d6d8607644a2a3c2352a4483bc34975b87252aa5482a76499c5afe30414a75ba5958bd5bbf1bc755850806824e4267031
diff --git a/dev-util/glib-utils/glib-utils-2.74.1.ebuild b/dev-util/glib-utils/glib-utils-2.74.1.ebuild
new file mode 100644
index 000000000000..c715c1e6fd52
--- /dev/null
+++ b/dev-util/glib-utils/glib-utils-2.74.1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..11} )
+GNOME_ORG_MODULE="glib"
+
+inherit gnome.org python-single-r1
+
+DESCRIPTION="Build utilities for GLib using projects"
+HOMEPAGE="https://www.gtk.org/"
+
+LICENSE="LGPL-2.1+"
+SLOT="0" # /usr/bin utilities that can't be parallel installed by their nature
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+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"
+
+RDEPEND="${PYTHON_DEPS}"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-libs/libxslt
+	app-text/docbook-xsl-stylesheets
+"
+
+src_configure() { :; }
+
+do_xsltproc_command() {
+	# Taken from meson.build for manual manpage building - keep in sync (also copied to dev-util/gdbus-codegen)
+	xsltproc \
+		--nonet \
+		--stringparam man.output.quietly 1 \
+		--stringparam funcsynopsis.style ansi \
+		--stringparam man.th.extra1.suppress 1 \
+		--stringparam man.authors.section.enabled 0 \
+		--stringparam man.copyright.section.enabled 0 \
+		-o "${2}" \
+		http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl \
+		"${1}" || die "manpage generation failed"
+}
+
+src_compile() {
+	sed -e "s:@VERSION@:${PV}:g;s:@PYTHON@:python:g" gobject/glib-genmarshal.in > gobject/glib-genmarshal || die
+	sed -e "s:@VERSION@:${PV}:g;s:@PYTHON@:python:g" gobject/glib-mkenums.in > gobject/glib-mkenums || die
+	sed -e "s:@GLIB_VERSION@:${PV}:g;s:@PYTHON@:python:g" glib/gtester-report.in > glib/gtester-report || die
+	do_xsltproc_command docs/reference/gobject/glib-genmarshal.xml docs/reference/gobject/glib-genmarshal.1
+	do_xsltproc_command docs/reference/gobject/glib-mkenums.xml docs/reference/gobject/glib-mkenums.1
+	do_xsltproc_command docs/reference/glib/gtester-report.xml docs/reference/glib/gtester-report.1
+}
+
+src_install() {
+	python_fix_shebang gobject/glib-genmarshal
+	python_fix_shebang gobject/glib-mkenums
+	python_fix_shebang glib/gtester-report
+	exeinto /usr/bin
+	doexe gobject/glib-genmarshal
+	doexe gobject/glib-mkenums
+	doexe glib/gtester-report
+	doman docs/reference/gobject/glib-genmarshal.1
+	doman docs/reference/gobject/glib-mkenums.1
+	doman docs/reference/glib/gtester-report.1
+}
diff --git a/dev-util/kdevelop-pg-qt/Manifest b/dev-util/kdevelop-pg-qt/Manifest
index 06dbca1f7941..6418c7d6a6f6 100644
--- a/dev-util/kdevelop-pg-qt/Manifest
+++ b/dev-util/kdevelop-pg-qt/Manifest
@@ -1,5 +1,3 @@
-DIST kdevelop-pg-qt-2.2.1.tar.xz 660904 BLAKE2B b3874ee4f36d43f6d39a28a79f4638601340ce0545c2fe965393e9fe266a960e904ce5cd3215a7903f7b011f2e138d3be8999563366ce796f50524084a36192b SHA512 0ef3daba60ee6c7d4602b31610bdc68709a730d4c3443770eac1aa1d298fc03e10b38bc0d2e34dd44df5bba1c3af945c87e80d8aaa818e0b1787121f056c78a9
 DIST kdevelop-pg-qt-2.2.1_p20220904-72138ed0.tar.gz 1131103 BLAKE2B a388fa38e27115912af7a589f43dc6f95f4af4790435bfda6344fa62245acb37254d86df48bda9201dc6341dc88f04d4bba7c3cfae90189a88e506af66fab95c SHA512 953dc8e76a7cf8d46963ec3b41252b9b19a03275469cfc145b649ef999df1b8aa8f45666616ee56c139eeb4b1e90e6f2fd85d18a1c2371a6133da674ce187106
-EBUILD kdevelop-pg-qt-2.2.1.ebuild 498 BLAKE2B 038fb285a2011f3ac700b5520c3ed1a509afce247a15697be0fae25b51a57253de8cf2586316d989cb48ee14aeb92e3ef99dd708c49c1ef1f63ff3e380152bf2 SHA512 dbc69484eef95d7cc080babc687e08ee4f4a81bf7a4513cf814b6f03deefd0aad4eddf02779ba568b437cae9987aa8b50635a7ab0bab96f0526bfe776632dd66
-EBUILD kdevelop-pg-qt-2.2.1_p20220904.ebuild 466 BLAKE2B 39701f4f18b08001efc267514f9519334cb78aacae58f305a7abb143b3e7348bae44ea5473a30572c60791aa9c3d0b32ed14d93fbe7dc854e958e532079fb90b SHA512 f6c7b32223c3acb4c8db074ff61d517944d3c4aaca15a82f652afb505d782455210b4d05aba01c8b2da6625d73cc3bb70103340f77ad7481ce83cd76320f8a0d
+EBUILD kdevelop-pg-qt-2.2.1_p20220904.ebuild 465 BLAKE2B c1c6ecfcf98744dd9707c8cbc75d26d9ebcd379a2d59c6f575f0de4409b2e037123652319f266fc5ebcfbe292b098d8a21d1e46987af315734197af223b1375d SHA512 1a0586331e834122c6f5b2605a848d3c2c713b37a932e89813a7a70f4fbdf2289518db416be93698c1aad14f8c387cb088668a2eda94edc1b78699ce5a894afd
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-2.2.1.ebuild b/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-2.2.1.ebuild
deleted file mode 100644
index 53c7d4871d4f..000000000000
--- a/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-2.2.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-inherit ecm kde.org
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
-	KEYWORDS="amd64 arm64 ~ppc64 x86"
-fi
-
-DESCRIPTION="LL(1) parser generator used mainly by KDevelop language plugins"
-HOMEPAGE="https://www.kdevelop.org/"
-
-LICENSE="LGPL-2+ LGPL-2.1+"
-SLOT="5"
-IUSE=""
-
-BDEPEND="
-	sys-devel/bison
-	sys-devel/flex
-"
diff --git a/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-2.2.1_p20220904.ebuild b/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-2.2.1_p20220904.ebuild
index 3b364b840ecc..a8425ea8b6c4 100644
--- a/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-2.2.1_p20220904.ebuild
+++ b/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-2.2.1_p20220904.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://kdevelop.org/"
 
 LICENSE="LGPL-2+ LGPL-2.1+"
 SLOT="5"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 
 BDEPEND="
 	sys-devel/bison
diff --git a/dev-util/lldb/Manifest b/dev-util/lldb/Manifest
index 5a1e2ed1c5a7..91f697d598a9 100644
--- a/dev-util/lldb/Manifest
+++ b/dev-util/lldb/Manifest
@@ -8,8 +8,8 @@ DIST llvm-project-b34ea582774c057d9bf5591174d683fd3d8aa02b.tar.gz 169735900 BLAK
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
 EBUILD lldb-13.0.1.ebuild 2587 BLAKE2B 1e017726c7d7f9879c96c744c63f950ff2837d3082e5e5f81202b9b6259d71d013285fb48e81a25d8cbdb81b1db8b2f6807f897ea83b9742a24c3c35ac9761c0 SHA512 6e626b26f6ed4c51e9b2c732de21a60d3a5db90ee57c890b40dd8a6c82f738d6e8bd7a02f8f7fe7cdb9cb067ead82513b3ce7d35e20210f10f4d525cb3baed77
 EBUILD lldb-14.0.6.ebuild 2661 BLAKE2B 272053742b016bf234e75bb6b05e4b113b1f8b34249e8a601842412216665cf00df1b93bf590815d1dd1a709ce5006671bddb92cda7d42a5d099f3cfc3968368 SHA512 91a303661ae706bde45a7d12da928735690fdbb48901a31d6477c2d8595a42a59d4e07dc0ffe4eeb64e0775c61c329b05c0f12ccdece7bed1d5a9093db690f34
-EBUILD lldb-15.0.3.9999.ebuild 2673 BLAKE2B 0c01470e8916e102a0478bf11e8d37b7ccf7e5582917c57da47aa740b1b67788ecd21e264fe9e69bb922faf731df046e0db77305aabd7beed3332d0c2a51063c SHA512 4b6ce3d052910dd175795ff62184fbbf3efd297d43ff5bd45718728103fd0811eace71a9b5415503e242f7d97fe3e96dc1811444a459b1a52669218ad494e0b8
 EBUILD lldb-15.0.3.ebuild 2696 BLAKE2B 7eda6ca848fdf9053e99363263cf54df4f658971b7201fdce7b789a43caaec2beea0ace930c86ff303d128305b578c13657e404023ffc06f9c964acd212f4b6f SHA512 a47c1c7cca3c7ba33d7517f059f0a983f1cb23a489f15d0ad13c4b95057b99faf982dcd6c85c6562e3c99b3004d69d6e6710d9077266bd95f2fd50a6566fa08a
+EBUILD lldb-15.0.4.9999.ebuild 2673 BLAKE2B 0c01470e8916e102a0478bf11e8d37b7ccf7e5582917c57da47aa740b1b67788ecd21e264fe9e69bb922faf731df046e0db77305aabd7beed3332d0c2a51063c SHA512 4b6ce3d052910dd175795ff62184fbbf3efd297d43ff5bd45718728103fd0811eace71a9b5415503e242f7d97fe3e96dc1811444a459b1a52669218ad494e0b8
 EBUILD lldb-16.0.0.9999.ebuild 2630 BLAKE2B 2c603a9c2de88501977cf49958858eda09c30dc04a5e7345b081c8597eefb1a6a568a0e285eff1cf4dff106e1efd98abc5a3c2ed6d233180c86a3e6564a78f9e SHA512 288528aa3b4c9aecd8a79f9e69265d719111ddf065fba9df34b2629c4cf1ad4164658410c9830feb1a157494126253f2e6c8778c88e3433e30eaede6faa518c1
 EBUILD lldb-16.0.0_pre20221016.ebuild 2673 BLAKE2B 0c01470e8916e102a0478bf11e8d37b7ccf7e5582917c57da47aa740b1b67788ecd21e264fe9e69bb922faf731df046e0db77305aabd7beed3332d0c2a51063c SHA512 4b6ce3d052910dd175795ff62184fbbf3efd297d43ff5bd45718728103fd0811eace71a9b5415503e242f7d97fe3e96dc1811444a459b1a52669218ad494e0b8
 EBUILD lldb-16.0.0_pre20221023.ebuild 2650 BLAKE2B 16cff433eeed391615fa5352e8929f1221a71935d02b1a91152effa137909c33aa79b79cadd7c2d2ee4dd3c39f2f378b831887444d5affca8703d3ff56fc3b3b SHA512 c6342de53f3151bc20d3fc3a7e04628ecec57baca3495b41611aec6c8a42cda1c79124d13d9f52483bbf9f75c121a3d00986558e5f7687339c9dd0e5e92c4cf2
diff --git a/dev-util/lldb/lldb-15.0.3.9999.ebuild b/dev-util/lldb/lldb-15.0.4.9999.ebuild
similarity index 100%
rename from dev-util/lldb/lldb-15.0.3.9999.ebuild
rename to dev-util/lldb/lldb-15.0.4.9999.ebuild
diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index d7de5b1bbbfd..6ab1dd1712d3 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -1,11 +1,9 @@
 AUX meson-0.63-xtools-support.patch 1136 BLAKE2B 7600b29f1c4accbf33ca587b848566d4f9d30e26695b125aa895ec8a48ee0f7355c7692845c0d9bbb59eb452fc0cd8b634bd2a90d8918efa0b65ef4759b56d8e SHA512 725b193afe229690b6ef0d7a2a832695b7c09ca3376512097baec597a84df6e8e18791e9f29221e8a4a3537ad2371672e74041aa05ec6a218ed9b6218ea2ab61
 DIST meson-0.62.2.tar.gz 2038542 BLAKE2B 51446cd348f3e8681a61ebecf95f5aafcafd90654e3c86d87ee2b68239237bd889b667f3c6543faba7d4b98d7e0ed73d96c6a988913e5262d3b9611b80ff8db2 SHA512 4089588701f0f702eb3b794e0ede78b99f13ec7545d1a7470c7bfd6a857de59673684a543928dd578402578c53f38365a3a59e3e29022fd30a525353818a4195
-DIST meson-0.63.0.tar.gz 2060688 BLAKE2B 763d35a6dee42d7ef61b00c472681042289f38737374178d43eb8e66c3abe38affd372fca7aea4f4c7cd52f25ad3754485f54f24ac5e453b7a58011397ddbbb8 SHA512 8d427261bb42d2bd1da7d4f7b5f53908044aa2cea6d020fb320b0ab9d9848e17cf28deb12ae6dc139807f9e377db0c8a546561e94301216b634bd77703f17cea
-DIST meson-0.63.1.tar.gz 2064118 BLAKE2B 2d7bf439ed096cc38d9e676a8837069d10f34299cc5a61773df7a27d9a67fd33ce3b4193f33b35e5d77dc5cc346098e427f70f0dc0eafcebce055940420c785e SHA512 25f96e18bcdbb6346c44d9f8e63035d6cb3d8f781cf43ac5530ddd6f8090f4d16d192f8d331240154602e92b498b410fabb1381dc5f39db1dfb9da05a964d44e
 DIST meson-0.63.2.tar.gz 2063397 BLAKE2B 765ef8994168bb149cce4dbbbdab4a5531b1c1119db5dace1a66c2728241830c7de075d586187d3f987fcc99e4181176a5910da56552ba735dda110a641d2541 SHA512 770d8d82502c5cd419123e09f6a445d2cbaea4463c5fa79f1497c868bf5defc5e5779a6e550ef5fcf75d57322d2b25b61574f4df0cbf001c4325c6abdbbc30b4
+DIST meson-0.63.3.tar.gz 2067612 BLAKE2B aa6052330f15aa6b1f64598a60075ea3b245ba4b53d65e760670fd526e3e462c110f95e710a83f91ab32f316fdb66dff1783c79ea832ed11d263fe0a3304eaa8 SHA512 6855b2bfe05d592419bfeaf4346c3d1079319f14de995109c09a7e5e9770cef829f66d659553337b3e54ca0dd6c497bccd4abef720f299173077b664d905864b
 EBUILD meson-0.62.2.ebuild 2848 BLAKE2B 0f1794a5141c01af083d614e9acd9d37461a0ffc68f71d33177bf934efe1261c260c1518e502552193d45814529335e9a98ba1ceb78349cf243bcdbe6eb3b12d SHA512 d333739fa3d7557cf9e84950004c1539c072ce43a3dcd88bd1409af4961ab2a37cf2989ed34fd0c6e80bf79d66a53f0e7e9d550e5e802d8b70ecc7f54a3dcd68
-EBUILD meson-0.63.0.ebuild 2895 BLAKE2B 8927bd8e995e0dcd1de37d303f5ee045dcd3a5969078f1619ccbb4b360da151fa7e5859a033548ffb7fa3002047f9e204d24c0e8568b2e06932f7091336eff97 SHA512 6b1af00bb3305ff75b19d7e442df9978a05a754aa244e2a19e5272316761dbac12ff23b4f7ba96122c6744f72aaf58f9567f182e9e115695133a7933152b45da
-EBUILD meson-0.63.1.ebuild 2895 BLAKE2B 8927bd8e995e0dcd1de37d303f5ee045dcd3a5969078f1619ccbb4b360da151fa7e5859a033548ffb7fa3002047f9e204d24c0e8568b2e06932f7091336eff97 SHA512 6b1af00bb3305ff75b19d7e442df9978a05a754aa244e2a19e5272316761dbac12ff23b4f7ba96122c6744f72aaf58f9567f182e9e115695133a7933152b45da
-EBUILD meson-0.63.2-r1.ebuild 2949 BLAKE2B cbe3babbae2b3ca6f2d31fde64e80196dca4983d3ca42374be09b6638ab0ba4324f8432092629e36218100d7c2dd62eaccf15b16df07f5d1c4bc1af931537f4c SHA512 a556f7e43ac5e34346cad8758fd28131455995521505d48852f1c91265c551adc621d1c7e6dcf86b48cd80575d9ea886e5bd242205d47146916b695957252cb3
+EBUILD meson-0.63.2-r1.ebuild 2947 BLAKE2B 9a65ea044fa4c3c8dc8b26e98f1859364597d336ccb7c58d78fad3048abbabbb6c8a722351a8a4e6704f3935c6dac84a2386498e635fad2d690b852c719faec1 SHA512 0c9a751013f170417ad67a87903c537ca5b28422e5529fc1235f5fe2777df6cfd92a4c6b4a179287e4766283946342cacd6011a3a106b0bc9dfc2bc66c01d629
+EBUILD meson-0.63.3.ebuild 2955 BLAKE2B ce83a122ad852be0032506fdde5a0948ce56fc94acb61f84002dfece2c36320040fbae9c4ced3f37023bac0fcf97c9d391c5286d2401a941ff7d0f2e786f2703 SHA512 abaa87cd7153c900120c1dcdffec5ea4232128a6848a7f5cdb736b07f906bd28dd6942b5bea39f9841f7be2c087c9ddd7cbb0cf3cb519e5a5731d0b0f1e5ccdd
 EBUILD meson-9999.ebuild 2955 BLAKE2B ce83a122ad852be0032506fdde5a0948ce56fc94acb61f84002dfece2c36320040fbae9c4ced3f37023bac0fcf97c9d391c5286d2401a941ff7d0f2e786f2703 SHA512 abaa87cd7153c900120c1dcdffec5ea4232128a6848a7f5cdb736b07f906bd28dd6942b5bea39f9841f7be2c087c9ddd7cbb0cf3cb519e5a5731d0b0f1e5ccdd
 MISC metadata.xml 480 BLAKE2B 5d3a0af4d84e497dcc2ccd5eb680e898beda896d5c37dc71fcaad2fe63f436f758d356990a5bca06baee9d265389b6e7084daec90d13c004f5523df4d0badbff SHA512 748f91fc17a18302ad0892d458e8e59650ab23dd3db5e83da85cfbca03d7932633c37b16f039faa12d87f6e4ec75a7a7fe4cc22f17328e61d57d99b073b6df3f
diff --git a/dev-util/meson/meson-0.63.1.ebuild b/dev-util/meson/meson-0.63.1.ebuild
deleted file mode 100644
index 14ecaa4f465b..000000000000
--- a/dev-util/meson/meson-0.63.1.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 2016-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..11} )
-DISTUTILS_USE_PEP517=setuptools
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/mesonbuild/meson"
-	inherit git-r3
-else
-	MY_P=${P/_/}
-	S=${WORKDIR}/${MY_P}
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-	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
-
-inherit bash-completion-r1 distutils-r1 toolchain-funcs
-
-DESCRIPTION="Open source build system"
-HOMEPAGE="https://mesonbuild.com/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	test? (
-		dev-libs/glib:2
-		dev-libs/gobject-introspection
-		dev-util/ninja
-		dev-vcs/git
-		sys-libs/zlib[static-libs(+)]
-		virtual/pkgconfig
-	)
-"
-
-python_prepare_all() {
-	local disable_unittests=(
-		# ASAN and sandbox both want control over LD_PRELOAD
-		# https://bugs.gentoo.org/673016
-		-e 's/test_generate_gir_with_address_sanitizer/_&/'
-
-		# ASAN is unsupported on some targets
-		# https://bugs.gentoo.org/692822
-		-e 's/test_pch_with_address_sanitizer/_&/'
-
-		# https://github.com/mesonbuild/meson/issues/7203
-		-e 's/test_templates/_&/'
-
-		# Broken due to python2 wrapper
-		-e 's/test_python_module/_&/'
-	)
-
-	sed -i "${disable_unittests[@]}" unittests/*.py || die
-
-	# Broken due to python2 script created by python_wrapper_setup
-	rm -r "test cases/frameworks/1 boost" || die
-
-	distutils-r1_python_prepare_all
-}
-
-src_test() {
-	tc-export PKG_CONFIG
-	if ${PKG_CONFIG} --exists Qt5Core && ! ${PKG_CONFIG} --exists Qt5Gui; then
-		ewarn "Found Qt5Core but not Qt5Gui; skipping tests"
-	else
-		distutils-r1_src_test
-	fi
-}
-
-python_test() {
-	(
-		# test_meson_installed
-		unset PYTHONDONTWRITEBYTECODE
-
-		# https://bugs.gentoo.org/687792
-		unset PKG_CONFIG
-
-		# test_cross_file_system_paths
-		unset XDG_DATA_HOME
-
-		# 'test cases/unit/73 summary' expects 80 columns
-		export COLUMNS=80
-
-		# If JAVA_HOME is not set, meson looks for javac in PATH.
-		# If javac is in /usr/bin, meson assumes /usr/include is a valid
-		# JDK include path. Setting JAVA_HOME works around this broken
-		# autodetection. If no JDK is installed, we should end up with an empty
-		# value in JAVA_HOME, and the tests should get skipped.
-		export JAVA_HOME=$(java-config -O 2>/dev/null)
-
-		# Call python3 instead of EPYTHON to satisfy test_meson_uninstalled.
-		python3 run_tests.py
-	) || die "Testing failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	insinto /usr/share/vim/vimfiles
-	doins -r data/syntax-highlighting/vim/{ftdetect,indent,syntax}
-
-	insinto /usr/share/zsh/site-functions
-	doins data/shell-completions/zsh/_meson
-
-	dobashcomp data/shell-completions/bash/meson
-}
diff --git a/dev-util/meson/meson-0.63.2-r1.ebuild b/dev-util/meson/meson-0.63.2-r1.ebuild
index 35037c2833ae..4001abf8a0a6 100644
--- a/dev-util/meson/meson-0.63.2-r1.ebuild
+++ b/dev-util/meson/meson-0.63.2-r1.ebuild
@@ -13,7 +13,7 @@ else
 	MY_P=${P/_/}
 	S=${WORKDIR}/${MY_P}
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-	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
 
 inherit bash-completion-r1 distutils-r1 toolchain-funcs
diff --git a/dev-util/meson/meson-0.63.0.ebuild b/dev-util/meson/meson-0.63.3.ebuild
similarity index 97%
rename from dev-util/meson/meson-0.63.0.ebuild
rename to dev-util/meson/meson-0.63.3.ebuild
index 14ecaa4f465b..f2e31397c003 100644
--- a/dev-util/meson/meson-0.63.0.ebuild
+++ b/dev-util/meson/meson-0.63.3.ebuild
@@ -37,6 +37,10 @@ DEPEND="
 	)
 "
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.63-xtools-support.patch
+)
+
 python_prepare_all() {
 	local disable_unittests=(
 		# ASAN and sandbox both want control over LD_PRELOAD
diff --git a/dev-util/patchelf/Manifest b/dev-util/patchelf/Manifest
index a066031ba74e..00df6f97c703 100644
--- a/dev-util/patchelf/Manifest
+++ b/dev-util/patchelf/Manifest
@@ -1,5 +1,5 @@
 DIST patchelf-0.14.5.tar.gz 124767 BLAKE2B f2e02fb468db7c8c0c4270c7f95ea6c8dc6ffab7ddb0a6479bd5d1dd0481cbc55982af21a13f42076504417264a11e74d50a9f15d3d5735e47019001abf33e41 SHA512 1b7eca84f6fe2d6f6d4469ca1ccdf35dc920d2052ba94b7daeba6c8cb41fdaff20b1e5bac7c8a7650ff12bf4156da87f84d32e75b09958636dc992a1b7b1a59d
 DIST patchelf-0.15.0.tar.gz 125803 BLAKE2B 08fc2cffd7d9e835c01c828c16762fb0b3c3e422990f2d0028a65a3e0ec849d01bdef699b6f68afa6bf307e34f5e76121fc94460793c95c055552e1d8a68d772 SHA512 3b2d3d6458be5b2d43cd2878dfb1a185a95cc13cd4c94abd0ee79979afb36f46e347acc292b8d9c2954a342b7291774e6a1b63930e9f90a1cf4179ec075ab046
 EBUILD patchelf-0.14.5.ebuild 551 BLAKE2B acd9c8b3dfef45e8449dd812861edf4441a6e54e529b8fab13048d64504ca2c9cf5058159a8b47ff06e552c4e4d74c6aa7da9afeb99d1aab70a264f3253ff8be SHA512 ce28a15e8d82eb2909d4ad3f3b111883988a37dd5495c05a6ac92b64819eae108488a1edad659d72ed94a174912dddc57495b42e4136de8cec23a4905da9bc57
-EBUILD patchelf-0.15.0.ebuild 583 BLAKE2B 495d8a7f2678c8359d7e3774769c135189d18dc5e36b3ef9ec01e9c6dc4d2fa97d12525f5d01af579c15ab5eb29d585a48343705e6913f2dcb8d0825de2b45b6 SHA512 32ab5074d6057a78b4e381fb7c37052f18b9d21415c767cf9e573c666097112b412be768da8c50d7b34f75796ae3aa31a5bdce0ff3fbda11bd3d3795fd8fa940
+EBUILD patchelf-0.15.0.ebuild 581 BLAKE2B bc0e41e8d43635652528d3fe3cab5af3d2c79458dc10a4337dc13985b41522c8bc386d0d571ceebc1aaf2cfaf446fb0907777754c5891d4c568aa334bcbde549 SHA512 cd5f2cac516581cdb58e298d6221de8bc09578843d9bf2795894a49571eed328fca4d394b7aeb2fe95746fac99584ab003c960b91ddd66435bdef7fb359dcbd3
 MISC metadata.xml 221 BLAKE2B 89c194836288a2092e342c7932283845027e33ed24c07238828996c457bbe637c44e0d39236fcf5f50db27dd3c66545a0239c4336f74e7f3b463bc2e7374a1a4 SHA512 3fb0d91be78f12317cfcafccc851b13b7e6a1fd588a5762e0dba27add0a9c6b5f8b22d3c27f2fcf6665cb8f8a5e36175d74eb4a97b42bd176afe6a8128254c10
diff --git a/dev-util/patchelf/patchelf-0.15.0.ebuild b/dev-util/patchelf/patchelf-0.15.0.ebuild
index eef94aea4993..49a53011cbb0 100644
--- a/dev-util/patchelf/patchelf-0.15.0.ebuild
+++ b/dev-util/patchelf/patchelf-0.15.0.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Small utility to modify the dynamic linker and RPATH of ELF executa
 HOMEPAGE="https://github.com/NixOS/patchelf"
 SRC_URI="https://github.com/NixOS/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 SLOT="0"
-KEYWORDS="~amd64 arm arm64 ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~riscv-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~riscv-linux ~x86-linux"
 LICENSE="GPL-3"
 
 src_prepare() {
diff --git a/dev-util/rbtools/Manifest b/dev-util/rbtools/Manifest
index d25260864e1d..aa83fd0b17f6 100644
--- a/dev-util/rbtools/Manifest
+++ b/dev-util/rbtools/Manifest
@@ -2,8 +2,10 @@ DIST RBTools-2.0.1.tar.gz 229394 BLAKE2B a3864c5a39854ffd8744cc562fb888aded06b86
 DIST RBTools-3.1.1.tar.gz 317592 BLAKE2B c50e27cf67e2015904e2330208f0d13ec5a799d0820f6477a6701553140851a5d82de65fbf41d8b64bfcf0028a9baf27b710909d230e1798032a4e28f2b43935 SHA512 1a1aa51f8924b1fcdc100c0337c66870284b8c3c91cb756d231509111e4b9ae233ccae1245251e826dc23c699553f5d3441e4b9ef2b80f32d4ce8876dfa43819
 DIST RBTools-3.1.2.tar.gz 322538 BLAKE2B ab459e60e1c25a8eb3cb8afbe9ad1c5c63d1d5bb73626225057e42a9afb61d1bf59b841db6ac61cab2ddb14cdb555f9a789d0ecab7eaf02b1489a6bcf9144149 SHA512 b70c42566559180245afcfa31d3920a7a35817377c60f7c70559625866d54790e9666ba9a366a03bf14feaf1d0e8d2847a526d3976be364d14447a82d148a2eb
 DIST RBTools-3.1.tar.gz 317015 BLAKE2B dccabc93af3a8095f5e166f9e3a31cce52155876cb38675b3dd43b6556024bb9b4ed66291e495ab42b41b09934f136f4eeca7a185fc0fbb2aa2d03e1ef12d656 SHA512 2568aa905dfd119e0b66213e3ae9c8edad5a3337df00228b955006cc85e90c1492e1dc4cccc2695b53f5879103c5d4ee8dba6262112c8781e452dea7633d2c0b
+DIST RBTools-4.0.tar.gz 397113 BLAKE2B 25d743a81e22e00575c6bc2a08d5bab04c35e554f6a1a17090eb55bbcaf0e8e5f4c2ad6a68a0415acb76c093c99b7bb223aeccd68392877bae97eac354578002 SHA512 d2dbe94dbd63fbd11ef0fc8c08eecbd7000df23388afe21d30151854ff4ef2b3a6c780c60ee52408832a146570a1f7b3f0269fc0c831953e871d2dda1ed8cb3f
 EBUILD rbtools-2.0.1.ebuild 1250 BLAKE2B 8c939c64d8bcb5ec0d15a27aecbba090f40a1b4d2dd35e2f38863b36b7f95db3ae558f7cff3cb0d74aa5d04eda9c7e93aa000994e4ca60c3d2eb355e1a0059f8 SHA512 447cb645f0715067e6e22817bcb2ffede46ed87f9ed10dca60c6b9375e1738ffcd26295aa404707ecde6eea99a326d2f8ff1379c0d087c06a8f893f19ee40521
-EBUILD rbtools-3.1.1.ebuild 1348 BLAKE2B 13538dd2b7cf09854daa8ea13148d75476c834ec799d358735144893ce00ebdadc9da9fc4772bec64b7dcbb5930f850b8b9db606a024e7baf45f3938be84efe9 SHA512 077649c23fbc94cfbf294541d064400d0f2e5af453f3d7c17b8710a8c83904e4e15f8a44e6b1dcdeb4979df79898afbac133c8d91358b90367b16e372461f8e9
+EBUILD rbtools-3.1.1.ebuild 1346 BLAKE2B 4d5aee256901d80aa1511e9e66def578ebd1c5b76bf82bd302b3739f0e38fe3de1e550f7e0bb3ec52e8a6db8a5facd945f0ff634cac08c69ba9e6e6b5cf8040c SHA512 3056584ca24081f687eb4e75782d7981ed9f14de3cd5829dd6f14a5d6ed7c6cddeb14661a4cbcfa865f15c0ee2fd95531ab83862469330eec2ded2d80f3086d3
 EBUILD rbtools-3.1.2.ebuild 1348 BLAKE2B 13538dd2b7cf09854daa8ea13148d75476c834ec799d358735144893ce00ebdadc9da9fc4772bec64b7dcbb5930f850b8b9db606a024e7baf45f3938be84efe9 SHA512 077649c23fbc94cfbf294541d064400d0f2e5af453f3d7c17b8710a8c83904e4e15f8a44e6b1dcdeb4979df79898afbac133c8d91358b90367b16e372461f8e9
 EBUILD rbtools-3.1.ebuild 1348 BLAKE2B 13538dd2b7cf09854daa8ea13148d75476c834ec799d358735144893ce00ebdadc9da9fc4772bec64b7dcbb5930f850b8b9db606a024e7baf45f3938be84efe9 SHA512 077649c23fbc94cfbf294541d064400d0f2e5af453f3d7c17b8710a8c83904e4e15f8a44e6b1dcdeb4979df79898afbac133c8d91358b90367b16e372461f8e9
+EBUILD rbtools-4.0.ebuild 1600 BLAKE2B 9cfb4c98f0335115397ed1982518dc95668667b297ae8d91ae12d69cc8dec5c18379beca6c8f5734196832ec0cfaf8e7b3ce883333e9554cf85b4d8cdd534156 SHA512 6352e4916c6148879d5a4e01b4f69798a5d2ebd95e0df495d0dfcf04976fbf51acc1138e01c99a4da44adf0a473360c1b3a91bd6da1ddfc8077ab22fefee89f7
 MISC metadata.xml 218 BLAKE2B e25e8013045a9887590c6b042f7b200cff82f721b120d495d01d69fa07fe49cbbbb996b77f4f6af08527d5f89194b3fa650c9ffc7c279328652b21709353bece SHA512 ac49327c1e8833a999126e219e7f7b0008fbaee02eabda53f36d0957a264619e5bd695edf6279a932cc49bd4aa48ca22373177afed7ab427cb454c9de53d01b1
diff --git a/dev-util/rbtools/rbtools-3.1.1.ebuild b/dev-util/rbtools/rbtools-3.1.1.ebuild
index 9fb63ed11ab4..475155951a75 100644
--- a/dev-util/rbtools/rbtools-3.1.1.ebuild
+++ b/dev-util/rbtools/rbtools-3.1.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://downloads.reviewboard.org/releases/${MY_PN}/$(ver_cut 1-2)/${MY
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-util/rbtools/rbtools-4.0.ebuild b/dev-util/rbtools/rbtools-4.0.ebuild
new file mode 100644
index 000000000000..d6db29ea592a
--- /dev/null
+++ b/dev-util/rbtools/rbtools-4.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8,9,10} )
+
+inherit distutils-r1
+
+MY_PN="RBTools"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Command line tools for use with Review Board"
+HOMEPAGE="https://www.reviewboard.org/"
+SRC_URI="https://downloads.reviewboard.org/releases/${MY_PN}/$(ver_cut 1-2)/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-python/importlib_metadata-4.12[${PYTHON_USEDEP}]
+	=dev-python/importlib_metadata-4*[${PYTHON_USEDEP}]
+	dev-python/colorama[${PYTHON_USEDEP}]
+	>=dev-python/pydiffx-1.1[${PYTHON_USEDEP}]
+	=dev-python/pydiffx-1.1*[${PYTHON_USEDEP}]
+	>=dev-python/six-1.8.0[${PYTHON_USEDEP}]
+	dev-python/texttable[${PYTHON_USEDEP}]
+	>=dev-python/typing-extensions-4.3.0[${PYTHON_USEDEP}]
+	dev-python/tqdm[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( >=dev-python/kgb-6.1[${PYTHON_USEDEP}] dev-python/pytest-env[${PYTHON_USEDEP}] )
+"
+
+DOCS=( AUTHORS NEWS README.md )
+
+S=${WORKDIR}/${MY_P}
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	default
+
+	# Avoid tests requiring unpackaged test data
+	rm -f rbtools/clients/tests/test_scanning.py || die
+
+	# Avoid repository specific tests to avoid dependencies on them
+	rm -f rbtools/clients/tests/test_{cvs,git,mercurial,svn}.py || die
+
+	# Fix test that appears to expect case-insentive comparison
+	sed -i -e 's/TEST CONTENT/Test content/' rbtools/utils/tests/test_console.py || die
+}
+
+python_test() {
+	distutils_install_for_testing
+	distutils-r1_python_test
+}
diff --git a/dev-util/seer/Manifest b/dev-util/seer/Manifest
index 615dfa4e5ae5..79acf11f862d 100644
--- a/dev-util/seer/Manifest
+++ b/dev-util/seer/Manifest
@@ -1,6 +1,7 @@
-DIST seer-1.10.tar.gz 367629 BLAKE2B e09ed500103428d5aee7138beb2cf8b2dafa167e2c6e3e60d0a5e26be358945af8544a9165dda835b2ec44264da4d16a3a44398000392263d690c6080cad914f SHA512 b691b433e206c78b121a48578ac632f236ca8734f9ee6c5e9c0eb3503ac11ee786595d66ef15c46e7ae5b31a58b444b7631cea2ef67389f0be7e292c7d2279ef
+AUX seer-1.12-build-fixes.patch 683 BLAKE2B 70fe3b851fc94edf47c70f29ad91c77621dc0037b97232548aa0eaf69057be8c5743a1d341bfcea8ec58953471c67155c5479bd85e05642272b8126df4c70131 SHA512 e2f4680038b5491925fcb642865762bbe52d2f70f156133881a23bfd713c54a49c0bbc48a80c79e0830c08b16fd0e51fefcae9c03475ae22c5f5568646088956
 DIST seer-1.11.tar.gz 380123 BLAKE2B 786061d12127cac2b64012461a8cab4f082c2f028db42c8856187cefae940ed084b70db68f6deb4735e5d6237f2d936be5d28d417f676a18324e37fc14342aec SHA512 be58f4c24f34b7d55689c82c7bf0584780e36d47f2e153555fca51b35763732ff639cd2f8281bf7eba8270d706c5560efea72d2c8b19cca5d4e2480d72f9f440
-EBUILD seer-1.10.ebuild 939 BLAKE2B c2e94cfe86db4f938afa2a1262364f71e8299e9a7df6b0b2250713211acee662072b94d2c3b83ec899b9eb26fb4818cca4d93cce6733bce0784c1a3410c5d857 SHA512 6165033e812c43ed711ca73d9fceb650ee8f5561e88221b3374cbb68715a975cf13664d2cdb0032f1a21bebc5830965bde6f8ee1c84e83a693c278841f0b6741
+DIST seer-1.12.tar.gz 387336 BLAKE2B 2db88904c230f5e5d1aa7112a77a88f709879aed8a6c6867ef05d53cfbba5baa56b477345be8e00a8a5881b2156da9730b71285dc68945d78cb959fccbb988be SHA512 94ce329fa0aebea34d838c1742cd3ab34d76123d3a99e102314b2e4a300944be2fb4cd3116d023efbc3a48aec562493ca241a8478a995bd99df58bf0fecc3d50
 EBUILD seer-1.11.ebuild 939 BLAKE2B c2e94cfe86db4f938afa2a1262364f71e8299e9a7df6b0b2250713211acee662072b94d2c3b83ec899b9eb26fb4818cca4d93cce6733bce0784c1a3410c5d857 SHA512 6165033e812c43ed711ca73d9fceb650ee8f5561e88221b3374cbb68715a975cf13664d2cdb0032f1a21bebc5830965bde6f8ee1c84e83a693c278841f0b6741
+EBUILD seer-1.12.ebuild 990 BLAKE2B b10a27d1aacdfe1cc46acb806f9cc94136548796d9c25d8fb607c8b00d2b8084c41257bedc1c231932422457126f6df2804f17b03057a8789ff775cfc9ef5998 SHA512 3767b1f3dbc76f8881ee4d20f254c0e2645d1746cd410e4060794c2e27ce9ffdbd5be7319b594a07daeaca54e1455610b7e9bc13203528428192502fd24bc981
 EBUILD seer-9999.ebuild 939 BLAKE2B c2e94cfe86db4f938afa2a1262364f71e8299e9a7df6b0b2250713211acee662072b94d2c3b83ec899b9eb26fb4818cca4d93cce6733bce0784c1a3410c5d857 SHA512 6165033e812c43ed711ca73d9fceb650ee8f5561e88221b3374cbb68715a975cf13664d2cdb0032f1a21bebc5830965bde6f8ee1c84e83a693c278841f0b6741
 MISC metadata.xml 318 BLAKE2B a34dc163a2b5e0fc9db7808eaa083a7b978a5578db14c5f33e870a2b73ec21f056c3b287997e8db4c1951e8d56852df746fccc30cf47ad24fdbae13896329014 SHA512 4c3706be2572cfb702b357753b35deb33199ed701d95b37f005919e374712ee5412a8b9214ea4c3c82e8371457b5571ed9a055b1df963196650a64e8c0d67fbd
diff --git a/dev-util/seer/files/seer-1.12-build-fixes.patch b/dev-util/seer/files/seer-1.12-build-fixes.patch
new file mode 100644
index 000000000000..1230e899c4c9
--- /dev/null
+++ b/dev-util/seer/files/seer-1.12-build-fixes.patch
@@ -0,0 +1,18 @@
+https://github.com/epasveer/seer/commit/75f44adf35b44739c6454ac8078ba2e3757a797c
+
+From 75f44adf35b44739c6454ac8078ba2e3757a797c Mon Sep 17 00:00:00 2001
+From: Malik Mlitat <malik.mlitat@gmail.com>
+Date: Sat, 22 Oct 2022 23:33:12 +0200
+Subject: [PATCH] Fix debian and cmake build on linux
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -193,8 +193,6 @@ qt5_add_resources(SOURCE_FILES resource.qrc)
+ if(NOT CMAKE_BUILD_TYPE MATCHES Debug) #Release, RelWithDebInfo and MinSizeRel
+     if(WIN32) # Check if we are on Windows
+         set(SYSTEM_TYPE WIN32)
+-    else() # UNIX
+-        set(SYSTEM_TYPE EXCLUDE_FROM_ALL)
+     endif()
+     message("System type is " ${SYSTEM_TYPE})
+ endif()
diff --git a/dev-util/seer/seer-1.10.ebuild b/dev-util/seer/seer-1.12.ebuild
similarity index 94%
rename from dev-util/seer/seer-1.10.ebuild
rename to dev-util/seer/seer-1.12.ebuild
index ecf4ab10dc4a..3106394943f3 100644
--- a/dev-util/seer/seer-1.10.ebuild
+++ b/dev-util/seer/seer-1.12.ebuild
@@ -35,6 +35,10 @@ RDEPEND="
 	sys-devel/gdb
 "
 
+PATCHES=(
+	"${FILESDIR}"/${P}-build-fixes.patch
+)
+
 src_install() {
 	cmake_src_install
 
diff --git a/dev-util/sgb/Manifest b/dev-util/sgb/Manifest
index 21df010d5245..c2c5793af93c 100644
--- a/dev-util/sgb/Manifest
+++ b/dev-util/sgb/Manifest
@@ -1,7 +1,8 @@
 AUX sgb-20030623-destdir.patch 2315 BLAKE2B e902a3c7e0d9a3863f02443ef33840a7a318b1fd278d7226fd7e7812fe1ceb190829599a9b06e588ab1b05ac13bb2d829f667ad0b0556dc0fd5dea3be1643d2f SHA512 0e821be0bdeac661c229958a9227b315810f66ae420f10b720b2fe0a09f9a20510d97f47aa6cc69a9c79904925ac842771743d694bd82ca9621f4fc8f1b46f04
 AUX sgb-20030623-parallel-make-fix.patch 947 BLAKE2B 7996934e520cfbfd30c2e281786714ac4f728875df2635eb7e7c1e63a1edfcfd6eac4fc9289ef7fdbeeb71fed4691ac49ff562eb5f07c7530e596d158efc1969 SHA512 d86c32c5f0a1ec9e09a70bc8dc0581654986ada562bd37f77c3d28e16856f72f6d42eae23e1cffc35973b2701718ea1e03bd0addee61a94901efbb5af0bcbd50
+AUX sgb-20090810-Fix-build-with-Clang-16.patch 1104 BLAKE2B 2c54d544fd7907dc3d4bf7aedb3f03adec9466a38f23e9958bd159af677b8e0be57d7c60c55c59134c47ee3120528fa9e18ee9eac4ab00f15d70f5afd0eb346e SHA512 120e4457e3d5038232426b196a0d8d1d34309aeeb83e7beda0932410391d84c27a3974bf03dc749ac3964b459b4fe07a7783807e2465a6a45c993e424c8f675e
 DIST sgb-2003-06-23.tar.gz 493974 BLAKE2B b4cf4e1fd9f2aba35937865d2c2075e206eabda9f56e7f5b844be8bd4684b2a220bb1d449f0b0ed431fd2603b92aaf0cfa0a7e88015e7870638b3d69cab7288f SHA512 f486317dd85dc11761c970ab2bc0c9193f8dd3fa0d114528e1b55fd935fa9cce9266dc595b2ebe3526214ce3e6a1b3dc747382b32cbfd518ffb6179d3463e874
 DIST sgb-2009-08-10.tar.gz 496678 BLAKE2B 48c780259fee240e9739166a52972c4f3a37dc44d98a503b1df63aecec553a05888e11a01b8cf40c8a853f7416ce3118109aa6ce5db15fbfed1abbee552735ce SHA512 39afaaaeda9b1e2b0ecd56d8d0fee59754ee9340c497c9bd28aa19f039be605aef6c492969082c230840ca1619de3cb81ba3a38d4d7b6fdac6f19b658d4c01e2
-EBUILD sgb-20030623-r1.ebuild 1190 BLAKE2B 405924bf3b1a94683615274604449c72e9d7e3559641910f40a9ead0327179fa316c68d9de705eb059aca49999bff59a867a1cf8f6676bd26ebc7ff8f8723312 SHA512 4ad9db2cb156d329ded337dc9df29a8397627a2cc8fea52b1ea1fff4d127315a3cfb82b9e9432405157f0e1feac1bbf1f177872d55d36746af89a1c8145f2f72
-EBUILD sgb-20090810.ebuild 1191 BLAKE2B ac8fb483b7092f6bbcc24370e73cce6a62f6872cdec5c5bb8a7aa074b01f45a5e481fe891e201fa84383c5dcaa5a15926c2269eaca55cbf3af0bdd5051f0f90f SHA512 232f33d3b031cb78eb269370620171b56b879b6812deb31e8faf8d26f08ce486be70e735f1dd8b2b4c3d0d8914a83f0fd6a4e90bb2b288b34b06b7549d4a9d29
+EBUILD sgb-20030623-r1.ebuild 1191 BLAKE2B 92e9701977b507b8ee1df84260b2b19f41dea5ab1a3a2e8df8ba07342310ea4755a4f4fb7f30e0d687b33fc75a9da88ed472a1dfaf8cc69dda64f4ad4ff53791 SHA512 4afc524f6ade75c38c3585a60a1cb0efbfe597c7295e96770d1ca844c6015c2d0d1989b043424219cb233c22ee4d81d1b28e56d003e86345b454ca14410d7935
+EBUILD sgb-20090810-r1.ebuild 1250 BLAKE2B a6feee7c3009f114b6a97aa6d811712fca57de4161701a09e14cd8f29ea8b026e3656bb6f5d1bfb5f5a0a51ca8adc41310d1334393d4d52bb90347c87f53035a SHA512 454e27c8b1e63eded4ba49925b8a4ca8c65ffd8208d7ddda139ef25fa85a5dfecf83e5c516e1ecc99062609deff8d5029bfdb4d8fd13915349cd50516e425514
 MISC metadata.xml 217 BLAKE2B fbec54484edc2603e95c90cb231985ef0f5f8d2cd48632ac8a097a4dac165499ff4cc087b1ca9ba6a4368bbb73b3af1ee99622a80df17072e1a340c345a2ee64 SHA512 7d3fc456b183fe7bdea26fb6edce39f702741a762b74cd7d2159a0ba85af50ebc87fbd921c926692a6164d50c9faf6b19680ab96528819bb06aaeac679e42de2
diff --git a/dev-util/sgb/files/sgb-20090810-Fix-build-with-Clang-16.patch b/dev-util/sgb/files/sgb-20090810-Fix-build-with-Clang-16.patch
new file mode 100644
index 000000000000..d26e26a42e1e
--- /dev/null
+++ b/dev-util/sgb/files/sgb-20090810-Fix-build-with-Clang-16.patch
@@ -0,0 +1,46 @@
+From 5d0845e935d9b8d4174b9d98dbc123ec5d5a3460 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Mon, 24 Oct 2022 19:54:02 +0100
+Subject: [PATCH] Fix build with Clang 16
+
+Bug: https://bugs.gentoo.org/832835
+--- a/gb_graph.w
++++ b/gb_graph.w
+@@ -40,11 +40,8 @@ programs at a higher level via the system loading routine. Here is
+ the general outline of \.{gb\_graph.c}:
+ 
+ @p
+-#ifdef SYSV
+ #include <string.h>
+-#else
+ #include <strings.h>
+-#endif
+ #include <stdio.h>
+ #include <stdlib.h>
+ @h@#
+@@ -63,11 +60,8 @@ interfere with GraphBase use of a useful identifier. We scotch that.
+ @(gb_graph.h@>=
+ #include <stdio.h>
+ #include <stdlib.h>
+-#ifdef SYSV
+ #include <string.h>
+-#else
+ #include <strings.h>
+-#endif
+ #undef min
+ @<Type declarations@>@;
+ 
+--- a/gb_io.w
++++ b/gb_io.w
+@@ -92,11 +92,8 @@ occasion to use some of the standard string operations.
+ 
+ @<Header...@>=
+ #include <stdio.h>
+-#ifdef SYSV
+ #include <string.h>
+-#else
+ #include <strings.h>
+-#endif
+ 
+ @* Inputting a line. The {\sc GB\_\,IO} routines get their input from
+ an array called |buffer|. This array is internal to {\sc
diff --git a/dev-util/sgb/sgb-20030623-r1.ebuild b/dev-util/sgb/sgb-20030623-r1.ebuild
index d89599421b58..26b28efed229 100644
--- a/dev-util/sgb/sgb-20030623-r1.ebuild
+++ b/dev-util/sgb/sgb-20030623-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,7 +7,7 @@ DESCRIPTION="Stanford GraphBase"
 HOMEPAGE="http://ftp.cs.stanford.edu/pub/sgb/"
 SRC_URI="http://ftp.cs.stanford.edu/pub/sgb/sgb-${PV:0:4}-${PV:4:2}-${PV:6:2}.tar.gz"
 
-LICENSE="BSD"
+LICENSE="mmix"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc x86"
 IUSE=""
diff --git a/dev-util/sgb/sgb-20090810.ebuild b/dev-util/sgb/sgb-20090810-r1.ebuild
similarity index 91%
rename from dev-util/sgb/sgb-20090810.ebuild
rename to dev-util/sgb/sgb-20090810-r1.ebuild
index 4f6d61def77b..411bb22b4b39 100644
--- a/dev-util/sgb/sgb-20090810.ebuild
+++ b/dev-util/sgb/sgb-20090810-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,7 +7,7 @@ DESCRIPTION="Stanford GraphBase"
 HOMEPAGE="http://ftp.cs.stanford.edu/pub/sgb/"
 SRC_URI="http://ftp.cs.stanford.edu/pub/sgb/sgb-${PV:0:4}-${PV:4:2}-${PV:6:2}.tar.gz"
 
-LICENSE="BSD"
+LICENSE="mmix"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
@@ -19,6 +19,7 @@ S="${WORKDIR}"
 PATCHES=(
 	"${FILESDIR}"/sgb-20030623-parallel-make-fix.patch
 	"${FILESDIR}"/sgb-20030623-destdir.patch
+	"${FILESDIR}"/sgb-20090810-Fix-build-with-Clang-16.patch
 )
 
 src_compile() {
diff --git a/dev-util/tree-sitter-cli/Manifest b/dev-util/tree-sitter-cli/Manifest
index b41f8427a5e6..3c59c00fedc3 100644
--- a/dev-util/tree-sitter-cli/Manifest
+++ b/dev-util/tree-sitter-cli/Manifest
@@ -108,5 +108,5 @@ DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f955297217
 DIST winapi-util-0.1.5.crate 10164 BLAKE2B fc800aceae5249a858c806c3e969ef2545766099872d856ebee51c883d9acf1122278db9607d50ca53eac351502b700fd2463900932d342240f97f683d517963 SHA512 7baeb661f397c4693dfa001fdc774b323c51a7c55caad40f2de5112a1cefd1d6151e3df41fa4ee193460a5905917c83d2b1de5fa10b4bd014ad96690af95c0fd
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 EBUILD tree-sitter-cli-0.20.6.ebuild 2926 BLAKE2B f92a2937d094f4f357aedad06f6bd714f7c881b521a4e5c9b360dcc288844b11343b0d7bee922502e4d0fbd64df96ff74298289b333f2f63d483a8c98841edde SHA512 7472165b035d24e7108ed13e4cea1e75bd686d5ad32c9320ec45ae0c4c5ae047489861cf0607b6a1890fedf966625df83148fd692ed66b12ce658a29459bce2c
-EBUILD tree-sitter-cli-0.20.7.ebuild 2932 BLAKE2B 0e7863902c045cf755712ac1902e3526f7c84a3d16b6af8b98d2c9274a96c37b0786110b2a2119611c668e57658364b480fafef014b1bab0bc97d52ba5eb69b7 SHA512 c75a0e1e888802e86c83f13f4b8e18f388cd13e72765a07970189afbbeecb7b3b9308cd1491577945fa8f3499696bd0ee8572fd5bcd4a02997f7dd78b18fcb0b
+EBUILD tree-sitter-cli-0.20.7.ebuild 2930 BLAKE2B a4864252f7dc44cdee01ad466befea91fb827e12427fd371f926e6e410a0fd1154253024a3c54b9eb379dfef28372cf497cbffd600127f571bc0a0bc6e23ac53 SHA512 686e4055ad1072a79bdf2a7894d24f2a24e1a5a7048bfc70dba6e395742f99e04f186c9cc0daef92dc4fa45a0224dc9149fe25b22f8ad9223d10a93817a15cc4
 MISC metadata.xml 678 BLAKE2B e000f4502ed07b8fffcbf05a9dcf0730407d70a00ddf289b8ffdd9e6d28df6481f7e6eec3416aa1278ad9602c098bde72bcaad4f7819c9554c39baf045555dc8 SHA512 37e64d773a4b01b34208b65be600e6f46c7633571d7ad39210b7957f41f31b296565304a4dc8a4ec0518489a89b1bf7a1b204111c4d428307b562e3f6d0575f8
diff --git a/dev-util/tree-sitter-cli/tree-sitter-cli-0.20.7.ebuild b/dev-util/tree-sitter-cli/tree-sitter-cli-0.20.7.ebuild
index 80bde82b0e80..e5faca30d8d0 100644
--- a/dev-util/tree-sitter-cli/tree-sitter-cli-0.20.7.ebuild
+++ b/dev-util/tree-sitter-cli/tree-sitter-cli-0.20.7.ebuild
@@ -124,7 +124,7 @@ S="${WORKDIR}"/${MY_P}/cli
 
 LICENSE="Apache-2.0 BSD-2 CC0-1.0 ISC MIT"
 SLOT="0"
-KEYWORDS="~amd64 arm arm64 ppc64 ~riscv sparc ~x86"
+KEYWORDS="amd64 arm arm64 ppc64 ~riscv sparc x86"
 
 # Test seems to require files (grammar definitions) that we don't have.
 RESTRICT="test"
diff --git a/games-arcade/Manifest.gz b/games-arcade/Manifest.gz
index f79d1122382e..ceeedd49c608 100644
Binary files a/games-arcade/Manifest.gz and b/games-arcade/Manifest.gz differ
diff --git a/games-arcade/amphetamine/Manifest b/games-arcade/amphetamine/Manifest
index 27622fdb3cd6..be56f7ca95ac 100644
--- a/games-arcade/amphetamine/Manifest
+++ b/games-arcade/amphetamine/Manifest
@@ -1,10 +1,16 @@
 AUX amphetamine-0.8.10-64bit.patch 2708 BLAKE2B 6abc82e1758000b1fbb3e930f51873026a9e6ab0c1558b2f793a9fad75d240b5c31fec6d69f7144a9c3a91eca809fca6860fdb72a1211b8aefd0d4d64480774a SHA512 8216a5b59c52488f35416295256087771c82e8996787e74d03d416829b628267d17b47cc5f6d7bae2ff87b442bdb38aec4f78f14cd130fb045f5c8272f6b4c9d
+AUX amphetamine-0.8.10-SDL-conversions.patch 926 BLAKE2B ac8bf1d9f5af967e08d595200160c3931469856d4f919e9a3b0ce965c2c1d874abdb7348ce073815e62c4f6266536827e2670e222e29f66588068b2a9e509a95 SHA512 a458dab9fb0182afb077cbe89d805d4ee87202c0ab75c2da66a6af70554e10e08a85f6954f645d70b55f3e0c43f193349e12d735f530ca8ae78c68b73dc94e91
 AUX amphetamine-0.8.10-bugs.patch 1821 BLAKE2B 3b0870cecaa55879da3d5107e2c23d7c972e49b1289519b2107fa0da48376c562364b8d4c632812dd20a80e4e6a02fc9ddd157aa8e104a3a8e097f238c422ae9 SHA512 30cc93031152e3f244a30cb56430b451ddfb8ccfddde0fc6cd681cbc6bf0ffb4d4801df642b5330fc1462d68cb0fc3e8d8f97f7e4dc87925b5335f5b1707ff8e
 AUX amphetamine-0.8.10-build.patch 700 BLAKE2B d63c5a73f065f181a6673feb3d90e852e85befb51446ac003eca6ea6076caa36cbd911ac0e33064b5aa549c9ffee8264c5a31a34bfa7ecc659f8c07687d12130 SHA512 c79c133bb6acfc666e557e09b0ca3b556203331d167b5266217a19880b5af2101776b651a420a81b53fc4fbf790de221d0b758979955632230226581dfa30ced
+AUX amphetamine-0.8.10-clang.patch 485 BLAKE2B 2831c1c9b04fc86c17a2625c03f4d674690532c138d9c7bc076fb19c901b5ea5ea0ff635984fd94323fb072d465dd3e4b7b5125012abb50f836a91bd3a8a102e SHA512 8f12fe93fc14332eb5da4e0d85cba2a879e40a9d72ed6294300cdc58add4167acbba8e28bd68b179e7b8beda9cdaa58e1d9a35d9426a9ca7b8b4270e74a471d9
+AUX amphetamine-0.8.10-format-string.patch 462 BLAKE2B 2ffe4d83cc27511f61379e4e27fb76ac4ccc93d72f8d2b3fae5e6d35eac1392f988ab120977ebd895b7a169db9634dc91233b975110be61acc0fbe8500ac488b SHA512 b240ad18befbfaa03a449718f2327c3f428ddb46b93aed592ab004d842db692f22d1ddc95e1895a8d4268367c8d78d5564fd8e11514f9482de80787e9529c327
 AUX amphetamine-0.8.10-missing-headers.patch 457 BLAKE2B 00c50c928487ff0e8fc4bf1c707d77b6ab28b064a9682e1d7f086e6b0555868c662dd68d5b474dca6346a23eb9bc91620b3f92ce18a6e7f0be597c14b41e0c5d SHA512 1f95ac463f600b0e3812afba10682657cdd8b95dd1e77f6a2fb93af7dab60fcb85c85e60613ee4c93421faf7492ca4663d2c94bc96172c52913effe63d259523
 AUX amphetamine-0.8.10-newline.patch 11906 BLAKE2B bf505f9f51d800b6b99b4a80d9c8cd30a91c97262e7984f371be16044328475ba5905145297019bc411c5c1394a81ee2c3cc3f753af46254cf4269f8e21449fe SHA512 9bb6e300f5c17a4ae2502162c3a7940a9574fcd6c09274454a6170c5b0cfdfdf3e4668d9c6e7876f7ea48119c94e098aef605836c866f8a475d81a15129d28b1
 AUX amphetamine-0.8.10-no-lxt.patch 504 BLAKE2B ab06ee2b2209b293d0a126127c5d0cbc0d51081295d9c53d4805cd386027cd77b94a8c8153c64da6bbf6d4bcf88c0cd79a4730d04d06be4785478ec5b39b8d7b SHA512 6c96aa314cc63de4b3472bfff6e0d0d25407f4f8e8a0974df5d20af9dc44fd95a70974cec3174c642ca01be70223c1a1eaea5d300d2026a35805e03e65028207
 DIST amphetamine-0.8.10.tar.bz2 72324 BLAKE2B 39d8f56066e7fbad853198be28375dfe7ee766d7c493a6faf0e2fa321ee2d2d757f5f294418208ac97a440d58bae03d40de2615e421bb8e9fad7a8ba5220d354 SHA512 eb3106df6070e207ffb3293ac4701bba8222603c0e399667505bad29b6f6433dc9ec008499b5180f713a724d3b686fead15536a20927195bc57780be16a860ef
 DIST amphetamine-data-0.8.6.tar.bz2 928775 BLAKE2B 078de623c719ebaedae3137fe3876ecd7ba02ad7ec44a64b7775fd173a42b399d137a3862d3fe426780a234638b0876a1f0fc5a06d6ab8f4b3c4ca66df367a49 SHA512 0feb86f420b4816064594756bb30bb6e02ae5062f03ef175b3262a8f30043340933f6f1b1894e2b2cfad70befc76d3ed1e0d2777c2dc2f7461459e8a93efeaf1
+DIST amphetamine-data_0.8.7.orig.tar.gz 955993 BLAKE2B ad14f36ac1d41b9c4ce7dccb9676a562b07400e2d3bf4303e6fbc18fa385453891da35bdcbbf73331989a65379a68329752b0d550951430c2777a3174db8df8f SHA512 623f5c4d02157f55188f4f7f0ea743b613ac846f56fa80c7b875488384341cb6737beecd2ea2322219ff2ff306e1588350e80bf3bcbd0891a3ce0fd514f142e7
+DIST amphetamine.png 95279 BLAKE2B 6403bb35883ce62f672ee3a3859eb580784c8fd5b068a116c6e3606be27893288205011cba5e9b83f2989d7471a65c13789e44acf5905fdf23402bf065f92c31 SHA512 c7698973e0d656187bebb070a1a76669d71d0025b5dc1e53adf221d934db5aac926897b52db257435168d74b622ed83d6fa6938984ec06682fbd9bd08f64521c
 EBUILD amphetamine-0.8.10-r1.ebuild 1004 BLAKE2B 11e7a7116ab5a30316a1257f83f4d61cfe972b588e796cb66fe17cdcd5f10a90bfa156dbadc640231813fdb18a1c88d981e2363b4e578806f15efcddee2fec19 SHA512 837a2dabcbfffee5014d88dc541909e44442ed63645b039974b91d19ba93d2c3e3824fb58219a0965753232be309064073601c3e810db85ce470f4f5b454848e
+EBUILD amphetamine-0.8.10-r2.ebuild 1236 BLAKE2B 38dd858e06b7261d05f872bca23f033a8e85dbb8dcb4b7663f28bad6fdea672a8256c57ffa1c38d5bf50914aa7de98b1892690bd2d8d145bb65848b27a1ca168 SHA512 156c108bb2d5f7a9202b8ceead2405115dd1bec1a5c8d4df20860caef3ec7e6d9e955040266372f4c6a45dc3eb4597f8c1ce67c4328fe7b3acd84ad645a1f262
 MISC metadata.xml 250 BLAKE2B 8d44bd4c6e7d6491273e2015e36ddac74af7b94a124fd240ff030e16430f5c85e53ab812f0e3e94bb2e6d138f39b512bbe01ff98b0081cacc21a02d648ec7643 SHA512 80ac07a3cac10ad2e72e9989a130b7d2073934fe92914a9db2af4d0e769d4bf537770f8faba0654bbd64a7e85ee38cf1f9d03b4b9cd322864b1b2bb35087d610
diff --git a/games-arcade/amphetamine/amphetamine-0.8.10-r2.ebuild b/games-arcade/amphetamine/amphetamine-0.8.10-r2.ebuild
new file mode 100644
index 000000000000..ac1c0dde9fb1
--- /dev/null
+++ b/games-arcade/amphetamine/amphetamine-0.8.10-r2.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit desktop
+
+DESCRIPTION="A cool Jump'n Run game offering some unique visual effects"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+SRC_URI="
+	mirror://gentoo/${P}.tar.bz2
+	mirror://debian/pool/main/a/amphetamine-data/amphetamine-data_0.8.7.orig.tar.gz
+	https://dev.gentoo.org/~pacho/${PN}/${PN}.png
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	media-libs/libsdl[sound,video]
+	x11-libs/libXpm
+"
+DEPEND="${RDEPEND}"
+BDEPEND=""
+
+PATCHES=(
+	"${FILESDIR}"/${P}-build.patch
+	"${FILESDIR}"/${P}-64bit.patch
+
+	# From Debian:
+	"${FILESDIR}"/${P}-no-lxt.patch
+	"${FILESDIR}"/${P}-bugs.patch
+	"${FILESDIR}"/${P}-missing-headers.patch
+	"${FILESDIR}"/${P}-newline.patch
+	"${FILESDIR}"/${P}-format-string.patch
+
+	# From OpenBSD:
+	"${FILESDIR}"/${P}-SDL-conversions.patch
+	"${FILESDIR}"/${P}-clang.patch
+)
+
+src_prepare() {
+	default
+	sed -i -e '55d' src/ObjInfo.cpp || die
+}
+
+src_compile() {
+	emake INSTALL_DIR=/usr/share/${PN}
+}
+
+src_install() {
+	newbin amph ${PN}
+	insinto /usr/share/${PN}
+	doins -r ../amph/*
+	doicon "${DISTDIR}/${PN}.png"
+	make_desktop_entry ${PN} Amphetamine ${PN}
+	einstalldocs
+}
diff --git a/games-arcade/amphetamine/files/amphetamine-0.8.10-SDL-conversions.patch b/games-arcade/amphetamine/files/amphetamine-0.8.10-SDL-conversions.patch
new file mode 100644
index 000000000000..7182eb7acfd0
--- /dev/null
+++ b/games-arcade/amphetamine/files/amphetamine-0.8.10-SDL-conversions.patch
@@ -0,0 +1,22 @@
+--- a/src/SndSys.cpp.orig	Sun Mar 24 00:49:09 2002
++++ b/src/SndSys.cpp	Sat Jan 24 04:52:38 2009
+@@ -16,7 +16,7 @@ void Mix_Audio(void *udata, Uint8 *stream, int len)
+ 
+ int InitializeSoundSystem()
+ {	
+-		SDL_AudioSpec wanted, obtained;
++		SDL_AudioSpec wanted;
+         
+         /* Set the audio format */
+         // Not all sounds are of the same sampling rate which is why
+@@ -28,8 +28,8 @@ int InitializeSoundSystem()
+         wanted.callback = Mix_Audio;
+         wanted.userdata = NULL;
+ 
+-        /* Open the audio device, forcing the desired format */
+-        if ( SDL_OpenAudio(&wanted, &obtained) < 0 ) {
++        /* Open the audio device, allowing SDL to apply conversions */
++        if ( SDL_OpenAudio(&wanted, NULL) < 0 ) {
+                 fprintf(stderr, "InitSoundSystem: Couldn't open audio: %s\n", SDL_GetError());
+                 fprintf(stderr, "Sound was disabled. \n");
+                 return(-1);
diff --git a/games-arcade/amphetamine/files/amphetamine-0.8.10-clang.patch b/games-arcade/amphetamine/files/amphetamine-0.8.10-clang.patch
new file mode 100644
index 000000000000..d3fcbfdcabff
--- /dev/null
+++ b/games-arcade/amphetamine/files/amphetamine-0.8.10-clang.patch
@@ -0,0 +1,18 @@
+Index: src/Element.cpp
+--- a/src/Element.cpp.orig
++++ b/src/Element.cpp
+@@ -279,7 +279,13 @@ CBackgroundElement::CBackgroundElement(short initx, sh
+ 
+ void	CBackgroundElement::OnAllocate()
+ {
+-	short	params[5] = {-1, xs, ys, xe - xs, ye - ys};
++	short	params[5] = {
++		-1,
++		static_cast<short>(xs),
++		static_cast<short>(ys),
++		static_cast<short>(xe - xs),
++		static_cast<short>(ye - ys)
++	};
+ 	unsigned char *tmpBmp;
+ 
+ 	tmpBmp = gShapeManager->GetBackground(params[1], params[2]);
diff --git a/games-arcade/amphetamine/files/amphetamine-0.8.10-format-string.patch b/games-arcade/amphetamine/files/amphetamine-0.8.10-format-string.patch
new file mode 100644
index 000000000000..50e235a66a85
--- /dev/null
+++ b/games-arcade/amphetamine/files/amphetamine-0.8.10-format-string.patch
@@ -0,0 +1,11 @@
+description: fix a format string issue
+--- a/src/AmpHead.hpp
++++ b/src/AmpHead.hpp
+@@ -183,6 +183,6 @@ typedef struct {
+ #define SWAP(a, b, _t) (a) = (_t)((long)a ^ (long)(b)); (b) = (_t)((long)(a) ^ (long)(b)); (a) = (_t)((long)(a) ^ (long)(b));
+ #define NZ(a, b) ((a) == 0 ? (b) : (a))
+ 
+-#define MSG(message) if (logFile) fprintf(logFile, message); fflush(logFile)
++#define MSG(message) if (logFile) fprintf(logFile, "%s", message); fflush(logFile)
+ 
+ #endif
diff --git a/games-fps/Manifest.gz b/games-fps/Manifest.gz
index 6defd48d5109..f8da2a31b550 100644
Binary files a/games-fps/Manifest.gz and b/games-fps/Manifest.gz differ
diff --git a/games-fps/qudos/Manifest b/games-fps/qudos/Manifest
index 89df8d19900c..0efa56cbbcc6 100644
--- a/games-fps/qudos/Manifest
+++ b/games-fps/qudos/Manifest
@@ -1,6 +1,12 @@
 AUX qudos-0.40.1-gnusource.patch 265 BLAKE2B beb6c3f71b39c28789e3dcaa58185464a312d63fe416324ee7cbc8eec084af41a8ca7590e95b19c02a2bfaacc510f7c0c477c1e96cf8726bfc63ae92076d0e30 SHA512 99e30dbcd4773021e6d8e2dc20cbf054534c1d18d86877688bdcb5ea34e7644e877ae0a674baaa471283899c596293336faa7afd4492336b3284d77256fd318b
-AUX qudos-0.40.1-libpng15.patch 209 BLAKE2B 9fb92e63f23f2acd2b5f14e0ef8d85385af868fcc1ef7200b35a18a979ef556b33a49325c860e54e3ae11aabb7a70097fb0733f3b826b78d650dcf2caf1b3124 SHA512 5e8fd8eef45902dbd41e64f7fcd3a31c91f19edc71e2eb1c89d161f46ef4f4c04894f27db8e0c5f9946673bdf72580aac067c63297214fe45531119d1f948380
+AUX qudos-0.40.1-libjpeg-clash.patch 961 BLAKE2B 5b33d8122054de9295a52af11da7dec272cd8a58ae89f4142d495bc5c1c2d916de6a8b9796cc3298f65c31154243f1fbc09555bf0b7ba82ff826bf5bf37799df SHA512 3ca43812848e7974ec29451cbdd3f68d082c46e9e41a5284ee8bb58ba54f49201db877612405df3ab35d8a060f768518c977350b7d528ceec8086097af3f713d
+AUX qudos-0.40.1-libpng.patch 997 BLAKE2B af1bffb598f21488dd873688351e83b3b96bfca60bb5355ad365a9a0105a3ce74ed77118ad7c236e09be74dd1ad77e8baf0953274151f79fa3210c991e4dc0b1 SHA512 ca62553c5310161fbc1be1042c33365340887a77812d41aaa0886f7645b4c22e83dd884e0eb0a1a2c987ba895e3cb87784268aba3c8ea2a6c30aa2d5ba9d12e3
+AUX qudos-0.40.1-no-bits-nan.patch 317 BLAKE2B b9c12827056b162a9d5e8946ec3bdc6cced9d8dcfa8bc5d52f5ce0dbf495a2abff43cbbecc966b69fcd55a343c7ca0be094d9d963c54d82a78b97f8e720c346a SHA512 5538210b96bafda9144bb62fac6f96513fc828d757a77f8b656f67dfb29d548755e8ba4454773e90c7c92afa3e7f7a6391ec57d2af30b0395a701217ec3c22e1
+AUX qudos-0.40.1-respect-cc.patch 389 BLAKE2B 2f7edbc95d8525d38428b338c725a07124a7f9f4cb8622441aebbc6dcd9def9ed8c3662396e6b79f2964099581f1e03df10ceb515da29094bb463a58f6458073 SHA512 f3f89abf6d6194c427b2aff3cf4d1ca48d4f4e80ff68a5f2f2e47ba8c47e85de7daf7c0a9a914f0f1e4890694d0c538a85135268a6986dd58aaed5e90fd708c9
+AUX qudos-0.40.1-respect-libdir.patch 1516 BLAKE2B fbd0b4075ffab070db54448bd044c962925cac16b98d1b07c0fb8b6dd72b47f203b9e0489db129f1285819d1db09723e4fca5b944f119c461971f9bae8742447 SHA512 20f154f00d3595e0c404ebafb53ab681cd17a3c79352dbe7baedad77cb8bdbe8e5a7c61f375afb580d59f5f91654e3bfa73987d0828007b6a676fc10fcdd5b81
+AUX qudos-0.40.1-use-pkg-config.patch 969 BLAKE2B 176b214f2161432aaeb8fe5cb029b06450c4b60820fdcf0b89556c0aedabb7e14bb6777a776bdd4a106a7fa429e8450d63606b49409f5b065d200a483ecb6d69 SHA512 77ff07b101b50ce714bf43c45a1cf7afe39ca3d8670233c13857421a368581b44f05ef3a104cbf0a828b87220f55195c6ddcc4d6c68e9763f8920fdf6b508d74
+AUX qudos-0.40.1-zlib-build.patch 388 BLAKE2B dae75195ab0a4742277e1b240479fe9df195d81906998b349c5bd891ef67a38804e3471022eb8469cb198a222e80deae50e962a1e876a54b69c213ea06a2b7bc SHA512 f615d44b257487f2762de98bbfa8f4089e8f4f3b09c54e964022ee23f3699f94bd3befc2cfae458a82426fad744513dcc2228c9d6736b2c0e5237b9ca8e1e02d
 DIST QuDos-0.40.1-src.tar.bz2 2031636 BLAKE2B 4940f589cc6239e1489bb81f2e0c0afd6efb36930595c57131927b777913c904ada04883eb5f12f9aaf0ba06d687bf4be8b03f369dd9684fe21d7b1068240599 SHA512 97b9c6bac0d09c060ab33174604deb2781f0ebdc48b00bd0bc402523fb04cdf84edd8abc18507bba8c7e616f6d460a1de6debc96ec39bb5562b20a7f06eea734
 DIST QuDos-0.40.1.pk3 4210489 BLAKE2B 98e07682368e52f4c318e7b9ab98d01b0363986bfea54edff3b13f7f2f4cad20de0146eb498569d024d22200830b341b02f135bf50df4a317915429bb1437439 SHA512 19c3c6b3d17cbd9642320d8eb7a83d667afeafd0ee5eb818e9f07be71e2ab69182474c1f529ecbcfcfa59590bafedb0de3c70dfff10e4bc7a6e07a1546f27d4b
-EBUILD qudos-0.40.1.ebuild 4205 BLAKE2B 4ea2a769ed1a04ba80f8599cfbcf61ae82b20546bfb0e9be5d288b6beb8356a191bb239c27a7e4871f6f613feb77a67520b21f8d3be62575265cbad258e90025 SHA512 aea7c9d34ad037a5b07bf4cb0525776b85ad6d06c9b0de65e099287289dc707c8a6eef20eb09e4134e32cb5ce27670b7a00ec9c327b63df53490240d56248ff6
+EBUILD qudos-0.40.1-r1.ebuild 4076 BLAKE2B f797a0b3bd7daf852c736e2978b5d672d77f36a861bfdb4d35b6b11146021a95fb02d0fe7140910b0ab2362ca70ae64e0ceb3f67c368b4553433aac6bee8525f SHA512 3a83713bd76b67882b30d82f75e25c422dab03e0eb45abe4f8ed32923fa2ff452c090b18969ee49804661ad9e46d559736373fb6a95b16d4691e249e7cfaa742
 MISC metadata.xml 666 BLAKE2B 847908831b34d7bcae31859484be771ddfd94b6014de51c7fdbed9da3e058adfd740e9a937cb6ffcc7994d5612037c9c2b2c8095e163767bc8fd7ecac1ab92c9 SHA512 4631a2fce2db990ff6b0a8966ff1de1e3ff79e0b35087a2c88a1ceb85f389c0aa6b5ca43edc96966d32e34842b3211eee7e27e7796cda70811e300268a7065c0
diff --git a/games-fps/qudos/files/qudos-0.40.1-libjpeg-clash.patch b/games-fps/qudos/files/qudos-0.40.1-libjpeg-clash.patch
new file mode 100644
index 000000000000..944c1aff856c
--- /dev/null
+++ b/games-fps/qudos/files/qudos-0.40.1-libjpeg-clash.patch
@@ -0,0 +1,25 @@
+From c657cd54baee3bdfe7a92c9b91536bb5c3ddcdd8 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Mon, 24 Oct 2022 17:50:17 +0100
+Subject: [PATCH 2/5] Fix clash with libjpeg
+
+--- a/src/ref_gl/gl_image.c
++++ b/src/ref_gl/gl_image.c
+@@ -912,7 +912,7 @@ jpg_skip_input_data(j_decompress_ptr cinfo, long num_bytes)
+ }
+ 
+ void
+-jpeg_mem_src(j_decompress_ptr cinfo, byte * mem, int len)
++qudos_jpeg_mem_src(j_decompress_ptr cinfo, byte * mem, int len)
+ {
+ 	cinfo->src = (struct jpeg_source_mgr *)(*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_PERMANENT, sizeof(struct jpeg_source_mgr));
+ 	cinfo->src->init_source = jpg_null;
+@@ -956,7 +956,7 @@ LoadJPG(char *filename, byte ** pic, int *width, int *height)
+ 	jpeg_create_decompress(&cinfo);
+ 
+ 	/* Feed JPEG memory into the libJpeg Object */
+-	jpeg_mem_src(&cinfo, rawdata, rawsize);
++	qudos_jpeg_mem_src(&cinfo, rawdata, rawsize);
+ 
+ 	/* Process JPEG header */
+ 	jpeg_read_header(&cinfo, true);
diff --git a/games-fps/qudos/files/qudos-0.40.1-libpng.patch b/games-fps/qudos/files/qudos-0.40.1-libpng.patch
new file mode 100644
index 000000000000..78fb4cdb7bd5
--- /dev/null
+++ b/games-fps/qudos/files/qudos-0.40.1-libpng.patch
@@ -0,0 +1,30 @@
+--- a/src/ref_gl/gl_local.h
++++ b/src/ref_gl/gl_local.h
+@@ -29,6 +29,7 @@
+ #include <GL/glu.h>
+ #include <GL/glext.h>
+ 
++#include <zlib.h> /* Z_DEFAULT_COMPRESSION */
+ #include <png.h>
+ #include <jpeglib.h>
+ 
+Subject: [PATCH] Fix build with libpng 1.4.0
+
+From the 1.4.0 release notes:
+```
+   m. The function png_set_gray_1_2_4_to_8() was removed. It has been
+      deprecated since libpng-1.0.18 and 1.2.9, when it was replaced with
+      png_set_expand_gray_1_2_4_to_8() because the former function also
+      expanded palette images.
+```
+--- a/src/ref_gl/gl_image.c
++++ b/src/ref_gl/gl_image.c
+@@ -1186,7 +1186,7 @@ LoadPNG(char *filename, byte ** pic, int *width, int *height)
+ 	if (my_png->ColorType == PNG_COLOR_TYPE_PALETTE)
+ 		png_set_palette_to_rgb(png);
+ 	if (my_png->ColorType == PNG_COLOR_TYPE_GRAY && my_png->BitDepth < 8)
+-		png_set_gray_1_2_4_to_8(png);
++		png_set_expand_gray_1_2_4_to_8(png);
+ 
+ 	/* Add alpha channel if present */
+ 	if (png_get_valid(png, pnginfo, PNG_INFO_tRNS))
diff --git a/games-fps/qudos/files/qudos-0.40.1-libpng15.patch b/games-fps/qudos/files/qudos-0.40.1-libpng15.patch
deleted file mode 100644
index 633215be34be..000000000000
--- a/games-fps/qudos/files/qudos-0.40.1-libpng15.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/ref_gl/gl_local.h
-+++ b/src/ref_gl/gl_local.h
-@@ -29,6 +29,7 @@
- #include <GL/glu.h>
- #include <GL/glext.h>
- 
-+#include <zlib.h> /* Z_DEFAULT_COMPRESSION */
- #include <png.h>
- #include <jpeglib.h>
- 
diff --git a/games-fps/qudos/files/qudos-0.40.1-no-bits-nan.patch b/games-fps/qudos/files/qudos-0.40.1-no-bits-nan.patch
new file mode 100644
index 000000000000..adcffef23c40
--- /dev/null
+++ b/games-fps/qudos/files/qudos-0.40.1-no-bits-nan.patch
@@ -0,0 +1,12 @@
+--- a/src/mods/rogue/g_local.h
++++ b/src/mods/rogue/g_local.h
+@@ -26,9 +26,6 @@
+ //==================================================================
+ 
+ #ifndef _WIN32
+-#ifdef __linux__
+-#include <bits/nan.h>
+-#endif
+ #define min(a,b) ((a) < (b) ? (a) : (b))
+ #define max(a,b) ((a) > (b) ? (a) : (b))
+ #ifdef __sun__
diff --git a/games-fps/qudos/files/qudos-0.40.1-respect-cc.patch b/games-fps/qudos/files/qudos-0.40.1-respect-cc.patch
new file mode 100644
index 000000000000..92c7028e1890
--- /dev/null
+++ b/games-fps/qudos/files/qudos-0.40.1-respect-cc.patch
@@ -0,0 +1,15 @@
+From 76aef29111d0b8c5e5fffe80833d0c227cca1127 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Mon, 24 Oct 2022 17:54:38 +0100
+Subject: [PATCH 4/5] Respect CC
+
+--- a/Makefile
++++ b/Makefile
+@@ -60,7 +60,6 @@ PREFIX?=	$(LOCALBASE)
+ DATADIR?=	$(LOCALBASE)/share/quake2
+ LIBDIR?=	$(LOCALBASE)/lib/QuDos
+ 
+-CC?=		gcc
+ TYPE?=		release
+ 
+ OGG_LDFLAGS=	-lvorbisfile -lvorbis -logg
diff --git a/games-fps/qudos/files/qudos-0.40.1-respect-libdir.patch b/games-fps/qudos/files/qudos-0.40.1-respect-libdir.patch
new file mode 100644
index 000000000000..b3e0cdc5a2f7
--- /dev/null
+++ b/games-fps/qudos/files/qudos-0.40.1-respect-libdir.patch
@@ -0,0 +1,53 @@
+From 1dc6681ee4eea2d1b6e7edd04cf84fd10c407d28 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Mon, 24 Oct 2022 17:54:12 +0100
+Subject: [PATCH 3/5] Respect libdir
+
+--- a/Makefile
++++ b/Makefile
+@@ -55,7 +55,6 @@ WITH_XMMS?=YES		# Enable XMMS support (thanks AprQ2).
+ 
+ # General variables.
+ LOCALBASE?=	/usr/local
+-X11BASE?=	/usr/X11R6
+ PREFIX?=	$(LOCALBASE)
+ 
+ DATADIR?=	$(LOCALBASE)/share/quake2
+@@ -98,34 +97,19 @@ GAME_NAME=	game$(ARCH).$(SHLIB_EXT)
+ endif
+ 
+ # Compilation flags.
+-CFLAGS+=	-I/usr/include -I$(LOCALBASE)/include -I$(X11BASE)/include \
++CFLAGS+=	-I/usr/include -I$(LOCALBASE)/include \
+ 		-DGAME_NAME='"$(GAME_NAME)"' -DQUDOS_VERSION='"$(VERSION)"'
+ 
+ WARNS=	-Wshadow -Wpointer-arith -Wcast-align -Waggregate-return -Wstrict-prototypes -Wredundant-decls -Wnested-externs
+ 
+-ifeq ($(TYPE),debug)
+-CFLAGS+=	-Wall -Werror -g -ggdb -DDEBUGGING # $(WARNS)
+-else
+-  ifeq ($(TYPE),profile)
+-CFLAGS+=	-pg
+-  else
+-CFLAGS+=	-O3 -ffast-math -funroll-loops -fomit-frame-pointer \
+-		-fexpensive-optimizations
+-    ifeq ($(ARCH),i386)
+-CFLAGS+=	-falign-loops=2 -falign-jumps=2 -falign-functions=2 \
+-		-fno-strict-aliasing
+-    endif
+-  endif
+-endif
+-
+ # Linker flags.
+-LDFLAGS+=	-L/usr/lib -L$(LOCALBASE)/lib -L$(X11BASE)/lib -lm
++LDFLAGS+=	-lm
+ 
+ ifeq ($(OSTYPE),Linux)
+ LDFLAGS+=	-ldl
+ endif
+ 
+-REF_LDFLAGS=	-L/usr/X11R6/lib -lX11 -lXext -lXxf86vm -lGLU -ljpeg -lpng
++REF_LDFLAGS=	-lX11 -lXext -lXxf86vm -lGLU -ljpeg -lpng
+ 
+ ifeq ($(strip $(WITH_DGA_MOUSE)),YES)
+ REF_LDFLAGS+= -lXxf86dga
diff --git a/games-fps/qudos/files/qudos-0.40.1-use-pkg-config.patch b/games-fps/qudos/files/qudos-0.40.1-use-pkg-config.patch
new file mode 100644
index 000000000000..c2aae64e2b32
--- /dev/null
+++ b/games-fps/qudos/files/qudos-0.40.1-use-pkg-config.patch
@@ -0,0 +1,30 @@
+From 372cfdd9c81043667451fc46bcb8daaa5a5e3620 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Mon, 24 Oct 2022 17:56:14 +0100
+Subject: [PATCH 5/5] Use pkg-config
+
+--- a/Makefile
++++ b/Makefile
+@@ -64,9 +64,9 @@ TYPE?=		release
+ 
+ OGG_LDFLAGS=	-lvorbisfile -lvorbis -logg
+ 
+-SDL_CONFIG?=	sdl-config
+-SDL_CFLAGS=	$(shell $(SDL_CONFIG) --cflags)
+-SDL_LDFLAGS=	$(shell $(SDL_CONFIG) --libs)
++PKG_CONFIG?=   pkg-config
++SDL_CFLAGS=	$(shell ${PKG_CONFIG} --cflags sdl)
++SDL_LDFLAGS=	$(shell ${PKG_CONFIG} --libs sdl)
+ 
+ ifeq ($(OSTYPE),Linux)
+ ALSA_LDFLAGS=	-lasound
+@@ -96,8 +95,7 @@ GAME_NAME=	game$(ARCH).$(SHLIB_EXT)
+ endif
+ 
+ # Compilation flags.
+-CFLAGS+=	-I/usr/include -I$(LOCALBASE)/include \
+-		-DGAME_NAME='"$(GAME_NAME)"' -DQUDOS_VERSION='"$(VERSION)"'
++CFLAGS+=	-DGAME_NAME='"$(GAME_NAME)"' -DQUDOS_VERSION='"$(VERSION)"'
+ 
+ WARNS=	-Wshadow -Wpointer-arith -Wcast-align -Waggregate-return -Wstrict-prototypes -Wredundant-decls -Wnested-externs
+ 
diff --git a/games-fps/qudos/files/qudos-0.40.1-zlib-build.patch b/games-fps/qudos/files/qudos-0.40.1-zlib-build.patch
new file mode 100644
index 000000000000..d2e1474f2d7b
--- /dev/null
+++ b/games-fps/qudos/files/qudos-0.40.1-zlib-build.patch
@@ -0,0 +1,12 @@
+From bdd75315feed9fbaaf9dcf87f9a7e5eb18ca0b8b Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Mon, 24 Oct 2022 17:50:02 +0100
+Subject: [PATCH 1/5] Fix zlib build
+
+--- a/src/qcommon/unzip/ioapi.h
++++ b/src/qcommon/unzip/ioapi.h
+@@ -1,3 +1,4 @@
++#define OF(x) x
+ /*
+  * ioapi.h -- IO base function header for compress/uncompress .zip files
+  * using zlib + zip or unzip API
diff --git a/games-fps/qudos/qudos-0.40.1.ebuild b/games-fps/qudos/qudos-0.40.1-r1.ebuild
similarity index 66%
rename from games-fps/qudos/qudos-0.40.1.ebuild
rename to games-fps/qudos/qudos-0.40.1-r1.ebuild
index 24a6a4e01612..4084c1e427b6 100644
--- a/games-fps/qudos/qudos-0.40.1.ebuild
+++ b/games-fps/qudos/qudos-0.40.1-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit desktop flag-o-matic toolchain-funcs
 
@@ -20,33 +20,45 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="cdinstall debug dedicated demo dga ipv6 joystick mods opengl qmax oss sdl textures"
 
-DEPEND="opengl? (
-		virtual/opengl
-		virtual/glu )
-	sdl? ( media-libs/libsdl[joystick?,opengl,sound,video]
-		virtual/opengl
-		virtual/glu )
-	virtual/jpeg:0
+DEPEND="
 	media-libs/libogg
-	media-libs/libpng:0
+	media-libs/libjpeg-turbo
+	media-libs/libpng
 	media-libs/libvorbis
 	sys-libs/zlib
 	x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXxf86dga
-	x11-libs/libXxf86vm"
+	x11-libs/libXxf86vm
+	opengl? (
+		virtual/opengl
+		virtual/glu
+	)
+	sdl? (
+		media-libs/libsdl[joystick?,opengl,sound,video]
+		virtual/opengl
+		virtual/glu
+	)
+"
 RDEPEND="
 	${DEPEND}
 	cdinstall? ( games-fps/quake2-data )
 	demo? ( games-fps/quake2-demodata[symlink] )
 	textures? ( games-fps/quake2-textures )
 "
+BDEPEND="virtual/pkgconfig"
 
 dir=usr/share/${MY_PN}
 
 PATCHES=(
-	"${FILESDIR}"/${P}-libpng15.patch
+	"${FILESDIR}"/${P}-libpng.patch
 	"${FILESDIR}"/${P}-gnusource.patch
+	"${FILESDIR}"/${P}-zlib-build.patch
+	"${FILESDIR}"/${P}-libjpeg-clash.patch
+	"${FILESDIR}"/${P}-respect-libdir.patch
+	"${FILESDIR}"/${P}-respect-cc.patch
+	"${FILESDIR}"/${P}-use-pkg-config.patch
+	"${FILESDIR}"/${P}-no-bits-nan.patch
 )
 
 default_client() {
@@ -81,38 +93,19 @@ pkg_setup() {
 
 	if default_client ; then
 		elog "Selected the ${snd_drv} sound driver as the default."
-		echo
 	fi
 }
 
-src_unpack() {
-	unpack "${FILE_STEM}.tar.bz2"
-}
-
 src_prepare() {
 	rm docs/gnu.txt || die
 
+	default
+
 	# Change default sound driver and its location
 	sed -i \
 		-e "s:\"oss\":\"${snd_drv}\":" \
 		-e "s:\"\./snd:\"/usr/$(get_libdir)/${PN}/snd:" \
 		src/client/snd_dma.c || die
-
-	sed -i \
-		-e 's:jpeg_mem_src:qudos_jpeg_mem_src:g' \
-		src/ref_gl/gl_image.c || die
-
-	if has_version '>=sys-libs/zlib-1.2.5.1-r1' ; then
-		sed -i \
-			-e '1i#define OF(x) x' \
-			src/qcommon/unzip/ioapi.h || die
-	fi
-
-	sed -i -e '106,119 s/CFL/LED/' Makefile || die
-
-	sed -i -e 's:-L/usr/lib -L$(LOCALBASE)/lib :: ' Makefile || die
-
-	default
 }
 
 src_configure() {
@@ -122,7 +115,7 @@ src_configure() {
 
 src_compile() {
 	yesno() {
-		usex ${1} YES NO;
+		usex ${1} YES NO
 	}
 
 	local client="YES"
@@ -131,36 +124,39 @@ src_compile() {
 	local type="release"
 	use debug && type="debug"
 
-	emake \
-		BUILD_QUAKE2="${client}" \
-		BUILD_DEDICATED=$(yesno dedicated) \
-		BUILD_GLX=$(yesno opengl) \
-		BUILD_SDLGL=$(yesno sdl) \
-		BUILD_ALSA_SND=NO \
-		BUILD_SDL_SND=$(yesno sdl) \
-		BUILD_OSS_SND=$(yesno oss) \
-		WITH_XMMS=NO \
-		WITH_DGA_MOUSE=$(yesno dga) \
-		WITH_JOYSTICK=$(yesno joystick) \
-		TYPE="${type}" \
-		DATADIR="${dir}" \
-		LOCALBASE=/usr \
-		LIBDIR="/usr/$(get_libdir)"/${PN} \
-		WITH_QMAX=$(yesno qmax) \
-		BUILD_3ZB2=$(yesno mods) \
-		BUILD_CTF=$(yesno mods) \
-		BUILD_JABOT=$(yesno mods) \
-		BUILD_ROGUE=$(yesno mods) \
-		BUILD_XATRIX=$(yesno mods) \
-		BUILD_ZAERO=$(yesno mods) \
-		WITH_BOTS=$(yesno mods) \
-		HAVE_IPV6=$(yesno ipv6) \
-		CC="$(tc-getCC)" \
-		WITH_X86_ASM=NO \
-		WITH_DATADIR=YES \
-		WITH_LIBDIR=YES \
-		BUILD_DEBUG_DIR=release \
+	local myemakeargs=(
+		BUILD_QUAKE2="${client}"
+		BUILD_DEDICATED=$(yesno dedicated)
+		BUILD_GLX=$(yesno opengl)
+		BUILD_SDLGL=$(yesno sdl)
+		BUILD_ALSA_SND=NO
+		BUILD_SDL_SND=$(yesno sdl)
+		BUILD_OSS_SND=$(yesno oss)
+		WITH_XMMS=NO
+		WITH_DGA_MOUSE=$(yesno dga)
+		WITH_JOYSTICK=$(yesno joystick)
+		TYPE="${type}"
+		DATADIR="${dir}"
+		LOCALBASE=/usr
+		LIBDIR="/usr/$(get_libdir)"/${PN}
+		WITH_QMAX=$(yesno qmax)
+		BUILD_3ZB2=$(yesno mods)
+		BUILD_CTF=$(yesno mods)
+		BUILD_JABOT=$(yesno mods)
+		BUILD_ROGUE=$(yesno mods)
+		BUILD_XATRIX=$(yesno mods)
+		BUILD_ZAERO=$(yesno mods)
+		WITH_BOTS=$(yesno mods)
+		HAVE_IPV6=$(yesno ipv6)
+		CC="$(tc-getCC)"
+		WITH_X86_ASM=NO
+		WITH_DATADIR=YES
+		WITH_LIBDIR=YES
+		BUILD_DEBUG_DIR=release
 		BUILD_RELEASE_DIR=release
+	)
+
+	emake "${myemakeargs[@]}"
 }
 
 src_install() {
diff --git a/games-util/Manifest.gz b/games-util/Manifest.gz
index ed18b295022c..6396f8b2e6cd 100644
Binary files a/games-util/Manifest.gz and b/games-util/Manifest.gz differ
diff --git a/games-util/antimicrox/Manifest b/games-util/antimicrox/Manifest
index 3a94f1df913f..8001b6d0b976 100644
--- a/games-util/antimicrox/Manifest
+++ b/games-util/antimicrox/Manifest
@@ -1,4 +1,6 @@
 AUX antimicrox-man_gz.patch 600 BLAKE2B 70f3837a4d3b2e4a5e64dd710eb710c1ea09bfdeea8a4000e976c1d3f0fcd451d0030aba22aa904308cf2aead9d1881757fd3b2fe4f703d8727ad132513bb24b SHA512 d30604d5615b00dd1b4ac03bd063a271c346ea8f13568b37c1af9f0bbdf8ad8ef8df604441b79e467742310433cc121aaee7c773cac7f3ec5e2547013fca16a8
 DIST antimicrox-3.2.5.tar.gz 1801792 BLAKE2B 8e42bef2c04f57a4ca733fa9632bb8b2070e4bfc6f0ac1c01016dd221a6cf24a229d1090c0d8ed2a7562d4c7224668cebdf0fe23265ac4d9208403f9fbe7e85c SHA512 5b9e75fcb1e5d7e12d5880f83451c12f0eb2da1a6e43387fc42bbcba8c24a77398868f69177277840b9a7541736007fdbec58fd852d32d12ca559f6f75178c0b
+DIST antimicrox-3.3.1.tar.gz 1878461 BLAKE2B 4f1d0c9be92bf89c5ebc6cad8a8b106f1888e53d135efc86616c1244738f79df6981fe0ea0e233e8d436ace126f4ac43a5edd63b0684a6af257c055db99f4284 SHA512 15c6b88640e0cd6ebff85574d1911fb92ed27868b2442ab225ef0eaccfbe243b445c3a78435225cb5a54d9dca65517da8998df95ebfa50d92bd1e53338c102d2
 EBUILD antimicrox-3.2.5.ebuild 1476 BLAKE2B 66557ba073b132582cf6e75c2423c31de0405fc54e07182ab824a187ece0408602ea0dd4a564c626b58c87caea98136af378999ccb5fe4d30eb0a690a3b7dd16 SHA512 db3db5f5539aa44978daf95b0f41f85e19c1215cc9711097ffdaaca23ce05567c9637c652e70ba6f8b080b5c15ef5b02e1531c566a607f08585a44a8ebd77a99
+EBUILD antimicrox-3.3.1.ebuild 1476 BLAKE2B 66557ba073b132582cf6e75c2423c31de0405fc54e07182ab824a187ece0408602ea0dd4a564c626b58c87caea98136af378999ccb5fe4d30eb0a690a3b7dd16 SHA512 db3db5f5539aa44978daf95b0f41f85e19c1215cc9711097ffdaaca23ce05567c9637c652e70ba6f8b080b5c15ef5b02e1531c566a607f08585a44a8ebd77a99
 MISC metadata.xml 412 BLAKE2B 9a75236478dfbb26649e3ab3355953ecb2d32739c0338d4fe2e8e0f4eddd0c5aa444fd13c02ff2740ef10077c56a40ab0a48d02670273ec831f24d50fae9cb83 SHA512 bcb066386dcc22038e8a9f2f42b03149dce3421ad545ebb9c7ef8df2f996970442219f40dbc82e232d7cf71ec9b421c6966b01801c46ca7a0322a8717cce4d87
diff --git a/games-util/antimicrox/antimicrox-3.3.1.ebuild b/games-util/antimicrox/antimicrox-3.3.1.ebuild
new file mode 100644
index 000000000000..15e929f6d678
--- /dev/null
+++ b/games-util/antimicrox/antimicrox-3.3.1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit udev xdg cmake
+
+DESCRIPTION="Graphical program used to map keyboard buttons and mouse controls to a gamepad"
+HOMEPAGE="https://github.com/AntiMicroX/antimicrox/"
+SRC_URI="https://github.com/AntiMicroX/${PN}/archive/${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+# Tests fail to build
+# https://github.com/AntiMicroX/antimicrox/issues/530
+RESTRICT="test"
+
+RDEPEND="
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	media-libs/libsdl2[X,joystick]
+	virtual/udev
+	x11-libs/libX11
+	x11-libs/libXi
+	x11-libs/libXtst
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-qt/linguist-tools:5
+	kde-frameworks/extra-cmake-modules
+	doc? ( app-doc/doxygen[dot] )
+"
+
+PATCHES=( "${FILESDIR}"/${PN}-man_gz.patch )
+DOCS=( CHANGELOG.md README.md )
+
+src_configure() {
+	local mycmakeargs=(
+		-DAPPDATA=OFF
+		-DCHECK_FOR_UPDATES=OFF
+		-DINSTALL_UINPUT_UDEV_RULES=OFF  # Install in src_install
+		-DWITH_TESTS=OFF
+		-DWITH_UINPUT=ON
+		-DWITH_X11=ON
+		-DWITH_XTEST=ON
+		-DBUILD_DOCS=$(usex doc ON OFF)
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	rm -r "${ED}"/usr/share/doc/${PN} || die
+
+	udev_dorules "${S}"/other/60-${PN}-uinput.rules
+
+	use doc && dodoc -r "${S}"/docs/{html,latex}
+}
+
+pkg_postinst() {
+	udev_reload
+	xdg_pkg_postinst
+}
+
+pkg_postrm() {
+	udev_reload
+	xdg_pkg_postrm
+}
diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz
index 5481ae9be9a2..356ed2b93aef 100644
Binary files a/gnome-extra/Manifest.gz and b/gnome-extra/Manifest.gz differ
diff --git a/gnome-extra/evolution-data-server/Manifest b/gnome-extra/evolution-data-server/Manifest
index 765c6a1f96d3..7c9750b91769 100644
--- a/gnome-extra/evolution-data-server/Manifest
+++ b/gnome-extra/evolution-data-server/Manifest
@@ -2,6 +2,8 @@ AUX 3.36.5-gtk-doc-1.32-compat.patch 1016 BLAKE2B 6458aa6e2bb41ce07bf74910ef36aa
 AUX calentry.schema 3661 BLAKE2B 0235e8d98d1367f209a31cc74da9563d53dfc12ca34e020f63a18fcb73c13345e58a9e4a9f5bb3e14a7774bdcd279118d84d971a4b164c8ce41cd26798efabdd SHA512 56606848319539b8c9af732a5d572db44e2d7da433b1689ef7f14a283880951e10d5fc39f27245a7ddc8f0cb2e7563a757060020c17e5411f875cae10b119834
 DIST evolution-data-server-3.44.4.tar.xz 4784388 BLAKE2B dd5b7094af9c66b710d61de282ff7e223fd87524f0135b7fc2c962d7829a8ed25a90a5fa73d155b692e28d9d18807f8c8731efbfb32613e2e1a020008739beae SHA512 385137f1e412b5c5bcd496d493da4657f8bb6e72519f6e62ab1a683c729082ea0ddcf7b5dae8c0cdf37cb279a1cf59ffb6dd61009c693001d03a0d54264e979a
 DIST evolution-data-server-3.46.0.tar.xz 4817048 BLAKE2B 5c07137659132fca4e2e42d616d3b7e26317f44009de1c9582105a65036884c5b1f7521ac325e2a74a6493362a38b6761d78dabd00b9e64b51a352bcd1d225af SHA512 3aef4ef51e5be2c5e392a2b2781283bb75d8e7d08a3a0daae6be488d14e998779b992095d12889d2d6afe5c732394090f99fa9a866e8825eecdcde2bf6b24ec1
+DIST evolution-data-server-3.46.1.tar.xz 4843728 BLAKE2B 1053389277c9b8f83c80db382ba14db974a0674e75f728ac24a21e49f2c744c0239d19f380487487a2798db85706c5c0a7cb867508726e40034bcdcbb46da6c1 SHA512 6dbb9b192c46fdec25eb3587f90c5c2f3de902c80996d691978be519d7f7aad9946d3282c44febcf498bb8d497b639f3afeeead3f032bbb0cd1ddb380a0ca5e7
 EBUILD evolution-data-server-3.44.4-r2.ebuild 4510 BLAKE2B 6c70a5ced1a2c2a815898b45728162a852771f9e2dfa2b77decb8844ae7a48b3a05ac1770862136bf0b5e104365254c080ff1c66bce10dcbb6d6b30860b5f81f SHA512 2cc50e79bbaf8ba95b8cdac5a20b20aa13a89db78cb99c7fd5cd67cfd2753cdc1e6fd275a253acd1b337ab77d5295b8755e5d1edcd2830ce10498ee551831c7c
 EBUILD evolution-data-server-3.46.0-r1.ebuild 4064 BLAKE2B 19c0bc2cd9167ce2907adaa9d6e6dca2daf81f17045eb0c4e0a9b4d7f545301280088453bc83bdeaa958030f38ea79bc76074d37260f408437c753210e88a27c SHA512 0ed0a208c7750f5600f623e0fe1219430315972d4a68e1956bf610170d597cce482807ad9e41a693fee10737a0c6064357ed5bbdf496bd7e1d1aed5a765782a0
+EBUILD evolution-data-server-3.46.1.ebuild 4064 BLAKE2B 19c0bc2cd9167ce2907adaa9d6e6dca2daf81f17045eb0c4e0a9b4d7f545301280088453bc83bdeaa958030f38ea79bc76074d37260f408437c753210e88a27c SHA512 0ed0a208c7750f5600f623e0fe1219430315972d4a68e1956bf610170d597cce482807ad9e41a693fee10737a0c6064357ed5bbdf496bd7e1d1aed5a765782a0
 MISC metadata.xml 850 BLAKE2B f3e730c63794d5890e76c1f2c7e388b1d6320fc6ef64fa405365a27e7d3883fd09b9cfd875ef0d774bdd51eae5237fff0fd7bd1e6be81a2e0d9252e0b1263afe SHA512 8657f87116f9ad70c24711f270f7b71a57e48bb4f9a8780900f9f6d3da550d0f7b6ae2da453ff6bb76ffd948935f534fdb4b3545a46b0129fbae68a8d1fcecdb
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.46.1.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.46.1.ebuild
new file mode 100644
index 000000000000..54af15fb111a
--- /dev/null
+++ b/gnome-extra/evolution-data-server/evolution-data-server-3.46.1.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake db-use flag-o-matic gnome2 vala virtualx
+
+DESCRIPTION="Evolution groupware backend"
+HOMEPAGE="https://wiki.gnome.org/Apps/Evolution https://gitlab.gnome.org/GNOME/evolution-data-server"
+
+# Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+".
+LICENSE="|| ( LGPL-2 LGPL-3 ) BSD Sleepycat"
+SLOT="0/63-26-20" # subslot = libcamel-1.2/libedataserver-1.2/libebook-1.2.so soname version
+
+IUSE="berkdb +gnome-online-accounts +gtk gtk-doc +introspection ldap kerberos oauth vala +weather"
+REQUIRED_USE="
+	oauth? ( gtk )
+	vala? ( introspection )
+"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+
+# berkdb needed only for migrating old addressbook data from <3.13 versions, bug #519512
+# glib-2.70 for build-time optional GPowerProfileMonitor
+RDEPEND="
+	>=app-crypt/libsecret-0.5[crypt]
+	>=dev-db/sqlite-3.7.17
+	>=dev-libs/glib-2.70:2
+	>=dev-libs/libical-3.0.8:=[glib,introspection?]
+	>=dev-libs/libxml2-2
+	>=dev-libs/nspr-4.4
+	>=dev-libs/nss-3.9
+	>=net-libs/libsoup-3.1.1:3.0
+	>=dev-libs/json-glib-1.0.4
+
+	dev-libs/icu:=
+	sys-libs/zlib:=
+	virtual/libiconv
+
+	berkdb? ( >=sys-libs/db-4:= )
+	gtk? (
+		>=x11-libs/gtk+-3.20:3
+		>=gui-libs/gtk-4.4:4
+		>=media-libs/libcanberra-0.25[gtk3]
+
+		oauth? (
+			>=net-libs/webkit-gtk-2.34.0:4.1
+			>=net-libs/webkit-gtk-2.36.0:5
+		)
+	)
+	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.8:= )
+	introspection? ( >=dev-libs/gobject-introspection-0.9.12:= )
+	kerberos? ( virtual/krb5:= )
+	ldap? ( >=net-nds/openldap-2:= )
+	weather? ( >=dev-libs/libgweather-4.2.0:4= )
+"
+DEPEND="${RDEPEND}
+	vala? ( $(vala_depend)
+		>=net-libs/libsoup-3.1.1:3.0[vala]
+		dev-libs/libical[vala]
+	)
+"
+BDEPEND="
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	dev-util/gperf
+	gtk-doc? ( >=dev-util/gtk-doc-1.14
+		app-text/docbook-xml-dtd:4.1.2 )
+	>=dev-util/intltool-0.35.5
+	>=sys-devel/gettext-0.18.3
+	virtual/pkgconfig
+"
+
+# Some tests fail due to missing locales.
+# Also, dbus tests are flaky, bugs #397975 #501834
+# It looks like a nightmare to disable those for now.
+RESTRICT="test !test? ( test )"
+
+# global scope PATCHES or DOCS array mustn't be used due to double default_src_prepare call
+src_prepare() {
+	use vala && vala_setup
+	cmake_src_prepare
+	gnome2_src_prepare
+
+	eapply "${FILESDIR}"/3.36.5-gtk-doc-1.32-compat.patch
+
+	# Make CMakeLists versioned vala enabled
+	sed -e "s;\(find_program(VALAC\) valac);\1 ${VALAC});" \
+	  -e "s;\(find_program(VAPIGEN\) vapigen);\1 ${VAPIGEN});" \
+	  -i "${S}"/CMakeLists.txt || die
+}
+
+src_configure() {
+	# /usr/include/db.h is always db-1 on FreeBSD
+	# so include the right dir in CPPFLAGS
+	use berkdb && append-cppflags "-I$(db_includedir)"
+
+	# phonenumber does not exist in tree
+	local mycmakeargs=(
+		-DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
+		-DENABLE_GTK_DOC=$(usex gtk-doc)
+		-DWITH_PRIVATE_DOCS=$(usex gtk-doc)
+		-DENABLE_SCHEMAS_COMPILE=OFF
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DWITH_KRB5=$(usex kerberos)
+		-DWITH_KRB5_INCLUDES=$(usex kerberos "${EPREFIX}"/usr "")
+		-DWITH_KRB5_LIBS=$(usex kerberos "${EPREFIX}"/usr/$(get_libdir) "")
+		-DWITH_OPENLDAP=$(usex ldap)
+		-DWITH_PHONENUMBER=OFF
+		-DENABLE_SMIME=ON
+		-DENABLE_GTK=$(usex gtk)
+		-DENABLE_GTK4=$(usex gtk)
+		-DENABLE_CANBERRA=$(usex gtk)
+		-DENABLE_OAUTH2_WEBKITGTK=$(usex oauth)
+		-DENABLE_OAUTH2_WEBKITGTK4=$(usex oauth)
+		-DENABLE_EXAMPLES=OFF
+		-DENABLE_GOA=$(usex gnome-online-accounts)
+		-DWITH_LIBDB=$(usex berkdb "${EPREFIX}"/usr OFF)
+		# ENABLE_BACKTRACES requires libdwarf ?
+		-DENABLE_IPV6=ON
+		-DENABLE_WEATHER=$(usex weather)
+		-DENABLE_LARGEFILE=ON
+		-DENABLE_VALA_BINDINGS=$(usex vala)
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+}
+
+src_test() {
+	virtx cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+
+	if use ldap; then
+		insinto /etc/openldap/schema
+		doins "${FILESDIR}"/calentry.schema
+		dosym ../../../usr/share/${PN}/evolutionperson.schema /etc/openldap/schema/evolutionperson.schema
+	fi
+}
diff --git a/gnome-extra/evolution-ews/Manifest b/gnome-extra/evolution-ews/Manifest
index 6653ee8352a3..be6fc890e7b0 100644
--- a/gnome-extra/evolution-ews/Manifest
+++ b/gnome-extra/evolution-ews/Manifest
@@ -1,5 +1,7 @@
 DIST evolution-ews-3.44.4.tar.xz 691396 BLAKE2B 69344bec9dffe21e54e77325929b791cc89072e9a2a2f9a0fbcf5551c1f8b13c90c4a3c2bd934956c4e1b73b306fbdd6827c6fb4ef7aee182a3bdbeb450d124a SHA512 0326b274fbcc3630ccaf6517495ce22409706f0ad16c11b189f91c27ab8921a639bb07296d51063e71cb706e66bd861044adbf146b16f9fca4b4cd9cde6edb65
 DIST evolution-ews-3.46.0.tar.xz 691740 BLAKE2B 1d956a39dc0233c8a8c3a23f2be3be2e2d697eca71d4e7317db69ca4ade007a4e2ac51edb99851aa75c009ed40e5c0b149b1ddab7cd6826eb4dddcb08f62f326 SHA512 3c01e981857e02c45660bd0d8143ce0f19dd20b30916b8334c15546e6ff720efb4fd52ab0cfb312a5767958cf0eceb5e39213256b75feb15e5c1fea6755b2dd9
+DIST evolution-ews-3.46.1.tar.xz 692020 BLAKE2B 9ccabf0393842a829f5a319fcca886e1546cf1bad3e5199683822ef68c9c285430076a11e87f646f052e9e4c8ba691029d31bce4b4da833c6e291252ab0f57fd SHA512 0e258aa2af4305f46926c43dba1787cf5e577567aa385e7d039b2e18d9660e24f7571b9b4e8660a8203e6dabd3f1346670164620f73c9465cbb6516a7076ab25
 EBUILD evolution-ews-3.44.4-r1.ebuild 1560 BLAKE2B f17aeee022f634c5f649d199a737508e40476732b3640664e7cc32a09d456d5b6be9f332cccb182df37110edce2f60277f06830d106b5f0eab9c773113b92967 SHA512 a0ef1eb981174aa1a43e68464bd8d074b683331387c12b0c96c4f8a847df08480ee8b94b5b317cda5e4883d74c098b936bb6dda82ad9c2d2cea06536ba1fc0c5
 EBUILD evolution-ews-3.46.0.ebuild 1569 BLAKE2B ad6d58dc251bc434f6cd5d3a8c097ab641715dcae6f63b68a33c0b2c4029d0c525aeb7128cd7d3ab3c6b0052050d3b401fc565953a755d811ce3461040d2affc SHA512 76893a81fd26c7a07ad72fc148646ad35a36a34436b448e6f13f71fc5dc35173b0696dc72df367cf21feb1d13d3cbbc2f976e32503e7519c51c369fb14df49eb
+EBUILD evolution-ews-3.46.1.ebuild 1569 BLAKE2B ad6d58dc251bc434f6cd5d3a8c097ab641715dcae6f63b68a33c0b2c4029d0c525aeb7128cd7d3ab3c6b0052050d3b401fc565953a755d811ce3461040d2affc SHA512 76893a81fd26c7a07ad72fc148646ad35a36a34436b448e6f13f71fc5dc35173b0696dc72df367cf21feb1d13d3cbbc2f976e32503e7519c51c369fb14df49eb
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/gnome-extra/evolution-ews/evolution-ews-3.46.1.ebuild b/gnome-extra/evolution-ews/evolution-ews-3.46.1.ebuild
new file mode 100644
index 000000000000..d8248e7b6518
--- /dev/null
+++ b/gnome-extra/evolution-ews/evolution-ews-3.46.1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake gnome2 optfeature
+
+DESCRIPTION="Evolution module for connecting to Microsoft Exchange Web Services"
+HOMEPAGE="https://wiki.gnome.org/Apps/Evolution https://gitlab.gnome.org/GNOME/evolution-ews"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+IUSE="test"
+
+# libical-glib currently (2020-02-29) oddly behind USE=introspection
+RDEPEND="
+	dev-db/sqlite:3
+	>=dev-libs/glib-2.68:2
+	>=dev-libs/libical-3.0.5:0=[introspection(-)]
+	>=dev-libs/json-glib-1.0.4
+	>=dev-libs/libmspack-0.4
+	dev-libs/libxml2:2
+	>=gnome-extra/evolution-data-server-${PV}:0=
+	>=mail-client/evolution-${PV}:2.0
+	>=net-libs/libsoup-3.0:3.0
+	>=x11-libs/gtk+-3.10:3
+"
+DEPEND="${RDEPEND}
+	test? ( >=net-libs/uhttpmock-0.9:1.0 )
+"
+BDEPEND="
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=dev-util/intltool-0.35.5
+	>=sys-devel/gettext-0.18.3
+	virtual/pkgconfig
+"
+
+# Unittests fail to find libevolution-ews.so
+RESTRICT="test !test? ( test )"
+
+# global scope PATCHES or DOCS array mustn't be used due to double default_src_prepare
+# call; if needed, set them after cmake_src_prepare call, if that works
+src_prepare() {
+	cmake_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_MSPACK=ON
+		-DENABLE_TESTS=$(usex test)
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+}
+
+src_test() {
+	cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+}
+
+pkg_postinst() {
+	optfeature "oauth support" gnome-extra/evolution-data-server[oauth]
+}
diff --git a/gnome-extra/gnome-software/Manifest b/gnome-extra/gnome-software/Manifest
index 7b9c9868aff6..0e7bfb8c68ab 100644
--- a/gnome-extra/gnome-software/Manifest
+++ b/gnome-extra/gnome-software/Manifest
@@ -2,6 +2,8 @@ AUX 43.0-fwupd-Update-the-self-test.patch 1467 BLAKE2B 368b70c15ce19b67bf9625b9a
 AUX 43.0-metainfo-Correct-release-information-to-pass-appstre.patch 14940 BLAKE2B 2692a3a648c6b20f3531a7e846e12ac09a9d59c86246cc4544624cb78cf7c48f568fbfaecc476e03ffc581e55389553e51ee01aef0920215f030dad5e080e4cb SHA512 5043f8b10c4f49f31ae065e326f861a83c1ae3862c21b8e7de312f04becdd75e282530df539f7320a689eb95266eb2b03c595dfeabd6b561c8e1648b1c679384
 DIST gnome-software-42.4.tar.xz 2278412 BLAKE2B beb63ba7f874b72edd3c592f0a7553a4a5ba3631ede55da4c70989604cd0433dd40dd7c75b4bafdf106f1c02285e8502a610d8e2c9edf8cc4d34ea14f75fab62 SHA512 00c70886c6e3302a59ae533034d8d75cfe05873ea40d0d05a03e15ae34101bb8a64722a7c6a6d43bb54b61033bc14af1542bb832a70ee7b1a2dab6dacb8ffd8f
 DIST gnome-software-43.0.tar.xz 2352976 BLAKE2B 8dc8b03c198aad01e73026ccb4b3e99888f39e9bbd99d9809863a2fe405865022a33458194f3769a3a5e9ff7a888beb463aca2805d90405342f9aae4485b352a SHA512 bcf64e4d3d847c660fd1c1a2356235569560bc315fb6b0d2e459dfb1bbee7bf97d9a14f7c8ef1129e01241385cd1540d1499f9cc9ad99a996965feb48e698d6a
+DIST gnome-software-43.1.tar.xz 2351032 BLAKE2B e8718817ee9a6ac458f57d5f06271136d590ba2e6a951a05f143f5f85e124b0a64e1866fd50a1ff8e28e24682ffcb6ffb72dfd2ee8fcb9f6e8dd2fa3797513a5 SHA512 5494622e1c52bcf660df8ab83cd73720ccab3c767f8870b6a23bd83c396972c508beb365e6df143055e3a7d9e77b42f01ea73a49d8dcdcf97aaeada0fe9f03e5
 EBUILD gnome-software-42.4.ebuild 2800 BLAKE2B bf6d0e0f52184efe135c677289dcbaceb2a7adb7b326e0a6597dfe2e8c8aee38772a93a74cc421857a663686caac6ded75f374c07f0f900c186626cb3e641c9e SHA512 809ef0e439d4f0f908228fa4d5f71c479bd1114b2af4cee3e5f8ab67a2e3c0018441494ff56b57cd6f691acac5f4c859ee299ab70d2e5173df06a00171e363de
 EBUILD gnome-software-43.0.ebuild 2783 BLAKE2B 23bfdc781acedca00698cc41ca76c0c32004427b6fa3ec00009c5e2d653b65887329bbcf3077196f20c5660ea3844c19b6e5bdf34c82c491830e24619e8d7339 SHA512 c85670858d264d1cb33df75b4fad441c909b9b99eade5bf4ff86bfc2ca19d6e5c3374b29aeba8f99803eeb49c7ab07f15c05077906fbea3ab0fd64f408b33aa4
+EBUILD gnome-software-43.1.ebuild 2636 BLAKE2B 5407bc77db2ed2dd43fdb628faa5851b40114c56c41d1dfe920a4940b59fe81c5c732f6e1e67dbe7230f989fb12950934641e26d5e521b4ebab1300865ceb88d SHA512 ced57c7bcdccbe6294f3b7fea45de1fe73b632af5fa7d41e0f192a56a2dc3bdcaffed86bab58c40331d8fd44bbe0da8a6aa8ef01f5cd34f47ba14f5bc49f5c10
 MISC metadata.xml 579 BLAKE2B 4ac8aea21122da6a03605961d9f47721a06a4c49ffdc1ffa16eee5a473f5e5957c69760ee7d19e087688fe2b479a16f4cf417cbe0e2d3e149b0339881fecd2fc SHA512 3f783e0f7fbec5a95f498d622885de19babf8f786a66af2d3755907d242df0433a910b07c2628854ed1038920417d7d28c35c10f18adfcbd37e8922aa3c9253d
diff --git a/gnome-extra/gnome-software/gnome-software-43.1.ebuild b/gnome-extra/gnome-software/gnome-software-43.1.ebuild
new file mode 100644
index 000000000000..19f8b6526551
--- /dev/null
+++ b/gnome-extra/gnome-software/gnome-software-43.1.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome.org gnome2-utils meson virtualx xdg
+
+DESCRIPTION="Gnome install & update software"
+HOMEPAGE="https://wiki.gnome.org/Apps/Software https://gitlab.gnome.org/GNOME/gnome-software"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="flatpak +firmware gnome gtk-doc sysprof udev test"
+
+RDEPEND="
+	>=dev-libs/appstream-0.14.0:0=
+	>=x11-libs/gdk-pixbuf-2.32.0:2
+	>=dev-libs/libxmlb-0.1.7:=
+	>=gui-libs/gtk-4.6:4
+	>=dev-libs/glib-2.70.0:2
+	>=dev-libs/json-glib-1.6.0
+	>=net-libs/libsoup-3.0:3.0
+	>=gui-libs/libadwaita-1.0.1:1
+	sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 )
+	gnome? ( >=gnome-base/gsettings-desktop-schemas-3.18.0 )
+	sys-auth/polkit
+	firmware? ( >=sys-apps/fwupd-1.5.6 )
+	flatpak? (
+		>=sys-apps/flatpak-1.9.1
+		dev-util/ostree
+	)
+	udev? ( dev-libs/libgudev )
+	>=gnome-base/gsettings-desktop-schemas-3.11.5
+"
+DEPEND="${RDEPEND}
+	test? ( dev-libs/libglib-testing )
+"
+BDEPEND="
+	dev-libs/libxml2:2
+	dev-util/gdbus-codegen
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	gtk-doc? (
+		dev-util/gtk-doc
+		app-text/docbook-xml-dtd:4.3
+	)
+"
+
+src_prepare() {
+	default
+	xdg_environment_reset
+
+	sed -i -e '/install_data.*README\.md.*share\/doc\/gnome-software/d' meson.build || die
+	# We don't need language packs download support, and it fails tests in 3.34.2 for us (if they are enabled)
+	sed -i -e '/subdir.*fedora-langpacks/d' plugins/meson.build || die
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use test tests)
+		$(meson_feature gnome gsettings_desktop_schemas) # Honoring of GNOME date format settings.
+		-Dman=true
+		-Dpackagekit=false
+		# -Dpackagekit_autoremove
+		-Dpolkit=true
+		-Deos_updater=false # Endless OS updater
+		$(meson_use firmware fwupd)
+		$(meson_use flatpak)
+		-Dmalcontent=false
+		-Drpm_ostree=false
+		-Dwebapps=true
+		-Dhardcoded_foss_webapps=true
+		-Dhardcoded_proprietary_webapps=true
+		$(meson_use udev gudev)
+		-Dapt=false
+		-Dsnap=false
+		-Dexternal_appstream=false
+		$(meson_use gtk-doc gtk_doc)
+		-Dhardcoded_curated=true
+		-Ddefault_featured_apps=false # TODO: Will this be beneficial to us with flatpak at least? If enabled, it shows some apps under installed (probably merely due to /usr/share/app-info presence), but launching and removal of them is broken
+		-Dmogwai=false #TODO?
+		$(meson_feature sysprof)
+		-Dprofile=''
+		-Dsoup2=false
+	)
+	meson_src_configure
+}
+
+src_test() {
+	virtx dbus-run-session meson test -C "${BUILD_DIR}" || die
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/gnome-extra/gucharmap/Manifest b/gnome-extra/gucharmap/Manifest
index 23bf0222e153..9c9f840be909 100644
--- a/gnome-extra/gucharmap/Manifest
+++ b/gnome-extra/gucharmap/Manifest
@@ -1,10 +1,13 @@
 AUX 14.0.1-fix-file-conflicts.patch 699 BLAKE2B a276814cd000ebc34b38b4031e47813935ac0a166acbdfe719e27eb3d83e50ce5eb55486dfe6dfd4bbd53bf56c28d3d213cc266148063fbe8aee06967a423622 SHA512 160d3bcf8ea27fecd51470a15e83ef29c99f9b4c86cce1286d8ba2a6432a11a0fa4ec602db80c8daba3ad5e5e24c602a876fc8ad90e07a65d968ed47e46badfc
 AUX 14.0.1-install-user-help.patch 749 BLAKE2B 954bae11770bccdbf5babea1c06cc829ef069777a52542ffb683ca0709300edbfaa452aea7da44497b900dc653c00b129bcdca0ee6808e6d5f610d43437858d6 SHA512 c1fedabf8eff11256cd4a93130db028c3e599f6f0fd249ff8a4533c1ebf7d3f8c17422b3765dbc047f25bd9c4725c43212de585642a246338c7fcd1c78c3d914
+AUX 15.0.1-fix-file-conflicts.patch 291 BLAKE2B 4ad2a65c731372de5553386bbe3136d0d2ff8dd76d27370f62d707eda83908169bb610d1e9d9687ac2a7e2f51681c07b2b446e92dbb4371b47c39a523f14be40 SHA512 9e9887b295f8b4b817904d2bdbd4dd0944c59daf4dfe1fbd1746e8db70088e40e8410965c10e8a24184407710ad19ae5fc93185e73ed7759a89aecb4ccf73a58
 AUX gucharmap-3.4.1.1-fix-doc.patch 348 BLAKE2B c6bf73a5e9940557fa43da04b8212ca527b9abdfaccf7f1522c9a6dfcb52af8f6c05a56a683621eb64c34452464605d7a5a98b77ab9b67224f5c84acc0b1cf68 SHA512 d6e468ce2bbd258e01be0125a1b16529c89ce9758c24504d91550181af3b3e7c6b0e4171d3b26c252339f099927d43a7184f967764d564a4ebf28610968d8d27
 DIST gucharmap-14.0.3.tar.gz 1931686 BLAKE2B e72b46450ad97a49519014882cbfd5792a07daf782fdf0d80e4b9221537548a57d3b43dc2b421f3f72d3b0adfee6f11c53304b4468c78b766ffee9536efebba2 SHA512 cb43265a2b54231c15331c299ed10bba8bb83bdc1860ee50764bed8a40ce1421f49edfeb7fa5814c8aac6c23f80936a966346849db83ddf7f94a370adeffc6c8
 DIST gucharmap-15.0.0.tar.gz 1936653 BLAKE2B 4ff592bca75a08e19921c2b08c19ea2693b4652986f2cf77536cf3e056353cf9bfe44e66e15b402552f5ab1b97631f53e07ac10b530164b0ba1d479f70d2b4c2 SHA512 b72f4bf5b6b4d922c91bd1fb58070a5bcdc4364f96144db7446c8a94045158bc3c9e549f1bd3db3f27bb22e6b83a130c73cbd7c737c49a2bb0e2a6a5c8756a66
+DIST gucharmap-15.0.1.tar.gz 1938073 BLAKE2B 0a6b6e76bb60648c591354394d2dfb78f56508dbf7d0b62edb945b8e79b6cbe7f333e7245d374fae9476986e06aee99bca53fe05da6a2e66629e33941fa79bd5 SHA512 77a6cd6bfa4465140a1014c8b1a9783acf6feb656925f319627f3fe5a0e091fa1819d82e3f5ca4f9eaa0c6e6bf8ace66ae6895360b9574a8f9ac7a347c37e103
 DIST gucharmap-3.0.1.tar.bz2 3275481 BLAKE2B 80dde7791abdc72677add9c65c59f810e6c6952116b92db34059c4c40d2657246b17844c105e68f32c86294e9b4e71e9d48e6f0522855465734d7c24e8d17608 SHA512 4d8a2276b5cb1a0b0fadca2a8522755c5884985a12d5b19341b9cefcd7f749ec1286c0271419e38ec84be7edcfa1293e7f0263eb682c75387d692792de3e1fb1
 EBUILD gucharmap-14.0.3.ebuild 1708 BLAKE2B 31654745e590266a69f0e716e884e65eafe3e211a111f4df42092f463d762a16780824710c7bfb40ce2cd85ea83dc7cfc8b81a462596fe9d9a19992d5c71a605 SHA512 af36e8e7e29d0c05db8ed6c6cd36645da80ffb7342e70c15c0f61060cd91ca6583dea5034ae3f2c01102f86f96346c6d4c6c21e826d2a754d5e069b5a847f9c4
 EBUILD gucharmap-15.0.0.ebuild 1696 BLAKE2B f2616d6fd69b90c9691dbd44ba72668c003a8d3f23cde395b924507ac2bd40d204fbb91fc7f935aa94c49babde6ad9a683fbf4995763cc634fbd664b88137dea SHA512 9939ac87a9b7b3278a24f4b7fb1de48f4560027dfdea960085d581efe05356087aa2a388fa96140140a31106267b051559b3fa853d1e6ad3b49a0d557d3194b6
+EBUILD gucharmap-15.0.1.ebuild 1696 BLAKE2B 9e78929bd3294a586b1a3e0adb109e07bac73f415bc879de43695cacbe20be1e8daa60e4fe0a6ed027823f9d523fa9e7d3215d648b1a60f02ac3a0c6bdca9f5b SHA512 6e88519c3015f837f55bfdba68f76e6099c51a71994e2a5527274a5c1ff4fae10d2494609c2022e10758c265f9d3440a21c5527ae51200b9b6c744c2549a66b2
 EBUILD gucharmap-3.0.1-r200.ebuild 1477 BLAKE2B 4ffe6feb86be5711b4850d4c1233bd79e2cb9cbca765977ac15b7a335c3b3f80beffe2119835a73024d38a22e4623037755c8672f77edb6016b818047b8c2256 SHA512 b0313be9418955ebfde4547603d66c8121cb36b7cf390e23ee9b536ea9ff21b4760bb9d9e0d843bd49fcb63db28b173d8536a6d5a5b72de1eef76a87bed769dd
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/gnome-extra/gucharmap/files/15.0.1-fix-file-conflicts.patch b/gnome-extra/gucharmap/files/15.0.1-fix-file-conflicts.patch
new file mode 100644
index 000000000000..0664c9f0c546
--- /dev/null
+++ b/gnome-extra/gucharmap/files/15.0.1-fix-file-conflicts.patch
@@ -0,0 +1,11 @@
+Avoids file conficts with other API versions being installed on the system.
+--- a/meson.build
++++ b/meson.build
+@@ -78,6 +78,6 @@ libgucharmap_gtk4_soversion = '0'
+ 
+ # i18n
+ 
+-gucharmap_gettext_domain = gucharmap_name
++gucharmap_gettext_domain = libgucharmap_gtk3_api_name
+ 
+ # Directories
diff --git a/gnome-extra/gucharmap/gucharmap-15.0.1.ebuild b/gnome-extra/gucharmap/gucharmap-15.0.1.ebuild
new file mode 100644
index 000000000000..6308b8aae15b
--- /dev/null
+++ b/gnome-extra/gucharmap/gucharmap-15.0.1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit gnome2-utils meson python-any-r1 vala xdg
+
+DESCRIPTION="Unicode character map viewer and library"
+HOMEPAGE="https://wiki.gnome.org/Apps/Gucharmap https://gitlab.gnome.org/GNOME/gucharmap/"
+SRC_URI="https://gitlab.gnome.org/GNOME/${PN}/-/archive/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="2.90"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+UNICODE_VERSION="15.0"
+
+IUSE="+introspection gtk-doc vala"
+REQUIRED_USE="vala? ( introspection )"
+
+RDEPEND="media-libs/freetype:2
+	>=dev-libs/glib-2.32:2
+	>=x11-libs/gtk+-3.22:3[introspection?]
+	>=dev-libs/libpcre2-10.21:=
+	=app-i18n/unicode-data-${UNICODE_VERSION}*
+	>=x11-libs/pango-1.42.4-r2[introspection?]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	${PYTHON_DEPS}
+	app-text/docbook-xml-dtd:4.1.2
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	gtk-doc? ( >=dev-util/gtk-doc-1 )
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+	vala? ( $(vala_depend) )
+"
+
+PATCHES=(
+	"${FILESDIR}"/14.0.1-install-user-help.patch
+	"${FILESDIR}"/15.0.1-fix-file-conflicts.patch
+)
+
+src_prepare() {
+	default
+	use vala && vala_setup
+	xdg_environment_reset
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dcharmap=true
+		-Ddbg=false # in 14.0.1 all this does is pass -ggdb3
+		$(meson_use gtk-doc docs)
+		$(meson_use introspection gir)
+		-Dgtk3=true
+		-Ducd_path="${EPREFIX}/usr/share/unicode-data"
+		$(meson_use vala vapi)
+	)
+
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/gui-libs/Manifest.gz b/gui-libs/Manifest.gz
index 1e4d3c89fccb..fd423baac7b9 100644
Binary files a/gui-libs/Manifest.gz and b/gui-libs/Manifest.gz differ
diff --git a/gui-libs/gtk/Manifest b/gui-libs/gtk/Manifest
index 7cf2f00437d3..9fe578e78914 100644
--- a/gui-libs/gtk/Manifest
+++ b/gui-libs/gtk/Manifest
@@ -1,5 +1,7 @@
 DIST gtk-4.6.7.tar.xz 22885556 BLAKE2B ff3647fbb87fb7743c6aaf84f4de463275ff5816ccdba7f29425ee5268677e53ef56507ddd71447def5a1707e7509958068d5b8a7c64816cc3a1541691d7a262 SHA512 7f9068f66b472e796c1611625a34466b13aa51bce2dfc7661928e6d8087ed39ed0f6adf47a6691609b85540c588621bebc5951e81435277071abe7d2facf28bb
 DIST gtk-4.8.1.tar.xz 20502844 BLAKE2B 2e60b4a1985c2faa6990f0a2512a14f06ee30287ee8c4cb6cabd2100a4425c8e441879dd5b6d95b1f99ad49dd07909832ccfc4cb2738a467b32dad16074bee36 SHA512 26201c2ef0de24e0a530b0cb03af5c131a85d068ecb4dcbe22c1faaedf1d5c1555ebe2bf2da794ccfa24bea7de810179957d48474fa951ae691ac957bbdfd61e
+DIST gtk-4.8.2.tar.xz 20210736 BLAKE2B 0595ee5b497cdf1b0fff3bc468a7e79d9665f5552213b3bd794f9df6354e280f3d4747820bf3cd83ee903b8709e2902f70f6c3721322573b204447017a9c0ebf SHA512 400cdde53a4b76a912f52b1300286b2198d47195902ccfc034fbc518be7bc4c5817fe6df6386d764c95686083eede2e4582cc555fb38b0bce455942ea6c5fcb5
 EBUILD gtk-4.6.7-r1.ebuild 5748 BLAKE2B 080ccac9ef219938bb0e44a670f67c635f3d9e8c58e5a3b202135a886df5c6406e374fe20914dd0929b4dba4a878d6bbebc08a5fe5b919c144e0cc4f5b65f584 SHA512 b1968a046d5e1b55dbf6c3519693da2d5b15778badca08af89ccadadb1427fc9c94f527e616e24a0dd1c38e055ec169b7e4cdc202b96db0f5fedf39c57f9c928
 EBUILD gtk-4.8.1-r1.ebuild 5650 BLAKE2B 9dfbb8bf31bdb96e56bb66e64ee7c8a79f6bd92b7b67a109b019802f1fb6ce4ef1f07e05dc0e93f5bd16ee710d4ad63f76ffa790756b3a795cfe86f0992e63ce SHA512 646ba31067e385340dfbd6636806a2e1d15bee48e7078ad52852429a0d7e3825189ff603b83029431f89d453aaebd1e94fad986cffb78b3b6a4dc56cde1bbd57
+EBUILD gtk-4.8.2.ebuild 5712 BLAKE2B b1f6c540fea752fc386d947fc684fbe3be2e27c1f2f042be1d9347092a728997828af9b048a8c01dc767ee521f4182278a37479c610848d4af9dcbe75db56654 SHA512 dd43f35e36df20015b331386eae6bbe89b0b581c9207faad5cdf2546968af69b659a991e9ecca9643ac8d4c12bd10c0cae8e1e1966fd1a105bccb634444bc896
 MISC metadata.xml 690 BLAKE2B 4ae68aa63a0aea931c3584ac288ac62226bc1a78395dad3e7401f1988d4ab45d3895eb8149f1c06a849e1e27926097d8aa09dd5a33a2bf8b4ce52e4e1694b1e0 SHA512 ff6bd9799fe0f9e3e922744ed78cc9db278801e6e2d309fbf146535b061670f5f9162946ddf76cdf3d0e4defca16657ba39b3af81e5bcf2423385c74fc299779
diff --git a/gui-libs/gtk/gtk-4.8.2.ebuild b/gui-libs/gtk/gtk-4.8.2.ebuild
new file mode 100644
index 000000000000..f8de8f482c10
--- /dev/null
+++ b/gui-libs/gtk/gtk-4.8.2.ebuild
@@ -0,0 +1,214 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..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 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/fribidi-0.19.7
+	>=dev-libs/glib-2.66.0:2
+	>=media-libs/graphene-1.9.1[introspection?]
+	>=media-libs/libepoxy-1.4[egl,X(+)?]
+	>=x11-libs/cairo-1.14[aqua?,glib,svg(+),X?]
+	>=x11-libs/gdk-pixbuf-2.30:2[introspection?]
+	>=x11-libs/pango-1.50.0[introspection?]
+	media-libs/libpng:0=
+	media-libs/tiff:0
+	media-libs/libjpeg-turbo:0=
+	>=media-libs/harfbuzz-2.6.0:=
+	x11-misc/shared-mime-info
+
+	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.39:= )
+	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
+			>=app-accessibility/at-spi2-atk-2.5.3
+		)
+		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
+		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
+		$(meson_feature cups print-cups)
+
+		# Optional dependencies
+		$(meson_feature vulkan)
+		-Dcloudproviders=disabled  # cloudprovider is not packaged in Gentoo yet
+		$(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 examples build-examples)
+		$(meson_use examples demos)
+		$(meson_use test build-tests)
+		-Dinstall-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/vte-common/Manifest b/gui-libs/vte-common/Manifest
index 22f2e75c9493..e42cb76ea56e 100644
--- a/gui-libs/vte-common/Manifest
+++ b/gui-libs/vte-common/Manifest
@@ -1,4 +1,6 @@
 AUX vte-common-0.70.0-musl-W_EXITCODE.patch 779 BLAKE2B c35f3cd21e59b9693d75b00232ef8b2d95448f4ff7031142050e9286ff854a19095bb56cec471d50585302ac08ca7a1d40ad068c013d8af142b0165d4c8d2112 SHA512 a3dd31fb4fcc9c2e725cfd64bbc63def63c1c1a85b6896b4a82083d6ff985df885c3a587e8c3c001de2acae476cb950f05a1e31b33bb263ba4895d25fa1e275b
 DIST vte-0.70.0.tar.bz2 499283 BLAKE2B 694cf4dfee334e9b54bb8e47f862167acbb8ffc7ac8e81889acd4786449cb45944a87a5adaa036f46458c350ca2119bb356e90dfa71f03638c9c2b14d2ccb877 SHA512 362b71296ae39a16b55402f524a39b063f66ae237e6e161ccc89ca2bb1f2a5c43f4d706d9f3bfae12a99fdb81c4e70408c7f3eca2c01316950b0a3a1a1d79423
+DIST vte-0.70.1.tar.bz2 502044 BLAKE2B 0a9ce43c1863e823fcd073fd30fb6b2cb39e9168e850796fe12be2b9bdfc0b24ceea974b4c94bcdd10f2225613990e0e079194380241b7e625cb6dc4309a7476 SHA512 88de629b382eca8a42199b2ba9b248e231817e1de7183417aed150bcf61530084f7177d73dee9aab25fe4c3ab80d795b5fdcae336687560d3b582bd04181353d
 EBUILD vte-common-0.70.0.ebuild 1875 BLAKE2B 33d970a32aa2880b787e24e295e55132c6ec47094d418a2c9033709507561b6e69d603d744b60bd8b821e1337c8f0e4e89a5b9251f86fadda88dbc53dfee08e8 SHA512 738d0259ebd7b68d15c682159f3cd40267e593ce9728474b8e4c5d6031e85b18f7f7508c2debdafe80948cd9dd05b44441a8ceaae715b676fc649a598ce23439
+EBUILD vte-common-0.70.1.ebuild 1875 BLAKE2B 987d79f8507b334dc1deb46c44ca07b708eaddb7b9dc56e8f3a348dd17f6c855628932850a3c13bcc852264fb973c2f6ff875f1b16d1467756250522c6c32019 SHA512 2e64cfe4fa8e5cafa6590d2836095690bb7852c0471038c328ae406414e546972aea1c3e93a0dba6bee7a403ed8a05e48546795616d4ce365d615102e05671d1
 MISC metadata.xml 433 BLAKE2B 2c71854e6417f0cb37252264beb583f6d0beaada3da3f8ca80c94a0e244065113827f2acf0655632387e2d1689e85dc91ce3be9989b68f0e61bc44b39d898cd8 SHA512 88d6c25bc0de5ef7642320fadb60922d9dfe745e77a99d7aa51d6d55c5355d3f20f65ec29ce951474ccfa158d4c1a81613c24ab274b4cff1b8908e9979c0108e
diff --git a/gui-libs/vte-common/vte-common-0.70.1.ebuild b/gui-libs/vte-common/vte-common-0.70.1.ebuild
new file mode 100644
index 000000000000..6ab4e8e60885
--- /dev/null
+++ b/gui-libs/vte-common/vte-common-0.70.1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit gnome.org meson python-any-r1
+
+DESCRIPTION="Library providing a virtual terminal emulator widget"
+HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/VTE https://gitlab.gnome.org/GNOME/vte"
+
+# Once SIXEL support ships (0.66 or later), might need xterm license (but code might be considered upgraded to LGPL-3+)
+LICENSE="LGPL-3+ GPL-3+"
+SLOT="2.91" # vte_api_version in meson.build
+IUSE="systemd"
+KEYWORDS="~amd64"
+
+# Upstream is hostile and refuses to upload tarballs.
+SRC_URI="https://gitlab.gnome.org/GNOME/vte/-/archive/${PV}/vte-${PV}.tar.bz2"
+
+DEPEND="
+	|| ( >=gui-libs/gtk-4.0.1:4 >=x11-libs/gtk+-3.24.22:3 )
+	>=dev-libs/fribidi-1.0.0
+	>=dev-libs/glib-2.52:2
+	>=x11-libs/pango-1.22.0
+	>=dev-libs/libpcre2-10.21
+	systemd? ( >=sys-apps/systemd-220:= )
+	sys-libs/zlib
+	x11-libs/pango
+"
+RDEPEND="
+	!<x11-libs/vte-0.70.0
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-libs/libxml2:2
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/vte-0.70.1"
+
+src_prepare() {
+	default
+	use elibc_musl && eapply "${FILESDIR}"/${PN}-0.70.0-musl-W_EXITCODE.patch
+}
+
+src_configure() {
+	local emesonargs=(
+		-Da11y=false
+		-Ddebugg=false
+		-Ddocs=false
+		-Dgir=false
+		-Dfribidi=true # pulled in by pango anyhow
+		-Dglade=false
+		-Dgnutls=false
+		-Dgtk3=false
+		-Dgtk4=false
+		-Dicu=false
+		$(meson_use systemd _systemd)
+		-Dvapi=false
+	)
+	meson_src_configure
+}
+
+src_install() {
+	exeinto /usr/libexec/
+	doexe "${BUILD_DIR}"/src/vte-urlencode-cwd
+	insinto /etc/profile.d/
+	newins "${BUILD_DIR}"/src/vte.sh vte-${SLOT}.sh
+	newins "${BUILD_DIR}"/src/vte.csh vte-${SLOT}.csh
+	if  use systemd; then
+		insinto /usr/lib/systemd/user/vte-spawn-.scode.d/
+		newins "${S}"/src/vte-spawn-.scope.conf defaults.conf
+	fi
+	einstalldocs
+}
diff --git a/gui-libs/vte/Manifest b/gui-libs/vte/Manifest
index 0c28d179cf37..6fb7303937f6 100644
--- a/gui-libs/vte/Manifest
+++ b/gui-libs/vte/Manifest
@@ -1,5 +1,7 @@
 AUX vte-0.66.2-musl-W_EXITCODE.patch 779 BLAKE2B c35f3cd21e59b9693d75b00232ef8b2d95448f4ff7031142050e9286ff854a19095bb56cec471d50585302ac08ca7a1d40ad068c013d8af142b0165d4c8d2112 SHA512 a3dd31fb4fcc9c2e725cfd64bbc63def63c1c1a85b6896b4a82083d6ff985df885c3a587e8c3c001de2acae476cb950f05a1e31b33bb263ba4895d25fa1e275b
 DIST vte-0.70.0-command-notify.patch.xz 9040 BLAKE2B 108dd05d00409af90b1fd3e9b5c3b0e5586ac80204cef8840fda935204cbc480fec1193e2a0a2782f98e2b094c3caebbfe61cf18631b16921df05cf3808afd22 SHA512 92123e7f5cb6ef876f2b2b108dbef59bce212efebd64cd790d49d9ee3215344acd848eec5d326fe2c3bd236846ed3b896148024390093491b2f6e2f7c46e2bd1
 DIST vte-0.70.0.tar.bz2 499283 BLAKE2B 694cf4dfee334e9b54bb8e47f862167acbb8ffc7ac8e81889acd4786449cb45944a87a5adaa036f46458c350ca2119bb356e90dfa71f03638c9c2b14d2ccb877 SHA512 362b71296ae39a16b55402f524a39b063f66ae237e6e161ccc89ca2bb1f2a5c43f4d706d9f3bfae12a99fdb81c4e70408c7f3eca2c01316950b0a3a1a1d79423
+DIST vte-0.70.1.tar.bz2 502044 BLAKE2B 0a9ce43c1863e823fcd073fd30fb6b2cb39e9168e850796fe12be2b9bdfc0b24ceea974b4c94bcdd10f2225613990e0e079194380241b7e625cb6dc4309a7476 SHA512 88de629b382eca8a42199b2ba9b248e231817e1de7183417aed150bcf61530084f7177d73dee9aab25fe4c3ab80d795b5fdcae336687560d3b582bd04181353d
 EBUILD vte-0.70.0.ebuild 3174 BLAKE2B 530bb2dfcbd6f6ffca44a159ff81c985d44b38ced9b20b8d3a03fa7f77d10dc56d80f3eef72af204db70f7321d74255fa369d8d7bd4346b720ae910fa45ad0cc SHA512 1f94cf039a34b63a10c37e9157b221dae4726cb2d1685460bf86f60ac66abd09645cd63225d85e28641f1a938c5a76cfc1eebeba85a6d4d5c90e7a500ee9b6f6
+EBUILD vte-0.70.1.ebuild 3174 BLAKE2B 530bb2dfcbd6f6ffca44a159ff81c985d44b38ced9b20b8d3a03fa7f77d10dc56d80f3eef72af204db70f7321d74255fa369d8d7bd4346b720ae910fa45ad0cc SHA512 1f94cf039a34b63a10c37e9157b221dae4726cb2d1685460bf86f60ac66abd09645cd63225d85e28641f1a938c5a76cfc1eebeba85a6d4d5c90e7a500ee9b6f6
 MISC metadata.xml 519 BLAKE2B e34530c7e9882f9d61b6c1fe9cc1d523037bcc05034e3f98351ff33bb543a0a25d96c0debdd1572cfeb0d2166b41a324c7fdfed38482c11cbe053db96b312ef8 SHA512 313a0af6b28d47bf385594a9306f38476bbfcc44517d7219ba1d0a8ddee224a37cd4ee8f7c4f8aed8bd7eae0ad2b3461bc4ae49c5eb8b08bc61459c76bf7a5ef
diff --git a/gui-libs/vte/vte-0.70.1.ebuild b/gui-libs/vte/vte-0.70.1.ebuild
new file mode 100644
index 000000000000..8f8f7969670b
--- /dev/null
+++ b/gui-libs/vte/vte-0.70.1.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit gnome.org meson python-any-r1 vala xdg
+
+DESCRIPTION="Library providing a virtual terminal emulator widget"
+HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/VTE https://gitlab.gnome.org/GNOME/vte"
+
+# Once SIXEL support ships (0.66 or later), might need xterm license (but code might be considered upgraded to LGPL-3+)
+LICENSE="LGPL-3+ GPL-3+"
+SLOT="2.91-gtk4" # vte_api_version + "-gtk4" in meson.build
+IUSE="+crypt debug gtk-doc +icu +introspection systemd +vala vanilla"
+KEYWORDS="~amd64"
+REQUIRED_USE="
+	gtk-doc? ( introspection )
+	vala? ( introspection )
+"
+
+# Upstream is hostile and refuses to upload tarballs.
+SRC_URI="https://gitlab.gnome.org/GNOME/${PN}/-/archive/${PV}/${P}.tar.bz2"
+SRC_URI="${SRC_URI} !vanilla? ( https://dev.gentoo.org/~mattst88/distfiles/${PN}-0.70.0-command-notify.patch.xz )"
+
+DEPEND="
+	>=gui-libs/gtk-4.0.1:4[introspection?]
+	>=dev-libs/fribidi-1.0.0
+	>=dev-libs/glib-2.52:2
+	crypt?  ( >=net-libs/gnutls-3.2.7:0= )
+	icu? ( dev-libs/icu:= )
+	>=x11-libs/pango-1.22.0
+	>=dev-libs/libpcre2-10.21:=
+	systemd? ( >=sys-apps/systemd-220:= )
+	sys-libs/zlib
+	introspection? ( >=dev-libs/gobject-introspection-1.56:= )
+	x11-libs/pango[introspection?]
+"
+RDEPEND="${DEPEND}
+	~gui-libs/vte-common-${PV}[systemd?]
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-libs/libxml2:2
+	dev-util/glib-utils
+	gtk-doc? ( dev-util/gi-docgen )
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+"
+
+src_prepare() {
+	default
+	use vala && vala_setup
+	xdg_environment_reset
+
+	use elibc_musl && eapply "${FILESDIR}"/${PN}-0.66.2-musl-W_EXITCODE.patch
+
+	if ! use vanilla; then
+		# Part of https://src.fedoraproject.org/rpms/vte291/raw/f37/f/vte291-cntnr-precmd-preexec-scroll.patch
+		# Adds OSC 777 support for desktop notifications in gnome-terminal or elsewhere
+		eapply "${WORKDIR}"/${PN}-0.70.0-command-notify.patch
+	fi
+
+	# -Ddebugg option enables various debug support via VTE_DEBUG, but also ggdb3; strip the latter
+	sed -e '/ggdb3/d' -i meson.build || die
+	sed -i 's/vte_gettext_domain = vte_api_name/vte_gettext_domain = vte_gtk4_api_name/' meson.build || die
+}
+
+src_configure() {
+	local emesonargs=(
+		-Da11y=true
+		$(meson_use debug debugg)
+		$(meson_use gtk-doc docs)
+		$(meson_use introspection gir)
+		-Dfribidi=true # pulled in by pango anyhow
+		-Dglade=true
+		$(meson_use crypt gnutls)
+		-Dgtk3=false
+		-Dgtk4=true
+		$(meson_use icu)
+		$(meson_use systemd _systemd)
+		$(meson_use vala vapi)
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_install # not meson_src_install because this would include einstalldocs, which would result in file collisions with x11-libs/vte
+	# Remove files that are provided by gui-libs/vte-common
+	rm "${ED}"/usr/libexec/vte-urlencode-cwd || die
+	rm "${ED}"/etc/profile.d/vte.sh || die
+	rm "${ED}"/etc/profile.d/vte.csh || die
+	if use systemd; then
+		rm "${ED}"/usr/lib/systemd/user/vte-spawn-.scope.d/defaults.conf || die
+	fi
+	if use gtk-doc; then
+		mkdir -p "${ED}"/usr/share/gtk-doc/ || die
+		mv "${ED}"/usr/share/doc/vte-${SLOT} "${ED}"/usr/share/gtk-doc/ || die
+	fi
+}
diff --git a/kde-misc/Manifest.gz b/kde-misc/Manifest.gz
index ace5b75cbeb3..73eef005ee56 100644
Binary files a/kde-misc/Manifest.gz and b/kde-misc/Manifest.gz differ
diff --git a/kde-misc/kio-fuse/Manifest b/kde-misc/kio-fuse/Manifest
index 9e4a47b8e4d0..d3f184eead93 100644
--- a/kde-misc/kio-fuse/Manifest
+++ b/kde-misc/kio-fuse/Manifest
@@ -1,5 +1,3 @@
-DIST kio-fuse-5.0.1.tar.xz 47596 BLAKE2B 3ed4f2a17aac1743ad0c8bc7421738eb499ea95eb20088444c241763b53315b8cd8a592d0ed18c7a6180de6040774f6d53429f8d1fe515eb4769fb95e680b530 SHA512 6423c461c001bb27d4e17e6f9a69e4a28c2e7834b6702bd14e4b34db9fc3156cdbb5400ec2c3f15975e78e563abbf14412f8f1b1db05f6313a8520bab030e7bd
 DIST kio-fuse-5.0.1_p20220906-fbd09a33.tar.gz 56438 BLAKE2B 45655e9308614f0094b18a6f9c6f52013a60ba00243a3871b182cf76d2f91eb5fddc401985eea39a7af26abc8045958894501969ad21dbdf9969f131005718cb SHA512 a6f4222c4f020b2bfd6c38b303881f4810f857aad9b611d2e6abe448d945d881e85d4f1ebd0d2cb7ca6dc3b11cbad6331dd00fcc6ec1109ad1fbea7f20490fdc
-EBUILD kio-fuse-5.0.1.ebuild 871 BLAKE2B 20bf3c6ce9f8224b17b025f0c571526dec6457c981e325322dd4820153b523582ed63d6ea966ba267382855614a9c0a97e92223114a65b1600f71a0de23a4063 SHA512 0c2773d1c933c3ac8d269389cac274d91f8657521ebd3a883d2e508a413216951bb2c0eef1a8337da799dcb8b6dbc403dd8cb53aae7ff83904e1cc3575cc49ba
-EBUILD kio-fuse-5.0.1_p20220906.ebuild 912 BLAKE2B 0707da3e58065ea84839d5385154ac390345c9b0a2d5dd38850e21b84fc6e96fd3e0a4eb3052ead815f46637660752161eccd24bbe2d2b427a7af72dbbef360c SHA512 90194cc212f286f2312cc26aad0140aadb528782c25a4c36db789bba908d3ad0c66f886f55c2a4f38c0fd0c498113b2319e5496eaaf55d29fb061cf77d5f3ba0
+EBUILD kio-fuse-5.0.1_p20220906.ebuild 911 BLAKE2B 689eddcab33147eba577b5010aed4d9b0ad4740400b7db960d26e2bd3ce9ce9beea3f7691561f317534a4cb567c98d15a8c7917849a30388665d0284cb5c9eba SHA512 59242f982ed5360bd0a720ec18a204a81139c06f3e80fa9f3495da507b2201057c15e1efa75bc0288d2b46537b68c01d970ac3e586fdb24972350714e29b460a
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-misc/kio-fuse/kio-fuse-5.0.1.ebuild b/kde-misc/kio-fuse/kio-fuse-5.0.1.ebuild
deleted file mode 100644
index e6d595d05d9c..000000000000
--- a/kde-misc/kio-fuse/kio-fuse-5.0.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-KFMIN=5.74.0
-QTMIN=5.15.2
-inherit ecm kde.org linux-info
-
-DESCRIPTION="FUSE interface for KIO"
-HOMEPAGE="https://feverfew.home.blog/2019/12/24/kiofuse-beta-4-9-0-released/"
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
-fi
-
-LICENSE="GPL-3+"
-SLOT="5"
-IUSE=""
-
-RESTRICT+=" test" # depend on fuse kernel module
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	sys-fs/fuse:3
-"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	local CONFIG_CHECK="~FUSE_FS"
-	linux-info_pkg_setup
-
-	ecm_pkg_setup
-}
diff --git a/kde-misc/kio-fuse/kio-fuse-5.0.1_p20220906.ebuild b/kde-misc/kio-fuse/kio-fuse-5.0.1_p20220906.ebuild
index 8f73c33087b7..e376c211e2c0 100644
--- a/kde-misc/kio-fuse/kio-fuse-5.0.1_p20220906.ebuild
+++ b/kde-misc/kio-fuse/kio-fuse-5.0.1_p20220906.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://feverfew.home.blog/2019/12/24/kiofuse-beta-4-9-0-released/"
 
 LICENSE="GPL-3+"
 SLOT="5"
-KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
 IUSE=""
 
 RESTRICT="test" # depend on fuse kernel module
diff --git a/mail-client/Manifest.gz b/mail-client/Manifest.gz
index a66a8548ddf6..05cc8ca331b2 100644
Binary files a/mail-client/Manifest.gz and b/mail-client/Manifest.gz differ
diff --git a/mail-client/evolution/Manifest b/mail-client/evolution/Manifest
index 4413f8bfba6c..2c35f645ddeb 100644
--- a/mail-client/evolution/Manifest
+++ b/mail-client/evolution/Manifest
@@ -1,5 +1,7 @@
 DIST evolution-3.44.4.tar.xz 13130588 BLAKE2B ffb6da420acbf7be7e5eb6fad44bcb9f00e9c52f99314a4f8e8e35e898eaac8a8fdc511328fd519fed5ac9ef98e63e326cfc7dde324919c1cc6e60ff17b3ad76 SHA512 1c2a30e00e4f9226ced2617cf5a69f33db914d5a94dd22223c9dc12e635952a52e2fac395d49de70c70c21004fb0d87e3ba81725aff924bb0b386ffb4901d058
 DIST evolution-3.46.0.tar.xz 13286524 BLAKE2B b9c9605d3d0fa697832fc181f25f85cccee0c1d2b37578221e0a7632b1daab4c21fbfa13142ef2ec24a4da4c7c39e182b912d803ee2ab1a9e36e7fe634d109f8 SHA512 58b532711196e7c79cffa2357245743562a94fd9629718066ba16a26889fb45f94992e4cc3cf0d3911356b700abecb05099c5c854749db282a241321c0d0c605
+DIST evolution-3.46.1.tar.xz 13287436 BLAKE2B 16e8fd77d7c1db2b1b04a4455e84054acbf8f03fb2eaadf072c4a1965b4527e709f6cdcc9f5762d8a5ed2757bedfc20e390466ce4c87437d7fc6755e2f205d30 SHA512 20b6a5663ec6ab43af6ec7c15a64b1d1070f8488aaebd3fbaca4b4cc8b70bf4b8087b047e5b75e37273818b8d1d6bde5139c708284626e9d3c15b83dc09f5d3b
 EBUILD evolution-3.44.4-r3.ebuild 4096 BLAKE2B 30636f4506fb5363253ef8294d84caed7c0261b00a3103022e2bc70722010cf9539e649d601ce38508a7c4cabdc339647b9f97b8d09db2679daca8dfd8132d56 SHA512 d8749e2d181a0537cf84fe804588ac20b1edf7801a09f21affc2739defaadbcb6ce248402ed54276db7ce8889136ab1446ba6418325acf5f610fa627a59beae2
 EBUILD evolution-3.46.0.ebuild 4072 BLAKE2B 0eaafdd5859603750ad332269b8636abc369b9bea4c3baeb34871928eda0755f7707b0dca4a60bd2b501844d825f752373af52b65fee8254d7f173bd5c52dbd6 SHA512 8f87c2364be09526fdae555607b3e0a9b19c343f4b587ccab29a2b54f991743d336f2543f00c2a6d6928401f8e09486105a740f8747fe41a105e11ea238074e7
+EBUILD evolution-3.46.1.ebuild 4122 BLAKE2B 8409313d373cfe6fdfe0d916683c4dede1d1acc50a81b019da1dadeaaffd2f524eeaf5fcca20c480491d59fb8dd12951239e9752330ce22f9ec7ce88faaffbc8 SHA512 4c0772917fd5708a1afa92378ba6a6de5d4ed89ac7f5b36acca9425e2fdc657f9fa814a6d12e54f58939f65913b64ca139a0ada1ced0806c0991a64ba38f0ede
 MISC metadata.xml 1078 BLAKE2B b3a32d1876342fba5db22aae478cf1194df56f01719c6322f13a069e9fe8d1f17123b9592e0a0c5c25ac856ddbb9d20266bc11ce7c9a4737aa7dd43e76c0aa8d SHA512 9c3da89a72cc8235f73fb98b2cbe21597a4889ebd4d989a98e105613e131a42236ed115c0ac88cb87a312a43123c5bdcc44aa76328bf3cd537367553691408f1
diff --git a/mail-client/evolution/evolution-3.46.1.ebuild b/mail-client/evolution/evolution-3.46.1.ebuild
new file mode 100644
index 000000000000..b9d659b7c751
--- /dev/null
+++ b/mail-client/evolution/evolution-3.46.1.ebuild
@@ -0,0 +1,151 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake gnome2 readme.gentoo-r1
+
+DESCRIPTION="Integrated mail, addressbook and calendaring functionality"
+HOMEPAGE="https://wiki.gnome.org/Apps/Evolution https://gitlab.gnome.org/GNOME/evolution"
+
+# Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+".
+LICENSE="|| ( LGPL-2 LGPL-3 ) CC-BY-SA-3.0 FDL-1.3+ OPENLDAP"
+SLOT="2.0"
+
+IUSE="archive +bogofilter geolocation gtk-doc highlight ldap spamassassin spell ssl +weather ytnef"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+# glade-3 support is for maintainers only per configure.ac
+# pst is not mature enough and changes API/ABI frequently
+# dconf explicitely needed for backup plugin
+# gnome-desktop support is optional with --enable-gnome-desktop
+# automagic libunity dep
+# >=gspell-1.8 to ensure it uses enchant:2 like webkit-gtk
+DEPEND="
+	>=app-text/enchant-2.2.0:2
+	>=dev-db/sqlite-3.7.17
+	>=dev-libs/glib-2.66:2[dbus]
+	>=dev-libs/libxml2-2.7.3:2
+	>=gnome-base/gnome-desktop-2.91.3:3=
+	>=gnome-base/gsettings-desktop-schemas-2.91.92
+	>=gnome-extra/evolution-data-server-${PV}:=[gtk,weather?]
+	>=media-libs/libcanberra-0.25[gtk3]
+	>=net-libs/libsoup-3.0:3.0
+	>=net-libs/webkit-gtk-2.38.0:4.1=[spell?]
+	>=x11-libs/cairo-1.9.15[glib]
+	>=x11-libs/gdk-pixbuf-2.24:2
+	>=x11-libs/gtk+-3.22:3
+	>=x11-libs/libnotify-0.7
+	>=x11-misc/shared-mime-info-0.22
+
+	app-text/cmark:=
+	>=app-text/iso-codes-0.49
+	|| ( >=app-accessibility/at-spi2-core-2.46.0:2 dev-libs/atk )
+
+	gnome-base/dconf
+	x11-libs/libSM
+	x11-libs/libICE
+
+	archive? ( >=app-arch/gnome-autoar-0.1.1[gtk] )
+	bogofilter? ( mail-filter/bogofilter )
+	geolocation? (
+		>=media-libs/libchamplain-0.12:0.12[gtk]
+		>=media-libs/clutter-1.0.0:1.0
+		>=media-libs/clutter-gtk-0.90:1.0
+		>=sci-geosciences/geocode-glib-3.26.3:2 )
+	ldap? ( >=net-nds/openldap-2:= )
+	spamassassin? ( mail-filter/spamassassin )
+	spell? ( >=app-text/gspell-1.8:= )
+	ssl? (
+		>=dev-libs/nspr-4.6.1
+		>=dev-libs/nss-3.11
+	)
+	weather? (
+		>=dev-libs/libgweather-4.2.0:4=
+		>=sci-geosciences/geocode-glib-3.26.3:2
+	)
+	ytnef? ( net-mail/ytnef )
+"
+RDEPEND="${DEPEND}
+	highlight? ( app-text/highlight )
+"
+BDEPEND="
+	app-text/docbook-xml-dtd:4.1.2
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	dev-util/itstool
+	gtk-doc? ( dev-util/gtk-doc
+		app-text/docbook-xml-dtd:4.3 )
+	>=dev-util/intltool-0.40.0
+	>=sys-devel/gettext-0.18.3
+	virtual/pkgconfig
+"
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="To change the default browser if you are not using GNOME, edit
+~/.local/share/applications/mimeapps.list so it includes the
+following content:
+
+[Default Applications]
+x-scheme-handler/http=firefox.desktop
+x-scheme-handler/https=firefox.desktop
+
+(replace firefox.desktop with the name of the appropriate .desktop
+file from /usr/share/applications if you use a different browser)."
+
+# global scope PATCHES or DOCS array mustn't be used due to double default_src_prepare
+# call; if needed, set them after cmake_src_prepare call, if that works
+
+src_prepare() {
+	cmake_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Use NSS/NSPR only if 'ssl' is enabled.
+	local mycmakeargs=(
+		-DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
+		-DENABLE_SCHEMAS_COMPILE=OFF
+		-DENABLE_GTK_DOC=$(usex gtk-doc)
+		-DWITH_OPENLDAP=$(usex ldap)
+		-DENABLE_SMIME=$(usex ssl)
+		-DENABLE_GNOME_DESKTOP=ON
+		-DWITH_ENCHANT_VERSION=2
+		-DENABLE_CANBERRA=ON
+		-DENABLE_AUTOAR=$(usex archive)
+		-DWITH_HELP=ON
+		-DENABLE_YTNEF=OFF
+		-DWITH_BOGOFILTER=$(usex bogofilter)
+		-DWITH_SPAMASSASSIN=$(usex spamassassin)
+		-DENABLE_GSPELL=$(usex spell)
+		-DENABLE_TEXT_HIGHLIGHT=$(usex highlight)
+		-DENABLE_WEATHER=$(usex weather)
+		-DENABLE_CONTACT_MAPS=OFF # was $(usex geolocation), this will come back libchamplain gets it's libsoup3 port
+		-DENABLE_YTNEF=$(usex ytnef)
+		-DENABLE_PST_IMPORT=OFF
+		-DWITH_GLADE_CATALOG=OFF
+		-DENABLE_MARKDOWN=ON
+	)
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+}
+
+src_test() {
+	cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	readme.gentoo_print_elog
+}
diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest
index 0a0a294665de..d5db905f983d 100644
--- a/mail-client/thunderbird/Manifest
+++ b/mail-client/thunderbird/Manifest
@@ -5,202 +5,6 @@ AUX gentoo-hwaccel-prefs.js 162 BLAKE2B c5f2dfb727081e2d538c262f12c0cfdda31cbda5
 AUX icon/thunderbird-r2.desktop 882 BLAKE2B eb9c2e381b67319d9cd53f26e9b406f55de86b716b28a3df6470594a612e07acda4c7dcdb48b6d55930972592f7f01afbbf14f09ccc4b20265d3c18554a01a2c SHA512 689c9fa5c37a1e6ee80a3dfaebec2a185d91508537c35ce2fb35d13d89b16ae0cf3c640c3115a52c0e4b7a7624aee6a8f8c52679a0073c94dea25cc779ce624b
 AUX thunderbird-r1.sh 2896 BLAKE2B 140047417b24e959fe6388c4913457f8e3e786158b7394abf7442b0d2e83de21238e58983845a23b855e1aab60c9289e1a12af430eac9a8b2d9929da97de2852 SHA512 f9b989152a8a3ac274033722c77ec19374085654ad6c85ea4db6f8af8f4b2066d6d9f82b610be2db341c8ac867547f54f806ca6571258ed98dd9e2527d21b357
 DIST firefox-102esr-patches-04j.tar.xz 21860 BLAKE2B 1cc1d6493912f85e71cb5a0ec2c3196cda203242f3503bb6ce8c23a93e71a6e8b1138f88498a6a9698066134cc234989b35cb378693fb2cbc9ba4caa8d66761d SHA512 9f7188dd79b9856826ae2a60b0109c2c86c60c10b03cd1828a9f7a7576df5c49ed3e11e4d3319d80e117204d6bc3408e375a62ad16ec8d2e53f999cd298811d8
-DIST firefox-91esr-patches-10j.tar.xz 18320 BLAKE2B ec882411eed19bafab8676e3d79f4ae43947bb97c44571c1497bb93a44fcfec99de06ebacbdf8c4944dcecdf949e4f684908d7ce4226cdcec60241e62e75810e SHA512 670a14d852bb74b9074c3fef9310650f71ce1c56314109c49aea02a7a69acc836af60a8beab11da53e21b10a8e6da341fcfa18b68a1dfd33b26978dd63758e9c
-DIST thunderbird-102.3.1-af.xpi 551420 BLAKE2B a4284bed51d507ee551a3e316d478e90942c7370a9cb811077722d09314ce1eab83134506ab2055082ddf1c7ef28d151ab0f3e91c72ad86dcc41cb96724708c9 SHA512 5226a93bc94ec69de028138cb8550db20838eec5ccaee94f14297346195b45c0a6534dca75474d0719380ac5462d480d9e5a6997ce017ff7430eeb8ab4dcc83f
-DIST thunderbird-102.3.1-ar.xpi 655776 BLAKE2B e14b0084b408df3b0a04daacdc15daeae31167798b2cccad6aaa20bd0b83fb79d655f26e7ac0e5abd0ef85ade576190542194de476af3e99602981aa702f662d SHA512 13ded198c187540ea8255e69bae5467108deec866b6681caa2cab8c11fbe5c8cd01d6d3e0e8599291ccd160756d2bb646e8a76874736239cd161f4764aaf82ab
-DIST thunderbird-102.3.1-ast.xpi 572178 BLAKE2B cbec4e2d5550cabe5cf0be2077ba538a400095ec21181f9d6e45e0a3274f81098cd9aa6b07353f55f175a17a1116a6b6a27c7963f1c9343084da9497fdf1871d SHA512 1856fe6d8aec0f949bff83595d7144cbfd23f12287c2d77a947ff895421432a1399206279938d72e47708628a88b24d737bd387593a65c24f012949c1cd3b274
-DIST thunderbird-102.3.1-be.xpi 687878 BLAKE2B 7d3ff8f25c1330d77c39a426ca330f2876e5129d9dd310d497c67084e44673285b7e7e9c374d9e8fd75f91d37f4021d5e93b4883d615ec71aaf36a78b30f3fb0 SHA512 0daa8d2d9168558f477751059a9cae3392122837d2e444329e2c68167a6fced1e2d51a2a208ec122dcdb0b1cb6c29fdae74b66c86099e04e60cb783a115a5e06
-DIST thunderbird-102.3.1-bg.xpi 683816 BLAKE2B f1c67b965d0d11536c0b9467006477eea39f7dd107626baf77b6f17af1ce154c3ae82557ff92f7a95f8c1cde6d35e680f9267b81c48011fdf0348ddbf15d2896 SHA512 81a3f8b08944df7b514f082c3d3250a167c3a97f2081953a8a97a250c27fdbf2249c49820cd308108b339d54fca85be06104245dc22a8afe162210adbcf1528a
-DIST thunderbird-102.3.1-br.xpi 615534 BLAKE2B 21e27e6d2b0e44e0066d3a8293abf076bc85683fcf37f43b139fb93b5f11df5ffa92cb80dbdc16a5b0607b482ca9f033f71808a2e067ff762c37500d86c35abc SHA512 f8019a3ab8b65e989f8ec10b114c61213e111136fb6e34f1ea0f15a87a5b943744323ee63fe4dc599cd0ee07d99033556b9c476fb25af7cd5ae9d9a239195ce7
-DIST thunderbird-102.3.1-ca.xpi 637766 BLAKE2B 6ef097cf88fa0a773b77a2183e28300c8c1f9691f1f4e508961f4af95a798bfff53314799ecb1276a327adbc03d19b1d6cb29a6d0350f9f0682413d81b171c31 SHA512 2bb9ca1368d59bc6885f5b8e791160fdad6b1c669744d1affd470c31c16868acc9ae005e897a18e9afdddfca6ee7fd18ebc3569cfb7cf6422b988c972de08418
-DIST thunderbird-102.3.1-cak.xpi 643988 BLAKE2B 44c09c5c51993588a3c5f42f851ee8d5546acab43a6e2850f7228741d05f6395515cdf326f99cc456ce10f16c2a1e481707926f75ca7128fed88437cadf72cbb SHA512 c70a9d0492ff5b2d9ea4b0a9391d36ec7f7d26eb0f289c8562e58e13a6451103fcc5ad77139343a3ddd0b82a8d2eb970cbf79fbdf84d41dd2f4def07fb48a0d8
-DIST thunderbird-102.3.1-cs.xpi 708439 BLAKE2B c288a09d6b798cd9561b5966a578f3052eb54010e470e479bd1de27b35e4197467eb7142693d407fb6b9f2f266fc4b9a88b375d3c12f37a1204b817fa3f331f0 SHA512 3fb74623dc7dcd123a4adf016d63a3870a37d2806506b50a091deb86ea5863d3d971e5e522b84a820fafc937e1e9583100c9c376b9096a1a0a310ce80d63a043
-DIST thunderbird-102.3.1-cy.xpi 686501 BLAKE2B a2febd6e1cd440b80cf5819e92b2d6ea1c0c1efde7ca51e8279238e49bada8e9cc7bfba1b69440585696a5d69841acb44ebfed7bc821e4884db585dd46845e5c SHA512 a8d0bc53e705f1f142b28685054dd59176466f4575a42cbabe31809158c7de0fd374f9b5fb608731bda47836c0d991edd2ec2729655ec338357a983f6b95f9d1
-DIST thunderbird-102.3.1-da.xpi 671989 BLAKE2B 086c47fa1f4fc88e0ced7d9e95c3eb5a3041cc618726d85bccb24fd91c66b9552f2ea2bd075431841c6c8e1105dba99234f543b53c65d01fbe205d79140b2068 SHA512 9d42fbafc61eea61cd24c43d81f4fde92ea1fba99f7afc02ed3e79bdf44f50d4d8bf039a5f015ab06eac29bcb9c78bd2162606dd503359b9160e3fdf80ce561c
-DIST thunderbird-102.3.1-de.xpi 704979 BLAKE2B 7bb5dbe5ffb4c42d25d524b9f173f90e11818926436004559a8441fea58dc63206824f9ed6ca385f1991579bed7179227237e27ec2fe6c8fb0a512a061ed61b5 SHA512 fdfb2d84543256e88b69d80b954224294f14a447be787509c793b593b56f7b9d2b794274dfb7c2a0e407033d846e1b905bbbb9ee9aa3bbadebfbadef23b66881
-DIST thunderbird-102.3.1-dsb.xpi 720016 BLAKE2B 27ff4d24fc0f8d10662311e602a8d82efa13a1d15def63cefd07ae9375241758061ed3e9522998b8e1f797fe650752315ef119f16f73be8f1e62b565fc547f52 SHA512 53cf5ff500bfe65376d42d158febed685d079f0344224dd61b802fdac98a31604ddb6ae59d826211ca70626a0494e75c0974a89e37e9587162578ccc9521dc7d
-DIST thunderbird-102.3.1-el.xpi 816802 BLAKE2B 161592b945cd29049ffff1869fb7932d41c33bc70f9bc70ae26e05829aa6d731aa9220565d4d419d01cb87065ca9d245dec5ba340497ad4c83f907ba9a872247 SHA512 ba28ef46493ac13c19ffed7810fc2e41f7d3ba557610ab727547798689bf3f368532bebb9c35e0b6e53392adddfd3603ebc1405f07e99d2ed7a843f14166febb
-DIST thunderbird-102.3.1-en-CA.xpi 644066 BLAKE2B 89b61d8608b52e1700713a861cc8a27e8b370e8982f796372113e490a81032d962a953ab0c0480fa88004c4736eaf1b60d31373e04a618ceb0e362c6c97d1901 SHA512 be6041ac20f84ba3d45d0076d17e983db40c067bef3e92026b64846dec7274b1ffa3c66915eb46f3f1153f0f526ae84048d87008f50a612ecb8eb57767547240
-DIST thunderbird-102.3.1-en-GB.xpi 646876 BLAKE2B efa1e02066f1f6bbe45caf803040986cfe5ffb8da7bae4cdc02d4caaedc918b2aea09c68130f76b44284141d5af36c90fcb854219db21df8615f58af087cc491 SHA512 d4fa6218f660057c6bb3f0519c17f2d6a9e5eb5ce3193e34fff67842d79dd685a259377e95e4502c18f42656ffb46d665a13db4d80fcfbc67d4947d3062344ab
-DIST thunderbird-102.3.1-es-AR.xpi 696660 BLAKE2B 644fe6f81076e474609c28cffec208157de692c1a172eb49bd23bfda4786322d04ae960572ec4a4689406a62720e639af6884e6aa8355abdf0aec6f9701d1dcd SHA512 968eb1188b27d1619bd8669539b0d8894ab2d28be931b65baa279bab08c49c8212e0c7d0d29f54ee3f8110fbee9ccaa89b5dd68ef27469c2b557e6720561cd6b
-DIST thunderbird-102.3.1-es-ES.xpi 652536 BLAKE2B 5eee398bb93152eb3ee6c9ab9580b60dfc8a1c69bf3f484501cb31782cbf46d547d06e2f06debdf848b51b1547c495e19b306f1b78fc88fd4d54dc68090fb4b1 SHA512 06e5adf92cce38a17c070219c648db91b339ee6e3cd280c2577f4c57c9f1f0b2779accaecd4978ffe1034425054a0114921ec4f25a1f4d31dc358044e54b0958
-DIST thunderbird-102.3.1-es-MX.xpi 699417 BLAKE2B c5b19b0fb07251f09b7a8e4a748963b5e990be46b8ceefdefe5834e5b55104b53db02b88790f263599c9deededcbd87cd444ebd181067afc45c42e41b7ab5f21 SHA512 bb8a9a31eaf681c55866557b0776e028fb3623f242eab2916a92f40cb57890cbd52e0d226af370169979cd1ca39acb5239a79ab3dae3f054f4dda949fc6c9a3f
-DIST thunderbird-102.3.1-et.xpi 667785 BLAKE2B e7a3f44886cbe291e6364a1bea0c7710401c6a0e088522b50bc28db73f374334e0a1cd4097c9ded9c3021c0ab71c921fb2d9e92122c99d92b998fb559f4c9e6d SHA512 24c2faafc254ca262f644648f8410860a6fd66d20ce1a87410dd96190a3e6e1a31d0949f65072a44b215b5f0a1078fa635fae8c8c34303a1504feb9625ce2679
-DIST thunderbird-102.3.1-eu.xpi 680664 BLAKE2B 7fbed9dd8834b3e8123543afa4ec5cd089d3d1b835ed0971126bea0fdd9b6a3e24d6c4c04d2e6606b856300111e40c84b59213be0552d90c55b74720d1cee823 SHA512 0c9a8f2d340b0a6d5627e3c615520d9f5896f2a7e867948f58a8266297e17b4b528d796077f672ff1f1bab90d780b71ddf63c02979cb88c1fc17caeece5174fc
-DIST thunderbird-102.3.1-fi.xpi 673890 BLAKE2B a6afd429b1ee3ce5c69c2a1ab0b521227d7312c2b06ad0b5f46ad1293f957f2c83ae8e2ef243e99bcddd844d03f24f288bd279f5fb9d98cb939b58e231ca9a5a SHA512 7a08f5a3c02929fe19b7a295deaec2cdf7e1577aa1865462eb630eb32903630a43e1b74f36414b8fd17fd20c367abd2be1a57618ae74a8e0981b4a8908d9eb8b
-DIST thunderbird-102.3.1-fr.xpi 709227 BLAKE2B 405003c9c2b48f99f3e53d83b27d50b4e61acaf0ce49c3c1c0d8c728ae7cf8cbdc645f3c2ae317c6ee9a8a3e2cbccdcf15c1aca521215e20f6b8c1b8712114e7 SHA512 050d1db6d2462fdc25115fda2242b253ee3e0cd68eadb31c849b414b895984c7aa251ae8dc34a5e5454a3e612f928d78dd24fac97aa7dc0169a622e0f6183745
-DIST thunderbird-102.3.1-fy-NL.xpi 691697 BLAKE2B 3b247f8f3daebb9ee5666b27f721ec222f88ccc3c791fec12cfdb892204c5b9b13b1f3d4693e3f9107cdff37dd901d179a4831470191356c2a60298a494f4ef7 SHA512 6608ae414b51a40bccfe94d2bd42fba443f238eabc1da7377fb61e478d49abda288bbf45d8b51d39e30629ae9cd859c3ca89d5177f9bee30218d07fc08bea158
-DIST thunderbird-102.3.1-ga-IE.xpi 607657 BLAKE2B e3b16e6ad6e40145d2b2cc95651e6d90368ba6b2380b58dc2c9e23681877beeccb5a941313659efbb0ee14ec3f2f7c5dbba777e19a46dded69e633a7f2522f1f SHA512 5a2f6eff60a68c1a737cc19719eb9e04df119e77bd4d2e4403916eaf9ab8de82d745fc95add84e393568e37de4698c8b06aeba96b01a2916db0f5c2822eede27
-DIST thunderbird-102.3.1-gd.xpi 632518 BLAKE2B 2c0fd0c9527b850f1c24c044987982659dd2004e7c2ec703c0d18070884b053899c3fd375dc3a0632b9f6307aeaeaa1ed4f1b69ee7662d04ab201a84f9642cfc SHA512 48094d897c953bd91bc5057e6aaec1bd8dd95a14fc8848893ca1eece2cd882def107e882a4a0992de0dedb896f8e801dcfb9609f61984bab8b1d192a97e56e81
-DIST thunderbird-102.3.1-gl.xpi 665405 BLAKE2B c09b334b1f0eb11804a23832ecf44e91f4864595a174f867ab4105af7717e46088dda5e2ecd2fc30bdc7b0255de60d21300f7ceb31fdf2bff6df467ef6345f42 SHA512 a026582c949f88477db3becb5eb8d482e9b13c0ec4c2c395dd38809c183b9cab8dfda43876871ab0ccba98357193bba7bc549f8c51b838017bbbdf0425018a32
-DIST thunderbird-102.3.1-he.xpi 664220 BLAKE2B bbaf4c81decf45848441a2376364950c9841e20ad706ac9af5737073181cc254e21718651c3ce451e8e4eb1969a945fdd0a04d661ac5c4a6345a451b4910092b SHA512 718e6ae5207781f3f89d7dd8333b550146c896d7abc2c9a46087fb73a5b0c8a8f245e7ec6a11b0cfa4b31923467a581babe33dd464a88bf0fc094de2406c5a2b
-DIST thunderbird-102.3.1-hr.xpi 662852 BLAKE2B 8fcfeaea6a12ad1b5bd16c01e7d5bd7114b84667c3bebde914fab30620ef8cb24f0725cbc8f2a792742e9c33fa11e6e881dbcb9d87e6e0c5f3dbf57427715811 SHA512 ea1801476940bcd8943ad05cdf598af15faa5e2dd09972bc657c631ec8890c20849a7bf4b0f554ae792104903782ee496ecc9340130598767ea5c3bfd0e904e5
-DIST thunderbird-102.3.1-hsb.xpi 716866 BLAKE2B aca4be086e33227f7630ff1c310d7e93dd592a4ede89cd9e81d14c215fc9b68cfcb2ed8317690e958b7a58dcef38d2085ce1605bfa69fb71333f299abf9625ec SHA512 053079901e58b6f27f3e66b06917aeadabe07207be153ece862cee146bf001d9e4bc3d7f0cefe5abf8b461119282c35b4aa9c8ffa9fe49393c59a3ea190eed7c
-DIST thunderbird-102.3.1-hu.xpi 719744 BLAKE2B 4d8995a7f489077dd14dedc10933d48cffc9624f5c6d87283d1ec8aded53eccdd6411d9a2d67fd3c43d08cb9f331a5d5fe54090cece07a6490960bb47a7e623a SHA512 ba1254c7c699480466da145497b88bf927978477cb75f380e1efee3530239c1d156645187828ab03284dbcc05bc7e67f465aead93470604c3784c131e0692252
-DIST thunderbird-102.3.1-id.xpi 642177 BLAKE2B 8e21b1074c87c7082c4c1fc792f52c51c35d2d775f39ad8690d28d63ffcfc3e600d00422c2ef6c0143537a89bc4717c0a8a1bec44ebc3c1961e5a83b95799111 SHA512 f91ac9c58bb1c7ff235de8a61d61194b2ef748a36309aa84fd94856bfb8f4ff5beff6bd11c5f35c32f65dc07095c59d3eb9581e25174e761ee8b5ff3e0ca0d9f
-DIST thunderbird-102.3.1-is.xpi 683479 BLAKE2B 88e707b2da5458e4f7a28dba085d10623a2a7373a948aee434d07e32afa82e0f0e1183829f35f76e521e6afb85257a8db338e00c1d3d1fe9fa3fe3794317b5e5 SHA512 0cbc8c96f0b67a12dbea25d42be67a69bcc95b8efacb1d3b3e23d1d7547265a8fc991ae5feda8cc0c05092d8a0cadf3b09c2b326b5eb32b032517665c2226bc3
-DIST thunderbird-102.3.1-it.xpi 600561 BLAKE2B 92a8e581600162f75bc5308ded04c440baa83ccd348f1e3dd7b5de813c66fe826733aeceb303bc0cfe738bb9ea3dbfa7ed13eecc85105fb5c419d58c26edb639 SHA512 57afe68c003301c56de7263bb124c6fd56fc2086fed24a39ad433b25617f46972b857045b9004965d02550f570d1314b839d251b2a3a36cafedcbdbb160683b9
-DIST thunderbird-102.3.1-ja.xpi 738137 BLAKE2B 6bd5aa52fe1f31df5c581d096f9ab41efade330f32f94f2f710efd8431b0c90da97b7a6b55ced96b370f72a29626aa7da8337fefc2ea720f24309a24e190c1ae SHA512 6160f957a51083e0732fdc1c72f8f25bbdd8a2d656ac0ed9138cd9f4563ff6cea0e06701ab00a3fec21e29b8d9fa6c9cabc2f9e45f67c5d1cb8707b478b2012e
-DIST thunderbird-102.3.1-ka.xpi 751856 BLAKE2B 57e30f561b24c424e6522e6902981e9cf940f4103e0da400eb4ab79137abc7a0feebe935ccdbd93fe8a8e5b4d6a00ce80c0941ecf539c79dd72990006f2a8698 SHA512 6201efcf1586da86efa77aa9a23d541d6c0d1b130f53aad7ef7a2daa0f7e11ae37bde797670bc26354ca42134ec8a305016d58759c9afe7a14952c76a6dff5d3
-DIST thunderbird-102.3.1-kab.xpi 690534 BLAKE2B f3d95a05ff54f657f36eaac1b3f00d0006118a7a6614018ad0ae22b544034f25a4714f26c3eae7a1df4954ecb313a46f547b4d91bd1b7cbdc891cfebccc86664 SHA512 ef2fe4cf00ed31746c0cb33a4f1fea077f2acc78666a66c4204791a5495d2c0c3ddc9670172da19cff7c8744c8fe7573202b322c07251eca9f6df2bfd1ca6af6
-DIST thunderbird-102.3.1-kk.xpi 733544 BLAKE2B e5e4cdcf5b401d053e0cc32803ae9361486cf7a7bc1e87a5da2ee2c9fe2011a93f660a571cc5bc8a4001be14a5f3c13e57960e340e45ba84c09f7a7115b32545 SHA512 073f86abb3251a16ce6b0a36659159059f426873223a1f088f629e584421207a5fb9dddbc93e18e16d7ebb87cab3668e60e61b3d6085de9f88562932af4efd7f
-DIST thunderbird-102.3.1-ko.xpi 695397 BLAKE2B 0044c00030627e0149fb2a49fca0c95b857a4cf3c6d4bf85b9479affdcdecdc20c9c93f78ba89121b677180820fb4089f22bab112e1c7fa22a6e90679a9fe2b3 SHA512 20ae6f87eca436520b34514c244d468f7e176f93b8033f48e9e5c10a5fd651ad7fafb27532ca14fa94eaf94e5d6d7ba7f2fb67cf88a9eda045929ffd0aa3650e
-DIST thunderbird-102.3.1-lt.xpi 683224 BLAKE2B cb5b55b4bb021dc34d768414c5365d7825b52445e59bdecb3dfa821d59ca7d7ae20db3318c030011ddfa6a157cc83352c66a0a414674bd9f57061dff2ec523a6 SHA512 65cf96922ca51c814df53ee48620c8b3b1b55606f23d5fd81331b624eefde802dcdced795deebae0fe04f897c5d352ac557de4cf32778e7acdbf736a128952bc
-DIST thunderbird-102.3.1-lv.xpi 610772 BLAKE2B a2c1c5e1154d70bf91e9d3c7f791571fe1fcb7ea9af3f80c8568c01b75386913da24beb5a3d67d0912b007c8765033f088d25b4b72bbc805c979cecb6c52e5bc SHA512 14e6b01ef0978ff04e0bc3a8ea701f2fb800ec68fa6dcb6abd4e01fe3ecdeadbf4e6d6c833d5968e1c1bb0ba5815c0b1d302ca519f332005bd24e14f74f18d18
-DIST thunderbird-102.3.1-ms.xpi 571590 BLAKE2B e510f01b94f3c48a34ada6cbd7570b28e4fb8c6f21dadc4ed668f9cfa21133af019ad7660c588b1632370fda464d8cde2b033494b7fa169b4e7645e3bf8fef27 SHA512 de840b274fd52a10b9b2d62942b111ab67f7fb248437bc8d9802aca3533cf2d2aa6b8b9aee90f8c7520f4819bc90b8ea832b720ca34e58944d493623a75bd1f0
-DIST thunderbird-102.3.1-nb-NO.xpi 650155 BLAKE2B 051aa33a470973ef721ab4465610048d90f088f3646e9c69c693a9560bdab3479da1c4e339bbca5948dd333856c52d641bdd6653f23cae6b89b0c8d2f188790b SHA512 724d8e3dca7dd9aed715bdadfe7933d0d2fe68b2bad2ae06280021e366d258a4b1082a02c4063c3d9bd3f2934e14d36d2fe53f87aeda8362a7d63820b24e0b5e
-DIST thunderbird-102.3.1-nl.xpi 683345 BLAKE2B 7dbcb948c5e72a169aafbf24633e2d95c370a298e87d64ef92044c04a89afe78ee6fb0f33ac089ee692f4593a5ff25347f208cf8c3e7287a2bb38e1c4cc11b3c SHA512 6b32ff0265a927f7201ac46d41ccca0b043ed3e8c1b39541ff7908541ef02fb19f887a666be120dd3ec87f3c849640ea321e6d60667dc8f401356c1f24033044
-DIST thunderbird-102.3.1-nn-NO.xpi 657849 BLAKE2B f162494ac21b2eeb7012f70bef8eaf2a4001ebea182fa9957bce5dbd3540e7951e367ad242236ece70adb27fc20d29d1c8d0148b39e14c26d8ae0e5248ddc868 SHA512 5f67e0f6a8221b48ec3c44ca920a351d28a0e359852948063cfbea531746e581eac7a558fc5a520737938083c1cbb4556d8a86770213dd02f578af2365af7e56
-DIST thunderbird-102.3.1-pa-IN.xpi 646678 BLAKE2B 08cade1bab8c72391bbbe0ba50f2612b4a1d2437c7aa000289248d72d75a8773782f26064c21a7801d4aade1c823c1582e52a4d52a9e43f4314e284b9d784500 SHA512 a1b0539c57f745ab127b13c0d7dd736864273a72f4a492054a7794cb10dae7b0c102b7f09d6ce98dce4a1adaee2759dc5a1c6cdffce8535fda2152f4877e713d
-DIST thunderbird-102.3.1-pl.xpi 695628 BLAKE2B 2a36aae44e05450d810d06759b32dfece8f57669854a64bdfd8ca79fc41c9c0814eb390845476a320687af95a4c165ad70acefa875183a81fa43b4c8d15d98db SHA512 d0ecc324769051beec22efbf39146aa5d5b8e3ed55318d365216986a8146da28ce24ec0100eb598361ec4a541d7b52882f422bfcac0fcee585886c12d5513dca
-DIST thunderbird-102.3.1-pt-BR.xpi 691147 BLAKE2B 0dff80ad29212adefa7726f1766fd8f42714ef7b72c22290bfbb7491361a9cfc3492bf56359d068413325dd99a65f8f935d6c8aee27129fb7d3f0fd48d5b113e SHA512 2d53b2d41bd27238a200f698fca808ed87ba066ee9a5b0494a3a98dfd3224a9f2b150dd38249027f4f67c9ea14c4b0f35df4cc1424675a5ac604328ea61657cc
-DIST thunderbird-102.3.1-pt-PT.xpi 667259 BLAKE2B 625f5bfbfddd8f0370ba304fa6ae81b170ae91f2c7d37dda153df78ac90b2f71a4cb2a46bfa0d1601717528247e9e7af5f28e154742ee63f61a26e4c81aa78fa SHA512 2b6c78217043d6c8d5aff55e87ac5666eaff0e11e6c9eabb5abbd1f4c1d85dac532d5e3b946008d2c170b56e790bb05818da632e39f479d577f77fa15bfb6878
-DIST thunderbird-102.3.1-rm.xpi 684541 BLAKE2B 86c6cb70dbcdc1c41d65458794c4bf6525cc4ab008e0227e3506c4b24908366222ea7c9f3c87fcbdf587961255a8a7f587dd424ec5eb8d3bc8ec71295623a678 SHA512 e629d349fe34403ee3b4350e736a308aff7ed342b6334facc95e0bd7279ab9b49e44cc91fa4fcfaa0f6a1f3ded7dfe5ee3a1a96a811de9d33e26679c5798eb8e
-DIST thunderbird-102.3.1-ro.xpi 652959 BLAKE2B 8e9b8a28decfd9b2bdaf60262d0a041deb9cf9b1114db09d48ecddc3e3e371671d0311df90a1ad416d7d8ce83b0f89c9eeb2a898d832e7f3512010ad7781d2c1 SHA512 266754ace42627091e1f21cd2c062680ed7f1bcc98d8256acd34610637c4bf6e9c4f05cbbb967879653f6631193b709ccd1a8404c71531b33740f25f545d6d7f
-DIST thunderbird-102.3.1-ru.xpi 801880 BLAKE2B 1fefa92ea0f23b7b89775cd7824d589984d64759c19d1a253f89c1b62b5eb82ac98d0a325b80bc80f61904271c92b258b8ec6de43df43ea6da641b17ceda12e9 SHA512 617595a0cbae1fc33ff2303b00727192b50f47e3215feba634c6c349294f5b33f57d23b946307b12ef9ec2ba5f4be02184c69a74512d7654805efdc33fe44eeb
-DIST thunderbird-102.3.1-sk.xpi 718806 BLAKE2B 24a357973a87527f593403d4adac2e4f18e6e56612a79fb647e6769161c7c6ecaba1a3934e23f5271413400edad09edb704af5acb0651b71966468f4ec353e67 SHA512 06dc363abf1189b4273f8213da5357c8ec134475eb170e943467966bef11efca4e6423ee0d744f8f7b08fd1905705f9847ecde3e141267b56cc8c26907821fec
-DIST thunderbird-102.3.1-sl.xpi 683839 BLAKE2B a62482b59ab974a0f91a4f8b0bb152dd612aae4924e8b3a72781138bbff6aaa6a5264ef3746c67cb4c51cf129cde18958006b3024a9b3e177cc620cf0ca4180e SHA512 6b892e167e62de496cb40954897295d5f5171e0717423f9c0947ac09450bdca73733daf43dfe1f6e2d320ba7fa705f7ae96d2607f5c0f25621790b46e6833233
-DIST thunderbird-102.3.1-sq.xpi 692096 BLAKE2B 09e64ccde9485565322a141ebc9165bfa313d4acaec9fabc4e977efe932c70ae5b98e066d13e042d0a6f27259152863714105a65c0c0f7620559f4079be880d1 SHA512 4495da421836c9699a013ff6ce258e09257385eb01d2c8afeceb347c87d2309b9a4e43beceec015162b1b46dbf669cad29fd47eb030112d02c99f874d54393ea
-DIST thunderbird-102.3.1-sr.xpi 704615 BLAKE2B 83a3f2d55c2b53b5056987065db89e93b807e3b6df709f2ae2912d4d447b6b86fca12711caa15a99a3ba105307c71857d97043b557f2416a7fe5d95286469bad SHA512 6b1a49972ce4b35f2429863ec95ec5ea331706b20598c9f6929aad3024be3aeb18941c3b4c2295256a2a6ff78829b78125dbddf34ea51ea0e8f026eb58e253f9
-DIST thunderbird-102.3.1-sv-SE.xpi 687049 BLAKE2B dc9601ffb62cc882518a14870ee99c67ace89acb9f395be13f371a151453aea3e01e1176fc3106bf8b150476c43adb947023a46c2aa52528987cdea6ef67f9c2 SHA512 08fd8583e721b99e04bdce5bb34ceb1537e8d1441a8e8ad6725099861bd6f09a1e38af089df08c8d4bbc2e99a096fb411404ed176163be651c6545c6b45ff806
-DIST thunderbird-102.3.1-th.xpi 737391 BLAKE2B 5e1fd24b6d79bbe67329ddc2236bd0b410e4c708cdae582ef8be5515b7ae38d6ada3cba8c34c9e42373b9b1cde2a8f75ce99df2d8866545d4993273dd6f15ff3 SHA512 dfca5be2cbfc4077ff7a547e16b1a3c3f09784cda64a78e69decee05c09cc25d88685d7c87369ddeb273f1e8b407c0a586851d495133d4ade87b4ce86a1a3e82
-DIST thunderbird-102.3.1-tr.xpi 697689 BLAKE2B 4ce4a042639b57407f9b4bace9e8a758941cab4214c5be7651a16fc8d5b5879e9398495e9eb30b50dcb1def1243f2baa03c503153227de24e45828a4a943d7cd SHA512 f05efe8a7f774779523310cdd98f7511a83560396510eabc63cc9de486551a1b2db4d14178e2031cc9dcf0f39545ec1cc2cabb24959d82d64ff64d492d260451
-DIST thunderbird-102.3.1-uk.xpi 794374 BLAKE2B 17b24a9917b088d55cca635705f08aaac655c3d926fa0f39e9297e92c93866e72c407ee5e836fc90fe537fc4071c0e9091177bf9887d2d0081eae7d78d8ab46e SHA512 3a6bb561d52bb4335aa19233b727f89189a75652d886e99c84b971955f5b8e07d76d7347cb5cb18a6121465c47c2ec36654ad8ab1ea5e0001051ff155c8ef75d
-DIST thunderbird-102.3.1-uz.xpi 588030 BLAKE2B 53c8f087fb9dba631054a2f54b55863e27cd737a976d228c731d206020456fa5229f59fc8b96450b0fd0d23e48182ef2b7d771852cb31c05069ba2e08c2d1709 SHA512 d4f739d81f9393aae98cc4f9ca0b419ce191a6e405772c63d5d7c201d0b70370b4c380457a877feef7c672814a70a0a5ca924cff3d250d3ebf4393bdf5255ce4
-DIST thunderbird-102.3.1-vi.xpi 725408 BLAKE2B 175ba67dd70acc7fcc917d5249257b54ec3a27aed71d5d45a842f4ae50a3cc52753dd78297405df909feee567e2a7f6443d9e9c03f0fe43ea223084fa12e1edd SHA512 482f55dea6a4642c9a664bea35f084a3a705c13f14bfdaa775e98c458cd82d49464bfd43eb9faf9657e947dc6b2650f0e194732e0530d1db24decc07feba680c
-DIST thunderbird-102.3.1-zh-CN.xpi 723936 BLAKE2B 4909615711dcea8bbb23e2dc0b4afd566c855ae0a0f0da5b9e8d0a211acb38cc65b96da7f3b644b5d17b4f13eefef6b9fba3f91345ca2efcda876d8c33d74e69 SHA512 98b77d42a496171c055068e4cbbf803aaab1df3d83f04f6cb0948eb52b45f72d284df99d370d1d96f876022b7dc57ff8ebb8efdc3755f968bf42c27ee9af346f
-DIST thunderbird-102.3.1-zh-TW.xpi 727835 BLAKE2B a3dc198cbd322a3151b96c65684ef6bf3644ec72dc94e1103ce235a9c1b086d594ccda83f877f064e4eea765a3b0457f9f2c8780e1c59428e4594a1441a44005 SHA512 058e0303d255b114fac7db6ba7aa8ddba4b3525bee72018b438c9d8ca33d2b48562e4050b538a521f430ba5056ba00a4a437aa7397fa7ef28ee35db3da6f9810
-DIST thunderbird-102.3.1.source.tar.xz 502887916 BLAKE2B 7eb98d8f1d4c42e2e7e5264983be1cdf3cf6e836653de9012558e6787569bd5ea3e9d9a31f15896d1729f3031ab8ffea765bffd0d70b157e9b9c0e180ea0d585 SHA512 8a127958b35c1c14b8acaa3ac256f8a3a7e9bde89fc810299ae4036c80c41d0c0d45c85ed47099d6ec37e2774a6bdeefe0de6b0b4b8bceca8206c7e54c3f93c1
-DIST thunderbird-102.3.2-af.xpi 551429 BLAKE2B 893b6540c36ae2c3178b45c9d771daf86db5e756bbb5eb040947a0cb473f678b759f51258e5fe97bfccf0fa24394689bafe88f810c1570fb5d5d7719b2a92fa5 SHA512 90953b13d343e8176cb6aff06615137bf3fc90f167b4f57988cf392339e52b1373d0bca52f0330eea7fa81744973a0f543abc6364702cbf7ead2f929753d0510
-DIST thunderbird-102.3.2-ar.xpi 655776 BLAKE2B 31cc5327128639365c883e610b003abef83c82660b8ea97abdf3e1659fe1ef249d4a10480da9db9d5cd2b4a8dd69c6057b5021c4b5b7fe32729c5f8769bb897d SHA512 bb4ad986ab1b2ba394b24115a5c42a1b03890268a786178cfd3ed516129056f5c77a04988059711df2ac7309f097a281bb7619d9834d56380d0f461ffcdd22f9
-DIST thunderbird-102.3.2-ast.xpi 572188 BLAKE2B 3a5613351e2ff235d06ee8292f50b45e9a441abd1e43f7f094bbf3be06e9f8c1669a1c39c1c9205c3809fa8c737e91fe30665cf0d5e4bfa0201ecfa583e46b32 SHA512 4011120af5cca3fa37459cc15f043b0851b9b27ee130de160e5281531b91671641cd9dfaf385007f913236bcbd262b6fc1605eb465522387846c8c221a5bb225
-DIST thunderbird-102.3.2-be.xpi 687888 BLAKE2B 948f524d8141279db58fdade014b4ed190b2c909228fab2412483904c499e5f995ebe5eaf55b349b063caa340c0659052f66a104aab0a19c688a2998c8ef66c5 SHA512 12c24d099b6aca49a09b6be124c0149cf1c2cd02735895be0085c1fdffca89c15469c4eaab16fb79e2fdcc1aaf6768d1c7987174b693ccbc88ecbf27aabe52a1
-DIST thunderbird-102.3.2-bg.xpi 683814 BLAKE2B 5db119090604c71b950cdc1d98680f3ac4db9525547bfd90909013d5d0bd5f4243e83e207c8164b5eb8bb44b03111a4a898bba2ab3051888eb9be467d38c6a66 SHA512 cd937f20ac6fae0886066c8b19622b8f867ca4d359c2806d6e771799a6307697b193db1f33f9c54eba8db33c0f1ab4d24b157bcb6c9942b81ac7964388367064
-DIST thunderbird-102.3.2-br.xpi 615535 BLAKE2B f6eac77d4b3ecdf471f108cc6fa9a5253a62a406b0f0cea1b4c67924ed35db2722c0315259dde5adff7ee5f65f40fc960e8b5dde92cf920b527b9f4c92967141 SHA512 6978b456e21434a922d605e006d875aa8afd78de50966b08e88886b817e85966a56bfe94fb4deffdb9edd550683896a2964944bdd2cf994f6127b84c12e8e7a9
-DIST thunderbird-102.3.2-ca.xpi 637764 BLAKE2B e923172ecf883f4cc920de79f2d71e447693c587615378d73a880cdffb3c7d4c3a6310370be8ddaf4e5d1e9b22be2e4d4e9f8410493429746e70947e8404b69f SHA512 224a334bf2b7d4cd6cedad901e87f934182d7c32ad359f268bdd5770e581d6c99fdc4edb834a2d6b92dbe27814d15b3f100f2d58500d69123315d884dc9406c2
-DIST thunderbird-102.3.2-cak.xpi 643999 BLAKE2B e29b18a77420a9ab470db0338a50c8224951bb733c78a63cb28955491a8704d2c5a8b4e7214dc44870b5e2a4458fd5dcbc274849961e7c4026e661b7d6f0355c SHA512 feec7d3beae7102f74d2076c4ffd98649ddea0cfbcf1b9f36d646924098439705ab01e81e71309dc38546a341060763b5d0bce2390b1efab5a348050bdd9fa59
-DIST thunderbird-102.3.2-cs.xpi 708438 BLAKE2B 797274570bdb89485639f31f0ff67ba1db8820d4cbf464b81c907317fb7e069dff140af37e101d95ac0fbf2eec4ad37960af18dc315bbffda5b422031c1d76eb SHA512 1a26b31e2daa8772fdb2e95f2823269b7103c597b039ffc82cc96044ea7efd826d42b0b9fe143ae5f7cafbb076e1a630041e2692b05bb092d01453c7ca70c292
-DIST thunderbird-102.3.2-cy.xpi 686632 BLAKE2B 2edd310c85abaf48fc1e1c92f0bb4897cfae750e5a3476f93f84af5ae0a0806d213e129ad6aa11e2a6fd94c00fe6d9b927837a5a57397c7785600ab02606f3a9 SHA512 846049f76079fec63f672f15300add157c65bb28c43fab0b5fc85bb8001c0337c861d0bd0ea6efbbb1bfa47eebea16a701e64280cb358367591afb644e9895af
-DIST thunderbird-102.3.2-da.xpi 672076 BLAKE2B 246ddf3eb1b26d5ac910bc67b2a10b87e96f6bcc6145c818eab243369368d613e734291285277c75eb9f42e012268099b407c24cabf711baaae851e508ae264f SHA512 f6a5463ea906c2b5f33e7d756dffc7d4821a7f12b0c8f3431605bde03574dc1ed444c60bf8c94464c701b71d4ffde4dcc1d1d479c75caf7e31728ac489590db2
-DIST thunderbird-102.3.2-de.xpi 705096 BLAKE2B bb802e1bcb2e6b713bd88d96f2a614ebb676991e8754e5a431fffe09ed6924862196cbff2f951cd6e6cae9ca77805e0649ec7e29eedd50a5550dd7df70d3a9b5 SHA512 88f3b94bd83c64daa0bfa248c19630a52fd1321625ead9545b7c01090e031fba3fca2c9dc185ae8c0536ae89ab5757316c798eadb250a9dd7d2aebf9bd5391cf
-DIST thunderbird-102.3.2-dsb.xpi 720127 BLAKE2B eb757cecba58ca36b0d963569ee3e2078cddf3a4550d42fbbbed0b7a44e63d5a15ae652a5abdb11f7568fb4f4fcd845ddc1925d7f78b4d7d63775483e7fc9fa5 SHA512 055d38f2c747a7f4435320a93fb47cc72e2d5024360f19b541d38401230cc3fe24f3daa74057509661dcb3ecdaecd39008e6d101fe7a5c2cd1f787f5b69f8df7
-DIST thunderbird-102.3.2-el.xpi 816975 BLAKE2B c2bdb8ac716d3b5170bfdfe99ea143ff46660122cd4b7948d3cf7ff04c8ff0e957fa8382eb42fe13cc7c79b24c8bd755f25eb2c5f700463c9951360cad8658eb SHA512 d3f9c10e3847d6dc31edab16867751b16f03d09579eb2e7a1bb41d4f9f8d5cd90266dfacb6aef4143e5cd8ff7900955a2a8ae9f4daf5f06c59ad01729cfcc0f1
-DIST thunderbird-102.3.2-en-CA.xpi 646633 BLAKE2B 16375423101614d8a9dc7bd32e49f83926ba43f4eb1ce4d9b05b9dd5db3fc6f6751563b731d90579cb9c7c85f3886cf00c493e2450a54ab9d938906f9bdf16bd SHA512 5b59e82f4d5497122a227135a27e1b1d87452670a441a68b05cae82a1d2f8535c58d31b2279490d4763ec0c8a60d672522a0851b0c9bcb8e86dafb39ac24b246
-DIST thunderbird-102.3.2-en-GB.xpi 646925 BLAKE2B 27a04c9d934c5c620e8d2b7eef104cbc5af2e39fdda58b0eaffa140fedf6ca75dfa3e7c59bb341c33c6a907fed0313cc767fef895743baf4946a919255f0b65c SHA512 94a81018e8cb02d6369895c59aa7e6e99b2ac9425d5ce353d1dfa1533ec60eb881a3811869d7ef391de8da3897b4eafba34cfa76da1f33bd63cf875a2095b44f
-DIST thunderbird-102.3.2-es-AR.xpi 696738 BLAKE2B c8afa8befa942ca03a57b945be626214b342ca978e51f07ea7613a91edd810146a86c729f2c0869abf6a5fbd82e988daab3ab2234fead33bb345523b115d5395 SHA512 7b6356d36e019ef19ef39b4244134fdbf5eba6c70833647175c889898e7b94df40dd4018ef93264a0bd1bf09c4505f9a7a866f35d4f2e602b62f814faf577a38
-DIST thunderbird-102.3.2-es-ES.xpi 652535 BLAKE2B 67c3b24d34e561a3fcf7956f9c5318141c6df6caba3144b1acdea4356d60bd15be2ce96bc372ab1a1f31316f5096fafd2af85025bc5c47797f8d64aaf1e142d4 SHA512 558a063fbf11b1158544e09e8eb4d9aeb4edc0c28bc2ec4075a0c7efebbb14cec5b8b1c5b2aa6761591c8d9c52b8d7a7d56c00ee495cc3b4ec1d76bdd8f45594
-DIST thunderbird-102.3.2-es-MX.xpi 699368 BLAKE2B 446a6ae01c2fbf78a0bc3e94db0d74501dff1635d30e75179082e81fe0d30901329b86c3532419fae94def12da33efae3950d080b64b6dde14edaca6971d9745 SHA512 0ff1c831d2137d1ca27e2e78774c3b9737199b48cb0d781b9f61a2e844c43ffdae633457981400e4de5efac7f08304d52208f7cc0f1b1112088cf980948eaa83
-DIST thunderbird-102.3.2-et.xpi 667781 BLAKE2B 1e99e9c4859030fa623a99d8dd3a773752a54eacf68ff9bcc52116a6e53cb22cb8a82aaf52ac006db431f0cce83776f1fffddd9e4b4ec236c0d09db92029a9db SHA512 5d30ffd9090c8eaadabe83a155be9b56e76073a959c89350cf63b73fbff7add8d8c22b77ff2af6dec0ce9587490ce602d0b2eca80a4ca790a6e5c15d14c5b5cc
-DIST thunderbird-102.3.2-eu.xpi 680746 BLAKE2B 29ee846812cd68e71db349d671eb7be2ace14aa1508a7e8fb68ed47883570e5a35d6f00663c11a95dc4c39467ec3a72ea7a41e792ae81613727275dc8e63946e SHA512 30c044c161a0d58288ac4a8189fc91d306ee2f1a47b00a9322c261431c8dbf763c0cfb6078cbee7ceb358155f4a3b82c9bcac9d5ffe3a6584b6bf13734c3b27c
-DIST thunderbird-102.3.2-fi.xpi 673890 BLAKE2B ca8ce5d81b246438dd0441741b0f2d561879223e17e15bf306b20a17c00c64ecf7cee8385352509967b73eb93101ff7285c3137e1ce02ac78f2d8fcf4463e983 SHA512 d296035cc09a813ea7cca50fe7e46076ed607a3cf08f3953ce33fb5af7de4dc7db8ec5cd974177882ea3ab0228ed18777b0587da8c8c6fc337123cda7b13f51d
-DIST thunderbird-102.3.2-fr.xpi 709323 BLAKE2B 83ffeb07cfba46ad709eb463e468dd011d78b8083dc5f36ae35015d20c3f8c6153c374fedb5a7a31bf11743c6b0c417e7135394b10885d351fb4e1e853fa5cc9 SHA512 005ce48eaf55014c7b09aa81afc32d5968a910d0bd9639bc35ee9e7cc069770449f8aa754aec68c213d112dcec0b5c4d74eb6a662cb781c66e9675b5f18904c3
-DIST thunderbird-102.3.2-fy-NL.xpi 691751 BLAKE2B df7b0fb1ebef2fffd1c3d7287d21d0d0a359d76d3069cc6139dd76ffa89aff97edc5957c940c0737f1c3e0b7e72d7aab9cf1d89755406361fd02c79662dc34fd SHA512 81ed53d980713f9c1c1d4f38fa601183152df1d8deae79f8178285cca1fec1d522c389da1016c09f365f8a36bb8b133ccd820e9acdf2571be1b2a64d67699c09
-DIST thunderbird-102.3.2-ga-IE.xpi 607655 BLAKE2B 4fd90486d5eb17f828ab554983a8720fb89bfe064e629f3832bc6bebed442b1f3bb031183d2102c1bbda6dc6c61799b1fd0983bc5cfa71712c6c4d450c4f3b41 SHA512 fa9d443ca8a664f28212130fbce49612be1153ee383798f902fdd047050edb1eded2493661606a26e9f03ba1d33ecdcbd63e997ab773bd1f0f183804062e0cc9
-DIST thunderbird-102.3.2-gd.xpi 632516 BLAKE2B 7d0ee5d4d5ed6942c10e6fdc381b4470855d836e672387c7f28b33edfd2dede5d451b40e4c4d6d103a385115b9b7a2378142e0dafb653b7685dec4b562d716b0 SHA512 702a33062ebc93c65b4066a396cd5ec7a84c4c4eb6282f6ef506f33235061639a9ed348b4de712f89b2d52b7932416f6bba291c2b786da32827cac9083500e02
-DIST thunderbird-102.3.2-gl.xpi 665403 BLAKE2B 99c8c2d4f32e57c76fa999e5d2bb17d939abbdd17e520d379e351973c07096363da2af78b3986654a50f6a90d8919f53671d9e960fda85e7c5ec787fa1e80f95 SHA512 fdbb6f371df6f43856ed89d57b00b00d3dab7c5efac5c10aefc3e499cb514ee468c4db3c99610b7a0abdfe6bb5129e14ce0ed40dd247ce990e799a9e10d6d25a
-DIST thunderbird-102.3.2-he.xpi 664220 BLAKE2B d957ec65613ede783d9ba8b0b25f0bab5c26e54cc8cdb50d81c7b8c7bd1c415edf3502c9f0dde333479f648ed934141f1a7f88ab2810fb96ec1c8dc60945b6d3 SHA512 1f5b13525316949c4e8bcd15daf4ca2e400a685d295bc9b37777b903177e69fe350b6fbf23876ffd871104170cd70a702c65d119410f85d43a8a70cc75496bdb
-DIST thunderbird-102.3.2-hr.xpi 662851 BLAKE2B 388930b8f55fb598b33810fd62b025335d81c7407cab470a60bd9e374e1a2c95e4d9498b113a8adf30218e6ed6ce144b60fc4c1b93c4fad5152cf367a3d586af SHA512 ce8fba8c774de3ddca0e2b70bdbcbf3faf5ded6ac9385802b5f30536c4387b669685893ad54e76b7adcd9fb62121cda71959b1afb6bcc6bac199d922c3420b28
-DIST thunderbird-102.3.2-hsb.xpi 716922 BLAKE2B da2631dd81f31a8fca352f02d693d41a6052afeb744bd5ae11252f0862104fa7be5bef1c70387079f639338d473097f4263392b96474fe7bd8be82eadd12ffe7 SHA512 39ae66b9ad1a63d773c634c3ae2aa697115a77bee67621b27200b1b7181409295d5f9872e91f267a721e15554dcb5f1377eaaa31078fbf574a677ee9896bb7aa
-DIST thunderbird-102.3.2-hu.xpi 719821 BLAKE2B e99758938afcaae467717bbc4fd75529466123ec631164d35d560a7e525d0bd1b5891e3537aeedda6f505f42e6fad9b92dc4fbc154812fedeb940212b52b1b1d SHA512 a36c26eb0f1aa03553c772197e016e9e445fd222e79bc500e28e9c8c0b648a5379c01e78b04c6c98b70d77f6f78ebdab50b8d413e9a118686c7f897acdb833b4
-DIST thunderbird-102.3.2-id.xpi 642174 BLAKE2B 8095070cb3340b3ab475ea52460034ebcbbe14151f6f7bb5760d3998c1ee3f19ff054a94db6345e6bddd0517a60cbda28a9023235ad628b461f8f9c193e5b851 SHA512 ffc30225007a997ef07065708eb290fefb62f570a7482b71447914179eb304f5c782e9797e45344ad6706445722a9cb04e11fdc31813e96083d43f44865dbaf3
-DIST thunderbird-102.3.2-is.xpi 683544 BLAKE2B de7e6dde6f6b909dbe1a8e2ef3f9cabf32e245817cd4ee275a7b65267fbb876da486df23b3e6200e4dcd4de85403d0c76b09a0264e96f073028e4945989ea100 SHA512 01ab5eba30167299db389c4c84ed603a55cec4b3cf5bc124d1d5198783e22f96272d2941aa5f7e0227c0138bb20abd3eabe5bd11b5fc74d47e8e4acdf240c4d7
-DIST thunderbird-102.3.2-it.xpi 600699 BLAKE2B fa74cc9aef662e409348a4db22e4a762f4e83d1e4d0ca4b80b32935519dbd16993a9132fedf157ce1d6c848e18a52b75476bd8a80fb9e6a83cbd769352ff8183 SHA512 6bc7a3bf9c543383e4d7d8e0fe815a6f006a68f75de92cfa5598d66d8b209612adaccc13b76e5cb06b24d37c851a6b88020c3ba59987155883609fcbe02251ee
-DIST thunderbird-102.3.2-ja.xpi 738138 BLAKE2B 1943a33638685e7d91f075686f5e1a360ca02b2984f8de0d673ca3efab90b4c6f697e45263d586bdc7e408b6ab9462946ee337017bc2d3f13d4644732f747ee2 SHA512 e4333146b58a0cf438b28a45474c65ebe9774a5ae8cafa3ab46e7a20877a0e650bef17e1f8ff09c200b5ff2813acfeae8905d297bdffe95a89c95a70764445c2
-DIST thunderbird-102.3.2-ka.xpi 751856 BLAKE2B 2436059978bfef26a4b998893237f85022f2d02f4c9c2a5202f96e4a94db7f892894fdd4e0af3e323e735c06353dd5168f96667d6ed30019a7383db7a71bd19c SHA512 b7f21f8473ce143473dff40e0cb66130bb34fbc634103c0661e0b8ba28c7d413159be236c239568140239cc4879cbf07af8f04c7ea1b4f81cf06d90bebc8b083
-DIST thunderbird-102.3.2-kab.xpi 690533 BLAKE2B 222dd5874f94fe276d692b0428e3a88451f9e44fe23de73ba5506c28c86ed7db171a3c8e6a5fe84691d041eb23977c620d4b8c379d74a5f6b5be01a2826e46cf SHA512 a58d13b94f36dc72cf42c57c201ff3c89af566f1388fc8539c95f28fb4a799025e9d1e037f80060d5837f09f373e54ec4b61125b90df95b4e8f17dbd8e70b4aa
-DIST thunderbird-102.3.2-kk.xpi 734106 BLAKE2B 30b485511463aabfe492bfeb77d2bd7d6af317797a2ac585cecd5ce900811cfe43795e3e9905114f48d5811b53d3cebef6e0bb734d675f84f7c38eb620cc47c1 SHA512 73a1cf6b5780d762d93bacc94565993f7c8729c67257cc39daef8afbfe88a40fc4216c559eeff09119aa2ecd3578cf4dd2225f1762b5ebf0119243c791404a17
-DIST thunderbird-102.3.2-ko.xpi 695397 BLAKE2B 531862efa4356db67b9f1630c22a380e44c36279c708e70f24cff6d7876bc99955e3208dc85905b997909f8fd185332530ecd2742f8480e2bca4cf954f0d681d SHA512 72b54755016d8002c62b38b2cc29c66ac5b60fc686ff4c8abc15131c3ef733e41aa48b568abe6543c78d3eda35fbf1254edc61f44135360b4ecef1a98545b593
-DIST thunderbird-102.3.2-lt.xpi 683221 BLAKE2B d48fd1e1da6ac47b8443449ec21859d4b2b09c8f02d7df77425b3fec8bee3110fe390a8cb2fe7c5ac6255c87813c4d5ceca9c2aa9983f16482d313e6395432ae SHA512 f26e0e8f5e81251568bdb671c38b4c70564d628f1f1f2fe50fe661dd7f89228441bc5405c8664ea34955f32a1ea9c446c6917999b065cef62d0be238c75825c2
-DIST thunderbird-102.3.2-lv.xpi 610783 BLAKE2B 5790ff1b4ecc1fd03f5c58d18160266026057f33cacb98866e7b90ddc0163d758c23aa67775c7cd0908afdb9e80c2a3ec286ee71960b4f94481773f7e810a4e1 SHA512 3f15f36164761291d45352ce54b0cdc4b8e91c175ceaf823a3d799ce9d2e5c8c19b4eb01cbbc8f9ed43d78c1b3a4bd391e4000c79ac9bd4bf7a3b38e1d487013
-DIST thunderbird-102.3.2-ms.xpi 571587 BLAKE2B 49dfba2add7ab4eaad53fa4353f9ecb7c5a5b4d4ad90be78dd11f3155327ca1008d6a339b36405524a050e6a269b4e356d48c72cde7282b337a2e3309c923821 SHA512 b4d7293863ba895dfba9c0f044a9d273c2bc133b7439975f131fe66590572b74a7a2e47ba95a1b5e7c6b548fabfe4da38a371646a7ffc77cf6b98f72f6539ae0
-DIST thunderbird-102.3.2-nb-NO.xpi 650154 BLAKE2B 0e17497bd187f44ce86e7510e619a611395da6313ef8a2b54ff5ce1316448546316e19a34b9af7c511739bca66cd61c4271dfec5704623f2783e6a42fb61debd SHA512 bb110e10c6f2662b0dcd34a152b7803c22efbe4f05f21e3bc9442137e93ec58aa9be0df15e55db15b27518e2938f28b13e83894875ae3230c7f4e8d44d811851
-DIST thunderbird-102.3.2-nl.xpi 683405 BLAKE2B 1198c6b312927b3ccad5dc55bf841cd5421c8eccdedcd9ba4bb91aa282525477a901b76aef03d75c174a79ee2807a1f5ec734b57d066339771137fcf0ee7ea47 SHA512 ed3b4db9f54eb74343500d62118c7bab5512ccde20391426b1d147dc401232fa137fd426382c19b7cfe57bfb110044727db4139a019f8edbd670f0be10f4de2d
-DIST thunderbird-102.3.2-nn-NO.xpi 658083 BLAKE2B f0b61e8bfdd1987c664c0378f4c99b8eea4ea29afabe5fb1a8335648e73e3eb1ecc36068f2baa5cdc59ba5631d5b9ad4457aecec66086897ae0d4b88d93b6f9c SHA512 a270700f3decb52a88f505461ddffb9ed137935a515a1a809e62b38bc73ae118c3794cb8156a31b4cc43c3a8b2bcf5ed5272e915d3f21869242a9af133ae3e01
-DIST thunderbird-102.3.2-pa-IN.xpi 647410 BLAKE2B 6a0a0ea055af1d8885a603941e2d1d09c3997ad8e51b00d9c68e5c07cff44decd93b785a60899e42f8c966db3d70f08f0b5532329916d7e6a2093d48e5532450 SHA512 a247cfe2f57c405fc799a37e09de8114d5259815cfb406d10303e0c0e5d76680f8059949774eb60054ca6fd1c4fbe901800bd9acba26b867968b6bbe8b3dba0c
-DIST thunderbird-102.3.2-pl.xpi 695625 BLAKE2B 9f306eadbb658f78ec3bf554adc059fb410c2533c45d4467548f050e96e455ad7044e9d86e6e5ca1577568fbc8f4217ea40aad903116df55f7bda29ba2622707 SHA512 10b1d114d1b2d458615696524da60a7a797edb15684d88322d756962042c65d0ddc725627e4af05238531c77569ed8a0d77d4fd7dd9ebfb87e8343adf037eb89
-DIST thunderbird-102.3.2-pt-BR.xpi 691271 BLAKE2B 7767971cae63605391ab9f4f00010686df57bc658404d9df26b21ed51d271b46b3770d0509450973b56bdf5ad37011f2f5d1dfa97f66d7e4ca8641d36d5786df SHA512 fca5af088c334ff2858fbd658b661cf705db670c3f41aedd8d96f474fdf6a7891e7a3e0873cc3227528a2d24a2b82693ee340c5478d2c70b28cf1fb3ff6f77f9
-DIST thunderbird-102.3.2-pt-PT.xpi 667544 BLAKE2B 4fd88560da974ee37fb0e9e94b00aca45fe4b2b3fa6083b50a69a2b965f1088a938c887c9701b9aabd4b9fe9708ccbefa62e89d54735222e6f53702a8e3196fe SHA512 816d3d9107f0fb2f672a41acca54bc28509ea1063bb30c403fd61556e5ae05ba1ddffd024b9deb630ddb69c78a9b28f141a0e95eb0830d5d28bcd28e14dcb6ed
-DIST thunderbird-102.3.2-rm.xpi 684539 BLAKE2B bc4d99be3b58d09dc2414be02a0058160f45efcd93aabcd977dade5d8697ecdf2f018b987674aa677dd5a918236263dd296eaf71eac8e17d9b5a0904cea7cabb SHA512 b6f14b89a6847e1586c5d81a752e4be2d38f1bb27fb6bd7f3c2d558b20f1825f736c873793b0cbf47fa7eefaf21c6b1a074c3222dffe35bd485ac65cb5e1a2b4
-DIST thunderbird-102.3.2-ro.xpi 652957 BLAKE2B 1b5e59745f1289e38d1857e336a20759efb237c011f90f0709916b7d583ecff27a6ff9526961358e19c0d9e036d101b231da6e3768d5c49bceb988fe81e68342 SHA512 ada45df85caf9c3005423e5b82b7a982d44c2c8202b7f8d4da29dd9a444a31e3d3a2ee1c80d69c7eeceb5dd05a913a5f7a453ba5133bcbb19081822d246e5f01
-DIST thunderbird-102.3.2-ru.xpi 802038 BLAKE2B 6ba717f9387862a55df4c76f17b202ea0b433a75233e49ba64b58b22103a6b91f2aa60226bcc70c60c8d8b00a260217e4e0e99782dcc80ef336dd5f022cc6fa3 SHA512 2419429dd23db866334754f36d0cf7848f21cc41dedf4c567c5ba10b447d60b2983fa0e7cc0e9a17db267cbc5904deeb515e0189e78a5db9281c73a8e9dc0d5a
-DIST thunderbird-102.3.2-sk.xpi 718946 BLAKE2B f9b544fd61692b2b18d8e33d0006c188cb1471c4b634eaaaed59417e06f9ac5aac1e07fb66166d68cf268f3fc9a57726d515eabac00205939166b56084356a17 SHA512 db603812c0d12bb7d3090b676fbe4e1b4612aad0b8df90cd15405f07f5da249e6fb03e567295980a16c050028fb90f34bfb5efc5e490ce44113cdbfefb24192b
-DIST thunderbird-102.3.2-sl.xpi 684477 BLAKE2B e0c4d2b2f7218e8c27b0d6786b3b66583864cc4d27222581a0bd9eadac0703dd5e83ecdd989dc701739b3e130d9c481cca8ec86429402cbeb6d4eb94df78f50a SHA512 4c32b07f4802ca1d55a48adf2e30e002e87ae3d50d30e37d44e50c6bec5be631c9864c907e8c9a481ecad60bcb0300a9de6e6ec199a35b1437319cab675e3bca
-DIST thunderbird-102.3.2-sq.xpi 692095 BLAKE2B ca811e623092ce356774da084d1cd2ce77616bfb5aab5b1565d534b3295777d1268c61de4c368c966d1474e54592a47e224df16a786974a944e398467766dca1 SHA512 8a6ee02cbb5641820e4dad6620124177de0fa64943d138161493632f9e70a53b21167967f1cb3c04993a9e25029864bb49b835d00e0cf9374fd07d1d2927d08f
-DIST thunderbird-102.3.2-sr.xpi 704614 BLAKE2B 2838753b4e23f7bd0421950e11b11acf25f48db920fbb391e9a1a661ea621ebfbaab87e5c0a04be124b016465d1ad44ed56b17c7fa80f8b6498c74c9e29c311e SHA512 2944086637949d19ca0961b67b2e6fc353ffd5d463f30f2cdd022676eb2704efc9465890e03955e9ade9bc1bdd7b744677853a80f3353d3a17cd0a9bf3ece0c6
-DIST thunderbird-102.3.2-sv-SE.xpi 687165 BLAKE2B 18591140fd748706f2e91d142b8c8dbed99f7b30b26e75caab39b92207e2890792200d89269d609d5bdb565d0d94ff074d715c4702c405a5caf214706911c4d3 SHA512 6f95e4238739c0cdf80754892ec0f72e083e5a6253a6366de6173454936a99c1145bd12ceeb02816fe63944037c27a21bde2085e5b0fd094199530687a72df0d
-DIST thunderbird-102.3.2-th.xpi 737390 BLAKE2B adbd728fdfc9c9bd3113a05cfd578bdef3f4ecf1c30537456db6b06707ca5bfb0adab9597bf445f2e80801b21e87c93e0caf6683ff098a2c269cf74f0dbe7b27 SHA512 7e784f8757050383b899df951da1dbc3d50ceac30e34d06774fb0878e22c2b711562b5d07a15b84c6e5dbc7494d0bc3eaff9cdf88f29109e18ed6ba77a1d597e
-DIST thunderbird-102.3.2-tr.xpi 697911 BLAKE2B 73f49003099f3d3d703c41df8b83dfd6fe150608a60ecc7c667621f91ede4faa093552a4db70ea03043794652c32050fc086acf4c2d8ec5df5c4c3c0210cfc87 SHA512 9277a92ef131b4cf2a078356ec570585444def67555e3e3a81e2874432a2add98debb2019fbcc17c65219e3d600a5cc2033d9be8f50cdda68d3af3544bb116a8
-DIST thunderbird-102.3.2-uk.xpi 794504 BLAKE2B 0c838a48d27f85025a1c070115dfbb9568eba096e01e277fccb4b2c0b95919453bed6da1906d9e9e7eab362793b6bac64ec0f4e0137ca6855edc5ef16946153b SHA512 8dcb7e059ca023a466bbd4f74a6eae787390dea9056df7450a9ffa06044bab18477702ab8f769a043999802dc3631740b8373d74c8b69dd4d163714426e64cc4
-DIST thunderbird-102.3.2-uz.xpi 588029 BLAKE2B 3582251ed9d2682a90e51e998b7f1f02b1e4fd2b599bcd8e1d3da601ef2b9ba04830b96aec7153eb1dea4b07f747e173f9da0421208b9b976ed1ffeb670beb27 SHA512 87866d48b87c39a6be71eb5b8cb2ca0206f7951fed580614087f2168b215317aadd148057520d86c871c824ddc968ca537bd0279356bbc97b4145a64e30186af
-DIST thunderbird-102.3.2-vi.xpi 725409 BLAKE2B cacf3c086077c13767fcd690abb324c026008224f4a7e514c9d4ba4e9d58ccfbea1eb0d50bccfe214d7c283de4c18d2bf5a67d1dd8c50720dbfba5deacfbacf7 SHA512 91fdc61353fac5e7f094db40cda9d84fbef105fad60e2616575cb93b7a37cddebaa0030ea5487394095d46c7a640c73ba7a645a9d7ee622fd92be47d809869a4
-DIST thunderbird-102.3.2-zh-CN.xpi 724290 BLAKE2B af8278ebdd50b3ef7db42c70d374797b73dc02697c28d76e4f3e58d403b92f12d47299583e2409b3d55133072281c0ba9cf79f8254ce3b4de807e32d8d6e600b SHA512 da1bc2160e201b36ec7980f7937fa1991bb40a92a6d9850205d97ea881c95f4cd0d3ecc7d2ac97137b6e882cb606899e48fc5ce261a7145fd0f25f9307ea474c
-DIST thunderbird-102.3.2-zh-TW.xpi 727975 BLAKE2B a6580f53529165b401a9bc4d665d0b0deb4108531ba298fdfef4c52208632dd47eb9ebac923599144abe586c06d0492b34027fbe6bd543aa92626dcb8c17d9d4 SHA512 370d80ef21fd1c143ad47d8657d23288e375b62b00a28042d145a63ef190ac8cb60c68bb503b556db06923049a104a56eab9b3732887f160ef4423ad6ffd7399
-DIST thunderbird-102.3.2.source.tar.xz 500105016 BLAKE2B e09c854dc9e3aa68a08f8e76fa436e69c3b48a7f4ba4fd49902b0e5be93a8f6d68210d5bec8fd0de95bbbb7c4d6e3054dda583cb51c488756a1d213f6f415393 SHA512 e10b0322293a723c5683231e4337b1c3a214c064bbcc7f569c111c4ace42e74ddc312f2f30a260020dac48e44662f093538fab935a78ee0f6fc4a2a70488f74a
-DIST thunderbird-102.3.3-af.xpi 551914 BLAKE2B b45e147fd3e2917bf9d5188c88aaa4a7567a97de86262cb780f566eacff409ea60cc7330263490f91b0adbbd9b2d265ef4937f162d88e2680f66e4ff4c77f98d SHA512 48b815d40572a261267536e49e2dbcd488536d2b884071bad9138ca81cbacee34881c17649df919794343ad7169c91de56a3fdf66cca0f998c100af26bc30055
-DIST thunderbird-102.3.3-ar.xpi 656148 BLAKE2B 32326ccb11e64e76f9d2eb0cf62ad3662cc331860c40f1ef1585c9bb212a23571b47fd7e25b36c12482c64bad4184282dd5e4d2e08c80e44cffeca1a50551f2f SHA512 10d9d36db74833c4167a6b403a39bb7db471edc141440632f7ab5dedc6dc8ae8ef2f1ebb814dabfe28196426a8acd37ebe182a90af5e5ee5f62f8e7fc4777a12
-DIST thunderbird-102.3.3-ast.xpi 564832 BLAKE2B 5be1aacf8a08dde4d5ac308b8f4e94c78ab021b9c763c88ab1397e4b6ca356eb5bb3ae6e9835fdfa133273ced9c10fd90d3e11a492a33842bc261e9444346cb0 SHA512 3d4b080ff8150d7b3576f09e4df65c530d59dac098fb3f1678c5fbe3206d345612112f82c84e99b7f49e914263243b1ed0b2b21e7c67b25317697ed14dce22e6
-DIST thunderbird-102.3.3-be.xpi 686677 BLAKE2B 9298b60670c913221d6c50b37b9b20075a6fad59cc516a7702a424aa3b0dd3d85c933948bfe90ce3130e90e4d2f25f765b539746fed53dcb1b16a77bf4c77604 SHA512 3c7ba4b4f02b9a95a08bcfab79c9d2a0568bcc06a1e5663d8e35f6ca391ad613dbb11bb1ab7f93a715363df7b28e8d9d984de8d3a2d5f10be8fa9d258fc21667
-DIST thunderbird-102.3.3-bg.xpi 682265 BLAKE2B c314d1ca411b818864f14eb0897ab2f5152dc7e5d28858509b5a70674b8b515ecf4298511df0f627df0365f2919fb4c9a22a929170e176ec0ae26d290b49e8dd SHA512 4ee20e692b91fa55bad268c73d7eef01465148dfa5e02f38c043ff9d5b7217398593666aca2b2fc838a521298aa6a39942a88e5dae43a4180de2a2174dbdd090
-DIST thunderbird-102.3.3-br.xpi 615114 BLAKE2B c12af2a5d74dfb585eecedb7de71b15159d72e13786868d27f8ef08a6b2de2c44dd127b0d23f966c56ffffb5c597d0b463de2a6b211e8bcd207d8958ede79f8a SHA512 2c90b0b6cc065f2bda52cd66a4245588f7eddca23972e8200ab138f735a04654b507f667cefd0a72bf6cfaefc1dbbf55a0bd7197005a3c4ffd67f03cefa2f044
-DIST thunderbird-102.3.3-ca.xpi 636171 BLAKE2B f6b11c32f1c74e18ae0614c3ab4e0813316f7650acc61712d7c826cad5ed2e0fba460424c8d056c67938777f3b5d718c198391b02e73e0b22bfb9bdae1ade38f SHA512 56e8ef2e778d2a71354d126dfd98ac6dfe251d49e3d2c5c5b83c5478369d71076dc8226e83b7035e5338776cd63e1a9989707a71cee85088dbb9c0fc6eecc785
-DIST thunderbird-102.3.3-cak.xpi 641840 BLAKE2B 551f13ab7cbd1d4d5409b19858f591b70bf1da2a6ef0d052b41cb1780217bc3cb811967bd3a6877f34248454301e1e129d7128a9894e24ceb8707a320d4674cf SHA512 aa72c09354ab9388f117fc13ec7f22a5fa9389421789d92bfe060782a82837dc6bb42509cfc09cb77b014706f4621947cf7a9f628fa5c5263d50c60a8f8459f1
-DIST thunderbird-102.3.3-cs.xpi 706225 BLAKE2B 894af4fcd5c0bb25e077de55b57d281efe2044b1ef8d5b34bd523a9a58edabd9ad3ada24be4726e590859d52b22cd98d811064c41177116370e4e3c392c9cbfa SHA512 acf528c82129f95b18623062f4a9915e59d17a34444c0779332e409f328f7ca8d856864df4fd5434a84812935c8a9d6dc1b595b8e38f879d278de7557846abd6
-DIST thunderbird-102.3.3-cy.xpi 684714 BLAKE2B b66a03b7b9693666e27f8bc367e429df6a25633c07e2a4e0b9f9e51dbedc3247d95b3385a99aa232af206e56f3cfa8aba8405be3f91fa36996f0bbb04f0b5ba3 SHA512 eeb5ec62a9372052f061604035bc256a946ee9a9504b576dd9580609768e8c9b023789767fc7e2347dfd91549b6996b1bf52b231fd336f3345f8d14146df7783
-DIST thunderbird-102.3.3-da.xpi 670576 BLAKE2B 86583878dc7dc85a75f01d71c0dba6dc55d637000b271ca0c350967f6455dc7f338f5f7abafe89fe7af0c34279a2c1687886e3402aa1d8c03fd8df38777f844b SHA512 8a493bc5dada1dada6e96594669ab1442e2c83619f1de3d6f3ec59c8173a5de9818e28af0680687dbee42d9d1634e5100c7a9ce04c4369b272d647d6144d5a98
-DIST thunderbird-102.3.3-de.xpi 703558 BLAKE2B 3dd69715bfed4f57998db1894161c1731eb3966027a2d250bff3cf3d43f83496e2db8b021c7278ef19d63ea940c1b0f9413db1a961965745b552283fefce28da SHA512 431f54dce4322cfb866895412bde083cbb9200f05ef25f6acf0f76a9dda4b389bd028c1f8a7d46df8ccdd2c83820c1cd3f5dad7c65cb9f6a7f0f9b7ab3c4f173
-DIST thunderbird-102.3.3-dsb.xpi 718467 BLAKE2B 6b543080bedce7f5579c7a95239f62a68041ceb6cda9fef1425d723eb5c00fea941b2e094c0899d696e803f474bcd4757057b23d009053fa7236a181cf1002fd SHA512 25a976bd1ef064717d7ffaf481cad3cfa84c32a8418131cec4a5bc17d5d0e47e9f65893a2f3ce1d6f8280d2c1d84a986d466257e0a7a9ffc1c1be885952854fc
-DIST thunderbird-102.3.3-el.xpi 816314 BLAKE2B a2c9ec3b3907ec037b995569770c87a4c6780a4e6a2ec1a09d5968d2924b64c8e78329df8e5e20c81935df18a89addc768483360c64d40f2d52aaafd9f1e34fd SHA512 5a4ecb1949dc700c1eeeaa00054f3a806af0b0a25a435bb3d0d30660caa6cbed5cd5ed8a609d3bec575fb497d3807fa8c75856c41e8b0c00558a1aeb3ffc6353
-DIST thunderbird-102.3.3-en-CA.xpi 644396 BLAKE2B 4ebe7644adbee98d854a52322808fc803dd66b207428ebbfe13f624ad8a37ac24b687b970c38deb5d6f6909de6037886063f8d587b6b64577b75789922b844da SHA512 edbe6747521bc66266331b4b1d0d7a536e7ecc0eb1452d1984514501b7befd6aa6c5d52f60f1f141f428a8f08d89d112946f86d80be4592a8b29475936328e53
-DIST thunderbird-102.3.3-en-GB.xpi 645396 BLAKE2B 6eec1979ca1e0acaebe3bf52bce006fdbed0133947dc6a14b305c5cf3b65c3182b5a3a0a63c62ec82da84483a5d6a9cb5b712087c8144b24e8a4ebec7b2243d7 SHA512 8723d7f4e2deca7b3cb1713ea34d2bed16535931d4c177aef4215fe2627319eb890c4d706374efc886feea01950dc8ee6dd1f8053ed895ca4ef7297054df1d1e
-DIST thunderbird-102.3.3-es-AR.xpi 695962 BLAKE2B 85fa81ce20aead9fefb79b0a116b87be05f9af2001d7f3f44e1b64e9d819133f3d6b8d9c67e00de53803e08d1b6e8688dea34808086efea94e986d84add4f1f8 SHA512 0a409974a5876104e15bff70b6a9030e589b268d6ffdd8d769184622ba91c82d3753144beb3376edf8bc14f077364c81eda8ab80a5b8b468ff2b1fa51bf2f381
-DIST thunderbird-102.3.3-es-ES.xpi 652044 BLAKE2B db4f5c6485e4cf9d355f26754699cb804e6e36ba84f0cb0b595ae1dc9c81069830252a07ef901570a7eff1e6a2b513653a27407036121889eab9acff3c4bbe1b SHA512 f194f6da15998e7d7bd5c0330928cff19c30898f5892a87be95094eca5335f1be6a37f098ab51b45a0dfe44e5b38704c0b20ca38b7e387af0805b8192e28b8d8
-DIST thunderbird-102.3.3-es-MX.xpi 698651 BLAKE2B 14558656c37fda346a72e46de047929aa68070f914921a1c739281edad7c3d3479765631a9c1009587f4d1af24a2a0e9433b182efe6eea1bfd5d01312f2260d8 SHA512 4be53c80c3dc244e34652b3bbd1c349ec7446d8ca7a6885988ba6cd93f722625eaa3e5c5fee2ce51b4c9e925debe9028169eb3c40c9b6a07b57d9b4e86a0738b
-DIST thunderbird-102.3.3-et.xpi 666813 BLAKE2B 469a08fc36a23457303c6a8b370fb6d3a9c98bbd85dd83e8e4d5174c79af4dda711f3ead902fc470459c699965c222200d5d695888a702fed35ba04b052b3735 SHA512 6afd0294fdc31e1b0d2fecf3bf4c448beab10923e5ceb03ee1a8d9bea1e279e5db0afb5534cb0eaaf11ca10bbaa5d135ce11dc8ae8753840f302ffc699ef0a49
-DIST thunderbird-102.3.3-eu.xpi 680209 BLAKE2B 5ad38b5583cb431fc5f9fd73cf6d8e47ee6417690918849f1b391cbb99baada79b8cdb5906f08c0cb1d1ee9228f991eea074f27ba1fa43cf27d8a77f92064ac4 SHA512 b72d8f831678c66434daee691ab928edfe504ffa33c921959889c08c78f5be6f7fa0ef9466ae3e4a57a585c6f101a401ce747e9f88a34d8ef45df628ed3bc94e
-DIST thunderbird-102.3.3-fi.xpi 673899 BLAKE2B e7a784343794756f3862760de42868112366f3f6db778a4c9cc0d24b571018de2b81391b038e62cf9fddc237a03acca6438554e41771b6eaca0366d77768c0f6 SHA512 db57a415db4c54a3f351855485bea784585ff3102029160f758decf711b9becee2f74eaaa815a97465875ad5b27df39f95b11c95cc2258f8516aa50d74b51b38
-DIST thunderbird-102.3.3-fr.xpi 708765 BLAKE2B 190bf8a74ff62318291bd3d6d01ee360079140e875a6f9ba3a9d5ed06f50d234ab20e22d3fa821172bc8bcbed66c4d2c03f99f5907010cf48ade509ab90a3ab1 SHA512 8064666216e16360606af3744fedcf562d5110238b4aa527a3a7670d8d980d87ddc19a31e3f3ae922c507dd798028746267dd476b42f9af92ee359b034b953bd
-DIST thunderbird-102.3.3-fy-NL.xpi 690680 BLAKE2B 5c8c9a68d74f606e2e863eadb3007a5721083364722436d4a746d53e66b33f7a857a2e5b967fea08beaf8da2073a906b52407249a1d126f0acbacde66127d3f5 SHA512 80f0acebd80a78b1a70304785e0fe489699f69025eec5001750506daf34cd512bff9cb91b7bbc14457fa51e6ea1361762b9b7952b7f97a6841a08ff559cabfe5
-DIST thunderbird-102.3.3-ga-IE.xpi 603096 BLAKE2B 321b72a377f6094c8514d6118b48d54891c0ad0bd884a3a507b3c066392ef4170044af5d4eb7b2dfc29e3fa67017a8dfdc20cc76d04e9647fafe505f1d495048 SHA512 536754659a3bcdcd82203ad63bca8e4b72ec15b95b93af30205fa15a6a54b448da482c02486d18755be6c4d128f44bd5106ac786599c95fac83fe10817c6ad5e
-DIST thunderbird-102.3.3-gd.xpi 632443 BLAKE2B dde7102b9c5783c201d4b08fe6af4e2bd526ee4e4e26af4c9e499a377357b0d25099cfa9cde4ef8b04149a03e57de682ec7e98b8a5c60d4a1b9005cee651f652 SHA512 608e2d52263b777e00d4f750753ccfdf4afa9f794c2553e986e748213757a98a12ee54e7c6bc875cbe1b5563d425de377f125ca9a504388081439fc1e140f853
-DIST thunderbird-102.3.3-gl.xpi 663207 BLAKE2B 99c86d4d2cfd2f5e21f4a164dafd23086ed350899d809303ed2525fd6e66d5f26f28a31d8162aef0d1bb312c312cfe9e2ca660a93b92b36d7596cf812da9abf6 SHA512 7f133956b90b3021dc08e000d0fbc80115aab2b83be94a88610e32bfaad7ad1eb80e45a1f649af7d4afc3f18196087150cf47abec72f08939b8984a7880a6906
-DIST thunderbird-102.3.3-he.xpi 662888 BLAKE2B c8d232a0aa4560b25ca61140d8326ea24f1cb32f81b0c88f5be1262c571540381da184267bd08bcf9093a9907edb23b5672f8363bd20824f920d8ebd85c5e91b SHA512 41314ef5035a26cf17a87af7fd20773f7dc1fdc6cb46d379782975cb5092d8a4bda592d1ae3060c9d109e169cce1dc639578c0f0ca053a2d192b0fb31b9a280d
-DIST thunderbird-102.3.3-hr.xpi 661111 BLAKE2B 7e21e41f83335d1948c04666f84796b99bd754bf150a9dfe552e54ac4e6b65c895825cffea1075e1eb3d02a87faf31c73d68914270a26c2ae0037b8830894a18 SHA512 38ff0cf101c888d94cb486f5b343e1a437723a2edaf5cc70971ac85e3a2a70a15ff89875c0d41eb9f9291556b44f1819734ede52ff097d3b67ac8e3b75b8f49d
-DIST thunderbird-102.3.3-hsb.xpi 715751 BLAKE2B 831d0e99f3fbb1c5cb4ad38c857b61c98fafac55e5b18fb96565ab68e0a220c5950be10c6f515c096aec7d8a1e7bc0a0e9a31818424703cbbe0efb79c462d862 SHA512 8354909ced8c7e3fe703cce4f28d1666dd325f2e5a76a9617c7b96e55aba3be176db4ac1da9991f2a28174dd1ae2c58c48e370637d85ca196afdbc5d12335866
-DIST thunderbird-102.3.3-hu.xpi 718783 BLAKE2B b923fe975165df1ac4e7cd4f4cb10c4cf46266b5fb2d0278a4e4ad614303381779de6773a0f08568a20e3df7c525e9629fe3120a8c23e2891b3f6f9ea71799a1 SHA512 c2815864a7e62a8006648f3fb3e63a8f071e22c2fb6bae2f9a019b481b3d9722c1d5bdc2138cf8a43b9ffb268d05d51329a374040ff0204a9158fda58968f4b8
-DIST thunderbird-102.3.3-id.xpi 639538 BLAKE2B 82339acf56659544b0aef6c4e9ffb4b5c3c84b2201bb9b288cb3f7633b3687053e2810d77fbebba36640e3ae4f48dcd8714479828473a407de463670b1159e3e SHA512 f8ebaaa26efa37c74d9a04561b7da3559dbb82eb7dae725019468eeeefa078596011cebe1e0bd18b87a0d6bb49ffd029086667ea38e0eb6d788d87e7b116e63d
-DIST thunderbird-102.3.3-is.xpi 685614 BLAKE2B 4523de5150d21aff3f8a8f12198aa3e3a8b1c385a4ee9cb95cb851d92b9b046003fcee855ea388b7fe5d211c19e4290b3de308a49dd6de2b26f13c6ec1ac9ecd SHA512 4d74af459130fd87cb0ab009f5463cc98169c898acdc0501139efef6f07f38a0695b1760e3749a2838304d42ada63bb5218eddcd9aea6a02b3b57d8cfb9271b4
-DIST thunderbird-102.3.3-it.xpi 617778 BLAKE2B 8c44c64eaf7134da1194e85329027493061beafacd160729b935beee05d7100bd5274a6e8cfe7195301349ebe2a72fe4e1b0718048ecab0261cb1771f5b8aae1 SHA512 bb2a11b341964ed81e40ec1316523efaed89d3b796eb822479c1b78df1d0b533d0a843ebab01a69a12359b39d7faae94575bbf4ef6b94eee5741cddeb6df2f0a
-DIST thunderbird-102.3.3-ja.xpi 755142 BLAKE2B 6426ff212f0ab0094140616368fd0ac6ea997d244c34a1f5e2f1cd1424915fcd4b2f13a34adf98ef0a34087b00a1acb298bfba5fd71de6ca570fb8ce5b5c6663 SHA512 5fabe66b296567f017b1a700a1d698f64b466624d5d59288a4ae2e785905ca7c9b9ebe551da1acb4d752159bedf8b239495ebfcea9a9b85781f969ef919b26c2
-DIST thunderbird-102.3.3-ka.xpi 752975 BLAKE2B 61f208d4d8734ce49eb9244b6fb4280dfa6449a969e5f9fc3406eb1a7e13463d13bc93d05f76f20d883d231d112bdf8a96bfd4945456599330efee5f8aaff953 SHA512 c0c401353fa1c20def0510248ea92856d1b095384af51c2d94448c251f2b43d6d278313387da1fb086fa91327379f7acb96db14fab7b377e12d3d8eca7455bca
-DIST thunderbird-102.3.3-kab.xpi 688569 BLAKE2B 33089a39c255d60a3d94b5765842f3cd74c9a8e160653a869e1705b8b8c32c7691a0de7b09a9601463034eae37cb46bfb738a249bbc211be3dd7259f48e59077 SHA512 5f66cfc3556198fb7b43a11cb66cc4ca9801ca8a89bd57ada09fadfe2502f089c4e973dc029342b5ea11a07371ce1c9d38e945f778cefa35fb1bda603cb6a1c9
-DIST thunderbird-102.3.3-kk.xpi 731940 BLAKE2B e079f428cac0c9d599d9ab275b236a8aef7e6e59608473844875761edf0fb3faa1dee39ad3cb73d69e6ed90c6b3d7b5f5b3aeb2b24388d237248facce820e2ca SHA512 65a338801833e3d062511458976ea28d0d994ec961870464434c62c17fea917be966e894d1a22d2959bac38a5769f29459a687cbce9db23cc0ecde7a002a1270
-DIST thunderbird-102.3.3-ko.xpi 692940 BLAKE2B 94fa8d71e733440668c38be0697893bfb19fc59593d5f86c2c63814e72bfb712f9bebb6cf9efcc60344723df94840b7808fa973d6d52994d78a879b2da32fb66 SHA512 c254b873dadbb8ec23064a5c5542357ca5aaeaa45098a8b2eb0759a6b64336f28dd8051adba93cbe37f0c9bab0e91c3a007fb34802e06ef7f4f42eaa5714cf43
-DIST thunderbird-102.3.3-lt.xpi 680718 BLAKE2B 07b4b685a78a2a1bddf5c621eb23bc154aaaf6c01fceb3421a14106fd0c7d8c264ca63a89309be0af15d2c14d5547f53bff89f399b95ebef6b7f6d1d9d51c3e4 SHA512 7b342d35f2d384c35000146a65a4db879e92f90563ee3d0d9d3d91492da46e16b165e44d9fa5dd2e562e18ea81d1a7ad3c8002d759cfbcca311157133c8281d8
-DIST thunderbird-102.3.3-lv.xpi 608588 BLAKE2B 619a7f8d0407367fc50f1cc350bce6d350289cf0975cf21cef526c9d173bca8136804d333e6d2540c18d5065c90270121a369311ceed3c89ecbe9b3b345fb3a9 SHA512 a4441bcf714e953a4da6428037fa645704e35032d383d83d59c4da436c5106928c49b22d9d2d6efc0fb6a8cf4132c5a6d716f80df17eb24ed824923d57992dd6
-DIST thunderbird-102.3.3-ms.xpi 568528 BLAKE2B 31a5870ebf869726a582fd49d86240c5c5efd7564872185f797e190a4ffda1b3e1d569142c2b920a379332df2d43b19250753d07f2c56742aa1778c9fa28e97b SHA512 464935c2e6ab93b75af64465e30f7145ee8d807cc753c9092a91905f9c4d6ac7d033b68a83a65237a4474def24b8bb4b97072f7ae05433d239a3367e6a517c1f
-DIST thunderbird-102.3.3-nb-NO.xpi 648581 BLAKE2B 1d5194124c9b3c2ddde70e200ad8e3a25bf8b64aceee2a898dc64721378103be24f9ca713196309d0f9b0697d827f64e0bc3117e736baaef0d7754a8798502f1 SHA512 53bd453e8cf1fcc75afe6d040d0bca8752fa6927de95efffeb071eaa4c17ab712f546aa0f0e26326bdf2b2b72eef567378c1ad2ed7da404294b21553c431471e
-DIST thunderbird-102.3.3-nl.xpi 682267 BLAKE2B 44a6a5543538b1bfeac91ebf9fa7099049efcb03272592f8d7d0a550efc502bce6e81a833293f072fec7a9152ccb0ff09b878e2a255b2d825a4de45a1670a8a0 SHA512 16a62c37562086f83eebf03add12a233d311f02c32f4da75ad061ba1d05feda341811c241958edb535bd636b90146a4112bac48e9b31c04a5595ec638dbe8a5e
-DIST thunderbird-102.3.3-nn-NO.xpi 656904 BLAKE2B f469e64b979d36e2446c3c3dd814d37064bd83dbe833c0ba96d5e2ca4f4007552b400dda655fda20ee61040283f802ca9912fbe8acee28ef0c730d1c520e43ae SHA512 1b36f8d11de3defecf8b5578ff690f9de6e12f70612ed1737726db4786d37fb9b63bbe8ab3418f8e79b8b974cbf2e7f6755091f6c92671ea6b21b4df7034fbb6
-DIST thunderbird-102.3.3-pa-IN.xpi 654092 BLAKE2B 9b0e358adca76f1568f332e5ed95949e00ec24e051e0ff4bfcad8a55de14fb2e88f47d11b2cbe96f45a6864aa8594ff4db5c39245290dcc9ed960d5034f503d1 SHA512 18ea82aa3d5e4e7a24e68a879510c6402c1eafe94495eb6b42ae69783f0a0eb29ef013a76081b7e2b1c507c5311aee285882c3fccf44273a9ded6dd9ed64d8ef
-DIST thunderbird-102.3.3-pl.xpi 695416 BLAKE2B 0246539c62ce221404bc084a8d6c32a8b15355c84bd6eeccc44d93eb0819988607454e6a4268b2c7943b987574072071780cff07439b2d2d5951b7ecb0139925 SHA512 85fe0049465c56190e8bea9f2aa8e02e2dc361761575b087e995d18cf67c19ba49653b0edd78234bb3b2408e4816591472bae10b22087f56181cde1de3fb465a
-DIST thunderbird-102.3.3-pt-BR.xpi 690286 BLAKE2B d581fb0753fafdc9652fdf8babd597f81c7f5a367f97859ba4927c896319e2ab901b462a681f889f7235db358f36c22e848d561d4cec65066ea4a7241afb620f SHA512 b7592740e3b1bae397ad5d63db9fe5ff2ed19e436f7b4f3cf491a0a580eced8bb3c97b34dabd6eacc53ef865ca841a21727f478d6699792a63cd9882f0f455f8
-DIST thunderbird-102.3.3-pt-PT.xpi 666877 BLAKE2B 7df4350845b657cc257d6cd0f8305abed9015c9ff1c70faa16b508f0154023e819bf8ecd3ad7b51909507d8f9a6d648f2cd368ebaa5b0f28e467d6d7f90ea897 SHA512 e2a874a1bdebda736329f42881dc2f1d17ca594c28835523655974df0d23f7de37b434aa91b38b5017d90b5b0a0bc326486dca9def29d3efe2e87f109f27507a
-DIST thunderbird-102.3.3-rm.xpi 686109 BLAKE2B 6a822f56a7a9e524d36dd893d38bc6d92f2a9febf91492db911f061b70b885a87fcc4f37412df95ff96bf6bd435ebf55d625cbe5b6e175ce4071b0a44372126d SHA512 152f7331262e292b9b55942f4541dc9d6c7e12be2599620f19cbb8fb0ea999bc7c6e3f10019db5a18527533811fb457d6aa476e894ae1b75b448a1b7cef8f03a
-DIST thunderbird-102.3.3-ro.xpi 651332 BLAKE2B 2f74a500e1f161dfbb537be961e2e2287258020beae303f6810ea215420f96f76f317935996e22e8f63fd9a64a14b28232e04c46e6c732042a137a35a783d778 SHA512 0fbe6e0da0580d98a25b928f45a8ee76fb84775b2173ada96d9854172609fbe2fad210cf87de0b5b437b9084717a75ed6c335b57f6d6445a88f9fd942666a705
-DIST thunderbird-102.3.3-ru.xpi 801783 BLAKE2B 3ca4bc0be7025f2b603236b8aa2efb0f990ec1b71b2f20f86617e80c75de0e275ffbdf1f729257bb3dee326cc0fd611901d9663700026cac9115eb718dc81f01 SHA512 e1d4f680038a98612de612c5209ebc30acedfab17ff28b19d79e5ea8f72701cb22bd5d3568e6925d452cd0bfb86c090a7b4faf1e9aed279ffea7f8c530abac9b
-DIST thunderbird-102.3.3-sk.xpi 718252 BLAKE2B d16983156199581bf176825a1f5831df72f9a879da81412502472cf2e0a849f9f737f2182dd23b98b02007b92ac8306fe2d245aa1b13520c666e7213eccec9a3 SHA512 d5a27037fe309f84bb38a30be01fa337612c7c41a6216528b441b8f586b62cf0af71f15bbbca391397d542537d58a52a8fd4342d564590de8ac28908142b764e
-DIST thunderbird-102.3.3-sl.xpi 683686 BLAKE2B ce660f97e8c3ec2a349c199c87a9b32566d197cf7c58377af29f41f98539445180e8174ea837ab8507b8ec34d595b7f12e19c13c4e5ee8fc8f3a6b7ba99a54c4 SHA512 302de72a255de678664922841c56229109ed9967753987f84daf4052152d53a850ca8ebf25d4a5464cd0942daa9ad72e4bcfd7ff969543c1b7d96e76de59febf
-DIST thunderbird-102.3.3-sq.xpi 690224 BLAKE2B 91f154899f1d630d5414ca3353ade64294064efddbb84dcc997633959c8f38d31d004c816becfc3b3c65df2f5c2c16c5408f7433c155bba788b550a4cd616295 SHA512 4c17aae68a153335e16923901efc1e224adca0f2e571127bdaaa4ccb05df881c01833ce1a1ca65d8ef2eb479fee28024c7ca259f2852c3dd8002793b011787d4
-DIST thunderbird-102.3.3-sr.xpi 705269 BLAKE2B d2651f2d2ed2fa406265cd385b0f7aabcbaf0b7dda3f87208ca277443b56f64de0cbfba65e748c685593aa6e88aea1a5d1a601bc0063f4677c41bbbbdd7ce6d8 SHA512 4e2f99e331bc69dd5463d16f59d6f9707631b7ad55646c8210e00f864e0d9ce54ec6acec036f333193d04a174ffdc08ed65649f7d7cfee250039b37477d2a61f
-DIST thunderbird-102.3.3-sv-SE.xpi 685683 BLAKE2B fa99325bb386c177f8c9b902fbedfafce10c23bdb8aea93fb7b3d952901e074583e5651be386836b8b3783bc6e0d15b7ca8951cf370d8e5832fda018d20503f3 SHA512 8d2f378ef1f6f2b9ba47acc55d17db23382ad51e7cae07d39144f0e446da3a2ff326cfdcc9dc76fdbfd34b92e0225506d0a0628ef86ad4226d3d86cd5d60f9bf
-DIST thunderbird-102.3.3-th.xpi 734539 BLAKE2B f6b858285d72e6babe56d2736f793c8ff4bfa7bfcb790fb15b7973f71a216276d24b2c511510a162332806f395ed92c72d44d8411e62d4abd1e82d2204db73da SHA512 6231a8554379dd2a0f5d8026ee7e2ec4d94c8b18f839d3cff3784f4700a8262a16d0a6ea941313a853eb4c4513f3fc926fe08272bb03045eff245be5722a4c20
-DIST thunderbird-102.3.3-tr.xpi 697055 BLAKE2B 93ded0c99553abce0f70b7eee9ae1c609a7845e4d9c92f423f43ce10dcc56cd5eb7cb237d351334c0a6d73d86baab9eb7a609c7969c569dbb3cf52c3efd35eef SHA512 c1ea088b93e88194b8c899fbb0d8a9db8cd1d56cfd94c06725648d8882253e832c5f3f9c56395d8b78eefd37ef3e058cbee969e609ae695e40e3596e2575f714
-DIST thunderbird-102.3.3-uk.xpi 794404 BLAKE2B 5daa954b989c5302b1d1b83e23d18ed85bee025c2a015804263b25c31b66b1c0f2c0b99927f405648fd3f60377262f28dfb4b8e772e6e3fc997e10c68ab334c1 SHA512 d1464684f3281dc5b44c56fb39266c0724d24a1b90cedf8a0f02e106aaee268bd27824653a387ae9835a12501dfadb56b9e74e3890de725684fb3d30e22b13d2
-DIST thunderbird-102.3.3-uz.xpi 585350 BLAKE2B 01fc2d181b3fd27abf042db1f0ea7d4bb8553abcdf970f4c37894bb724630780267343a91724431c7e216f7fb362828582a418a5409e511202e447e4f6f1ad68 SHA512 ed50753badd0b588348f56d651e863d92ff52aac759ad919fe75a36fa26ebbaa42b2c916757b150fe3a1b775547486ab800a239381a6939c0c071ad493516b5e
-DIST thunderbird-102.3.3-vi.xpi 724846 BLAKE2B 8bb5dfd792edbc8e5d60c9122a2a3c0d003aedfd37667001fa902743c61b5abe0c1a7a36a6906bdd02b47876d4bb1f0b5a4a8356a0ca72a52a6ee473aa22da3c SHA512 00f91b0cf8e77c8d6582462edf6eed069b5be8ace290e0ad6ec6ab9d0998c5712db82354f42b363b3cee41d3b2e386cd14a8828e6556dc391166faf05230324a
-DIST thunderbird-102.3.3-zh-CN.xpi 722696 BLAKE2B 8d8ed51ef4302f790628eb8a5971125aaaab1476efdd20e5380dea9feba46de30800f61ee9d14f46db6e134651918e6399ac364285bc2977c46f1aafc1fe5889 SHA512 7360f3cb3ec5ff68ffd49bb9051a44b66ab082767bcd2f699a3ad3c8eb5226f3a03f7ece672654785d40599e401b92f6be533b1ab1b39036da8f318230a19e90
-DIST thunderbird-102.3.3-zh-TW.xpi 725967 BLAKE2B 5c36662e1156c86da6e3ab1493d53a0a9191294964791c56d7e6d8fdf46b2cef3211444174e6624715dc197d22bd6aeacfcbd0cd52d99fbd083bb5421059119e SHA512 de7e4373513b95f131eea4d48795d9d5260499a95237af275440e43c9873eec45eef665a89251dc61d4f25d307f6e96130531398342d7afedafdc59dfffaf3a0
-DIST thunderbird-102.3.3.source.tar.xz 504792532 BLAKE2B bf6697e959325d4ab6aa6e9d0d86935ee8e8970e43372a748947842cdbb3227b6aff5c78a073a40f7fe9893d6503ab499c80033d253b3656d4175e2d9d70c2b5 SHA512 37027f251513885d1432ee8cbe0fb2b4cb3c95b0ce88bd35f207cd7a4552d6700a63d13e0542712f796d46be6cfc165d6d1c224b30a445be7f5058fc396655fe
 DIST thunderbird-102.4.0-af.xpi 551915 BLAKE2B 13681d8aac920cc3295760e3ae21717d8fa67c35557216c70044b0e0d53515985e7a1c1508199149d34ea1dc6d0fe209091da3a30e1f0f9654b7c9ee607cd44a SHA512 960d9abcb20ce01ad1156c0851e8911f20de7de6e81968f85eeffadec76a1e322c7072b098f8001f0f9f252ccd5079efbec1d4ca41bcd2c5202982e3d7590b99
 DIST thunderbird-102.4.0-ar.xpi 656148 BLAKE2B 9e83046403ddbb6701efa85da7c9492e852bc61bbf67287447c51a57d48934fa7e1111147ddef881b40eecbfb1da30c0d28cc9f215e210defdef583bed515936 SHA512 3ad66f30160bb1ec4d881849e96e511cfd71cda4b1b5d559bcec5e4268085e2c6fad30b7a7ce276b9e01cc70193bdc097e0870538c60ff3c4d86e8e23735b9b4
 DIST thunderbird-102.4.0-ast.xpi 564832 BLAKE2B 83e12d4c8de9ef10bd5801ba54e2c37c718303f204bb730f99a3769b0931a62144d17fb699a24baffb3b16ca506638074a3d1f586f6c128f1874d70bf2d50ce2 SHA512 f07d7aa6d5c809506a10ddd79d1542045f4d222eca7ec5889a06ce539e10a291b8fae89cb500476a8945c2d2a093e102e08fe56cb27e9211ddd2780805a429f6
@@ -266,73 +70,5 @@ DIST thunderbird-102.4.0-vi.xpi 724847 BLAKE2B 66c99673ec9b66a4fd3d0820e2f853a40
 DIST thunderbird-102.4.0-zh-CN.xpi 722697 BLAKE2B 464fff02ab6dcfb8c21e10162883ab76dcf9b6fc67e750be6603c17c17ef54620bfa4d75d9f81a4ceabd8816095754ccf26f5bd8e3e15092a3b917c4df861b3e SHA512 93dc589af87444651e29c1208d4c3e301b0eb73fb03d2ae927620c5c3f36763695e28a5cf7fc15b88a111148a8b86a47de8002955cfa32e62af60c9beff4a45a
 DIST thunderbird-102.4.0-zh-TW.xpi 725967 BLAKE2B ffe45ffff1b2564b6882afd85fb86ed3819bb06aaccf84597b0809be8b6a65adfb307c5c7ca0e3f5d095e12da2b8d80f1b4fe97022604048dd3da7ac106cda61 SHA512 de6327c2a9059a89768c72ada5f62d6d1dbc5b48c824702aa0ed8d4ef29797a4f5d2d1045dfe0973316190330ebefd512b791d01d3c67c591f994df053fcb944
 DIST thunderbird-102.4.0.source.tar.xz 508467296 BLAKE2B 3831504f898a8ff1625ca352f4257b3d0a6debe54eaf81f8f46e74aeb2d6f8b6d7a354127872c860e75ad41c0860c116ed074f7950324e05a01a98ba88f79f12 SHA512 e2ce59eefb0c4df3eb20af01af2b7ad78a09e0fbac7bcc8800538d6655ca63a5d132c0700e2465654cc707a50aee01c62df0532f2c53b5f11c2d3a7ca881d8f0
-DIST thunderbird-91.13.1-af.xpi 561879 BLAKE2B b3b2f9303e0540dc258fe2a9653a4283ca88645edd7717d3fa885cb3b79cc428b281e53d86862c6a4a78ff0609670749090ef637481f230ca8445686a33beaf4 SHA512 c3eb26d200ef6d121299e041b69d82951b1fdaf40eb409d002e2bec4082f501284463020c7cdb486775062fd5d71b791093c9a188276e51c2287b95043250013
-DIST thunderbird-91.13.1-ar.xpi 665731 BLAKE2B 4a82e82a241b00e501d4558f13f021c87d8f90403bae36705bdce155b2f90aca1c8eac98be4c443da06bd62253d6805be5011025b0f61343d5f5e949ddbd0905 SHA512 03792643d2fd90ab3f33b065e9078882c607293bc674e44e4960635e946de8bf5843261528c70a8cf04218386b8058d83b9d3a952115bed5883931bac36b3feb
-DIST thunderbird-91.13.1-ast.xpi 580512 BLAKE2B 660ddd94462b403d82a3b26b4e89e515c33a3467bb978da0cbcb6fbbfad45986a99f83d93d6cdff67ae2e187ab4442821f82dbb2ab4a864291afce7aeb681359 SHA512 1ba13cd42b30bfcbd1966e30c274eb790b5f9b92d6705f06d607d6a38460cef9ef1f4fe873a8560413a86cd3a7186461a1d953332c3cfc4a80d47afc260b1124
-DIST thunderbird-91.13.1-be.xpi 695198 BLAKE2B e00db126092d94b9f92721c284165bc8dea3ad8bd26119848daa30773e0aa2e2ba87565a2c540ab48da544ead5002e45ab0e85dee597c6a57a322b95f7624e81 SHA512 c957153b423624b903db6afb7d0f99c48db2497726e14bd703579a982f6257cb3ca5c037c35c65f2c58cfab793164229da5f1f8f7365c770ef85a98a8bff7c55
-DIST thunderbird-91.13.1-bg.xpi 690996 BLAKE2B 0044c883bf838e96762e6087c4c3736efd4b675c71720b3630bcaad517c895c9c8fa4e1d15716d77f8db276fd7263037a40530ac2c42ee752b8dd9a6f0d25332 SHA512 a84ae392e122b9d16ed34274a8b44e9bedaa6878f908f255e5cec5fef87509874587c1048efb24172345f7e438071108b3cd4ddd112c89c0d41b45e853c023f6
-DIST thunderbird-91.13.1-br.xpi 620588 BLAKE2B 5a17895dee441441199fb6c372287446c09eeed6b8bc9d39ce00654bbe9d6bda9b95f5508f437175fa6ad203208d79a6e75291f0ff65955d81af1ec58f0ccf8b SHA512 69fcbcb4b69cf3dfc4fea428454e0a1a7ff58b0b607ebef8360e27477f65e174ad72488136d4391a0646c03b541d8c1e958ab12f2104ebad1b3b9907af1ede4d
-DIST thunderbird-91.13.1-ca.xpi 645975 BLAKE2B 6d1ed9c1707d4af96dae8d6d6a282103ef41db6e2ffa9a6851e3058b1a15ade6b276060146a7f0e03951babb289982ec19fb634337e69caa7fff8a99300195ef SHA512 79d45c9b72e4e64516ac7a425aec22cf10bd9eaa407a4293d52f5638ceffe376c49f0afd4ef3321c4d4ab955f59d13b94741335e0b583db6b84adbfd5600a44f
-DIST thunderbird-91.13.1-cak.xpi 652065 BLAKE2B bc4370fed4a2a553e57379f6be689ab47eade81e9aaddd1d84c0a0e25904236cb5212cf5600ba4778dd623d5ea1913abffd6017475d1332309b5e2960dd972d4 SHA512 823770d16138a59393a5e25e57a50b8e5158927d138b553b6a73c6671a77fcceac6429b2806172634d5409c6f779738b8d135191bb4d089b46b67fedce6def67
-DIST thunderbird-91.13.1-cs.xpi 711936 BLAKE2B ba966468ba446277109a330ce96e5da9ebed13763c158fd8f0fccb65d99aff60908795c30bd0fc657a4326b4bedeb1a4cea536d61812f42a0b91598bf522867e SHA512 e48443fab4a8be056ac15b6246cf6ee3e55465a09efae728d1087698201b56b2abc318ec65d7aab7d5a65f011825d38bb2ba105167d1e2a2852cd1a48861310d
-DIST thunderbird-91.13.1-cy.xpi 688889 BLAKE2B da3dfe9a21564900ff1bf3bd1e8c2c3ac362363916b4db592bf40e3c279b3bd58906e312f27980f982b372de48ad5e86cc5cdeb074c347c2eb431cf5c7814a7c SHA512 40db19f05e6ef7c9232c986e5101c6f415e26d6a15c7be4f3f2cec983a1e4ebdbd2e3ba146a8a7af22cd6716dccbc801ec0bbabe40105a0934881e2c20f331f7
-DIST thunderbird-91.13.1-da.xpi 674443 BLAKE2B 96e815cd5e2187d6e35b052ca3a82ff3987a902c882eb0a9fe16be12a8c8cd3977dd6a7e968d3bc35e0c8e1c74c42daac1ea265857de65934153ac7e45dd8f65 SHA512 4592d984819406f70bc16f464b4987e4ded9ba7673d7f36c4f765d2cc442343683f4f2ac522f0906086807da3a7001732af726b7745de40c4a10231cd681722d
-DIST thunderbird-91.13.1-de.xpi 697527 BLAKE2B 2b8a9467ff7babf884a67d06ef2fed13cda832a38d86572d971ec9dca28b296424bb1d6162c635ea0fa0da8715413ae8bc004cc64744fbbbb1e129686ffa44bc SHA512 e4e71c8860b33e39e3e6b325d38be0e5034b7f84ac4128f40fd818139de9453fa56af88ed82f72d8a105de843ba88e43ee6e69cb4860ce8ed2a08f87a6685005
-DIST thunderbird-91.13.1-dsb.xpi 723999 BLAKE2B 3da24a736ff8ea7f93eedfa7b412402a8cee24267259a4a6e2d9fe99cd3c82b9b84c313b53487e0c95df2e6b201ec8061983518750b8e68f0239f43cfdb5b4f5 SHA512 3e1d71e08cf9d5adcc89dc2bb9aeb6a8d3ab1520593427eccc0f7bb06e8d57fe90e561e556ada8585f3c6ea318970235c84580ea733f1b193b69c8455332a44a
-DIST thunderbird-91.13.1-el.xpi 821181 BLAKE2B e40d084cbda3c3291f45a3759575917beae5945720a411d9185085d9e530bda22606cac4334077b481f53c7afdf814a3001e9d13d75c77e3328283d1fa72be7b SHA512 261edd8cc15ba9bfa941474c59a577795daaf2d746df78af25a98270c3cb770d561175734622f7c247ff75b01434a7290595db46283d319aae55c09d62acccc5
-DIST thunderbird-91.13.1-en-CA.xpi 647814 BLAKE2B db9797b0833114f1ecb88e65f1c7c6f49db325a18321669843fd033735c4113be171558312ae0cbe55f5ccbfe51fd85a7c383d2407b7cc90d9bcc3228c6659b9 SHA512 6568061ef35d15f0381fdbd29b3cdf826ce85f4c0a651716a34ed46574960d157622f5b88aecd8cdb877f9e08d1c89ae152339e40174dfbac9ec2d8fce953f7e
-DIST thunderbird-91.13.1-en-GB.xpi 650554 BLAKE2B 914ea9eb29fc4fb156578f0fe6a38593486d5f4dc2c2e63b552c94ed542dfc021d09537b121d47886bdc197632d0e1cb1b973e8d1ca66242d61160f6a1a93531 SHA512 71ff59ddb550129ab5998633412d75fe7a80017336ab5b825a60131094bae6599f0bf45dc17e29bd91f763872e676c84381f7c2f2b1ed99d70946c24eeeaf1e4
-DIST thunderbird-91.13.1-es-AR.xpi 700497 BLAKE2B 406b91a44e989ae443993fd61f7d486bcd994c362fb221ffc6c19305636761e05d9458cf2e22362598cfdd9f34ff483ed35eeea8aee453318621c25d95d1bdb8 SHA512 5677b56dea0d46b79cb0a44a8664e961e8e1e12e1968ec88238e4119acd91a990d3c0934a2d4d5e3d017e1e922f93467e8a149240d213db191030c6252463c97
-DIST thunderbird-91.13.1-es-ES.xpi 630921 BLAKE2B 24b799e99c457617aa6b8cec5be923cc2f04fee0996fd803d54c4eea90e479596b8cbf419514d593c357715e7cd47f09ede7a84338836f66990e07d7a630b6e3 SHA512 a3a93898a8b49a0997cf7a922b1ad75c2de982a58470edec953c0d33c706340c193869eb88c931f20aed605da9c2b34870d860b0a2e2a090543ae567ec805468
-DIST thunderbird-91.13.1-et.xpi 672171 BLAKE2B 78f7f81a834e60b5e3dd8ffa8e23091fe6d6e994920906962aca013283fb1b6f07d098e5cd6c7eeb51435a2252c46570e4bf24d5cdf5943bfd418da10dcf675c SHA512 5d92074412f1d1b9e0f274a4c6eaa4b08bf930dbbdb9e1bbb5477d758ad031e1a36b8b34ba029c5c8ad6c96d9f2e721e33a1b07dbff0b5787776e1ad54d45574
-DIST thunderbird-91.13.1-eu.xpi 678264 BLAKE2B be3739e8899fd91e675a9726687c6ce1fb2408bbf0b7edbd226f782fbaf62126747faeb4ad7d889d9002ae30e8a47ceb8f4b716d5dfc097edae945760c096be8 SHA512 a98e784b8baf1c077bae4a079a7fc9d2b1c0243fbd8f9694e7b01c85a013fee1da87216735f6e18ed95bd2a01c69b68b0f76df52e801a530c6bb8c4394079fda
-DIST thunderbird-91.13.1-fi.xpi 676630 BLAKE2B 5f41b7b5636e2802cdf8b3c2ad2bd5ac1c235bc4934ffdaeb28a2c42ae2751c83f61af9215facf2b8a173538c402da88bdd9d1dcb709a3518ed3aafbe3425087 SHA512 f33664adf5722735ceb7502706a93100e055d0fb3dc63199480499f2970ad4bd19326a8da06a8ed83c1ca50cba93e62505afeade3efe53b8d15a4fd4451a7907
-DIST thunderbird-91.13.1-fr.xpi 711454 BLAKE2B cb27d43a677b1daa2f421902f2d4ab5e24b7aa52dbc6bebfb3b4524b8d4713c713d01d350bf13126bca21de7e486329b33e05249f8834344c8c2e3e051e8f837 SHA512 d1925097dbdd6194c6da44413cd308719c6eb1b3483b700236cd0e6b0f0000cdfe29d8168f225eef1ca11e33cbac83bfb5b1275e3f74dd478f2c2ef0090b4cb7
-DIST thunderbird-91.13.1-fy-NL.xpi 691880 BLAKE2B 5d24f4c502617e79e4ca4dd035c9a38d8a8369a55471a611e5080926ff1e626a7fbb57602189f0f7576bac1bb4b9e9ccb8c08be5cfd7e99bb65560f37b4b5372 SHA512 ce4ade10bf5746d005c7b04ab7b7726d611addb77a39a74359ae2eddec65a018cfa5f878973808639d39b8063ed957830ca3432ffaf3be6aac90864f91667f64
-DIST thunderbird-91.13.1-ga-IE.xpi 613124 BLAKE2B d2e5dfb0418985f89842ee75924470cfd2df8f3a421cdf0cfeb648958264d5d751d33b6b2d600389c2b3eb5208aa829c6643f4577b38cc6a7875185fccbb4a45 SHA512 90a989f5a5d6c876cf4ed1565225d3c2ddcc21629cfc36f613eb38786d4949e3abe5024b076807d3610696b46606b9e6abc5d127745cd467fb66d7460e2f2376
-DIST thunderbird-91.13.1-gd.xpi 640649 BLAKE2B 73bbb1f27ae819f69dbdf0f400f83eedb67c163b6cde42ef2aa900a837d2c73d856bd7c75571e03a624eddda383727ceb8223cf77965a8f8bbd4355612b489f4 SHA512 d38b95c70c7f0cff95ed67a4ad746b2266ddd29bf46f9257a8d3eb2f7357060fdaefd8c74e05d19d5d4eda0a8c300171e28c790170a5d9a7d05191dc8aa7eeb6
-DIST thunderbird-91.13.1-gl.xpi 677790 BLAKE2B f3ea61c88f46dd820a2113050731cc46464a8230197f2be9779bdab9bd88ce728c5ae5ed9be0edee2fb7aedd07d5b0c711385426e6e2a89e576f56219857f5c6 SHA512 35b0458ed1d073d54a02f5b9443d8d4eaf5fd487be0ab6d414c3da56a32083c2027f39c341eddbb2ec7f3c7db17d928319f99c1d647bbf297503fa69bac3b1e4
-DIST thunderbird-91.13.1-he.xpi 673191 BLAKE2B 85475a9ff13d7c85239223408244e6aca1e566e93c81762cef41b59db137b9feced8e75c33f4f10dce93763b25257a1aefbf24ff11ac0dca7607952c9b540881 SHA512 bd42e4ac1f00aa3ca8b545ded36f9951b9857bbe733118af20210c9cb027c24da7224655a24a3f35ff9e04138aebe604c4709d201a694891afe52480e62798c8
-DIST thunderbird-91.13.1-hr.xpi 653581 BLAKE2B 5498822d72d9c0792616b31a121db655427ad13d5d447114a0bb64203287e8079022e06458e7b8867dca4e34188e13af036fc6decbb38a225fdbc209fb60c2eb SHA512 9d89bc3fb8424cc6853e8b7c517ba59c08b04b8abc8dcfe0ea40f8505b3be206b7d7d4d18fb3477a1b52cfaaea12a932fa7c41e13083b788a19fa63e3684f327
-DIST thunderbird-91.13.1-hsb.xpi 720813 BLAKE2B 435dacd02f044572f1648f9e392137f62ae5b6ede4201d914e14fe00b271d9cd847042547201b76c5ab27a1ddfccb6e4623360c31349147ed6798bf8c935b8c7 SHA512 1ac74d2705b4eb61a2ed4fe1f512856fb6e042c4001a7b79b55e542d54adc1e4ab1f7012e0fd9d75a1bd56066a3dcb187e0fe327f59c529f9354dd01079030c9
-DIST thunderbird-91.13.1-hu.xpi 723400 BLAKE2B 181fe55f7ab7f763090cca3c21df77bb384101ed256140f9c101aa2b4f1b9ecc6196f36e01fb12dde3316970b4a81921c65bf7c03dc1e30e7c431235675c76ee SHA512 afb19806cd954e86af04f71a10db2bcfd2b4a1bd665b9da77a6676da29c25ba36f494af007ca41fd46727cf498c2ee35a0242760a1d8b77a182dfaa5fe6f7e99
-DIST thunderbird-91.13.1-id.xpi 648251 BLAKE2B 290b194aecbf9b9137d58905e68f46bd551833eea08a7eb7b80f24916b2a8003350399f53df0a5caa124815e5c4d7af42be4884d181e8789f9b88e4e04210f59 SHA512 4c3138e032e9e1054a706b4379a787ec5083ebedb2656267091656dd9dfa37f3662470d7f89f7b4a1849f1980f96d3df6cd7741e1f0eabb6accdcd3fc0453e56
-DIST thunderbird-91.13.1-is.xpi 682263 BLAKE2B e5fa8169ddcb92dc42c5d8aa001c10c50f3954bcc6f754cd4e14fb9fe9b00470474e9eb8cc39efcdbb26b97421985202fbc8b9fc23e6389436c700154fbe897c SHA512 0d1f5f81d50afac11670230044300bc2e4a02a83777af5dc97b3e12c0ea098d44a93d014419f39c49ea6dc6998423b5b30393e7f39d68da5d223e192ccd6d9d1
-DIST thunderbird-91.13.1-it.xpi 613334 BLAKE2B d4394136857239545a4ff7deba47aea32ed289cf54ac8a84cfbc6c4a4f84fc453a1ebc9a00de12b09395cae5d48a9f81f7d961aadaa706bec666412e62402abe SHA512 a2a6cba163f828144ec02948a6ddeb6004757869e0c9b23eddb6adf77467a81fb00ea94d5a15306ea3529d94c4a7a8d600d90d0827c2bd8b486c0ef6aff5ec90
-DIST thunderbird-91.13.1-ja.xpi 756467 BLAKE2B 0bac08106bcdf27254c30ae0f3b5733d254c9030dadcd8f3e2b78c880cfbe95f8815d414a48a6149e78a80a167d24950f26e4bb4e04109dce09a0ed94410ba6c SHA512 b272b4c1f80ffe2300625ab9e0c91f06dc5f5e10c781be1797356897bae855fe23535cd6a0a3bdaafe4c5d8681641522013f981fec772d0c59c0e7eb0a95a9f8
-DIST thunderbird-91.13.1-ka.xpi 762627 BLAKE2B 1789d237d20b05b08c0fe8685516aa28950b340e2f518121d858bc5bcce854dd58b2c2342ba94e37e1ac86914fe128764572748d14626ab60bb210b50fb0a663 SHA512 357629a8718f32bdc6192095e6cd4cc13c3df938197f86ce6f1633d62017a7fadad67f27e936dbc269bd3f2f450ad428d448929b6ac07800e9f6790c40e275a9
-DIST thunderbird-91.13.1-kab.xpi 677084 BLAKE2B e79342079a004891e7f0690f513735316e931a2196693589c6060d3b110338796f3725827802a30bcbe4998cbfce8b3a7a34e8efe81de6be932b298f1e59a494 SHA512 6844ae031894a498c404b62b49fea70a00959b1cbf918e07f3fe5c5d3201a5aa2908bc20648e0ae71251e4b44caed81ac323e21b026ba663936a66f8e4f742e8
-DIST thunderbird-91.13.1-kk.xpi 745524 BLAKE2B 657acda66881c6ed498ce4e4076af5676dbb8f94622a1053daee77542eacc186c56e5e90b795aa5bed3b2e329f0419a44369897eb24c04ac5c301f55e77e689f SHA512 7f19a76a80a41e61851d77c5202e8616be27765e83d72c4a0efff8500e746a2e330492ca2bfd0f29458e4f1333231b5042c47c136182a1a47f6ebaa4ef574fee
-DIST thunderbird-91.13.1-ko.xpi 704769 BLAKE2B 86d98807d871cce94fdfde497e801c796f3bd8486e31cd8e790502d70340e5c70c5e648d56af7514ca5272c36b79705e6eda55401f36d738efef80f1508acd92 SHA512 90d08fc3547d14c1c53c3951b06c4f539b76dc47b3bd3e0183a6f332b03495c0abbc26b6d15f954dffe60686eb00147cc311e98f64cca53323867644c8e15315
-DIST thunderbird-91.13.1-lt.xpi 696045 BLAKE2B 13487de0a99f756c1311afbe8f02ce24f8b8c2d972445b647e5dedb64a836b592a949b4e33a47d5afa706a017c5d27266aaa5a438986ea1b36496e208ac45348 SHA512 f3fe45cf3c25d765b9bd9667977be7baf8d3cc1ab5f6dfa821adb453eb9d30cafd3142c1667131abb9f05983163e83b5065c612e223818e36ebeacc384e856c3
-DIST thunderbird-91.13.1-lv.xpi 618525 BLAKE2B 0d01b52902cd49c9ea1b59ffe1978230526cb2771a7fa21568dce09042ffff9823abfbc37d2aea036c3bdd74f88472d751b78110c1f01d91f654cf70ccdfa6c4 SHA512 743439b52c52343aebd74490f96cac3ff34f078672d9c7d3f0e2b5622126da6bd0b51582f1f1e844bf4c66d5b5a0e1dc1236c18d7281a2d4ddfc9a212cf9dc01
-DIST thunderbird-91.13.1-ms.xpi 578080 BLAKE2B 4cb90fe2c1b17ff12a04ae3fef1d9667883e91f8f36506e18126af46124f834aa3b3e83b683d93043e223f335eb80e7e544ff834d265eaf0949f4d25c6f6dd21 SHA512 b4dc625fdcb26bd92101a0d53f0524e7e517fda1a317797f77c010a37ae27cadf5e4c233a7c63052fb707a5f983b40a34dc551ece6b585563c242ce4ff9e9e6e
-DIST thunderbird-91.13.1-nb-NO.xpi 653326 BLAKE2B 34073bc856e36f9efd88ad7717f35101044e62a4418cf069ba6b42f60ba7e22854cc85524e413033d0ffc9a92579fc4c13792a0aa890c43583cbce59c61efd84 SHA512 d1804ffe2b435bdd138a267999211dc0c8b3b95d89ba78d78be6befb4406550e87427764c9381de95057c4336ef27be65fae9ffd920f2b192ae892b29526bd1b
-DIST thunderbird-91.13.1-nl.xpi 685342 BLAKE2B 6e867ef578c8275d4b164cdab906a0249408df77a5fed4ec0f2e108fc4be5f8644dfa1e9f93631a02e845948766bce83f207c0d48cdb6111bdef6fc294fbd216 SHA512 12298513dcbf8506f806551d2478f5bbc5c650d43a0c491e0fb1d61e4535fa5c843dc8f0ef5f1440a06f26ff34366b206acd38326ad9415f3e7ef0db8515cd8b
-DIST thunderbird-91.13.1-nn-NO.xpi 658572 BLAKE2B 380c40e0fcba60100151d418ed354eaafb78a95b93103aec49edb388d3cf94406d3654cba91994e2cafd01df6c517eba450a26ca4c7c2c69b17ba63284e0809b SHA512 cede9a3d36294d51bf187b68ce7113c7fa9d96a1cce31fddd142b8e5fd054bf2d626300259f608dfe62b77a1158e7e651e45c07f00e3d28c8356ce2585dcc63c
-DIST thunderbird-91.13.1-pa-IN.xpi 652335 BLAKE2B 18ea7fdf6da1b3db6acd9f2404d2dbe8a5e3fccf8a2964220f04a720013d7a0afa2f0235cee366c3f257d4e1927f6c95120b0d14d1f9c549603eb0155c428b48 SHA512 bcbdc5f0c9d99c4e312dc7abc97947849af5d8b0e29e12bd8c6ca6b05a21bba9e7738e54795823a06461b9e729528cfe6805e3a3f1fab2d25286c87336ce3d25
-DIST thunderbird-91.13.1-pl.xpi 694112 BLAKE2B 35064b4e75b5d7647636652d49d9b132f655851fe61645064358ecb90c2cc311ccc0b3f6132c719ea19c8face99b0d8522a666dd72c357ab52d54268f8368d2b SHA512 dd6f86ca52741b89813dfe39fe40f7108797e4678e6c010e463a39b617fa67be96ab28e0f1d6f3ad9c17f63a9c717001faadaceaaf426940ca672531478ee886
-DIST thunderbird-91.13.1-pt-BR.xpi 694133 BLAKE2B e811fe90ae243240ae52921bbbc3743c0dbe46a939ffad4cc043230421fbcd5eaf4d89b57e31f9af209343e159cbba5836fc9c8146de8d479d543f9e0ef8ce80 SHA512 12757482fc0897bacd19cfc63c3792adac093959f9e21d6780ea87737497bbd56d10d2f58d4dffcfe7aed2fb1df8d122910250c6d2f3d5086ea9e462b1f5bdef
-DIST thunderbird-91.13.1-pt-PT.xpi 674673 BLAKE2B 320ea22b1b1287a42d7c4704e1706ff326a69747fd3ee35a8fc5677b2f1551c0c751c02226c4ab5bb14c3d59626fa406258f34077340b8ee661cee6ca6941923 SHA512 e74ebddad5906323e3b60530f2f69fa3c65ab74fe5e8eb463394ff5f81349930d904afbeeff0c153289ccd75eb06811b474091b3eaaaf2c65579e679011ade94
-DIST thunderbird-91.13.1-rm.xpi 687615 BLAKE2B 7fa1a9da4f84c31c8414eed81d23a878331f9c20a9997abbbb185523bb9094978d406fb60aca67eca7e58a0af3248c46cc8b518da98b062dba14919c2aed0c9d SHA512 fca6dcc5c430f39d01aa4971c50a6595d22e766c55ec5f8324b3bc5c78ba131e7b03217e35f681ca5534abb31d6bd15bec1ba8009959cf3cd696a725b1f78f9b
-DIST thunderbird-91.13.1-ro.xpi 661347 BLAKE2B 492ff4527b6b40c3031d3d3b0fbe13bc38371ff8dbd5a848832680553ee3ddf066c438beb3aea7e74de70a73a1f4a3c219741f3b95df7caa421eabb9de4d94e2 SHA512 f5ded1a90fa5053736bafb201993560b8e400001c09945687d52e252ef4675d14c14368b4675bcd08e71300620de95e482467a8f08af064ab01d8dc95d670c3c
-DIST thunderbird-91.13.1-ru.xpi 793375 BLAKE2B 4a477abb164b62d11ca771910e4c45e0729067738ad9d7ab1fa2ec4a27ea230c2ce5d1d8f4d41d5fcb5980751fbf35e598652f495c87ea2779eea2abcbbe84c8 SHA512 510d94b65cc6ea78b2a760e68a11874c53eba5e22024ad56ee73f938a13c61db61a5e29f6bc97b29b65a20cca69a59f1bd202c7687375e915c4e30b979c98a70
-DIST thunderbird-91.13.1-sk.xpi 721093 BLAKE2B a2fd89c1e06dab250cd73e0ae6d434219ea93323f896816b9d8706d95f23044e03671608e7f160b273f8aae68d156800f5b55ec4c85a3d482e84e75022f879b1 SHA512 72b9cbf1ba6c6a2780eb7abf77a7ac5d950107c14cc31a30df3ea5371c554d60c79d469248602a8d0b42ab8f813fc36d13a63d4c1d09f968a2267425f9a43ecb
-DIST thunderbird-91.13.1-sl.xpi 682544 BLAKE2B db7754f7c78122e56cb5cc764e446ff06074c2681fe270d072e6aa284dc7e597dcd116ad74700e2096698f9cbb10500e0ad684991dcb26a13fef1fc73faf6f7e SHA512 50421c0d4cec1ee2c0c86fef1dca56f3f38de3e25603e1c0d509c73d1e8b8de3a59a1d7b1fd6bac07d6eff7c6c141717c05ca4ce641afd8bce88d4f1a9356861
-DIST thunderbird-91.13.1-sq.xpi 703627 BLAKE2B cf6b630e94e0e1c8e8e2c491358ebf774e6d1b0dcd8fd89f647e82fbb54a3b40efb97f0d7126f65b581a16ccef7a4d6682f407a44a78bd3c066c6c20ea161d07 SHA512 9198cae43314a5df2e955e0add9c3aeccad1d22d1420c72000997e484c84a49991ec346bf25039b2e2e98d3bda9b807c1fd88e2f95af7eff6e3023c8494249b7
-DIST thunderbird-91.13.1-sr.xpi 710564 BLAKE2B d8c651e9167019366c4ebbffb8729386e32f70b2b662fc81548404ec534a04ed025693687b7b4f9fb3a1b29cae61675564702cdf575fe0c56cf2d1b256ab2476 SHA512 ef67a441ca6a3d832dfabc0632187d24f5a45c526f174ae91f0c17f1bd87e9aff2f42d4afc5a84ff0d5179b1f90f36f0e18be1a95421f6c2a32a70b163701e16
-DIST thunderbird-91.13.1-sv-SE.xpi 690968 BLAKE2B da1fb70df0cb71ea7aeec559cfd1cc3a9a610130507f25b9e17f23400c801c80c5fd75ca129f8791a404ccde4fce84647018098d2fbd0fbd740d88ab9c84b452 SHA512 dad7c9b5045115643371d19c805892e4041a4ba21133ec12e894db661af31f39e6f722d582f862d2229c351cc9e882d030670bdf71fc1c21ee1b5a4f92724292
-DIST thunderbird-91.13.1-th.xpi 748757 BLAKE2B 559ed2f57119cf92352c75cfd48619b6f1dc5025714a9221caa94a7cc50c1213765b487c8366c1289b8d0dae575a713daa6b4929b5cf232f82dffc9ed402278c SHA512 46af4e7dcbb0c8ea7baf4b6feff6e6cd388b2b45f303145b9d17558d71b56aaf638f2191eb07ef3d67707e96664715c2528b73738a64232b089c77626ff74f1e
-DIST thunderbird-91.13.1-tr.xpi 699653 BLAKE2B 60a3fc1500bc38172ff0154037d865f2a42ffa8fe81ce3514996dc20f654b09e080ffbcf0a13b39a1e12a3a4fca9c323f3be767035860433ea3e45dbcdcf3096 SHA512 a82f52f6b0e52c33a465a72ba7a5f6fdd89034edecd4761d94f4b4931a605f9fff6f25743835f4e134fc847a76b382e7a9101793bf782c53e15ad4ca0713189b
-DIST thunderbird-91.13.1-uk.xpi 798483 BLAKE2B c6df1f65d353794377c10a054520022fc59db8c4b103e0a6eadd03a1c53760c39107f24e0807d635529c0928667fbe9d827cff1b874d1f99dd178ffc79c970b8 SHA512 78c750a050c083001397100d8e08c352a3307810f65f9bfa97dd01ef32a554daa581ccc0fc552dac10e7c26f359cd7c18a3c4e9821f706cf6a6041c31f7f3ecd
-DIST thunderbird-91.13.1-uz.xpi 595925 BLAKE2B 3be732abd1e0421b1d3ab727fb63ed1a6bfc51a5e5595959b0e4860d289e46f63f187b103168934d79830fabd3f500abcca06535841dc26ff7808efa8c2f72ab SHA512 7ecca89e964563c174b29c95f50cfa41ba9f5ec9e1e321b476475e4506ee6a70be8c36f478dddbfce71a9e4993716828dfde87f4baf0554be22778645813a3ab
-DIST thunderbird-91.13.1-vi.xpi 725526 BLAKE2B 9fabf9089f53297081a88c2083950759772b1f31713f85eb6521f24b7fee5ec4dd4a5b797feb0c18ad641df70fdde32b0ca36bb5a78c42ba56aae0ef04c435d0 SHA512 6495894c4ca638a92826f9e4bfd0043f0a5311f8ad074aa1b3a2b52e8a9e387e4837ebf2218886771a316c6416c5f4980899f1f7ba13b1eb7321ff1af59f6a97
-DIST thunderbird-91.13.1-zh-CN.xpi 730902 BLAKE2B 2558ad7077397092ee0007891c785d29e1a6eb6045a970a1b9c98ecc38a4b6958aced83465c62cc432e9d0dd0b691e020ec29586b16f103e250b467453784595 SHA512 d8a86dd9b79c9f0f13095ec8b1069124d125fba21a9a8732294e9b3087fbdefdc516e79a2c3864ca11199e8e0facc2023cbdd8bff616ba1f941cb51e2177bc01
-DIST thunderbird-91.13.1-zh-TW.xpi 731944 BLAKE2B 5641671442b5c87560a1b13c3f9715e2bba22b897a1a8bfab6bc86dd90837f46fbe8d28507c5a73ebbcd0f79b69f73753f1987cbd7d4d0a8cc2626fd01b6f8bf SHA512 91c2e25f7ff34c70621006e33b0663c52ed70861be407b83c8822ef8eb8fc01e26b03141499ff71dadb63bb1fb3d9f79deb2c58ffaed6843d783a7d369c3ec4e
-DIST thunderbird-91.13.1.source.tar.xz 402696448 BLAKE2B f5219c185eff49932cd417267665b8e8327d8f5f4894d8adc35e9d46c944e110e5ad2461ffba36bde990509c552d75f464fa790406b1154f3a6e70bd1bd6ea24 SHA512 ca1bf821e6ca010c554fc111157af60e627ace7a0d43785ba39b260cd0606480dd5736c188c49ef6c3f1bda4b4c6870767b75e483241e7fd5a4290d689017e73
-EBUILD thunderbird-102.3.1.ebuild 33359 BLAKE2B d7cf72b476e300c59275656af3673da040ddfd37b6e2261bf6d0cf57524eb1973d2855523756c82e145aa15f7c22ad00cf93c8ce27ad49e8776da040c4bb8e59 SHA512 21be4a0c807bbdcc966827a58d7bc4e14061b8b312e0b757351ea9541cac7431af086c7dd85ca7657bd9d4a4bd1ad986dbe70cabbf0ee65d5e4a4b53b5584258
-EBUILD thunderbird-102.3.2.ebuild 33380 BLAKE2B 742658551b8235577d49d4987bce4178de78c4f99ffb967358ac8637d49dc6c3f605319864068448a389e010ab392a9691fe23e99db19fd1faf2be49eed894d8 SHA512 1efff394a41d4124189fc0a03b213ffefd85d56648a79e879e04f6cdd017de6905af6011f80538a2f6eecc593f9274668e48b90d41814ac530c7118dbb281994
-EBUILD thunderbird-102.3.3.ebuild 33385 BLAKE2B f1d0ef254090859b7fdcd76652dbe173919ce5b5d7f801a443e7eb25150aef0071788d4d33c4dbdac8618e69af27b7c0fc0e6d25d7a235b1f7c4aaef101e8aed SHA512 93073ae1d25482aa9d3bb12feff138c2cc840b47609158d3be3c9f8827493ef5ead5160c229df502e6caa4ef21f84ebad6a0cc479963fd93ed47e7176112e00a
-EBUILD thunderbird-102.4.0.ebuild 33381 BLAKE2B f9a7fa12784dda83531346d7281805ce79aecbe1c32edbc060b05628fa9833828b3f11a65ffb1beffe14f8552facf49bd9d7aaa0ed62141b558cee9258d8a4bd SHA512 60e2ef80274f85d9b6a074584deafebc8395ec4eabe8f41a8bc65ce9656046df3b1821d7d7b69060652710476b510301bbec4c997cacc74dcb3f7e2d73012459
-EBUILD thunderbird-91.13.1.ebuild 32760 BLAKE2B eca6bb6ad4a3c2cce82926f76410e8543f7c9edb32c4cad7b19fb6a0175384f0bab5706fa42697367011655c3ea9b537386a432059e4766d6a7c5764af6f3e32 SHA512 b941bc14b6d7a23d142eb4c21f8af8641ad2aaa800ed0b56d717ad5ca57988f30b7bee2a4ee4801b09ec25b2523b2d0ace457d358521d2efa4b8d27e237d01ad
+EBUILD thunderbird-102.4.0.ebuild 33379 BLAKE2B f593b99ddeaffd3e3171dd4a2b136cde405ffcc54b9d673fcedf170c13430296948124a915d8370b7f89fcf950315aa857fc66d19adabbfd7050594e584a39da SHA512 bcffd76836f691aef6d076a5ebf9652e0290d369c3e88d41ea81ff4e7f4ec908f07e76dc41d476ba19aa3ce78a8aec96308ead4c43dbf12e7104c41bdf8b0031
 MISC metadata.xml 2139 BLAKE2B c348f9dc2bf813c386bc2e62782bf762ef4fdaf3f913cec41bbd115a7bac54b01852dec04e6f7574b24ea5cd6d9500f289109127cdac5887128b07116d6a6cf8 SHA512 09b0670e852cc954b5df5e846935d274ae180e4627d112104d5fedf2a777fda7d52d73cdfde9e50475d9a560ed44946d4c0682d52d793bbfb5f2e1b1e0aac608
diff --git a/mail-client/thunderbird/thunderbird-102.3.1.ebuild b/mail-client/thunderbird/thunderbird-102.3.1.ebuild
deleted file mode 100644
index 865ddcf22cba..000000000000
--- a/mail-client/thunderbird/thunderbird-102.3.1.ebuild
+++ /dev/null
@@ -1,1164 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-FIREFOX_PATCHSET="firefox-102esr-patches-04j.tar.xz"
-
-LLVM_MAX_SLOT=14
-
-PYTHON_COMPAT=( python3_{8..11} )
-PYTHON_REQ_USE="ncurses,sqlite,ssl"
-
-WANT_AUTOCONF="2.1"
-
-VIRTUALX_REQUIRED="pgo"
-
-MOZ_ESR=
-
-MOZ_PV=${PV}
-MOZ_PV_SUFFIX=
-if [[ ${PV} =~ (_(alpha|beta|rc).*)$ ]] ; then
-	MOZ_PV_SUFFIX=${BASH_REMATCH[1]}
-
-	# Convert the ebuild version to the upstream Mozilla version
-	MOZ_PV="${MOZ_PV/_alpha/a}" # Handle alpha for SRC_URI
-	MOZ_PV="${MOZ_PV/_beta/b}"  # Handle beta for SRC_URI
-	MOZ_PV="${MOZ_PV%%_rc*}"    # Handle rc for SRC_URI
-fi
-
-if [[ -n ${MOZ_ESR} ]] ; then
-	# ESR releases have slightly different version numbers
-	MOZ_PV="${MOZ_PV}esr"
-fi
-
-MOZ_PN="${PN%-bin}"
-MOZ_P="${MOZ_PN}-${MOZ_PV}"
-MOZ_PV_DISTFILES="${MOZ_PV}${MOZ_PV_SUFFIX}"
-MOZ_P_DISTFILES="${MOZ_PN}-${MOZ_PV_DISTFILES}"
-
-inherit autotools check-reqs desktop flag-o-matic gnome2-utils \
-	llvm multiprocessing optfeature pax-utils python-any-r1 toolchain-funcs \
-	virtualx xdg
-
-MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/releases/${MOZ_PV}"
-
-if [[ ${PV} == *_rc* ]] ; then
-	MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/candidates/${MOZ_PV}-candidates/build${PV##*_rc}"
-fi
-
-PATCH_URIS=(
-	https://dev.gentoo.org/~{juippis,whissi,slashbeast}/mozilla/patchsets/${FIREFOX_PATCHSET}
-)
-
-SRC_URI="${MOZ_SRC_BASE_URI}/source/${MOZ_P}.source.tar.xz -> ${MOZ_P_DISTFILES}.source.tar.xz
-	${PATCH_URIS[@]}"
-
-DESCRIPTION="Thunderbird Mail Client"
-HOMEPAGE="https://www.thunderbird.net/"
-
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
-
-SLOT="0"
-LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-
-IUSE="+clang cpu_flags_arm_neon dbus debug eme-free hardened hwaccel"
-IUSE+=" jack libproxy lto +openh264 pgo pulseaudio sndio selinux"
-IUSE+=" +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent +system-libvpx system-png system-python-libs +system-webp"
-IUSE+=" wayland wifi"
-
-# Thunderbird-only USE flags.
-IUSE+=" +system-librnp"
-
-REQUIRED_USE="debug? ( !system-av1 )
-	pgo? ( lto )
-	wifi? ( dbus )"
-
-# Thunderbird-only dependencies.
-TB_ONLY_DEPEND="!<x11-plugins/enigmail-2.2
-	selinux? ( sec-policy/selinux-thunderbird )
-	!system-librnp? ( dev-libs/jsoncpp )
-	system-librnp? ( dev-util/librnp:= )"
-BDEPEND="${PYTHON_DEPS}
-	app-arch/unzip
-	app-arch/zip
-	>=dev-util/cbindgen-0.24.3
-	net-libs/nodejs
-	virtual/pkgconfig
-	virtual/rust
-	|| (
-		(
-			sys-devel/clang:14
-			sys-devel/llvm:14
-			clang? (
-				=sys-devel/lld-14*
-				pgo? ( =sys-libs/compiler-rt-sanitizers-14*[profile] )
-			)
-		)
-		(
-			sys-devel/clang:13
-			sys-devel/llvm:13
-			clang? (
-				=sys-devel/lld-13*
-				pgo? ( =sys-libs/compiler-rt-sanitizers-13*[profile] )
-			)
-		)
-	)
-	amd64? ( >=dev-lang/nasm-2.14 )
-	x86? ( >=dev-lang/nasm-2.14 )"
-
-COMMON_DEPEND="${TB_ONLY_DEPEND}
-	dev-libs/atk
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/libffi:=
-	>=dev-libs/nss-3.79
-	>=dev-libs/nspr-4.34
-	media-libs/alsa-lib
-	media-libs/fontconfig
-	media-libs/freetype
-	media-libs/mesa
-	media-video/ffmpeg
-	sys-libs/zlib
-	virtual/freedesktop-icon-theme
-	virtual/opengl
-	x11-libs/cairo[X]
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:3[X]
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXrandr
-	x11-libs/libXtst
-	x11-libs/libxcb:=
-	x11-libs/libxkbcommon[X]
-	x11-libs/pango
-	x11-libs/pixman
-	dbus? (
-		dev-libs/dbus-glib
-		sys-apps/dbus
-	)
-	jack? ( virtual/jack )
-	libproxy? ( net-libs/libproxy )
-	sndio? ( >=media-sound/sndio-1.8.0-r1 )
-	system-av1? (
-		>=media-libs/dav1d-1.0.0:=
-		>=media-libs/libaom-1.0.0:=
-	)
-	system-harfbuzz? (
-		>=media-gfx/graphite2-1.3.13
-		>=media-libs/harfbuzz-2.8.1:0=
-	)
-	system-icu? ( >=dev-libs/icu-71.1:= )
-	system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
-	system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] )
-	system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] )
-	system-png? ( >=media-libs/libpng-1.6.35:0=[apng] )
-	system-webp? ( >=media-libs/libwebp-1.1.0:0= )
-	wayland? (
-		x11-libs/gtk+:3[wayland]
-		x11-libs/libdrm
-		x11-libs/libxkbcommon[wayland]
-	)
-	wifi? (
-		kernel_linux? (
-			dev-libs/dbus-glib
-			net-misc/networkmanager
-			sys-apps/dbus
-		)
-	)"
-
-RDEPEND="${COMMON_DEPEND}
-	jack? ( virtual/jack )
-	openh264? ( media-libs/openh264:*[plugin] )
-	pulseaudio? (
-		|| (
-			media-sound/pulseaudio
-			>=media-sound/apulse-0.1.12-r4
-		)
-	)"
-
-DEPEND="${COMMON_DEPEND}
-	x11-libs/libICE
-	x11-libs/libSM
-	pulseaudio? (
-		|| (
-			media-sound/pulseaudio
-			>=media-sound/apulse-0.1.12-r4[sdk]
-		)
-	)"
-
-S="${WORKDIR}/${PN}-${PV%_*}"
-
-llvm_check_deps() {
-	if ! has_version -b "sys-devel/clang:${LLVM_SLOT}" ; then
-		einfo "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-		return 1
-	fi
-
-	if use clang ; then
-		if ! has_version -b "=sys-devel/lld-${LLVM_SLOT}*" ; then
-			einfo "=sys-devel/lld-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-			return 1
-		fi
-
-		if use pgo ; then
-			if ! has_version -b "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}*" ; then
-				einfo "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-				return 1
-			fi
-		fi
-	fi
-
-	einfo "Using LLVM slot ${LLVM_SLOT} to build" >&2
-}
-
-MOZ_LANGS=(
-	af ar ast be bg br ca cak cs cy da de dsb
-	el en-CA en-GB en-US es-AR es-ES es-MX et eu
-	fi fr fy-NL ga-IE gd gl he hr hsb hu
-	id is it ja ka kab kk ko lt lv ms nb-NO nl nn-NO
-	pa-IN pl pt-BR pt-PT rm ro ru
-	sk sl sq sr sv-SE th tr uk uz vi zh-CN zh-TW
-)
-
-mozilla_set_globals() {
-	# https://bugs.gentoo.org/587334
-	local MOZ_TOO_REGIONALIZED_FOR_L10N=(
-		fy-NL ga-IE gu-IN hi-IN hy-AM nb-NO ne-NP nn-NO pa-IN sv-SE
-	)
-
-	local lang xflag
-	for lang in "${MOZ_LANGS[@]}" ; do
-		# en and en_US are handled internally
-		if [[ ${lang} == en ]] || [[ ${lang} == en-US ]] ; then
-			continue
-		fi
-
-		# strip region subtag if $lang is in the list
-		if has ${lang} "${MOZ_TOO_REGIONALIZED_FOR_L10N[@]}" ; then
-			xflag=${lang%%-*}
-		else
-			xflag=${lang}
-		fi
-
-		SRC_URI+=" l10n_${xflag/[_@]/-}? ("
-		SRC_URI+=" ${MOZ_SRC_BASE_URI}/linux-x86_64/xpi/${lang}.xpi -> ${MOZ_P_DISTFILES}-${lang}.xpi"
-		SRC_URI+=" )"
-		IUSE+=" l10n_${xflag/[_@]/-}"
-	done
-}
-mozilla_set_globals
-
-moz_clear_vendor_checksums() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -ne 1 ]] ; then
-		die "${FUNCNAME} requires exact one argument"
-	fi
-
-	einfo "Clearing cargo checksums for ${1} ..."
-
-	sed -i \
-		-e 's/\("files":{\)[^}]*/\1/' \
-		"${S}"/third_party/rust/${1}/.cargo-checksum.json \
-		|| die
-}
-
-moz_install_xpi() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 2 ]] ; then
-		die "${FUNCNAME} requires at least two arguments"
-	fi
-
-	local DESTDIR=${1}
-	shift
-
-	insinto "${DESTDIR}"
-
-	local emid xpi_file xpi_tmp_dir
-	for xpi_file in "${@}" ; do
-		emid=
-		xpi_tmp_dir=$(mktemp -d --tmpdir="${T}")
-
-		# Unpack XPI
-		unzip -qq "${xpi_file}" -d "${xpi_tmp_dir}" || die
-
-		# Determine extension ID
-		if [[ -f "${xpi_tmp_dir}/install.rdf" ]] ; then
-			emid=$(sed -n -e '/install-manifest/,$ { /em:id/!d; s/.*[\">]\([^\"<>]*\)[\"<].*/\1/; p; q }' "${xpi_tmp_dir}/install.rdf")
-			[[ -z "${emid}" ]] && die "failed to determine extension id from install.rdf"
-		elif [[ -f "${xpi_tmp_dir}/manifest.json" ]] ; then
-			emid=$(sed -n -e 's/.*"id": "\([^"]*\)".*/\1/p' "${xpi_tmp_dir}/manifest.json")
-			[[ -z "${emid}" ]] && die "failed to determine extension id from manifest.json"
-		else
-			die "failed to determine extension id"
-		fi
-
-		einfo "Installing ${emid}.xpi into ${ED}${DESTDIR} ..."
-		newins "${xpi_file}" "${emid}.xpi"
-	done
-}
-
-mozconfig_add_options_ac() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 2 ]] ; then
-		die "${FUNCNAME} requires at least two arguments"
-	fi
-
-	local reason=${1}
-	shift
-
-	local option
-	for option in ${@} ; do
-		echo "ac_add_options ${option} # ${reason}" >>${MOZCONFIG}
-	done
-}
-
-mozconfig_add_options_mk() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 2 ]] ; then
-		die "${FUNCNAME} requires at least two arguments"
-	fi
-
-	local reason=${1}
-	shift
-
-	local option
-	for option in ${@} ; do
-		echo "mk_add_options ${option} # ${reason}" >>${MOZCONFIG}
-	done
-}
-
-mozconfig_use_enable() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 1 ]] ; then
-		die "${FUNCNAME} requires at least one arguments"
-	fi
-
-	local flag=$(use_enable "${@}")
-	mozconfig_add_options_ac "$(use ${1} && echo +${1} || echo -${1})" "${flag}"
-}
-
-mozconfig_use_with() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 1 ]] ; then
-		die "${FUNCNAME} requires at least one arguments"
-	fi
-
-	local flag=$(use_with "${@}")
-	mozconfig_add_options_ac "$(use ${1} && echo +${1} || echo -${1})" "${flag}"
-}
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]] ; then
-		if use pgo ; then
-			if ! has usersandbox $FEATURES ; then
-				die "You must enable usersandbox as X server can not run as root!"
-			fi
-		fi
-
-		# Ensure we have enough disk space to compile
-		if use pgo || use lto || use debug ; then
-			CHECKREQS_DISK_BUILD="13500M"
-		else
-			CHECKREQS_DISK_BUILD="6600M"
-		fi
-
-		check-reqs_pkg_pretend
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]] ; then
-		if use pgo ; then
-			if ! has userpriv ${FEATURES} ; then
-				eerror "Building ${PN} with USE=pgo and FEATURES=-userpriv is not supported!"
-			fi
-		fi
-
-		# Ensure we have enough disk space to compile
-		if use pgo || use lto || use debug ; then
-			CHECKREQS_DISK_BUILD="13500M"
-		else
-			CHECKREQS_DISK_BUILD="6400M"
-		fi
-
-		check-reqs_pkg_setup
-
-		llvm_pkg_setup
-
-		if use clang && use lto ; then
-			local version_lld=$(ld.lld --version 2>/dev/null | awk '{ print $2 }')
-			[[ -n ${version_lld} ]] && version_lld=$(ver_cut 1 "${version_lld}")
-			[[ -z ${version_lld} ]] && die "Failed to read ld.lld version!"
-
-			local version_llvm_rust=$(rustc -Vv 2>/dev/null | grep -F -- 'LLVM version:' | awk '{ print $3 }')
-			[[ -n ${version_llvm_rust} ]] && version_llvm_rust=$(ver_cut 1 "${version_llvm_rust}")
-			[[ -z ${version_llvm_rust} ]] && die "Failed to read used LLVM version from rustc!"
-
-			if ver_test "${version_lld}" -ne "${version_llvm_rust}" ; then
-				eerror "Rust is using LLVM version ${version_llvm_rust} but ld.lld version belongs to LLVM version ${version_lld}."
-				eerror "You will be unable to link ${CATEGORY}/${PN}. To proceed you have the following options:"
-				eerror "  - Manually switch rust version using 'eselect rust' to match used LLVM version"
-				eerror "  - Switch to dev-lang/rust[system-llvm] which will guarantee matching version"
-				eerror "  - Build ${CATEGORY}/${PN} without USE=lto"
-				eerror "  - Rebuild lld with llvm that was used to build rust (may need to rebuild the whole "
-				eerror "    llvm/clang/lld/rust chain depending on your @world updates)"
-				die "LLVM version used by Rust (${version_llvm_rust}) does not match with ld.lld version (${version_lld})!"
-			fi
-		fi
-
-		python-any-r1_pkg_setup
-
-		# Avoid PGO profiling problems due to enviroment leakage
-		# These should *always* be cleaned up anyway
-		unset \
-			DBUS_SESSION_BUS_ADDRESS \
-			DISPLAY \
-			ORBIT_SOCKETDIR \
-			SESSION_MANAGER \
-			XAUTHORITY \
-			XDG_CACHE_HOME \
-			XDG_SESSION_COOKIE
-
-		# Build system is using /proc/self/oom_score_adj, bug #604394
-		addpredict /proc/self/oom_score_adj
-
-		if use pgo ; then
-			# Allow access to GPU during PGO run
-			local ati_cards mesa_cards nvidia_cards render_cards
-			shopt -s nullglob
-
-			ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
-			if [[ -n "${ati_cards}" ]] ; then
-				addpredict "${ati_cards}"
-			fi
-
-			mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
-			if [[ -n "${mesa_cards}" ]] ; then
-				addpredict "${mesa_cards}"
-			fi
-
-			nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
-			if [[ -n "${nvidia_cards}" ]] ; then
-				addpredict "${nvidia_cards}"
-			fi
-
-			render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
-			if [[ -n "${render_cards}" ]] ; then
-				addpredict "${render_cards}"
-			fi
-
-			shopt -u nullglob
-		fi
-
-		if ! mountpoint -q /dev/shm ; then
-			# If /dev/shm is not available, configure is known to fail with
-			# a traceback report referencing /usr/lib/pythonN.N/multiprocessing/synchronize.py
-			ewarn "/dev/shm is not mounted -- expect build failures!"
-		fi
-
-		# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
-		# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
-		# get your own set of keys.
-		if [[ -z "${MOZ_API_KEY_GOOGLE+set}" ]] ; then
-			MOZ_API_KEY_GOOGLE="AIzaSyDEAOvatFogGaPi0eTgsV_ZlEzx0ObmepsMzfAc"
-		fi
-
-		if [[ -z "${MOZ_API_KEY_LOCATION+set}" ]] ; then
-			MOZ_API_KEY_LOCATION="AIzaSyB2h2OuRgGaPicUgy5N-5hsZqiPW6sH3n_rptiQ"
-		fi
-
-		# Mozilla API keys (see https://location.services.mozilla.com/api)
-		# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
-		# get your own set of keys.
-		if [[ -z "${MOZ_API_KEY_MOZILLA+set}" ]] ; then
-			MOZ_API_KEY_MOZILLA="edb3d487-3a84-46m0ap1e3-9dfd-92b5efaaa005"
-		fi
-
-		# Ensure we use C locale when building, bug #746215
-		export LC_ALL=C
-	fi
-}
-
-src_unpack() {
-	local _lp_dir="${WORKDIR}/language_packs"
-	local _src_file
-
-	if [[ ! -d "${_lp_dir}" ]] ; then
-		mkdir "${_lp_dir}" || die
-	fi
-
-	for _src_file in ${A} ; do
-		if [[ ${_src_file} == *.xpi ]]; then
-			cp "${DISTDIR}/${_src_file}" "${_lp_dir}" || die "Failed to copy '${_src_file}' to '${_lp_dir}'!"
-		else
-			unpack ${_src_file}
-		fi
-	done
-}
-
-src_prepare() {
-	if use lto; then
-		rm -v "${WORKDIR}"/firefox-patches/*-LTO-Only-enable-LTO-*.patch || die
-	fi
-
-	eapply "${WORKDIR}/firefox-patches"
-
-	# Allow user to apply any additional patches without modifing ebuild
-	eapply_user
-
-	# Make cargo respect MAKEOPTS
-	export CARGO_BUILD_JOBS="$(makeopts_jobs)"
-
-	# Make LTO respect MAKEOPTS
-	sed -i \
-		-e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
-		"${S}"/build/moz.configure/lto-pgo.configure \
-		|| die "sed failed to set num_cores"
-
-	# Make ICU respect MAKEOPTS
-	sed -i \
-		-e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
-		"${S}"/intl/icu_sources_data.py \
-		|| die "sed failed to set num_cores"
-
-	# sed-in toolchain prefix
-	sed -i \
-		-e "s/objdump/${CHOST}-objdump/" \
-		"${S}"/python/mozbuild/mozbuild/configure/check_debug_ranges.py \
-		|| die "sed failed to set toolchain prefix"
-
-	sed -i \
-		-e 's/ccache_stats = None/return None/' \
-		"${S}"/python/mozbuild/mozbuild/controller/building.py \
-		|| die "sed failed to disable ccache stats call"
-
-	einfo "Removing pre-built binaries ..."
-	find "${S}"/third_party -type f \( -name '*.so' -o -name '*.o' \) -print -delete || die
-
-	# Create build dir
-	BUILD_DIR="${WORKDIR}/${PN}_build"
-	mkdir -p "${BUILD_DIR}" || die
-
-	# Write API keys to disk
-	echo -n "${MOZ_API_KEY_GOOGLE//gGaPi/}" > "${S}"/api-google.key || die
-	echo -n "${MOZ_API_KEY_LOCATION//gGaPi/}" > "${S}"/api-location.key || die
-	echo -n "${MOZ_API_KEY_MOZILLA//m0ap1/}" > "${S}"/api-mozilla.key || die
-
-	xdg_environment_reset
-}
-
-src_configure() {
-	# Show flags set at the beginning
-	einfo "Current BINDGEN_CFLAGS:\t${BINDGEN_CFLAGS:-no value set}"
-	einfo "Current CFLAGS:\t\t${CFLAGS:-no value set}"
-	einfo "Current CXXFLAGS:\t\t${CXXFLAGS:-no value set}"
-	einfo "Current LDFLAGS:\t\t${LDFLAGS:-no value set}"
-	einfo "Current RUSTFLAGS:\t\t${RUSTFLAGS:-no value set}"
-
-	local have_switched_compiler=
-	if use clang && ! tc-is-clang ; then
-		# Force clang
-		einfo "Enforcing the use of clang due to USE=clang ..."
-		have_switched_compiler=yes
-		AR=llvm-ar
-		AS=llvm-as
-		CC=${CHOST}-clang
-		CXX=${CHOST}-clang++
-		NM=llvm-nm
-		RANLIB=llvm-ranlib
-	elif ! use clang && ! tc-is-gcc ; then
-		# Force gcc
-		have_switched_compiler=yes
-		einfo "Enforcing the use of gcc due to USE=-clang ..."
-		AR=gcc-ar
-		CC=${CHOST}-gcc
-		CXX=${CHOST}-g++
-		NM=gcc-nm
-		RANLIB=gcc-ranlib
-	fi
-
-	if [[ -n "${have_switched_compiler}" ]] ; then
-		# Because we switched active compiler we have to ensure
-		# that no unsupported flags are set
-		strip-unsupported-flags
-	fi
-
-	# Ensure we use correct toolchain
-	export HOST_CC="$(tc-getBUILD_CC)"
-	export HOST_CXX="$(tc-getBUILD_CXX)"
-	tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
-
-	# Pass the correct toolchain paths through cbindgen
-	if tc-is-cross-compiler ; then
-		export BINDGEN_CFLAGS="${SYSROOT:+--sysroot=${ESYSROOT}} --target=${CHOST} ${BINDGEN_CFLAGS-}"
-	fi
-
-	# Set MOZILLA_FIVE_HOME
-	export MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
-
-	# python/mach/mach/mixin/process.py fails to detect SHELL
-	export SHELL="${EPREFIX}/bin/bash"
-
-	# Set state path
-	export MOZBUILD_STATE_PATH="${BUILD_DIR}"
-
-	# Set MOZCONFIG
-	export MOZCONFIG="${S}/.mozconfig"
-
-	# Initialize MOZCONFIG
-	mozconfig_add_options_ac '' --enable-application=comm/mail
-
-	# Set Gentoo defaults
-	export MOZILLA_OFFICIAL=1
-
-	mozconfig_add_options_ac 'Gentoo default' \
-		--allow-addon-sideload \
-		--disable-cargo-incremental \
-		--disable-crashreporter \
-		--disable-gpsd \
-		--disable-install-strip \
-		--disable-parental-controls \
-		--disable-strip \
-		--disable-updater \
-		--enable-js-shell \
-		--enable-negotiateauth \
-		--enable-new-pass-manager \
-		--enable-official-branding \
-		--enable-release \
-		--enable-system-ffi \
-		--enable-system-pixman \
-		--host="${CBUILD:-${CHOST}}" \
-		--libdir="${EPREFIX}/usr/$(get_libdir)" \
-		--prefix="${EPREFIX}/usr" \
-		--target="${CHOST}" \
-		--without-ccache \
-		--without-wasm-sandboxed-libraries \
-		--with-intl-api \
-		--with-libclang-path="$(llvm-config --libdir)" \
-		--with-system-nspr \
-		--with-system-nss \
-		--with-system-zlib \
-		--with-toolchain-prefix="${CHOST}-" \
-		--with-unsigned-addon-scopes=app,system \
-		--x-includes="${ESYSROOT}/usr/include" \
-		--x-libraries="${ESYSROOT}/usr/$(get_libdir)"
-
-	# Set update channel
-	local update_channel=release
-	[[ -n ${MOZ_ESR} ]] && update_channel=esr
-	mozconfig_add_options_ac '' --update-channel=${update_channel}
-
-	if ! use x86 && [[ ${CHOST} != armv*h* ]] ; then
-		mozconfig_add_options_ac '' --enable-rust-simd
-	fi
-
-	# For future keywording: This is currently (97.0) only supported on:
-	# amd64, arm, arm64 & x86.
-	# Might want to flip the logic around if Firefox is to support more arches.
-	if use ppc64; then
-		mozconfig_add_options_ac '' --disable-sandbox
-	else
-		mozconfig_add_options_ac '' --enable-sandbox
-	fi
-
-	if [[ -s "${S}/api-google.key" ]] ; then
-		local key_origin="Gentoo default"
-		if [[ $(cat "${S}/api-google.key" | md5sum | awk '{ print $1 }') != 709560c02f94b41f9ad2c49207be6c54 ]] ; then
-			key_origin="User value"
-		fi
-
-		mozconfig_add_options_ac "${key_origin}" \
-			--with-google-safebrowsing-api-keyfile="${S}/api-google.key"
-	else
-		einfo "Building without Google API key ..."
-	fi
-
-	if [[ -s "${S}/api-location.key" ]] ; then
-		local key_origin="Gentoo default"
-		if [[ $(cat "${S}/api-location.key" | md5sum | awk '{ print $1 }') != ffb7895e35dedf832eb1c5d420ac7420 ]] ; then
-			key_origin="User value"
-		fi
-
-		mozconfig_add_options_ac "${key_origin}" \
-			--with-google-location-service-api-keyfile="${S}/api-location.key"
-	else
-		einfo "Building without Location API key ..."
-	fi
-
-	if [[ -s "${S}/api-mozilla.key" ]] ; then
-		local key_origin="Gentoo default"
-		if [[ $(cat "${S}/api-mozilla.key" | md5sum | awk '{ print $1 }') != 3927726e9442a8e8fa0e46ccc39caa27 ]] ; then
-			key_origin="User value"
-		fi
-
-		mozconfig_add_options_ac "${key_origin}" \
-			--with-mozilla-api-keyfile="${S}/api-mozilla.key"
-	else
-		einfo "Building without Mozilla API key ..."
-	fi
-
-	mozconfig_use_with system-av1
-	mozconfig_use_with system-harfbuzz
-	mozconfig_use_with system-harfbuzz system-graphite2
-	mozconfig_use_with system-icu
-	mozconfig_use_with system-jpeg
-	mozconfig_use_with system-libevent
-	mozconfig_use_with system-libvpx
-	mozconfig_use_with system-png
-	mozconfig_use_with system-webp
-
-	if use system-librnp; then
-		mozconfig_add_options_ac "+system-librnp" --enable-compile-environment
-		mozconfig_use_with system-librnp
-	fi
-
-	mozconfig_use_enable dbus
-	mozconfig_use_enable libproxy
-
-	use eme-free && mozconfig_add_options_ac '+eme-free' --disable-eme
-
-	if use hardened ; then
-		mozconfig_add_options_ac "+hardened" --enable-hardening
-		append-ldflags "-Wl,-z,relro -Wl,-z,now"
-	fi
-
-	local myaudiobackends=""
-	use jack && myaudiobackends+="jack,"
-	use sndio && myaudiobackends+="sndio,"
-	use pulseaudio && myaudiobackends+="pulseaudio,"
-	! use pulseaudio && myaudiobackends+="alsa,"
-
-	mozconfig_add_options_ac '--enable-audio-backends' --enable-audio-backends="${myaudiobackends::-1}"
-
-	mozconfig_use_enable wifi necko-wifi
-
-	if use wayland ; then
-		mozconfig_add_options_ac '+x11+wayland' --enable-default-toolkit=cairo-gtk3-x11-wayland
-	else
-		mozconfig_add_options_ac '+x11' --enable-default-toolkit=cairo-gtk3
-	fi
-
-	if use lto ; then
-		if use clang ; then
-			# Upstream only supports lld when using clang
-			mozconfig_add_options_ac "forcing ld=lld due to USE=clang and USE=lto" --enable-linker=lld
-
-			mozconfig_add_options_ac '+lto' --enable-lto=cross
-
-		else
-			# ThinLTO is currently broken, see bmo#1644409
-			mozconfig_add_options_ac '+lto' --enable-lto=full
-			mozconfig_add_options_ac "linker is set to bfd" --enable-linker=bfd
-		fi
-
-		if use pgo ; then
-			mozconfig_add_options_ac '+pgo' MOZ_PGO=1
-
-			if use clang ; then
-				# Used in build/pgo/profileserver.py
-				export LLVM_PROFDATA="llvm-profdata"
-			fi
-		fi
-	else
-		# Avoid auto-magic on linker
-		if use clang ; then
-			# This is upstream's default
-			mozconfig_add_options_ac "forcing ld=lld due to USE=clang" --enable-linker=lld
-		else
-			mozconfig_add_options_ac "linker is set to bfd" --enable-linker=bfd
-		fi
-	fi
-
-	# LTO flag was handled via configure
-	filter-flags '-flto*'
-
-	mozconfig_use_enable debug
-	if use debug ; then
-		mozconfig_add_options_ac '+debug' --disable-optimize
-	else
-		if is-flag '-g*' ; then
-			if use clang ; then
-				mozconfig_add_options_ac 'from CFLAGS' --enable-debug-symbols=$(get-flag '-g*')
-			else
-				mozconfig_add_options_ac 'from CFLAGS' --enable-debug-symbols
-			fi
-		else
-			mozconfig_add_options_ac 'Gentoo default' --disable-debug-symbols
-		fi
-
-		if is-flag '-O0' ; then
-			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O0
-		elif is-flag '-O4' ; then
-			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O4
-		elif is-flag '-O3' ; then
-			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O3
-		elif is-flag '-O1' ; then
-			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O1
-		elif is-flag '-Os' ; then
-			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-Os
-		else
-			mozconfig_add_options_ac "Gentoo default" --enable-optimize=-O2
-		fi
-	fi
-
-	# Debug flag was handled via configure
-	filter-flags '-g*'
-
-	# Optimization flag was handled via configure
-	filter-flags '-O*'
-
-	# Modifications to better support ARM, bug #553364
-	if use cpu_flags_arm_neon ; then
-		mozconfig_add_options_ac '+cpu_flags_arm_neon' --with-fpu=neon
-
-		if ! tc-is-clang ; then
-			# thumb options aren't supported when using clang, bug 666966
-			mozconfig_add_options_ac '+cpu_flags_arm_neon' \
-				--with-thumb=yes \
-				--with-thumb-interwork=no
-		fi
-	fi
-
-	if [[ ${CHOST} == armv*h* ]] ; then
-		mozconfig_add_options_ac 'CHOST=armv*h*' --with-float-abi=hard
-
-		if ! use system-libvpx ; then
-			sed -i \
-				-e "s|softfp|hard|" \
-				"${S}"/media/libvpx/moz.build \
-				|| die
-		fi
-	fi
-
-	if use clang ; then
-		# https://bugzilla.mozilla.org/show_bug.cgi?id=1482204
-		# https://bugzilla.mozilla.org/show_bug.cgi?id=1483822
-		# toolkit/moz.configure Elfhack section: target.cpu in ('arm', 'x86', 'x86_64')
-		local disable_elf_hack=
-		if use amd64 ; then
-			disable_elf_hack=yes
-		elif use x86 ; then
-			disable_elf_hack=yes
-		elif use arm ; then
-			disable_elf_hack=yes
-		fi
-
-		if [[ -n ${disable_elf_hack} ]] ; then
-			mozconfig_add_options_ac 'elf-hack is broken when using Clang' --disable-elf-hack
-		fi
-	elif tc-is-gcc ; then
-		if ver_test $(gcc-fullversion) -ge 10 ; then
-			einfo "Forcing -fno-tree-loop-vectorize to workaround GCC bug, see bug 758446 ..."
-			append-cxxflags -fno-tree-loop-vectorize
-		fi
-	fi
-
-	# Additional ARCH support
-	case "${ARCH}" in
-		arm)
-			# Reduce the memory requirements for linking
-			if use clang ; then
-				# Nothing to do
-				:;
-			elif use lto ; then
-				append-ldflags -Wl,--no-keep-memory
-			else
-				append-ldflags -Wl,--no-keep-memory -Wl,--reduce-memory-overheads
-			fi
-			;;
-	esac
-
-	if ! use elibc_glibc ; then
-		mozconfig_add_options_ac '!elibc_glibc' --disable-jemalloc
-	fi
-
-	# Allow elfhack to work in combination with unstripped binaries
-	# when they would normally be larger than 2GiB.
-	append-ldflags "-Wl,--compress-debug-sections=zlib"
-
-	# Make revdep-rebuild.sh happy; Also required for musl
-	append-ldflags -Wl,-rpath="${MOZILLA_FIVE_HOME}",--enable-new-dtags
-
-	# Pass $MAKEOPTS to build system
-	export MOZ_MAKE_FLAGS="${MAKEOPTS}"
-
-	# Use system's Python environment
-	PIP_NETWORK_INSTALL_RESTRICTED_VIRTUALENVS=mach
-
-	if use system-python-libs; then
-		export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE="system"
-	else
-		export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE="none"
-	fi
-
-	# Disable notification when build system has finished
-	export MOZ_NOSPAM=1
-
-	# Portage sets XARGS environment variable to "xargs -r" by default which
-	# breaks build system's check_prog() function which doesn't support arguments
-	mozconfig_add_options_ac 'Gentoo default' "XARGS=${EPREFIX}/usr/bin/xargs"
-
-	# Set build dir
-	mozconfig_add_options_mk 'Gentoo default' "MOZ_OBJDIR=${BUILD_DIR}"
-
-	# Show flags we will use
-	einfo "Build BINDGEN_CFLAGS:\t${BINDGEN_CFLAGS:-no value set}"
-	einfo "Build CFLAGS:\t\t${CFLAGS:-no value set}"
-	einfo "Build CXXFLAGS:\t\t${CXXFLAGS:-no value set}"
-	einfo "Build LDFLAGS:\t\t${LDFLAGS:-no value set}"
-	einfo "Build RUSTFLAGS:\t\t${RUSTFLAGS:-no value set}"
-
-	# Handle EXTRA_CONF and show summary
-	local ac opt hash reason
-
-	# Apply EXTRA_ECONF entries to $MOZCONFIG
-	if [[ -n ${EXTRA_ECONF} ]] ; then
-		IFS=\! read -a ac <<<${EXTRA_ECONF// --/\!}
-		for opt in "${ac[@]}"; do
-			mozconfig_add_options_ac "EXTRA_ECONF" --${opt#--}
-		done
-	fi
-
-	echo
-	echo "=========================================================="
-	echo "Building ${PF} with the following configuration"
-	grep ^ac_add_options "${MOZCONFIG}" | while read ac opt hash reason; do
-		[[ -z ${hash} || ${hash} == \# ]] \
-			|| die "error reading mozconfig: ${ac} ${opt} ${hash} ${reason}"
-		printf "    %-30s  %s\n" "${opt}" "${reason:-mozilla.org default}"
-	done
-	echo "=========================================================="
-	echo
-
-	./mach configure || die
-}
-
-src_compile() {
-	local virtx_cmd=
-
-	if use pgo ; then
-		virtx_cmd=virtx
-
-		# Reset and cleanup environment variables used by GNOME/XDG
-		gnome2_environment_reset
-
-		addpredict /root
-	fi
-
-	local -x GDK_BACKEND=x11
-
-	${virtx_cmd} ./mach build --verbose \
-		|| die
-}
-
-src_install() {
-	# xpcshell is getting called during install
-	pax-mark m \
-		"${BUILD_DIR}"/dist/bin/xpcshell \
-		"${BUILD_DIR}"/dist/bin/${PN} \
-		"${BUILD_DIR}"/dist/bin/plugin-container
-
-	DESTDIR="${D}" ./mach install || die
-
-	# Upstream cannot ship symlink but we can (bmo#658850)
-	rm "${ED}${MOZILLA_FIVE_HOME}/${PN}-bin" || die
-	dosym ${PN} ${MOZILLA_FIVE_HOME}/${PN}-bin
-
-	# Don't install llvm-symbolizer from sys-devel/llvm package
-	if [[ -f "${ED}${MOZILLA_FIVE_HOME}/llvm-symbolizer" ]] ; then
-		rm -v "${ED}${MOZILLA_FIVE_HOME}/llvm-symbolizer" || die
-	fi
-
-	# Install policy (currently only used to disable application updates)
-	insinto "${MOZILLA_FIVE_HOME}/distribution"
-	newins "${FILESDIR}"/distribution.ini distribution.ini
-	newins "${FILESDIR}"/disable-auto-update.policy.json policies.json
-
-	# Install system-wide preferences
-	local PREFS_DIR="${MOZILLA_FIVE_HOME}/defaults/pref"
-	insinto "${PREFS_DIR}"
-	newins "${FILESDIR}"/gentoo-default-prefs.js gentoo-prefs.js
-
-	local GENTOO_PREFS="${ED}${PREFS_DIR}/gentoo-prefs.js"
-
-	# Set dictionary path to use system hunspell
-	cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set spellchecker.dictionary_path pref"
-	pref("spellchecker.dictionary_path",       "${EPREFIX}/usr/share/myspell");
-	EOF
-
-	# Force hwaccel prefs if USE=hwaccel is enabled
-	if use hwaccel ; then
-		cat "${FILESDIR}"/gentoo-hwaccel-prefs.js \
-		>>"${GENTOO_PREFS}" \
-		|| die "failed to add prefs to force hardware-accelerated rendering to all-gentoo.js"
-
-		if use wayland; then
-			cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set hwaccel wayland prefs"
-			pref("gfx.x11-egl.force-enabled",          false);
-			EOF
-		else
-			cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set hwaccel x11 prefs"
-			pref("gfx.x11-egl.force-enabled",          true);
-			EOF
-		fi
-	fi
-
-	# Force the graphite pref if USE=system-harfbuzz is enabled, since the pref cannot disable it
-	if use system-harfbuzz ; then
-		cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set gfx.font_rendering.graphite.enabled pref"
-		sticky_pref("gfx.font_rendering.graphite.enabled", true);
-		EOF
-	fi
-
-	# Install language packs
-	local langpacks=( $(find "${WORKDIR}/language_packs" -type f -name '*.xpi') )
-	if [[ -n "${langpacks}" ]] ; then
-		moz_install_xpi "${MOZILLA_FIVE_HOME}/distribution/extensions" "${langpacks[@]}"
-	fi
-
-	# Install icons
-	local icon_srcdir="${S}/comm/mail/branding/thunderbird"
-	local icon_symbolic_file="${icon_srcdir}/TB-symbolic.svg"
-
-	insinto /usr/share/icons/hicolor/symbolic/apps
-	newins "${icon_symbolic_file}" ${PN}-symbolic.svg
-
-	local icon size
-	for icon in "${icon_srcdir}"/default*.png ; do
-		size=${icon%.png}
-		size=${size##*/default}
-
-		if [[ ${size} -eq 48 ]] ; then
-			newicon "${icon}" ${PN}.png
-		fi
-
-		newicon -s ${size} "${icon}" ${PN}.png
-	done
-
-	# Install menu
-	local app_name="Mozilla ${MOZ_PN^}"
-	local desktop_file="${FILESDIR}/icon/${PN}-r2.desktop"
-	local desktop_filename="${PN}.desktop"
-	local exec_command="${PN}"
-	local icon="${PN}"
-	local use_wayland="false"
-
-	if use wayland ; then
-		use_wayland="true"
-	fi
-
-	cp "${desktop_file}" "${WORKDIR}/${PN}.desktop-template" || die
-
-	sed -i \
-		-e "s:@NAME@:${app_name}:" \
-		-e "s:@EXEC@:${exec_command}:" \
-		-e "s:@ICON@:${icon}:" \
-		"${WORKDIR}/${PN}.desktop-template" \
-		|| die
-
-	newmenu "${WORKDIR}/${PN}.desktop-template" "${desktop_filename}"
-
-	rm "${WORKDIR}/${PN}.desktop-template" || die
-
-	# Install wrapper script
-	[[ -f "${ED}/usr/bin/${PN}" ]] && rm "${ED}/usr/bin/${PN}"
-	newbin "${FILESDIR}/${PN}-r1.sh" ${PN}
-
-	# Update wrapper
-	sed -i \
-		-e "s:@PREFIX@:${EPREFIX}/usr:" \
-		-e "s:@MOZ_FIVE_HOME@:${MOZILLA_FIVE_HOME}:" \
-		-e "s:@APULSELIB_DIR@:${apulselib}:" \
-		-e "s:@DEFAULT_WAYLAND@:${use_wayland}:" \
-		"${ED}/usr/bin/${PN}" \
-		|| die
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-
-	# If the apulse libs are available in MOZILLA_FIVE_HOME then apulse
-	# does not need to be forced into the LD_LIBRARY_PATH
-	if use pulseaudio && has_version ">=media-sound/apulse-0.1.12-r4" ; then
-		einfo "APULSE found; Generating library symlinks for sound support ..."
-		local lib
-		pushd "${ED}${MOZILLA_FIVE_HOME}" &>/dev/null || die
-		for lib in ../apulse/libpulse{.so{,.0},-simple.so{,.0}} ; do
-			# A quickpkg rolled by hand will grab symlinks as part of the package,
-			# so we need to avoid creating them if they already exist.
-			if [[ ! -L ${lib##*/} ]] ; then
-				ln -s "${lib}" ${lib##*/} || die
-			fi
-		done
-		popd &>/dev/null || die
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	if use pulseaudio && has_version ">=media-sound/apulse-0.1.12-r4" ; then
-		elog "Apulse was detected at merge time on this system and so it will always be"
-		elog "used for sound.  If you wish to use pulseaudio instead please unmerge"
-		elog "media-sound/apulse."
-		elog
-	fi
-
-	local show_doh_information
-	local show_shortcut_information
-
-	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
-		# New install; Tell user that DoH is disabled by default
-		show_doh_information=yes
-		show_shortcut_information=no
-	else
-		local replacing_version
-		for replacing_version in ${REPLACING_VERSIONS} ; do
-			if ver_test "${replacing_version}" -lt 91.0 ; then
-				# Tell user that we no longer install a shortcut
-				# per supported display protocol
-				show_shortcut_information=yes
-			fi
-		done
-	fi
-
-	if [[ -n "${show_doh_information}" ]] ; then
-		elog
-		elog "Note regarding Trusted Recursive Resolver aka DNS-over-HTTPS (DoH):"
-		elog "Due to privacy concerns (encrypting DNS might be a good thing, sending all"
-		elog "DNS traffic to Cloudflare by default is not a good idea and applications"
-		elog "should respect OS configured settings), \"network.trr.mode\" was set to 5"
-		elog "(\"Off by choice\") by default."
-		elog "You can enable DNS-over-HTTPS in ${PN^}'s preferences."
-	fi
-
-	if [[ -n "${show_shortcut_information}" ]] ; then
-		elog
-		elog "Since ${PN}-91.0 we no longer install multiple shortcuts for"
-		elog "each supported display protocol.  Instead we will only install"
-		elog "one generic Mozilla ${PN^} shortcut."
-		elog "If you still want to be able to select between running Mozilla ${PN^}"
-		elog "on X11 or Wayland, you have to re-create these shortcuts on your own."
-	fi
-
-	# bug 835078
-	if use hwaccel && has_version "x11-drivers/xf86-video-nouveau"; then
-		ewarn "You have nouveau drivers installed in your system and 'hwaccel' "
-		ewarn "enabled for Firefox. Nouveau / your GPU might not support the "
-		ewarn "required EGL, so either disable 'hwaccel' or try the workaround "
-		ewarn "explained in https://bugs.gentoo.org/835078#c5 if Firefox crashes."
-	fi
-
-	optfeature_header "Optional runtime features:"
-	optfeature "encrypted chat support" net-libs/libotr
-}
diff --git a/mail-client/thunderbird/thunderbird-102.3.2.ebuild b/mail-client/thunderbird/thunderbird-102.3.2.ebuild
deleted file mode 100644
index 96dac65ec06c..000000000000
--- a/mail-client/thunderbird/thunderbird-102.3.2.ebuild
+++ /dev/null
@@ -1,1165 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-FIREFOX_PATCHSET="firefox-102esr-patches-04j.tar.xz"
-
-LLVM_MAX_SLOT=14
-
-PYTHON_COMPAT=( python3_{8..11} )
-PYTHON_REQ_USE="ncurses,sqlite,ssl"
-
-WANT_AUTOCONF="2.1"
-
-VIRTUALX_REQUIRED="pgo"
-
-MOZ_ESR=
-
-MOZ_PV=${PV}
-MOZ_PV_SUFFIX=
-if [[ ${PV} =~ (_(alpha|beta|rc).*)$ ]] ; then
-	MOZ_PV_SUFFIX=${BASH_REMATCH[1]}
-
-	# Convert the ebuild version to the upstream Mozilla version
-	MOZ_PV="${MOZ_PV/_alpha/a}" # Handle alpha for SRC_URI
-	MOZ_PV="${MOZ_PV/_beta/b}"  # Handle beta for SRC_URI
-	MOZ_PV="${MOZ_PV%%_rc*}"    # Handle rc for SRC_URI
-fi
-
-if [[ -n ${MOZ_ESR} ]] ; then
-	# ESR releases have slightly different version numbers
-	MOZ_PV="${MOZ_PV}esr"
-fi
-
-MOZ_PN="${PN%-bin}"
-MOZ_P="${MOZ_PN}-${MOZ_PV}"
-MOZ_PV_DISTFILES="${MOZ_PV}${MOZ_PV_SUFFIX}"
-MOZ_P_DISTFILES="${MOZ_PN}-${MOZ_PV_DISTFILES}"
-
-inherit autotools check-reqs desktop flag-o-matic gnome2-utils \
-	llvm multiprocessing optfeature pax-utils python-any-r1 toolchain-funcs \
-	virtualx xdg
-
-MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/releases/${MOZ_PV}"
-
-if [[ ${PV} == *_rc* ]] ; then
-	MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/candidates/${MOZ_PV}-candidates/build${PV##*_rc}"
-fi
-
-PATCH_URIS=(
-	https://dev.gentoo.org/~{juippis,whissi,slashbeast}/mozilla/patchsets/${FIREFOX_PATCHSET}
-)
-
-SRC_URI="${MOZ_SRC_BASE_URI}/source/${MOZ_P}.source.tar.xz -> ${MOZ_P_DISTFILES}.source.tar.xz
-	${PATCH_URIS[@]}"
-
-DESCRIPTION="Thunderbird Mail Client"
-HOMEPAGE="https://www.thunderbird.net/"
-
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-
-SLOT="0"
-LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-
-IUSE="+clang cpu_flags_arm_neon dbus debug eme-free hardened hwaccel"
-IUSE+=" jack libproxy lto +openh264 pgo pulseaudio sndio selinux"
-IUSE+=" +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent +system-libvpx system-png system-python-libs +system-webp"
-IUSE+=" wayland wifi"
-
-# Thunderbird-only USE flags.
-IUSE+=" +system-librnp"
-
-REQUIRED_USE="debug? ( !system-av1 )
-	pgo? ( lto )
-	wayland? ( dbus )
-	wifi? ( dbus )"
-
-# Thunderbird-only dependencies.
-TB_ONLY_DEPEND="!<x11-plugins/enigmail-2.2
-	selinux? ( sec-policy/selinux-thunderbird )
-	!system-librnp? ( dev-libs/jsoncpp )
-	system-librnp? ( dev-util/librnp:= )"
-BDEPEND="${PYTHON_DEPS}
-	app-arch/unzip
-	app-arch/zip
-	>=dev-util/cbindgen-0.24.3
-	net-libs/nodejs
-	virtual/pkgconfig
-	virtual/rust
-	|| (
-		(
-			sys-devel/clang:14
-			sys-devel/llvm:14
-			clang? (
-				=sys-devel/lld-14*
-				pgo? ( =sys-libs/compiler-rt-sanitizers-14*[profile] )
-			)
-		)
-		(
-			sys-devel/clang:13
-			sys-devel/llvm:13
-			clang? (
-				=sys-devel/lld-13*
-				pgo? ( =sys-libs/compiler-rt-sanitizers-13*[profile] )
-			)
-		)
-	)
-	amd64? ( >=dev-lang/nasm-2.14 )
-	x86? ( >=dev-lang/nasm-2.14 )"
-
-COMMON_DEPEND="${TB_ONLY_DEPEND}
-	dev-libs/atk
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/libffi:=
-	>=dev-libs/nss-3.79
-	>=dev-libs/nspr-4.34
-	media-libs/alsa-lib
-	media-libs/fontconfig
-	media-libs/freetype
-	media-libs/mesa
-	media-video/ffmpeg
-	sys-libs/zlib
-	virtual/freedesktop-icon-theme
-	virtual/opengl
-	x11-libs/cairo[X]
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:3[X]
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXrandr
-	x11-libs/libXtst
-	x11-libs/libxcb:=
-	x11-libs/libxkbcommon[X]
-	x11-libs/pango
-	x11-libs/pixman
-	dbus? (
-		dev-libs/dbus-glib
-		sys-apps/dbus
-	)
-	jack? ( virtual/jack )
-	libproxy? ( net-libs/libproxy )
-	sndio? ( >=media-sound/sndio-1.8.0-r1 )
-	system-av1? (
-		>=media-libs/dav1d-1.0.0:=
-		>=media-libs/libaom-1.0.0:=
-	)
-	system-harfbuzz? (
-		>=media-gfx/graphite2-1.3.13
-		>=media-libs/harfbuzz-2.8.1:0=
-	)
-	system-icu? ( >=dev-libs/icu-71.1:= )
-	system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
-	system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] )
-	system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] )
-	system-png? ( >=media-libs/libpng-1.6.35:0=[apng] )
-	system-webp? ( >=media-libs/libwebp-1.1.0:0= )
-	wayland? (
-		x11-libs/gtk+:3[wayland]
-		x11-libs/libdrm
-		x11-libs/libxkbcommon[wayland]
-	)
-	wifi? (
-		kernel_linux? (
-			dev-libs/dbus-glib
-			net-misc/networkmanager
-			sys-apps/dbus
-		)
-	)"
-
-RDEPEND="${COMMON_DEPEND}
-	jack? ( virtual/jack )
-	openh264? ( media-libs/openh264:*[plugin] )
-	pulseaudio? (
-		|| (
-			media-sound/pulseaudio
-			>=media-sound/apulse-0.1.12-r4
-		)
-	)"
-
-DEPEND="${COMMON_DEPEND}
-	x11-libs/libICE
-	x11-libs/libSM
-	pulseaudio? (
-		|| (
-			media-sound/pulseaudio
-			>=media-sound/apulse-0.1.12-r4[sdk]
-		)
-	)"
-
-S="${WORKDIR}/${PN}-${PV%_*}"
-
-llvm_check_deps() {
-	if ! has_version -b "sys-devel/clang:${LLVM_SLOT}" ; then
-		einfo "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-		return 1
-	fi
-
-	if use clang ; then
-		if ! has_version -b "=sys-devel/lld-${LLVM_SLOT}*" ; then
-			einfo "=sys-devel/lld-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-			return 1
-		fi
-
-		if use pgo ; then
-			if ! has_version -b "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}*" ; then
-				einfo "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-				return 1
-			fi
-		fi
-	fi
-
-	einfo "Using LLVM slot ${LLVM_SLOT} to build" >&2
-}
-
-MOZ_LANGS=(
-	af ar ast be bg br ca cak cs cy da de dsb
-	el en-CA en-GB en-US es-AR es-ES es-MX et eu
-	fi fr fy-NL ga-IE gd gl he hr hsb hu
-	id is it ja ka kab kk ko lt lv ms nb-NO nl nn-NO
-	pa-IN pl pt-BR pt-PT rm ro ru
-	sk sl sq sr sv-SE th tr uk uz vi zh-CN zh-TW
-)
-
-mozilla_set_globals() {
-	# https://bugs.gentoo.org/587334
-	local MOZ_TOO_REGIONALIZED_FOR_L10N=(
-		fy-NL ga-IE gu-IN hi-IN hy-AM nb-NO ne-NP nn-NO pa-IN sv-SE
-	)
-
-	local lang xflag
-	for lang in "${MOZ_LANGS[@]}" ; do
-		# en and en_US are handled internally
-		if [[ ${lang} == en ]] || [[ ${lang} == en-US ]] ; then
-			continue
-		fi
-
-		# strip region subtag if $lang is in the list
-		if has ${lang} "${MOZ_TOO_REGIONALIZED_FOR_L10N[@]}" ; then
-			xflag=${lang%%-*}
-		else
-			xflag=${lang}
-		fi
-
-		SRC_URI+=" l10n_${xflag/[_@]/-}? ("
-		SRC_URI+=" ${MOZ_SRC_BASE_URI}/linux-x86_64/xpi/${lang}.xpi -> ${MOZ_P_DISTFILES}-${lang}.xpi"
-		SRC_URI+=" )"
-		IUSE+=" l10n_${xflag/[_@]/-}"
-	done
-}
-mozilla_set_globals
-
-moz_clear_vendor_checksums() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -ne 1 ]] ; then
-		die "${FUNCNAME} requires exact one argument"
-	fi
-
-	einfo "Clearing cargo checksums for ${1} ..."
-
-	sed -i \
-		-e 's/\("files":{\)[^}]*/\1/' \
-		"${S}"/third_party/rust/${1}/.cargo-checksum.json \
-		|| die
-}
-
-moz_install_xpi() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 2 ]] ; then
-		die "${FUNCNAME} requires at least two arguments"
-	fi
-
-	local DESTDIR=${1}
-	shift
-
-	insinto "${DESTDIR}"
-
-	local emid xpi_file xpi_tmp_dir
-	for xpi_file in "${@}" ; do
-		emid=
-		xpi_tmp_dir=$(mktemp -d --tmpdir="${T}")
-
-		# Unpack XPI
-		unzip -qq "${xpi_file}" -d "${xpi_tmp_dir}" || die
-
-		# Determine extension ID
-		if [[ -f "${xpi_tmp_dir}/install.rdf" ]] ; then
-			emid=$(sed -n -e '/install-manifest/,$ { /em:id/!d; s/.*[\">]\([^\"<>]*\)[\"<].*/\1/; p; q }' "${xpi_tmp_dir}/install.rdf")
-			[[ -z "${emid}" ]] && die "failed to determine extension id from install.rdf"
-		elif [[ -f "${xpi_tmp_dir}/manifest.json" ]] ; then
-			emid=$(sed -n -e 's/.*"id": "\([^"]*\)".*/\1/p' "${xpi_tmp_dir}/manifest.json")
-			[[ -z "${emid}" ]] && die "failed to determine extension id from manifest.json"
-		else
-			die "failed to determine extension id"
-		fi
-
-		einfo "Installing ${emid}.xpi into ${ED}${DESTDIR} ..."
-		newins "${xpi_file}" "${emid}.xpi"
-	done
-}
-
-mozconfig_add_options_ac() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 2 ]] ; then
-		die "${FUNCNAME} requires at least two arguments"
-	fi
-
-	local reason=${1}
-	shift
-
-	local option
-	for option in ${@} ; do
-		echo "ac_add_options ${option} # ${reason}" >>${MOZCONFIG}
-	done
-}
-
-mozconfig_add_options_mk() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 2 ]] ; then
-		die "${FUNCNAME} requires at least two arguments"
-	fi
-
-	local reason=${1}
-	shift
-
-	local option
-	for option in ${@} ; do
-		echo "mk_add_options ${option} # ${reason}" >>${MOZCONFIG}
-	done
-}
-
-mozconfig_use_enable() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 1 ]] ; then
-		die "${FUNCNAME} requires at least one arguments"
-	fi
-
-	local flag=$(use_enable "${@}")
-	mozconfig_add_options_ac "$(use ${1} && echo +${1} || echo -${1})" "${flag}"
-}
-
-mozconfig_use_with() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 1 ]] ; then
-		die "${FUNCNAME} requires at least one arguments"
-	fi
-
-	local flag=$(use_with "${@}")
-	mozconfig_add_options_ac "$(use ${1} && echo +${1} || echo -${1})" "${flag}"
-}
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]] ; then
-		if use pgo ; then
-			if ! has usersandbox $FEATURES ; then
-				die "You must enable usersandbox as X server can not run as root!"
-			fi
-		fi
-
-		# Ensure we have enough disk space to compile
-		if use pgo || use lto || use debug ; then
-			CHECKREQS_DISK_BUILD="13500M"
-		else
-			CHECKREQS_DISK_BUILD="6600M"
-		fi
-
-		check-reqs_pkg_pretend
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]] ; then
-		if use pgo ; then
-			if ! has userpriv ${FEATURES} ; then
-				eerror "Building ${PN} with USE=pgo and FEATURES=-userpriv is not supported!"
-			fi
-		fi
-
-		# Ensure we have enough disk space to compile
-		if use pgo || use lto || use debug ; then
-			CHECKREQS_DISK_BUILD="13500M"
-		else
-			CHECKREQS_DISK_BUILD="6400M"
-		fi
-
-		check-reqs_pkg_setup
-
-		llvm_pkg_setup
-
-		if use clang && use lto ; then
-			local version_lld=$(ld.lld --version 2>/dev/null | awk '{ print $2 }')
-			[[ -n ${version_lld} ]] && version_lld=$(ver_cut 1 "${version_lld}")
-			[[ -z ${version_lld} ]] && die "Failed to read ld.lld version!"
-
-			local version_llvm_rust=$(rustc -Vv 2>/dev/null | grep -F -- 'LLVM version:' | awk '{ print $3 }')
-			[[ -n ${version_llvm_rust} ]] && version_llvm_rust=$(ver_cut 1 "${version_llvm_rust}")
-			[[ -z ${version_llvm_rust} ]] && die "Failed to read used LLVM version from rustc!"
-
-			if ver_test "${version_lld}" -ne "${version_llvm_rust}" ; then
-				eerror "Rust is using LLVM version ${version_llvm_rust} but ld.lld version belongs to LLVM version ${version_lld}."
-				eerror "You will be unable to link ${CATEGORY}/${PN}. To proceed you have the following options:"
-				eerror "  - Manually switch rust version using 'eselect rust' to match used LLVM version"
-				eerror "  - Switch to dev-lang/rust[system-llvm] which will guarantee matching version"
-				eerror "  - Build ${CATEGORY}/${PN} without USE=lto"
-				eerror "  - Rebuild lld with llvm that was used to build rust (may need to rebuild the whole "
-				eerror "    llvm/clang/lld/rust chain depending on your @world updates)"
-				die "LLVM version used by Rust (${version_llvm_rust}) does not match with ld.lld version (${version_lld})!"
-			fi
-		fi
-
-		python-any-r1_pkg_setup
-
-		# Avoid PGO profiling problems due to enviroment leakage
-		# These should *always* be cleaned up anyway
-		unset \
-			DBUS_SESSION_BUS_ADDRESS \
-			DISPLAY \
-			ORBIT_SOCKETDIR \
-			SESSION_MANAGER \
-			XAUTHORITY \
-			XDG_CACHE_HOME \
-			XDG_SESSION_COOKIE
-
-		# Build system is using /proc/self/oom_score_adj, bug #604394
-		addpredict /proc/self/oom_score_adj
-
-		if use pgo ; then
-			# Allow access to GPU during PGO run
-			local ati_cards mesa_cards nvidia_cards render_cards
-			shopt -s nullglob
-
-			ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
-			if [[ -n "${ati_cards}" ]] ; then
-				addpredict "${ati_cards}"
-			fi
-
-			mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
-			if [[ -n "${mesa_cards}" ]] ; then
-				addpredict "${mesa_cards}"
-			fi
-
-			nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
-			if [[ -n "${nvidia_cards}" ]] ; then
-				addpredict "${nvidia_cards}"
-			fi
-
-			render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
-			if [[ -n "${render_cards}" ]] ; then
-				addpredict "${render_cards}"
-			fi
-
-			shopt -u nullglob
-		fi
-
-		if ! mountpoint -q /dev/shm ; then
-			# If /dev/shm is not available, configure is known to fail with
-			# a traceback report referencing /usr/lib/pythonN.N/multiprocessing/synchronize.py
-			ewarn "/dev/shm is not mounted -- expect build failures!"
-		fi
-
-		# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
-		# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
-		# get your own set of keys.
-		if [[ -z "${MOZ_API_KEY_GOOGLE+set}" ]] ; then
-			MOZ_API_KEY_GOOGLE="AIzaSyDEAOvatFogGaPi0eTgsV_ZlEzx0ObmepsMzfAc"
-		fi
-
-		if [[ -z "${MOZ_API_KEY_LOCATION+set}" ]] ; then
-			MOZ_API_KEY_LOCATION="AIzaSyB2h2OuRgGaPicUgy5N-5hsZqiPW6sH3n_rptiQ"
-		fi
-
-		# Mozilla API keys (see https://location.services.mozilla.com/api)
-		# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
-		# get your own set of keys.
-		if [[ -z "${MOZ_API_KEY_MOZILLA+set}" ]] ; then
-			MOZ_API_KEY_MOZILLA="edb3d487-3a84-46m0ap1e3-9dfd-92b5efaaa005"
-		fi
-
-		# Ensure we use C locale when building, bug #746215
-		export LC_ALL=C
-	fi
-}
-
-src_unpack() {
-	local _lp_dir="${WORKDIR}/language_packs"
-	local _src_file
-
-	if [[ ! -d "${_lp_dir}" ]] ; then
-		mkdir "${_lp_dir}" || die
-	fi
-
-	for _src_file in ${A} ; do
-		if [[ ${_src_file} == *.xpi ]]; then
-			cp "${DISTDIR}/${_src_file}" "${_lp_dir}" || die "Failed to copy '${_src_file}' to '${_lp_dir}'!"
-		else
-			unpack ${_src_file}
-		fi
-	done
-}
-
-src_prepare() {
-	if use lto; then
-		rm -v "${WORKDIR}"/firefox-patches/*-LTO-Only-enable-LTO-*.patch || die
-	fi
-
-	eapply "${WORKDIR}/firefox-patches"
-
-	# Allow user to apply any additional patches without modifing ebuild
-	eapply_user
-
-	# Make cargo respect MAKEOPTS
-	export CARGO_BUILD_JOBS="$(makeopts_jobs)"
-
-	# Make LTO respect MAKEOPTS
-	sed -i \
-		-e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
-		"${S}"/build/moz.configure/lto-pgo.configure \
-		|| die "sed failed to set num_cores"
-
-	# Make ICU respect MAKEOPTS
-	sed -i \
-		-e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
-		"${S}"/intl/icu_sources_data.py \
-		|| die "sed failed to set num_cores"
-
-	# sed-in toolchain prefix
-	sed -i \
-		-e "s/objdump/${CHOST}-objdump/" \
-		"${S}"/python/mozbuild/mozbuild/configure/check_debug_ranges.py \
-		|| die "sed failed to set toolchain prefix"
-
-	sed -i \
-		-e 's/ccache_stats = None/return None/' \
-		"${S}"/python/mozbuild/mozbuild/controller/building.py \
-		|| die "sed failed to disable ccache stats call"
-
-	einfo "Removing pre-built binaries ..."
-	find "${S}"/third_party -type f \( -name '*.so' -o -name '*.o' \) -print -delete || die
-
-	# Create build dir
-	BUILD_DIR="${WORKDIR}/${PN}_build"
-	mkdir -p "${BUILD_DIR}" || die
-
-	# Write API keys to disk
-	echo -n "${MOZ_API_KEY_GOOGLE//gGaPi/}" > "${S}"/api-google.key || die
-	echo -n "${MOZ_API_KEY_LOCATION//gGaPi/}" > "${S}"/api-location.key || die
-	echo -n "${MOZ_API_KEY_MOZILLA//m0ap1/}" > "${S}"/api-mozilla.key || die
-
-	xdg_environment_reset
-}
-
-src_configure() {
-	# Show flags set at the beginning
-	einfo "Current BINDGEN_CFLAGS:\t${BINDGEN_CFLAGS:-no value set}"
-	einfo "Current CFLAGS:\t\t${CFLAGS:-no value set}"
-	einfo "Current CXXFLAGS:\t\t${CXXFLAGS:-no value set}"
-	einfo "Current LDFLAGS:\t\t${LDFLAGS:-no value set}"
-	einfo "Current RUSTFLAGS:\t\t${RUSTFLAGS:-no value set}"
-
-	local have_switched_compiler=
-	if use clang && ! tc-is-clang ; then
-		# Force clang
-		einfo "Enforcing the use of clang due to USE=clang ..."
-		have_switched_compiler=yes
-		AR=llvm-ar
-		AS=llvm-as
-		CC=${CHOST}-clang
-		CXX=${CHOST}-clang++
-		NM=llvm-nm
-		RANLIB=llvm-ranlib
-	elif ! use clang && ! tc-is-gcc ; then
-		# Force gcc
-		have_switched_compiler=yes
-		einfo "Enforcing the use of gcc due to USE=-clang ..."
-		AR=gcc-ar
-		CC=${CHOST}-gcc
-		CXX=${CHOST}-g++
-		NM=gcc-nm
-		RANLIB=gcc-ranlib
-	fi
-
-	if [[ -n "${have_switched_compiler}" ]] ; then
-		# Because we switched active compiler we have to ensure
-		# that no unsupported flags are set
-		strip-unsupported-flags
-	fi
-
-	# Ensure we use correct toolchain
-	export HOST_CC="$(tc-getBUILD_CC)"
-	export HOST_CXX="$(tc-getBUILD_CXX)"
-	tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
-
-	# Pass the correct toolchain paths through cbindgen
-	if tc-is-cross-compiler ; then
-		export BINDGEN_CFLAGS="${SYSROOT:+--sysroot=${ESYSROOT}} --target=${CHOST} ${BINDGEN_CFLAGS-}"
-	fi
-
-	# Set MOZILLA_FIVE_HOME
-	export MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
-
-	# python/mach/mach/mixin/process.py fails to detect SHELL
-	export SHELL="${EPREFIX}/bin/bash"
-
-	# Set state path
-	export MOZBUILD_STATE_PATH="${BUILD_DIR}"
-
-	# Set MOZCONFIG
-	export MOZCONFIG="${S}/.mozconfig"
-
-	# Initialize MOZCONFIG
-	mozconfig_add_options_ac '' --enable-application=comm/mail
-
-	# Set Gentoo defaults
-	export MOZILLA_OFFICIAL=1
-
-	mozconfig_add_options_ac 'Gentoo default' \
-		--allow-addon-sideload \
-		--disable-cargo-incremental \
-		--disable-crashreporter \
-		--disable-gpsd \
-		--disable-install-strip \
-		--disable-parental-controls \
-		--disable-strip \
-		--disable-updater \
-		--enable-js-shell \
-		--enable-negotiateauth \
-		--enable-new-pass-manager \
-		--enable-official-branding \
-		--enable-release \
-		--enable-system-ffi \
-		--enable-system-pixman \
-		--host="${CBUILD:-${CHOST}}" \
-		--libdir="${EPREFIX}/usr/$(get_libdir)" \
-		--prefix="${EPREFIX}/usr" \
-		--target="${CHOST}" \
-		--without-ccache \
-		--without-wasm-sandboxed-libraries \
-		--with-intl-api \
-		--with-libclang-path="$(llvm-config --libdir)" \
-		--with-system-nspr \
-		--with-system-nss \
-		--with-system-zlib \
-		--with-toolchain-prefix="${CHOST}-" \
-		--with-unsigned-addon-scopes=app,system \
-		--x-includes="${ESYSROOT}/usr/include" \
-		--x-libraries="${ESYSROOT}/usr/$(get_libdir)"
-
-	# Set update channel
-	local update_channel=release
-	[[ -n ${MOZ_ESR} ]] && update_channel=esr
-	mozconfig_add_options_ac '' --update-channel=${update_channel}
-
-	if ! use x86 && [[ ${CHOST} != armv*h* ]] ; then
-		mozconfig_add_options_ac '' --enable-rust-simd
-	fi
-
-	# For future keywording: This is currently (97.0) only supported on:
-	# amd64, arm, arm64 & x86.
-	# Might want to flip the logic around if Firefox is to support more arches.
-	if use ppc64; then
-		mozconfig_add_options_ac '' --disable-sandbox
-	else
-		mozconfig_add_options_ac '' --enable-sandbox
-	fi
-
-	if [[ -s "${S}/api-google.key" ]] ; then
-		local key_origin="Gentoo default"
-		if [[ $(cat "${S}/api-google.key" | md5sum | awk '{ print $1 }') != 709560c02f94b41f9ad2c49207be6c54 ]] ; then
-			key_origin="User value"
-		fi
-
-		mozconfig_add_options_ac "${key_origin}" \
-			--with-google-safebrowsing-api-keyfile="${S}/api-google.key"
-	else
-		einfo "Building without Google API key ..."
-	fi
-
-	if [[ -s "${S}/api-location.key" ]] ; then
-		local key_origin="Gentoo default"
-		if [[ $(cat "${S}/api-location.key" | md5sum | awk '{ print $1 }') != ffb7895e35dedf832eb1c5d420ac7420 ]] ; then
-			key_origin="User value"
-		fi
-
-		mozconfig_add_options_ac "${key_origin}" \
-			--with-google-location-service-api-keyfile="${S}/api-location.key"
-	else
-		einfo "Building without Location API key ..."
-	fi
-
-	if [[ -s "${S}/api-mozilla.key" ]] ; then
-		local key_origin="Gentoo default"
-		if [[ $(cat "${S}/api-mozilla.key" | md5sum | awk '{ print $1 }') != 3927726e9442a8e8fa0e46ccc39caa27 ]] ; then
-			key_origin="User value"
-		fi
-
-		mozconfig_add_options_ac "${key_origin}" \
-			--with-mozilla-api-keyfile="${S}/api-mozilla.key"
-	else
-		einfo "Building without Mozilla API key ..."
-	fi
-
-	mozconfig_use_with system-av1
-	mozconfig_use_with system-harfbuzz
-	mozconfig_use_with system-harfbuzz system-graphite2
-	mozconfig_use_with system-icu
-	mozconfig_use_with system-jpeg
-	mozconfig_use_with system-libevent
-	mozconfig_use_with system-libvpx
-	mozconfig_use_with system-png
-	mozconfig_use_with system-webp
-
-	if use system-librnp; then
-		mozconfig_add_options_ac "+system-librnp" --enable-compile-environment
-		mozconfig_use_with system-librnp
-	fi
-
-	mozconfig_use_enable dbus
-	mozconfig_use_enable libproxy
-
-	use eme-free && mozconfig_add_options_ac '+eme-free' --disable-eme
-
-	if use hardened ; then
-		mozconfig_add_options_ac "+hardened" --enable-hardening
-		append-ldflags "-Wl,-z,relro -Wl,-z,now"
-	fi
-
-	local myaudiobackends=""
-	use jack && myaudiobackends+="jack,"
-	use sndio && myaudiobackends+="sndio,"
-	use pulseaudio && myaudiobackends+="pulseaudio,"
-	! use pulseaudio && myaudiobackends+="alsa,"
-
-	mozconfig_add_options_ac '--enable-audio-backends' --enable-audio-backends="${myaudiobackends::-1}"
-
-	mozconfig_use_enable wifi necko-wifi
-
-	if use wayland ; then
-		mozconfig_add_options_ac '+x11+wayland' --enable-default-toolkit=cairo-gtk3-x11-wayland
-	else
-		mozconfig_add_options_ac '+x11' --enable-default-toolkit=cairo-gtk3
-	fi
-
-	if use lto ; then
-		if use clang ; then
-			# Upstream only supports lld when using clang
-			mozconfig_add_options_ac "forcing ld=lld due to USE=clang and USE=lto" --enable-linker=lld
-
-			mozconfig_add_options_ac '+lto' --enable-lto=cross
-
-		else
-			# ThinLTO is currently broken, see bmo#1644409
-			mozconfig_add_options_ac '+lto' --enable-lto=full
-			mozconfig_add_options_ac "linker is set to bfd" --enable-linker=bfd
-		fi
-
-		if use pgo ; then
-			mozconfig_add_options_ac '+pgo' MOZ_PGO=1
-
-			if use clang ; then
-				# Used in build/pgo/profileserver.py
-				export LLVM_PROFDATA="llvm-profdata"
-			fi
-		fi
-	else
-		# Avoid auto-magic on linker
-		if use clang ; then
-			# This is upstream's default
-			mozconfig_add_options_ac "forcing ld=lld due to USE=clang" --enable-linker=lld
-		else
-			mozconfig_add_options_ac "linker is set to bfd" --enable-linker=bfd
-		fi
-	fi
-
-	# LTO flag was handled via configure
-	filter-flags '-flto*'
-
-	mozconfig_use_enable debug
-	if use debug ; then
-		mozconfig_add_options_ac '+debug' --disable-optimize
-	else
-		if is-flag '-g*' ; then
-			if use clang ; then
-				mozconfig_add_options_ac 'from CFLAGS' --enable-debug-symbols=$(get-flag '-g*')
-			else
-				mozconfig_add_options_ac 'from CFLAGS' --enable-debug-symbols
-			fi
-		else
-			mozconfig_add_options_ac 'Gentoo default' --disable-debug-symbols
-		fi
-
-		if is-flag '-O0' ; then
-			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O0
-		elif is-flag '-O4' ; then
-			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O4
-		elif is-flag '-O3' ; then
-			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O3
-		elif is-flag '-O1' ; then
-			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O1
-		elif is-flag '-Os' ; then
-			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-Os
-		else
-			mozconfig_add_options_ac "Gentoo default" --enable-optimize=-O2
-		fi
-	fi
-
-	# Debug flag was handled via configure
-	filter-flags '-g*'
-
-	# Optimization flag was handled via configure
-	filter-flags '-O*'
-
-	# Modifications to better support ARM, bug #553364
-	if use cpu_flags_arm_neon ; then
-		mozconfig_add_options_ac '+cpu_flags_arm_neon' --with-fpu=neon
-
-		if ! tc-is-clang ; then
-			# thumb options aren't supported when using clang, bug 666966
-			mozconfig_add_options_ac '+cpu_flags_arm_neon' \
-				--with-thumb=yes \
-				--with-thumb-interwork=no
-		fi
-	fi
-
-	if [[ ${CHOST} == armv*h* ]] ; then
-		mozconfig_add_options_ac 'CHOST=armv*h*' --with-float-abi=hard
-
-		if ! use system-libvpx ; then
-			sed -i \
-				-e "s|softfp|hard|" \
-				"${S}"/media/libvpx/moz.build \
-				|| die
-		fi
-	fi
-
-	if use clang ; then
-		# https://bugzilla.mozilla.org/show_bug.cgi?id=1482204
-		# https://bugzilla.mozilla.org/show_bug.cgi?id=1483822
-		# toolkit/moz.configure Elfhack section: target.cpu in ('arm', 'x86', 'x86_64')
-		local disable_elf_hack=
-		if use amd64 ; then
-			disable_elf_hack=yes
-		elif use x86 ; then
-			disable_elf_hack=yes
-		elif use arm ; then
-			disable_elf_hack=yes
-		fi
-
-		if [[ -n ${disable_elf_hack} ]] ; then
-			mozconfig_add_options_ac 'elf-hack is broken when using Clang' --disable-elf-hack
-		fi
-	elif tc-is-gcc ; then
-		if ver_test $(gcc-fullversion) -ge 10 ; then
-			einfo "Forcing -fno-tree-loop-vectorize to workaround GCC bug, see bug 758446 ..."
-			append-cxxflags -fno-tree-loop-vectorize
-		fi
-	fi
-
-	# Additional ARCH support
-	case "${ARCH}" in
-		arm)
-			# Reduce the memory requirements for linking
-			if use clang ; then
-				# Nothing to do
-				:;
-			elif use lto ; then
-				append-ldflags -Wl,--no-keep-memory
-			else
-				append-ldflags -Wl,--no-keep-memory -Wl,--reduce-memory-overheads
-			fi
-			;;
-	esac
-
-	if ! use elibc_glibc ; then
-		mozconfig_add_options_ac '!elibc_glibc' --disable-jemalloc
-	fi
-
-	# Allow elfhack to work in combination with unstripped binaries
-	# when they would normally be larger than 2GiB.
-	append-ldflags "-Wl,--compress-debug-sections=zlib"
-
-	# Make revdep-rebuild.sh happy; Also required for musl
-	append-ldflags -Wl,-rpath="${MOZILLA_FIVE_HOME}",--enable-new-dtags
-
-	# Pass $MAKEOPTS to build system
-	export MOZ_MAKE_FLAGS="${MAKEOPTS}"
-
-	# Use system's Python environment
-	PIP_NETWORK_INSTALL_RESTRICTED_VIRTUALENVS=mach
-
-	if use system-python-libs; then
-		export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE="system"
-	else
-		export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE="none"
-	fi
-
-	# Disable notification when build system has finished
-	export MOZ_NOSPAM=1
-
-	# Portage sets XARGS environment variable to "xargs -r" by default which
-	# breaks build system's check_prog() function which doesn't support arguments
-	mozconfig_add_options_ac 'Gentoo default' "XARGS=${EPREFIX}/usr/bin/xargs"
-
-	# Set build dir
-	mozconfig_add_options_mk 'Gentoo default' "MOZ_OBJDIR=${BUILD_DIR}"
-
-	# Show flags we will use
-	einfo "Build BINDGEN_CFLAGS:\t${BINDGEN_CFLAGS:-no value set}"
-	einfo "Build CFLAGS:\t\t${CFLAGS:-no value set}"
-	einfo "Build CXXFLAGS:\t\t${CXXFLAGS:-no value set}"
-	einfo "Build LDFLAGS:\t\t${LDFLAGS:-no value set}"
-	einfo "Build RUSTFLAGS:\t\t${RUSTFLAGS:-no value set}"
-
-	# Handle EXTRA_CONF and show summary
-	local ac opt hash reason
-
-	# Apply EXTRA_ECONF entries to $MOZCONFIG
-	if [[ -n ${EXTRA_ECONF} ]] ; then
-		IFS=\! read -a ac <<<${EXTRA_ECONF// --/\!}
-		for opt in "${ac[@]}"; do
-			mozconfig_add_options_ac "EXTRA_ECONF" --${opt#--}
-		done
-	fi
-
-	echo
-	echo "=========================================================="
-	echo "Building ${PF} with the following configuration"
-	grep ^ac_add_options "${MOZCONFIG}" | while read ac opt hash reason; do
-		[[ -z ${hash} || ${hash} == \# ]] \
-			|| die "error reading mozconfig: ${ac} ${opt} ${hash} ${reason}"
-		printf "    %-30s  %s\n" "${opt}" "${reason:-mozilla.org default}"
-	done
-	echo "=========================================================="
-	echo
-
-	./mach configure || die
-}
-
-src_compile() {
-	local virtx_cmd=
-
-	if use pgo ; then
-		virtx_cmd=virtx
-
-		# Reset and cleanup environment variables used by GNOME/XDG
-		gnome2_environment_reset
-
-		addpredict /root
-	fi
-
-	local -x GDK_BACKEND=x11
-
-	${virtx_cmd} ./mach build --verbose \
-		|| die
-}
-
-src_install() {
-	# xpcshell is getting called during install
-	pax-mark m \
-		"${BUILD_DIR}"/dist/bin/xpcshell \
-		"${BUILD_DIR}"/dist/bin/${PN} \
-		"${BUILD_DIR}"/dist/bin/plugin-container
-
-	DESTDIR="${D}" ./mach install || die
-
-	# Upstream cannot ship symlink but we can (bmo#658850)
-	rm "${ED}${MOZILLA_FIVE_HOME}/${PN}-bin" || die
-	dosym ${PN} ${MOZILLA_FIVE_HOME}/${PN}-bin
-
-	# Don't install llvm-symbolizer from sys-devel/llvm package
-	if [[ -f "${ED}${MOZILLA_FIVE_HOME}/llvm-symbolizer" ]] ; then
-		rm -v "${ED}${MOZILLA_FIVE_HOME}/llvm-symbolizer" || die
-	fi
-
-	# Install policy (currently only used to disable application updates)
-	insinto "${MOZILLA_FIVE_HOME}/distribution"
-	newins "${FILESDIR}"/distribution.ini distribution.ini
-	newins "${FILESDIR}"/disable-auto-update.policy.json policies.json
-
-	# Install system-wide preferences
-	local PREFS_DIR="${MOZILLA_FIVE_HOME}/defaults/pref"
-	insinto "${PREFS_DIR}"
-	newins "${FILESDIR}"/gentoo-default-prefs.js gentoo-prefs.js
-
-	local GENTOO_PREFS="${ED}${PREFS_DIR}/gentoo-prefs.js"
-
-	# Set dictionary path to use system hunspell
-	cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set spellchecker.dictionary_path pref"
-	pref("spellchecker.dictionary_path",       "${EPREFIX}/usr/share/myspell");
-	EOF
-
-	# Force hwaccel prefs if USE=hwaccel is enabled
-	if use hwaccel ; then
-		cat "${FILESDIR}"/gentoo-hwaccel-prefs.js \
-		>>"${GENTOO_PREFS}" \
-		|| die "failed to add prefs to force hardware-accelerated rendering to all-gentoo.js"
-
-		if use wayland; then
-			cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set hwaccel wayland prefs"
-			pref("gfx.x11-egl.force-enabled",          false);
-			EOF
-		else
-			cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set hwaccel x11 prefs"
-			pref("gfx.x11-egl.force-enabled",          true);
-			EOF
-		fi
-	fi
-
-	# Force the graphite pref if USE=system-harfbuzz is enabled, since the pref cannot disable it
-	if use system-harfbuzz ; then
-		cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set gfx.font_rendering.graphite.enabled pref"
-		sticky_pref("gfx.font_rendering.graphite.enabled", true);
-		EOF
-	fi
-
-	# Install language packs
-	local langpacks=( $(find "${WORKDIR}/language_packs" -type f -name '*.xpi') )
-	if [[ -n "${langpacks}" ]] ; then
-		moz_install_xpi "${MOZILLA_FIVE_HOME}/distribution/extensions" "${langpacks[@]}"
-	fi
-
-	# Install icons
-	local icon_srcdir="${S}/comm/mail/branding/thunderbird"
-	local icon_symbolic_file="${icon_srcdir}/TB-symbolic.svg"
-
-	insinto /usr/share/icons/hicolor/symbolic/apps
-	newins "${icon_symbolic_file}" ${PN}-symbolic.svg
-
-	local icon size
-	for icon in "${icon_srcdir}"/default*.png ; do
-		size=${icon%.png}
-		size=${size##*/default}
-
-		if [[ ${size} -eq 48 ]] ; then
-			newicon "${icon}" ${PN}.png
-		fi
-
-		newicon -s ${size} "${icon}" ${PN}.png
-	done
-
-	# Install menu
-	local app_name="Mozilla ${MOZ_PN^}"
-	local desktop_file="${FILESDIR}/icon/${PN}-r2.desktop"
-	local desktop_filename="${PN}.desktop"
-	local exec_command="${PN}"
-	local icon="${PN}"
-	local use_wayland="false"
-
-	if use wayland ; then
-		use_wayland="true"
-	fi
-
-	cp "${desktop_file}" "${WORKDIR}/${PN}.desktop-template" || die
-
-	sed -i \
-		-e "s:@NAME@:${app_name}:" \
-		-e "s:@EXEC@:${exec_command}:" \
-		-e "s:@ICON@:${icon}:" \
-		"${WORKDIR}/${PN}.desktop-template" \
-		|| die
-
-	newmenu "${WORKDIR}/${PN}.desktop-template" "${desktop_filename}"
-
-	rm "${WORKDIR}/${PN}.desktop-template" || die
-
-	# Install wrapper script
-	[[ -f "${ED}/usr/bin/${PN}" ]] && rm "${ED}/usr/bin/${PN}"
-	newbin "${FILESDIR}/${PN}-r1.sh" ${PN}
-
-	# Update wrapper
-	sed -i \
-		-e "s:@PREFIX@:${EPREFIX}/usr:" \
-		-e "s:@MOZ_FIVE_HOME@:${MOZILLA_FIVE_HOME}:" \
-		-e "s:@APULSELIB_DIR@:${apulselib}:" \
-		-e "s:@DEFAULT_WAYLAND@:${use_wayland}:" \
-		"${ED}/usr/bin/${PN}" \
-		|| die
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-
-	# If the apulse libs are available in MOZILLA_FIVE_HOME then apulse
-	# does not need to be forced into the LD_LIBRARY_PATH
-	if use pulseaudio && has_version ">=media-sound/apulse-0.1.12-r4" ; then
-		einfo "APULSE found; Generating library symlinks for sound support ..."
-		local lib
-		pushd "${ED}${MOZILLA_FIVE_HOME}" &>/dev/null || die
-		for lib in ../apulse/libpulse{.so{,.0},-simple.so{,.0}} ; do
-			# A quickpkg rolled by hand will grab symlinks as part of the package,
-			# so we need to avoid creating them if they already exist.
-			if [[ ! -L ${lib##*/} ]] ; then
-				ln -s "${lib}" ${lib##*/} || die
-			fi
-		done
-		popd &>/dev/null || die
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	if use pulseaudio && has_version ">=media-sound/apulse-0.1.12-r4" ; then
-		elog "Apulse was detected at merge time on this system and so it will always be"
-		elog "used for sound.  If you wish to use pulseaudio instead please unmerge"
-		elog "media-sound/apulse."
-		elog
-	fi
-
-	local show_doh_information
-	local show_shortcut_information
-
-	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
-		# New install; Tell user that DoH is disabled by default
-		show_doh_information=yes
-		show_shortcut_information=no
-	else
-		local replacing_version
-		for replacing_version in ${REPLACING_VERSIONS} ; do
-			if ver_test "${replacing_version}" -lt 91.0 ; then
-				# Tell user that we no longer install a shortcut
-				# per supported display protocol
-				show_shortcut_information=yes
-			fi
-		done
-	fi
-
-	if [[ -n "${show_doh_information}" ]] ; then
-		elog
-		elog "Note regarding Trusted Recursive Resolver aka DNS-over-HTTPS (DoH):"
-		elog "Due to privacy concerns (encrypting DNS might be a good thing, sending all"
-		elog "DNS traffic to Cloudflare by default is not a good idea and applications"
-		elog "should respect OS configured settings), \"network.trr.mode\" was set to 5"
-		elog "(\"Off by choice\") by default."
-		elog "You can enable DNS-over-HTTPS in ${PN^}'s preferences."
-	fi
-
-	if [[ -n "${show_shortcut_information}" ]] ; then
-		elog
-		elog "Since ${PN}-91.0 we no longer install multiple shortcuts for"
-		elog "each supported display protocol.  Instead we will only install"
-		elog "one generic Mozilla ${PN^} shortcut."
-		elog "If you still want to be able to select between running Mozilla ${PN^}"
-		elog "on X11 or Wayland, you have to re-create these shortcuts on your own."
-	fi
-
-	# bug 835078
-	if use hwaccel && has_version "x11-drivers/xf86-video-nouveau"; then
-		ewarn "You have nouveau drivers installed in your system and 'hwaccel' "
-		ewarn "enabled for Firefox. Nouveau / your GPU might not support the "
-		ewarn "required EGL, so either disable 'hwaccel' or try the workaround "
-		ewarn "explained in https://bugs.gentoo.org/835078#c5 if Firefox crashes."
-	fi
-
-	optfeature_header "Optional runtime features:"
-	optfeature "encrypted chat support" net-libs/libotr
-}
diff --git a/mail-client/thunderbird/thunderbird-102.3.3.ebuild b/mail-client/thunderbird/thunderbird-102.3.3.ebuild
deleted file mode 100644
index 10909f4d3856..000000000000
--- a/mail-client/thunderbird/thunderbird-102.3.3.ebuild
+++ /dev/null
@@ -1,1165 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-FIREFOX_PATCHSET="firefox-102esr-patches-04j.tar.xz"
-
-LLVM_MAX_SLOT=14
-
-PYTHON_COMPAT=( python3_{8..11} )
-PYTHON_REQ_USE="ncurses,sqlite,ssl"
-
-WANT_AUTOCONF="2.1"
-
-VIRTUALX_REQUIRED="pgo"
-
-MOZ_ESR=
-
-MOZ_PV=${PV}
-MOZ_PV_SUFFIX=
-if [[ ${PV} =~ (_(alpha|beta|rc).*)$ ]] ; then
-	MOZ_PV_SUFFIX=${BASH_REMATCH[1]}
-
-	# Convert the ebuild version to the upstream Mozilla version
-	MOZ_PV="${MOZ_PV/_alpha/a}" # Handle alpha for SRC_URI
-	MOZ_PV="${MOZ_PV/_beta/b}"  # Handle beta for SRC_URI
-	MOZ_PV="${MOZ_PV%%_rc*}"    # Handle rc for SRC_URI
-fi
-
-if [[ -n ${MOZ_ESR} ]] ; then
-	# ESR releases have slightly different version numbers
-	MOZ_PV="${MOZ_PV}esr"
-fi
-
-MOZ_PN="${PN%-bin}"
-MOZ_P="${MOZ_PN}-${MOZ_PV}"
-MOZ_PV_DISTFILES="${MOZ_PV}${MOZ_PV_SUFFIX}"
-MOZ_P_DISTFILES="${MOZ_PN}-${MOZ_PV_DISTFILES}"
-
-inherit autotools check-reqs desktop flag-o-matic gnome2-utils \
-	llvm multiprocessing optfeature pax-utils python-any-r1 toolchain-funcs \
-	virtualx xdg
-
-MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/releases/${MOZ_PV}"
-
-if [[ ${PV} == *_rc* ]] ; then
-	MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/candidates/${MOZ_PV}-candidates/build${PV##*_rc}"
-fi
-
-PATCH_URIS=(
-	https://dev.gentoo.org/~{juippis,whissi,slashbeast}/mozilla/patchsets/${FIREFOX_PATCHSET}
-)
-
-SRC_URI="${MOZ_SRC_BASE_URI}/source/${MOZ_P}.source.tar.xz -> ${MOZ_P_DISTFILES}.source.tar.xz
-	${PATCH_URIS[@]}"
-
-DESCRIPTION="Thunderbird Mail Client"
-HOMEPAGE="https://www.thunderbird.net/"
-
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-
-SLOT="0"
-LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-
-IUSE="+clang cpu_flags_arm_neon dbus debug eme-free hardened hwaccel"
-IUSE+=" jack libproxy lto +openh264 pgo pulseaudio sndio selinux"
-IUSE+=" +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent +system-libvpx system-png system-python-libs +system-webp"
-IUSE+=" wayland wifi"
-
-# Thunderbird-only USE flags.
-IUSE+=" +system-librnp"
-
-REQUIRED_USE="debug? ( !system-av1 )
-	pgo? ( lto )
-	wayland? ( dbus )
-	wifi? ( dbus )"
-
-# Thunderbird-only dependencies.
-TB_ONLY_DEPEND="!<x11-plugins/enigmail-2.2
-	selinux? ( sec-policy/selinux-thunderbird )
-	!system-librnp? ( dev-libs/jsoncpp )
-	system-librnp? ( dev-util/librnp )"
-BDEPEND="${PYTHON_DEPS}
-	app-arch/unzip
-	app-arch/zip
-	>=dev-util/cbindgen-0.24.3
-	net-libs/nodejs
-	virtual/pkgconfig
-	virtual/rust
-	|| (
-		(
-			sys-devel/clang:14
-			sys-devel/llvm:14
-			clang? (
-				=sys-devel/lld-14*
-				pgo? ( =sys-libs/compiler-rt-sanitizers-14*[profile] )
-			)
-		)
-		(
-			sys-devel/clang:13
-			sys-devel/llvm:13
-			clang? (
-				=sys-devel/lld-13*
-				pgo? ( =sys-libs/compiler-rt-sanitizers-13*[profile] )
-			)
-		)
-	)
-	amd64? ( >=dev-lang/nasm-2.14 )
-	x86? ( >=dev-lang/nasm-2.14 )"
-
-COMMON_DEPEND="${TB_ONLY_DEPEND}
-	dev-libs/atk
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/libffi:=
-	>=dev-libs/nss-3.79
-	>=dev-libs/nspr-4.34
-	media-libs/alsa-lib
-	media-libs/fontconfig
-	media-libs/freetype
-	media-libs/mesa
-	media-video/ffmpeg
-	sys-libs/zlib
-	virtual/freedesktop-icon-theme
-	virtual/opengl
-	x11-libs/cairo[X]
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:3[X]
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXrandr
-	x11-libs/libXtst
-	x11-libs/libxcb:=
-	x11-libs/libxkbcommon[X]
-	x11-libs/pango
-	x11-libs/pixman
-	dbus? (
-		dev-libs/dbus-glib
-		sys-apps/dbus
-	)
-	jack? ( virtual/jack )
-	libproxy? ( net-libs/libproxy )
-	sndio? ( >=media-sound/sndio-1.8.0-r1 )
-	system-av1? (
-		>=media-libs/dav1d-1.0.0:=
-		>=media-libs/libaom-1.0.0:=
-	)
-	system-harfbuzz? (
-		>=media-gfx/graphite2-1.3.13
-		>=media-libs/harfbuzz-2.8.1:0=
-	)
-	system-icu? ( >=dev-libs/icu-71.1:= )
-	system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
-	system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] )
-	system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] )
-	system-png? ( >=media-libs/libpng-1.6.35:0=[apng] )
-	system-webp? ( >=media-libs/libwebp-1.1.0:0= )
-	wayland? (
-		x11-libs/gtk+:3[wayland]
-		x11-libs/libdrm
-		x11-libs/libxkbcommon[wayland]
-	)
-	wifi? (
-		kernel_linux? (
-			dev-libs/dbus-glib
-			net-misc/networkmanager
-			sys-apps/dbus
-		)
-	)"
-
-RDEPEND="${COMMON_DEPEND}
-	jack? ( virtual/jack )
-	openh264? ( media-libs/openh264:*[plugin] )
-	pulseaudio? (
-		|| (
-			media-sound/pulseaudio
-			>=media-sound/apulse-0.1.12-r4
-		)
-	)"
-
-DEPEND="${COMMON_DEPEND}
-	x11-libs/libICE
-	x11-libs/libSM
-	pulseaudio? (
-		|| (
-			media-sound/pulseaudio
-			>=media-sound/apulse-0.1.12-r4[sdk]
-		)
-	)"
-
-S="${WORKDIR}/${PN}-${PV%_*}"
-
-llvm_check_deps() {
-	if ! has_version -b "sys-devel/clang:${LLVM_SLOT}" ; then
-		einfo "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-		return 1
-	fi
-
-	if use clang ; then
-		if ! has_version -b "=sys-devel/lld-${LLVM_SLOT}*" ; then
-			einfo "=sys-devel/lld-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-			return 1
-		fi
-
-		if use pgo ; then
-			if ! has_version -b "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}*" ; then
-				einfo "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-				return 1
-			fi
-		fi
-	fi
-
-	einfo "Using LLVM slot ${LLVM_SLOT} to build" >&2
-}
-
-MOZ_LANGS=(
-	af ar ast be bg br ca cak cs cy da de dsb
-	el en-CA en-GB en-US es-AR es-ES es-MX et eu
-	fi fr fy-NL ga-IE gd gl he hr hsb hu
-	id is it ja ka kab kk ko lt lv ms nb-NO nl nn-NO
-	pa-IN pl pt-BR pt-PT rm ro ru
-	sk sl sq sr sv-SE th tr uk uz vi zh-CN zh-TW
-)
-
-mozilla_set_globals() {
-	# https://bugs.gentoo.org/587334
-	local MOZ_TOO_REGIONALIZED_FOR_L10N=(
-		fy-NL ga-IE gu-IN hi-IN hy-AM nb-NO ne-NP nn-NO pa-IN sv-SE
-	)
-
-	local lang xflag
-	for lang in "${MOZ_LANGS[@]}" ; do
-		# en and en_US are handled internally
-		if [[ ${lang} == en ]] || [[ ${lang} == en-US ]] ; then
-			continue
-		fi
-
-		# strip region subtag if $lang is in the list
-		if has ${lang} "${MOZ_TOO_REGIONALIZED_FOR_L10N[@]}" ; then
-			xflag=${lang%%-*}
-		else
-			xflag=${lang}
-		fi
-
-		SRC_URI+=" l10n_${xflag/[_@]/-}? ("
-		SRC_URI+=" ${MOZ_SRC_BASE_URI}/linux-x86_64/xpi/${lang}.xpi -> ${MOZ_P_DISTFILES}-${lang}.xpi"
-		SRC_URI+=" )"
-		IUSE+=" l10n_${xflag/[_@]/-}"
-	done
-}
-mozilla_set_globals
-
-moz_clear_vendor_checksums() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -ne 1 ]] ; then
-		die "${FUNCNAME} requires exact one argument"
-	fi
-
-	einfo "Clearing cargo checksums for ${1} ..."
-
-	sed -i \
-		-e 's/\("files":{\)[^}]*/\1/' \
-		"${S}"/third_party/rust/${1}/.cargo-checksum.json \
-		|| die
-}
-
-moz_install_xpi() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 2 ]] ; then
-		die "${FUNCNAME} requires at least two arguments"
-	fi
-
-	local DESTDIR=${1}
-	shift
-
-	insinto "${DESTDIR}"
-
-	local emid xpi_file xpi_tmp_dir
-	for xpi_file in "${@}" ; do
-		emid=
-		xpi_tmp_dir=$(mktemp -d --tmpdir="${T}")
-
-		# Unpack XPI
-		unzip -qq "${xpi_file}" -d "${xpi_tmp_dir}" || die
-
-		# Determine extension ID
-		if [[ -f "${xpi_tmp_dir}/install.rdf" ]] ; then
-			emid=$(sed -n -e '/install-manifest/,$ { /em:id/!d; s/.*[\">]\([^\"<>]*\)[\"<].*/\1/; p; q }' "${xpi_tmp_dir}/install.rdf")
-			[[ -z "${emid}" ]] && die "failed to determine extension id from install.rdf"
-		elif [[ -f "${xpi_tmp_dir}/manifest.json" ]] ; then
-			emid=$(sed -n -e 's/.*"id": "\([^"]*\)".*/\1/p' "${xpi_tmp_dir}/manifest.json")
-			[[ -z "${emid}" ]] && die "failed to determine extension id from manifest.json"
-		else
-			die "failed to determine extension id"
-		fi
-
-		einfo "Installing ${emid}.xpi into ${ED}${DESTDIR} ..."
-		newins "${xpi_file}" "${emid}.xpi"
-	done
-}
-
-mozconfig_add_options_ac() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 2 ]] ; then
-		die "${FUNCNAME} requires at least two arguments"
-	fi
-
-	local reason=${1}
-	shift
-
-	local option
-	for option in ${@} ; do
-		echo "ac_add_options ${option} # ${reason}" >>${MOZCONFIG}
-	done
-}
-
-mozconfig_add_options_mk() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 2 ]] ; then
-		die "${FUNCNAME} requires at least two arguments"
-	fi
-
-	local reason=${1}
-	shift
-
-	local option
-	for option in ${@} ; do
-		echo "mk_add_options ${option} # ${reason}" >>${MOZCONFIG}
-	done
-}
-
-mozconfig_use_enable() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 1 ]] ; then
-		die "${FUNCNAME} requires at least one arguments"
-	fi
-
-	local flag=$(use_enable "${@}")
-	mozconfig_add_options_ac "$(use ${1} && echo +${1} || echo -${1})" "${flag}"
-}
-
-mozconfig_use_with() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 1 ]] ; then
-		die "${FUNCNAME} requires at least one arguments"
-	fi
-
-	local flag=$(use_with "${@}")
-	mozconfig_add_options_ac "$(use ${1} && echo +${1} || echo -${1})" "${flag}"
-}
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]] ; then
-		if use pgo ; then
-			if ! has usersandbox $FEATURES ; then
-				die "You must enable usersandbox as X server can not run as root!"
-			fi
-		fi
-
-		# Ensure we have enough disk space to compile
-		if use pgo || use lto || use debug ; then
-			CHECKREQS_DISK_BUILD="13500M"
-		else
-			CHECKREQS_DISK_BUILD="6600M"
-		fi
-
-		check-reqs_pkg_pretend
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]] ; then
-		if use pgo ; then
-			if ! has userpriv ${FEATURES} ; then
-				eerror "Building ${PN} with USE=pgo and FEATURES=-userpriv is not supported!"
-			fi
-		fi
-
-		# Ensure we have enough disk space to compile
-		if use pgo || use lto || use debug ; then
-			CHECKREQS_DISK_BUILD="13500M"
-		else
-			CHECKREQS_DISK_BUILD="6400M"
-		fi
-
-		check-reqs_pkg_setup
-
-		llvm_pkg_setup
-
-		if use clang && use lto ; then
-			local version_lld=$(ld.lld --version 2>/dev/null | awk '{ print $2 }')
-			[[ -n ${version_lld} ]] && version_lld=$(ver_cut 1 "${version_lld}")
-			[[ -z ${version_lld} ]] && die "Failed to read ld.lld version!"
-
-			local version_llvm_rust=$(rustc -Vv 2>/dev/null | grep -F -- 'LLVM version:' | awk '{ print $3 }')
-			[[ -n ${version_llvm_rust} ]] && version_llvm_rust=$(ver_cut 1 "${version_llvm_rust}")
-			[[ -z ${version_llvm_rust} ]] && die "Failed to read used LLVM version from rustc!"
-
-			if ver_test "${version_lld}" -ne "${version_llvm_rust}" ; then
-				eerror "Rust is using LLVM version ${version_llvm_rust} but ld.lld version belongs to LLVM version ${version_lld}."
-				eerror "You will be unable to link ${CATEGORY}/${PN}. To proceed you have the following options:"
-				eerror "  - Manually switch rust version using 'eselect rust' to match used LLVM version"
-				eerror "  - Switch to dev-lang/rust[system-llvm] which will guarantee matching version"
-				eerror "  - Build ${CATEGORY}/${PN} without USE=lto"
-				eerror "  - Rebuild lld with llvm that was used to build rust (may need to rebuild the whole "
-				eerror "    llvm/clang/lld/rust chain depending on your @world updates)"
-				die "LLVM version used by Rust (${version_llvm_rust}) does not match with ld.lld version (${version_lld})!"
-			fi
-		fi
-
-		python-any-r1_pkg_setup
-
-		# Avoid PGO profiling problems due to enviroment leakage
-		# These should *always* be cleaned up anyway
-		unset \
-			DBUS_SESSION_BUS_ADDRESS \
-			DISPLAY \
-			ORBIT_SOCKETDIR \
-			SESSION_MANAGER \
-			XAUTHORITY \
-			XDG_CACHE_HOME \
-			XDG_SESSION_COOKIE
-
-		# Build system is using /proc/self/oom_score_adj, bug #604394
-		addpredict /proc/self/oom_score_adj
-
-		if use pgo ; then
-			# Allow access to GPU during PGO run
-			local ati_cards mesa_cards nvidia_cards render_cards
-			shopt -s nullglob
-
-			ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
-			if [[ -n "${ati_cards}" ]] ; then
-				addpredict "${ati_cards}"
-			fi
-
-			mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
-			if [[ -n "${mesa_cards}" ]] ; then
-				addpredict "${mesa_cards}"
-			fi
-
-			nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
-			if [[ -n "${nvidia_cards}" ]] ; then
-				addpredict "${nvidia_cards}"
-			fi
-
-			render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
-			if [[ -n "${render_cards}" ]] ; then
-				addpredict "${render_cards}"
-			fi
-
-			shopt -u nullglob
-		fi
-
-		if ! mountpoint -q /dev/shm ; then
-			# If /dev/shm is not available, configure is known to fail with
-			# a traceback report referencing /usr/lib/pythonN.N/multiprocessing/synchronize.py
-			ewarn "/dev/shm is not mounted -- expect build failures!"
-		fi
-
-		# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
-		# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
-		# get your own set of keys.
-		if [[ -z "${MOZ_API_KEY_GOOGLE+set}" ]] ; then
-			MOZ_API_KEY_GOOGLE="AIzaSyDEAOvatFogGaPi0eTgsV_ZlEzx0ObmepsMzfAc"
-		fi
-
-		if [[ -z "${MOZ_API_KEY_LOCATION+set}" ]] ; then
-			MOZ_API_KEY_LOCATION="AIzaSyB2h2OuRgGaPicUgy5N-5hsZqiPW6sH3n_rptiQ"
-		fi
-
-		# Mozilla API keys (see https://location.services.mozilla.com/api)
-		# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
-		# get your own set of keys.
-		if [[ -z "${MOZ_API_KEY_MOZILLA+set}" ]] ; then
-			MOZ_API_KEY_MOZILLA="edb3d487-3a84-46m0ap1e3-9dfd-92b5efaaa005"
-		fi
-
-		# Ensure we use C locale when building, bug #746215
-		export LC_ALL=C
-	fi
-}
-
-src_unpack() {
-	local _lp_dir="${WORKDIR}/language_packs"
-	local _src_file
-
-	if [[ ! -d "${_lp_dir}" ]] ; then
-		mkdir "${_lp_dir}" || die
-	fi
-
-	for _src_file in ${A} ; do
-		if [[ ${_src_file} == *.xpi ]]; then
-			cp "${DISTDIR}/${_src_file}" "${_lp_dir}" || die "Failed to copy '${_src_file}' to '${_lp_dir}'!"
-		else
-			unpack ${_src_file}
-		fi
-	done
-}
-
-src_prepare() {
-	if use lto; then
-		rm -v "${WORKDIR}"/firefox-patches/*-LTO-Only-enable-LTO-*.patch || die
-	fi
-
-	eapply "${WORKDIR}/firefox-patches"
-
-	# Allow user to apply any additional patches without modifing ebuild
-	eapply_user
-
-	# Make cargo respect MAKEOPTS
-	export CARGO_BUILD_JOBS="$(makeopts_jobs)"
-
-	# Make LTO respect MAKEOPTS
-	sed -i \
-		-e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
-		"${S}"/build/moz.configure/lto-pgo.configure \
-		|| die "sed failed to set num_cores"
-
-	# Make ICU respect MAKEOPTS
-	sed -i \
-		-e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
-		"${S}"/intl/icu_sources_data.py \
-		|| die "sed failed to set num_cores"
-
-	# sed-in toolchain prefix
-	sed -i \
-		-e "s/objdump/${CHOST}-objdump/" \
-		"${S}"/python/mozbuild/mozbuild/configure/check_debug_ranges.py \
-		|| die "sed failed to set toolchain prefix"
-
-	sed -i \
-		-e 's/ccache_stats = None/return None/' \
-		"${S}"/python/mozbuild/mozbuild/controller/building.py \
-		|| die "sed failed to disable ccache stats call"
-
-	einfo "Removing pre-built binaries ..."
-	find "${S}"/third_party -type f \( -name '*.so' -o -name '*.o' \) -print -delete || die
-
-	# Create build dir
-	BUILD_DIR="${WORKDIR}/${PN}_build"
-	mkdir -p "${BUILD_DIR}" || die
-
-	# Write API keys to disk
-	echo -n "${MOZ_API_KEY_GOOGLE//gGaPi/}" > "${S}"/api-google.key || die
-	echo -n "${MOZ_API_KEY_LOCATION//gGaPi/}" > "${S}"/api-location.key || die
-	echo -n "${MOZ_API_KEY_MOZILLA//m0ap1/}" > "${S}"/api-mozilla.key || die
-
-	xdg_environment_reset
-}
-
-src_configure() {
-	# Show flags set at the beginning
-	einfo "Current BINDGEN_CFLAGS:\t${BINDGEN_CFLAGS:-no value set}"
-	einfo "Current CFLAGS:\t\t${CFLAGS:-no value set}"
-	einfo "Current CXXFLAGS:\t\t${CXXFLAGS:-no value set}"
-	einfo "Current LDFLAGS:\t\t${LDFLAGS:-no value set}"
-	einfo "Current RUSTFLAGS:\t\t${RUSTFLAGS:-no value set}"
-
-	local have_switched_compiler=
-	if use clang && ! tc-is-clang ; then
-		# Force clang
-		einfo "Enforcing the use of clang due to USE=clang ..."
-		have_switched_compiler=yes
-		AR=llvm-ar
-		AS=llvm-as
-		CC=${CHOST}-clang
-		CXX=${CHOST}-clang++
-		NM=llvm-nm
-		RANLIB=llvm-ranlib
-	elif ! use clang && ! tc-is-gcc ; then
-		# Force gcc
-		have_switched_compiler=yes
-		einfo "Enforcing the use of gcc due to USE=-clang ..."
-		AR=gcc-ar
-		CC=${CHOST}-gcc
-		CXX=${CHOST}-g++
-		NM=gcc-nm
-		RANLIB=gcc-ranlib
-	fi
-
-	if [[ -n "${have_switched_compiler}" ]] ; then
-		# Because we switched active compiler we have to ensure
-		# that no unsupported flags are set
-		strip-unsupported-flags
-	fi
-
-	# Ensure we use correct toolchain
-	export HOST_CC="$(tc-getBUILD_CC)"
-	export HOST_CXX="$(tc-getBUILD_CXX)"
-	tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
-
-	# Pass the correct toolchain paths through cbindgen
-	if tc-is-cross-compiler ; then
-		export BINDGEN_CFLAGS="${SYSROOT:+--sysroot=${ESYSROOT}} --target=${CHOST} ${BINDGEN_CFLAGS-}"
-	fi
-
-	# Set MOZILLA_FIVE_HOME
-	export MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
-
-	# python/mach/mach/mixin/process.py fails to detect SHELL
-	export SHELL="${EPREFIX}/bin/bash"
-
-	# Set state path
-	export MOZBUILD_STATE_PATH="${BUILD_DIR}"
-
-	# Set MOZCONFIG
-	export MOZCONFIG="${S}/.mozconfig"
-
-	# Initialize MOZCONFIG
-	mozconfig_add_options_ac '' --enable-application=comm/mail
-
-	# Set Gentoo defaults
-	export MOZILLA_OFFICIAL=1
-
-	mozconfig_add_options_ac 'Gentoo default' \
-		--allow-addon-sideload \
-		--disable-cargo-incremental \
-		--disable-crashreporter \
-		--disable-gpsd \
-		--disable-install-strip \
-		--disable-parental-controls \
-		--disable-strip \
-		--disable-updater \
-		--enable-js-shell \
-		--enable-negotiateauth \
-		--enable-new-pass-manager \
-		--enable-official-branding \
-		--enable-release \
-		--enable-system-ffi \
-		--enable-system-pixman \
-		--host="${CBUILD:-${CHOST}}" \
-		--libdir="${EPREFIX}/usr/$(get_libdir)" \
-		--prefix="${EPREFIX}/usr" \
-		--target="${CHOST}" \
-		--without-ccache \
-		--without-wasm-sandboxed-libraries \
-		--with-intl-api \
-		--with-libclang-path="$(llvm-config --libdir)" \
-		--with-system-nspr \
-		--with-system-nss \
-		--with-system-zlib \
-		--with-toolchain-prefix="${CHOST}-" \
-		--with-unsigned-addon-scopes=app,system \
-		--x-includes="${ESYSROOT}/usr/include" \
-		--x-libraries="${ESYSROOT}/usr/$(get_libdir)"
-
-	# Set update channel
-	local update_channel=release
-	[[ -n ${MOZ_ESR} ]] && update_channel=esr
-	mozconfig_add_options_ac '' --update-channel=${update_channel}
-
-	if ! use x86 && [[ ${CHOST} != armv*h* ]] ; then
-		mozconfig_add_options_ac '' --enable-rust-simd
-	fi
-
-	# For future keywording: This is currently (97.0) only supported on:
-	# amd64, arm, arm64 & x86.
-	# Might want to flip the logic around if Firefox is to support more arches.
-	if use ppc64; then
-		mozconfig_add_options_ac '' --disable-sandbox
-	else
-		mozconfig_add_options_ac '' --enable-sandbox
-	fi
-
-	if [[ -s "${S}/api-google.key" ]] ; then
-		local key_origin="Gentoo default"
-		if [[ $(cat "${S}/api-google.key" | md5sum | awk '{ print $1 }') != 709560c02f94b41f9ad2c49207be6c54 ]] ; then
-			key_origin="User value"
-		fi
-
-		mozconfig_add_options_ac "${key_origin}" \
-			--with-google-safebrowsing-api-keyfile="${S}/api-google.key"
-	else
-		einfo "Building without Google API key ..."
-	fi
-
-	if [[ -s "${S}/api-location.key" ]] ; then
-		local key_origin="Gentoo default"
-		if [[ $(cat "${S}/api-location.key" | md5sum | awk '{ print $1 }') != ffb7895e35dedf832eb1c5d420ac7420 ]] ; then
-			key_origin="User value"
-		fi
-
-		mozconfig_add_options_ac "${key_origin}" \
-			--with-google-location-service-api-keyfile="${S}/api-location.key"
-	else
-		einfo "Building without Location API key ..."
-	fi
-
-	if [[ -s "${S}/api-mozilla.key" ]] ; then
-		local key_origin="Gentoo default"
-		if [[ $(cat "${S}/api-mozilla.key" | md5sum | awk '{ print $1 }') != 3927726e9442a8e8fa0e46ccc39caa27 ]] ; then
-			key_origin="User value"
-		fi
-
-		mozconfig_add_options_ac "${key_origin}" \
-			--with-mozilla-api-keyfile="${S}/api-mozilla.key"
-	else
-		einfo "Building without Mozilla API key ..."
-	fi
-
-	mozconfig_use_with system-av1
-	mozconfig_use_with system-harfbuzz
-	mozconfig_use_with system-harfbuzz system-graphite2
-	mozconfig_use_with system-icu
-	mozconfig_use_with system-jpeg
-	mozconfig_use_with system-libevent
-	mozconfig_use_with system-libvpx
-	mozconfig_use_with system-png
-	mozconfig_use_with system-webp
-
-	if use system-librnp; then
-		mozconfig_add_options_ac "+system-librnp" --enable-compile-environment
-		mozconfig_use_with system-librnp
-	fi
-
-	mozconfig_use_enable dbus
-	mozconfig_use_enable libproxy
-
-	use eme-free && mozconfig_add_options_ac '+eme-free' --disable-eme
-
-	if use hardened ; then
-		mozconfig_add_options_ac "+hardened" --enable-hardening
-		append-ldflags "-Wl,-z,relro -Wl,-z,now"
-	fi
-
-	local myaudiobackends=""
-	use jack && myaudiobackends+="jack,"
-	use sndio && myaudiobackends+="sndio,"
-	use pulseaudio && myaudiobackends+="pulseaudio,"
-	! use pulseaudio && myaudiobackends+="alsa,"
-
-	mozconfig_add_options_ac '--enable-audio-backends' --enable-audio-backends="${myaudiobackends::-1}"
-
-	mozconfig_use_enable wifi necko-wifi
-
-	if use wayland ; then
-		mozconfig_add_options_ac '+x11+wayland' --enable-default-toolkit=cairo-gtk3-x11-wayland
-	else
-		mozconfig_add_options_ac '+x11' --enable-default-toolkit=cairo-gtk3
-	fi
-
-	if use lto ; then
-		if use clang ; then
-			# Upstream only supports lld when using clang
-			mozconfig_add_options_ac "forcing ld=lld due to USE=clang and USE=lto" --enable-linker=lld
-
-			mozconfig_add_options_ac '+lto' --enable-lto=cross
-
-		else
-			# ThinLTO is currently broken, see bmo#1644409
-			mozconfig_add_options_ac '+lto' --enable-lto=full
-			mozconfig_add_options_ac "linker is set to bfd" --enable-linker=bfd
-		fi
-
-		if use pgo ; then
-			mozconfig_add_options_ac '+pgo' MOZ_PGO=1
-
-			if use clang ; then
-				# Used in build/pgo/profileserver.py
-				export LLVM_PROFDATA="llvm-profdata"
-			fi
-		fi
-	else
-		# Avoid auto-magic on linker
-		if use clang ; then
-			# This is upstream's default
-			mozconfig_add_options_ac "forcing ld=lld due to USE=clang" --enable-linker=lld
-		else
-			mozconfig_add_options_ac "linker is set to bfd" --enable-linker=bfd
-		fi
-	fi
-
-	# LTO flag was handled via configure
-	filter-flags '-flto*'
-
-	mozconfig_use_enable debug
-	if use debug ; then
-		mozconfig_add_options_ac '+debug' --disable-optimize
-	else
-		if is-flag '-g*' ; then
-			if use clang ; then
-				mozconfig_add_options_ac 'from CFLAGS' --enable-debug-symbols=$(get-flag '-g*')
-			else
-				mozconfig_add_options_ac 'from CFLAGS' --enable-debug-symbols
-			fi
-		else
-			mozconfig_add_options_ac 'Gentoo default' --disable-debug-symbols
-		fi
-
-		if is-flag '-O0' ; then
-			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O0
-		elif is-flag '-O4' ; then
-			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O4
-		elif is-flag '-O3' ; then
-			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O3
-		elif is-flag '-O1' ; then
-			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O1
-		elif is-flag '-Os' ; then
-			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-Os
-		else
-			mozconfig_add_options_ac "Gentoo default" --enable-optimize=-O2
-		fi
-	fi
-
-	# Debug flag was handled via configure
-	filter-flags '-g*'
-
-	# Optimization flag was handled via configure
-	filter-flags '-O*'
-
-	# Modifications to better support ARM, bug #553364
-	if use cpu_flags_arm_neon ; then
-		mozconfig_add_options_ac '+cpu_flags_arm_neon' --with-fpu=neon
-
-		if ! tc-is-clang ; then
-			# thumb options aren't supported when using clang, bug 666966
-			mozconfig_add_options_ac '+cpu_flags_arm_neon' \
-				--with-thumb=yes \
-				--with-thumb-interwork=no
-		fi
-	fi
-
-	if [[ ${CHOST} == armv*h* ]] ; then
-		mozconfig_add_options_ac 'CHOST=armv*h*' --with-float-abi=hard
-
-		if ! use system-libvpx ; then
-			sed -i \
-				-e "s|softfp|hard|" \
-				"${S}"/media/libvpx/moz.build \
-				|| die
-		fi
-	fi
-
-	if use clang ; then
-		# https://bugzilla.mozilla.org/show_bug.cgi?id=1482204
-		# https://bugzilla.mozilla.org/show_bug.cgi?id=1483822
-		# toolkit/moz.configure Elfhack section: target.cpu in ('arm', 'x86', 'x86_64')
-		local disable_elf_hack=
-		if use amd64 ; then
-			disable_elf_hack=yes
-		elif use x86 ; then
-			disable_elf_hack=yes
-		elif use arm ; then
-			disable_elf_hack=yes
-		fi
-
-		if [[ -n ${disable_elf_hack} ]] ; then
-			mozconfig_add_options_ac 'elf-hack is broken when using Clang' --disable-elf-hack
-		fi
-	elif tc-is-gcc ; then
-		if ver_test $(gcc-fullversion) -ge 10 ; then
-			einfo "Forcing -fno-tree-loop-vectorize to workaround GCC bug, see bug 758446 ..."
-			append-cxxflags -fno-tree-loop-vectorize
-		fi
-	fi
-
-	# Additional ARCH support
-	case "${ARCH}" in
-		arm)
-			# Reduce the memory requirements for linking
-			if use clang ; then
-				# Nothing to do
-				:;
-			elif use lto ; then
-				append-ldflags -Wl,--no-keep-memory
-			else
-				append-ldflags -Wl,--no-keep-memory -Wl,--reduce-memory-overheads
-			fi
-			;;
-	esac
-
-	if ! use elibc_glibc ; then
-		mozconfig_add_options_ac '!elibc_glibc' --disable-jemalloc
-	fi
-
-	# Allow elfhack to work in combination with unstripped binaries
-	# when they would normally be larger than 2GiB.
-	append-ldflags "-Wl,--compress-debug-sections=zlib"
-
-	# Make revdep-rebuild.sh happy; Also required for musl
-	append-ldflags -Wl,-rpath="${MOZILLA_FIVE_HOME}",--enable-new-dtags
-
-	# Pass $MAKEOPTS to build system
-	export MOZ_MAKE_FLAGS="${MAKEOPTS}"
-
-	# Use system's Python environment
-	export PIP_NETWORK_INSTALL_RESTRICTED_VIRTUALENVS=mach
-
-	if use system-python-libs; then
-		export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE="system"
-	else
-		export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE="none"
-	fi
-
-	# Disable notification when build system has finished
-	export MOZ_NOSPAM=1
-
-	# Portage sets XARGS environment variable to "xargs -r" by default which
-	# breaks build system's check_prog() function which doesn't support arguments
-	mozconfig_add_options_ac 'Gentoo default' "XARGS=${EPREFIX}/usr/bin/xargs"
-
-	# Set build dir
-	mozconfig_add_options_mk 'Gentoo default' "MOZ_OBJDIR=${BUILD_DIR}"
-
-	# Show flags we will use
-	einfo "Build BINDGEN_CFLAGS:\t${BINDGEN_CFLAGS:-no value set}"
-	einfo "Build CFLAGS:\t\t${CFLAGS:-no value set}"
-	einfo "Build CXXFLAGS:\t\t${CXXFLAGS:-no value set}"
-	einfo "Build LDFLAGS:\t\t${LDFLAGS:-no value set}"
-	einfo "Build RUSTFLAGS:\t\t${RUSTFLAGS:-no value set}"
-
-	# Handle EXTRA_CONF and show summary
-	local ac opt hash reason
-
-	# Apply EXTRA_ECONF entries to $MOZCONFIG
-	if [[ -n ${EXTRA_ECONF} ]] ; then
-		IFS=\! read -a ac <<<${EXTRA_ECONF// --/\!}
-		for opt in "${ac[@]}"; do
-			mozconfig_add_options_ac "EXTRA_ECONF" --${opt#--}
-		done
-	fi
-
-	echo
-	echo "=========================================================="
-	echo "Building ${PF} with the following configuration"
-	grep ^ac_add_options "${MOZCONFIG}" | while read ac opt hash reason; do
-		[[ -z ${hash} || ${hash} == \# ]] \
-			|| die "error reading mozconfig: ${ac} ${opt} ${hash} ${reason}"
-		printf "    %-30s  %s\n" "${opt}" "${reason:-mozilla.org default}"
-	done
-	echo "=========================================================="
-	echo
-
-	./mach configure || die
-}
-
-src_compile() {
-	local virtx_cmd=
-
-	if use pgo ; then
-		virtx_cmd=virtx
-
-		# Reset and cleanup environment variables used by GNOME/XDG
-		gnome2_environment_reset
-
-		addpredict /root
-	fi
-
-	local -x GDK_BACKEND=x11
-
-	${virtx_cmd} ./mach build --verbose \
-		|| die
-}
-
-src_install() {
-	# xpcshell is getting called during install
-	pax-mark m \
-		"${BUILD_DIR}"/dist/bin/xpcshell \
-		"${BUILD_DIR}"/dist/bin/${PN} \
-		"${BUILD_DIR}"/dist/bin/plugin-container
-
-	DESTDIR="${D}" ./mach install || die
-
-	# Upstream cannot ship symlink but we can (bmo#658850)
-	rm "${ED}${MOZILLA_FIVE_HOME}/${PN}-bin" || die
-	dosym ${PN} ${MOZILLA_FIVE_HOME}/${PN}-bin
-
-	# Don't install llvm-symbolizer from sys-devel/llvm package
-	if [[ -f "${ED}${MOZILLA_FIVE_HOME}/llvm-symbolizer" ]] ; then
-		rm -v "${ED}${MOZILLA_FIVE_HOME}/llvm-symbolizer" || die
-	fi
-
-	# Install policy (currently only used to disable application updates)
-	insinto "${MOZILLA_FIVE_HOME}/distribution"
-	newins "${FILESDIR}"/distribution.ini distribution.ini
-	newins "${FILESDIR}"/disable-auto-update.policy.json policies.json
-
-	# Install system-wide preferences
-	local PREFS_DIR="${MOZILLA_FIVE_HOME}/defaults/pref"
-	insinto "${PREFS_DIR}"
-	newins "${FILESDIR}"/gentoo-default-prefs.js gentoo-prefs.js
-
-	local GENTOO_PREFS="${ED}${PREFS_DIR}/gentoo-prefs.js"
-
-	# Set dictionary path to use system hunspell
-	cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set spellchecker.dictionary_path pref"
-	pref("spellchecker.dictionary_path",       "${EPREFIX}/usr/share/myspell");
-	EOF
-
-	# Force hwaccel prefs if USE=hwaccel is enabled
-	if use hwaccel ; then
-		cat "${FILESDIR}"/gentoo-hwaccel-prefs.js \
-		>>"${GENTOO_PREFS}" \
-		|| die "failed to add prefs to force hardware-accelerated rendering to all-gentoo.js"
-
-		if use wayland; then
-			cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set hwaccel wayland prefs"
-			pref("gfx.x11-egl.force-enabled",          false);
-			EOF
-		else
-			cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set hwaccel x11 prefs"
-			pref("gfx.x11-egl.force-enabled",          true);
-			EOF
-		fi
-	fi
-
-	# Force the graphite pref if USE=system-harfbuzz is enabled, since the pref cannot disable it
-	if use system-harfbuzz ; then
-		cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set gfx.font_rendering.graphite.enabled pref"
-		sticky_pref("gfx.font_rendering.graphite.enabled", true);
-		EOF
-	fi
-
-	# Install language packs
-	local langpacks=( $(find "${WORKDIR}/language_packs" -type f -name '*.xpi') )
-	if [[ -n "${langpacks}" ]] ; then
-		moz_install_xpi "${MOZILLA_FIVE_HOME}/distribution/extensions" "${langpacks[@]}"
-	fi
-
-	# Install icons
-	local icon_srcdir="${S}/comm/mail/branding/thunderbird"
-	local icon_symbolic_file="${icon_srcdir}/TB-symbolic.svg"
-
-	insinto /usr/share/icons/hicolor/symbolic/apps
-	newins "${icon_symbolic_file}" ${PN}-symbolic.svg
-
-	local icon size
-	for icon in "${icon_srcdir}"/default*.png ; do
-		size=${icon%.png}
-		size=${size##*/default}
-
-		if [[ ${size} -eq 48 ]] ; then
-			newicon "${icon}" ${PN}.png
-		fi
-
-		newicon -s ${size} "${icon}" ${PN}.png
-	done
-
-	# Install menu
-	local app_name="Mozilla ${MOZ_PN^}"
-	local desktop_file="${FILESDIR}/icon/${PN}-r2.desktop"
-	local desktop_filename="${PN}.desktop"
-	local exec_command="${PN}"
-	local icon="${PN}"
-	local use_wayland="false"
-
-	if use wayland ; then
-		use_wayland="true"
-	fi
-
-	cp "${desktop_file}" "${WORKDIR}/${PN}.desktop-template" || die
-
-	sed -i \
-		-e "s:@NAME@:${app_name}:" \
-		-e "s:@EXEC@:${exec_command}:" \
-		-e "s:@ICON@:${icon}:" \
-		"${WORKDIR}/${PN}.desktop-template" \
-		|| die
-
-	newmenu "${WORKDIR}/${PN}.desktop-template" "${desktop_filename}"
-
-	rm "${WORKDIR}/${PN}.desktop-template" || die
-
-	# Install wrapper script
-	[[ -f "${ED}/usr/bin/${PN}" ]] && rm "${ED}/usr/bin/${PN}"
-	newbin "${FILESDIR}/${PN}-r1.sh" ${PN}
-
-	# Update wrapper
-	sed -i \
-		-e "s:@PREFIX@:${EPREFIX}/usr:" \
-		-e "s:@MOZ_FIVE_HOME@:${MOZILLA_FIVE_HOME}:" \
-		-e "s:@APULSELIB_DIR@:${apulselib}:" \
-		-e "s:@DEFAULT_WAYLAND@:${use_wayland}:" \
-		"${ED}/usr/bin/${PN}" \
-		|| die
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-
-	# If the apulse libs are available in MOZILLA_FIVE_HOME then apulse
-	# does not need to be forced into the LD_LIBRARY_PATH
-	if use pulseaudio && has_version ">=media-sound/apulse-0.1.12-r4" ; then
-		einfo "APULSE found; Generating library symlinks for sound support ..."
-		local lib
-		pushd "${ED}${MOZILLA_FIVE_HOME}" &>/dev/null || die
-		for lib in ../apulse/libpulse{.so{,.0},-simple.so{,.0}} ; do
-			# A quickpkg rolled by hand will grab symlinks as part of the package,
-			# so we need to avoid creating them if they already exist.
-			if [[ ! -L ${lib##*/} ]] ; then
-				ln -s "${lib}" ${lib##*/} || die
-			fi
-		done
-		popd &>/dev/null || die
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	if use pulseaudio && has_version ">=media-sound/apulse-0.1.12-r4" ; then
-		elog "Apulse was detected at merge time on this system and so it will always be"
-		elog "used for sound.  If you wish to use pulseaudio instead please unmerge"
-		elog "media-sound/apulse."
-		elog
-	fi
-
-	local show_doh_information
-	local show_shortcut_information
-
-	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
-		# New install; Tell user that DoH is disabled by default
-		show_doh_information=yes
-		show_shortcut_information=no
-	else
-		local replacing_version
-		for replacing_version in ${REPLACING_VERSIONS} ; do
-			if ver_test "${replacing_version}" -lt 91.0 ; then
-				# Tell user that we no longer install a shortcut
-				# per supported display protocol
-				show_shortcut_information=yes
-			fi
-		done
-	fi
-
-	if [[ -n "${show_doh_information}" ]] ; then
-		elog
-		elog "Note regarding Trusted Recursive Resolver aka DNS-over-HTTPS (DoH):"
-		elog "Due to privacy concerns (encrypting DNS might be a good thing, sending all"
-		elog "DNS traffic to Cloudflare by default is not a good idea and applications"
-		elog "should respect OS configured settings), \"network.trr.mode\" was set to 5"
-		elog "(\"Off by choice\") by default."
-		elog "You can enable DNS-over-HTTPS in ${PN^}'s preferences."
-	fi
-
-	if [[ -n "${show_shortcut_information}" ]] ; then
-		elog
-		elog "Since ${PN}-91.0 we no longer install multiple shortcuts for"
-		elog "each supported display protocol.  Instead we will only install"
-		elog "one generic Mozilla ${PN^} shortcut."
-		elog "If you still want to be able to select between running Mozilla ${PN^}"
-		elog "on X11 or Wayland, you have to re-create these shortcuts on your own."
-	fi
-
-	# bug 835078
-	if use hwaccel && has_version "x11-drivers/xf86-video-nouveau"; then
-		ewarn "You have nouveau drivers installed in your system and 'hwaccel' "
-		ewarn "enabled for Firefox. Nouveau / your GPU might not support the "
-		ewarn "required EGL, so either disable 'hwaccel' or try the workaround "
-		ewarn "explained in https://bugs.gentoo.org/835078#c5 if Firefox crashes."
-	fi
-
-	optfeature_header "Optional runtime features:"
-	optfeature "encrypted chat support" net-libs/libotr
-}
diff --git a/mail-client/thunderbird/thunderbird-102.4.0.ebuild b/mail-client/thunderbird/thunderbird-102.4.0.ebuild
index 30a2eccaa1c3..1ff0425c8ce4 100644
--- a/mail-client/thunderbird/thunderbird-102.4.0.ebuild
+++ b/mail-client/thunderbird/thunderbird-102.4.0.ebuild
@@ -57,7 +57,7 @@ SRC_URI="${MOZ_SRC_BASE_URI}/source/${MOZ_P}.source.tar.xz -> ${MOZ_P_DISTFILES}
 DESCRIPTION="Thunderbird Mail Client"
 HOMEPAGE="https://www.thunderbird.net/"
 
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 
 SLOT="0"
 LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
diff --git a/mail-client/thunderbird/thunderbird-91.13.1.ebuild b/mail-client/thunderbird/thunderbird-91.13.1.ebuild
deleted file mode 100644
index eec0e380e0f1..000000000000
--- a/mail-client/thunderbird/thunderbird-91.13.1.ebuild
+++ /dev/null
@@ -1,1131 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-FIREFOX_PATCHSET="firefox-91esr-patches-10j.tar.xz"
-
-LLVM_MAX_SLOT=14
-
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="ncurses,sqlite,ssl"
-
-WANT_AUTOCONF="2.1"
-
-VIRTUALX_REQUIRED="pgo"
-
-MOZ_ESR=
-
-MOZ_PV=${PV}
-MOZ_PV_SUFFIX=
-if [[ ${PV} =~ (_(alpha|beta|rc).*)$ ]] ; then
-	MOZ_PV_SUFFIX=${BASH_REMATCH[1]}
-
-	# Convert the ebuild version to the upstream Mozilla version
-	MOZ_PV="${MOZ_PV/_alpha/a}" # Handle alpha for SRC_URI
-	MOZ_PV="${MOZ_PV/_beta/b}"  # Handle beta for SRC_URI
-	MOZ_PV="${MOZ_PV%%_rc*}"    # Handle rc for SRC_URI
-fi
-
-if [[ -n ${MOZ_ESR} ]] ; then
-	# ESR releases have slightly different version numbers
-	MOZ_PV="${MOZ_PV}esr"
-fi
-
-MOZ_PN="${PN%-bin}"
-MOZ_P="${MOZ_PN}-${MOZ_PV}"
-MOZ_PV_DISTFILES="${MOZ_PV}${MOZ_PV_SUFFIX}"
-MOZ_P_DISTFILES="${MOZ_PN}-${MOZ_PV_DISTFILES}"
-
-inherit autotools check-reqs desktop flag-o-matic gnome2-utils \
-	llvm multiprocessing optfeature pax-utils python-any-r1 toolchain-funcs \
-	virtualx xdg
-
-MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/releases/${MOZ_PV}"
-
-if [[ ${PV} == *_rc* ]] ; then
-	MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/candidates/${MOZ_PV}-candidates/build${PV##*_rc}"
-fi
-
-PATCH_URIS=(
-	https://dev.gentoo.org/~{juippis,polynomial-c,whissi}/mozilla/patchsets/${FIREFOX_PATCHSET}
-)
-
-SRC_URI="${MOZ_SRC_BASE_URI}/source/${MOZ_P}.source.tar.xz -> ${MOZ_P_DISTFILES}.source.tar.xz
-	${PATCH_URIS[@]}"
-
-DESCRIPTION="Thunderbird Mail Client"
-HOMEPAGE="https://www.thunderbird.net/"
-
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
-
-SLOT="0"
-LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-
-IUSE="+clang cpu_flags_arm_neon dbus debug eme-free hardened hwaccel"
-IUSE+=" jack lto +openh264 pgo pulseaudio sndio selinux"
-IUSE+=" +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent +system-libvpx system-png +system-webp"
-IUSE+=" wayland wifi"
-
-REQUIRED_USE="debug? ( !system-av1 )
-	pgo? ( lto )
-	wifi? ( dbus )"
-
-BDEPEND="${PYTHON_DEPS}
-	app-arch/unzip
-	app-arch/zip
-	>=dev-util/cbindgen-0.24.0
-	>=net-libs/nodejs-10.23.1
-	virtual/pkgconfig
-	>=virtual/rust-1.51.0
-	|| (
-		(
-			sys-devel/clang:14
-			sys-devel/llvm:14
-			clang? (
-				=sys-devel/lld-14*
-				pgo? ( =sys-libs/compiler-rt-sanitizers-14*[profile] )
-			)
-		)
-		(
-			sys-devel/clang:13
-			sys-devel/llvm:13
-			clang? (
-				=sys-devel/lld-13*
-				pgo? ( =sys-libs/compiler-rt-sanitizers-13*[profile] )
-			)
-		)
-	)
-	amd64? ( >=dev-lang/nasm-2.13 )
-	x86? ( >=dev-lang/nasm-2.13 )"
-
-COMMON_DEPEND="
-	>=dev-libs/nss-3.68
-	>=dev-libs/nspr-4.32
-	dev-libs/atk
-	dev-libs/expat
-	>=x11-libs/cairo-1.10[X]
-	>=x11-libs/gtk+-3.4.0:3[X]
-	x11-libs/gdk-pixbuf
-	>=x11-libs/pango-1.22.0
-	>=media-libs/mesa-10.2:*
-	media-libs/fontconfig
-	>=media-libs/freetype-2.4.10
-	kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) )
-	virtual/freedesktop-icon-theme
-	>=x11-libs/pixman-0.19.2
-	>=dev-libs/glib-2.26:2
-	>=sys-libs/zlib-1.2.3
-	>=dev-libs/libffi-3.0.10:=
-	media-video/ffmpeg
-	x11-libs/libX11
-	x11-libs/libxcb:=
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXrender
-	x11-libs/libXt
-	dbus? (
-		sys-apps/dbus
-		dev-libs/dbus-glib
-	)
-	system-av1? (
-		>=media-libs/dav1d-0.8.1:=
-		>=media-libs/libaom-1.0.0:=
-	)
-	system-harfbuzz? (
-		>=media-libs/harfbuzz-2.8.1:0=
-		>=media-gfx/graphite2-1.3.13
-	)
-	system-icu? ( >=dev-libs/icu-69.1:= )
-	system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
-	system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] )
-	system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] )
-	system-png? ( >=media-libs/libpng-1.6.35:0=[apng] )
-	system-webp? ( >=media-libs/libwebp-1.1.0:0= )
-	wifi? (
-		kernel_linux? (
-			sys-apps/dbus
-			dev-libs/dbus-glib
-			net-misc/networkmanager
-		)
-	)
-	jack? ( virtual/jack )
-	selinux? ( sec-policy/selinux-mozilla )
-	sndio? ( media-sound/sndio )"
-
-RDEPEND="${COMMON_DEPEND}
-	jack? ( virtual/jack )
-	openh264? ( media-libs/openh264:*[plugin] )
-	pulseaudio? (
-		|| (
-			media-sound/pulseaudio
-			>=media-sound/apulse-0.1.12-r4
-		)
-	)
-	selinux? ( sec-policy/selinux-mozilla )
-	!<x11-plugins/enigmail-2.2"
-
-DEPEND="${COMMON_DEPEND}
-	x11-libs/libICE
-	x11-libs/libSM
-	pulseaudio? (
-		|| (
-			media-sound/pulseaudio
-			>=media-sound/apulse-0.1.12-r4[sdk]
-		)
-	)
-	wayland? ( >=x11-libs/gtk+-3.11:3[wayland] )
-	amd64? ( virtual/opengl )
-	x86? ( virtual/opengl )"
-
-S="${WORKDIR}/${PN}-${PV%_*}"
-
-llvm_check_deps() {
-	if ! has_version -b "sys-devel/clang:${LLVM_SLOT}" ; then
-		einfo "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-		return 1
-	fi
-
-	if use clang ; then
-		if ! has_version -b "=sys-devel/lld-${LLVM_SLOT}*" ; then
-			einfo "=sys-devel/lld-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-			return 1
-		fi
-
-		if use pgo ; then
-			if ! has_version -b "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}*" ; then
-				einfo "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-				return 1
-			fi
-		fi
-	fi
-
-	einfo "Using LLVM slot ${LLVM_SLOT} to build" >&2
-}
-
-MOZ_LANGS=(
-	af ar ast be bg br ca cak cs cy da de dsb
-	el en-CA en-GB en-US es-AR es-ES et eu
-	fi fr fy-NL ga-IE gd gl he hr hsb hu
-	id is it ja ka kab kk ko lt lv ms nb-NO nl nn-NO
-	pa-IN pl pt-BR pt-PT rm ro ru
-	sk sl sq sr sv-SE th tr uk uz vi zh-CN zh-TW
-)
-
-mozilla_set_globals() {
-	# https://bugs.gentoo.org/587334
-	local MOZ_TOO_REGIONALIZED_FOR_L10N=(
-		fy-NL ga-IE gu-IN hi-IN hy-AM nb-NO ne-NP nn-NO pa-IN sv-SE
-	)
-
-	local lang xflag
-	for lang in "${MOZ_LANGS[@]}" ; do
-		# en and en_US are handled internally
-		if [[ ${lang} == en ]] || [[ ${lang} == en-US ]] ; then
-			continue
-		fi
-
-		# strip region subtag if $lang is in the list
-		if has ${lang} "${MOZ_TOO_REGIONALIZED_FOR_L10N[@]}" ; then
-			xflag=${lang%%-*}
-		else
-			xflag=${lang}
-		fi
-
-		SRC_URI+=" l10n_${xflag/[_@]/-}? ("
-		SRC_URI+=" ${MOZ_SRC_BASE_URI}/linux-x86_64/xpi/${lang}.xpi -> ${MOZ_P_DISTFILES}-${lang}.xpi"
-		SRC_URI+=" )"
-		IUSE+=" l10n_${xflag/[_@]/-}"
-	done
-}
-mozilla_set_globals
-
-moz_clear_vendor_checksums() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -ne 1 ]] ; then
-		die "${FUNCNAME} requires exact one argument"
-	fi
-
-	einfo "Clearing cargo checksums for ${1} ..."
-
-	sed -i \
-		-e 's/\("files":{\)[^}]*/\1/' \
-		"${S}"/third_party/rust/${1}/.cargo-checksum.json \
-		|| die
-}
-
-moz_install_xpi() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 2 ]] ; then
-		die "${FUNCNAME} requires at least two arguments"
-	fi
-
-	local DESTDIR=${1}
-	shift
-
-	insinto "${DESTDIR}"
-
-	local emid xpi_file xpi_tmp_dir
-	for xpi_file in "${@}" ; do
-		emid=
-		xpi_tmp_dir=$(mktemp -d --tmpdir="${T}")
-
-		# Unpack XPI
-		unzip -qq "${xpi_file}" -d "${xpi_tmp_dir}" || die
-
-		# Determine extension ID
-		if [[ -f "${xpi_tmp_dir}/install.rdf" ]] ; then
-			emid=$(sed -n -e '/install-manifest/,$ { /em:id/!d; s/.*[\">]\([^\"<>]*\)[\"<].*/\1/; p; q }' "${xpi_tmp_dir}/install.rdf")
-			[[ -z "${emid}" ]] && die "failed to determine extension id from install.rdf"
-		elif [[ -f "${xpi_tmp_dir}/manifest.json" ]] ; then
-			emid=$(sed -n -e 's/.*"id": "\([^"]*\)".*/\1/p' "${xpi_tmp_dir}/manifest.json")
-			[[ -z "${emid}" ]] && die "failed to determine extension id from manifest.json"
-		else
-			die "failed to determine extension id"
-		fi
-
-		einfo "Installing ${emid}.xpi into ${ED}${DESTDIR} ..."
-		newins "${xpi_file}" "${emid}.xpi"
-	done
-}
-
-mozconfig_add_options_ac() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 2 ]] ; then
-		die "${FUNCNAME} requires at least two arguments"
-	fi
-
-	local reason=${1}
-	shift
-
-	local option
-	for option in ${@} ; do
-		echo "ac_add_options ${option} # ${reason}" >>${MOZCONFIG}
-	done
-}
-
-mozconfig_add_options_mk() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 2 ]] ; then
-		die "${FUNCNAME} requires at least two arguments"
-	fi
-
-	local reason=${1}
-	shift
-
-	local option
-	for option in ${@} ; do
-		echo "mk_add_options ${option} # ${reason}" >>${MOZCONFIG}
-	done
-}
-
-mozconfig_use_enable() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 1 ]] ; then
-		die "${FUNCNAME} requires at least one arguments"
-	fi
-
-	local flag=$(use_enable "${@}")
-	mozconfig_add_options_ac "$(use ${1} && echo +${1} || echo -${1})" "${flag}"
-}
-
-mozconfig_use_with() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 1 ]] ; then
-		die "${FUNCNAME} requires at least one arguments"
-	fi
-
-	local flag=$(use_with "${@}")
-	mozconfig_add_options_ac "$(use ${1} && echo +${1} || echo -${1})" "${flag}"
-}
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]] ; then
-		if use pgo ; then
-			if ! has usersandbox $FEATURES ; then
-				die "You must enable usersandbox as X server can not run as root!"
-			fi
-		fi
-
-		# Ensure we have enough disk space to compile
-		if use pgo || use lto || use debug ; then
-			CHECKREQS_DISK_BUILD="13500M"
-		else
-			CHECKREQS_DISK_BUILD="6400M"
-		fi
-
-		check-reqs_pkg_pretend
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]] ; then
-		if use pgo ; then
-			if ! has userpriv ${FEATURES} ; then
-				eerror "Building ${PN} with USE=pgo and FEATURES=-userpriv is not supported!"
-			fi
-		fi
-
-		# Ensure we have enough disk space to compile
-		if use pgo || use lto || use debug ; then
-			CHECKREQS_DISK_BUILD="13500M"
-		else
-			CHECKREQS_DISK_BUILD="6400M"
-		fi
-
-		check-reqs_pkg_setup
-
-		llvm_pkg_setup
-
-		if use clang && use lto ; then
-			local version_lld=$(ld.lld --version 2>/dev/null | awk '{ print $2 }')
-			[[ -n ${version_lld} ]] && version_lld=$(ver_cut 1 "${version_lld}")
-			[[ -z ${version_lld} ]] && die "Failed to read ld.lld version!"
-
-			local version_llvm_rust=$(rustc -Vv 2>/dev/null | grep -F -- 'LLVM version:' | awk '{ print $3 }')
-			[[ -n ${version_llvm_rust} ]] && version_llvm_rust=$(ver_cut 1 "${version_llvm_rust}")
-			[[ -z ${version_llvm_rust} ]] && die "Failed to read used LLVM version from rustc!"
-
-			if ver_test "${version_lld}" -ne "${version_llvm_rust}" ; then
-				eerror "Rust is using LLVM version ${version_llvm_rust} but ld.lld version belongs to LLVM version ${version_lld}."
-				eerror "You will be unable to link ${CATEGORY}/${PN}. To proceed you have the following options:"
-				eerror "  - Manually switch rust version using 'eselect rust' to match used LLVM version"
-				eerror "  - Switch to dev-lang/rust[system-llvm] which will guarantee matching version"
-				eerror "  - Build ${CATEGORY}/${PN} without USE=lto"
-				eerror "  - Rebuild lld with llvm that was used to build rust (may need to rebuild the whole "
-				eerror "    llvm/clang/lld/rust chain depending on your @world updates)"
-				die "LLVM version used by Rust (${version_llvm_rust}) does not match with ld.lld version (${version_lld})!"
-			fi
-		fi
-
-		if ! use clang && [[ $(gcc-major-version) -eq 11 ]] \
-			&& ! has_version -b ">sys-devel/gcc-11.1.0:11" ; then
-			# bug 792705
-			eerror "Using GCC 11 to compile firefox is currently known to be broken (see bug #792705)."
-			die "Set USE=clang or select <gcc-11 to build ${CATEGORY}/${P}."
-		fi
-
-		python-any-r1_pkg_setup
-
-		# Avoid PGO profiling problems due to enviroment leakage
-		# These should *always* be cleaned up anyway
-		unset \
-			DBUS_SESSION_BUS_ADDRESS \
-			DISPLAY \
-			ORBIT_SOCKETDIR \
-			SESSION_MANAGER \
-			XAUTHORITY \
-			XDG_CACHE_HOME \
-			XDG_SESSION_COOKIE
-
-		# Build system is using /proc/self/oom_score_adj, bug #604394
-		addpredict /proc/self/oom_score_adj
-
-		if use pgo ; then
-			# Allow access to GPU during PGO run
-			local ati_cards mesa_cards nvidia_cards render_cards
-			shopt -s nullglob
-
-			ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
-			if [[ -n "${ati_cards}" ]] ; then
-				addpredict "${ati_cards}"
-			fi
-
-			mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
-			if [[ -n "${mesa_cards}" ]] ; then
-				addpredict "${mesa_cards}"
-			fi
-
-			nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
-			if [[ -n "${nvidia_cards}" ]] ; then
-				addpredict "${nvidia_cards}"
-			fi
-
-			render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
-			if [[ -n "${render_cards}" ]] ; then
-				addpredict "${render_cards}"
-			fi
-
-			shopt -u nullglob
-		fi
-
-		if ! mountpoint -q /dev/shm ; then
-			# If /dev/shm is not available, configure is known to fail with
-			# a traceback report referencing /usr/lib/pythonN.N/multiprocessing/synchronize.py
-			ewarn "/dev/shm is not mounted -- expect build failures!"
-		fi
-
-		# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
-		# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
-		# get your own set of keys.
-		if [[ -z "${MOZ_API_KEY_GOOGLE+set}" ]] ; then
-			MOZ_API_KEY_GOOGLE="AIzaSyDEAOvatFogGaPi0eTgsV_ZlEzx0ObmepsMzfAc"
-		fi
-
-		if [[ -z "${MOZ_API_KEY_LOCATION+set}" ]] ; then
-			MOZ_API_KEY_LOCATION="AIzaSyB2h2OuRgGaPicUgy5N-5hsZqiPW6sH3n_rptiQ"
-		fi
-
-		# Mozilla API keys (see https://location.services.mozilla.com/api)
-		# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
-		# get your own set of keys.
-		if [[ -z "${MOZ_API_KEY_MOZILLA+set}" ]] ; then
-			MOZ_API_KEY_MOZILLA="edb3d487-3a84-46m0ap1e3-9dfd-92b5efaaa005"
-		fi
-
-		# Ensure we use C locale when building, bug #746215
-		export LC_ALL=C
-	fi
-}
-
-src_unpack() {
-	local _lp_dir="${WORKDIR}/language_packs"
-	local _src_file
-
-	if [[ ! -d "${_lp_dir}" ]] ; then
-		mkdir "${_lp_dir}" || die
-	fi
-
-	for _src_file in ${A} ; do
-		if [[ ${_src_file} == *.xpi ]]; then
-			cp "${DISTDIR}/${_src_file}" "${_lp_dir}" || die "Failed to copy '${_src_file}' to '${_lp_dir}'!"
-		else
-			unpack ${_src_file}
-		fi
-	done
-}
-
-src_prepare() {
-	if use lto; then
-		rm -v "${WORKDIR}"/firefox-patches/*-LTO-Only-enable-LTO-*.patch || die
-	fi
-
-	if use system-av1 && has_version "<media-libs/dav1d-1.0.0"; then
-		rm -v "${WORKDIR}"/firefox-patches/0033-bgo-835788-dav1d-1.0.0-support.patch || die
-		elog "<media-libs/dav1d-1.0.0 detected, removing 1.0.0 compat patch."
-	elif ! use system-av1; then
-		rm -v "${WORKDIR}"/firefox-patches/0033-bgo-835788-dav1d-1.0.0-support.patch || die
-		elog "-system-av1 USE flag detected, removing 1.0.0 compat patch."
-	fi
-
-	eapply "${WORKDIR}/firefox-patches"
-
-	# Allow user to apply any additional patches without modifing ebuild
-	eapply_user
-
-	# Make cargo respect MAKEOPTS
-	export CARGO_BUILD_JOBS="$(makeopts_jobs)"
-
-	# Make LTO respect MAKEOPTS
-	sed -i \
-		-e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
-		"${S}"/build/moz.configure/lto-pgo.configure \
-		|| die "sed failed to set num_cores"
-
-	# Make ICU respect MAKEOPTS
-	sed -i \
-		-e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
-		"${S}"/intl/icu_sources_data.py \
-		|| die "sed failed to set num_cores"
-
-	# sed-in toolchain prefix
-	sed -i \
-		-e "s/objdump/${CHOST}-objdump/" \
-		"${S}"/python/mozbuild/mozbuild/configure/check_debug_ranges.py \
-		|| die "sed failed to set toolchain prefix"
-
-	sed -i \
-		-e 's/ccache_stats = None/return None/' \
-		"${S}"/python/mozbuild/mozbuild/controller/building.py \
-		|| die "sed failed to disable ccache stats call"
-
-	einfo "Removing pre-built binaries ..."
-	find "${S}"/third_party -type f \( -name '*.so' -o -name '*.o' \) -print -delete || die
-
-	# Clearing checksums where we have applied patches
-	moz_clear_vendor_checksums target-lexicon-0.9.0
-
-	# Create build dir
-	BUILD_DIR="${WORKDIR}/${PN}_build"
-	mkdir -p "${BUILD_DIR}" || die
-
-	# Write API keys to disk
-	echo -n "${MOZ_API_KEY_GOOGLE//gGaPi/}" > "${S}"/api-google.key || die
-	echo -n "${MOZ_API_KEY_LOCATION//gGaPi/}" > "${S}"/api-location.key || die
-	echo -n "${MOZ_API_KEY_MOZILLA//m0ap1/}" > "${S}"/api-mozilla.key || die
-
-	xdg_environment_reset
-}
-
-src_configure() {
-	# Show flags set at the beginning
-	einfo "Current BINDGEN_CFLAGS:\t${BINDGEN_CFLAGS:-no value set}"
-	einfo "Current CFLAGS:\t\t${CFLAGS:-no value set}"
-	einfo "Current CXXFLAGS:\t\t${CXXFLAGS:-no value set}"
-	einfo "Current LDFLAGS:\t\t${LDFLAGS:-no value set}"
-	einfo "Current RUSTFLAGS:\t\t${RUSTFLAGS:-no value set}"
-
-	local have_switched_compiler=
-	if use clang && ! tc-is-clang ; then
-		# Force clang
-		einfo "Enforcing the use of clang due to USE=clang ..."
-		have_switched_compiler=yes
-		AR=llvm-ar
-		CC=${CHOST}-clang
-		CXX=${CHOST}-clang++
-		NM=llvm-nm
-		RANLIB=llvm-ranlib
-	elif ! use clang && ! tc-is-gcc ; then
-		# Force gcc
-		have_switched_compiler=yes
-		einfo "Enforcing the use of gcc due to USE=-clang ..."
-		AR=gcc-ar
-		CC=${CHOST}-gcc
-		CXX=${CHOST}-g++
-		NM=gcc-nm
-		RANLIB=gcc-ranlib
-	fi
-
-	if [[ -n "${have_switched_compiler}" ]] ; then
-		# Because we switched active compiler we have to ensure
-		# that no unsupported flags are set
-		strip-unsupported-flags
-	fi
-
-	# Ensure we use correct toolchain
-	export HOST_CC="$(tc-getBUILD_CC)"
-	export HOST_CXX="$(tc-getBUILD_CXX)"
-	tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
-
-	# Pass the correct toolchain paths through cbindgen
-	if tc-is-cross-compiler ; then
-		export BINDGEN_CFLAGS="${SYSROOT:+--sysroot=${ESYSROOT}} --target=${CHOST} ${BINDGEN_CFLAGS-}"
-	fi
-
-	# Set MOZILLA_FIVE_HOME
-	export MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
-
-	# python/mach/mach/mixin/process.py fails to detect SHELL
-	export SHELL="${EPREFIX}/bin/bash"
-
-	# Set state path
-	export MOZBUILD_STATE_PATH="${BUILD_DIR}"
-
-	# Set MOZCONFIG
-	export MOZCONFIG="${S}/.mozconfig"
-
-	# Initialize MOZCONFIG
-	mozconfig_add_options_ac '' --enable-application=comm/mail
-
-	# Set Gentoo defaults
-	export MOZILLA_OFFICIAL=1
-
-	mozconfig_add_options_ac 'Gentoo default' \
-		--allow-addon-sideload \
-		--disable-cargo-incremental \
-		--disable-crashreporter \
-		--disable-install-strip \
-		--disable-strip \
-		--disable-updater \
-		--enable-js-shell \
-		--enable-official-branding \
-		--enable-release \
-		--enable-system-ffi \
-		--enable-system-pixman \
-		--host="${CBUILD:-${CHOST}}" \
-		--libdir="${EPREFIX}/usr/$(get_libdir)" \
-		--prefix="${EPREFIX}/usr" \
-		--target="${CHOST}" \
-		--without-ccache \
-		--with-intl-api \
-		--with-libclang-path="$(llvm-config --libdir)" \
-		--with-system-nspr \
-		--with-system-nss \
-		--with-system-zlib \
-		--with-toolchain-prefix="${CHOST}-" \
-		--with-unsigned-addon-scopes=app,system \
-		--x-includes="${ESYSROOT}/usr/include" \
-		--x-libraries="${ESYSROOT}/usr/$(get_libdir)"
-
-	# Set update channel
-	local update_channel=release
-	[[ -n ${MOZ_ESR} ]] && update_channel=esr
-	mozconfig_add_options_ac '' --update-channel=${update_channel}
-
-	if ! use x86 && [[ ${CHOST} != armv*h* ]] ; then
-		mozconfig_add_options_ac '' --enable-rust-simd
-	fi
-
-	if [[ -s "${S}/api-google.key" ]] ; then
-		local key_origin="Gentoo default"
-		if [[ $(cat "${S}/api-google.key" | md5sum | awk '{ print $1 }') != 709560c02f94b41f9ad2c49207be6c54 ]] ; then
-			key_origin="User value"
-		fi
-
-		mozconfig_add_options_ac "${key_origin}" \
-			--with-google-safebrowsing-api-keyfile="${S}/api-google.key"
-	else
-		einfo "Building without Google API key ..."
-	fi
-
-	if [[ -s "${S}/api-location.key" ]] ; then
-		local key_origin="Gentoo default"
-		if [[ $(cat "${S}/api-location.key" | md5sum | awk '{ print $1 }') != ffb7895e35dedf832eb1c5d420ac7420 ]] ; then
-			key_origin="User value"
-		fi
-
-		mozconfig_add_options_ac "${key_origin}" \
-			--with-google-location-service-api-keyfile="${S}/api-location.key"
-	else
-		einfo "Building without Location API key ..."
-	fi
-
-	if [[ -s "${S}/api-mozilla.key" ]] ; then
-		local key_origin="Gentoo default"
-		if [[ $(cat "${S}/api-mozilla.key" | md5sum | awk '{ print $1 }') != 3927726e9442a8e8fa0e46ccc39caa27 ]] ; then
-			key_origin="User value"
-		fi
-
-		mozconfig_add_options_ac "${key_origin}" \
-			--with-mozilla-api-keyfile="${S}/api-mozilla.key"
-	else
-		einfo "Building without Mozilla API key ..."
-	fi
-
-	mozconfig_use_with system-av1
-	mozconfig_use_with system-harfbuzz
-	mozconfig_use_with system-harfbuzz system-graphite2
-	mozconfig_use_with system-icu
-	mozconfig_use_with system-jpeg
-	mozconfig_use_with system-libevent system-libevent "${ESYSROOT}/usr"
-	mozconfig_use_with system-libvpx
-	mozconfig_use_with system-png
-	mozconfig_use_with system-webp
-
-	mozconfig_use_enable dbus
-
-	use eme-free && mozconfig_add_options_ac '+eme-free' --disable-eme
-
-	if use hardened ; then
-		mozconfig_add_options_ac "+hardened" --enable-hardening
-		append-ldflags "-Wl,-z,relro -Wl,-z,now"
-	fi
-
-	mozconfig_use_enable jack
-
-	mozconfig_use_enable pulseaudio
-	# force the deprecated alsa sound code if pulseaudio is disabled
-	if use kernel_linux && ! use pulseaudio ; then
-		mozconfig_add_options_ac '-pulseaudio' --enable-alsa
-	fi
-
-	mozconfig_use_enable sndio
-
-	mozconfig_use_enable wifi necko-wifi
-
-	if use wayland ; then
-		mozconfig_add_options_ac '+wayland' --enable-default-toolkit=cairo-gtk3-wayland
-	else
-		mozconfig_add_options_ac '' --enable-default-toolkit=cairo-gtk3
-	fi
-
-	if use lto ; then
-		if use clang ; then
-			# Upstream only supports lld when using clang
-			mozconfig_add_options_ac "forcing ld=lld due to USE=clang and USE=lto" --enable-linker=lld
-
-			mozconfig_add_options_ac '+lto' --enable-lto=cross
-		else
-			# ld.gold is known to fail:
-			# /usr/lib/gcc/x86_64-pc-linux-gnu/11.2.1/../../../../x86_64-pc-linux-gnu/bin/ld.gold: internal error in set_xindex, at /var/tmp/portage/sys-devel/binutils-2.37_p1-r1/work/binutils-2.37/gold/object.h:1050
-
-			# ThinLTO is currently broken, see bmo#1644409
-			mozconfig_add_options_ac '+lto' --enable-lto=full
-			mozconfig_add_options_ac "linker is set to bfd" --enable-linker=bfd
-		fi
-
-		if use pgo ; then
-			mozconfig_add_options_ac '+pgo' MOZ_PGO=1
-
-			if use clang ; then
-				# Used in build/pgo/profileserver.py
-				export LLVM_PROFDATA="llvm-profdata"
-			fi
-		fi
-	else
-		# Avoid auto-magic on linker
-		if use clang ; then
-			# This is upstream's default
-			mozconfig_add_options_ac "forcing ld=lld due to USE=clang" --enable-linker=lld
-		else
-			mozconfig_add_options_ac "linker is set to bfd" --enable-linker=bfd
-		fi
-	fi
-
-	# LTO flag was handled via configure
-	filter-flags '-flto*'
-
-	mozconfig_use_enable debug
-	if use debug ; then
-		mozconfig_add_options_ac '+debug' --disable-optimize
-	else
-		if is-flag '-g*' ; then
-			if use clang ; then
-				mozconfig_add_options_ac 'from CFLAGS' --enable-debug-symbols=$(get-flag '-g*')
-			else
-				mozconfig_add_options_ac 'from CFLAGS' --enable-debug-symbols
-			fi
-		else
-			mozconfig_add_options_ac 'Gentoo default' --disable-debug-symbols
-		fi
-
-		if is-flag '-O0' ; then
-			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O0
-		elif is-flag '-O4' ; then
-			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O4
-		elif is-flag '-O3' ; then
-			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O3
-		elif is-flag '-O1' ; then
-			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O1
-		elif is-flag '-Os' ; then
-			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-Os
-		else
-			mozconfig_add_options_ac "Gentoo default" --enable-optimize=-O2
-		fi
-	fi
-
-	# Debug flag was handled via configure
-	filter-flags '-g*'
-
-	# Optimization flag was handled via configure
-	filter-flags '-O*'
-
-	# Modifications to better support ARM, bug #553364
-	if use cpu_flags_arm_neon ; then
-		mozconfig_add_options_ac '+cpu_flags_arm_neon' --with-fpu=neon
-
-		if ! tc-is-clang ; then
-			# thumb options aren't supported when using clang, bug 666966
-			mozconfig_add_options_ac '+cpu_flags_arm_neon' \
-				--with-thumb=yes \
-				--with-thumb-interwork=no
-		fi
-	fi
-
-	if [[ ${CHOST} == armv*h* ]] ; then
-		mozconfig_add_options_ac 'CHOST=armv*h*' --with-float-abi=hard
-
-		if ! use system-libvpx ; then
-			sed -i \
-				-e "s|softfp|hard|" \
-				"${S}"/media/libvpx/moz.build \
-				|| die
-		fi
-	fi
-
-	if use clang ; then
-		# https://bugzilla.mozilla.org/show_bug.cgi?id=1482204
-		# https://bugzilla.mozilla.org/show_bug.cgi?id=1483822
-		# toolkit/moz.configure Elfhack section: target.cpu in ('arm', 'x86', 'x86_64')
-		local disable_elf_hack=
-		if use amd64 ; then
-			disable_elf_hack=yes
-		elif use x86 ; then
-			disable_elf_hack=yes
-		elif use arm ; then
-			disable_elf_hack=yes
-		fi
-
-		if [[ -n ${disable_elf_hack} ]] ; then
-			mozconfig_add_options_ac 'elf-hack is broken when using Clang' --disable-elf-hack
-		fi
-	elif tc-is-gcc ; then
-		if ver_test $(gcc-fullversion) -ge 10 ; then
-			einfo "Forcing -fno-tree-loop-vectorize to workaround GCC bug, see bug 758446 ..."
-			append-cxxflags -fno-tree-loop-vectorize
-		fi
-	fi
-
-	# Additional ARCH support
-	case "${ARCH}" in
-		arm)
-			# Reduce the memory requirements for linking
-			if use clang ; then
-				# Nothing to do
-				:;
-			elif tc-ld-is-gold || use lto ; then
-				append-ldflags -Wl,--no-keep-memory
-			else
-				append-ldflags -Wl,--no-keep-memory -Wl,--reduce-memory-overheads
-			fi
-			;;
-	esac
-
-	if ! use elibc_glibc ; then
-		mozconfig_add_options_ac '!elibc_glibc' --disable-jemalloc
-	fi
-
-	# Allow elfhack to work in combination with unstripped binaries
-	# when they would normally be larger than 2GiB.
-	append-ldflags "-Wl,--compress-debug-sections=zlib"
-
-	# Make revdep-rebuild.sh happy; Also required for musl
-	append-ldflags -Wl,-rpath="${MOZILLA_FIVE_HOME}",--enable-new-dtags
-
-	# Pass $MAKEOPTS to build system
-	export MOZ_MAKE_FLAGS="${MAKEOPTS}"
-
-	# Use system's Python environment
-	export MACH_USE_SYSTEM_PYTHON=1
-
-	# Disable notification when build system has finished
-	export MOZ_NOSPAM=1
-
-	# Portage sets XARGS environment variable to "xargs -r" by default which
-	# breaks build system's check_prog() function which doesn't support arguments
-	mozconfig_add_options_ac 'Gentoo default' "XARGS=${EPREFIX}/usr/bin/xargs"
-
-	# Set build dir
-	mozconfig_add_options_mk 'Gentoo default' "MOZ_OBJDIR=${BUILD_DIR}"
-
-	# Show flags we will use
-	einfo "Build BINDGEN_CFLAGS:\t${BINDGEN_CFLAGS:-no value set}"
-	einfo "Build CFLAGS:\t\t${CFLAGS:-no value set}"
-	einfo "Build CXXFLAGS:\t\t${CXXFLAGS:-no value set}"
-	einfo "Build LDFLAGS:\t\t${LDFLAGS:-no value set}"
-	einfo "Build RUSTFLAGS:\t\t${RUSTFLAGS:-no value set}"
-
-	# Handle EXTRA_CONF and show summary
-	local ac opt hash reason
-
-	# Apply EXTRA_ECONF entries to $MOZCONFIG
-	if [[ -n ${EXTRA_ECONF} ]] ; then
-		IFS=\! read -a ac <<<${EXTRA_ECONF// --/\!}
-		for opt in "${ac[@]}"; do
-			mozconfig_add_options_ac "EXTRA_ECONF" --${opt#--}
-		done
-	fi
-
-	echo
-	echo "=========================================================="
-	echo "Building ${PF} with the following configuration"
-	grep ^ac_add_options "${MOZCONFIG}" | while read ac opt hash reason; do
-		[[ -z ${hash} || ${hash} == \# ]] \
-			|| die "error reading mozconfig: ${ac} ${opt} ${hash} ${reason}"
-		printf "    %-30s  %s\n" "${opt}" "${reason:-mozilla.org default}"
-	done
-	echo "=========================================================="
-	echo
-
-	./mach configure || die
-}
-
-src_compile() {
-	local virtx_cmd=
-
-	if use pgo ; then
-		virtx_cmd=virtx
-
-		# Reset and cleanup environment variables used by GNOME/XDG
-		gnome2_environment_reset
-
-		addpredict /root
-	fi
-
-	local -x GDK_BACKEND=x11
-
-	${virtx_cmd} ./mach build --verbose \
-		|| die
-}
-
-src_install() {
-	# xpcshell is getting called during install
-	pax-mark m \
-		"${BUILD_DIR}"/dist/bin/xpcshell \
-		"${BUILD_DIR}"/dist/bin/${PN} \
-		"${BUILD_DIR}"/dist/bin/plugin-container
-
-	DESTDIR="${D}" ./mach install || die
-
-	# Upstream cannot ship symlink but we can (bmo#658850)
-	rm "${ED}${MOZILLA_FIVE_HOME}/${PN}-bin" || die
-	dosym ${PN} ${MOZILLA_FIVE_HOME}/${PN}-bin
-
-	# Don't install llvm-symbolizer from sys-devel/llvm package
-	if [[ -f "${ED}${MOZILLA_FIVE_HOME}/llvm-symbolizer" ]] ; then
-		rm -v "${ED}${MOZILLA_FIVE_HOME}/llvm-symbolizer" || die
-	fi
-
-	# Install policy (currently only used to disable application updates)
-	insinto "${MOZILLA_FIVE_HOME}/distribution"
-	newins "${FILESDIR}"/distribution.ini distribution.ini
-	newins "${FILESDIR}"/disable-auto-update.policy.json policies.json
-
-	# Install system-wide preferences
-	local PREFS_DIR="${MOZILLA_FIVE_HOME}/defaults/pref"
-	insinto "${PREFS_DIR}"
-	newins "${FILESDIR}"/gentoo-default-prefs.js gentoo-prefs.js
-
-	local GENTOO_PREFS="${ED}${PREFS_DIR}/gentoo-prefs.js"
-
-	# Set dictionary path to use system hunspell
-	cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set spellchecker.dictionary_path pref"
-	pref("spellchecker.dictionary_path",       "${EPREFIX}/usr/share/myspell");
-	EOF
-
-	# Force hwaccel prefs if USE=hwaccel is enabled
-	if use hwaccel ; then
-		cat "${FILESDIR}"/gentoo-hwaccel-prefs.js \
-		>>"${GENTOO_PREFS}" \
-		|| die "failed to add prefs to force hardware-accelerated rendering to all-gentoo.js"
-	fi
-
-	# Force the graphite pref if USE=system-harfbuzz is enabled, since the pref cannot disable it
-	if use system-harfbuzz ; then
-		cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set gfx.font_rendering.graphite.enabled pref"
-		sticky_pref("gfx.font_rendering.graphite.enabled", true);
-		EOF
-	fi
-
-	# Install language packs
-	local langpacks=( $(find "${WORKDIR}/language_packs" -type f -name '*.xpi') )
-	if [[ -n "${langpacks}" ]] ; then
-		moz_install_xpi "${MOZILLA_FIVE_HOME}/distribution/extensions" "${langpacks[@]}"
-	fi
-
-	# Install icons
-	local icon_srcdir="${S}/comm/mail/branding/thunderbird"
-	local icon_symbolic_file="${icon_srcdir}/TB-symbolic.svg"
-
-	insinto /usr/share/icons/hicolor/symbolic/apps
-	newins "${icon_symbolic_file}" ${PN}-symbolic.svg
-
-	local icon size
-	for icon in "${icon_srcdir}"/default*.png ; do
-		size=${icon%.png}
-		size=${size##*/default}
-
-		if [[ ${size} -eq 48 ]] ; then
-			newicon "${icon}" ${PN}.png
-		fi
-
-		newicon -s ${size} "${icon}" ${PN}.png
-	done
-
-	# Install menu
-	local app_name="Mozilla ${MOZ_PN^}"
-	local desktop_file="${FILESDIR}/icon/${PN}-r2.desktop"
-	local desktop_filename="${PN}.desktop"
-	local exec_command="${PN}"
-	local icon="${PN}"
-	local use_wayland="false"
-
-	if use wayland ; then
-		use_wayland="true"
-	fi
-
-	cp "${desktop_file}" "${WORKDIR}/${PN}.desktop-template" || die
-
-	sed -i \
-		-e "s:@NAME@:${app_name}:" \
-		-e "s:@EXEC@:${exec_command}:" \
-		-e "s:@ICON@:${icon}:" \
-		"${WORKDIR}/${PN}.desktop-template" \
-		|| die
-
-	newmenu "${WORKDIR}/${PN}.desktop-template" "${desktop_filename}"
-
-	rm "${WORKDIR}/${PN}.desktop-template" || die
-
-	# Install wrapper script
-	[[ -f "${ED}/usr/bin/${PN}" ]] && rm "${ED}/usr/bin/${PN}"
-	newbin "${FILESDIR}/${PN}-r1.sh" ${PN}
-
-	# Update wrapper
-	sed -i \
-		-e "s:@PREFIX@:${EPREFIX}/usr:" \
-		-e "s:@MOZ_FIVE_HOME@:${MOZILLA_FIVE_HOME}:" \
-		-e "s:@APULSELIB_DIR@:${apulselib}:" \
-		-e "s:@DEFAULT_WAYLAND@:${use_wayland}:" \
-		"${ED}/usr/bin/${PN}" \
-		|| die
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-
-	# If the apulse libs are available in MOZILLA_FIVE_HOME then apulse
-	# does not need to be forced into the LD_LIBRARY_PATH
-	if use pulseaudio && has_version ">=media-sound/apulse-0.1.12-r4" ; then
-		einfo "APULSE found; Generating library symlinks for sound support ..."
-		local lib
-		pushd "${ED}${MOZILLA_FIVE_HOME}" &>/dev/null || die
-		for lib in ../apulse/libpulse{.so{,.0},-simple.so{,.0}} ; do
-			# A quickpkg rolled by hand will grab symlinks as part of the package,
-			# so we need to avoid creating them if they already exist.
-			if [[ ! -L ${lib##*/} ]] ; then
-				ln -s "${lib}" ${lib##*/} || die
-			fi
-		done
-		popd &>/dev/null || die
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	if use pulseaudio && has_version ">=media-sound/apulse-0.1.12-r4" ; then
-		elog "Apulse was detected at merge time on this system and so it will always be"
-		elog "used for sound.  If you wish to use pulseaudio instead please unmerge"
-		elog "media-sound/apulse."
-		elog
-	fi
-
-	local show_doh_information
-	local show_shortcut_information
-
-	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
-		# New install; Tell user that DoH is disabled by default
-		show_doh_information=yes
-		show_shortcut_information=no
-	else
-		local replacing_version
-		for replacing_version in ${REPLACING_VERSIONS} ; do
-			if ver_test "${replacing_version}" -lt 91.0 ; then
-				# Tell user that we no longer install a shortcut
-				# per supported display protocol
-				show_shortcut_information=yes
-			fi
-		done
-	fi
-
-	if [[ -n "${show_doh_information}" ]] ; then
-		elog
-		elog "Note regarding Trusted Recursive Resolver aka DNS-over-HTTPS (DoH):"
-		elog "Due to privacy concerns (encrypting DNS might be a good thing, sending all"
-		elog "DNS traffic to Cloudflare by default is not a good idea and applications"
-		elog "should respect OS configured settings), \"network.trr.mode\" was set to 5"
-		elog "(\"Off by choice\") by default."
-		elog "You can enable DNS-over-HTTPS in ${PN^}'s preferences."
-	fi
-
-	if [[ -n "${show_shortcut_information}" ]] ; then
-		elog
-		elog "Since ${PN}-91.0 we no longer install multiple shortcuts for"
-		elog "each supported display protocol.  Instead we will only install"
-		elog "one generic Mozilla ${PN^} shortcut."
-		elog "If you still want to be able to select between running Mozilla ${PN^}"
-		elog "on X11 or Wayland, you have to re-create these shortcuts on your own."
-	fi
-
-	optfeature_header "Optional runtime features:"
-	optfeature "encrypted chat support" net-libs/libotr
-}
diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz
index a8884242ea6d..9bf0b64619b2 100644
Binary files a/mail-filter/Manifest.gz and b/mail-filter/Manifest.gz differ
diff --git a/mail-filter/mimedefang/Manifest b/mail-filter/mimedefang/Manifest
index 7c685fee7c47..b06b6e1b0528 100644
--- a/mail-filter/mimedefang/Manifest
+++ b/mail-filter/mimedefang/Manifest
@@ -1,8 +1,11 @@
 AUX mimedefang-2.72-ldflags.patch 2458 BLAKE2B 3d78cfee8b7bfe87c57390045919511ee11548bc0279316b54c63a428e04d4d168b1d5cd430600e17fa63c5ca2770756bfdf8f681025dff08a600629af3eb9d6 SHA512 a84ff0cefc9dc56b348b8fe6715e9669af43a25d20867b63c63a3006565edd6fb40d2f27b8ddcfd8dd5bb9a4f023e23ae4d258da70df53e3309d680fac4b0aef
-AUX mimedefang-tests.patch 327 BLAKE2B 1bf56e641b0094c9ff32c8e61d8ce751383e7aa084469f32a5ccd72fab970524723882e979394913c24d0d8211344d0ac5cb6df32996826facba4d09d4847b41 SHA512 d04f81edafb569adbe98ee6cd20793c657b098d3d29aec84af9be3bf61cbba592cdd4adda314ad28e2e559ca00979b24ec7783849d11bc4e213f54ab305b69f7
-AUX mimedefang.conf 4760 BLAKE2B 14457894f4f42557ee06aca1454a85978fee1d0dd21dca7cfcf17a2526473212e7813079af4ea949cef398ee3caecc2ce505c254c66209899a64fc7728ef0ff1 SHA512 7f0c8700a48fcbf8e9539a5e34e9b59288ecabe53a1651f6e4b6e01a6bd71475dd5e6417ef966868b6d8b16e36946cde04e31f1ef634abd7b40f3f2f2f55d594
-AUX mimedefang.init 1740 BLAKE2B bf00f5797e2dd72a29dc5b955a18a7faff1e9fd2b82d011f0628222ebc2b4117e1a9262d096706b83729c4e3851a09a65a0d1c0ee57d68c155c9136c63b569a2 SHA512 f45b3ce8a085b3559c80e4bf361ecf3cc16c360322986ac5381a1707e217a282fec4a9bec7856dd153107557911bd6eb9a9ec66b160c0b6bfec3e783aaef321a
+AUX mimedefang-tests.patch 255 BLAKE2B c922cc096e4364cdd601c2f4746f5c71393d0c94a32f7141d439c9a5995977cfec52a40722f9fa11a91bc00df1833b89371f5c470134bf3953cca8ed7e84967b SHA512 90d86b05a50746064f281bc2a812f167a6ec2ac019c2fd9eb863e4a09f54648d8e1ed14345f949d2666d2bbee23e89c02cfabd8d3d96ac4aa1bcd8e8851be516
+AUX mimedefang-tests2.patch 630 BLAKE2B 7e7e07d27c8bc21ea2382895b9f3207850de25c096ad1891d0e32c556c76be78a0d8ddd1b07bd0598f2df36e32d9072b3d7bc14a9786238558dd72360b2a7e22 SHA512 23c8b20696ec6217ba69d7105f3947d71f819d703b0be759dcacbf996b07ce9797c568fa9c5598402298d1fda58dc07c6b0d84d7a630fc625ca72a54b1dded91
+AUX mimedefang-vendor.patch 1161 BLAKE2B dd3db311d749c7655dfccaa791e64179db0ae5317a6bc21ddb88d9bba95606576a5e70276ba5e7aaf63599d2b79a428a09a4b5ccd8e9145e96864687d2277dab SHA512 cefcd2afdc9f4013705eea09401b6ebe60f1f9649456d082d7e8aa79ab6ee9e289c4fda20a224846fbb49db20e16f5e47d572f44daf69064b8eafbac450adaf3
+AUX mimedefang.conf 4802 BLAKE2B a4b1961b2309b85abb6ff607b6044e9cd9e0938ef740504c2d3d09bc60df9bb56ccbbab78009246637e6b914a6a51d9b61527f721369ea89c8d56b0ede04a51c SHA512 a087fa75169e2e23ab6e6ec7fabbc965a5585bea9731b2bf1d3612185e6314b4bbe7d4d23dd8adfc3b904bd9b957f9dafe5a9eb139a7f2df4ad86197993c79e8
+AUX mimedefang.init 1799 BLAKE2B 96da24cc26a5b10358a8c993cce9a2a329d2b38df92571af38ea193285e67369ee5d333558c1c8eb0c0ca90709b8b860e119d9146d6639346a85a7ffe50f822c SHA512 1fe4d534063b771b9ef0838fe54c7138e398d11569a2f1880ba41d03d28831cce59bda80cc4eaa1e6564c360638aad82da3f12666dbcc2ff69ddf4370e93b539
 DIST mimedefang-2.84.tar.gz 371596 BLAKE2B b9b871d6a438792afbcebfcd99a77a1f9bb2c0dc7826abea74db913c6dc154403753a3016dc0647e9873256fe354649dea096c0e50d54f8db16ff8d2b91f54f4 SHA512 ffe039654d2e3f649219efc559380e39b21ce910becc36e262356d59d50129f8683ee2e59dd9680aff46478ccebd6b3d9c4567f85ade9a8464077350f4e52f48
-EBUILD mimedefang-2.84-r1.ebuild 1795 BLAKE2B 8f9134d7f5c9236e294a09d2bc8a8126b18d0de1a3f6b8587bf82f1631feb1814d36f46e781b881bbfa47526edec916779684582c4af997897d9cf5df209995b SHA512 dc0e51681879d2fbb00979e035f9e7ef8e9af99b91ecc0b94a52714850afee97b6391b88a327da79fb05184cde3e3d0d97833ef1a74fa8ae171b2913ef2c5b56
+DIST mimedefang-3.1.tar.gz 494467 BLAKE2B 4b1f9156c606b83bf9895ab76c4929fa37c2e0bd4454cb7177f1a2b8e8bfcac1b0eedfaefd1c32ceb29d9e0425ab09fb22c552ebe37a587f517d073dd46e16f6 SHA512 392c2bfa1f4e6bb2503ba6887d79696ccc861ded17a780d3ff44bd12c14ae248536aa8f056ec4679bf9c76b6a82d0357d5fdfe467b664b8992a0c11056c5180f
 EBUILD mimedefang-2.84-r2.ebuild 1772 BLAKE2B 0adfb92ea77a804bbdba8148e98dc5de53141edaa5ebaf750c77e774349cba136fad5989ec325150d6da8b9fee9cdf0b0da8d2081dbdf27b6cf5528f829df439 SHA512 51934b795a546a48f2bfc021db0dfd69ad284ab9cb4444d782777ad7635fc054e50b4f5656e3e0bb9c719ca5b6c61c4484f3ffa942e4e7b1b4e1497ac32cc413
+EBUILD mimedefang-3.1.ebuild 1817 BLAKE2B e408c8f046664acb16660f5d89ef536344c3a12c0d5d8357809b13eeec2154cadb33684461d0863c5d11392153b9f1f93df61f6b90520e6af4ac9e33bd0b18e5 SHA512 5c40ffe318784f74ed62b3f086461470adf903e93948ef67dcdb7d2bdc201b0241cf25540856e679fff60cc0aedb75aca06932258350c05abfbdb1e7f78d8d60
 MISC metadata.xml 749 BLAKE2B 52dd0d19fc548cc9f40f105b079b3507236d85384ac9375155e5f0080b5de0481c129c644dc9c40d7b819fae8134ddae24cdfc13f9842e4056362e3055eabcf9 SHA512 f9757c87d51c72ab8523ffd138478e34b6b7aa7e7b0c26ee84671e15f4e76519cd7493eafc85fa8b3006dbec49e048619121fdca6cea8c78a0d34fe824cd7d34
diff --git a/mail-filter/mimedefang/files/mimedefang-tests.patch b/mail-filter/mimedefang/files/mimedefang-tests.patch
index 82f8b9b56160..a6bb02e85ae7 100644
--- a/mail-filter/mimedefang/files/mimedefang-tests.patch
+++ b/mail-filter/mimedefang/files/mimedefang-tests.patch
@@ -1,5 +1,5 @@
---- a/t/lib/MIMEDefang/Unit.pm.ori	2010-05-13 23:12:23.000000000 +0200
-+++ b/t/lib/MIMEDefang/Unit.pm	2019-07-10 15:08:35.190824853 +0200
+--- a/t/lib/MIMEDefang/Unit.pm.ori
++++ b/t/lib/MIMEDefang/Unit.pm
 @@ -12,7 +12,7 @@
  	no warnings 'redefine';
  	local *CORE::GLOBAL::exit = sub { };
diff --git a/mail-filter/mimedefang/files/mimedefang-tests2.patch b/mail-filter/mimedefang/files/mimedefang-tests2.patch
new file mode 100644
index 000000000000..90753ef40680
--- /dev/null
+++ b/mail-filter/mimedefang/files/mimedefang-tests2.patch
@@ -0,0 +1,21 @@
+--- a/t/net.t
++++ b/t/net.t
+@@ -54,9 +54,15 @@
+   my @rbl;
+   $rbl[0] = "dnsbltest.spamassassin.org";
+   my $relayip = "144.137.3.98";
+-  detect_and_load_perl_modules();
+-  my $res = relay_is_blacklisted_multi($relayip, 10, 1, \@rbl);
+-  is($res->{"dnsbltest.spamassassin.org"}[0], "127.0.0.2");
++
++  SKIP: {
++    if ( (not defined $ENV{'NET_TEST'}) or ($ENV{'NET_TEST'} ne 'yes' )) {
++      skip "Net test disabled", 1
++    }
++    detect_and_load_perl_modules();
++    my $res = relay_is_blacklisted_multi($relayip, 10, 1, \@rbl);
++    is($res->{"dnsbltest.spamassassin.org"}[0], "127.0.0.2");
++  }
+ }
+ 
+ __PACKAGE__->runtests();
diff --git a/mail-filter/mimedefang/files/mimedefang-vendor.patch b/mail-filter/mimedefang/files/mimedefang-vendor.patch
new file mode 100644
index 000000000000..a66bd66046f5
--- /dev/null
+++ b/mail-filter/mimedefang/files/mimedefang-vendor.patch
@@ -0,0 +1,30 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -42,7 +42,7 @@
+ PERLINSTALLSITELIB=@PERLINSTALLSITELIB@
+ PERLINSTALLPRIVLIB=@PERLINSTALLPRIVLIB@
+ PERLVENDORPREFIX=@PERLVENDORPREFIX@
+-PERLVENDORLIB=@PERLINSTALLPRIVLIB@/vendor_perl
++PERLVENDORLIB=@PERLVENDORLIB@
+ LDFLAGS=@LDFLAGS@
+ IP_HEADER=@IP_HEADER@
+ SPOOLDIR=@SPOOLDIR@
+--- a/configure
++++ b/configure
+@@ -662,6 +662,7 @@
+ PERLINSTALLPRIVLIB
+ PERLINSTALLARCHLIB
+ PERLVENDORPREFIX
++PERLVENDORLIB
+ PERLSITEPREFIX
+ PERLPREFIX
+ CONFDIR_EVAL
+@@ -3962,7 +3963,7 @@
+ fi
+ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+ 
+-for thing in prefix siteprefix vendorprefix installarchlib installprivlib installbin installman1dir installman3dir installscript installsitearch installsitelib; do
++for thing in prefix siteprefix vendorprefix vendorlib installarchlib installprivlib installbin installman1dir installman3dir installscript installsitearch installsitelib; do
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Perl installation variable $thing" >&5
+ printf %s "checking for Perl installation variable $thing... " >&6; }
+     val=`$PERL -V:$thing | sed -e "s/^.*='//" -e "s/';$//"`
diff --git a/mail-filter/mimedefang/files/mimedefang.conf b/mail-filter/mimedefang/files/mimedefang.conf
index 5deb1401d5ef..051ffb1823b3 100644
--- a/mail-filter/mimedefang/files/mimedefang.conf
+++ b/mail-filter/mimedefang/files/mimedefang.conf
@@ -2,6 +2,9 @@
 # Mandatory options for MIMEDefang #
 ####################################
 
+# PID directory
+PIDDIR='/run/MIMEDefang'
+
 # spool directory
 SPOOLDIR='/var/spool/MIMEDefang'
 
diff --git a/mail-filter/mimedefang/files/mimedefang.init b/mail-filter/mimedefang/files/mimedefang.init
index 931f47bf5919..4d9624a93ce6 100644
--- a/mail-filter/mimedefang/files/mimedefang.init
+++ b/mail-filter/mimedefang/files/mimedefang.init
@@ -1,10 +1,12 @@
 #!/sbin/openrc-run
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+PIDDIR="${PIDDIR:-/run/MIMEDefang}"
+PID="${PIDDIR}/mimedefang.pid"
+MXPID="${PIDDIR}/mimedefang-multiplexor.pid"
+
 SPOOLDIR="${SPOOLDIR:-/var/spool/MIMEDefang}"
-PID="${SPOOLDIR}/mimedefang.pid"
-MXPID="${SPOOLDIR}/mimedefang-multiplexor.pid"
 LOCK="${SPOOLDIR}/mimedefang.lock"
 MXLOCK="${SPOOLDIR}/mimedefang-multiplexor.lock"
 
@@ -21,6 +23,7 @@ depend() {
 }
 
 checkconfig() {
+	checkpath -d "${PIDDIR}"
 	checkpath -d "${SPOOLDIR}"
 	einfo "multiplexor socket: ${MX_SOCKET}"
 	einfo "sendmail socket: ${SOCKET}"
diff --git a/mail-filter/mimedefang/mimedefang-2.84-r1.ebuild b/mail-filter/mimedefang/mimedefang-3.1.ebuild
similarity index 82%
rename from mail-filter/mimedefang/mimedefang-2.84-r1.ebuild
rename to mail-filter/mimedefang/mimedefang-3.1.ebuild
index e916663dfa66..80c4242a862d 100644
--- a/mail-filter/mimedefang/mimedefang-2.84-r1.ebuild
+++ b/mail-filter/mimedefang/mimedefang-3.1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 DESCRIPTION="Antispam, antivirus and other customizable filters for MTAs with Milter support"
-HOMEPAGE="http://www.mimedefang.org/"
-SRC_URI="http://www.mimedefang.org/static/${P}.tar.gz"
+HOMEPAGE="https://www.mimedefang.org/"
+SRC_URI="https://mimedefang.org/releases/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
@@ -14,6 +14,7 @@ IUSE="clamav +poll test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
+	|| ( mail-mta/sendmail mail-mta/postfix )
 	acct-group/defang
 	acct-user/defang
 	dev-perl/Digest-SHA1
@@ -21,7 +22,7 @@ RDEPEND="
 	dev-perl/MailTools
 	dev-perl/MIME-tools
 	dev-perl/Unix-Syslog
-	|| ( mail-filter/libmilter mail-mta/sendmail )
+	mail-filter/libmilter:=
 	virtual/perl-MIME-Base64
 	clamav? ( app-antivirus/clamav )
 "
@@ -34,11 +35,11 @@ DEPEND="
 	)
 "
 
-src_prepare() {
-	eapply "${FILESDIR}/${PN}-2.72-ldflags.patch"
-	eapply "${FILESDIR}/${PN}-tests.patch"
-	eapply_user
-}
+PATCHES=(
+	"${FILESDIR}/${PN}-2.72-ldflags.patch"
+	"${FILESDIR}/${PN}-vendor.patch"
+	"${FILESDIR}/${PN}-tests2.patch"
+)
 
 src_configure() {
 	local myeconfargs=(
diff --git a/mate-base/Manifest.gz b/mate-base/Manifest.gz
index 72470850a610..23402f1c996b 100644
Binary files a/mate-base/Manifest.gz and b/mate-base/Manifest.gz differ
diff --git a/mate-base/mate-applets/Manifest b/mate-base/mate-applets/Manifest
index 6ed8d358176c..de4dbafc5fad 100644
--- a/mate-base/mate-applets/Manifest
+++ b/mate-base/mate-applets/Manifest
@@ -1,3 +1,5 @@
 DIST mate-applets-1.24.1.tar.xz 8222540 BLAKE2B f018f131cedda486a28c3a125c07efaf5c3111f95c17b0c3fbdd0b1f084ddf851d46ea4ef511a1e57f6d9f7f29a28e48ab010abc4cc6d87c1315b79bfbf01849 SHA512 d29e39a140310fef84cb0fe631568e0177ca5faaf2bf566211a23b32613fd6aabf06dd8ecd81a16e09553c659a7feda9ba372bb62a70504a235be58e07726ed2
+DIST mate-applets-1.26.0.tar.xz 8442720 BLAKE2B b7e3d9cf868926c13652e93b214317c59f7693f3cedc277d2f8e676892bde026587893faabbfff1c6d35af2e6e7f900c3b71d89fc4a8065ff794d1be6e0e4f99 SHA512 4b7676afd8a3ca9e2389f3775abcad5e84bfd628394e98c66c1e77a99503f4893bfd5c8839d63e6044b1b11990aa1d6f7fa857522c1907461ee7b1f68efc7192
 EBUILD mate-applets-1.24.1.ebuild 2106 BLAKE2B 1a399b0f26da4563a7b509cd2ea57474c67ef5c91779f9aa575403792c61807e98abcc51e65048bf7a85bddb7edfeefa1503cb064194a8fb0924d7177fae2679 SHA512 1e7e473bb7e565f65d8a817a975fea0a34347a2c865d5f496fc39a50079f31904fb526c0808f7590837e17cda4c7969c21dd59b77eec20d9f5260b93e3a98321
-MISC metadata.xml 477 BLAKE2B fbaf4a8d44e1a536a4ca376057d0cb567d2eaf500950bac84ec9c3845e321a5e149355d26641aacb14c53e42d21363a79ab9d6da46ef846598ada12e942a9e84 SHA512 ceeece9a646eab26c4c686f426d0441abc344c85bee6635ca9e5ce50689f0ae36fc2d3db1619569f873723199eaf015eb35778c11f82d5dae65e754678f35b35
+EBUILD mate-applets-1.26.0.ebuild 2148 BLAKE2B c162b4a5a3ea393421dc757c98946f64f87530885a89583d1274e0e7ae90a7de3ab88865d5e10f38bfe83c1683a6d1a0ada1e7532787a8f25d6d86ba565e0d81 SHA512 1dea1552ceac067d1dfb699141bc870b62ce019c20c1b44103c564a7de31ee7503162127c9268bb976f6716e5ece10e8e72747c10f0ad904adcdbc81ed93a56e
+MISC metadata.xml 537 BLAKE2B c2dcc9bea2e0aed4539a9793fd16a712d2fe48f33425f39002fa6b643342ba308d810de81ead295075d73f1e01e4d5b29fc28ab274d1d770fa0e8b49a552ada5 SHA512 f1dedf39ef5b49c1d5c14526ff5d5463328c833d717c929151ec7ed4c0d45980fbec2a040c18afc7dc5c6138e4b4a18332226771c8ea0ad5a20d1d5a767553d2
diff --git a/mate-base/mate-applets/mate-applets-1.26.0.ebuild b/mate-base/mate-applets/mate-applets-1.26.0.ebuild
new file mode 100644
index 000000000000..9a6d65f8af07
--- /dev/null
+++ b/mate-base/mate-applets/mate-applets-1.26.0.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit mate
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86"
+fi
+
+DESCRIPTION="Applets for the MATE Desktop and Panel"
+LICENSE="CC-BY-SA-3.0 FDL-1.1+ GPL-2+ GPL-3+ LGPL-2+"
+SLOT="0"
+
+IUSE="X +cpupower ipv6 netlink policykit +upower"
+
+REQUIRED_USE="policykit? ( cpupower )"
+
+COMMON_DEPEND="
+	dev-libs/atk
+	>=dev-libs/dbus-glib-0.74
+	>=dev-libs/glib-2.50:2
+	>=dev-libs/libmateweather-1.17.0
+	>=dev-libs/libxml2-2.5:2
+	>=gnome-base/libgtop-2.12.0:2=
+	>=gnome-extra/gucharmap-3.0:2.90
+	>=mate-base/mate-panel-1.25.2
+	>=net-wireless/wireless-tools-28_pre9:0
+	>=sys-apps/dbus-1.10.0
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3.22:3
+	x11-libs/gtksourceview:3.0
+	>=x11-libs/libnotify-0.7
+	x11-libs/libX11
+	>=x11-libs/libwnck-3.0:3
+	x11-libs/pango
+	cpupower? (
+		sys-power/cpupower
+		policykit? ( >=sys-auth/polkit-0.97:0 )
+	)
+	netlink? (
+		dev-libs/libnl:3
+	)
+	upower? ( >=sys-power/upower-0.99.8 )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	mate-base/caja
+	mate-base/mate-desktop
+	>=mate-base/mate-settings-daemon-1.6
+	virtual/libintl
+"
+
+BDEPEND="${COMMON_DEPEND}
+	app-text/docbook-xml-dtd:4.3
+	app-text/rarian
+	>=app-text/scrollkeeper-dtd-1:1.0
+	app-text/yelp-tools
+	dev-libs/libxslt
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+src_configure() {
+
+	# configure.ac logic is a little hinky
+	# and ignores --enable flags for cpufreq
+	use cpupower || myconf="--disable-cpufreq"
+
+	mate_src_configure \
+		--libexecdir=/usr/libexec/mate-applets \
+		$(use_with X x) \
+		$(use_with upower) \
+		$(use_with netlink nl) \
+		$(use_enable ipv6) \
+		$(use_enable policykit polkit) \
+		"${myconf[@]}"
+}
+
+src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS
+	emake check
+}
+
+src_install() {
+	mate_src_install
+
+	local APPLETS="accessx-status battstat charpick command cpufreq drivemount
+			geyes mateweather multiload netspeed stickynotes
+			timerapplet trashapplet"
+
+	for applet in ${APPLETS}; do
+		docinto ${applet}
+
+		for d in AUTHORS ChangeLog NEWS README README.themes TODO; do
+			[ -s ${applet}/${d} ] && dodoc ${applet}/${d}
+		done
+	done
+}
diff --git a/mate-base/mate-applets/metadata.xml b/mate-base/mate-applets/metadata.xml
index 4213c64d6b17..4031bc303455 100644
--- a/mate-base/mate-applets/metadata.xml
+++ b/mate-base/mate-applets/metadata.xml
@@ -9,6 +9,7 @@
 		<flag name="cpupower">
 			Enable support for cpu frequency manipulation using <pkg>sys-power/cpupower</pkg>
 		</flag>
+		<flag name="netlink">Use <pkg>dev-libs/libnl</pkg></flag>
 	</use>
 	<upstream>
 		<remote-id type="github">mate-desktop/mate-applets</remote-id>
diff --git a/mate-extra/Manifest.gz b/mate-extra/Manifest.gz
index 812ac45226ef..31c11c84aa6d 100644
Binary files a/mate-extra/Manifest.gz and b/mate-extra/Manifest.gz differ
diff --git a/mate-extra/caja-actions/Manifest b/mate-extra/caja-actions/Manifest
new file mode 100644
index 000000000000..6d8df189abc0
--- /dev/null
+++ b/mate-extra/caja-actions/Manifest
@@ -0,0 +1,3 @@
+DIST caja-actions-1.26.0.tar.xz 11177892 BLAKE2B dd7d36995051f3640569557498dcf26aa2c65aa30dcfed4cead10804a253ab923ea5bddc3b0063f873e0ddde9c4c0d0d0a2b08c0c48b6676d4eed130406b55a1 SHA512 1387fdcfd960ff616f478972f59fa141278cc0b0896c2702ca65be29874af8f2b1a6b6bddd8f6ffd2f8a0d2603af0f1393925d5144b16b836fd5de6ab90a3504
+EBUILD caja-actions-1.26.0.ebuild 638 BLAKE2B 6b822168f5dc81f0ccd8428861bdd05f3a8ff4fc672c15bfee202fe03bc1db16ad17cd212760437e653cd5a6ff0997e40adc0184d22f4951655c2bd90e3da22c SHA512 022d988bf34f6f01f9945d5b5b1e243e90eefc20e75c6ea7c2e5f27e1790ac268b9aae69da2fe9bda7618697f2657550aee399de2ccdbbd3a5b5199277f26446
+MISC metadata.xml 341 BLAKE2B 0cb853e8730104f115e52645e68683f5724253a4c4c9d5ff6d68b2ffaab96efaf8b4b8d73375d85d70bc7d566f8b8584c8a733dbff91d0369a431c1f02301668 SHA512 07a27d88971dadc091f3dfec5fa28604c1796f902ec51df61e335e525309a8ae481571b4b204aa80d862c6c04bf8bb257369e863125386a333bfa5a9eea5116e
diff --git a/mate-extra/caja-actions/caja-actions-1.26.0.ebuild b/mate-extra/caja-actions/caja-actions-1.26.0.ebuild
new file mode 100644
index 000000000000..1dcf22d08048
--- /dev/null
+++ b/mate-extra/caja-actions/caja-actions-1.26.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 2019-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MATE_LA_PUNT=yes
+
+inherit mate
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Caja Actions"
+HOMEPAGE="https://github.com/infirit/caja-admin"
+
+LICENSE="GPL-2+"
+SLOT="0"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.32:2
+	>=x11-libs/gtk+-3.22:3
+	>=gnome-base/libgtop-2.23.1:2=
+	dev-libs/libxml2
+	>=mate-base/caja-1.17
+	x11-libs/libSM
+	virtual/libintl
+"
+RDEPEND="${COMMON_DEPEND}"
+BDEPEND="${COMMON_DEPEND}
+	>=sys-devel/gettext-0.19.8
+	>=sys-devel/autoconf-2.53:*
+	>=sys-devel/libtool-2.2.6:2
+	virtual/pkgconfig
+"
diff --git a/mate-extra/caja-actions/metadata.xml b/mate-extra/caja-actions/metadata.xml
new file mode 100644
index 000000000000..4148eaae6382
--- /dev/null
+++ b/mate-extra/caja-actions/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>mate@gentoo.org</email>
+		<name>Gentoo MATE Desktop</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">mate-desktop/caja-actions</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/mate-extra/caja-dropbox/Manifest b/mate-extra/caja-dropbox/Manifest
index b95aa392f12f..cc56420bfe35 100644
--- a/mate-extra/caja-dropbox/Manifest
+++ b/mate-extra/caja-dropbox/Manifest
@@ -1,3 +1,5 @@
 DIST caja-dropbox-1.24.0.tar.xz 309024 BLAKE2B 2ae560dcd6e744fe96d9e0fcd876a899c22ad06b8238c2ad9e5394cf80aa8844cd634431dc6bb245396e6d919da857645488214880947e5b90413c254cd4c6a2 SHA512 64d699b4c3957d5996ef69936b4b2746641bc2db4efb7b23535febf5eed3ee767330927aeeda67747c0d72e0f052a2979ae2160ffaaf01e4fd82aff68a5f27bf
+DIST caja-dropbox-1.26.0.tar.xz 361352 BLAKE2B 877196d1c6900904314e4ea0f4220821febe123395b1af8eb30e6557beea068ce572621473e733bf41f597a9c72d03ca0b2666cb7c335bbdcaefec06ffd577b9 SHA512 f96e3ddf4434936b04e992044d6cd5797b6ff77ead573e8e9a6493f4308d9716f47871f1fd7f08b0dbf7f2659f107511b6be65e98632a0892ebfff0a9888dbe7
 EBUILD caja-dropbox-1.24.0-r1.ebuild 1843 BLAKE2B ba60c03db008ff52a343cb8f66eea4aa8ffa94a029f5b5631b870429af8faac57dea531078a55e2e5d48879fa6cb8c52f3b41bc486e79d5e0c54b39b73f5d5a2 SHA512 fe7a8894418d61ee67c8da61a263e2d8b0909ba21095b55290964bd9c4ace0c3a06a5681d4c246313f56c967652a0eff2d46ff222dc9bb407116e141fa871137
+EBUILD caja-dropbox-1.26.0-r1.ebuild 1858 BLAKE2B 8d79880ca97ebc2a935c271ddeadd7fd22be82af7099475bee1e5684ddba03cf9e44a44c3bde6c5c75cd790619205e2d91d4dc86c79f439af7b3e1fdbda03fc5 SHA512 c9d109ef27a006e336780c063236346db5dc3a0378712f88908a8e1f24a530f2cbbd8bfc30d0a010f2c7a769b96600cba1d677529bdccde452d10f5f0dfbb084
 MISC metadata.xml 342 BLAKE2B 819a1836902b4b04aeff2de9a7c8af1e1baec3d4854e308f9796c9372ff50b327cef9da9d9c8a193dad97b01f8c53991b5f578323000243b27ba1d296ec6b4d0 SHA512 e1171322b47f82c9d4c9e2cc5755974ef39fdf87ec5590402d1842b3cda6b79b30ef5f40f450f91511df1700dbede47fcf885f210c03a3d4e51b6cbe063ecbde
diff --git a/mate-extra/caja-dropbox/caja-dropbox-1.26.0-r1.ebuild b/mate-extra/caja-dropbox/caja-dropbox-1.26.0-r1.ebuild
new file mode 100644
index 000000000000..1a25e3298ceb
--- /dev/null
+++ b/mate-extra/caja-dropbox/caja-dropbox-1.26.0-r1.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8,9,10,11} )
+MATE_LA_PUNT="yes"
+
+inherit mate python-single-r1 linux-info
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Store, Sync and Share Files Online"
+LICENSE="CC-BY-ND-3.0 GPL-3+ public-domain"
+SLOT="0"
+
+IUSE="debug nls"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	dev-libs/atk
+	>=dev-libs/glib-2.50:2
+	$(python_gen_cond_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]')
+	>=mate-base/caja-1.19.1
+	mate-extra/caja-extensions
+	media-libs/fontconfig:1.0
+	media-libs/freetype:2
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3.22:3
+	x11-libs/libXinerama
+	x11-libs/pango
+"
+
+RDEPEND="${COMMON_DEPEND}
+	net-misc/dropbox
+"
+
+BDEPEND="${COMMON_DEPEND}
+	dev-python/docutils
+	virtual/pkgconfig
+"
+
+CONFIG_CHECK="~INOTIFY_USER"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	check_extra_config
+}
+
+MATE_FORCE_AUTORECONF=true
+
+src_prepare() {
+	# Use system dropbox.
+	sed -e "s|~/[.]dropbox-dist|/opt/dropbox|" \
+		-e 's|\(DROPBOXD_PATH = \).*|\1"/opt/dropbox/dropboxd"|' \
+			-i caja-dropbox.in || die
+
+	sed -e 's|\[rst2man\]|\[rst2man\.py\]|' -i configure.ac || die
+
+	mate_src_prepare
+}
+
+src_configure() {
+	mate_src_configure \
+		$(use_enable debug) \
+		$(use_enable nls)
+}
+
+src_install() {
+	python_fix_shebang caja-dropbox.in
+
+	mate_src_install
+}
+
+pkg_postinst() {
+	mate_pkg_postinst
+
+	for v in ${REPLACING_VERSIONS}; do
+		if ver_test "${v}" "-lt" "1.24.0-r1" || ver_test "${v}" "-eq" "9999"; then
+			ewarn "Starting with ${CATEGORY}/${PN}-1.24.0-r1, ${PN} now no longer"
+			ewarn "configures caja-dropbox to use its own group. This brings caja-dropbox in line"
+			ewarn "with nautilus-dropbox and dolphin-plugins-dropbox. You may remove the 'dropbox' group."
+		fi
+	done
+}
diff --git a/mate-extra/mate-indicator-applet/Manifest b/mate-extra/mate-indicator-applet/Manifest
index b7539f5ce7ab..7138075867ba 100644
--- a/mate-extra/mate-indicator-applet/Manifest
+++ b/mate-extra/mate-indicator-applet/Manifest
@@ -1,3 +1,5 @@
 DIST mate-indicator-applet-1.24.0.tar.xz 380136 BLAKE2B 1ae77c892f02127f7a0d778958e0f4acc2b14e01a4b8d8a316253c3b227eacd59cb556ed852de690f3ec4aec4d02874c2f594b41315cd85c87c16967ef9403ee SHA512 0e82f572c1855c8623e537a45c2c0c0b98d3d642e46333eedc16c26607205293098a062008d0e568890ffdf6b8dc4c30a7f5e2e41a150f940917b3671783e413
+DIST mate-indicator-applet-1.26.0.tar.xz 383936 BLAKE2B 4435c8e2c4acf5cd033a9f85b39a2f577d9861124fa47e22bdba970fb61c9ce5fe8bf31bc87a47a8a8f82640905c50b316f35f572a2a4a83830c8f8d110b80fd SHA512 677586b4090edd22871eb034b923795a01030a5270e633a11ed711171e49f487047fbf75daf1d69d491660bdf63421b900e06fd806eeef93df101058c0130c06
 EBUILD mate-indicator-applet-1.24.0-r1.ebuild 530 BLAKE2B ab438772184bd64faf7d6f8e8438885a54c65828169b0e3894390d85106c3bc10cbb91270a430f4fff800302cc4fd752a8b76f0866c1bf0d1d56a6ed386ecb40 SHA512 84728a11a6f695738084c2afcbed4429c2586fa772b3e54aeb158a828780af4a04d816d4f06ad763ec9db869057d107d81e1a24e015850cd91949890e8a6574f
+EBUILD mate-indicator-applet-1.26.0.ebuild 523 BLAKE2B 2941c5a73fb47724efd5a95a48111018d3990fc8256b70e2476e36a5d4e1ee33838d02e66a23c043a997359bf8c411b9083f0cdaf2e892b9d3d0685226702a52 SHA512 be4ce6d82f5cce030497737118856e1daa1b4991fe1646a7a5a584eebeaf9cee8077b5027768e3a06a82029cd64a1b1525f6f72c968fccdbc4ab5a40648d3683
 MISC metadata.xml 351 BLAKE2B e48e460d9a4129eb19a7edb5659e7ca8b3bdb62fe6b00e3366be15716c6283ade2707b5a1d03fa9be44cc95ee506a15ff267c7b3e764f71e9f67ba3ca1f4c98a SHA512 2538efec96a0fe9ffb744536b92ccaf5da779efc46a0731849ccbf11348a590d2ecfbf3abc55ba9063ffb96eeca7ecb379927e192371cae681d56dee170a9870
diff --git a/mate-extra/mate-indicator-applet/mate-indicator-applet-1.26.0.ebuild b/mate-extra/mate-indicator-applet/mate-indicator-applet-1.26.0.ebuild
new file mode 100644
index 000000000000..518ca06dfc34
--- /dev/null
+++ b/mate-extra/mate-indicator-applet/mate-indicator-applet-1.26.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit mate
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+fi
+
+DESCRIPTION="MATE indicator applet"
+LICENSE="GPL-3 GPL-3+ LGPL-2+ LGPL-3+"
+SLOT="0"
+
+IUSE=""
+
+COMMON_DEPEND="
+	>=dev-libs/libindicator-0.4:3
+	>=mate-base/mate-panel-1.17.0
+	>=x11-libs/gtk+-3.22:3
+"
+
+RDEPEND="${COMMON_DEPEND}
+	virtual/libintl
+"
+
+BDEPEND="${COMMON_DEPEND}
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 14ddd9c932e8..bc37cefd9bd7 100644
Binary files a/media-gfx/Manifest.gz and b/media-gfx/Manifest.gz differ
diff --git a/media-gfx/eog/Manifest b/media-gfx/eog/Manifest
index fae927a8135e..1dd485cf2dc1 100644
--- a/media-gfx/eog/Manifest
+++ b/media-gfx/eog/Manifest
@@ -1,5 +1,7 @@
 DIST eog-42.3.tar.xz 4460968 BLAKE2B ce589ec50210870bf11d8737c0ca18dd7da308de59654639623f15984f9d62f36cb1b87854fa4f67b7885cb5802e576281fc91c6e2c86e9d285d9a952193a8cc SHA512 bc82830897c55769cd2cb0c0d428b9456465c0f4e793c597ea74b3c84d5c052f051b772413cb32754153714239a9815a09fe93daf928f13e16f8d997b1e58b45
 DIST eog-43.0.tar.xz 4461552 BLAKE2B 3afc0da472e9b57d6cde097c0aad08d2880ba596eb94cf8091fa99b802a2c11ee87e04b617f65e31bf11bf8885c92023dbb422ad58c2a768995eb5676b993d30 SHA512 ee9de8469f408a247577e71854cb45e0a8058f8ffd3cc42bbead67994862179d24bf9fbf7d8e18ba20ac13b3a11479053b87abe7da07358f5816d0f94b1f4f8d
+DIST eog-43.1.tar.xz 4649476 BLAKE2B 0c7225f8f7fd60ff66469c43a0d11c15fa26956cf22706ee5d2a8c06597a8b4ef51a7d3754cde968bf2f98301d5f59326db05213217c7012fe193c57f0ce04ef SHA512 10fd4f6ad07d5a0c13931cb47c3a16d208eb6aa107f288e32fa0f1fd711d17893be9d9980fa64fa530047da131ef4e10d729421ac46d3549a9ab731be45479bc
 EBUILD eog-42.3.ebuild 1713 BLAKE2B ab54d270a0702792c60a7e3d069a0a842b99f2615ed840c8c40c4648f20bf53b35e490e9336d8070e1d7628240505e30bb063182cf0c86f5fe0905eb82482aae SHA512 21334df0eb38c1631b98afbf52e701281345177dc38020a05f45470a15550e6702755405508128e345c494a469c8ebdf81d368ca93ff522dae0a97270626f23c
 EBUILD eog-43.0.ebuild 1747 BLAKE2B 0c3270091bcb648893290dd7ed772458c1f0a54e5448943dad43162045d284fb43a3a3cc3563bba898c883c97cd6c98d121beb99c4d8f26fa002923420a946c3 SHA512 80f94f87e9814cde7850d0c30c6c7807c4514baa0f762f29d9433076126e33e99f40afbe6603f76ab9c1999889bb790359a2ed56ac53ecb57b07cdcce7d09644
+EBUILD eog-43.1.ebuild 1745 BLAKE2B d5eeed8b34a65cc88a4c57212ee7bdcc0b10a79fedd5273be9d217fdb2e2d5d7156185eb0ca4a605307cd75c0541c28e6e3271dbbf88c2a63a9d950e748abd0a SHA512 157de1c1e0eb22c75e0b110196bdffcba1a670bf74d14f3579690c1411452765eece200b21dbff4015edc1199016c00727fb3ff75c55e4a4e2bf1317e9f0ee5b
 MISC metadata.xml 482 BLAKE2B 03780ad7b79dd3b35ee6a9b3ee95bceb94ebbd97de711912ba0f5e61ef4e25d9a20a474011cd3c5261c82757105bed5383f16259468dee80bfd6cdcec13b5828 SHA512 0c51ba4ac4859bc5e6361862282a76a98343ad3e46dfac04e088c79ec25683e820ea907991212979b5fffa0b757a66ea33ddfcff7a8012e42e81dba0e943ea39
diff --git a/media-gfx/eog/eog-43.1.ebuild b/media-gfx/eog/eog-43.1.ebuild
new file mode 100644
index 000000000000..e05a0fa8da4e
--- /dev/null
+++ b/media-gfx/eog/eog-43.1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome.org gnome2-utils meson xdg
+
+DESCRIPTION="The Eye of GNOME image viewer"
+HOMEPAGE="https://wiki.gnome.org/Apps/EyeOfGnome https://gitlab.gnome.org/GNOME/eog"
+
+LICENSE="GPL-2+"
+SLOT="1"
+
+IUSE="+exif gtk-doc +introspection +jpeg lcms +svg xmp tiff"
+REQUIRED_USE="
+	exif? ( jpeg )
+	gtk-doc? ( introspection )
+"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	>=dev-libs/glib-2.53.4:2
+	>=dev-libs/libpeas-0.7.4[gtk]
+	>=gnome-base/gnome-desktop-2.91.2:3=
+	>=gnome-base/gsettings-desktop-schemas-42_beta
+	>=x11-misc/shared-mime-info-0.20
+	>=x11-libs/gdk-pixbuf-2.36.5:2[jpeg?,tiff?]
+	>=x11-libs/gtk+-3.24.15:3[introspection,X]
+	>=gui-libs/libhandy-1.5.0:1
+	sys-libs/zlib
+
+	exif? ( >=media-libs/libexif-0.6.14 )
+	lcms? ( media-libs/lcms:2 )
+	xmp? ( media-libs/exempi:2 )
+	jpeg? ( media-libs/libjpeg-turbo:= )
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+	svg? ( >=gnome-base/librsvg-2.44.0:2 )
+
+	x11-libs/libX11
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	gtk-doc? (
+		dev-util/gi-docgen
+		app-text/docbook-xml-dtd:4.1.2
+	)
+	dev-util/glib-utils
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use exif libexif)
+		$(meson_use lcms cms)
+		$(meson_use xmp)
+		$(meson_use jpeg libjpeg)
+		$(meson_use svg librsvg)
+		$(meson_use gtk-doc gtk_doc)
+		$(meson_use introspection)
+		-Dinstalled_tests=false
+		-Dlibportal=false # As of 40.3, all libportal usages are flatpak-specific
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/media-gfx/eom/Manifest b/media-gfx/eom/Manifest
index 2d9e0569c555..9cd9d2b603fa 100644
--- a/media-gfx/eom/Manifest
+++ b/media-gfx/eom/Manifest
@@ -1,4 +1,6 @@
 AUX eom-1.24.0-add-gdk-includes.patch 798 BLAKE2B db2156dadd2458100624a01e0724f7520529ace1aeabf78544aa780d91fe57d8db7aee8934401ede46810a8ee8f53f26d0e7304605386fd6fba080825c70abae SHA512 3a487cbbbfd94240858cb0a7221b9515720aeaab7adea3e7dd8be2d05d0369f5d3ecd5e3afc4ceb1cda0e2aecc0c72d0cae796f70ed181a90944e3d5d76a31f2
 DIST eom-1.24.2.tar.xz 2428972 BLAKE2B 871cb98c4a308dbc4821e67bae41522dbebae446e64777d764d30ded2f0637bae33cb9090e813fd7e43206ba1a436f7795684c4c5e850a242e9db96804b08e81 SHA512 38497dc5fc42340ca1b356f40eab8c14c21b1467f82ec64024d633cfb7ebfc598020b35c02eedce4f73f7a5ecb9050b0f0af4ea00279a1a5e7a627e542f34951
+DIST eom-1.26.0.tar.xz 2493104 BLAKE2B 3a2e018e90514a5ee7c05bd981d1a129900ae2ba5b1c513da85e6ede2b2f5b253133c14766787a44f0e372da99b13922f3aaa6e2447e6d4d901a604689c03cd8 SHA512 efc5a1ce5c21ad74108c63827fa60f2cd8517888d8e155d7c9934f5490e61b2cf73bae3b42f8d6b69ce1d5c4658d0c74f2ab19e90f40173d55354276bbe5d824
 EBUILD eom-1.24.2.ebuild 1678 BLAKE2B 0f31fbd800e1fbfe464ec93adf933872e33a44c71cbd2764c257077b9d190e57a3b98b626a919b2cea657f45a4751e1d97ae5c30f62c028085304656aceeba0d SHA512 26ebc8095790f6f37546898f4b1a9fa95b3bbd212bb271245e43be88d1e10922b37e6ae48564ff18b4fbd1ea271e1ff747e92810bfaa0a24f6206b764c711d56
+EBUILD eom-1.26.0.ebuild 1624 BLAKE2B 9a5ce0213b2c91297481ef32cdb60bad28dd017f8c1d9e82b73d20a6ccb816cea265b72a00ddda58af224610f20f0938c09e82d8e202047f5d30b8df6f4f2085 SHA512 4fde9cca2b9cf42d774a0b729b2f401b368ea7b2b071d79169fcb560e915e30ee626954ebca6c44a6fc00fefecae616f79dbecf0cb8dae7586817d041dfc7194
 MISC metadata.xml 468 BLAKE2B 3dfeeca0297db2fc0dde74b8f23d365e6f33d53856bc32b568c2901a803097c69af05ecf881a9fd522a8f5a1e2a01e7aad496a8fd6571a1328746bf3376c541e SHA512 d605718c99007b9fb1b66b97f3078c7497b8bdeb46d3e487831d1b3e04dfe142d788ce83af67830d9f612c9077b69ee7eb197eef720b5da55327d9846d75478c
diff --git a/media-gfx/eom/eom-1.26.0.ebuild b/media-gfx/eom/eom-1.26.0.ebuild
new file mode 100644
index 000000000000..5fae0d44825d
--- /dev/null
+++ b/media-gfx/eom/eom-1.26.0.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit mate
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86"
+fi
+
+DESCRIPTION="The MATE image viewer"
+LICENSE="FDL-1.1+ GPL-2+ IJG LGPL-2+"
+SLOT="0"
+
+IUSE="X debug exif imagemagick +introspection nls jpeg lcms svg tiff xmp"
+
+COMMON_DEPEND="
+	dev-libs/atk
+	>=dev-libs/glib-2.52:2
+	>=dev-libs/libpeas-1.8.0[gtk]
+	>=dev-libs/libxml2-2:2
+	gnome-base/dconf
+	>=mate-base/mate-desktop-1.17.0
+	sys-libs/zlib
+	x11-libs/cairo
+	>=x11-libs/gdk-pixbuf-2.36.5:2[introspection?,jpeg?,tiff?]
+	>=x11-libs/gtk+-3.22:3[introspection?]
+	x11-libs/libX11
+	>=x11-misc/shared-mime-info-0.20
+	exif? (
+		>=media-libs/libexif-0.6.22
+		virtual/jpeg:0
+	)
+	imagemagick? ( >=media-gfx/imagemagick-6.2.6 )
+	introspection? ( >=dev-libs/gobject-introspection-0.9.3:= )
+	jpeg? ( virtual/jpeg:0 )
+	lcms? ( media-libs/lcms:2 )
+	svg? ( >=gnome-base/librsvg-2.36.2:2 )
+	xmp? ( >=media-libs/exempi-1.99.5:2 )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	virtual/libintl
+	!!media-gfx/mate-image-viewer
+"
+
+BDEPEND="${COMMON_DEPEND}
+	app-text/yelp-tools
+	dev-util/glib-utils
+	dev-util/gtk-doc
+	dev-util/gtk-doc-am
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+src_configure() {
+	mate_src_configure \
+		--enable-thumbnailer \
+		$(use_enable debug) \
+		$(use_enable introspection) \
+		$(use_with X x) \
+		$(use_with exif libexif) \
+		$(usex imagemagick \
+			--without-gdk-pixbuf-thumbnailer \
+			--with-gdk-pixbuf-thumbnailer \
+		) \
+		$(use_with jpeg libjpeg) \
+		$(use_with lcms cms) \
+		$(use_with svg librsvg) \
+		$(use_with xmp)
+}
diff --git a/media-gfx/exiv2/Manifest b/media-gfx/exiv2/Manifest
index fced338d44b5..8f8bdd64a835 100644
--- a/media-gfx/exiv2/Manifest
+++ b/media-gfx/exiv2/Manifest
@@ -1,4 +1,4 @@
 AUX exiv2-0.27.5-musl-tests.patch 2390 BLAKE2B b6e69abee39168f0ecf1cfe6220d017802abae12a22ffaefe96c9a4c3a47748810bbc27bfc65d7b2a1c0b8499b5756123e7d475ef872c87337851d93241012fb SHA512 ba1bffe8a477ec90a8cc83eebaecc9608f5a953bba433cff0d62e807457969f37bdc97c205ffcf8d0fe4c948f2b67172f33adca5edacd68e35ba10366bbc4c85
 DIST exiv2-0.27.5-Source.tar.gz 32720608 BLAKE2B 803cb853fd049b28d309952c2332589a8544ff90c16fc1a588b6f1a2d4ae5e96da7ae746cf2247954ac54e155b84e0ad1f4f2d89f22d07e7bbd34038f0e292a5 SHA512 0f2d2dfbc976052a428dfeb597225d3ea3c725f584d05b99316bd4aa9cbf0ba5e1e37bcde71f9041975cf003b4fdb578c559adb144268d784bfd64494f451491
-EBUILD exiv2-0.27.5-r1.ebuild 2835 BLAKE2B 66c42243507c17dc62ade055e31bdf9ce9f3634b731ff70ecbf630415f3834cc21e68332e930bb667ad8bd1c296dd7c8da2c564554683395271eb3837714c13e SHA512 3916c243271d592e26370c0ac56c07fa163102697bdac5b26b653d0e2fa764abca1fbc372f99b20cdb74f80f511007fdb509365810c284c709c426b2c0158f70
+EBUILD exiv2-0.27.5-r1.ebuild 2836 BLAKE2B d8309f07f5b7b7da67dc40b66f5774520cfa2df4ed77d488f4fc49daabe50ee2c255eff1610696dc6032503817f4159b1614ce4255dd62f3d041f0f87feda039 SHA512 cff29ff6c76853098da4a7aeff9ca105615702b386608a3e86ca1fd4a1b8990ffb267f3a9745aa40ca039246cac6bce7c719b093f5793cac865cd2675d0b9cdf
 MISC metadata.xml 686 BLAKE2B 2d1079660cf4268216f8835d1ae6655ebafc99d5402872bb05dac6342034a28a07dcff587fc616a5eedc8c538ea3e43e013711d39c2541295e89629e39a244ee SHA512 40f9225a42386fa6f03bf9436d675bb01bd6eb859974bfed22d1316536ceaf40752fabffdab20b439e87c57f65d193d8d249e5aa022584de3f869f4162660b4e
diff --git a/media-gfx/exiv2/exiv2-0.27.5-r1.ebuild b/media-gfx/exiv2/exiv2-0.27.5-r1.ebuild
index 0b3c07acc565..76dad821c808 100644
--- a/media-gfx/exiv2/exiv2-0.27.5-r1.ebuild
+++ b/media-gfx/exiv2/exiv2-0.27.5-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-if [[ ${PV} = *9999 ]]; then
+if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/Exiv2/exiv2.git"
 	inherit git-r3
 else
@@ -12,7 +12,7 @@ else
 	S="${WORKDIR}/${P}-Source"
 fi
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 inherit cmake-multilib python-any-r1
 
 DESCRIPTION="EXIF, IPTC and XMP metadata C++ library and command line utility"
@@ -24,16 +24,6 @@ SLOT="0/27.5"
 IUSE="+bmff doc examples nls +png test webready +xmp"
 RESTRICT="!test? ( test )"
 
-BDEPEND="
-	doc? (
-		${PYTHON_DEPS}
-		app-doc/doxygen
-		dev-libs/libxslt
-		media-gfx/graphviz
-		virtual/pkgconfig
-	)
-	nls? ( sys-devel/gettext )
-"
 RDEPEND="
 	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
 	nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )
@@ -45,13 +35,22 @@ RDEPEND="
 	xmp? ( dev-libs/expat[${MULTILIB_USEDEP}] )
 "
 DEPEND="${DEPEND}
-	test? ( dev-cpp/gtest )"
+	test? ( dev-cpp/gtest )
+"
+BDEPEND="
+	doc? (
+		${PYTHON_DEPS}
+		app-doc/doxygen
+		dev-libs/libxslt
+		media-gfx/graphviz
+		virtual/pkgconfig
+	)
+	nls? ( sys-devel/gettext )
+"
 
 DOCS=( README.md doc/ChangeLog doc/cmd.txt )
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.27.5-musl-tests.patch
-)
+PATCHES=( "${FILESDIR}"/${PN}-0.27.5-musl-tests.patch )
 
 pkg_setup() {
 	use doc && python-any-r1_pkg_setup
diff --git a/media-gfx/geeqie/Manifest b/media-gfx/geeqie/Manifest
index 0e5045fb6652..f1885f01b1e7 100644
--- a/media-gfx/geeqie/Manifest
+++ b/media-gfx/geeqie/Manifest
@@ -1,9 +1,9 @@
-AUX geeqie-2.0.1-allow_xxdi.patch 774 BLAKE2B 4bba0667ea4030bba821787d22725e0db177ab5034a77124c85467f4c4b34b3148f4b3001f9466ee472425958d6d97fd868539a7c7d04740872255aad6ed6543 SHA512 83788dc0e4e99e9a2ad6e4da20c9c8d61e8bea9678d86b40c82cfc9d925abde2bfbdc5cfa0fbf421056b3625049fdf037dcc18402049dfba8c1c4443106464d8
+AUX geeqie-2.0.1-allow_xxdi.patch 776 BLAKE2B 59f566ef44b581e06b7d066fc6874a552bc08ad4b180ed1a240839661d50a92b860738efd8994c3a5344746bb109cd6da7cac0b68c3b37f730ba842a9382883e SHA512 376ca5efc6ec2f5385c4c4f77e5257d105ecf2ef39d26576a2f50307b8babdb2ae55d8aa38a23709eb1aa7d5dfa62e0213b3a71aebe70c54c7d6a1afc5b7da8a
 AUX geeqie-2.0.1-doc_option.patch 4141 BLAKE2B 59ea49f13d8bd666a01c0905ae95845eb1ecc6acbe71b7ef8553902c0ffca172984ca7dabe39e840d0ca779e13418a8a8043cacc0e3992d691a363f547fa0d58 SHA512 4edb088606d5a4b6f1d83390b40c47c8d2e06a2da2a2ea21dd9049961c63253a9aaa32d0270ef3969b0a273f5f9d2114a740328d9d4d7bbf73b766ecd2aaa8a8
 DIST geeqie-1.7.3.tar.xz 1949696 BLAKE2B c261a09446472f2decb0f332f227453e14fbffbc64bff77c538062d7cf57fd91efd7d30a121b2760795eb9c097e993a1dcbe5ead79cb32c200092e27422ad8b9 SHA512 5647422876dcd41ec369cc926783661e15f33c2794e073df98827b8fc030baf3ebf03587e42eef35caaddc3b315b74ee0f8c3a156422f72522ffbbb7ec0fd8d9
 DIST geeqie-2.0.1-ChangeLog.tar.gz 626106 BLAKE2B b1e166e7537d6e2bf8a9fec259315af4d70194688b489eb44715eb51c690806dd6387e6aa884b737222a25114c36b2e1a2a70fd2bbec015e64d5f6274cac1ab9 SHA512 a986981f28bad254747fb674ee16691bbec64afb354eb158dc511e0f9b198bba8e3bd0fc2ae432322806959a5ea7434687cb462c8cbb0d1c9dc17b5431f72288
 DIST geeqie-2.0.1.tar.xz 1666600 BLAKE2B e90d9b5c0bfe9d4f84c65e4754ba3ddaee8ba44c6d493cf4b5c0e37d398a4e2f6234c60fc6e88e4022ff4f8fcaf10626037c3a80450921f88f5fd937fd386958 SHA512 cd2251c831c6d4d461d92eee84df08590752ad625e1f50d57e1fb5d0fc6ac16a225584a8217e14bf4f993ba247f7df3296498b27fcc4f5f4c7f25307699aadc5
 EBUILD geeqie-1.7.3.ebuild 2322 BLAKE2B 57e6a0b443abe37232d6d241a017da5d2f3f33173bfd3e801ebac526bcfca240415fcf99d38fac0aabec01678a693cef716c94fb15a011c7734e4c956bd7a5ca SHA512 a11a4e45a52482e189fcca579c45bb9be07e1a8b56ca5f68430472b186ccfb2b3d80670b9ab70294832de8c90f7125b9849d1ba6ae0dbb98754d289c2588383c
-EBUILD geeqie-2.0.1-r1.ebuild 3206 BLAKE2B 6c3f999812883d72561c7a3404fb56ec9e26831293661629df71dc60093d76f82214436724d6f6d7e96e7f54606519f2b86202dc5641e436d2bb6c0363e8d5ee SHA512 8adbe3711c9dc40e039757a03c259da700bf9306399da8ff5d4fe505f465b1aad7ceb415a8b10aeb21b6a448b544069216f29e6481cf3a093fad041ccf1d7eec
-EBUILD geeqie-9999.ebuild 3034 BLAKE2B 0c3f49fa2ec5d21210f405c9892620702e99846b92262c93c5371630c241337fad3a2d89048f69ddd188c3374e29b9030124b6e9ac31d77c4d0167901abc5ea2 SHA512 c4284b1db9733672337618fcc471ebbadca43ff54cfea121111be24f8d4a2ef42829b71beea3b9744ed18b09c09462160124163415b17f600791d7e71b937e65
+EBUILD geeqie-2.0.1-r1.ebuild 3236 BLAKE2B 834efdba26ca755e3bcbda45b850b6035a903be91e2060b9dad7e12e46302a5f243c5d440adddb5480b0cdd8512087dfbc6287c560ede251d9cb6a584128b8bb SHA512 710fd6b9e72a92a5f44f84dacb623987718d17725a7e9cee539ec500dd831c3167059e130b181f5287e229299c44443dd03e3eff995d5653cdda9f66119f074a
+EBUILD geeqie-9999.ebuild 3163 BLAKE2B 03580468af556c3645872e313d8458fd88b0e48ce8842a0bba637bb0b492958b365fbfb8df062ec8cb04fa876c4d012e6159749c80778f7b2eb7e63f50789986 SHA512 736b6d49daef5f6dccefd3c6760f784341ace097ce6ea3337d00482b836b89f22c5ba427b179257459c513513f35576c985092582d31fc514332ea51efef3f90
 MISC metadata.xml 1004 BLAKE2B 8f631bfdc45713df491faf9f78479c2c675c815547e52e848e55d6b87aad94ddb656d1ec9a3159b2bf22b039f5c25840e9a86da78de80bee97478e0c07c3fd4e SHA512 b721895c5afc72f4e09fd7ce512113495364fffdf0aa8e01e92cf0a4f441e72683e7319023baca99f575b2514d815810b7e04eab12482f20798235246c2a06bd
diff --git a/media-gfx/geeqie/files/geeqie-2.0.1-allow_xxdi.patch b/media-gfx/geeqie/files/geeqie-2.0.1-allow_xxdi.patch
index 440de7189344..bf6a7d77975f 100644
--- a/media-gfx/geeqie/files/geeqie-2.0.1-allow_xxdi.patch
+++ b/media-gfx/geeqie/files/geeqie-2.0.1-allow_xxdi.patch
@@ -14,4 +14,4 @@ diff -Naur geeqie-2.0.1.orig/scripts/generate-ClayRGB1998-icc-h.sh geeqie-2.0.1/
  cd "$(dirname "$1")" || return 1
  
 -xxd -i "$(basename "$1")" "$build_dir/$2"
-+${XXD} "$(basename "$1")" "$build_dir/$2"
++${XXD} "$(basename "$1")" > "$build_dir/$2"
diff --git a/media-gfx/geeqie/geeqie-2.0.1-r1.ebuild b/media-gfx/geeqie/geeqie-2.0.1-r1.ebuild
index 8a99ae4480da..7dcf1197b2ae 100644
--- a/media-gfx/geeqie/geeqie-2.0.1-r1.ebuild
+++ b/media-gfx/geeqie/geeqie-2.0.1-r1.ebuild
@@ -14,13 +14,12 @@ SRC_URI="https://github.com/BestImageViewer/${PN}/releases/download/v${PV}/${P}.
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="debug doc djvu exif ffmpegthumbnailer heif jpeg jpeg2k jpegxl lcms lua map pdf raw spell tiff webp xmp zip"
+IUSE="debug djvu exif ffmpegthumbnailer heif jpeg jpeg2k jpegxl lcms lua map pdf raw spell tiff webp xmp zip"
 
 RDEPEND="gnome-extra/zenity
 	virtual/libintl
 	x11-libs/gtk+:3
 	djvu? ( app-text/djvu )
-	doc? ( app-text/yelp-tools )
 	exif? ( >=media-gfx/exiv2-0.17:=[xmp?] )
 	ffmpegthumbnailer? ( media-video/ffmpegthumbnailer )
 	heif? ( >=media-libs/libheif-1.3.2 )
@@ -28,8 +27,7 @@ RDEPEND="gnome-extra/zenity
 	jpeg? ( media-libs/libjpeg-turbo:= )
 	jpegxl? ( >=media-libs/libjxl-0.3.7 )
 	lcms? ( media-libs/lcms:2 )
-	lua? ( ${LUA_DEPS}
-		doc? ( app-doc/doxygen ) )
+	lua? ( ${LUA_DEPS} )
 	map? ( media-libs/clutter-gtk
 		media-libs/libchamplain:0.12[gtk] )
 	pdf? ( >=app-text/poppler-0.62[cairo] )
@@ -61,6 +59,9 @@ pkg_setup() {
 src_prepare() {
 	default
 
+	# Disable doc build - not useful most of the time per upstream
+	sed -e "/subdir('doc')/d" -i meson.build || die
+
 	# Lua version
 	sed -e "s/lua5.[0-9]/${LUA_SINGLE_TARGET/-/.}/" -i meson.build || die
 }
@@ -71,7 +72,6 @@ src_configure() {
 		-Dgq_htmldir="share/doc/${PF}/html"
 		$(meson_use debug)
 		$(meson_feature djvu)
-		$(meson_feature doc)
 		$(meson_feature exif exiv2)
 		$(meson_feature ffmpegthumbnailer videothumbnailer)
 		$(meson_feature heif)
diff --git a/media-gfx/geeqie/geeqie-9999.ebuild b/media-gfx/geeqie/geeqie-9999.ebuild
index 2be0f992fee3..9d85f853281b 100644
--- a/media-gfx/geeqie/geeqie-9999.ebuild
+++ b/media-gfx/geeqie/geeqie-9999.ebuild
@@ -15,13 +15,12 @@ EGIT_REPO_URI="https://github.com/BestImageViewer/geeqie.git"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="debug doc djvu exif ffmpegthumbnailer heif jpeg jpeg2k jpegxl lcms lua map pdf raw spell tiff webp xmp zip"
+IUSE="debug djvu exif ffmpegthumbnailer heif jpeg jpeg2k jpegxl lcms lua map pdf raw spell tiff webp xmp zip"
 
 RDEPEND="gnome-extra/zenity
 	virtual/libintl
 	x11-libs/gtk+:3
 	djvu? ( app-text/djvu )
-	doc? ( app-text/yelp-tools )
 	exif? ( >=media-gfx/exiv2-0.17:=[xmp?] )
 	ffmpegthumbnailer? ( media-video/ffmpegthumbnailer )
 	heif? ( >=media-libs/libheif-1.3.2 )
@@ -29,8 +28,7 @@ RDEPEND="gnome-extra/zenity
 	jpeg? ( media-libs/libjpeg-turbo:= )
 	jpegxl? ( >=media-libs/libjxl-0.3.7 )
 	lcms? ( media-libs/lcms:2 )
-	lua? ( ${LUA_DEPS}
-		doc? ( app-doc/doxygen ) )
+	lua? ( ${LUA_DEPS} )
 	map? ( media-libs/clutter-gtk
 		media-libs/libchamplain:0.12[gtk] )
 	pdf? ( >=app-text/poppler-0.62[cairo] )
@@ -57,6 +55,12 @@ pkg_setup() {
 src_prepare() {
 	default
 
+	# Fix xxdi.pl support
+	sed -e 's/"$build_dir/> \0/' scripts/generate-ClayRGB1998-icc-h.sh || die
+
+	# Disable doc build - not useful most of the time per upstream
+	sed -e "/subdir('doc')/d" -i meson.build || die
+
 	# Lua version
 	sed -e "s/lua5.[0-9]/${LUA_SINGLE_TARGET/-/.}/" -i meson.build || die
 }
@@ -67,7 +71,6 @@ src_configure() {
 		-Dgq_htmldir="share/doc/${PF}/html"
 		$(meson_use debug)
 		$(meson_feature djvu)
-		$(meson_feature doc)
 		$(meson_feature exif exiv2)
 		$(meson_feature ffmpegthumbnailer videothumbnailer)
 		$(meson_feature heif)
diff --git a/media-gfx/graphviz/Manifest b/media-gfx/graphviz/Manifest
index 9bcfe74e754b..8feb89a5ef1e 100644
--- a/media-gfx/graphviz/Manifest
+++ b/media-gfx/graphviz/Manifest
@@ -1,6 +1,8 @@
 AUX graphviz-6.0.1-private-ghostscript-symbols.patch 1207 BLAKE2B ec966713af13fbfbdea0e6217d3da22884019ef39fb968fcb4f0ccdbb21c170087f00561ac613d78c29917468e925466f4d8e70a881876877fa88f2207d25141 SHA512 7f5434235b4627b0204e7b9c374290b02d805edcbebdca23154c18df6795ecb12016bfeb1ed9c6520e41ad216f81f38ad18791a1de1e06f15125805f1829aee6
 DIST graphviz-5.0.1.tar.xz 21493276 BLAKE2B 1eabf7dc175cde4827db682ae7c0cb00f5bec4bee8aa9801bc6ac86b06011588260ce261e25613d6d4a1e708ccb4fd65aba73210df8cf0af84f2e20b7c914167 SHA512 c1c5784558fd6f32cd8ce9b63c2bc5232f47ea1c4abf8fbfc1b8b0175aa30845af452dbc6651642f07f2c5b7a73f5c792934ca99561608a104ae99898eca3bc7
 DIST graphviz-6.0.1.tar.xz 21492876 BLAKE2B 36b8c2e922a73e35cddb2a252138193c9a413df823953faf387c964a31cf41e93b9c502ddc58831542aeea7e06cfd9ec377c390b45b859bdab1e0602c9b9683c SHA512 78f58734c47a6e1531a00b9de881481108500bf0a38b0ee734ecd024b629d838d98dbb32d81d2c2fe3b5ac28cbad140452b4bb5fa808ec667cc6cbe7638156ee
+DIST graphviz-7.0.0.tar.xz 21486172 BLAKE2B f52a75b5938ba3a6fbad3efe9d0ca6413145f9355c3ad1c8dc39253e8db36e9862c70c4dc910afd05e601e5787640b5b4a3dd09c1527cc3bd39a97ef281a7215 SHA512 dfead861d2f6ad1ebc9e3e4bd30684e02005cc7a2b78dab3ad45a11a401e08aeb1b6f7d8ea7ad7655230275ab6c10fd791434489e4ba09ae6905970230a974dc
 EBUILD graphviz-5.0.1-r1.ebuild 6134 BLAKE2B ced1e9eed2d12476044c69c269aa904a07ad8e4437956a01a199f19fee3328db937453969d4521c5f976b76fc4ad7d8824521b505a07326f67c149684d03da3e SHA512 28fb36c8781fb453de8020706583a1373af729c6583db178d78a432e8d08ddedb6c683c31bceb9ad8e8c9c7fa72ea28a1b7d25a9d8fd424af2ea5b55ed6c6ae3
 EBUILD graphviz-6.0.1-r2.ebuild 6217 BLAKE2B da9dc265f433e9cf73767daa122274dc5b4efdf6274b9c6c2a5f682715b6fa83095b273bf4a928a78a107b7c19f6f28bf07e47208e533723d9d604ef615f1d9f SHA512 aa5a915946fc9f1623eaa16a83d4b33b36e26dbcd1b22adbc72b3b1f54349913e24d67a255d6c3e67a5581d5d2ae44333d72c078f22ba641406ae722d9d67d64
+EBUILD graphviz-7.0.0.ebuild 6138 BLAKE2B 7c9d65aebfd0ab15ea72f236c5efac79c579029eff7c01e26056bf2eb11f8494d65aa1034f7d39d49ff18743d9487672976728c49c5ce22636250c55b5791495 SHA512 021445d87fcad2b7d03b9ed33a64dca3b79bd3f3b6d416e437080299c9aae41f7bcf446710e8096616023645ddd311a7dfbeb1c256fc39d1120f370f1a63acd5
 MISC metadata.xml 2324 BLAKE2B 206e5312317fb7bf8f4bba64196a6fa89a8a9e30be3b5e0bf598485cdc2a862e1cc302024b9d170aa6c8ebbbd429ab839d296076bc6f1ac3b154678773cd4d5f SHA512 8eb9a1508823a06fbb180755a7dd173cb2365d7d90e25ad211d56645ee213ee825a991ba56b3f1c8d952c0a7baaa1ea3f8d8d35bdedbffbdce608d66645dd2b0
diff --git a/media-gfx/graphviz/graphviz-7.0.0.ebuild b/media-gfx/graphviz/graphviz-7.0.0.ebuild
new file mode 100644
index 000000000000..af33ee99a65d
--- /dev/null
+++ b/media-gfx/graphviz/graphviz-7.0.0.ebuild
@@ -0,0 +1,216 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+inherit python-single-r1
+
+DESCRIPTION="Open Source Graph Visualization Software"
+HOMEPAGE="https://www.graphviz.org/ https://gitlab.com/graphviz/graphviz/"
+# Unfortunately upstream uses an "artifact" store for the pre-generated
+# tarball now, which makes predictable URLs impossible.
+SRC_URI="https://gitlab.com/api/v4/projects/4207231/packages/generic/graphviz-releases/${PV}/${P}.tar.xz"
+
+LICENSE="CPL-1.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 ~x64-solaris"
+IUSE="+cairo devil doc examples gtk2 gts guile lasi nls pdf perl postscript python qt5 ruby svg tcl webp X"
+
+REQUIRED_USE="
+	!cairo? ( !X !gtk2 !postscript !lasi )
+	pdf? ( cairo )
+	python? ( ${PYTHON_REQUIRED_USE} )"
+
+# Requires ksh, tests against installed package, missing files and directory
+RESTRICT="test"
+
+RDEPEND="
+	>=dev-libs/expat-2
+	>=dev-libs/glib-2.11.1:2
+	dev-libs/libltdl
+	>=media-libs/fontconfig-2.3.95
+	>=media-libs/freetype-2.1.10
+	>=media-libs/gd-2.0.34:=[fontconfig,jpeg,png,truetype,zlib]
+	media-libs/libjpeg-turbo:=
+	>=media-libs/libpng-1.2:=
+	sys-libs/zlib
+	virtual/libiconv
+	cairo? (
+		>=x11-libs/cairo-1.1.10[svg(+)]
+		>=x11-libs/pango-1.12
+	)
+	devil? ( media-libs/devil[png,jpeg] )
+	gtk2? (
+		x11-libs/gdk-pixbuf:2
+		x11-libs/gtk+:2
+	)
+	gts? ( sci-libs/gts )
+	guile? ( dev-scheme/guile )
+	lasi? ( media-libs/lasi )
+	pdf? ( app-text/poppler )
+	perl? ( dev-lang/perl:= )
+	postscript? ( app-text/ghostscript-gpl )
+	python? ( ${PYTHON_DEPS} )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtprintsupport:5
+		dev-qt/qtwidgets:5
+	)
+	ruby? ( dev-lang/ruby:* )
+	svg? ( gnome-base/librsvg )
+	tcl? ( >=dev-lang/tcl-8.3:= )
+	webp? ( media-libs/libwebp:= )
+	X? ( x11-libs/libX11 )"
+DEPEND="${RDEPEND}
+	X? ( x11-base/xorg-proto )"
+BDEPEND="
+	sys-devel/flex
+	sys-devel/libtool
+	virtual/pkgconfig
+	doc? (
+		app-text/ghostscript-gpl
+		sys-apps/groff
+	)
+	guile? (
+		dev-lang/swig
+		dev-scheme/guile
+	)
+	nls? ( >=sys-devel/gettext-0.14.5 )
+	perl? ( dev-lang/swig )
+	python? ( dev-lang/swig )
+	ruby? ( dev-lang/swig )
+	tcl? ( dev-lang/swig )"
+
+# Dependency description / Maintainer info:
+
+# Rendering is done via the following plugins (/plugins):
+# - core, dot_layout, neato_layout, gd , dot
+#   the ones which are always compiled in, depend on zlib, gd
+# - gtk
+#   Directly depends on gtk-2.
+#   needs 'pangocairo' enabled in graphviz configuration
+#   gtk-2 depends on pango, cairo and libX11 directly.
+# - gdk-pixbuf
+#   Directly depends on gtk-2 and gdk-pixbuf.
+#   needs 'pangocairo' enabled in graphviz configuration
+# - ming
+#   flash plugin via -Tswf requires media-libs/ming-0.4. Disabled as it's
+#   incomplete.
+# - cairo/pango:
+#   Needs pango for text layout, uses cairo methods to draw stuff
+# - xlib:
+#   needs cairo+pango,
+#   can make use of gnomeui and inotify support (??? unsure),
+#   needs libXaw for UI
+#   UI also links directly against libX11, libXmu, and libXt
+#   and uses libXpm if available so we make sure it always is
+
+# There can be swig-generated bindings for the following languages (/tclpkg/gv):
+# - c-sharp (disabled)
+# - scheme (enabled via guile) ... no longer broken on ~x86
+# - go (disabled)
+# - io (disabled)
+# - lua (enabled via lua)
+# - ocaml (enabled via ocaml)
+# - perl (enabled via perl) *1
+# - php (enabled via php) *2
+# - python (enabled via python) *1
+# - ruby (enabled via ruby) *1
+# - tcl (enabled via tcl)
+# *1 = The ${P}-bindings.patch takes care that those bindings are installed to the right location
+# *2 = Those bindings don't build because the paths for the headers/libs aren't
+#      detected correctly and/or the options passed to swig are wrong (-php instead of -php4/5)
+
+# There are several other tools in /tclpkg:
+# gdtclft, tcldot, tclhandle, tclpathplan, tclstubs ; enabled with: --with-tcl
+# tkspline, tkstubs ; enabled with: --with-tk
+
+# And the commands (/cmd):
+# - dot, gvedit, gvpr, smyrna, tools/* :)
+#   sci-libs/gts can be used for some of these
+# - gvedit (via 'qt5'):
+#   based on ./configure it needs qt-core and qt-gui only
+# - smyrna : experimental opengl front-end (via 'smyrna')
+#   currently disabled -- it segfaults a lot
+#   needs x11-libs/gtkglext, gnome-base/libglade, media-libs/freeglut
+#   sci-libs/gts, x11-libs/gtk.  Also needs 'gtk','glade','glut','gts' and 'png'
+#   with flags enabled at configure time
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+	local myconf=(
+		# Speeds up the libltdl configure
+		--cache-file="${S}"/config.cache
+		--enable-ltdl
+		$(use_enable doc man-pdfs)
+		$(use_with cairo pangocairo)
+		$(use_with examples demos '$(docdir)/examples')
+		$(use_with devil)
+		$(use_with gtk2 gdk)
+		$(use_with gtk2 gdk-pixbuf)
+		$(use_with gtk2)
+		$(use_with gts)
+		$(use_with qt5 qt)
+		$(use_with lasi)
+		$(use_with pdf poppler)
+		$(use_with postscript ghostscript)
+		$(use_with svg rsvg)
+		$(use_with webp)
+		$(use_with X x)
+		--with-digcola
+		--with-fontconfig
+		--with-freetype2
+		--with-ipsepcola
+		--with-libgd
+		--with-sfdp
+		--without-ming
+		# New/experimental features, to be tested, disable for now
+		--without-ipsepcola
+		--without-smyrna
+		--without-visio
+		# Bindings
+		$(use_enable guile)
+		$(use_enable perl)
+		$(use_enable python python3)
+		$(use_enable ruby)
+		$(use_enable tcl)
+		--disable-go
+		--disable-io
+		--disable-lua
+		--disable-java
+		--disable-ocaml
+		--disable-php
+		--disable-python
+		--disable-r
+		--disable-sharp
+		# libtool file collision, bug #276609
+		--without-included-ltdl
+		--disable-ltdl-install
+	)
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+
+	find "${ED}" -name '*.la' -delete || die
+
+	use python && python_optimize \
+		"${D}"$(python_get_sitedir) \
+		"${ED}"/usr/$(get_libdir)/graphviz/python3
+}
+
+pkg_postinst() {
+	# We need to register all plugins before they become usable
+	dot -c || die
+}
+
+pkg_postrm() {
+	# Remove cruft, bug #547344
+	rm -rf "${EROOT}"/usr/$(get_libdir)/graphviz/config{,6} || die
+}
diff --git a/media-gfx/kgraphviewer/Manifest b/media-gfx/kgraphviewer/Manifest
index 0b5639ca166e..6aa6e9c8e558 100644
--- a/media-gfx/kgraphviewer/Manifest
+++ b/media-gfx/kgraphviewer/Manifest
@@ -2,6 +2,5 @@ AUX kgraphviewer-2.4.3-highdpi.patch 577 BLAKE2B bfe4613b9e67cc01bde9ec7f9c9a827
 AUX kgraphviewer-2.4.3-obsolete-dep.patch 4965 BLAKE2B da1924881e582840e533eed3069274b23ea1a335975d1bbe01627970f64ed46b37f1610b0cefb2d7916b500caf1799eb5b52ee6f954c3acd8dc306affc554d2e SHA512 a43b19dbc068f03011b126b1950cd84b58b784c17464ed2b96042a40ccd36c55e7a4806a7ea5092f392db3fdb4e06777eef2dd046a191db75b3a1a207043ebcd
 AUX kgraphviewer-2.4.3-set-startupwmclass.patch 1045 BLAKE2B 8e48bc5a67cf8857a5eb5a57873fbe19a5a3cc52ef70d5c01ca3674d889acfa28dc46456caccd3a6078572b876e9f73b15e483f46fe35f82bd6fcdbed5d2312c SHA512 b4005bf61e448be43f7bcc3886ec092c9f2930e475067f4c1a382db4039dfdb580ce7e2a4765480438f80dc2e905013c43c8b65711f87fb14e62de73c60bedcd
 DIST kgraphviewer-2.4.3.tar.xz 1491328 BLAKE2B b51cf825ad4763538139f917a7d16d15a7244c19b3cab9c79bbd938ee3dd80e4e35e37012199e1256bcc9a9404d756cdb0f5ffb975484d527577c208ecf1d3fa SHA512 d18146ba380efe73e1ec716dd1cc310fe1eac23eccb10e2a699b107451637b9332cc25d62a4de762df4706cea182c9474ba1e885801c9832e1bb9bff1648e72d
-EBUILD kgraphviewer-2.4.3-r1.ebuild 1134 BLAKE2B 98138f2be42b6e006d96576dac964717aafbcae7eaf222cde033791b6cfac6131ead11ecc81d68675e154448e9064b1b2fa19d714cabccb41daa27ca92544ccf SHA512 9da0a9b995323a44bc274838b33a16eaafd4584a4f54249ccaed1b638c762599dfb915a50a3207a5abf970a49b26b5d6af3cb40978f4266f488482bcdabfbabc
-EBUILD kgraphviewer-2.4.3-r2.ebuild 1098 BLAKE2B 90ba69ef9a3118e4ee61bd53dd1a8585dabbe1094c99d180e553505786b633b8f891118c8df600a279cd4622d4913001ca04e3158f16ada49cf1f6331a35a85d SHA512 ea112d1219f7f577bf1f2992b2a8254da11945c3a6f8caf78fc06d719abb6fedefc849058edb5b74b90762eeb97d3da35016614b98ee559714b48f4f4c436e7f
+EBUILD kgraphviewer-2.4.3-r2.ebuild 1097 BLAKE2B 312301205617180031aafc740d5749cdb436f601047e2433992d5f376c1b3e82e56dc8137a106faea8131da322dfcd6f2d6b392ad39009dcde368256d3212da7 SHA512 47208d70b25113a5d53168923bdcf16b03230758ace49fcca01fe071102f3f95b382f293c17e422c4ea6a8f6a764ea80c86e60ec5c6e107af0d106a41f00e38e
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/media-gfx/kgraphviewer/kgraphviewer-2.4.3-r1.ebuild b/media-gfx/kgraphviewer/kgraphviewer-2.4.3-r1.ebuild
deleted file mode 100644
index 036079737c78..000000000000
--- a/media-gfx/kgraphviewer/kgraphviewer-2.4.3-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Graphviz dot graph file viewer"
-HOMEPAGE="https://apps.kde.org/en/kgraphviewer"
-[[ ${PV} != *9999* ]] && SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2 GPL-2+ LGPL-2+ LGPL-2.1+ handbook? ( FDL-1.2 )"
-SLOT="5"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-COMMON_DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=media-gfx/graphviz-2.30
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-"
-RDEPEND="${COMMON_DEPEND}
-	!media-gfx/kgraphviewer:4
-"
-
-PATCHES=( "${FILESDIR}/${P}-set-startupwmclass.patch" )
diff --git a/media-gfx/kgraphviewer/kgraphviewer-2.4.3-r2.ebuild b/media-gfx/kgraphviewer/kgraphviewer-2.4.3-r2.ebuild
index 41ddd6b6b4c0..4716b8e8e2e9 100644
--- a/media-gfx/kgraphviewer/kgraphviewer-2.4.3-r2.ebuild
+++ b/media-gfx/kgraphviewer/kgraphviewer-2.4.3-r2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/kgraphviewer"
 
 LICENSE="GPL-2 GPL-2+ LGPL-2+ LGPL-2.1+ handbook? ( FDL-1.2 )"
 SLOT="5"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/media-gfx/photoqt/Manifest b/media-gfx/photoqt/Manifest
index 70d2befd956d..ce2d324c35aa 100644
--- a/media-gfx/photoqt/Manifest
+++ b/media-gfx/photoqt/Manifest
@@ -1,7 +1,3 @@
-AUX photoqt-1.7.1-cmake.patch 358 BLAKE2B ecadfc9f5ff6cac0535f5db36efc87f37705e77bc6d4b2445a77430c606c642081bff5c6c5733804dcf6cc3878d424bce4c39fd590478ee596f63e23f022506b SHA512 3a5b74999bc6765c37252dd2b34e36ed910c0f3c58e30dbdc84b38b361b45bf6e9131525069b1184c7e2b4e820674742233359120c63c37324fb802e0d9c1726
-AUX photoqt-1.7.1-exiv2-0.27.patch 3900 BLAKE2B 080ed5afb4c9a29779b6a875261a893315529dd87caacec31bca34b91a626bc196acb9ce3f7ed4427478855e31a4e24a14ef9d12834054c2c766e42596435fad SHA512 6a8b56ab47b4e2f21f951b8e78455b5ba7757c1a1d98ffd0f754a245662f87877a6a326409868091d0a163caa639ff7fc497151baee3b9fdae26b3cd291065f4
-DIST photoqt-1.7.1.tar.gz 1324774 BLAKE2B b739508511cdc34b6de5736260692c48186a49d0cf62d8283238ee274d2fdf73716589277fa602f86c8c15fff87b49d1700202d260480e002dfa18380b47d328 SHA512 50cee1a77a5e69d05f19a8f1ac8ab18d1ef420962b05f3a76e12ce0f3202db7037c894bbd7631674504f0e51c2be690aff4248ed343d0da2dc8a1ccce2d8e078
 DIST photoqt-2.9.1.tar.gz 3708647 BLAKE2B dd8c958709ebd830558f150f59c90c317d3f5edb363f92e9fadcd1506de4c97a41f6766670e202081397081c231604028298771eb52911255dae53bfa92a1a8d SHA512 c2ac3bce2ffa0962b243808cdd2495d45af3bd5703389de5e9626a518a8edf25646a317ff420dc0fdd8dc60a53104b1b5ec7e473087454d5c2f0b967066dc192
-EBUILD photoqt-1.7.1-r1.ebuild 1265 BLAKE2B 6f6d7be992fc9fca2f99ca9aa7c3026c7c02595b55318be69c838182310e0d68a51c335ff08a6d948a1810fb7a7e8f9d27c695ff67da5e41fb7689e143037cf2 SHA512 c0ea40aeafede7202f4bff59a00071117d1ca4a79d8e805ef08c2f5d143cb1df8f4e9c433cfb3e0e5a8a599297027db27d0e197e54a20cf57a8bd6c954cefc07
-EBUILD photoqt-2.9.1.ebuild 1746 BLAKE2B 9f6a72b5ce7019e5e299f917f3e96d72597d43399a34b6854736922e45b348bb51ed7d053fccf5422468846e53da01a8539de3765079ca7571ee5cf178275933 SHA512 7102d6e4cd403f5974e760480f396445bcdc3f3c3b13291f98118c6e48db72e5d7fb47430227ffdb30f53406c7017a1dd72fce23d6ae5441b7ed40d90bd236fe
+EBUILD photoqt-2.9.1.ebuild 1744 BLAKE2B ed42404d0106e24b1f53ea5e6b233a4336b7259098b038be8b6f0953997ff12e6ca5d0a223c9cbc718c429f19809777386026d92aabe638c9f167ff398df62f2 SHA512 f53168021cf7cff26054d0568a9b2f25fde0136f0244633d9f045ff96b989bfbba07f887ddfbb730675de422fde032b7d58b1d6b97f70751b3f7efeaab76141c
 MISC metadata.xml 544 BLAKE2B 050620e07354fb5d5808b90f3a412a81adf17dfa99b5a0afb9f75cc76051da1b0c693a34cf7e325f465871107f8dbbbe59c6f5adb77de6f9625cbeb6acd8fd75 SHA512 56acfa4ec0047826ee31e1b7216c5860790850f3f84f0ccd454baa0d2cb82db06a08f8a5c9458cc562d0b14082815ee1623e5171f579dcecaa45a759ac47cb84
diff --git a/media-gfx/photoqt/files/photoqt-1.7.1-cmake.patch b/media-gfx/photoqt/files/photoqt-1.7.1-cmake.patch
deleted file mode 100644
index 5dfacf435a0e..000000000000
--- a/media-gfx/photoqt/files/photoqt-1.7.1-cmake.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/CMake/FindExiv2.cmake	2018-06-03 05:21:04.143148857 +0200
-+++ b/CMake/FindExiv2.cmake	2018-12-29 22:35:40.770393025 +0100
-@@ -13,8 +13,8 @@
-     "${EXIV2_LOCATION}"
-     "${EXIV2_LOCATION}/include"
-     /usr/include
--    /usr/include/Exiv2
--    /opt/local/include/Exiv2
-+    /usr/include/exiv2
-+    /opt/local/include/exiv2
- )
- 
- IF(EXIV2_INCLUDE_DIR)
diff --git a/media-gfx/photoqt/files/photoqt-1.7.1-exiv2-0.27.patch b/media-gfx/photoqt/files/photoqt-1.7.1-exiv2-0.27.patch
deleted file mode 100644
index 48734ce70593..000000000000
--- a/media-gfx/photoqt/files/photoqt-1.7.1-exiv2-0.27.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-From c6fd41478e818f3a651d40f96cab3d790e1c09a4 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Sun, 20 Jan 2019 18:25:45 +0100
-Subject: [PATCH] Fix build with exiv2-0.27
-
-Fixes https://gitlab.com/luspi/photoqt/issues/64
----
- cplusplus/scripts/getanddostuff/manipulation.h | 3 +--
- cplusplus/scripts/getmetadata.cpp              | 4 ++--
- cplusplus/scripts/getmetadata.h                | 3 +--
- cplusplus/scripts/managepeopletags.cpp         | 4 ++--
- cplusplus/scripts/managepeopletags.h           | 3 +--
- 5 files changed, 7 insertions(+), 10 deletions(-)
-
-diff --git a/cplusplus/scripts/getanddostuff/manipulation.h b/cplusplus/scripts/getanddostuff/manipulation.h
-index b3fa9b42..465d9372 100644
---- a/cplusplus/scripts/getanddostuff/manipulation.h
-+++ b/cplusplus/scripts/getanddostuff/manipulation.h
-@@ -38,8 +38,7 @@
- #include "../../logger.h"
- 
- #ifdef EXIV2
--#include <exiv2/image.hpp>
--#include <exiv2/exif.hpp>
-+#include <exiv2/exiv2.hpp>
- #endif
- 
- class GetAndDoStuffManipulation : public QObject {
-diff --git a/cplusplus/scripts/getmetadata.cpp b/cplusplus/scripts/getmetadata.cpp
-index deb89a25..df92de6b 100644
---- a/cplusplus/scripts/getmetadata.cpp
-+++ b/cplusplus/scripts/getmetadata.cpp
-@@ -203,7 +203,7 @@ QVariantMap GetMetaData::getExiv2(QString path) {
-                 }
- 
-             } catch(Exiv2::Error &e) {
--                LOG << CURDATE << "GetMetaData::getExiv2() Unable to read Exif metadata: " << e << " (" << Exiv2::errMsg(e.code()) << ")" << NL;
-+                LOG << CURDATE << "GetMetaData::getExiv2() Unable to read Exif metadata: " << e.what() << NL;
-             }
- 
-             // If GPS is set, compose into one string
-@@ -246,7 +246,7 @@ QVariantMap GetMetaData::getExiv2(QString path) {
-                 }
- 
-             } catch(Exiv2::Error &e) {
--                LOG << CURDATE << "GetMetaData::getExiv2() ERROR reading IPTC metadata: " << e << " (" << Exiv2::errMsg(e.code()) << ")" << NL;
-+                LOG << CURDATE << "GetMetaData::getExiv2() ERROR reading IPTC metadata: " << e.what() << NL;
-             }
- 
-             QString city = returnMap["Iptc.Application2.City"].toString();
-diff --git a/cplusplus/scripts/getmetadata.h b/cplusplus/scripts/getmetadata.h
-index e427cbc1..c5b99140 100644
---- a/cplusplus/scripts/getmetadata.h
-+++ b/cplusplus/scripts/getmetadata.h
-@@ -34,8 +34,7 @@
- #include "../logger.h"
- 
- #ifdef EXIV2
--#include <exiv2/image.hpp>
--#include <exiv2/exif.hpp>
-+#include <exiv2/exiv2.hpp>
- #endif
- 
- class GetMetaData : public QObject {
-diff --git a/cplusplus/scripts/managepeopletags.cpp b/cplusplus/scripts/managepeopletags.cpp
-index 9b8c7503..96baeb9e 100644
---- a/cplusplus/scripts/managepeopletags.cpp
-+++ b/cplusplus/scripts/managepeopletags.cpp
-@@ -98,7 +98,7 @@ QVariantList ManagePeopleTags::getFaceTags(QString path) {
- 
-     } catch(Exiv2::Error& e) {
-         LOG << CURDATE << "GetPeopleTag::getPeopleLocations() 2 - ERROR reading exiv data (caught exception): "
--            << e << " (" << Exiv2::errMsg(e.code()) << ")" << NL;
-+            << e.what() << NL;
-         return ret;
-     }
- 
-@@ -201,7 +201,7 @@ void ManagePeopleTags::setFaceTags(QString filename, QVariantList tags) {
- 
-     } catch(Exiv2::Error& e) {
-         LOG << CURDATE << "GetPeopleTag::setFaceTags() - ERROR reading exiv data (caught exception): "
--            << e << " (" << Exiv2::errMsg(e.code()) << ")" << NL;
-+            << e.what() << NL;
-         return;
-     }
- 
-diff --git a/cplusplus/scripts/managepeopletags.h b/cplusplus/scripts/managepeopletags.h
-index 1908ba0a..59686cc1 100644
---- a/cplusplus/scripts/managepeopletags.h
-+++ b/cplusplus/scripts/managepeopletags.h
-@@ -29,8 +29,7 @@
- #include "../logger.h"
- 
- #ifdef EXIV2
--#include <exiv2/image.hpp>
--#include <exiv2/exif.hpp>
-+#include <exiv2/exiv2.hpp>
- #endif
- 
- class ManagePeopleTags : public QObject {
--- 
-2.18.1
diff --git a/media-gfx/photoqt/photoqt-1.7.1-r1.ebuild b/media-gfx/photoqt/photoqt-1.7.1-r1.ebuild
deleted file mode 100644
index 53e9fae1e605..000000000000
--- a/media-gfx/photoqt/photoqt-1.7.1-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_KDEINSTALLDIRS=false
-inherit ecm
-
-DESCRIPTION="Simple but powerful Qt-based image viewer"
-HOMEPAGE="https://photoqt.org/"
-SRC_URI="https://photoqt.org/pkgs/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="devil exif freeimage graphicsmagick pdf raw"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-"
-RDEPEND="
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgraphicaleffects:5
-	dev-qt/qtgui:5
-	dev-qt/qtimageformats:5
-	dev-qt/qtmultimedia:5[qml]
-	dev-qt/qtnetwork:5
-	dev-qt/qtquickcontrols:5
-	dev-qt/qtsql:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	app-arch/libarchive:=
-	app-arch/unrar
-	devil? ( media-libs/devil )
-	exif? ( media-gfx/exiv2:= )
-	freeimage? ( media-libs/freeimage )
-	graphicsmagick? ( >=media-gfx/graphicsmagick-1.3.20:= )
-	pdf? ( app-text/poppler[qt5] )
-	raw? ( media-libs/libraw:= )
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-cmake.patch"
-	"${FILESDIR}/${P}-exiv2-0.27.patch" # bugs 675714, 676194
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DDEVIL=$(usex devil)
-		-DEXIV2=$(usex exif)
-		-DFREEIMAGE=$(usex freeimage)
-		-DGM=$(usex graphicsmagick)
-		-DPOPPLER=$(usex pdf)
-		-DRAW=$(usex raw)
-	)
-	ecm_src_configure
-}
diff --git a/media-gfx/photoqt/photoqt-2.9.1.ebuild b/media-gfx/photoqt/photoqt-2.9.1.ebuild
index af9a0fe11515..f73af804f930 100644
--- a/media-gfx/photoqt/photoqt-2.9.1.ebuild
+++ b/media-gfx/photoqt/photoqt-2.9.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://photoqt.org/pkgs/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="devil exif freeimage graphicsmagick imagemagick mpv pdf raw"
 
 COMMON_DEPEND="
diff --git a/media-gfx/pngtools/Manifest b/media-gfx/pngtools/Manifest
index 9ec8397d02a3..bfda5de83e44 100644
--- a/media-gfx/pngtools/Manifest
+++ b/media-gfx/pngtools/Manifest
@@ -5,5 +5,5 @@ AUX pngtools-0.4_p20220314-docbook-dtd.patch 2482 BLAKE2B b6f48ff4fa4d3f20f3d720
 DIST pngtools-0.4_p20220314.tar.gz 651338 BLAKE2B 9df108da4a52c6292c52a08ddc59163d386bc5de4aaaac96a166ba1e5dc38029b4261e80b8a186997d199ecd11b43fe9e46a41b6b25c65595b7baa4eab43376e SHA512 d1812051d4d1e6306805c96f686798e5af0a304ec045dbf02d77ab3f6432bc0f4e0c96c800bbb159d6ca9e83e8ef479c6d4ba742072fa897ec55808061001676
 DIST pngtools_0_4.tgz 1312178 BLAKE2B bff4be34b9a14a459cef2fb5cd1b70bb645c1fca8843bffc2a517b7f56e7a40e104b25b887f8bda227da2e12613c6c568b081b38bf70881b291bb5562eaeb6db SHA512 588b954c7c43ba48442ed4b22ad94fcfb456c7fc84a682e9126ca9d1c9b63dbb8f2d64e6e156664f327efbe11bb2ab1ac29d63ebb8a05329ac14200fb29f95a1
 EBUILD pngtools-0.4-r2.ebuild 703 BLAKE2B 2ce8afd2ce3d957fdd4bf77b3e1cc821523aadde6b2f4995928ece1cae9c633f4c3de60454589929536cc0299b257485de175e7fd73877e2f272f0a161a99086 SHA512 6c618d4ec7c027b1a621d879aa10ff27bab962ffbbe6de42031380fc1343b6a63f6f85a15385232765c9d46d5dc83ce616adcc1aebea8930259529fdb86b5788
-EBUILD pngtools-0.4_p20220314.ebuild 805 BLAKE2B 5b4746e920bf13aff4b28f06b628643823427c518a78782b8868d536c57a4d3de2d7367c99609ac88daa687fc19e0b5c50830cfe38b3f5646904a26d432f60cd SHA512 cb1f19ab0e8b575cd0e4f4cc1f067be04c4ac592260f6fff688881723c8f0933f8d8f0516eb4254157255a2e0ea4de172055910b8e65e472f6333064e76a487f
+EBUILD pngtools-0.4_p20220314.ebuild 803 BLAKE2B b5009769d08578c92a06cc3a8429123ed1bd18d7256dbafad46774d6fcb22c378508a9efe717cd2815d11aa4cbe4885fb930127bf0aab78b7660e407e6af11ca SHA512 c5f9849ac346e938bcc0ea07d00f3206e58e2fbfef2dce0050654429698a7864317fb37623ed5996c90789265d4d1a228b2a1601e00d97b2c599f36a0931aac3
 MISC metadata.xml 303 BLAKE2B f87e0bb36559ffa7e785a019927f1f11d4d5de135c5b82331ee1a4acf21ceb94f8fd41486235be173e5e966b270b270772153ea74ec5a71036cec2f56b91ee8d SHA512 5ece8e5c353817fa3e6825116f62f610285cbb7ad4cc3b6b06d6d4136fd6969dc0662b92363bd2441d544038e438be721b00af4780420cb64547c01729db2b07
diff --git a/media-gfx/pngtools/pngtools-0.4_p20220314.ebuild b/media-gfx/pngtools/pngtools-0.4_p20220314.ebuild
index 9fe86338be40..8889ed8a1a47 100644
--- a/media-gfx/pngtools/pngtools-0.4_p20220314.ebuild
+++ b/media-gfx/pngtools/pngtools-0.4_p20220314.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}"/${PN}-${MY_COMMIT}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 
 RDEPEND="media-libs/libpng:="
 DEPEND="${RDEPEND}"
diff --git a/media-gfx/renderdoc/Manifest b/media-gfx/renderdoc/Manifest
index db9153ce0781..2d2618c378d3 100644
--- a/media-gfx/renderdoc/Manifest
+++ b/media-gfx/renderdoc/Manifest
@@ -10,5 +10,5 @@ DIST renderdoc-1.22.tar.gz 46942430 BLAKE2B 8dfdea0883fd050af2359bb26c7ed2f99109
 DIST renderdoc-1.22.tar.gz.asc 833 BLAKE2B e8281369e602302a56189f81c6a4fc8084d0167de7ca76cb5066653a3697aa0c74ade8565ff98fad64e72ba1e0d3eec6447c7b96974ef7814d512e07ebfa0a9c SHA512 070255fa5ddbcb52c938b9354c6505b9b1c4ba3cade9f066cd938424076f4c475efee061575da111038e9fb7b49487216542a7742048596d9e729160f8d68e9e
 DIST swig-renderdoc-7.tar.gz 4006241 BLAKE2B 619f41239f4aef496264d61f44ae042cf80d3ff28491d452cf11ad07e898554c4a32df6119ee0e8e3de36e6bee61855358cd968ad01c9281976e24e9a6cac839 SHA512 5285a65924c069cfb9f73104ad8a95251badac4001293a1757b97ebead5953730c03289159741f82da4c5afe4f61f7c826b105eaf82df044ed2fa21810242c86
 EBUILD renderdoc-1.21.ebuild 5441 BLAKE2B e92947959aed6e9557b53f88b63d0e3515f146c2e2acb61f84f90714d6bb8176fc9b582d8347d28a16174480392c0d5b1c06db01b049c305642e2b9b8de73c51 SHA512 4b62fc9e1424284e285ed031b3d1120964412abda30295238506136dfcb9201ac0a9fa771b69274a4f8386446459b263c0adfbe320d40b47efeb8186208f3ca0
-EBUILD renderdoc-1.22.ebuild 5514 BLAKE2B ff57b25ced9a605acf13f4b02168cf961e4f00d563ad93cb385c8bec60f0e8465ec8127305c490f589b50da9fe05b99e5f546f5143546b397837c3e92727ace2 SHA512 7fbd675d0c6e1627326f79b1cbf781b0b787e9aae5118cba605f22c6da3ccfa99e491b7f89b16c30af01db80835b7b93ef16c7e198a22dd0891bcb21eaeb275f
+EBUILD renderdoc-1.22.ebuild 5513 BLAKE2B d143413c1cada6a312d557ca2da6bb0b2adbee2b7a58864f22c3d9bb487b7689e3ec63816d5c1ab94d50c561207fbf97b10b69ffe733fd2263e308411719c177 SHA512 a94a0fcefaf0059f62aa599e22ef7761aa2719352e079546cb1360b86306b09dd834192ee8c4e4fbd2191a51fbd5e57d376f972e6e13c70c7b86268c9dcd2dcb
 MISC metadata.xml 551 BLAKE2B 6b04ab731ce0f9c836b958914e25fcd4a4b76032fd97ba41f6bda742e99a4b7404de51acac99fe4736ba87e488300e94dc1ef7621a780d0a8e453d0fde0430f2 SHA512 a1c2b5260d0265efe2e1294cb88aa1c43618654c7d989cd8f4bd6e919082ea1d37fed4df8a601a702b5b120d5fb5f6658d3e155c5346dacb17249fed629c04d0
diff --git a/media-gfx/renderdoc/renderdoc-1.22.ebuild b/media-gfx/renderdoc/renderdoc-1.22.ebuild
index 08c06d55b13b..47381cf87597 100644
--- a/media-gfx/renderdoc/renderdoc-1.22.ebuild
+++ b/media-gfx/renderdoc/renderdoc-1.22.ebuild
@@ -40,7 +40,7 @@ SRC_URI="
 # swig: GPL-3+ BSD BSD-2
 LICENSE="BSD BSD-2 CC-BY-3.0 GPL-3+ MIT OFL-1.1 public-domain ZLIB"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="pyside2 qt5"
 REQUIRED_USE="doc? ( qt5 ) pyside2? ( qt5 ) qt5? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 26c28dbda31d..3b29670faf62 100644
Binary files a/media-libs/Manifest.gz and b/media-libs/Manifest.gz differ
diff --git a/media-libs/flac/Manifest b/media-libs/flac/Manifest
index aa55b6fe3a36..e86672d2ddde 100644
--- a/media-libs/flac/Manifest
+++ b/media-libs/flac/Manifest
@@ -3,5 +3,5 @@ DIST flac-1.4.1.tar.xz 1024160 BLAKE2B 9ed283a0e56e96667bb0c7d66ad9f9d932dc001bf
 DIST flac-1.4.2.tar.xz 1013700 BLAKE2B 60a40806c6c54fe836235cea2c476051c6f82e6a50ac6d160b4ab783b8b0c33f1763ba2816e5e490acd6320de0764ea3c4b35708820a17f40ccada3f72bac687 SHA512 20bdf0990a7432ac765037764bc8733a0d5646866fe6cc6f4868152d2a051c89676e501012ae489c7f87b3aacb45a5b30265afaca164cf0cf53ac058644a74c5
 EBUILD flac-1.3.4.ebuild 1564 BLAKE2B 8bd7aef1a3ad5d9d4acdb92d19df3b6c3d667c4614d9263d59e345a3683bd8e24adf72129be46e355266ec33ff2239efcede265bba8874a1f251b8f5a21ed085 SHA512 cd7b12fd21f8d09b09028c5fd1d128f2826f3894ef3072328e0e6f51d5c62220493f1f4ec953128354369f3aa3e6f9e2a00a301766be43724657d0c72f3deab8
 EBUILD flac-1.4.1.ebuild 1841 BLAKE2B 0c2137b39b46ee9a898932a14524b9ade6718a465efc293760f61f37613a0bfb2fb2da8cb1917688b1295c1fb5f7c9d23f116680faf02dae4f774ccb18481225 SHA512 94a55febdb552f351f6d56447e5ab44882d6d47105c051bf2e8b48f16fc83c08ef7706dd9ef455eaf34fc57a278144722d54a80b56c0cfb5864c6104a15cb1c5
-EBUILD flac-1.4.2.ebuild 1717 BLAKE2B c997295a415c6f43c4ecddf590c43c5dd6d09a0ccbaf9446d030c88a7e3e912e673694cdfe6e6bf87794188341733dd07dc52d57a71c5b625250673b1dbd298f SHA512 dc468658bee92da870281482953dca6aa09748bb0f1286056d1ac6287aa4e5b4e3286897576eabdef6a60863765e81baf0de37cbac57df1704def8808e9ee968
+EBUILD flac-1.4.2.ebuild 1712 BLAKE2B 02f27415fe1f5cd79f95b3eb2c59a29ded7f7251fccb7e7dfd4ce286cf5c9cc216ca5ed3b3cf268445935c88164687599f6372d059cd9ea97537229122a9608f SHA512 b6aca20859bee5802e2751ee662064a8dfcbdb5dd5882ab04c1a30e5c0240e2ca07de7ee21077d10c81fb274d002ca9507bb24204844732866c6502e31f69dab
 MISC metadata.xml 377 BLAKE2B 9fa4c0dc0300b2d2deb791a29d7a2ce6b00e05399ccc29581bc4ab83b1bdff3fecd2edbe6cef3cf8b4111cae5064edf4ccec9205e6791fb57f41d363c6352e95 SHA512 9d9d3c80a5a7c0255476ddc86ebf2fc76e42fc278185e9d5c4c814ff395f6d7d74e9a3e680be2966e89113a76dd482e1fe53f761a59474cf46e8b2469849fc2e
diff --git a/media-libs/flac/flac-1.4.2.ebuild b/media-libs/flac/flac-1.4.2.ebuild
index 3f82504e9a45..8298c7e76ed9 100644
--- a/media-libs/flac/flac-1.4.2.ebuild
+++ b/media-libs/flac/flac-1.4.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://downloads.xiph.org/releases/${PN}/${P}.tar.xz"
 LICENSE="BSD FDL-1.2 GPL-2 LGPL-2.1"
 # <libFLAC SONAME>-<libFLAC++ SONAME>
 SLOT="0/10-12"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="+cxx debug ogg cpu_flags_ppc_altivec cpu_flags_ppc_vsx cpu_flags_x86_avx2 cpu_flags_x86_avx static-libs"
 
 # AVX configure switch is for both AVX & AVX2
diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest
index f8950e86793e..b2ce61081939 100644
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@@ -1,8 +1,10 @@
 DIST harfbuzz-4.4.1.tar.gz 29231251 BLAKE2B 3947084ea2eedd76d64acfc5286ecd14d772ce0507163bc2c54a86579556a8799959ff4d47ea2919ee8472f8fe50d0266d325e3d0a7024f2ae8dcdf48d14f37e SHA512 bbc415d7b74408b1e8d34bfbc19a3cab002471fdd56d71b469c3129f0eae5532d5c7aaae7bb5cc3942fea6008d2ed9e96a7b20b10f4f5e46db63cecfa5c0248e
 DIST harfbuzz-5.1.0.tar.gz 29358116 BLAKE2B 006e66e9c76b505214b948c7c8756af38171b85cc865923e4665a4dd3eb14d89d20456ad4490b11208d57d056b087da78e1742141e41f8a22e644f20d3ea4851 SHA512 bdd7c2ca0b6f2a3a3fffbf0324d3c8bfd64a1753314048f6f67f901d4098e90054eeda9155d134f03c5d3ddefb15e087f872d2d87b2ace07bac6625fb43c7f3e
 DIST harfbuzz-5.3.0.tar.xz 17921224 BLAKE2B a220c1d4912487012f30942280651bcb63b5109e49be778a210bf26f4a0bcc7dc5ab7247775286b75cbe5b8fad7c439ae420d2085c6719088f028679242f9269 SHA512 0eae94769ac0157bf1df9b001223b30d40104ac448b1062f34ac793edb27ed1e459ac99954498c4b3cfb65c8cda29f2214a300f11523826b378ab67deec1a5f3
+DIST harfbuzz-5.3.1.tar.xz 17874260 BLAKE2B e4d3926daca4f5c95441a9b99e10acd4b95bf365f56934a2bbb8b35955e8457a90a13b0ad3223d8350012373216083e910f517b34c0dffb09fb218a1f8e9ca48 SHA512 6b0aef2b7445f4a71c324b545414114507d8077dc186366f25140dcd3bedeee67868cfc65c0eef59ed950381a4c101a541900be4995f645377c11754b027b501
 EBUILD harfbuzz-4.4.1.ebuild 2568 BLAKE2B 7e139034f21f106e2d3df102161487d788b49e6f52d2d109a922c0d38a9821fe090f71f5d844e04f495e16c69328b5b75c37dfd2faa05d1e120b19f4ccca66dd SHA512 0548def0efedc11cf90c9b57090e835a2f83a9e7f5b679166c04c16fc011dcf7919d5399c0ccbff1c7c8371c2480771d7a92da60573c3aa530e451cf5c2726c3
 EBUILD harfbuzz-5.1.0.ebuild 2574 BLAKE2B 2793ad1bf84ab388d2d5efddb74cd1431e2d4db4789273314e1824fd8c9fff9ea3f1489253b15703295fb46fd8509712cdd3cafe1a9e3aa07d2d9d9170bdd022 SHA512 80cd15636bc586ff84796bd0fb2d4b4b607e94335ad7eb83f6901164f4236c1cbb5db0533532b500638f25eb615da725ffd82aab5dc2cfdef50432597c1cf62d
 EBUILD harfbuzz-5.3.0.ebuild 2588 BLAKE2B f1a74063855a9437e2b3ff5322d03ef90bb6432721cb223373a8a088362db51f9819ea09179f2a7e1ee2b23ed783b8daebca8f689044d89f86ef1f114ad3fbae SHA512 398bc8ba0dd4f9b04157e7b842bbd6f2c7ea51699a47249192e5c31f78167eaa47bd1cc9c9cbb56ef7ead2626a754f2ef75124aea14d59cd5f4f701c8589b879
+EBUILD harfbuzz-5.3.1.ebuild 2588 BLAKE2B f1a74063855a9437e2b3ff5322d03ef90bb6432721cb223373a8a088362db51f9819ea09179f2a7e1ee2b23ed783b8daebca8f689044d89f86ef1f114ad3fbae SHA512 398bc8ba0dd4f9b04157e7b842bbd6f2c7ea51699a47249192e5c31f78167eaa47bd1cc9c9cbb56ef7ead2626a754f2ef75124aea14d59cd5f4f701c8589b879
 EBUILD harfbuzz-9999.ebuild 2588 BLAKE2B f1a74063855a9437e2b3ff5322d03ef90bb6432721cb223373a8a088362db51f9819ea09179f2a7e1ee2b23ed783b8daebca8f689044d89f86ef1f114ad3fbae SHA512 398bc8ba0dd4f9b04157e7b842bbd6f2c7ea51699a47249192e5c31f78167eaa47bd1cc9c9cbb56ef7ead2626a754f2ef75124aea14d59cd5f4f701c8589b879
 MISC metadata.xml 763 BLAKE2B cb8679b8a67d692c73f1dc48facf6a98a442d34b51a90b2236070919b737d22e38a15babe5847cf4d30d4630c66d803f9d6e684c5e8b8b87a199d5d471a9e35c SHA512 0d87926c3e7a475bc84859d630cc8ed1b62e5766856e15b9aa74c87b5fd22345a9c05951508ccecadbea3513afdfd2244b1dbfbec8b41022d413a1401701e55e
diff --git a/media-libs/harfbuzz/harfbuzz-5.3.1.ebuild b/media-libs/harfbuzz/harfbuzz-5.3.1.ebuild
new file mode 100644
index 000000000000..0b9dc09b3923
--- /dev/null
+++ b/media-libs/harfbuzz/harfbuzz-5.3.1.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit flag-o-matic meson-multilib python-any-r1 xdg-utils
+
+DESCRIPTION="An OpenType text shaping engine"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/HarfBuzz"
+
+if [[ ${PV} = 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/harfbuzz/harfbuzz.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/harfbuzz/harfbuzz/releases/download/${PV}/${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"
+fi
+
+LICENSE="Old-MIT ISC icu"
+# 0.9.18 introduced the harfbuzz-icu split; bug #472416
+# 3.0.0 dropped some unstable APIs; bug #813705
+SLOT="0/4.0.0"
+
+IUSE="+cairo debug doc experimental +glib +graphite icu +introspection test +truetype"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="introspection? ( glib )"
+
+RDEPEND="
+	cairo? ( x11-libs/cairo:= )
+	glib? ( >=dev-libs/glib-2.38:2[${MULTILIB_USEDEP}] )
+	graphite? ( >=media-gfx/graphite2-1.2.1:=[${MULTILIB_USEDEP}] )
+	icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
+	introspection? ( >=dev-libs/gobject-introspection-1.34:= )
+	truetype? ( >=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	>=dev-libs/gobject-introspection-common-1.34
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	virtual/pkgconfig
+	doc? ( dev-util/gtk-doc )
+	introspection? ( dev-util/glib-utils )
+"
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+	if ! use debug ; then
+		append-cppflags -DHB_NDEBUG
+	fi
+}
+
+src_prepare() {
+	default
+
+	xdg_environment_reset
+
+	# bug #726120
+	sed -i \
+		-e '/tests\/macos\.tests/d' \
+		test/shape/data/in-house/Makefile.sources \
+		|| die
+
+	# bug #618772
+	append-cxxflags -std=c++14
+
+	# bug #790359
+	filter-flags -fexceptions -fthreadsafe-statics
+
+	# bug #762415
+	local pyscript
+	for pyscript in $(find -type f -name "*.py") ; do
+		python_fix_shebang -q "${pyscript}"
+	done
+}
+
+multilib_src_configure() {
+	# harfbuzz-gobject only used for introspection, bug #535852
+	local emesonargs=(
+		-Dcoretext="disabled"
+		-Dchafa="disabled"
+
+		$(meson_feature glib)
+		$(meson_feature graphite graphite2)
+		$(meson_feature icu)
+		$(meson_feature introspection gobject)
+		$(meson_feature test tests)
+		$(meson_feature truetype freetype)
+
+		$(meson_native_use_feature cairo)
+		$(meson_native_use_feature doc docs)
+		$(meson_native_use_feature introspection)
+
+		$(meson_use experimental experimental_api)
+	)
+
+	meson_src_configure
+}
diff --git a/media-libs/libcdaudio/Manifest b/media-libs/libcdaudio/Manifest
index 0f2224ddb56a..192fc1950c78 100644
--- a/media-libs/libcdaudio/Manifest
+++ b/media-libs/libcdaudio/Manifest
@@ -4,5 +4,5 @@ AUX libcdaudio-0.99.12-libdir-fix.patch 343 BLAKE2B d53a60c2bfb6308fc9f54e61846b
 AUX libcdaudio-0.99.12-m4-testprogram-fix.patch 176 BLAKE2B 9f17b18b06d418c49522b10f6f68b7a2b1d54aeac476482b091cd57e87d85c2d987b94b3582d410afbab7f6a3b1feab01e664c6aa3f9682da40c4cfae86a4aab SHA512 7a4907c583b2cf7022390f44480853a453132f8416940d6b3d3fc72c2a1c39633e9e7b1d268e7416d9dc5e6bd724bd1846d71869efe3acf0bae378676b1abc8f
 DIST libcdaudio-0.99.12.tar.gz 357150 BLAKE2B 406dcdeb801237e9aa88934bd7ca39bad0b121641de198b65a4137ff1d25500954f12f7f86b78912098a7acda3afb188a5965b69e99ccb0a84441b3bf1931327 SHA512 c00fbea7776e847da93bfbf4cbe74ccb3ee826da80e74eef84575fc211729e6a09599f5bfa332c91d678a31f9de5e5b333bdafe51438f266f6dea519652f5247
 EBUILD libcdaudio-0.99.12-r3.ebuild 628 BLAKE2B f2ea99e1543e443c0d841e942643886a244bb9dffa19c9f4aa1ae98b12f5a4fbb2800939d7c0ba2fc9098320ebf867fc086e2b3ca698e8752bc031e745873494 SHA512 8714d0e1007f1303cbfeced2f1b8e792d2f77bc8fcd4e7bc5fb89fb5486e8a9c58227ba9724cf5663c7956479b9eaf4dd02301d9706316ced431f09f9c235a11
-EBUILD libcdaudio-0.99.12-r4.ebuild 675 BLAKE2B aa77d057bef3fcc7fb6f4d59ad2de24247975b8064608a6c7eb39ac91940253e4eed53b2eb70ec5d7ba790fed588a792b3b0f514cdd47bd5c1f1178a6bbf84f9 SHA512 dbb1e9d72b47b7789b83c6ce091825935ab85eafc8c6a8d1b5bbbc3813e91fe1b668f26a700dd463118398cefb946b22e611cdfafea5c8a7b536542d0057bc7c
+EBUILD libcdaudio-0.99.12-r4.ebuild 673 BLAKE2B cc7dd8207af1e51cc73bd21e60e8f6445e72d831124d52163e06f459124d4c4cba6fb98c6f90b3a824b7789978df75cd2140684e067dc06af52651cd019d9661 SHA512 56dfce349476d14bd3a3d01a7a6430daf213c0c3dc9ef297f011a1eb25fc587433d0694e504e10c21d2e82aef6cd8241765fc85a83fa8b1a585a2237d04f8a5e
 MISC metadata.xml 334 BLAKE2B d9be9083a98a2b39213e4be83809d0fc452d0ce36ac1d9f90a62ce46a921842daead9da5efc3fa677df8e8e6578f15d298f669a7a7c309d137716859e1420747 SHA512 5ed9828508c9cc4e02f337bb7acb844d418ff555372bc5bdb1650b3e8a366bb1ab2a2bac88a6e5b08b6b74e8f3dce119971b126cccfd329fb206b9358eb934a3
diff --git a/media-libs/libcdaudio/libcdaudio-0.99.12-r4.ebuild b/media-libs/libcdaudio/libcdaudio-0.99.12-r4.ebuild
index 497e026d0b84..7912ed3b0f5d 100644
--- a/media-libs/libcdaudio/libcdaudio-0.99.12-r4.ebuild
+++ b/media-libs/libcdaudio/libcdaudio-0.99.12-r4.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/libcdaudio/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE=""
 
 PATCHES=(
diff --git a/media-libs/libjxl/Manifest b/media-libs/libjxl/Manifest
index d66eba2ba2b2..2ce3afe0f2a8 100644
--- a/media-libs/libjxl/Manifest
+++ b/media-libs/libjxl/Manifest
@@ -1,6 +1,6 @@
-DIST libjxl-0.7.0_pre20220329.tar.gz 21282311 BLAKE2B 8ced9811adba47e5ccac4d55cb7133a863bedceebeb51e649fa79ecb17b785e747532f1f36fd39e3627d0a29406f5f403dee8fa42a9958c713c1296c2f83260a SHA512 deb17dd2eb3e2c39d624d97c6959940aee5beafcb009f6cb2ac14dd83c73d2601df8c81f6cec5d8032d9e66d1fdabfe620dcbf9bfa5e90eb9978265896816242
+DIST libjxl-0.7.0.tar.gz 1505917 BLAKE2B fd60e8fb1d7082deaaaf413395ac09e6096bb164ac1b2765a836e0bd3b96a8ac604c2e7631dd17d3eb1d9421c9460de13cede63c5786a5b0689cb858d7f5ec59 SHA512 c73039606acf7b2cbc331c6787af5167d711fd1af22bc616e1f478c531b087da82c98f2cb7e88c4d1f8bcfdc4e053ae0dc99cc9a811545b7f9658041489ed04b
 DIST libjxl-0.7.0_pre20220825.tar.gz 1505499 BLAKE2B 67b1f33112c85c8ccf1187cc44441f1afd6b5f11139f5b066092abe3dd2304e7ff8a8179fb1ef2a08982d2700ac757113019580c99abf37b3d701310f70861bf SHA512 13132dbe93d1b55cf878653803b01547b77152687aedd8ea07c162562f78965f74b5d96b82a434d2982962ad817096253a9447743e620cc72af0f1906a284b1d
-EBUILD libjxl-0.7.0_pre20220329.ebuild 1966 BLAKE2B 471819d39ffda2fde94c3e9567df095a60fde5c6bd7fe8da6c7f37f5a187abf2da900c2def6560049d8728d375aef98708c1ae53725fd45f5e0531a60cf68fa0 SHA512 e5b77fe41bfe6ae7063fcbe2cba6b2cde3147e9ebc266a597df9807af47dc5afb2ff9821fb0235a2e1f423a48c1013e2b29b2a4366c3231cd0c54b4c495ac276
-EBUILD libjxl-0.7.0_pre20220825.ebuild 1838 BLAKE2B f06ea0bac203f2eabbce0164246678a3f9c9c35258a60a18644628ecc09c4c44361579785c9296b3a18546bc0ba2bba5053cc9431577077f0048a0f58c949ccf SHA512 f3bcad4f956f62891960919c882cf454419f121f642271c6ddc5d8758170ca226ba8303202f79d2159c4614d074c9e23ae397cf0c80f11b858c3eaadd6ba1332
-EBUILD libjxl-9999.ebuild 1825 BLAKE2B f25b4b4c41b7c2bd1f97bfbba975a6e9a61a4550c4e02425354e39c125dd1dc07d5c65814655e6525704c556757949c0295a4e47766cd95c82b44e56e0b0b936 SHA512 92a8a2918fdb31b73603e3ec17fd8c4b30555457969e4c0820fad7b3ab1800611c1d90abb626d70b8a2c62c50dd5e69fb7aa1125fdf4c6acb8aa8514e90afc15
-MISC metadata.xml 737 BLAKE2B c6d720ad6e51168ebab6cc33b8c3af44149f19a8331f1b834fcf4e33f9b90050fae96bdd03202a83960ec7d01d9427e6eaf0be51d47efa736533b8bb5affaac5 SHA512 6b461b43818da3626a59c7d040c7f3cf470624b6205001445a0ede4ceffa4f1ad6233ea85cf3616dd4bfd7cbbd50ce28e0f509e13ec06b64ba4b724e2a90d602
+EBUILD libjxl-0.7.0.ebuild 1742 BLAKE2B 44aa26ab93c6c47ab17c4899d29719116e7b74bae876edc4c232e9cc60260133c9fbbd87bb841993fa55e11577d90ebbb1191be3494d405531e4ad875886034e SHA512 7e858a1aba07595781ea88e78148bcbdab1c60e41fb1a2237c1ba6d919d134ae02f39b4e3e551dc7827ab1c5a51f4d0e6a27e26c130c16bae86abd0ee6a9bf30
+EBUILD libjxl-0.7.0_pre20220825.ebuild 1837 BLAKE2B 904e32dfd030184606f0b9fdc04e9a49315390ccf98cdb0e03fd457d95ad38f622a3808681c9caf541ed032d3d4f780c1b8c097169730d7042063b742ad0ccab SHA512 7ec4d6c0ccfe235cfd69752f4ab60fa640dfd2bd6a2e237ebba49675c6a7392a00f199f3c8ec719ca7c8b593ce166db04fb35c50b7b50fceaf4daded459288cc
+EBUILD libjxl-9999.ebuild 1750 BLAKE2B 7a82432b1a82fa2c224062b1b91a2d1c3444d4039940024d0a892fc2dcc044b5832f46bcbf4972ff1b294f0289aa5c7c6212abc5b28ac59f255c3b80de77995c SHA512 b98d2ab562b1d46df6194e1b0c7240fa2e2ff7527134cc80c3a7d80f998a770ea64a29fa08d1ab2ed1af5770b1c89a8512f9671e2e166de8901625546f90b35d
+MISC metadata.xml 668 BLAKE2B b9cd4d0f146c6d44b619a88ba63b3aeff87415ee1717a80f809da7caea0d3d595f9238f80d33502fcd5b85e294f9af837075547ebeb947d0888a151875eb679b SHA512 c634f5a110fc31e0f7379c37b53656f3af6f3c8f49937164adeea3f2facd1c9519369fc5f28cfb969e00abeb830209e4a986938ca275a33e77945906f235fabf
diff --git a/media-libs/libjxl/libjxl-0.7.0_pre20220329.ebuild b/media-libs/libjxl/libjxl-0.7.0.ebuild
similarity index 71%
rename from media-libs/libjxl/libjxl-0.7.0_pre20220329.ebuild
rename to media-libs/libjxl/libjxl-0.7.0.ebuild
index 35d770126395..c35258044ff6 100644
--- a/media-libs/libjxl/libjxl-0.7.0_pre20220329.ebuild
+++ b/media-libs/libjxl/libjxl-0.7.0.ebuild
@@ -3,36 +3,33 @@
 
 EAPI=8
 
-inherit cmake-multilib
+inherit cmake-multilib flag-o-matic
 
 DESCRIPTION="JPEG XL image format reference implementation"
 HOMEPAGE="https://github.com/libjxl/libjxl"
-
-SRC_URI="https://api.github.com/repos/libjxl/libjxl/tarball/fde214c5f4dc5ffd0360401a68df33182edf9226 -> ${P}.tar.gz"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86"
+SRC_URI="https://github.com/libjxl/libjxl/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-IUSE="examples openexr"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="openexr"
 
 DEPEND="app-arch/brotli:=[${MULTILIB_USEDEP}]
-	dev-cpp/gflags:=[${MULTILIB_USEDEP}]
-	>=dev-cpp/highway-0.16.0[${MULTILIB_USEDEP}]
+	>=dev-cpp/highway-1.0.0[${MULTILIB_USEDEP}]
 	media-libs/giflib:=[${MULTILIB_USEDEP}]
 	>=media-libs/lcms-2.13:=[${MULTILIB_USEDEP}]
+	media-libs/libjpeg-turbo[${MULTILIB_USEDEP}]
 	media-libs/libpng:=[${MULTILIB_USEDEP}]
 	sys-libs/zlib[${MULTILIB_USEDEP}]
-	virtual/jpeg[${MULTILIB_USEDEP}]
 	>=x11-misc/shared-mime-info-2.2
 	openexr? ( media-libs/openexr:= )
 "
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}/libjxl-libjxl-fde214c"
-
 multilib_src_configure() {
+	filter-lto
+
 	local mycmakeargs=(
-		-DCMAKE_SKIP_RPATH=ON
 		-DBUILD_TESTING=OFF
 		-DJPEGXL_ENABLE_BENCHMARK=OFF
 		-DJPEGXL_ENABLE_COVERAGE=OFF
@@ -50,18 +47,17 @@ multilib_src_configure() {
 		-DJPEGXL_ENABLE_MANPAGES=OFF
 		-DJPEGXL_ENABLE_JNI=OFF
 		-DJPEGXL_ENABLE_TCMALLOC=OFF
+		-DJPEGXL_ENABLE_EXAMPLES=OFF
 	)
 
 	if multilib_is_native_abi; then
 		mycmakeargs+=(
 			-DJPEGXL_ENABLE_TOOLS=ON
-			-DJPEGXL_ENABLE_EXAMPLES=$(usex examples)
 			-DJPEGXL_ENABLE_OPENEXR=$(usex openexr)
 		)
 	else
 		mycmakeargs+=(
 			-DJPEGXL_ENABLE_TOOLS=OFF
-			-DJPEGXL_ENABLE_EXAMPLES=OFF
 			-DJPEGXL_ENABLE_OPENEXR=OFF
 		)
 	fi
@@ -72,9 +68,5 @@ multilib_src_configure() {
 multilib_src_install() {
 	cmake_src_install
 
-	if use examples && multilib_is_native_abi; then
-		dobin "${BUILD_DIR}/jxlinfo"
-	fi
-
 	find "${D}" -name '*.a' -delete || die
 }
diff --git a/media-libs/libjxl/libjxl-0.7.0_pre20220825.ebuild b/media-libs/libjxl/libjxl-0.7.0_pre20220825.ebuild
index 7ae7057be9c6..e772dea30c98 100644
--- a/media-libs/libjxl/libjxl-0.7.0_pre20220825.ebuild
+++ b/media-libs/libjxl/libjxl-0.7.0_pre20220825.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/libjxl-libjxl-${COMMIT:0:7}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc ppc64 ~riscv sparc x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86"
 IUSE="openexr"
 
 DEPEND="app-arch/brotli:=[${MULTILIB_USEDEP}]
diff --git a/media-libs/libjxl/libjxl-9999.ebuild b/media-libs/libjxl/libjxl-9999.ebuild
index a2269bfc62ec..f8c37689216e 100644
--- a/media-libs/libjxl/libjxl-9999.ebuild
+++ b/media-libs/libjxl/libjxl-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit cmake-multilib git-r3
+inherit cmake-multilib flag-o-matic git-r3
 
 DESCRIPTION="JPEG XL image format reference implementation"
 HOMEPAGE="https://github.com/libjxl/libjxl"
@@ -13,26 +13,26 @@ EGIT_SUBMODULES=(third_party/skcms)
 
 LICENSE="BSD"
 SLOT="0"
-IUSE="gdk-pixbuf gimp210 openexr"
+IUSE="gdk-pixbuf openexr"
 
 DEPEND="app-arch/brotli:=[${MULTILIB_USEDEP}]
-	dev-cpp/gflags:=[${MULTILIB_USEDEP}]
 	>=dev-cpp/highway-1.0.0[${MULTILIB_USEDEP}]
 	media-libs/giflib:=[${MULTILIB_USEDEP}]
+	media-libs/libjpeg-turbo[${MULTILIB_USEDEP}]
 	media-libs/libpng:=[${MULTILIB_USEDEP}]
 	sys-libs/zlib[${MULTILIB_USEDEP}]
-	media-libs/libjpeg-turbo[${MULTILIB_USEDEP}]
 	>=x11-misc/shared-mime-info-2.2
 	gdk-pixbuf? (
 		dev-libs/glib:2
 		x11-libs/gdk-pixbuf:2
 	)
-	gimp210? ( >=media-gfx/gimp-2.10.28:0/2 )
 	openexr? ( media-libs/openexr:= )
 "
 RDEPEND="${DEPEND}"
 
 multilib_src_configure() {
+	filter-lto
+
 	local mycmakeargs=(
 		-DBUILD_TESTING=OFF
 		-DJPEGXL_ENABLE_BENCHMARK=OFF
@@ -58,7 +58,7 @@ multilib_src_configure() {
 			-DJPEGXL_ENABLE_OPENEXR=$(usex openexr)
 			-DJPEGXL_ENABLE_PLUGINS=ON
 			-DJPEGXL_ENABLE_PLUGIN_GDKPIXBUF=$(usex gdk-pixbuf)
-			-DJPEGXL_ENABLE_PLUGIN_GIMP210=$(usex gimp210)
+			-DJPEGXL_ENABLE_PLUGIN_GIMP210=OFF
 			-DJPEGXL_ENABLE_PLUGIN_MIME=OFF
 		)
 	else
diff --git a/media-libs/libjxl/metadata.xml b/media-libs/libjxl/metadata.xml
index f39fa860738c..8ac778195a7c 100644
--- a/media-libs/libjxl/metadata.xml
+++ b/media-libs/libjxl/metadata.xml
@@ -16,6 +16,5 @@
   </longdescription>
   <use>
     <flag name="gdk-pixbuf">Build a gdk-pixbuf loader</flag>
-    <flag name="gimp210">Enable plugin for GIMP 2.10.x series</flag>
   </use>
 </pkgmetadata>
diff --git a/media-libs/libquicktime/Manifest b/media-libs/libquicktime/Manifest
index 7dd8bb4a43a6..ce69249ff9fe 100644
--- a/media-libs/libquicktime/Manifest
+++ b/media-libs/libquicktime/Manifest
@@ -4,6 +4,7 @@ AUX libquicktime-1.2.4-CVE-2017-9122_et_al.patch 4584 BLAKE2B 8d5be1d1a297d89da1
 AUX libquicktime-1.2.4-ffmpeg2.patch 4046 BLAKE2B 1db6a761fa94a32741a05919d12d0211964647a61ffd32ba8619530ec089c980999aa1ded534c2652eb3baf15558bcb9842a23634eeef043a6ed3eb3f8e794ff SHA512 32ddf394aad4ed80e89ec72a534e0466268ab0061b991815e905b78eae55a7d935117b0915faf6f7f51bd7e2d9fbaa4b0e07bfcef1ef1e2f4a7e2061c489122d
 AUX libquicktime-1.2.4-ffmpeg29.patch 13436 BLAKE2B 8a1e7b5df65f5297f59aa17c4a52706413c1ffd88d8645de7359ec26f7059101ab81ac135cf7ef707a8acbeb709e1a6dae03d6a7e7f70c7e88185ebb271acbe4 SHA512 2a7e06c03b0f64f02b923c1a0e7121f4e1ea735f19a6df8ce8daf18177ead132d1ae921c64f3770042db3bbf29f15a7fcceece835d475e052c4c3bb7139c9e2e
 AUX libquicktime-1.2.4-ffmpeg4.patch 14723 BLAKE2B bd1299c24b738b3752e4d8d50ed1b2fa2f208c83e577876118d115fca22293e102614ae0cdc168060115f7145d951d290bccf21154fda4aabf55329d310b6aca SHA512 1b11a82d694654976a5f79cd8feb27eec3810e09a66dc58ca576eaf1f96e4948abd4dae7955a7da6cf99ae6ffef9e183b39090d96cc6b5fe216b4c4f4faff7a8
+AUX libquicktime-1.2.4-implicit-func-decl.patch 235 BLAKE2B 275b71da56e9d499865e95b4c84e8a7b4e0b294daa8dc95bfeb1ad6588cace9822b17d7645561195e8d8c569ec7de94f7319e2f2ad8dfd13e6a18667b479e80f SHA512 e3ebd066dcdf393a7b08e7c592f664261b87ba7d2cfa5cad2d4bf364c25477b9290ffd30ea124dce7f09ce3b3c3139026d5685f2059b3d277f227c8eec4a9cc4
 DIST libquicktime-1.2.4.tar.gz 1028626 BLAKE2B 6c50965be5d19fb4c57ea6b36f2581ebd575d78a34f2df7029ce2c6ee560e8135a953a2e85d91d189e2c01b97c99804d0eab602866b88a5f07c36351174680f0 SHA512 6ab6cd62ae2361bb3ad73725e9e8baa2b03361bc23e9e34b24f90c0e2bec4337de950ed7f30a6a1d2e67ab33e8f0c43538369fd07e417f54b84583a3c331f8dd
-EBUILD libquicktime-1.2.4-r3.ebuild 3630 BLAKE2B e469410bef7d2f98c85999db95517795ca56481b44c08344cda777178807692bcc3078544430d4c8087faa5c8534aa1a5feac81db50cc19f436df21dc403f340 SHA512 de08b8b81804ab395caaeacf82d37f56d744fee2f5ec1e156bccfe2f5f33d255ce8f4bb8e36c2305e01a0aee640b510a5a4afc6577d6fa09f0da25fdc5bda7bf
+EBUILD libquicktime-1.2.4-r4.ebuild 3680 BLAKE2B ae45c7da03c2b92575f958b69457c40582d54e28e399d1c36bd0a394d889b182582c8bb538f632ae7271cda0115e429e26dca2f3f27d293b19d82173abf7f142 SHA512 29b5f3d295ae4f56953b268ab1b467037685d6e7163177d98d70f9d51301e544a504e7a7e060db8d71c254d7699c340747d5835a08f0a0bbc7b62d370c689595
 MISC metadata.xml 306 BLAKE2B 5dde92ce1f7506afb07de09c7c6148c2c4d2f82a2bcd5a7cb6397af0353b6b867d68a504e5eb0f9cce160c444f69b64708d3e737ec0f71309b8fad6510586d8a SHA512 83fe67ab5171754f4c61fd1546c39ffef692be44cd1a76ae00744a0587f8d03cdd37c02a952c8ee231adf32ee510fe362c6b36ff8bf235524d6f7510adb63686
diff --git a/media-libs/libquicktime/files/libquicktime-1.2.4-implicit-func-decl.patch b/media-libs/libquicktime/files/libquicktime-1.2.4-implicit-func-decl.patch
new file mode 100644
index 000000000000..c4fbb02d0754
--- /dev/null
+++ b/media-libs/libquicktime/files/libquicktime-1.2.4-implicit-func-decl.patch
@@ -0,0 +1,11 @@
+https://bugs.gentoo.org/874447
+--- a/plugins/png/qtpng.c
++++ b/plugins/png/qtpng.c
+@@ -26,6 +26,7 @@
+ #include <quicktime/colormodels.h>
+ #include <png.h>
+ #include <stdlib.h>
++#include <string.h>
+ #include "qtpng.h"
+ 
+ typedef struct
diff --git a/media-libs/libquicktime/libquicktime-1.2.4-r3.ebuild b/media-libs/libquicktime/libquicktime-1.2.4-r4.ebuild
similarity index 96%
rename from media-libs/libquicktime/libquicktime-1.2.4-r3.ebuild
rename to media-libs/libquicktime/libquicktime-1.2.4-r4.ebuild
index a56c905c7c94..d39c7d5b0dda 100644
--- a/media-libs/libquicktime/libquicktime-1.2.4-r3.ebuild
+++ b/media-libs/libquicktime/libquicktime-1.2.4-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -25,7 +25,7 @@ RDEPEND="
 	dv? ( >=media-libs/libdv-1.0.0-r3[${MULTILIB_USEDEP}] )
 	ffmpeg? ( >=media-video/ffmpeg-3.2.6:0=[${MULTILIB_USEDEP}] )
 	gtk? ( x11-libs/gtk+:2 )
-	jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
+	jpeg? ( media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] )
 	lame? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] )
 	opengl? ( virtual/opengl )
 	png? ( >=media-libs/libpng-1.6.10:0[${MULTILIB_USEDEP}] )
@@ -58,6 +58,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-ffmpeg29.patch
 	"${FILESDIR}"/${P}-CVE-2016-2399.patch
 	"${FILESDIR}"/${P}-CVE-2017-9122_et_al.patch
+	"${FILESDIR}"/${P}-implicit-func-decl.patch
 )
 
 src_prepare() {
diff --git a/media-libs/libshumate/Manifest b/media-libs/libshumate/Manifest
index 50cc9554f756..f7965ad0107c 100644
--- a/media-libs/libshumate/Manifest
+++ b/media-libs/libshumate/Manifest
@@ -1,3 +1,5 @@
 DIST libshumate-1.0.1.tar.xz 109884 BLAKE2B b1a4838b3f43df00ded7973e78acaceaa1c2fa6bb3a67214e475026a980c03f610e68b8d2a992093f091731e8d8e48e954d1ba917e93071f63a984f45a3142bc SHA512 19bf8a563d9b5c9cca3adfc337ec8843c7d8b891fcdd789adecfb79a46c3ba6f674795d39199ce154c5a3f6b95eac5d6e56ba73066f2ab18c8a95d3646b9ad25
+DIST libshumate-1.0.2.tar.xz 110656 BLAKE2B 75abbfd9b4e1e7eb1044a33ff1b46391024005487f01aa4401552727322f92f28120104af4c2f90bb91c70ada6282882b9ee7f50ac62542aab8c88cc227799f8 SHA512 15539ce50462b345e4329fc27f52a5d1fb143e82821a990ce818a576fec94d1fe1fbef9926d0251d169f22394f3f21c62e56fe4d97bbdd4482429c70f22c6b2d
 EBUILD libshumate-1.0.1.ebuild 1441 BLAKE2B aafe203c13f50943bb4bddfc0350471c3838cb0981d86ab0fd0b49c678dd1d7d653463c734804e7fec8a7f7828a97d5928bcb7e96d52531cf6ad891f990ab6f7 SHA512 2df30a99fcd43784f78da8d6bf4e2d59b430020c8c0ab36d5db766c411945eb4bdcba8d7c8e541cbcb8508e439d3a8f88240d76ffddc2d0912d852b614334d91
+EBUILD libshumate-1.0.2.ebuild 1441 BLAKE2B aafe203c13f50943bb4bddfc0350471c3838cb0981d86ab0fd0b49c678dd1d7d653463c734804e7fec8a7f7828a97d5928bcb7e96d52531cf6ad891f990ab6f7 SHA512 2df30a99fcd43784f78da8d6bf4e2d59b430020c8c0ab36d5db766c411945eb4bdcba8d7c8e541cbcb8508e439d3a8f88240d76ffddc2d0912d852b614334d91
 MISC metadata.xml 254 BLAKE2B de7a97001e5947704f42973c8a0c3a23c2d80afb976254f5fd21e9d372a946e055d4cdc3c0eaed010505f87929b56e8b1e650c945e2a302644adbc9440833be8 SHA512 c81da4f9b80e5691a167f4590906952e25356604ec17689c005be14efb394c0634776bbe84df936edde239480bdf46db41216b00da4a3a45f670e9ca18ab0132
diff --git a/media-libs/libshumate/libshumate-1.0.2.ebuild b/media-libs/libshumate/libshumate-1.0.2.ebuild
new file mode 100644
index 000000000000..e3f5bb4d13fb
--- /dev/null
+++ b/media-libs/libshumate/libshumate-1.0.2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome.org meson vala virtualx
+
+DESCRIPTION="Shumate is a GTK toolkit providing widgets for embedded maps"
+HOMEPAGE="https://wiki.gnome.org/Projects/libshumate https://gitlab.gnome.org/GNOME/libshumate"
+
+SLOT="1.0/1"
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64"
+REQUIRED_USE="gtk-doc? ( introspection )"
+
+IUSE="gtk-doc +introspection vala" # vector-renderer is still experimental, maybe put in at a later release
+
+RDEPEND="
+	>=dev-libs/glib-2.68.0:2
+	>=x11-libs/cairo-1.4
+	>=dev-db/sqlite-1.12:3
+	>=gui-libs/gtk-4:4
+	>=net-libs/libsoup-3.0:3.0
+	introspection? ( >=dev-libs/gobject-introspection-0.6.3:= )
+"
+# vector-renderer? (
+#	>=dev-libs/json-glib-1.6.0[introspection?]
+#	dev-libs/protobuf-c
+# )
+
+DEPEND="${RDEPEND}"
+BDEPEND="
+	gtk-doc? ( >=dev-util/gi-docgen-2021.1 )
+	vala? ( $(vala_depend) )
+"
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use introspection gir)
+		$(meson_use vala vapi)
+		$(meson_use gtk-doc gtk_doc)
+		-Ddemos=false # only built, not installed
+		# $(meson_use vector-renderer vector_renderer)
+		-Dvector_renderer=false
+		-Dlibsoup3=true
+	)
+	meson_src_configure
+}
+
+src_test() {
+	virtx meson_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
+	fi
+}
diff --git a/media-libs/libuninameslist/Manifest b/media-libs/libuninameslist/Manifest
index e2d26ad08cb5..37a6ae37572c 100644
--- a/media-libs/libuninameslist/Manifest
+++ b/media-libs/libuninameslist/Manifest
@@ -1,4 +1,6 @@
 AUX libuninameslist-20211114-slibtool.patch 2399 BLAKE2B bd5f8534506b55ce42f16e4d31ea9815d9e6408bff2c1649ebba119fb8e2dc90504e97ba59a4ab6b8dc49fcaaebfff5f0def923162e7f3bca4afb2c8d161ea7f SHA512 026a2dcda527433d33783317545b08a62cf89dba3429eb37871e796599e873feb9de56118dbb152befd86706c3286c004e1e61e3e3690586c2625af5e1f43c24
 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 611 BLAKE2B b60dd540ea36379176e3615a0842489b199f27bcd5e98cdf18b43174d44c6ae8b1cd13fcf70553d198fd65231c49cea512b9e9b29e851a8829e19ae2c96e77f4 SHA512 6ef1b4f0c4425ecb0404e7a5138075e215ac0a4ff1401874364d4e0d3d8fd24a22c80867d16df47c34df18fb413488ce37562d70d79c6295f0e8db1c7f7a2eac
 MISC metadata.xml 484 BLAKE2B c5aae59be58a06431b5c19c32ac89ebc77a2ca93c37e98b834e9adf11e7c4a45e7655d21621929b70fac24cc4121f50dff17e462d1d782942215aaf5cffeabe2 SHA512 2bcc9f45999095ed409b6a77b66b827395371ae177c6496056936cff949339d192288b430ff631aea20ced5b107268afe63284919a3e90d0f335427910e18f7f
diff --git a/media-libs/libuninameslist/libuninameslist-20221022.ebuild b/media-libs/libuninameslist/libuninameslist-20221022.ebuild
new file mode 100644
index 000000000000..629588167fe0
--- /dev/null
+++ b/media-libs/libuninameslist/libuninameslist-20221022.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Library of unicode annotation data"
+HOMEPAGE="https://github.com/fontforge/libuninameslist"
+SRC_URI="https://github.com/fontforge/libuninameslist/releases/download/${PV}/${PN}-dist-${PV}.tar.gz"
+
+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"
+
+src_configure() {
+	econf --enable-frenchlib
+}
+
+src_install() {
+	default
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-libs/mlt/Manifest b/media-libs/mlt/Manifest
index fdf0017c0184..400065b1c400 100644
--- a/media-libs/mlt/Manifest
+++ b/media-libs/mlt/Manifest
@@ -3,5 +3,5 @@ AUX mlt-6.22.1-no_lua_bdepend.patch 153 BLAKE2B 3ea31c570e7bef81bda0905549baedee
 AUX mlt-7.0.1-cmake-symlink.patch 569 BLAKE2B 06f7c8e7ec78206bb1344bab98f1d9ec816b16c458300964fe31ff30f8f2cc64d8f25a795773fd64db7249b031a164c350b55b6326c4d07d73ffd27f8786a911 SHA512 6deb458c3a89f800b4770460330c1e545c22d3a7304f0713b7ae214145d1413a3061c7c026ab2f6fc44801d1d7505352f03c0da7034e817b684e0ebb25d9a94f
 AUX mlt-7.8.0-linux_locale_h.patch 1508 BLAKE2B 412f066a5032e0f2408642256d182f0fdb22e58df3013cb08769e36a9189010b5a8d46b4def16ba0c59325f4db06c84eb664bff5aa7954ac8c8a8ba13ff20785 SHA512 5fddb589cbe2557a02be4a8a721b4e2acb03ab771444e603d8bd9878264c19803888ef7af383f102dd217a4784dec36376eb0bf2b84c1d907e6dfd0b22533f4a
 DIST mlt-7.8.0a.tar.gz 1458730 BLAKE2B 0f544923c7f1667d2a2379bcb84a68dca2c701ce7b9cebe4e9b5f81efcb494674111fea09e9025108b8714e792a0179d465d226bb0a0231a197a67c99d82f976 SHA512 aa44d604f2246db11e5c572e2c3f9121ef0ace1fdead95a6a4a20f7555a3139b067fd2d464f27d23cc90cfcf8907ae9cf8f33b26f76c110a6ba2329867f88bd1
-EBUILD mlt-7.8.0.ebuild 3705 BLAKE2B cfdefd8dda186f54c93056673dd49f3495b2a5fcb56e1b843501cef1433d9f0652ae63aa97417c46506dbc0280de87e84c68faa3f41f7eb9420bb8fd99ae9c3e SHA512 9e44034d17e8acd2bf5b13c1ad52ca875e45d1405f564c118e24da7badd29f37d15e4ef10dc88292b765e170cd4f4a4683d990e64b67b59d28539fde7a9728be
+EBUILD mlt-7.8.0.ebuild 3705 BLAKE2B 1a713c4dbfb65e06907fcd29e67481d2ac5a83f43902a4d495984a3ab2e2f296a7c201762136bb02541df0b049f0f133d10ab761002e92468beec4deac78c181 SHA512 e3425148b727dacc140b1c363d20f2a9cd7fa3841e61559fbef60b86e86e0415c8a8987af8ddee1f872d33d589b678371fe52db38324f4153deefb3934ade64a
 MISC metadata.xml 1412 BLAKE2B 8d4eed394f1d1e95e5559466ef1840978966e8f1f7b89fdfd2549b2a35b6ce8f114c9373374fdaefe320cc34a4dc8cbd9f6c4433740d1ae9680de54484b5e3d1 SHA512 b19c711dc3798f952e0223dc0628b25aa3c9a296d66ee2f2b7f46a55b82e71c0c583ee64517be88dcc55eb1e9c31aa782b9043eb7630a853077afb1bf8b4dedd
diff --git a/media-libs/mlt/mlt-7.8.0.ebuild b/media-libs/mlt/mlt-7.8.0.ebuild
index d25a3214c7c1..53b16ea2df51 100644
--- a/media-libs/mlt/mlt-7.8.0.ebuild
+++ b/media-libs/mlt/mlt-7.8.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 inherit python-single-r1 cmake
 
 DESCRIPTION="Open source multimedia framework for television broadcasting"
diff --git a/media-libs/mutagen/Manifest b/media-libs/mutagen/Manifest
index 2fdd743031f9..fe188a984d5a 100644
--- a/media-libs/mutagen/Manifest
+++ b/media-libs/mutagen/Manifest
@@ -1,3 +1,5 @@
 DIST mutagen-1.45.1.tar.gz 1285455 BLAKE2B a1e29698d96b4c98f16e18dd8b3f902e41dcc4409d01da861a726a6a9fbd7f116e07b4e1872b8b3857f0eec080d18bac736de741635746f5c71416a3a8ef6e78 SHA512 c5244efa01b9de5ec22ceca39e55f34b933ca4a5bec0f2088fd3adca657f0230cbe85cd5e156db1d90fb44d9339bc94dc3bdcd3e49f1b0d46bc3d71ece6b45d8
+DIST mutagen-1.46.0.tar.gz 1268561 BLAKE2B 44e0dbbc1c102521569a91386a9d807f3ad82ffb96a5e3f76958551d173d00c7095fa6a2668a0a418bfdda31be5c3bb175856b2278719007bf7af866c732dc40 SHA512 52ab7408af46e54e79f1d157a3f6114e2606c6a55eb46fdd314dff82d6d586c2c22294b181a432581230dee566c79554456a9435a8e1188a91f4ae000644ae71
 EBUILD mutagen-1.45.1.ebuild 931 BLAKE2B 1ccc00abf9c6bca45df253155c009fcc219824487efdcab796db621efb6797bd28e080126a7ac9a6650347448d153c7ee9b53989fd798214fe4842611efe7dfa SHA512 84a5baa590c4ba2cb5f05849498e42a85ac05073783c9dbcaacf08d29a5d94a9bc1c55cd29a731b592405b8560e0341a0303e47d21d647242645b8cb03d7b16e
-MISC metadata.xml 381 BLAKE2B 9c8f321d4969c2971c82ab2df255d101601b05b688599cadc81ae6a5ce9f0977b0e75cf54d7a72ac306338b3288de9ce5160f3dc8979c14b57e8fe9cb606fd4e SHA512 8cdb18da38b5866f5b54b662a028e96c2db78eed5dc412cb68b0cb41c6d3aa514aa20dda14653fd439c8858031962412830029e3354cb29ec0794126696b0177
+EBUILD mutagen-1.46.0.ebuild 828 BLAKE2B e5cadbbb1e0aa05d005d987dba3f5595b5b61c1e5050f53c1213823af49d24fd11b18942b088be897004fe5a4b6423b4195d6c1e9b34c22d561603021707782d SHA512 135ca1d8a0d798e2a2672bc2ec02a95bef230ee5c108f066a365c0b08e37db49bb08e9e4a5c1f160feca37b24703b73b02601640f2ff2b47d3f54864969fc441
+MISC metadata.xml 482 BLAKE2B 3ae30f618d887acb7bcabfb63ceafd422ee356b1a2f0b812dd51196e1a3e4f5afd6fc2c5fb36ff137060d710a8a7e1800ff25e2246a6dd4bb5dc3301cd559171 SHA512 13450efc95ce24cacf3c882c78acb2605c10bd803e1b63a700bd6a7bff103946f905ef39e15bc2b86e7302940c7b0a6fe9a5767c8de51f77ee1f11cfc31bfa6f
diff --git a/media-libs/mutagen/metadata.xml b/media-libs/mutagen/metadata.xml
index a1a48b57a317..62779eccebd2 100644
--- a/media-libs/mutagen/metadata.xml
+++ b/media-libs/mutagen/metadata.xml
@@ -5,6 +5,10 @@
 		<email>sound@gentoo.org</email>
 		<name>Gentoo Sound project</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">quodlibet/mutagen</remote-id>
 		<remote-id type="pypi">mutagen</remote-id>
diff --git a/media-libs/mutagen/mutagen-1.46.0.ebuild b/media-libs/mutagen/mutagen-1.46.0.ebuild
new file mode 100644
index 000000000000..8a145e8453da
--- /dev/null
+++ b/media-libs/mutagen/mutagen-1.46.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Audio metadata tag reader and writer implemented in pure Python"
+HOMEPAGE="
+	https://github.com/quodlibet/mutagen/
+	https://pypi.org/project/mutagen/
+"
+SRC_URI="
+	https://github.com/quodlibet/mutagen/releases/download/release-${PV}/${P}.tar.gz
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+BDEPEND="
+	test? (
+		dev-python/eyeD3[${PYTHON_USEDEP}]
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+		media-libs/flac[ogg]
+	)
+"
+
+DOCS=( NEWS README.rst )
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs \
+	dev-python/sphinx_rtd_theme
diff --git a/media-libs/openh264/Manifest b/media-libs/openh264/Manifest
index 518b09c274de..4438da51bdfa 100644
--- a/media-libs/openh264/Manifest
+++ b/media-libs/openh264/Manifest
@@ -3,5 +3,5 @@ DIST gmp-api-Firefox39-3a01c086d1b0394238ff1b5ad22e76022830625a.tar.gz 10464 BLA
 DIST openh264-2.3.0.tar.gz 60290792 BLAKE2B 08aa571471188c72bb0f098fa1cfaf9ba46ee4311f50518de868a2d7bbd61d9d4547cf5d33b3140d56c09a1ea7ea411bfaa96ed960e159876e6cc803f081b5d3 SHA512 5f0ccbb3c0026a010d9830e973312486f9d5ea8152afa3653ab6b3c43906a1169cebea70532134c1624846cc03b586e85b12cfd0621af505bd532a7dd833defd
 DIST openh264-2.3.1.tar.gz 60290897 BLAKE2B b4480150cfe7c44b89c7b294698db06f93d96f5f9f3ef4345108c4e360e99bc6133407cead54e720e6e74aa17ab9f2e4342287a42f19463a54eb44c9d3141c80 SHA512 fd59c767794cdfb934d692d5929e4500d78606cbf1e403bc7c7dce048cc07e40daa0794357adb856d29479427a53460c76338e156b6bbeaa36139afcd603c8e1
 EBUILD openh264-2.3.0.ebuild 3618 BLAKE2B 9ea4acd09a5c2281a99a576974bf3d0348fd54377349a68fb94ff983051a6f27a4a59c8b756124e48cdab8e92dfa336558e804ab80da4fd15cb271428de45977 SHA512 6cc32135588b0da11776558c210e7bc8ddca89f4028d4ad1fe283c046b08b058eac6404320937f7d1c6e3ac17fbaa14f7f04f505a1915d68fa2b393c72691efa
-EBUILD openh264-2.3.1-r1.ebuild 3623 BLAKE2B 3a4c1e50359f39669d29585fe98f47a14654eb787dc566683e0217e90d4608b5617af3361f4f1adc346584ad4405a6f6e716b8558967ff34b0d6f64a600b99af SHA512 a6ae0f64244a1a8d69c09c091485f865542f42f11159da9bff5b3f88ce5e0e95c6cb2373028ad7fd4be87029932f2b1d530a746492643be6fc20b67d79d51ab1
+EBUILD openh264-2.3.1-r1.ebuild 3620 BLAKE2B f43833f7de692821e2a4fae79e18c0014d1d53d45d7e04d4ed5210e53afdb487c4693652b050a72548252f2042974792090c942a119d64f5e4f66afebbaf484e SHA512 9f2daa4d865c432e23a14bc374beefd00b5e2f819da1b6ba6cf926c81f9db6e2c8efaba0609ed7bfbab7687dfeda80e1499b89722acbe01bae6730a36d20111b
 MISC metadata.xml 569 BLAKE2B 14a021fba978f0156bab46178d05a6b9f8f67fdeba784d587759207fe60ea1d74a383eec3fc40662c39d33fcecb71d8cafe7eb6354383c253e0a3f7f1e94feae SHA512 ceb77117c6a50f16640b329368c86db26127b8e501475dbaca4c53ba41315b0fc7161f6d9268cb86d1f6dbf2cf867e2bb0e6b5f45240ab3227b99b734c344efd
diff --git a/media-libs/openh264/openh264-2.3.1-r1.ebuild b/media-libs/openh264/openh264-2.3.1-r1.ebuild
index c22e0eb1cf9e..26d476618bba 100644
--- a/media-libs/openh264/openh264-2.3.1-r1.ebuild
+++ b/media-libs/openh264/openh264-2.3.1-r1.ebuild
@@ -18,7 +18,7 @@ LICENSE="BSD"
 # (2.2.0 needed a minor bump due to undocumented but breaking ABI changes, just to be sure.
 #  https://github.com/cisco/openh264/issues/3459 )
 SLOT="0/7"
-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="cpu_flags_arm_neon cpu_flags_x86_avx2 +plugin utils"
 
 RESTRICT="bindist test"
diff --git a/media-radio/Manifest.gz b/media-radio/Manifest.gz
index aefc3152ca22..ea55c3059cb7 100644
Binary files a/media-radio/Manifest.gz and b/media-radio/Manifest.gz differ
diff --git a/media-radio/fldigi/Manifest b/media-radio/fldigi/Manifest
index cbbfcfec5f03..dce08915ca1f 100644
--- a/media-radio/fldigi/Manifest
+++ b/media-radio/fldigi/Manifest
@@ -3,5 +3,5 @@ AUX fldigi-drop-nullptr-definition.patch 596 BLAKE2B d258036b22f597d82b6a66ecadb
 DIST fldigi-4.1.22.tar.gz 4934496 BLAKE2B 9db73c51acba4fe521c9acc90a7dcd5728aae8a0bf596c6d10831de2ba66bb1661bdff0be499585379db6951cc4312aae27491681b3325da41d36ae1dcae003a SHA512 e5b724afdd16b25d366ccfc549b4c39e7eed58c19fbf189d53bade0e27695d63124c5a1e02df7e256ce5ce145e85ba77e86da357faa6ccda8167c20698e70536
 DIST fldigi-4.1.23.tar.gz 4933875 BLAKE2B 73c9598d73e3f8f4a4299edebf687254830196d81470b4563bc530b0434e7b8beb6d9d0cbbd97029fba2da3491ec354f3fc723045e4691b60db7d03666624a07 SHA512 c01d579fb23325f097969cbb93bd488c8e0c61ef552097166c902a56ce119d7c20694df5cd76ae9b2cb485d68570720745d961b1f1dd9918c6f466f0441005fb
 EBUILD fldigi-4.1.22.ebuild 1531 BLAKE2B 938178cdec741635a08bac4d3a3fa4a2fd784c69f57f184c09738099762b0f79a668ce54c521064b0b0279f237458651fc8a66a8e9754a7261a9fc0e1266c069 SHA512 cb5bc9030ce0ecab467b5207663b3e34172025a8c53b6186589a0e10c08f36b1debdb8fe56b69f1b2a0c13093caf2169a0c15d3a7d980fd6c16b7fda213faa5e
-EBUILD fldigi-4.1.23.ebuild 1533 BLAKE2B ca6d7c7be1585efa8dcc4c6b21b3ebbc90b3ba7861021abe22497aef3a576afd990c084951405478044d93df1d5255b8ccc8c1a4bbe419438db31a289b7a3dda SHA512 d6c74dc8fdf4154f620fffa9e143324621a24a3bc860d4e56dba00ab97baba3fd74ebc4abb2429b171d5722bb94a387006a361c94ca70515afa1fbb63afd103c
+EBUILD fldigi-4.1.23.ebuild 1531 BLAKE2B 938178cdec741635a08bac4d3a3fa4a2fd784c69f57f184c09738099762b0f79a668ce54c521064b0b0279f237458651fc8a66a8e9754a7261a9fc0e1266c069 SHA512 cb5bc9030ce0ecab467b5207663b3e34172025a8c53b6186589a0e10c08f36b1debdb8fe56b69f1b2a0c13093caf2169a0c15d3a7d980fd6c16b7fda213faa5e
 MISC metadata.xml 548 BLAKE2B c527aea6c74ff1af56467b594775abdd47e6c57b0f1772013a38f941a5ca32eae9edebf2224c0f435a3f3ca6cbe076d1e33996f66d81e25504e2bd66e04cb9ad SHA512 200dba843700a8361c0f1367038a24c2d8d1389ad6bb36a609543272b44ae672118ab9c74ab7a63036b2bb130a1a288487a204b187e1780dc2bef132e6a1511d
diff --git a/media-radio/fldigi/fldigi-4.1.23.ebuild b/media-radio/fldigi/fldigi-4.1.23.ebuild
index 56b0232ac656..13f0cf746f6b 100644
--- a/media-radio/fldigi/fldigi-4.1.23.ebuild
+++ b/media-radio/fldigi/fldigi-4.1.23.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="hamlib nls pulseaudio"
 IUSE_CPU_FLAGS=" sse sse2 sse3"
 IUSE+=" ${IUSE_CPU_FLAGS// / cpu_flags_x86_}"
diff --git a/media-radio/flrig/Manifest b/media-radio/flrig/Manifest
index 131bf47d0ddb..a9f25803ee05 100644
--- a/media-radio/flrig/Manifest
+++ b/media-radio/flrig/Manifest
@@ -2,5 +2,5 @@ AUX flrig-1.4.4-musl.patch 618 BLAKE2B e03367cea46747325ab98a9a9b2a7bb2b977e21e4
 DIST flrig-1.4.5.tar.gz 995774 BLAKE2B 7853c38521c880cd0b1622dae339f6e5120ca9679e7f661e9b0aacc9b3bb12708c3c9a8b1204db0ebe69358bf0dd0daa0a5989163cc304b43c6906cc1872da4d SHA512 f4bd283900975f59b82208e21d9258b25901ed893e339cfc80eb27ce464439eb9df7b04af855a2c87b73cc477d327f965fd48d89589539bdf0da907078f765d3
 DIST flrig-1.4.7.tar.gz 1042848 BLAKE2B a1cb9ccd57466dc1d2b387dd8a4e9784f937a2f0227a0e394b10a25b40d06c4c9566dff2b4e5f7b09b5564b13b8fa604a0618f7909b992053f8d7ec6f0aa4c7c SHA512 6d213e15e0a81808491509e10c84e6f90b5f22483a9a327a4a1a56fdd1b773f2ddfa615470e5e5458747bf4d7a2087f2753951b25e6d2169dcf26aed7f50d87d
 EBUILD flrig-1.4.5.ebuild 687 BLAKE2B 6a5189e8370640126f1da49855a9740db51601e1abb79ff29b14b4a5653e8c6241feccf94f02ce154ff2816fdd2a754e23e903fadabff259a35a466c38b8c1a6 SHA512 18579a21e677849d922b9fa8499817bf7c08016087a7974b52203fe31288bac19f99a1a73dd16874e1ae271439dbc2966b3b9c41237c29820470a1da87d91cc9
-EBUILD flrig-1.4.7.ebuild 689 BLAKE2B 22709244f9771c7ba3439b2de9db42f271bc3277f633a1f83264a3240a1be25db62015e093afe8bb92ec67153b807b8baeaee8996c4e911d9aa0102557b2dbc6 SHA512 8721ad5ef799ca4490cc142fd925612778ffd7d2da15f64f5cd70ac2b28446d9c0e1d19109769340fa314e5d87a0b91a607312389397ab76111c6d711bf66a9f
+EBUILD flrig-1.4.7.ebuild 687 BLAKE2B 6a5189e8370640126f1da49855a9740db51601e1abb79ff29b14b4a5653e8c6241feccf94f02ce154ff2816fdd2a754e23e903fadabff259a35a466c38b8c1a6 SHA512 18579a21e677849d922b9fa8499817bf7c08016087a7974b52203fe31288bac19f99a1a73dd16874e1ae271439dbc2966b3b9c41237c29820470a1da87d91cc9
 MISC metadata.xml 326 BLAKE2B fb57e943fa61222b3967939ff95da7bb17aae2651e55d960a9c405e6d5965843ed0ec9e6fadd0df1f41602c0f3c90c78c6ca2ab12ea72b515484f7c2ec34ec68 SHA512 e48dc185e9eaa074ed92d1ed27920e41b72760cd3e878fd40583efdca0a6997598a7d82221a33c7987fb19dea090f92eee070b9e89ea452ddce028d88db7bf9c
diff --git a/media-radio/flrig/flrig-1.4.7.ebuild b/media-radio/flrig/flrig-1.4.7.ebuild
index 6dbb605b0a9c..81a737736eac 100644
--- a/media-radio/flrig/flrig-1.4.7.ebuild
+++ b/media-radio/flrig/flrig-1.4.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/fldigi/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="nls"
 
 DOCS=(AUTHORS ChangeLog README)
diff --git a/media-radio/tucnak/Manifest b/media-radio/tucnak/Manifest
index fd4b8bed3fa2..def7b126689a 100644
--- a/media-radio/tucnak/Manifest
+++ b/media-radio/tucnak/Manifest
@@ -1,5 +1,7 @@
 DIST tucnak-4.34.tar.gz 3596477 BLAKE2B 530b1e18167e7704b1596dc606f9c352fa761c6e3e060ff88e8dfb744c25faaf0b3840e89d2fad1747cb6dfd688f92222b4553731545d59d00dc8ad01f0c77bf SHA512 860c6887ba004d8efad8d6cd60951f744f772ca4ac6022a7f1b484eb43778eeba8f3426447b9a656dc321816e0b8dfb05906868e6122edaa26a7f3c2679ceb74
 DIST tucnak-4.36.tar.gz 3601081 BLAKE2B 76dfb5a319309203ef452e1e4faff5c47208b5c7f66fb63d9dbf45a6a3a63b35f788d0a05931db44965be6593c5eca1a26c23dcc50e79fd9a70446083f2644b1 SHA512 dee0c6b60ccd66b81257dbc04ead8b9a7df1a77a6c5a73503bcdf8012b8a59318ad8e96ba5a25d6e38ac995312acac23fdf62c5d6d2ad036bc029a691c1a350d
+DIST tucnak-4.37.tar.gz 3603639 BLAKE2B d7ddfc5aae62c4c9745777249940399c4d2945c37814f84785edb69ef266234da1ff91c60ea29c36ff22def727b9b0ae2fb940c5f7284c47e5971fd88e24c909 SHA512 7273da2cfdfa2e99cc7c1873a38ecf4da0efed7e79c75de6b38d502db732fdee62aef40112cea134a7b1551b72b7ed16ab437979b00a0fc02478ced8f3cecf07
 EBUILD tucnak-4.34.ebuild 1959 BLAKE2B a7928ea7a30bedf9441e446ef60fcf4bcc93bba2eafba11c12d5d87dd315ab304b8b04c4129a0e48afc7b766b21114dd19f3a14a3f4c62d660340b9dac6c8218 SHA512 98d2528e8e512f556b50ee327d7087cbf0631a1bef683e704d46adea872aca87ddfa62054d32b46053aee1657cfa6a16d2ebba762803222fb18aa6600323a882
 EBUILD tucnak-4.36.ebuild 1959 BLAKE2B a7928ea7a30bedf9441e446ef60fcf4bcc93bba2eafba11c12d5d87dd315ab304b8b04c4129a0e48afc7b766b21114dd19f3a14a3f4c62d660340b9dac6c8218 SHA512 98d2528e8e512f556b50ee327d7087cbf0631a1bef683e704d46adea872aca87ddfa62054d32b46053aee1657cfa6a16d2ebba762803222fb18aa6600323a882
+EBUILD tucnak-4.37.ebuild 1961 BLAKE2B 8320da5011bc2ac9a99e038b903188dd522c9b7603a9b945d9758cdc9b2eb0eff95dabeeb69495e5c3d41468609c0aa95ac8a23446f241f6673cc1ca8d16aea2 SHA512 0345a92132138039c52788cf7fcf6c0e8da5adfd293bb6788d7de51b280eb9ab79920d20b47eaf7eef7dfd1255528ced294be282519f4e04f4351104fdc47cb2
 MISC metadata.xml 409 BLAKE2B 8179722b95bb5d639bbf3755eac5ec6d3a2492d117a9af0edd5aba1910974f7ca99c35bf759f9c44a6ee59d18a4b7088c1f009abf0dbdfbafd04f6c3a6875b3a SHA512 e07f3bbf055dfafb6d6fb2596fe20bdb0aaccb8960fc5d1ad5ea372a51baafb75458571729f99afc1086fcc596aa35cd22aafbc9af4d422dba2aba1243c93422
diff --git a/media-radio/tucnak/tucnak-4.37.ebuild b/media-radio/tucnak/tucnak-4.37.ebuild
new file mode 100644
index 000000000000..358be0cafa27
--- /dev/null
+++ b/media-radio/tucnak/tucnak-4.37.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit autotools flag-o-matic
+
+DESCRIPTION="Amateur Radio VHF Contest Logbook"
+HOMEPAGE="http://tucnak.nagano.cz"
+SRC_URI="http://tucnak.nagano.cz/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa fftw gpm hamlib suid"
+
+RDEPEND="dev-libs/glib:2
+	dev-libs/libzia
+	media-libs/libsndfile
+	>=media-libs/libsdl-1.2
+	alsa? ( media-libs/alsa-lib )
+	fftw? ( sci-libs/fftw:3.0 )
+	gpm? ( sys-libs/gpm )
+	hamlib? ( media-libs/hamlib:= )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	eapply_user
+	# fix destop file
+	sed -i -e "s/HamRadio/HamRadio;/" share/applications/tucnak.desktop || die
+	# fix doc install path
+	sed -i -e "s/docsdir/# docsdir/" \
+		-e "s/docs_DATA =/# docs_DATA/" \
+		-e "s/EXTRA_DIST =/# EXTRA_DIST =/" Makefile.am doc/Makefile.am || die
+	eautoreconf
+}
+
+src_configure() {
+	append-ldflags -L/usr/$(get_libdir)/hamlib
+	econf $(use_with alsa) \
+		$(use_with gpm) $(use_with hamlib) \
+		$(use_with fftw fftw3)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc AUTHORS ChangeLog doc/NAVOD.pdf
+	if use suid ; then
+		fperms 4711 /usr/bin/soundwrapper
+	fi
+}
+
+pkg_postinst() {
+	elog "In order to use sound with tucnak add yourself to the 'audio' group"
+	elog "and to key your rig via the parport add yourself to the 'lp' group"
+	elog ""
+	elog "tucnak can be used with the following additional packages:"
+	elog "	   media-radio/cwdaemon  : Morse output via code cwdaemon"
+	elog "                             (No need to recompile)"
+	if use suid ; then
+		ewarn "You have choosen to install the little helper program 'soundwrapper'"
+		ewarn "setuid by setting USE=suid. That helper is only needed if you"
+		ewarn "want to use morse sidetone output via the PC speaker."
+		ewarn ""
+		ewarn "While the helper should be safe by design be aware that setting"
+		ewarn "any program setuid is a security risk."
+	fi
+}
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 69717c19f2fa..94e1e43eebdd 100644
Binary files a/media-sound/Manifest.gz and b/media-sound/Manifest.gz differ
diff --git a/media-sound/pavucontrol/Manifest b/media-sound/pavucontrol/Manifest
index 0bca57d6f4c7..c576cd28ba3e 100644
--- a/media-sound/pavucontrol/Manifest
+++ b/media-sound/pavucontrol/Manifest
@@ -1,3 +1,3 @@
 DIST pavucontrol-5.0.tar.xz 194248 BLAKE2B 9e6b9b7d94be51a4ad8b5310e031c4fed0f5299e67c770c9a573c0647edf27345014fb6504892fad29b9b5e79ce43ed312217dbed8e2b31b805f291531062903 SHA512 5673d783c2c819a68b49025c051bedd39f4caba446a479797b06569e24a96acc0924ba680d2416baff8c3211cfc7c94760d503900207fbe7c89c5cb2adaebec1
-EBUILD pavucontrol-5.0-r1.ebuild 832 BLAKE2B 1a30b574beadff9fac98c365ad33f369d48a196a3ae09863c0c442a4c58e00240bfbfe17572ceb550d6d964fb3ba22ad3abe71c6b88e089181fd6d61cf40c7cc SHA512 e6bce7c6a3f51220dc418c6380317634e8e8d0b8b9f82e276d330eec988f1fca719acc45971b7a94434acfaebbc6022d9f16fc9497ce490c598c80031c9c3cd5
+EBUILD pavucontrol-5.0-r1.ebuild 839 BLAKE2B e3372efdbd8a8bf0475706f528b8b7e1a4c6cd1e43a4e7625d26a4baeac7922381226a7af91ff6df989aafee03409d76a64a89b562f54824b34a3358d20d20b9 SHA512 9ed02142e21eccecfe2505c6634afbf5c7989d39af1b351e23d36db592db1f2d179ebd44057c829788eca78419bfc7fd7fc54c30aead54e97c584e81e36cf893
 MISC metadata.xml 250 BLAKE2B 3e6dae5d5f3b3ac412806dd8615a1975c7ea8a64bfd72ad54f2c93a9b24c19c620ac3e8b26e1f6cadec899443e138ee4fb7a82ecb83c784d0c03ee91854d8622 SHA512 2bfce2cf73aefce6dda06ea351cb93b2990b9543f48be1ae5406a5a5acf2c34faed1eb2ce715eb689eb50a9a1add5576b39232eb818c233f5a5589e16032aca8
diff --git a/media-sound/pavucontrol/pavucontrol-5.0-r1.ebuild b/media-sound/pavucontrol/pavucontrol-5.0-r1.ebuild
index d1aa59fa73e0..51ff1494a013 100644
--- a/media-sound/pavucontrol/pavucontrol-5.0-r1.ebuild
+++ b/media-sound/pavucontrol/pavucontrol-5.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="https://freedesktop.org/software/pulseaudio/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~hppa ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm ~arm64 ~hppa ~loong ppc ~ppc64 ~riscv ~sparc x86"
 IUSE="nls"
 
 RDEPEND="
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index befcf78f6555..f386acfe0163 100644
Binary files a/metadata/Manifest.gz and b/metadata/Manifest.gz differ
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index ab52cd2cd0a6..877fc60a9ed4 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Mon, 24 Oct 2022 11:39:39 +0000
+Wed, 26 Oct 2022 04:39:44 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index ae0baef0d13d..c80927c219be 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 530688 BLAKE2B 1384754019a41108cd5a577394c6aafe7ddaa1600e86ddd30f667b8ffcd2a271d1d63c110dd32bcc5d2cdf57213dc2ed2ad65288c00d7dd764fc88a2a5ad121f SHA512 08bf73bc99a66d9fbe7dcf764826772bf00488ab216fa1e39298dffc1fef683f7a82d65031193ede26cf629f7bb21ac7a709099a37a9c6772e7b4eacbf503986
-TIMESTAMP 2022-10-24T11:39:42Z
+TIMESTAMP 2022-10-26T04:39:48Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNWeX5fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNYuhRfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBIoQ/+Puir8h2jW0P2fvhHhxOKZ3DOLGMSAiqpHtRuvrEdgI7aikwCdCu3Jrz3
-MqohU5JyzaMQyazgMs6gcCd2Xqxr/YQSKGDO/iAh8HvagF9x71ETKdZsOySZqKC+
-Ie730pMOarSPF7hB9lnW5iZgiKejYmnVn/EmNkgpbdJreUq1OkaQESrpS+QWEO2r
-3d7nMbFku0IXh9ETU5jB1TwA2DjBCxfESpi+drBNBORp9h79sEQbVem7czMWBMQT
-nO81JtlIobEJMCWrBfgUPCK1gFKIx5lPg8eV9KRoZITIoi7oHC9m0SSAucP0vfyo
-Yc3uLrSr16vcoDzawtd8EZNtNZcXhDGfsunH7wjz5FE/YE+cmlRJKbQamghug2oz
-5nPefFej4b/zU9USRDpx+5rQdMX2t3ojUIxhzzD1yam/C5viSCZw3bQRNU8q3PSR
-IWn4y2ME0MEbS12+1xF/5NFCPMrlO6EzJXXphSF2bQDAU2ij4xi/6pC/hrQydy5G
-Oi5+AHky3Q72Y9+GIKc3ELnota0ol2OucGHgwOSqlCc1vGFyz0VznckiivE4Cet8
-vGfxKQYRu4APWrCGIFZ65NSvm73qlURpUj6d64KtM0JGRqVx/e5L3Rt+0DJj/s9/
-bV33A/CYTwSvOp6UHfHg1kOImnF8qQMdav6QefyXwRWspf7ux90=
-=7BhL
+klA8xA//T4tO4Peq+46Bvxt8nRIotcjBHWjhqcS1thPmnjRcHrGpfvPveJi7efCU
+/jBAHG1Gy9AD9o08U2IEa2zd0PQY1hTUSiezt2WtP/a+mK3wpDm8X2OcxvucuKki
+Ox2QzYf+cMSo0M3i1M0fuOsZwZ35OXfvk+9vImOvqlhYqtwJaAyLe/d5+f0Wt9ho
+NiQ4s8/RqL1/8M2H4LN1Te4YPo/RxVnPqralQynsxuLTYeBNf2SdkQMuAxIoHqoq
+csRce7z4vQrQ6oyfXbv/daIU18McmBSVey+ZoPxdQvF3dBJueY3LTgNFGoXbDqyD
+3jSZ8E7rHhjHwI/ZkGCcb7iYk6++qO7WCqMwrdmRJcSJXX840PH3bLfKn7i5JmHh
+1G4M9uGs4gADvzuM0UTxV3H4EzqwzxckoqKeek6OXExIHrTn4MS+eff6Xdjq++vi
+dZZbHx33ubyWyG6LPJQQsrlRXN1ozSSSit0TUXkp7rXZGsuI0/1/Nazi/lkagVSp
+or6wo8pdPRkShtQVxaX9QCLEJaSRB+IUxsGKkJaqG6t99hFG0J3XBTdUaTI0cazM
+AwomZL7u4FSuSIS+SxOwuRE1IM4PeWnKn1GcEp1Kdlf77M+Fhn97t/0kRk6F0RoC
+y5a8G40UYqeoglqdCGJ9ifEsA5HaBZlkOUhRzVDWm0K774sS/+s=
+=pnKZ
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index ab52cd2cd0a6..877fc60a9ed4 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Mon, 24 Oct 2022 11:39:39 +0000
+Wed, 26 Oct 2022 04:39:44 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index c710d1532caf..460c651bf3d4 100644
Binary files a/metadata/md5-cache/Manifest.gz and b/metadata/md5-cache/Manifest.gz differ
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index 22a37f2ada63..91da562de7d4 100644
Binary files a/metadata/md5-cache/app-admin/Manifest.gz and b/metadata/md5-cache/app-admin/Manifest.gz differ
diff --git a/metadata/md5-cache/app-admin/awscli-1.25.81 b/metadata/md5-cache/app-admin/awscli-1.25.81
deleted file mode 100644
index f3d316ab80ba..000000000000
--- a/metadata/md5-cache/app-admin/awscli-1.25.81
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pytest-forked[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/botocore-1.27.80[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !app-admin/awscli-bin >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,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_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~arm64 ~riscv x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/botocore-1.27.80[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !app-admin/awscli-bin python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/aws/aws-cli/archive/1.25.81.tar.gz -> aws-cli-1.25.81.gh.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=463e8ae8e3991c6811bd78c46e61afa6
diff --git a/metadata/md5-cache/app-admin/awscli-1.25.89 b/metadata/md5-cache/app-admin/awscli-1.25.89
index 66f971a324eb..2a2aec5199de 100644
--- a/metadata/md5-cache/app-admin/awscli-1.25.89
+++ b/metadata/md5-cache/app-admin/awscli-1.25.89
@@ -5,7 +5,7 @@ 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_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~riscv x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/botocore-1.27.88[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !app-admin/awscli-bin python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_8 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/aws/aws-cli/archive/1.25.89.tar.gz -> aws-cli-1.25.89.gh.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=d3e40343c65019dc8ca8907cf3ccfe5a
+_md5_=463e8ae8e3991c6811bd78c46e61afa6
diff --git a/metadata/md5-cache/app-admin/awscli-1.25.90 b/metadata/md5-cache/app-admin/awscli-1.25.90
deleted file mode 100644
index b0b4fe3cc6f9..000000000000
--- a/metadata/md5-cache/app-admin/awscli-1.25.90
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pytest-forked[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/botocore-1.27.89[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !app-admin/awscli-bin >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,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_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm64 ~riscv ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/botocore-1.27.89[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !app-admin/awscli-bin python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/aws/aws-cli/archive/1.25.90.tar.gz -> aws-cli-1.25.90.gh.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=d3e40343c65019dc8ca8907cf3ccfe5a
diff --git a/metadata/md5-cache/app-admin/awscli-1.25.91 b/metadata/md5-cache/app-admin/awscli-1.25.91
deleted file mode 100644
index 67ac31f64362..000000000000
--- a/metadata/md5-cache/app-admin/awscli-1.25.91
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pytest-forked[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/botocore-1.27.90[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !app-admin/awscli-bin >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,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_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm64 ~riscv ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/botocore-1.27.90[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !app-admin/awscli-bin python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/aws/aws-cli/archive/1.25.91.tar.gz -> aws-cli-1.25.91.gh.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=d3e40343c65019dc8ca8907cf3ccfe5a
diff --git a/metadata/md5-cache/app-admin/awscli-1.25.92 b/metadata/md5-cache/app-admin/awscli-1.25.92
deleted file mode 100644
index 52ebcd54147d..000000000000
--- a/metadata/md5-cache/app-admin/awscli-1.25.92
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pytest-forked[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/botocore-1.27.91[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !app-admin/awscli-bin >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,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_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm64 ~riscv ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/botocore-1.27.91[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !app-admin/awscli-bin python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/aws/aws-cli/archive/1.25.92.tar.gz -> aws-cli-1.25.92.gh.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=d3e40343c65019dc8ca8907cf3ccfe5a
diff --git a/metadata/md5-cache/app-admin/awscli-1.25.93 b/metadata/md5-cache/app-admin/awscli-1.25.93
deleted file mode 100644
index 8d118adeff32..000000000000
--- a/metadata/md5-cache/app-admin/awscli-1.25.93
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pytest-forked[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/botocore-1.27.92[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !app-admin/awscli-bin >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,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_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm64 ~riscv ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/botocore-1.27.92[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !app-admin/awscli-bin python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/aws/aws-cli/archive/1.25.93.tar.gz -> aws-cli-1.25.93.gh.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=d3e40343c65019dc8ca8907cf3ccfe5a
diff --git a/metadata/md5-cache/app-admin/awscli-1.25.94 b/metadata/md5-cache/app-admin/awscli-1.25.94
deleted file mode 100644
index b2d42fde5360..000000000000
--- a/metadata/md5-cache/app-admin/awscli-1.25.94
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pytest-forked[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/botocore-1.27.93[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !app-admin/awscli-bin >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,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_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm64 ~riscv ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/botocore-1.27.93[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !app-admin/awscli-bin python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/aws/aws-cli/archive/1.25.94.tar.gz -> aws-cli-1.25.94.gh.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=d3e40343c65019dc8ca8907cf3ccfe5a
diff --git a/metadata/md5-cache/app-admin/awscli-1.25.96 b/metadata/md5-cache/app-admin/awscli-1.25.96
deleted file mode 100644
index 74daed339629..000000000000
--- a/metadata/md5-cache/app-admin/awscli-1.25.96
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pytest-forked[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/botocore-1.27.95[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !app-admin/awscli-bin >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,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_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm64 ~riscv ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/botocore-1.27.95[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !app-admin/awscli-bin python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/aws/aws-cli/archive/1.25.96.tar.gz -> aws-cli-1.25.96.gh.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=d3e40343c65019dc8ca8907cf3ccfe5a
diff --git a/metadata/md5-cache/app-admin/awscli-1.26.0 b/metadata/md5-cache/app-admin/awscli-1.26.0
new file mode 100644
index 000000000000..0d74e3f1635b
--- /dev/null
+++ b/metadata/md5-cache/app-admin/awscli-1.26.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/pytest-forked[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/botocore-1.28.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !app-admin/awscli-bin >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,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_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm64 ~riscv ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/botocore-1.28.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !app-admin/awscli-bin python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/aws/aws-cli/archive/1.26.0.tar.gz -> aws-cli-1.26.0.gh.tar.gz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=3d0c469e2cf6687c02cfec2685e84498
diff --git a/metadata/md5-cache/app-admin/awscli-1.26.1 b/metadata/md5-cache/app-admin/awscli-1.26.1
new file mode 100644
index 000000000000..ca48d50f41e8
--- /dev/null
+++ b/metadata/md5-cache/app-admin/awscli-1.26.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/pytest-forked[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/botocore-1.28.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !app-admin/awscli-bin >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,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_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm64 ~riscv ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/botocore-1.28.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !app-admin/awscli-bin python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/aws/aws-cli/archive/1.26.1.tar.gz -> aws-cli-1.26.1.gh.tar.gz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=3d0c469e2cf6687c02cfec2685e84498
diff --git a/metadata/md5-cache/app-admin/rsyslog-8.2210.0 b/metadata/md5-cache/app-admin/rsyslog-8.2210.0-r1
similarity index 99%
rename from metadata/md5-cache/app-admin/rsyslog-8.2210.0
rename to metadata/md5-cache/app-admin/rsyslog-8.2210.0-r1
index 21f1608a902d..02666cb315a4 100644
--- a/metadata/md5-cache/app-admin/rsyslog-8.2210.0
+++ b/metadata/md5-cache/app-admin/rsyslog-8.2210.0-r1
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.rsyslog.com/files/download/rsyslog/rsyslog-8.2210.0.tar.gz doc? ( https://www.rsyslog.com/files/download/rsyslog/rsyslog-doc-8.2210.0.tar.gz )
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	bbfa385d6907d7948d49a5e107bd654d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=1f3916f987a0cd8b57a94eadf3dbe8f9
+_md5_=6fbfff07d4b9266c9e2bb463ef65bd6c
diff --git a/metadata/md5-cache/app-admin/sudo-1.9.12 b/metadata/md5-cache/app-admin/sudo-1.9.12
new file mode 100644
index 000000000000..c2f3c2562f5c
--- /dev/null
+++ b/metadata/md5-cache/app-admin/sudo-1.9.12
@@ -0,0 +1,16 @@
+BDEPEND=verify-sig? ( sec-keys/openpgp-keys-sudo ) sys-devel/bison virtual/pkgconfig >=app-portage/elt-patches-20170815 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=configure install postinst prepare unpack
+DEPEND=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] )
+DESCRIPTION=Allows users or groups to run commands as other users
+EAPI=8
+HOMEPAGE=https://www.sudo.ws/
+INHERIT=pam libtool tmpfiles toolchain-funcs verify-sig
+IUSE=gcrypt ldap nls offensive pam sasl +secure-path selinux +sendmail skey ssl sssd verify-sig
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~sparc-solaris
+LICENSE=ISC BSD
+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
+SRC_URI=https://www.sudo.ws/sudo/dist/sudo-1.9.12.tar.gz ftp://ftp.sudo.ws/pub/sudo/sudo-1.9.12.tar.gz verify-sig? ( https://www.sudo.ws/sudo/dist/sudo-1.9.12.tar.gz.sig ftp://ftp.sudo.ws/pub/sudo/sudo-1.9.12.tar.gz.sig )
+_eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pam	e44a1dd98f13e1ad76de01e919bde1f1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	0748d665fa664a87add00152ed046e16
+_md5_=a36fba36cb9a635a3bee2b76ff149557
diff --git a/metadata/md5-cache/app-admin/system-config-printer-1.5.18 b/metadata/md5-cache/app-admin/system-config-printer-1.5.18
index abe723bc19bc..cf180c444a6f 100644
--- a/metadata/md5-cache/app-admin/system-config-printer-1.5.18
+++ b/metadata/md5-cache/app-admin/system-config-printer-1.5.18
@@ -1,18 +1,18 @@
 BDEPEND=virtual/pkgconfig virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst postrm preinst setup
-DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8[xml(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9[xml(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10[xml(+)] ) dev-libs/glib:2 net-print/cups[dbus] virtual/libusb:1 >=virtual/udev-172 x11-libs/gtk+:3[introspection] x11-libs/libnotify[introspection] x11-libs/pango[introspection] app-text/docbook-xml-dtd:4.1.2 >=app-text/xmlto-0.0.22 dev-perl/XML-Parser dev-util/desktop-file-utils >=sys-devel/gettext-0.20 virtual/pkgconfig
+DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8[xml(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9[xml(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10[xml(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[xml(+)] ) dev-libs/glib:2 net-print/cups[dbus] virtual/libusb:1 >=virtual/udev-172 x11-libs/gtk+:3[introspection] x11-libs/libnotify[introspection] x11-libs/pango[introspection] app-text/docbook-xml-dtd:4.1.2 >=app-text/xmlto-0.0.22 dev-perl/XML-Parser dev-util/desktop-file-utils >=sys-devel/gettext-0.20 virtual/pkgconfig
 DESCRIPTION=Graphical user interface for CUPS administration
 EAPI=8
 HOMEPAGE=https://github.com/OpenPrinting/system-config-printer
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=python-single-r1 systemd udev xdg
-IUSE=gnome-keyring policykit python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+IUSE=gnome-keyring policykit python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=GPL-2+
-RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8[xml(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9[xml(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10[xml(+)] ) dev-libs/glib:2 net-print/cups[dbus] virtual/libusb:1 >=virtual/udev-172 x11-libs/gtk+:3[introspection] x11-libs/libnotify[introspection] x11-libs/pango[introspection] python_single_target_python3_8? ( dev-python/dbus-python[python_targets_python3_8(-)] dev-python/pycairo[python_targets_python3_8(-)] dev-python/pycups[python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] dev-python/requests[python_targets_python3_8(-)] dev-python/urllib3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/dbus-python[python_targets_python3_9(-)] dev-python/pycairo[python_targets_python3_9(-)] dev-python/pycups[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] dev-python/urllib3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/dbus-python[python_targets_python3_10(-)] dev-python/pycairo[python_targets_python3_10(-)] dev-python/pycups[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] dev-python/requests[python_targets_python3_10(-)] dev-python/urllib3[python_targets_python3_10(-)] ) gnome-keyring? ( app-crypt/libsecret[introspection] ) policykit? ( net-print/cups-pk-helper )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
+RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8[xml(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9[xml(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10[xml(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[xml(+)] ) dev-libs/glib:2 net-print/cups[dbus] virtual/libusb:1 >=virtual/udev-172 x11-libs/gtk+:3[introspection] x11-libs/libnotify[introspection] x11-libs/pango[introspection] python_single_target_python3_8? ( dev-python/dbus-python[python_targets_python3_8(-)] dev-python/pycairo[python_targets_python3_8(-)] dev-python/pycups[python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] dev-python/requests[python_targets_python3_8(-)] dev-python/urllib3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/dbus-python[python_targets_python3_9(-)] dev-python/pycairo[python_targets_python3_9(-)] dev-python/pycups[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] dev-python/urllib3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/dbus-python[python_targets_python3_10(-)] dev-python/pycairo[python_targets_python3_10(-)] dev-python/pycups[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] dev-python/requests[python_targets_python3_10(-)] dev-python/urllib3[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/dbus-python[python_targets_python3_11(-)] dev-python/pycairo[python_targets_python3_11(-)] dev-python/pycups[python_targets_python3_11(-)] dev-python/pygobject:3[python_targets_python3_11(-)] dev-python/requests[python_targets_python3_11(-)] dev-python/urllib3[python_targets_python3_11(-)] ) gnome-keyring? ( app-crypt/libsecret[introspection] ) policykit? ( net-print/cups-pk-helper )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/OpenPrinting/system-config-printer/releases/download/v1.5.18/system-config-printer-1.5.18.tar.xz
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	udev	eec0bbab06977f1cfc5597269c1fa152	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=5d72b99abed79cb20ab425a17201c2c8
+_md5_=03fff8426b3379401f30df1850f60a57
diff --git a/metadata/md5-cache/app-admin/xtail-2.1_p8 b/metadata/md5-cache/app-admin/xtail-2.1_p8
index bda7eaed4ed2..b99a2b6708d8 100644
--- a/metadata/md5-cache/app-admin/xtail-2.1_p8
+++ b/metadata/md5-cache/app-admin/xtail-2.1_p8
@@ -4,9 +4,9 @@ DESCRIPTION=Tail multiple logfiles at once, even if rotated
 EAPI=8
 HOMEPAGE=http://www.unicom.com/sw/xtail/
 INHERIT=autotools toolchain-funcs
-KEYWORDS=~amd64 ~ppc ~sparc ~x86
+KEYWORDS=amd64 ~ppc sparc x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=http://www.unicom.com/sw/xtail/xtail-2.1.tar.gz http://www.unicom.com/files/20120219-patch-aalto.zip mirror://debian/pool/main/x/xtail/xtail_2.1-8.debian.tar.xz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=ef5dd6bc8291b82758f61d9cfa80df53
+_md5_=1ffb97d078038903c9ff7b9893203aee
diff --git a/metadata/md5-cache/app-arch/Manifest.gz b/metadata/md5-cache/app-arch/Manifest.gz
index 03541fcfd120..22ad2816884f 100644
Binary files a/metadata/md5-cache/app-arch/Manifest.gz and b/metadata/md5-cache/app-arch/Manifest.gz differ
diff --git a/metadata/md5-cache/app-arch/brotli-1.0.9-r5 b/metadata/md5-cache/app-arch/brotli-1.0.9-r5
index 823063283ce5..587bf0076ddc 100644
--- a/metadata/md5-cache/app-arch/brotli-1.0.9-r5
+++ b/metadata/md5-cache/app-arch/brotli-1.0.9-r5
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/google/brotli/
 INHERIT=cmake-multilib distutils-r1
 IUSE=python 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 python_targets_pypy3 python_targets_python3_8 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 ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
 LICENSE=MIT python? ( Apache-2.0 )
 RDEPEND=python? ( python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) )
 REQUIRED_USE=python? ( || ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 ) )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=https://github.com/google/brotli/archive/v1.0.9.tar.gz -> brotli-1.0.9.tar.gz test? ( https://dev.gentoo.org/~mgorny/dist/brotli-1.0.9.testdata.tar.xz )
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	flag-o-matic	29a755b1291d64133634d80b0328f153	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=7e6c12b93e847c13ab0464cd3a376286
+_md5_=03bf4f808b9091c968114bb3373f34f7
diff --git a/metadata/md5-cache/app-arch/bzip3-1.1.5 b/metadata/md5-cache/app-arch/bzip3-1.1.5
index 34bde393c0d2..836027c04229 100644
--- a/metadata/md5-cache/app-arch/bzip3-1.1.5
+++ b/metadata/md5-cache/app-arch/bzip3-1.1.5
@@ -3,9 +3,9 @@ DESCRIPTION=A better and stronger spiritual successor to BZip2
 EAPI=8
 HOMEPAGE=https://github.com/kspalaiologos/bzip3
 INHERIT=toolchain-funcs
-KEYWORDS=~amd64 ~arm64 ~loong ~x86
+KEYWORDS=amd64 arm64 ~loong ~x86
 LICENSE=LGPL-3+
 SLOT=0
 SRC_URI=https://github.com/kspalaiologos/bzip3/releases/download/1.1.5/bzip3-1.1.5.tar.xz
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=49e77d16744f08d232de972e545a4559
+_md5_=6d73ebf4dde557b72343977901882e77
diff --git a/metadata/md5-cache/app-arch/bzip3-1.1.4 b/metadata/md5-cache/app-arch/bzip3-1.1.8
similarity index 94%
rename from metadata/md5-cache/app-arch/bzip3-1.1.4
rename to metadata/md5-cache/app-arch/bzip3-1.1.8
index 198668773048..4f58fc1b0aa9 100644
--- a/metadata/md5-cache/app-arch/bzip3-1.1.4
+++ b/metadata/md5-cache/app-arch/bzip3-1.1.8
@@ -6,6 +6,6 @@ INHERIT=toolchain-funcs
 KEYWORDS=~amd64 ~arm64 ~loong ~x86
 LICENSE=LGPL-3+
 SLOT=0
-SRC_URI=https://github.com/kspalaiologos/bzip3/releases/download/1.1.4/bzip3-1.1.4.tar.xz
+SRC_URI=https://github.com/kspalaiologos/bzip3/releases/download/1.1.8/bzip3-1.1.8.tar.xz
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
 _md5_=49e77d16744f08d232de972e545a4559
diff --git a/metadata/md5-cache/app-arch/engrampa-1.26.0 b/metadata/md5-cache/app-arch/engrampa-1.26.0
new file mode 100644
index 000000000000..15eb00e25261
--- /dev/null
+++ b/metadata/md5-cache/app-arch/engrampa-1.26.0
@@ -0,0 +1,15 @@
+BDEPEND=app-text/yelp-tools dev-util/glib-utils >=sys-devel/gettext-0.19.8 virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils sys-devel/gnuconfig || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/glib-2.50:2 >=dev-libs/json-glib-0.14 virtual/libintl x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.22:3[X] x11-libs/libSM x11-libs/pango caja? ( >=mate-base/caja-1.17.1 ) magic? ( sys-apps/file ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=mate-base/mate-common-1.26
+DESCRIPTION=Engrampa archive manager for MATE
+EAPI=7
+HOMEPAGE=https://mate-desktop.org/ https://github.com/mate-desktop/engrampa
+INHERIT=mate optfeature
+IUSE=caja magic
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~riscv ~x86
+LICENSE=FDL-1.1+ GPL-2+ LGPL-2+
+RDEPEND=>=dev-libs/glib-2.50:2 >=dev-libs/json-glib-0.14 virtual/libintl x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.22:3[X] x11-libs/libSM x11-libs/pango caja? ( >=mate-base/caja-1.17.1 ) magic? ( sys-apps/file ) virtual/libintl
+SLOT=0
+SRC_URI=https://pub.mate-desktop.org/releases/1.26/engrampa-1.26.0.tar.xz
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	mate	e29617c33d6e271931938d0073817dde	mate-desktop.org	0da897c64adb500292c6b9db3e424496	multilib	5ca4e49abed8e3a2f7b56920eadee157	optfeature	1a2157392a869265b2afcb63a26c12ac	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=f12b907b34532599818737ea4bd7d6f6
diff --git a/metadata/md5-cache/app-arch/rpm-4.17.1 b/metadata/md5-cache/app-arch/rpm-4.17.1
deleted file mode 100644
index f4a5c2dce928..000000000000
--- a/metadata/md5-cache/app-arch/rpm-4.17.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen ) nls? ( sys-devel/gettext ) test? ( sys-apps/fakechroot ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 dev-lang/perl test? ( virtual/perl-Test-Simple )
-DEFINED_PHASES=compile configure install postinst prepare pretend setup test
-DEPEND=!app-arch/rpm5 app-arch/libarchive:= >=app-arch/bzip2-1.0.1 app-arch/xz-utils >=app-crypt/gnupg-1.2 >=dev-lang/perl-5.8.8 dev-libs/elfutils dev-libs/libgcrypt:= >=dev-libs/popt-1.7 sys-apps/file >=sys-libs/zlib-1.2.3-r1 virtual/libintl lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) acl? ( virtual/acl ) audit? ( sys-process/audit ) caps? ( >=sys-libs/libcap-2.0 ) dbus? ( sys-apps/dbus ) sqlite? ( dev-db/sqlite:3 ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) ) nls? ( virtual/libintl ) zstd? ( app-arch/zstd:= ) dev-lang/perl
-DESCRIPTION=Red Hat Package Management Utils
-EAPI=8
-HOMEPAGE=https://rpm.org https://github.com/rpm-software-management/rpm
-INHERIT=autotools lua-single perl-module python-single-r1 toolchain-funcs
-IUSE=acl audit caps +berkdb doc dbus nls openmp python selinux +sqlite test +zstd lua_single_target_lua5-3 lua_single_target_lua5-4 test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2 LGPL-2
-RDEPEND=!app-arch/rpm5 app-arch/libarchive:= >=app-arch/bzip2-1.0.1 app-arch/xz-utils >=app-crypt/gnupg-1.2 >=dev-lang/perl-5.8.8 dev-libs/elfutils dev-libs/libgcrypt:= >=dev-libs/popt-1.7 sys-apps/file >=sys-libs/zlib-1.2.3-r1 virtual/libintl lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) acl? ( virtual/acl ) audit? ( sys-process/audit ) caps? ( >=sys-libs/libcap-2.0 ) dbus? ( sys-apps/dbus ) sqlite? ( dev-db/sqlite:3 ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) ) nls? ( virtual/libintl ) zstd? ( app-arch/zstd:= ) selinux? ( sec-policy/selinux-rpm ) dev-lang/perl:=
-REQUIRED_USE=^^ ( lua_single_target_lua5-3 lua_single_target_lua5-4 ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
-RESTRICT=test !test? ( test )
-SLOT=0
-SRC_URI=https://ftp.osuosl.org/pub/rpm/releases/rpm-4.17.x/rpm-4.17.1.tar.bz2 http://ftp.rpm.org/releases/rpm-4.17.x/rpm-4.17.1.tar.bz2
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	21a0cb6221498d0e7894bdf445b79887	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=b37ca2adc3c7f7fe9e988de273b45aa5
diff --git a/metadata/md5-cache/app-arch/rpm-4.18.0 b/metadata/md5-cache/app-arch/rpm-4.18.0
index 8a273141b61e..e40ce8a29b58 100644
--- a/metadata/md5-cache/app-arch/rpm-4.18.0
+++ b/metadata/md5-cache/app-arch/rpm-4.18.0
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://rpm.org/ https://github.com/rpm-software-management/rpm
 INHERIT=autotools lua-single perl-module python-single-r1 toolchain-funcs
 IUSE=acl audit caps +berkdb doc dbus nls openmp python readline selinux +sqlite test +zstd lua_single_target_lua5-3 lua_single_target_lua5-4 test python_single_target_python3_8 python_single_target_python3_9 python_single_target_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=GPL-2 LGPL-2
 RDEPEND=lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) !app-arch/rpm5 app-arch/libarchive:= >=app-arch/bzip2-1.0.1 app-arch/xz-utils >=app-crypt/gnupg-1.2 >=dev-lang/perl-5.8.8 dev-libs/elfutils dev-libs/libgcrypt:= >=dev-libs/popt-1.7 sys-apps/file >=sys-libs/zlib-1.2.3-r1 virtual/libintl acl? ( virtual/acl ) audit? ( sys-process/audit ) caps? ( >=sys-libs/libcap-2.0 ) dbus? ( sys-apps/dbus ) readline? ( sys-libs/readline:= ) sqlite? ( dev-db/sqlite:3 ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) ) nls? ( virtual/libintl ) zstd? ( app-arch/zstd:= ) selinux? ( sec-policy/selinux-rpm ) dev-lang/perl:=
 REQUIRED_USE=^^ ( lua_single_target_lua5-3 lua_single_target_lua5-4 ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
@@ -14,4 +14,4 @@ RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://ftp.osuosl.org/pub/rpm/releases/rpm-4.18.x/rpm-4.18.0.tar.bz2 http://ftp.rpm.org/releases/rpm-4.18.x/rpm-4.18.0.tar.bz2
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	21a0cb6221498d0e7894bdf445b79887	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=8ea2abb25e17b42309b8ee9d584aeb3d
+_md5_=4a8e3977563d7f2a8ece18ecab40cff3
diff --git a/metadata/md5-cache/app-backup/Manifest.gz b/metadata/md5-cache/app-backup/Manifest.gz
index 085ddf9a467e..3d3fe3625506 100644
Binary files a/metadata/md5-cache/app-backup/Manifest.gz and b/metadata/md5-cache/app-backup/Manifest.gz differ
diff --git a/metadata/md5-cache/app-backup/borgbackup-1.2.2 b/metadata/md5-cache/app-backup/borgbackup-1.2.2
deleted file mode 100644
index 0ea5a9d906f5..000000000000
--- a/metadata/md5-cache/app-backup/borgbackup-1.2.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools_scm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cython-0.29.29[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pkgconfig[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !!app-office/borg app-arch/lz4 virtual/acl dev-python/pyfuse3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ~dev-python/msgpack-1.0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-libs/openssl:0=
-DESCRIPTION=Deduplicating backup program with compression and authenticated encryption
-EAPI=8
-HOMEPAGE=https://borgbackup.readthedocs.io/
-INHERIT=distutils-r1
-IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=BSD
-RDEPEND=!!app-office/borg app-arch/lz4 virtual/acl dev-python/pyfuse3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ~dev-python/msgpack-1.0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-libs/openssl:0= python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-SLOT=0
-SRC_URI=mirror://pypi/b/borgbackup/borgbackup-1.2.2.tar.gz
-_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=800ee050b654c26e0bf61e4e815949e4
diff --git a/metadata/md5-cache/app-backup/borgbackup-1.2.2-r1 b/metadata/md5-cache/app-backup/borgbackup-1.2.2-r1
new file mode 100644
index 000000000000..26a8d910a061
--- /dev/null
+++ b/metadata/md5-cache/app-backup/borgbackup-1.2.2-r1
@@ -0,0 +1,16 @@
+BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools_scm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cython-0.29.29[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pkgconfig[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !!app-office/borg app-arch/lz4 virtual/acl dev-python/pyfuse3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ~dev-python/msgpack-1.0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-libs/openssl:0=
+DESCRIPTION=Deduplicating backup program with compression and authenticated encryption
+EAPI=8
+HOMEPAGE=https://borgbackup.readthedocs.io/
+INHERIT=distutils-r1 bash-completion-r1
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=BSD
+RDEPEND=!!app-office/borg app-arch/lz4 virtual/acl dev-python/pyfuse3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ~dev-python/msgpack-1.0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-libs/openssl:0= python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+SLOT=0
+SRC_URI=mirror://pypi/b/borgbackup/borgbackup-1.2.2.tar.gz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=158db26550e62a42fe25199adfd6f143
diff --git a/metadata/md5-cache/app-backup/borgmatic-1.7.2 b/metadata/md5-cache/app-backup/borgmatic-1.7.2
index 6153852905da..fce963a8a4a6 100644
--- a/metadata/md5-cache/app-backup/borgmatic-1.7.2
+++ b/metadata/md5-cache/app-backup/borgmatic-1.7.2
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://torsion.org/borgmatic/
 INHERIT=distutils-r1 systemd
 IUSE=test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~riscv
+KEYWORDS=amd64 ~arm ~arm64 ~riscv
 LICENSE=GPL-3
 RDEPEND=app-backup/borgbackup python_single_target_python3_8? ( <dev-python/colorama-0.5[python_targets_python3_8(-)] dev-python/jsonschema[python_targets_python3_8(-)] dev-python/requests[python_targets_python3_8(-)] <dev-python/ruamel-yaml-0.18.0[python_targets_python3_8(-)] dev-python/setuptools[python_targets_python3_8(-)] ) python_single_target_python3_9? ( <dev-python/colorama-0.5[python_targets_python3_9(-)] dev-python/jsonschema[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] <dev-python/ruamel-yaml-0.18.0[python_targets_python3_9(-)] dev-python/setuptools[python_targets_python3_9(-)] ) python_single_target_python3_10? ( <dev-python/colorama-0.5[python_targets_python3_10(-)] dev-python/jsonschema[python_targets_python3_10(-)] dev-python/requests[python_targets_python3_10(-)] <dev-python/ruamel-yaml-0.18.0[python_targets_python3_10(-)] dev-python/setuptools[python_targets_python3_10(-)] ) python_single_target_python3_11? ( <dev-python/colorama-0.5[python_targets_python3_11(-)] dev-python/jsonschema[python_targets_python3_11(-)] dev-python/requests[python_targets_python3_11(-)] <dev-python/ruamel-yaml-0.18.0[python_targets_python3_11(-)] dev-python/setuptools[python_targets_python3_11(-)] ) python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/borgmatic/borgmatic-1.7.2.tar.gz
 _eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=172a24f07f87e21209a805b70abe95ff
+_md5_=4fc50a9b626c276b8e93e20df58c30a0
diff --git a/metadata/md5-cache/app-backup/btrbk-0.31.3 b/metadata/md5-cache/app-backup/btrbk-0.31.3
deleted file mode 100644
index 5136728cae64..000000000000
--- a/metadata/md5-cache/app-backup/btrbk-0.31.3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile install postinst preinst
-DEPEND=doc? ( >=dev-ruby/asciidoctor-1.5.7 )
-DESCRIPTION=Tool for creating snapshots and remote backups of btrfs subvolumes
-EAPI=7
-HOMEPAGE=https://digint.ch/btrbk/
-INHERIT=systemd
-IUSE=+mbuffer +doc +lsbtr
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-3+
-RDEPEND=dev-lang/perl net-misc/openssh mbuffer? ( >=sys-block/mbuffer-20180505 ) >=sys-fs/btrfs-progs-4.12
-SLOT=0
-SRC_URI=https://digint.ch/download/btrbk/releases/btrbk-0.31.3.tar.xz
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=b1fe07abaabc1cc3ba48254b45e2e63e
diff --git a/metadata/md5-cache/app-backup/btrbk-0.32.0 b/metadata/md5-cache/app-backup/btrbk-0.32.0
deleted file mode 100644
index 732228fb8a97..000000000000
--- a/metadata/md5-cache/app-backup/btrbk-0.32.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile install postinst preinst
-DEPEND=doc? ( >=dev-ruby/asciidoctor-1.5.7 )
-DESCRIPTION=Tool for creating snapshots and remote backups of btrfs subvolumes
-EAPI=7
-HOMEPAGE=https://digint.ch/btrbk/
-INHERIT=systemd
-IUSE=+mbuffer +doc +lsbtr
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-3+
-RDEPEND=dev-lang/perl net-misc/openssh mbuffer? ( >=sys-block/mbuffer-20180505 ) >=sys-fs/btrfs-progs-4.12
-SLOT=0
-SRC_URI=https://digint.ch/download/btrbk/releases/btrbk-0.32.0.tar.xz
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=bcb1b62558cc5516369c1c48921dccd3
diff --git a/metadata/md5-cache/app-backup/btrbk-0.32.1 b/metadata/md5-cache/app-backup/btrbk-0.32.1
deleted file mode 100644
index 3580059c5ec3..000000000000
--- a/metadata/md5-cache/app-backup/btrbk-0.32.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile install postinst preinst
-DEPEND=doc? ( >=dev-ruby/asciidoctor-1.5.7 )
-DESCRIPTION=Tool for creating snapshots and remote backups of btrfs subvolumes
-EAPI=7
-HOMEPAGE=https://digint.ch/btrbk/
-INHERIT=systemd
-IUSE=+mbuffer +doc +lsbtr
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-3+
-RDEPEND=dev-lang/perl net-misc/openssh mbuffer? ( >=sys-block/mbuffer-20180505 ) >=sys-fs/btrfs-progs-4.12
-SLOT=0
-SRC_URI=https://digint.ch/download/btrbk/releases/btrbk-0.32.1.tar.xz
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=bcb1b62558cc5516369c1c48921dccd3
diff --git a/metadata/md5-cache/app-backup/btrbk-0.32.3 b/metadata/md5-cache/app-backup/btrbk-0.32.3
deleted file mode 100644
index f737045e60c2..000000000000
--- a/metadata/md5-cache/app-backup/btrbk-0.32.3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile install postinst preinst
-DEPEND=doc? ( >=dev-ruby/asciidoctor-1.5.7 )
-DESCRIPTION=Tool for creating snapshots and remote backups of btrfs subvolumes
-EAPI=8
-HOMEPAGE=https://digint.ch/btrbk/
-INHERIT=systemd
-IUSE=+mbuffer +doc +lsbtr
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-3+
-RDEPEND=dev-lang/perl net-misc/openssh mbuffer? ( >=sys-block/mbuffer-20180505 ) >=sys-fs/btrfs-progs-4.12
-SLOT=0
-SRC_URI=https://digint.ch/download/btrbk/releases/btrbk-0.32.3.tar.xz
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=651224f301e0272241351223dac9c53e
diff --git a/metadata/md5-cache/app-backup/btrbk-0.32.4 b/metadata/md5-cache/app-backup/btrbk-0.32.4
deleted file mode 100644
index 45c6c75df9b7..000000000000
--- a/metadata/md5-cache/app-backup/btrbk-0.32.4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile install postinst preinst
-DEPEND=doc? ( >=dev-ruby/asciidoctor-1.5.7 )
-DESCRIPTION=Tool for creating snapshots and remote backups of btrfs subvolumes
-EAPI=8
-HOMEPAGE=https://digint.ch/btrbk/
-INHERIT=systemd
-IUSE=+mbuffer +doc +lsbtr
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-3+
-RDEPEND=dev-lang/perl net-misc/openssh mbuffer? ( >=sys-block/mbuffer-20180505 ) >=sys-fs/btrfs-progs-4.12
-SLOT=0
-SRC_URI=https://digint.ch/download/btrbk/releases/btrbk-0.32.4.tar.xz
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=651224f301e0272241351223dac9c53e
diff --git a/metadata/md5-cache/app-backup/btrbk-0.32.2 b/metadata/md5-cache/app-backup/btrbk-0.32.5
similarity index 90%
rename from metadata/md5-cache/app-backup/btrbk-0.32.2
rename to metadata/md5-cache/app-backup/btrbk-0.32.5
index eca1c343cd4a..8061098753c7 100644
--- a/metadata/md5-cache/app-backup/btrbk-0.32.2
+++ b/metadata/md5-cache/app-backup/btrbk-0.32.5
@@ -10,6 +10,6 @@ KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=GPL-3+
 RDEPEND=dev-lang/perl net-misc/openssh mbuffer? ( >=sys-block/mbuffer-20180505 ) >=sys-fs/btrfs-progs-4.12
 SLOT=0
-SRC_URI=https://digint.ch/download/btrbk/releases/btrbk-0.32.2.tar.xz
+SRC_URI=https://digint.ch/download/btrbk/releases/btrbk-0.32.5.tar.xz
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
 _md5_=651224f301e0272241351223dac9c53e
diff --git a/metadata/md5-cache/app-containers/Manifest.gz b/metadata/md5-cache/app-containers/Manifest.gz
index 2bdb782c4bf2..4c6ae40b41b3 100644
Binary files a/metadata/md5-cache/app-containers/Manifest.gz and b/metadata/md5-cache/app-containers/Manifest.gz differ
diff --git a/metadata/md5-cache/app-containers/snapd-2.57.5 b/metadata/md5-cache/app-containers/snapd-2.57.5
new file mode 100644
index 000000000000..06f0bd4c3ab3
--- /dev/null
+++ b/metadata/md5-cache/app-containers/snapd-2.57.5
@@ -0,0 +1,18 @@
+BDEPEND=>=dev-lang/go-1.9 dev-python/docutils sys-devel/gettext sys-fs/xfsprogs sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 >=dev-lang/go-1.18 app-arch/unzip virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DEPEND=sys-libs/libseccomp:= apparmor? ( sec-policy/apparmor-profiles sys-apps/apparmor:= ) dev-libs/glib virtual/libudev systemd? ( sys-apps/systemd ) sys-libs/libcap:= sys-fs/squashfs-tools[lzma]
+DESCRIPTION=Service and tools for management of snap packages
+EAPI=7
+HOMEPAGE=http://snapcraft.io/
+INHERIT=autotools bash-completion-r1 flag-o-matic go-module linux-info readme.gentoo-r1 systemd xdg-utils
+IUSE=apparmor +forced-devmode gtk kde systemd
+KEYWORDS=~amd64
+LICENSE=GPL-3 Apache-2.0 BSD BSD-2 LGPL-3-with-linking-exception MIT
+PDEPEND=sys-auth/polkit[gtk?,kde?]
+RDEPEND=sys-libs/libseccomp:= apparmor? ( sec-policy/apparmor-profiles sys-apps/apparmor:= ) dev-libs/glib virtual/libudev systemd? ( sys-apps/systemd ) sys-libs/libcap:= sys-fs/squashfs-tools[lzma]
+REQUIRED_USE=!forced-devmode? ( apparmor ) systemd
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://github.com/snapcore/snapd/releases/download/2.57.5/snapd_2.57.5.vendor.tar.xz -> snapd-2.57.5.tar.xz
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	go-module	15312495dc4fd84f8c37bbe228ea2abd	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	bbfa385d6907d7948d49a5e107bd654d	multilib	5ca4e49abed8e3a2f7b56920eadee157	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=4890ef91805a8a226b2aab1d3054ea58
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index bab453608cbf..954af055515c 100644
Binary files a/metadata/md5-cache/app-crypt/Manifest.gz and b/metadata/md5-cache/app-crypt/Manifest.gz differ
diff --git a/metadata/md5-cache/app-crypt/efitools-1.9.2-r1 b/metadata/md5-cache/app-crypt/efitools-1.9.2-r1
new file mode 100644
index 000000000000..9d7cfbb30c3c
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/efitools-1.9.2-r1
@@ -0,0 +1,15 @@
+BDEPEND=app-crypt/sbsigntools dev-perl/File-Slurp sys-apps/help2man virtual/pkgconfig
+DEFINED_PHASES=configure prepare
+DEPEND=!static? ( dev-libs/openssl:= ) sys-apps/util-linux static? ( dev-libs/openssl:=[static-libs(+)] ) sys-boot/gnu-efi
+DESCRIPTION=Tools for manipulating UEFI secure boot platforms
+EAPI=8
+HOMEPAGE=https://git.kernel.org/cgit/linux/kernel/git/jejb/efitools.git
+INHERIT=flag-o-matic toolchain-funcs
+IUSE=static
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=!static? ( dev-libs/openssl:= ) sys-apps/util-linux
+SLOT=0
+SRC_URI=https://git.kernel.org/pub/scm/linux/kernel/git/jejb/efitools.git/snapshot/efitools-1.9.2.tar.gz
+_eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=fe593a1d7ff1be560be1f5f8255fc0a2
diff --git a/metadata/md5-cache/app-crypt/swtpm-0.7.3 b/metadata/md5-cache/app-crypt/swtpm-0.7.3
index f16b844fc729..13da688198cf 100644
--- a/metadata/md5-cache/app-crypt/swtpm-0.7.3
+++ b/metadata/md5-cache/app-crypt/swtpm-0.7.3
@@ -1,4 +1,4 @@
-BDEPEND=|| ( >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+BDEPEND=|| ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install prepare setup
 DEPEND=fuse? ( dev-libs/glib:2 sys-fs/fuse:0 ) gnutls? ( dev-libs/libtasn1:= >=net-libs/gnutls-3.1.0:=[tools,pkcs11] ) seccomp? ( sys-libs/libseccomp ) acct-group/tss acct-user/tss dev-libs/openssl:0= dev-libs/json-glib dev-libs/libtpms test? ( net-misc/socat dev-tcltk/expect )
 DESCRIPTION=Libtpms-based TPM emulator
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/stefanberger/swtpm/archive/v0.7.3.tar.gz -> swtpm-0.7.3.tar.gz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=01675393249a13b5faf3a4885cd04884
+_md5_=7bf3b11287d49b9348ad0e19df20af2e
diff --git a/metadata/md5-cache/app-editors/Manifest.gz b/metadata/md5-cache/app-editors/Manifest.gz
index ea0d99d07ea0..93a8a01f4f04 100644
Binary files a/metadata/md5-cache/app-editors/Manifest.gz and b/metadata/md5-cache/app-editors/Manifest.gz differ
diff --git a/metadata/md5-cache/app-editors/qhexedit2-0.8.6_p20190316 b/metadata/md5-cache/app-editors/qhexedit2-0.8.6_p20190316
deleted file mode 100644
index 351a36755457..000000000000
--- a/metadata/md5-cache/app-editors/qhexedit2-0.8.6_p20190316
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 python? ( dev-python/PyQt5[gui,widgets,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/sip-5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) )
-DESCRIPTION=Hex editor library, Qt application written in C++ with Python bindings
-EAPI=7
-HOMEPAGE=https://github.com/lancos/qhexedit2/
-INHERIT=distutils-r1 qmake-utils
-IUSE=doc +gui python python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~riscv x86
-LICENSE=GPL-2
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 python? ( dev-python/PyQt5[gui,widgets,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/sip-5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) )
-REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) )
-SLOT=0
-SRC_URI=https://github.com/lancos/qhexedit2/archive/ba5af8616b3a6c916e718914225a483267c01356.tar.gz -> qhexedit2-0.8.6_p20190316.tar.gz
-_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=2d3ccee636eea8e00a374c2fa8578707
diff --git a/metadata/md5-cache/app-editors/qhexedit2-0.8.6_p20190316-r2 b/metadata/md5-cache/app-editors/qhexedit2-0.8.6_p20190316-r2
deleted file mode 100644
index 98b0d35af9ed..000000000000
--- a/metadata/md5-cache/app-editors/qhexedit2-0.8.6_p20190316-r2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python? ( python_targets_python3_8? ( >=dev-python/PyQt-builder-1.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sip-5:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-python/PyQt-builder-1.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sip-5:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/PyQt-builder-1.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sip-5:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) )
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_8? ( >=dev-python/PyQt5-5.15.6[gui,widgets,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-python/PyQt5-5.15.6[gui,widgets,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/PyQt5-5.15.6[gui,widgets,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) )
-DESCRIPTION=Hex editor library, Qt application written in C++ with Python bindings
-EAPI=8
-HOMEPAGE=https://github.com/lancos/qhexedit2/
-INHERIT=python-r1 qmake-utils
-IUSE=doc +gui python python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~riscv ~x86
-LICENSE=GPL-2
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_8? ( >=dev-python/PyQt5-5.15.6[gui,widgets,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-python/PyQt5-5.15.6[gui,widgets,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/PyQt5-5.15.6[gui,widgets,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) )
-REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) )
-SLOT=0
-SRC_URI=https://github.com/lancos/qhexedit2/archive/ba5af8616b3a6c916e718914225a483267c01356.tar.gz -> qhexedit2-0.8.6_p20190316.tar.gz
-_eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=1a9c633af8815ee2ac271f633c410ef8
diff --git a/metadata/md5-cache/app-editors/qhexedit2-0.8.9_p20210525 b/metadata/md5-cache/app-editors/qhexedit2-0.8.9_p20210525
deleted file mode 100644
index 85b16ff72e44..000000000000
--- a/metadata/md5-cache/app-editors/qhexedit2-0.8.9_p20210525
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 python? ( dev-python/PyQt5[gui,widgets,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) )
-DESCRIPTION=Hex editor library, Qt application written in C++ with Python bindings
-EAPI=8
-HOMEPAGE=https://github.com/Simsys/qhexedit2/
-INHERIT=distutils-r1 qmake-utils
-IUSE=doc +gui python python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~riscv ~x86
-LICENSE=GPL-2
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 python? ( dev-python/PyQt5[gui,widgets,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
-REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) ) || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-SLOT=0
-SRC_URI=https://github.com/Simsys/qhexedit2/archive/541139125be034b90b6811a84faa1413e357fd94.tar.gz -> qhexedit2-0.8.9_p20210525.tar.gz
-_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=e4e1d40d4a1d9d0a432b861df7a4b813
diff --git a/metadata/md5-cache/app-emacs/Manifest.gz b/metadata/md5-cache/app-emacs/Manifest.gz
index e920577e8357..ee2468f4b438 100644
Binary files a/metadata/md5-cache/app-emacs/Manifest.gz and b/metadata/md5-cache/app-emacs/Manifest.gz differ
diff --git a/metadata/md5-cache/app-emacs/editorconfig-emacs-0.9.0 b/metadata/md5-cache/app-emacs/editorconfig-emacs-0.9.0
new file mode 100644
index 000000000000..7c91e1c3095f
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/editorconfig-emacs-0.9.0
@@ -0,0 +1,14 @@
+BDEPEND=>=app-editors/emacs-23.1:*
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DESCRIPTION=EditorConfig plugin for emacs
+EAPI=8
+HOMEPAGE=https://github.com/editorconfig/editorconfig-emacs
+INHERIT=elisp readme.gentoo-r1
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=>=app-editors/emacs-23.1:*
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/editorconfig/editorconfig-emacs/archive/v0.9.0.tar.gz -> editorconfig-emacs-0.9.0.tar.gz
+_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
+_md5_=d50134f7705d4eb1346ecbaafe621639
diff --git a/metadata/md5-cache/app-emacs/systemd-mode-1.6 b/metadata/md5-cache/app-emacs/systemd-mode-1.6
new file mode 100644
index 000000000000..fcbb4b2882d1
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/systemd-mode-1.6
@@ -0,0 +1,13 @@
+BDEPEND=>=app-editors/emacs-24.4:*
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DESCRIPTION=Major mode for editing systemd units in GNU Emacs
+EAPI=8
+HOMEPAGE=https://github.com/holomorph/systemd-mode/
+INHERIT=elisp
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=>=app-editors/emacs-24.4:*
+SLOT=0
+SRC_URI=https://github.com/holomorph/systemd-mode/archive/v1.6.tar.gz -> systemd-mode-1.6.tar.gz
+_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_md5_=0dd61e3920d919774d8c29e970cdd5d6
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index 38274b63e35e..eb7ac32c7b0b 100644
Binary files a/metadata/md5-cache/app-emulation/Manifest.gz and b/metadata/md5-cache/app-emulation/Manifest.gz differ
diff --git a/metadata/md5-cache/app-emulation/qemu-guest-agent-6.0.0 b/metadata/md5-cache/app-emulation/qemu-guest-agent-6.0.0
index 824fbfc96885..32c3b59636ca 100644
--- a/metadata/md5-cache/app-emulation/qemu-guest-agent-6.0.0
+++ b/metadata/md5-cache/app-emulation/qemu-guest-agent-6.0.0
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig virtual/pkgconfig
 DEFINED_PHASES=configure install postinst postrm setup
-DEPEND=dev-libs/glib || ( >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 )
+DEPEND=dev-libs/glib || ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 )
 DESCRIPTION=QEMU Guest Agent (qemu-ga) for use when running inside a VM
 EAPI=7
 HOMEPAGE=https://wiki.qemu.org/Features/GuestAgent
@@ -11,4 +11,4 @@ RDEPEND=dev-libs/glib
 SLOT=0
 SRC_URI=http://wiki.qemu.org/download/qemu-6.0.0.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	udev	eec0bbab06977f1cfc5597269c1fa152
-_md5_=3c6650c3589155dede565f442e2b2909
+_md5_=df8f6e419f94af91cd8944cd7c4515af
diff --git a/metadata/md5-cache/app-emulation/qemu-guest-agent-7.1.0 b/metadata/md5-cache/app-emulation/qemu-guest-agent-7.1.0
index 3e0ba2ef63f6..a01d52db74a1 100644
--- a/metadata/md5-cache/app-emulation/qemu-guest-agent-7.1.0
+++ b/metadata/md5-cache/app-emulation/qemu-guest-agent-7.1.0
@@ -1,4 +1,4 @@
-BDEPEND=|| ( >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) virtual/pkgconfig virtual/pkgconfig
+BDEPEND=|| ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) virtual/pkgconfig virtual/pkgconfig
 DEFINED_PHASES=configure install postinst postrm setup
 DEPEND=dev-libs/glib
 DESCRIPTION=QEMU Guest Agent (qemu-ga) for use when running inside a VM
@@ -11,4 +11,4 @@ RDEPEND=dev-libs/glib
 SLOT=0
 SRC_URI=http://wiki.qemu.org/download/qemu-7.1.0.tar.xz
 _eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	udev	eec0bbab06977f1cfc5597269c1fa152
-_md5_=c0de07a9512d94c88c1b0d14d650b7d7
+_md5_=25c0466841d5a641e245688e89e8ac5a
diff --git a/metadata/md5-cache/app-emulation/xen-4.15.4_pre1 b/metadata/md5-cache/app-emulation/xen-4.15.4_pre1
index 641fe49c72a1..172b855c624b 100644
--- a/metadata/md5-cache/app-emulation/xen-4.15.4_pre1
+++ b/metadata/md5-cache/app-emulation/xen-4.15.4_pre1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://xenproject.org
 INHERIT=flag-o-matic mount-boot python-any-r1 toolchain-funcs
 IUSE=debug efi flask
-KEYWORDS=~amd64 ~arm -x86
+KEYWORDS=amd64 ~arm -x86
 LICENSE=GPL-2
 PDEPEND=~app-emulation/xen-tools-4.15.4_pre1
 REQUIRED_USE=arm? ( debug )
@@ -13,4 +13,4 @@ RESTRICT=test splitdebug strip
 SLOT=0
 SRC_URI=https://downloads.xenproject.org/release/xen/4.15.3/xen-4.15.3.tar.gz https://gitweb.gentoo.org/proj/xen-upstream-patches.git/snapshot/xen-upstream-patches-4.15.4-pre-patchset-1.tar.bz2
 _eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=bb6f641312fc8bae176e9a135769608c
+_md5_=a1fbebde616a86ea2896d17dc7c93f97
diff --git a/metadata/md5-cache/app-emulation/xen-tools-4.15.4_pre1 b/metadata/md5-cache/app-emulation/xen-tools-4.15.4_pre1
index aee96a718b6f..57297d89ea9e 100644
--- a/metadata/md5-cache/app-emulation/xen-tools-4.15.4_pre1
+++ b/metadata/md5-cache/app-emulation/xen-tools-4.15.4_pre1
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://xenproject.org
 INHERIT=bash-completion-r1 flag-o-matic multilib python-single-r1 toolchain-funcs
 IUSE=api debug doc +hvm +ipxe lzma ocaml ovmf pygrub python +qemu +qemu-traditional +rombios screen selinux sdl static-libs system-ipxe system-qemu system-seabios python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=GPL-2
 RDEPEND=lzma? ( app-arch/xz-utils ) qemu? ( dev-libs/glib:2 sys-libs/pam ) app-arch/bzip2 dev-libs/libnl:3 dev-libs/lzo:2 dev-libs/yajl sys-apps/util-linux sys-fs/e2fsprogs sys-libs/ncurses sys-libs/zlib python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8[ncurses,xml(+),threads(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9[ncurses,xml(+),threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10[ncurses,xml(+),threads(+)] ) sys-apps/iproute2[-minimal] net-misc/bridge-utils screen? ( app-misc/screen app-admin/logrotate ) selinux? ( sec-policy/selinux-xen )
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) ipxe? ( rombios ) ovmf? ( hvm ) pygrub? ( python ) rombios? ( hvm ) system-ipxe? ( rombios ) ?? ( ipxe system-ipxe ) ?? ( qemu system-qemu )
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0/4.15
 SRC_URI=https://downloads.xenproject.org/release/xen/4.15.3/xen-4.15.3.tar.gz https://www.seabios.org/downloads/seabios-1.14.0.tar.gz ipxe? ( https://xenbits.xen.org/xen-extfiles/ipxe-git-3c040ad387099483102708bb1839110bc788cefb.tar.gz ) ovmf? ( https://github.com/tianocore/edk2/archive/7b4a99be8a39c12d3a7fc4b8db9f0eab4ac688d5.tar.gz -> edk2-7b4a99be8a39c12d3a7fc4b8db9f0eab4ac688d5.tar.gz https://github.com/openssl/openssl/archive/OpenSSL_1_1_1j.tar.gz https://github.com/ucb-bar/berkeley-softfloat-3/archive/b64af41c3276f97f0e181920400ee056b9c88037.tar.gz -> berkeley-softfloat-b64af41c3276f97f0e181920400ee056b9c88037.tar.gz https://github.com/google/brotli/archive/666c3280cc11dc433c303d79a83d4ffbdd12cc8d.tar.gz -> brotli-666c3280cc11dc433c303d79a83d4ffbdd12cc8d.tar.gz ) https://gitweb.gentoo.org/proj/xen-upstream-patches.git/snapshot/xen-upstream-patches-4.15.4-pre-patchset-1.tar.bz2 https://gitweb.gentoo.org/proj/xen-gentoo-patches.git/snapshot/xen-gentoo-patches-4.15.3-gentoo-patchset-2.tar.bz2
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=d6695527583cc45b22ab9d0496935176
+_md5_=ab64af7b306883d854d326a2fc6dbc02
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index fbcf959452bf..259b78e7e111 100644
Binary files a/metadata/md5-cache/app-misc/Manifest.gz and b/metadata/md5-cache/app-misc/Manifest.gz differ
diff --git a/metadata/md5-cache/app-misc/cstream-3.2.1 b/metadata/md5-cache/app-misc/cstream-3.2.1-r1
similarity index 94%
rename from metadata/md5-cache/app-misc/cstream-3.2.1
rename to metadata/md5-cache/app-misc/cstream-3.2.1-r1
index 0fbbc97fc1f0..13c03cdb345b 100644
--- a/metadata/md5-cache/app-misc/cstream-3.2.1
+++ b/metadata/md5-cache/app-misc/cstream-3.2.1-r1
@@ -9,4 +9,4 @@ LICENSE=MIT
 SLOT=0
 SRC_URI=http://www.cons.org/cracauer/download/cstream-3.2.1.tar.gz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=1d91385543429d23a03f3a38aab734c8
+_md5_=8b2b17fdd477de6b9fc71c58b0c1b755
diff --git a/metadata/md5-cache/app-misc/mouseremote-0.90-r3 b/metadata/md5-cache/app-misc/mouseremote-0.90-r4
similarity index 70%
rename from metadata/md5-cache/app-misc/mouseremote-0.90-r3
rename to metadata/md5-cache/app-misc/mouseremote-0.90-r4
index 88320253b21c..95e024dcdd87 100644
--- a/metadata/md5-cache/app-misc/mouseremote-0.90-r3
+++ b/metadata/md5-cache/app-misc/mouseremote-0.90-r4
@@ -1,12 +1,12 @@
-DEFINED_PHASES=compile install postinst prepare
-DEPEND=virtual/perl-Time-HiRes
+DEFINED_PHASES=compile install postinst
 DESCRIPTION=X10 MouseRemote
-EAPI=6
+EAPI=8
 HOMEPAGE=http://www4.pair.com/gribnif/ha/
 INHERIT=toolchain-funcs
 KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
+RDEPEND=virtual/perl-Time-HiRes
 SLOT=0
 SRC_URI=http://www4.pair.com/gribnif/ha/MouseRemote.tar.gz
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=3076e4e2b7567e9ee2a5ba408754c864
+_md5_=81d3c1cf26a2105a23c361728b863d39
diff --git a/metadata/md5-cache/app-misc/rlwrap-0.46 b/metadata/md5-cache/app-misc/rlwrap-0.46
new file mode 100644
index 000000000000..476a11fbc080
--- /dev/null
+++ b/metadata/md5-cache/app-misc/rlwrap-0.46
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure
+DEPEND=sys-libs/ncurses:= sys-libs/readline:=
+DESCRIPTION=GNU readline wrapper
+EAPI=8
+HOMEPAGE=https://github.com/hanslub42/rlwrap
+IUSE=debug
+KEYWORDS=~amd64 ~arm64 ~mips ~ppc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+LICENSE=GPL-2+
+RDEPEND=sys-libs/ncurses:= sys-libs/readline:=
+SLOT=0
+SRC_URI=https://github.com/hanslub42/rlwrap/releases/download/v0.46/rlwrap-0.46.tar.gz
+_md5_=1b1544d27dc9cc24573acdc700e2fb20
diff --git a/metadata/md5-cache/app-portage/Manifest.gz b/metadata/md5-cache/app-portage/Manifest.gz
index afac7a3a445c..37d4305ba60d 100644
Binary files a/metadata/md5-cache/app-portage/Manifest.gz and b/metadata/md5-cache/app-portage/Manifest.gz differ
diff --git a/metadata/md5-cache/app-portage/iwdevtools-0.12.0 b/metadata/md5-cache/app-portage/iwdevtools-0.12.0
new file mode 100644
index 000000000000..46cdaff678f0
--- /dev/null
+++ b/metadata/md5-cache/app-portage/iwdevtools-0.12.0
@@ -0,0 +1,15 @@
+BDEPEND=sys-apps/help2man || ( sys-apps/util-linux app-misc/getopt ) test? ( app-misc/pax-utils app-portage/portage-utils >=app-shells/bash-5.1 dev-libs/libxml2:2 sys-apps/diffutils sys-apps/file sys-apps/portage || ( sys-apps/util-linux app-misc/getopt ) ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst test
+DESCRIPTION=Small tools to aid with Gentoo development, primarily intended for QA
+EAPI=8
+HOMEPAGE=https://github.com/ionenwks/iwdevtools
+INHERIT=meson optfeature
+IUSE=test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos
+LICENSE=BSD-2
+RDEPEND=app-misc/pax-utils app-portage/portage-utils >=app-shells/bash-5.1 dev-libs/libxml2:2 sys-apps/diffutils sys-apps/file sys-apps/portage || ( sys-apps/util-linux app-misc/getopt )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ionenwks/iwdevtools/archive/refs/tags/v0.12.0.tar.gz -> iwdevtools-0.12.0.tar.gz
+_eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	1a2157392a869265b2afcb63a26c12ac	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=38dbace2cc50b20d9339350875faf52f
diff --git a/metadata/md5-cache/app-portage/mgorny-dev-scripts-25 b/metadata/md5-cache/app-portage/mgorny-dev-scripts-25
deleted file mode 100644
index e3990def064a..000000000000
--- a/metadata/md5-cache/app-portage/mgorny-dev-scripts-25
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Handy scripts for ebuild development and more
-EAPI=8
-HOMEPAGE=https://github.com/projg2/mgorny-dev-scripts/
-KEYWORDS=amd64 arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc x86 ~x64-macos
-LICENSE=BSD-2
-RDEPEND=app-portage/gentoolkit app-portage/portage-utils dev-perl/URI dev-util/pkgcheck dev-vcs/git net-misc/wget sys-apps/portage x11-misc/xdg-utils !dev-util/pkgdiff
-SLOT=0
-SRC_URI=https://github.com/projg2/mgorny-dev-scripts/archive/v25.tar.gz -> mgorny-dev-scripts-25.tar.gz
-_md5_=a04b75632e172746fe4fd620e60c098d
diff --git a/metadata/md5-cache/app-portage/mgorny-dev-scripts-26 b/metadata/md5-cache/app-portage/mgorny-dev-scripts-26
deleted file mode 100644
index 2e65a2e21fdb..000000000000
--- a/metadata/md5-cache/app-portage/mgorny-dev-scripts-26
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Handy scripts for ebuild development and more
-EAPI=8
-HOMEPAGE=https://github.com/projg2/mgorny-dev-scripts/
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos
-LICENSE=BSD-2
-RDEPEND=app-portage/gentoolkit app-portage/portage-utils dev-perl/URI dev-util/pkgcheck dev-vcs/git net-misc/wget sys-apps/portage x11-misc/xdg-utils !dev-util/pkgdiff
-SLOT=0
-SRC_URI=https://github.com/projg2/mgorny-dev-scripts/archive/v26.tar.gz -> mgorny-dev-scripts-26.tar.gz
-_md5_=2616dfe4bb55e89baa6bd50a276c10f2
diff --git a/metadata/md5-cache/app-portage/mgorny-dev-scripts-28 b/metadata/md5-cache/app-portage/mgorny-dev-scripts-28
index f0b75020f57d..4a8a8de34286 100644
--- a/metadata/md5-cache/app-portage/mgorny-dev-scripts-28
+++ b/metadata/md5-cache/app-portage/mgorny-dev-scripts-28
@@ -2,9 +2,9 @@ DEFINED_PHASES=install
 DESCRIPTION=Handy scripts for ebuild development and more
 EAPI=8
 HOMEPAGE=https://github.com/projg2/mgorny-dev-scripts/
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos
+KEYWORDS=amd64 arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc x86 ~x64-macos
 LICENSE=BSD-2
 RDEPEND=app-portage/gentoolkit app-portage/portage-utils dev-perl/URI dev-util/pkgcheck dev-vcs/git net-misc/wget sys-apps/portage x11-misc/xdg-utils !dev-util/pkgdiff
 SLOT=0
 SRC_URI=https://github.com/projg2/mgorny-dev-scripts/archive/v28.tar.gz -> mgorny-dev-scripts-28.tar.gz
-_md5_=2616dfe4bb55e89baa6bd50a276c10f2
+_md5_=a04b75632e172746fe4fd620e60c098d
diff --git a/metadata/md5-cache/app-portage/mgorny-dev-scripts-27 b/metadata/md5-cache/app-portage/mgorny-dev-scripts-29
similarity index 81%
rename from metadata/md5-cache/app-portage/mgorny-dev-scripts-27
rename to metadata/md5-cache/app-portage/mgorny-dev-scripts-29
index 81b1e3ae05fe..4eab3532832a 100644
--- a/metadata/md5-cache/app-portage/mgorny-dev-scripts-27
+++ b/metadata/md5-cache/app-portage/mgorny-dev-scripts-29
@@ -6,5 +6,5 @@ KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-mac
 LICENSE=BSD-2
 RDEPEND=app-portage/gentoolkit app-portage/portage-utils dev-perl/URI dev-util/pkgcheck dev-vcs/git net-misc/wget sys-apps/portage x11-misc/xdg-utils !dev-util/pkgdiff
 SLOT=0
-SRC_URI=https://github.com/projg2/mgorny-dev-scripts/archive/v27.tar.gz -> mgorny-dev-scripts-27.tar.gz
+SRC_URI=https://github.com/projg2/mgorny-dev-scripts/archive/v29.tar.gz -> mgorny-dev-scripts-29.tar.gz
 _md5_=2616dfe4bb55e89baa6bd50a276c10f2
diff --git a/metadata/md5-cache/app-portage/portage-utils-0.94.3 b/metadata/md5-cache/app-portage/portage-utils-0.94.3
index bc625396e6af..0ebfe3fbc1c4 100644
--- a/metadata/md5-cache/app-portage/portage-utils-0.94.3
+++ b/metadata/md5-cache/app-portage/portage-utils-0.94.3
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://wiki.gentoo.org/wiki/Portage-utils
 INHERIT=flag-o-matic toolchain-funcs
 IUSE=openmp +qmanifest +qtegrity static
-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
 RDEPEND=qmanifest? ( !static? ( app-crypt/gpgme:= app-crypt/libb2:= dev-libs/openssl:= sys-libs/zlib:= ) ) qtegrity? ( !static? ( dev-libs/openssl:= ) )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~grobian/distfiles/portage-utils-0.94.3.tar.xz
 _eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=57d61e7b07df65a218f64c719222c78a
+_md5_=5055b2cbe09f3a5354abc98e71b25edc
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index 7e491e516d21..658ec48de188 100644
Binary files a/metadata/md5-cache/app-text/Manifest.gz and b/metadata/md5-cache/app-text/Manifest.gz differ
diff --git a/metadata/md5-cache/app-text/pdftk-3.3.3 b/metadata/md5-cache/app-text/pdftk-3.3.3
index 5cc02dbbb89f..5b3463659976 100644
--- a/metadata/md5-cache/app-text/pdftk-3.3.3
+++ b/metadata/md5-cache/app-text/pdftk-3.3.3
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://gitlab.com/pdftk-java/pdftk
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.8:* dev-java/bcprov:0 dev-java/commons-lang:3.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://gitlab.com/pdftk-java/pdftk/-/archive/v3.3.3/pdftk-v3.3.3.tar.gz
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=2f17d9354f7e36ee49ec29db36057369
+_md5_=39924304075c5d7be0614595f7c4c014
diff --git a/metadata/md5-cache/app-text/qpdf-11.0.0 b/metadata/md5-cache/app-text/qpdf-11.0.0
deleted file mode 100644
index b70f65f6bb99..000000000000
--- a/metadata/md5-cache/app-text/qpdf-11.0.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-lang/perl doc? ( app-arch/unzip ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=media-libs/libjpeg-turbo:= sys-libs/zlib ssl? ( gnutls? ( net-libs/gnutls:= ) !gnutls? ( dev-libs/openssl:= ) ) test? ( app-text/ghostscript-gpl[tiff(+)] media-libs/tiff sys-apps/diffutils )
-DESCRIPTION=Command-line tool for structural, content-preserving transformation of PDF files
-EAPI=8
-HOMEPAGE=https://qpdf.sourceforge.net/
-INHERIT=cmake bash-completion-r1
-IUSE=doc examples gnutls ssl test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris
-LICENSE=|| ( Apache-2.0 Artistic-2 )
-RDEPEND=media-libs/libjpeg-turbo:= sys-libs/zlib ssl? ( gnutls? ( net-libs/gnutls:= ) !gnutls? ( dev-libs/openssl:= ) )
-RESTRICT=!test? ( test )
-SLOT=0/11
-SRC_URI=https://github.com/qpdf/qpdf/releases/download/v11.0.0/qpdf-11.0.0.tar.gz doc? ( https://github.com/qpdf/qpdf/releases/download/v11.0.0/qpdf-11.0.0-doc.zip )
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=4c34421ae09a16e1a45f0e833219ed47
diff --git a/metadata/md5-cache/app-text/qpdf-11.1.0-r2 b/metadata/md5-cache/app-text/qpdf-11.1.0-r2
deleted file mode 100644
index bb6a9af61ca3..000000000000
--- a/metadata/md5-cache/app-text/qpdf-11.1.0-r2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-lang/perl doc? ( app-arch/unzip ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=media-libs/libjpeg-turbo:= sys-libs/zlib ssl? ( gnutls? ( net-libs/gnutls:= ) !gnutls? ( dev-libs/openssl:= ) ) test? ( app-text/ghostscript-gpl[tiff(+)] media-libs/tiff sys-apps/diffutils )
-DESCRIPTION=Command-line tool for structural, content-preserving transformation of PDF files
-EAPI=8
-HOMEPAGE=https://qpdf.sourceforge.net/
-INHERIT=cmake bash-completion-r1
-IUSE=doc examples gnutls ssl test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris
-LICENSE=|| ( Apache-2.0 Artistic-2 )
-RDEPEND=media-libs/libjpeg-turbo:= sys-libs/zlib ssl? ( gnutls? ( net-libs/gnutls:= ) !gnutls? ( dev-libs/openssl:= ) )
-RESTRICT=!test? ( test )
-SLOT=0/11
-SRC_URI=https://github.com/qpdf/qpdf/releases/download/v11.1.0/qpdf-11.1.0.tar.gz doc? ( https://github.com/qpdf/qpdf/releases/download/v11.1.0/qpdf-11.1.0-doc.zip )
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=cbbea2a8900790ca0568a08025855b92
diff --git a/metadata/md5-cache/dev-cpp/Manifest.gz b/metadata/md5-cache/dev-cpp/Manifest.gz
index 9f8f1f2c3a25..5d51a7b0fb24 100644
Binary files a/metadata/md5-cache/dev-cpp/Manifest.gz and b/metadata/md5-cache/dev-cpp/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-cpp/amqp-cpp-4.3.16 b/metadata/md5-cache/dev-cpp/amqp-cpp-4.3.16
deleted file mode 100644
index a9879b61dd42..000000000000
--- a/metadata/md5-cache/dev-cpp/amqp-cpp-4.3.16
+++ /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=AMQP-CPP is a C++ library for communicating with a RabbitMQ message broker
-EAPI=8
-HOMEPAGE=https://github.com/CopernicaMarketingSoftware/AMQP-CPP
-INHERIT=cmake
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=Apache-2.0
-SLOT=0
-SRC_URI=https://github.com/CopernicaMarketingSoftware/AMQP-CPP/archive/v4.3.16.tar.gz -> AMQP-CPP-4.3.16.tar.gz
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=14b45a91747b1384ae27d03d2597eed8
diff --git a/metadata/md5-cache/dev-cpp/amqp-cpp-4.3.17 b/metadata/md5-cache/dev-cpp/amqp-cpp-4.3.18
similarity index 94%
rename from metadata/md5-cache/dev-cpp/amqp-cpp-4.3.17
rename to metadata/md5-cache/dev-cpp/amqp-cpp-4.3.18
index 69e97330973b..bdd8cea5a762 100644
--- a/metadata/md5-cache/dev-cpp/amqp-cpp-4.3.17
+++ b/metadata/md5-cache/dev-cpp/amqp-cpp-4.3.18
@@ -7,6 +7,6 @@ INHERIT=cmake
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=Apache-2.0
 SLOT=0
-SRC_URI=https://github.com/CopernicaMarketingSoftware/AMQP-CPP/archive/v4.3.17.tar.gz -> AMQP-CPP-4.3.17.tar.gz
+SRC_URI=https://github.com/CopernicaMarketingSoftware/AMQP-CPP/archive/v4.3.18.tar.gz -> AMQP-CPP-4.3.18.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=14b45a91747b1384ae27d03d2597eed8
diff --git a/metadata/md5-cache/dev-cpp/argparse-2.6 b/metadata/md5-cache/dev-cpp/argparse-2.9
similarity index 88%
rename from metadata/md5-cache/dev-cpp/argparse-2.6
rename to metadata/md5-cache/dev-cpp/argparse-2.9
index 39a819b744e2..6bdb268b8708 100644
--- a/metadata/md5-cache/dev-cpp/argparse-2.6
+++ b/metadata/md5-cache/dev-cpp/argparse-2.9
@@ -9,6 +9,6 @@ KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/p-ranav/argparse/archive/v2.6.tar.gz -> argparse-2.6.tar.gz
+SRC_URI=https://github.com/p-ranav/argparse/archive/v2.9.tar.gz -> argparse-2.9.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=c2892910faf2784f26084d2ae47c7b28
diff --git a/metadata/md5-cache/dev-cpp/highway-1.0.1-r1 b/metadata/md5-cache/dev-cpp/highway-1.0.1-r1
index 48af27fce885..d6aa9141864e 100644
--- a/metadata/md5-cache/dev-cpp/highway-1.0.1-r1
+++ b/metadata/md5-cache/dev-cpp/highway-1.0.1-r1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/google/highway
 INHERIT=cmake-multilib
 IUSE=cpu_flags_arm_neon 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 ppc ppc64 ~riscv sparc x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv sparc x86
 LICENSE=Apache-2.0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/google/highway/archive/refs/tags/1.0.1.tar.gz -> highway-1.0.1.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	29a755b1291d64133634d80b0328f153	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=069893d8fbbf8158d2c701370660f100
+_md5_=aa038b53d07e0b27780bd0339977e252
diff --git a/metadata/md5-cache/dev-cpp/rapidfuzz-cpp-1.9.0 b/metadata/md5-cache/dev-cpp/rapidfuzz-cpp-1.9.0
new file mode 100644
index 000000000000..64c21ff7bf68
--- /dev/null
+++ b/metadata/md5-cache/dev-cpp/rapidfuzz-cpp-1.9.0
@@ -0,0 +1,14 @@
+BDEPEND=test? ( >=dev-cpp/catch-3 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Rapid fuzzy string matching in C++
+EAPI=8
+HOMEPAGE=https://github.com/maxbachmann/rapidfuzz-cpp/
+INHERIT=cmake
+IUSE=test
+KEYWORDS=~amd64 ~riscv
+LICENSE=MIT
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/maxbachmann/rapidfuzz-cpp/archive/v1.9.0.tar.gz -> rapidfuzz-cpp-1.9.0.gh.tar.gz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=0862d4c5ed86bfb4ad34fac59ac0bd74
diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index 132a3d12f34e..3fd86aa7434b 100644
Binary files a/metadata/md5-cache/dev-db/Manifest.gz and b/metadata/md5-cache/dev-db/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-db/kdb-3.2.0-r2 b/metadata/md5-cache/dev-db/kdb-3.2.0-r2
index a75be77517bf..3d2061baa8c5 100644
--- a/metadata/md5-cache/dev-db/kdb-3.2.0-r2
+++ b/metadata/md5-cache/dev-db/kdb-3.2.0-r2
@@ -1,4 +1,4 @@
-BDEPEND=|| ( >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) dev-qt/linguist-tools:5 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.82.0:5
+BDEPEND=|| ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) dev-qt/linguist-tools:5 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp: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/icu:= >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kcoreaddons-5.82.0:5 mysql? ( dev-db/mysql-connector-c:= ) postgres? ( dev-db/postgresql:* >=dev-qt/qtnetwork-5.15.2:5 ) sqlite? ( dev-db/sqlite:3 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 DESCRIPTION=Database connectivity and creation framework for various vendors
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=5/4
 SRC_URI=mirror://kde/stable/kdb/src/kdb-3.2.0.tar.xz https://dev.gentoo.org/~asturm/distfiles/kdb-3.2.0-patches.tar.xz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	ecm	3dae552f761290722bcc848a12bfb538	flag-o-matic	29a755b1291d64133634d80b0328f153	kde.org	087d21100477ce987a8de6c1d613a176	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=f7709737cd6736ddec156cb242216d60
+_md5_=9c3d504d3f7e4fe6e6cf4e6dcd4d4bc4
diff --git a/metadata/md5-cache/dev-db/mydumper-0.12.5.3 b/metadata/md5-cache/dev-db/mydumper-0.12.5.3
index 10182edaceae..d6c36fc8d51b 100644
--- a/metadata/md5-cache/dev-db/mydumper-0.12.5.3
+++ b/metadata/md5-cache/dev-db/mydumper-0.12.5.3
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/maxbube/mydumper
 INHERIT=cmake
 IUSE=doc
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-3+
 RDEPEND=app-arch/zstd dev-db/mysql-connector-c:= dev-libs/glib:2 dev-libs/libpcre dev-libs/openssl:= sys-libs/zlib:=
 SLOT=0
 SRC_URI=https://github.com/maxbube/mydumper/archive/v0.12.5-3.tar.gz -> mydumper-0.12.5-3.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=ff506b56d84a18840d5cb5002d548c77
+_md5_=bde9ae9c1620d61441fa6e261425598b
diff --git a/metadata/md5-cache/dev-db/pgpool2-4.2.1-r2 b/metadata/md5-cache/dev-db/pgpool2-4.2.1-r2
deleted file mode 100644
index b505fd64a7e8..000000000000
--- a/metadata/md5-cache/dev-db/pgpool2-4.2.1-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=postgres_targets_postgres13? ( dev-db/postgresql:13= ) postgres_targets_postgres12? ( dev-db/postgresql:12= ) postgres_targets_postgres11? ( dev-db/postgresql:11= ) postgres_targets_postgres10? ( dev-db/postgresql:10= ) acct-group/postgres acct-user/pgpool net-libs/libnsl:0= virtual/libcrypt:= memcached? ( dev-libs/libmemcached ) pam? ( sys-auth/pambase ) ssl? ( dev-libs/openssl:0= ) sys-devel/bison virtual/pkgconfig
-DESCRIPTION=Connection pool server for PostgreSQL
-EAPI=7
-HOMEPAGE=https://www.pgpool.net/
-INHERIT=autotools postgres-multi
-IUSE=doc memcached pam ssl static-libs postgres_targets_postgres13 postgres_targets_postgres12 postgres_targets_postgres11 postgres_targets_postgres10
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=postgres_targets_postgres13? ( dev-db/postgresql:13= ) postgres_targets_postgres12? ( dev-db/postgresql:12= ) postgres_targets_postgres11? ( dev-db/postgresql:11= ) postgres_targets_postgres10? ( dev-db/postgresql:10= ) acct-group/postgres acct-user/pgpool net-libs/libnsl:0= virtual/libcrypt:= memcached? ( dev-libs/libmemcached ) pam? ( sys-auth/pambase ) ssl? ( dev-libs/openssl:0= )
-SLOT=0
-SRC_URI=https://www.pgpool.net/download.php?f=pgpool-II-4.2.1.tar.gz -> pgpool-II-4.2.1.tar.gz
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	postgres	b5504cd45a86175e300d6d5c6e309c29	postgres-multi	67d8361b394ded18c2e915e9e493e5f7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=a6d20d92ae95e4340119b929d025b674
diff --git a/metadata/md5-cache/dev-db/pgpool2-4.2.2-r2 b/metadata/md5-cache/dev-db/pgpool2-4.2.2-r2
deleted file mode 100644
index 8ab8a43670db..000000000000
--- a/metadata/md5-cache/dev-db/pgpool2-4.2.2-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=postgres_targets_postgres13? ( dev-db/postgresql:13= ) postgres_targets_postgres12? ( dev-db/postgresql:12= ) postgres_targets_postgres11? ( dev-db/postgresql:11= ) postgres_targets_postgres10? ( dev-db/postgresql:10= ) acct-group/postgres acct-user/pgpool net-libs/libnsl:0= virtual/libcrypt:= memcached? ( dev-libs/libmemcached ) pam? ( sys-auth/pambase ) ssl? ( dev-libs/openssl:0= ) sys-devel/bison virtual/pkgconfig
-DESCRIPTION=Connection pool server for PostgreSQL
-EAPI=7
-HOMEPAGE=https://www.pgpool.net/
-INHERIT=autotools postgres-multi
-IUSE=doc memcached pam ssl static-libs postgres_targets_postgres13 postgres_targets_postgres12 postgres_targets_postgres11 postgres_targets_postgres10
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=postgres_targets_postgres13? ( dev-db/postgresql:13= ) postgres_targets_postgres12? ( dev-db/postgresql:12= ) postgres_targets_postgres11? ( dev-db/postgresql:11= ) postgres_targets_postgres10? ( dev-db/postgresql:10= ) acct-group/postgres acct-user/pgpool net-libs/libnsl:0= virtual/libcrypt:= memcached? ( dev-libs/libmemcached ) pam? ( sys-auth/pambase ) ssl? ( dev-libs/openssl:0= )
-SLOT=0
-SRC_URI=https://www.pgpool.net/download.php?f=pgpool-II-4.2.2.tar.gz -> pgpool-II-4.2.2.tar.gz
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	postgres	b5504cd45a86175e300d6d5c6e309c29	postgres-multi	67d8361b394ded18c2e915e9e493e5f7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=d7db356746d817af14715998e668981e
diff --git a/metadata/md5-cache/dev-db/pgpool2-4.2.9 b/metadata/md5-cache/dev-db/pgpool2-4.2.9
deleted file mode 100644
index adfc637a864c..000000000000
--- a/metadata/md5-cache/dev-db/pgpool2-4.2.9
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=postgres_targets_postgres14? ( dev-db/postgresql:14= ) postgres_targets_postgres13? ( dev-db/postgresql:13= ) postgres_targets_postgres12? ( dev-db/postgresql:12= ) postgres_targets_postgres11? ( dev-db/postgresql:11= ) postgres_targets_postgres10? ( dev-db/postgresql:10= ) net-libs/libnsl:0= virtual/libcrypt:= memcached? ( dev-libs/libmemcached ) pam? ( sys-auth/pambase ) ssl? ( dev-libs/openssl:0= ) sys-devel/bison virtual/pkgconfig
-DESCRIPTION=Connection pool server for PostgreSQL
-EAPI=7
-HOMEPAGE=https://www.pgpool.net/
-INHERIT=autotools postgres-multi
-IUSE=doc memcached pam ssl static-libs postgres_targets_postgres14 postgres_targets_postgres13 postgres_targets_postgres12 postgres_targets_postgres11 postgres_targets_postgres10
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=postgres_targets_postgres14? ( dev-db/postgresql:14= ) postgres_targets_postgres13? ( dev-db/postgresql:13= ) postgres_targets_postgres12? ( dev-db/postgresql:12= ) postgres_targets_postgres11? ( dev-db/postgresql:11= ) postgres_targets_postgres10? ( dev-db/postgresql:10= ) net-libs/libnsl:0= virtual/libcrypt:= memcached? ( dev-libs/libmemcached ) pam? ( sys-auth/pambase ) ssl? ( dev-libs/openssl:0= )
-SLOT=0
-SRC_URI=https://www.pgpool.net/download.php?f=pgpool-II-4.2.9.tar.gz -> pgpool-II-4.2.9.tar.gz
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	postgres	b5504cd45a86175e300d6d5c6e309c29	postgres-multi	67d8361b394ded18c2e915e9e493e5f7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=620df826f452d2784cac73d92646b41d
diff --git a/metadata/md5-cache/dev-db/pgpool2-4.3.1 b/metadata/md5-cache/dev-db/pgpool2-4.3.1
deleted file mode 100644
index 74e2eceb632f..000000000000
--- a/metadata/md5-cache/dev-db/pgpool2-4.3.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=postgres_targets_postgres14? ( dev-db/postgresql:14= ) postgres_targets_postgres13? ( dev-db/postgresql:13= ) postgres_targets_postgres12? ( dev-db/postgresql:12= ) postgres_targets_postgres11? ( dev-db/postgresql:11= ) postgres_targets_postgres10? ( dev-db/postgresql:10= ) acct-user/pgpool net-libs/libnsl:0= virtual/libcrypt:= memcached? ( dev-libs/libmemcached ) pam? ( sys-auth/pambase ) ssl? ( dev-libs/openssl:0= ) sys-devel/bison virtual/pkgconfig
-DESCRIPTION=Connection pool server for PostgreSQL
-EAPI=7
-HOMEPAGE=https://www.pgpool.net/
-INHERIT=autotools postgres-multi
-IUSE=doc memcached pam ssl static-libs postgres_targets_postgres14 postgres_targets_postgres13 postgres_targets_postgres12 postgres_targets_postgres11 postgres_targets_postgres10
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=postgres_targets_postgres14? ( dev-db/postgresql:14= ) postgres_targets_postgres13? ( dev-db/postgresql:13= ) postgres_targets_postgres12? ( dev-db/postgresql:12= ) postgres_targets_postgres11? ( dev-db/postgresql:11= ) postgres_targets_postgres10? ( dev-db/postgresql:10= ) acct-user/pgpool net-libs/libnsl:0= virtual/libcrypt:= memcached? ( dev-libs/libmemcached ) pam? ( sys-auth/pambase ) ssl? ( dev-libs/openssl:0= )
-SLOT=0
-SRC_URI=https://www.pgpool.net/download.php?f=pgpool-II-4.3.1.tar.gz -> pgpool-II-4.3.1.tar.gz
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	postgres	b5504cd45a86175e300d6d5c6e309c29	postgres-multi	67d8361b394ded18c2e915e9e493e5f7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=b95fd8310f186431911460efab87554e
diff --git a/metadata/md5-cache/dev-db/pgpool2-9999 b/metadata/md5-cache/dev-db/pgpool2-9999
index 4eda508eab6e..370443d406d2 100644
--- a/metadata/md5-cache/dev-db/pgpool2-9999
+++ b/metadata/md5-cache/dev-db/pgpool2-9999
@@ -1,14 +1,14 @@
 BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=postgres_targets_postgres13? ( dev-db/postgresql:13= ) postgres_targets_postgres12? ( dev-db/postgresql:12= ) postgres_targets_postgres11? ( dev-db/postgresql:11= ) postgres_targets_postgres10? ( dev-db/postgresql:10= ) acct-group/postgres acct-user/pgpool net-libs/libnsl:0= virtual/libcrypt:= memcached? ( dev-libs/libmemcached ) pam? ( sys-auth/pambase ) ssl? ( dev-libs/openssl:= ) sys-devel/bison virtual/pkgconfig doc? ( app-text/openjade dev-libs/libxml2 dev-libs/libxslt )
+DEPEND=postgres_targets_postgres15? ( dev-db/postgresql:15= ) postgres_targets_postgres14? ( dev-db/postgresql:14= ) postgres_targets_postgres13? ( dev-db/postgresql:13= ) postgres_targets_postgres12? ( dev-db/postgresql:12= ) postgres_targets_postgres11? ( dev-db/postgresql:11= ) postgres_targets_postgres10? ( dev-db/postgresql:10= ) acct-group/postgres acct-user/pgpool net-libs/libnsl:0= virtual/libcrypt:= memcached? ( dev-libs/libmemcached ) pam? ( sys-auth/pambase ) ssl? ( dev-libs/openssl:= ) sys-devel/bison virtual/pkgconfig doc? ( app-text/openjade dev-libs/libxml2 dev-libs/libxslt )
 DESCRIPTION=Connection pool server for PostgreSQL
 EAPI=7
 HOMEPAGE=https://www.pgpool.net/
 INHERIT=autotools git-r3 postgres-multi
-IUSE=doc memcached pam ssl static-libs postgres_targets_postgres13 postgres_targets_postgres12 postgres_targets_postgres11 postgres_targets_postgres10
+IUSE=doc memcached pam ssl static-libs postgres_targets_postgres15 postgres_targets_postgres14 postgres_targets_postgres13 postgres_targets_postgres12 postgres_targets_postgres11 postgres_targets_postgres10
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=postgres_targets_postgres13? ( dev-db/postgresql:13= ) postgres_targets_postgres12? ( dev-db/postgresql:12= ) postgres_targets_postgres11? ( dev-db/postgresql:11= ) postgres_targets_postgres10? ( dev-db/postgresql:10= ) acct-group/postgres acct-user/pgpool net-libs/libnsl:0= virtual/libcrypt:= memcached? ( dev-libs/libmemcached ) pam? ( sys-auth/pambase ) ssl? ( dev-libs/openssl:= )
+RDEPEND=postgres_targets_postgres15? ( dev-db/postgresql:15= ) postgres_targets_postgres14? ( dev-db/postgresql:14= ) postgres_targets_postgres13? ( dev-db/postgresql:13= ) postgres_targets_postgres12? ( dev-db/postgresql:12= ) postgres_targets_postgres11? ( dev-db/postgresql:11= ) postgres_targets_postgres10? ( dev-db/postgresql:10= ) acct-group/postgres acct-user/pgpool net-libs/libnsl:0= virtual/libcrypt:= memcached? ( dev-libs/libmemcached ) pam? ( sys-auth/pambase ) ssl? ( dev-libs/openssl:= )
 SLOT=0
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	postgres	b5504cd45a86175e300d6d5c6e309c29	postgres-multi	67d8361b394ded18c2e915e9e493e5f7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=b4df5d18bcd976f34bf51f2583ea8cfb
+_md5_=33e2e3cd3e9d142a315ef4c0229974ad
diff --git a/metadata/md5-cache/dev-db/rqlite-7.9.2 b/metadata/md5-cache/dev-db/rqlite-7.9.2
new file mode 100644
index 000000000000..6b5974a88628
--- /dev/null
+++ b/metadata/md5-cache/dev-db/rqlite-7.9.2
@@ -0,0 +1,13 @@
+BDEPEND=>=dev-lang/go-1.18 app-arch/unzip
+DEFINED_PHASES=compile install test unpack
+DESCRIPTION=Replicated SQLite using the Raft consensus protocol
+EAPI=7
+HOMEPAGE=https://github.com/rqlite/rqlite https://www.philipotoole.com/tag/rqlite/
+INHERIT=go-module
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT Apache-2.0 BSD CC0-1.0 MPL-2.0
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://github.com/rqlite/rqlite/archive/v7.9.2.tar.gz -> rqlite-7.9.2.tar.gz https://dev.gentoo.org/~zmedico/dist/rqlite-7.7.2-deps.tar.xz
+_eclasses_=go-module	15312495dc4fd84f8c37bbe228ea2abd
+_md5_=92292bb5bd3c7c66838244770cd1522a
diff --git a/metadata/md5-cache/dev-games/KXL-1.1.7_p17 b/metadata/md5-cache/dev-games/KXL-1.1.7_p17
index aa5ba5b7d321..0fa83eee1299 100644
--- a/metadata/md5-cache/dev-games/KXL-1.1.7_p17
+++ b/metadata/md5-cache/dev-games/KXL-1.1.7_p17
@@ -5,10 +5,10 @@ DESCRIPTION=Development Library for making games for X
 EAPI=8
 HOMEPAGE=http://kxl.orz.hm/
 INHERIT=autotools
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=x11-libs/libX11
 SLOT=0
 SRC_URI=mirror://debian/pool/main/k/kxl/kxl_1.1.7.orig.tar.gz -> KXL-1.1.7.tar.gz mirror://debian/pool/main/k/kxl/kxl_1.1.7-17.debian.tar.xz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=3fc319224b7093a06ab3ca7790e97c32
+_md5_=e049b55dabff10eda97c393f87f47188
diff --git a/metadata/md5-cache/dev-games/Manifest.gz b/metadata/md5-cache/dev-games/Manifest.gz
index e7194e0feb73..b8859cfe5939 100644
Binary files a/metadata/md5-cache/dev-games/Manifest.gz and b/metadata/md5-cache/dev-games/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index e7e576f6a63d..4fbb955cf005 100644
Binary files a/metadata/md5-cache/dev-java/Manifest.gz and b/metadata/md5-cache/dev-java/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-java/commons-text-1.10.0 b/metadata/md5-cache/dev-java/commons-text-1.10.0
index f2246550617b..d14dbd24a683 100644
--- a/metadata/md5-cache/dev-java/commons-text-1.10.0
+++ b/metadata/md5-cache/dev-java/commons-text-1.10.0
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://commons.apache.org/proper/commons-text/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=~amd64 ppc64 ~x86
+KEYWORDS=amd64 ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* dev-java/commons-lang:3.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache//commons/text/source/commons-text-1.10.0-src.tar.gz
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=337ad4806e71621b9eb3427efea5c142
+_md5_=172fcf75d090f02f6c1633d2d3ab5e05
diff --git a/metadata/md5-cache/dev-java/commons-text-1.9 b/metadata/md5-cache/dev-java/commons-text-1.9
deleted file mode 100644
index 917e42fa33b2..000000000000
--- a/metadata/md5-cache/dev-java/commons-text-1.9
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.8:* >=dev-java/commons-lang-3.11:3.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Apache Commons Text is a library focused on algorithms working on strings
-EAPI=7
-HOMEPAGE=https://commons.apache.org/proper/commons-text
-INHERIT=java-pkg-2 java-pkg-simple
-IUSE=doc source
-KEYWORDS=amd64 ppc64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.8:* >=dev-java/commons-lang-3.11:3.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://downloads.apache.org//commons/text/source/commons-text-1.9-src.tar.gz -> commons-text-1.9-sources.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=7bf149e50a545940e82cce31351cbf86
diff --git a/metadata/md5-cache/dev-java/jakarta-servlet-api-6.0.0 b/metadata/md5-cache/dev-java/jakarta-servlet-api-6.0.0
index 03e81a24fdee..93df161b8a8e 100644
--- a/metadata/md5-cache/dev-java/jakarta-servlet-api-6.0.0
+++ b/metadata/md5-cache/dev-java/jakarta-servlet-api-6.0.0
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://projects.eclipse.org/projects/ee4j.servlet
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=~amd64 ~arm arm64 ppc64
+KEYWORDS=amd64 ~arm arm64 ppc64
 LICENSE=EPL-2.0 GPL-2-with-classpath-exception
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=6
 SRC_URI=https://github.com/jakartaee/servlet/archive/6.0.0-RELEASE.tar.gz -> jakarta-servlet-api-6.0.0-RELEASE.tar.gz
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=ea75da9779346a62c183d459229ce156
+_md5_=5d2664ad92fb3e75a46097321e695be3
diff --git a/metadata/md5-cache/dev-java/jakartaee-migration-1.0.3 b/metadata/md5-cache/dev-java/jakartaee-migration-1.0.3
deleted file mode 100644
index fba1d9de1b8e..000000000000
--- a/metadata/md5-cache/dev-java/jakartaee-migration-1.0.3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.8:* dev-java/ant-core:0 dev-java/bcel:0 >=dev-java/commons-compress-1.20:0 dev-java/commons-io:1 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
-DESCRIPTION=Apache Tomcat tool for migration from Java EE 8 to Jakarta EE 9
-EAPI=8
-HOMEPAGE=https://tomcat.apache.org
-INHERIT=java-pkg-2 java-pkg-simple
-IUSE=doc source test
-KEYWORDS=amd64
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.8:* dev-java/ant-core:0 dev-java/bcel:0 >=dev-java/commons-compress-1.20:0 dev-java/commons-io:1 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://apache/tomcat/jakartaee-migration/v1.0.3/source/jakartaee-migration-1.0.3-src.tar.gz -> jakartaee-migration-1.0.3-sources.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=ca2a8fdd4f82c22c01e7dda5c287ce25
diff --git a/metadata/md5-cache/dev-java/jakartaee-migration-1.0.4 b/metadata/md5-cache/dev-java/jakartaee-migration-1.0.4
index 2a925c29e102..b31c14ce8c67 100644
--- a/metadata/md5-cache/dev-java/jakartaee-migration-1.0.4
+++ b/metadata/md5-cache/dev-java/jakartaee-migration-1.0.4
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://tomcat.apache.org
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* dev-java/ant-core:0 >=dev-java/bcel-6.5.0:0 >=dev-java/commons-compress-1.21:0 >=dev-java/commons-io-2.11.0:1 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://apache/tomcat/jakartaee-migration/v1.0.4/source/jakartaee-migration-1.0.4-src.tar.gz -> jakartaee-migration-1.0.4-sources.tar.gz
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=71e82eaa8e7b8e4e38dbd9c855986122
+_md5_=9cf6dbc17d414773961febac7710b852
diff --git a/metadata/md5-cache/dev-java/protobuf-java-3.19.6 b/metadata/md5-cache/dev-java/protobuf-java-3.19.6
new file mode 100644
index 000000000000..770d69277f1c
--- /dev/null
+++ b/metadata/md5-cache/dev-java/protobuf-java-3.19.6
@@ -0,0 +1,16 @@
+BDEPEND=dev-libs/protobuf:0/30
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.8:* test? ( dev-java/guava:0 dev-java/mockito:4 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=Google's Protocol Buffers - Java bindings
+EAPI=8
+HOMEPAGE=https://developers.google.com/protocol-buffers/
+INHERIT=java-pkg-2 java-pkg-simple
+IUSE=doc source test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos
+LICENSE=BSD
+RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test )
+SLOT=0/30
+SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.19.6.tar.gz -> protobuf-3.19.6.tar.gz
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
+_md5_=af4d4fb158481967ce14638867c3d7f6
diff --git a/metadata/md5-cache/dev-java/protobuf-java-3.20.3 b/metadata/md5-cache/dev-java/protobuf-java-3.20.3
new file mode 100644
index 000000000000..c045ece6dc20
--- /dev/null
+++ b/metadata/md5-cache/dev-java/protobuf-java-3.20.3
@@ -0,0 +1,16 @@
+BDEPEND=dev-libs/protobuf:0/31
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.8:* test? ( dev-java/guava:0 dev-java/mockito:4 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=Google's Protocol Buffers - Java bindings
+EAPI=8
+HOMEPAGE=https://developers.google.com/protocol-buffers/
+INHERIT=java-pkg-2 java-pkg-simple
+IUSE=doc source test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos
+LICENSE=BSD
+RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test )
+SLOT=0/31
+SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.20.3.tar.gz -> protobuf-3.20.3.tar.gz
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
+_md5_=6b0b3ca80a3094fffb40a070bafb1d3c
diff --git a/metadata/md5-cache/dev-java/protobuf-java-3.21.8 b/metadata/md5-cache/dev-java/protobuf-java-3.21.8
new file mode 100644
index 000000000000..e8207baa9ffe
--- /dev/null
+++ b/metadata/md5-cache/dev-java/protobuf-java-3.21.8
@@ -0,0 +1,16 @@
+BDEPEND=dev-libs/protobuf:0/32
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.8:* test? ( dev-java/guava:0 dev-java/mockito:4 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=Google's Protocol Buffers - Java bindings
+EAPI=8
+HOMEPAGE=https://developers.google.com/protocol-buffers/
+INHERIT=java-pkg-2 java-pkg-simple
+IUSE=doc source test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos
+LICENSE=BSD
+RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test )
+SLOT=0/32
+SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v21.8.tar.gz -> protobuf-21.8.tar.gz
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
+_md5_=48722d974c81cb1a3213d2515466da20
diff --git a/metadata/md5-cache/dev-java/protobuf-java-9999 b/metadata/md5-cache/dev-java/protobuf-java-9999
index d6b8c77213a4..b37dfc827fe6 100644
--- a/metadata/md5-cache/dev-java/protobuf-java-9999
+++ b/metadata/md5-cache/dev-java/protobuf-java-9999
@@ -1,14 +1,15 @@
-BDEPEND=~dev-libs/protobuf-9999 >=virtual/jdk-1.8:* >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=dev-libs/protobuf:0/32 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile install preinst prepare setup test unpack
-DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DEPEND=>=virtual/jdk-1.8:* test? ( dev-java/guava:0 dev-java/mockito:4 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 DESCRIPTION=Google's Protocol Buffers - Java bindings
 EAPI=8
-HOMEPAGE=https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf
+HOMEPAGE=https://developers.google.com/protocol-buffers/
 INHERIT=java-pkg-2 java-pkg-simple git-r3
-IUSE=doc source
+IUSE=doc source test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0/31
+RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test )
+SLOT=0/32
 _eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=4a3f061025934395a5049a5a8c1bf866
+_md5_=52846d34defc03b2b5570b2c113207f8
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index 3a7840332d4a..f21089881d71 100644
Binary files a/metadata/md5-cache/dev-lang/Manifest.gz and b/metadata/md5-cache/dev-lang/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-lang/python-3.10.8 b/metadata/md5-cache/dev-lang/python-3.10.8
index 824ba5acc324..ef060459b920 100644
--- a/metadata/md5-cache/dev-lang/python-3.10.8
+++ b/metadata/md5-cache/dev-lang/python-3.10.8
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=3.10
 SRC_URI=https://www.python.org/ftp/python/3.10.8/Python-3.10.8.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.10.8.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.10.8/Python-3.10.8.tar.xz.asc )
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	0748d665fa664a87add00152ed046e16	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=1b887cbdde6c13a0f7b6df24e4881661
+_md5_=e51b1bafa46db2737057b72bf6751e09
diff --git a/metadata/md5-cache/dev-lang/python-3.11.0 b/metadata/md5-cache/dev-lang/python-3.11.0
new file mode 100644
index 000000000000..813866ea1b9d
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/python-3.11.0
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/autoconf-archive virtual/awk virtual/pkgconfig verify-sig? ( sec-keys/openpgp-keys-python ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install postinst prepare pretend setup test unpack
+DEPEND=app-arch/bzip2:= app-arch/xz-utils:= app-crypt/libb2 >=dev-libs/expat-2.1:= 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? ( !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 ) !!<sys-apps/sandbox-2.21 bluetooth? ( net-wireless/bluez ) test? ( app-arch/xz-utils[extra-filters(+)] )
+DESCRIPTION=An interpreted, interactive, object-oriented programming language
+EAPI=7
+HOMEPAGE=https://www.python.org/ https://github.com/python/cpython/
+INHERIT=autotools check-reqs flag-o-matic multiprocessing pax-utils python-utils-r1 toolchain-funcs verify-sig
+IUSE=bluetooth build +ensurepip examples gdbm hardened libedit lto +ncurses pgo +readline +sqlite +ssl test tk verify-sig
+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:= app-crypt/libb2 >=dev-libs/expat-2.1:= 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? ( !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 ) !!<sys-apps/sandbox-2.21 !build? ( app-misc/mime-types ) dev-lang/python-exec[python_targets_python3_11(-)]
+RESTRICT=!test? ( test )
+SLOT=3.11
+SRC_URI=https://www.python.org/ftp/python/3.11.0/Python-3.11.0.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.11.0.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.11.0/Python-3.11.0.tar.xz.asc )
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	0748d665fa664a87add00152ed046e16	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=9620dac79d261fd8b7d20ed3652801c5
diff --git a/metadata/md5-cache/dev-lang/python-3.12.0_alpha1 b/metadata/md5-cache/dev-lang/python-3.12.0_alpha1
new file mode 100644
index 000000000000..1cb7f3c8e7f8
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/python-3.12.0_alpha1
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/autoconf-archive virtual/awk virtual/pkgconfig verify-sig? ( >=sec-keys/openpgp-keys-python-20221025 ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install postinst prepare pretend setup test unpack
+DEPEND=app-arch/bzip2:= app-arch/xz-utils:= app-crypt/libb2 >=dev-libs/expat-2.1:= 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? ( !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 ) !!<sys-apps/sandbox-2.21 bluetooth? ( net-wireless/bluez ) test? ( app-arch/xz-utils[extra-filters(+)] )
+DESCRIPTION=An interpreted, interactive, object-oriented programming language
+EAPI=7
+HOMEPAGE=https://www.python.org/ https://github.com/python/cpython/
+INHERIT=autotools check-reqs flag-o-matic multiprocessing pax-utils python-utils-r1 toolchain-funcs verify-sig
+IUSE=bluetooth build +ensurepip examples gdbm hardened libedit lto +ncurses pgo +readline +sqlite +ssl test tk verify-sig
+LICENSE=PSF-2
+RDEPEND=app-arch/bzip2:= app-arch/xz-utils:= app-crypt/libb2 >=dev-libs/expat-2.1:= 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? ( !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 ) !!<sys-apps/sandbox-2.21 !build? ( app-misc/mime-types )
+RESTRICT=!test? ( test )
+SLOT=3.12
+SRC_URI=https://www.python.org/ftp/python/3.12.0/Python-3.12.0a1.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.12.0a1.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.12.0/Python-3.12.0a1.tar.xz.asc )
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	0748d665fa664a87add00152ed046e16	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=b7df92274966574601f40f757069d192
diff --git a/metadata/md5-cache/dev-lang/python-3.8.15 b/metadata/md5-cache/dev-lang/python-3.8.15
index dfc1e79dc942..8ecf9b49c013 100644
--- a/metadata/md5-cache/dev-lang/python-3.8.15
+++ b/metadata/md5-cache/dev-lang/python-3.8.15
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=3.8
 SRC_URI=https://www.python.org/ftp/python/3.8.15/Python-3.8.15.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.8.15.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.8.15/Python-3.8.15.tar.xz.asc )
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	0748d665fa664a87add00152ed046e16	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=a1a58eb03c20d615302b1a56d4e69370
+_md5_=0d4f35df63446614440e6b94aef145f3
diff --git a/metadata/md5-cache/dev-lang/python-3.9.15 b/metadata/md5-cache/dev-lang/python-3.9.15
index 6be3eff22f67..2d9f2a127e0f 100644
--- a/metadata/md5-cache/dev-lang/python-3.9.15
+++ b/metadata/md5-cache/dev-lang/python-3.9.15
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=3.9
 SRC_URI=https://www.python.org/ftp/python/3.9.15/Python-3.9.15.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.9.15.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.9.15/Python-3.9.15.tar.xz.asc )
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	0748d665fa664a87add00152ed046e16	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=38b509b2bd404090d2f9857f59326f0f
+_md5_=5b622ba971f4d75942086f05da7fb2bd
diff --git a/metadata/md5-cache/dev-lang/swig-4.1.0 b/metadata/md5-cache/dev-lang/swig-4.1.0
new file mode 100644
index 000000000000..76a1760ca9f0
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/swig-4.1.0
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure install test
+DEPEND=pcre? ( dev-libs/libpcre2 ) ccache? ( sys-libs/zlib )
+DESCRIPTION=Simplified Wrapper and Interface Generator
+EAPI=8
+HOMEPAGE=http://www.swig.org/ https://github.com/swig/swig
+INHERIT=toolchain-funcs
+IUSE=ccache doc pcre
+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 ~x64-solaris ~x86-solaris
+LICENSE=GPL-3+ BSD BSD-2
+RDEPEND=pcre? ( dev-libs/libpcre2 ) ccache? ( sys-libs/zlib )
+SLOT=0
+SRC_URI=mirror://sourceforge/swig/swig-4.1.0.tar.gz
+_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=0c90b74457a6e705b27ef613f5493c20
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index e8356727ea79..dd3434d92d8f 100644
Binary files a/metadata/md5-cache/dev-libs/Manifest.gz and b/metadata/md5-cache/dev-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-libs/expat-2.5.0 b/metadata/md5-cache/dev-libs/expat-2.5.0
new file mode 100644
index 000000000000..6112565e6271
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/expat-2.5.0
@@ -0,0 +1,13 @@
+BDEPEND=unicode? ( || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Stream-oriented XML parser library
+EAPI=8
+HOMEPAGE=https://libexpat.github.io/
+INHERIT=autotools multilib-minimal
+IUSE=examples static-libs unicode 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
+LICENSE=MIT
+SLOT=0
+SRC_URI=https://github.com/libexpat/libexpat/releases/download/R_2_5_0/expat-2.5.0.tar.xz
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=37bf885f2764e55a53ef20cf37fc67b9
diff --git a/metadata/md5-cache/dev-libs/glib-2.74.1 b/metadata/md5-cache/dev-libs/glib-2.74.1
new file mode 100644
index 000000000000..c4546be13fe4
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/glib-2.74.1
@@ -0,0 +1,17 @@
+BDEPEND=app-text/docbook-xsl-stylesheets dev-libs/libxslt >=sys-devel/gettext-0.19.8 gtk-doc? ( >=dev-util/gtk-doc-1.33 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 ) systemtap? ( >=dev-util/systemtap-1.3 ) || ( >=dev-lang/python-3.11.0_beta4:3.11[xml(+)] >=dev-lang/python-3.10.4:3.10[xml(+)] >=dev-lang/python-3.9.12:3.9[xml(+)] >=dev-lang/python-3.8.13:3.8[xml(+)] ) test? ( >=sys-apps/dbus-1.2.14 ) virtual/pkgconfig 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=!<dev-util/gdbus-codegen-2.74.1 >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libpcre2-10.32: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(-)?,static-libs?] >=dev-libs/libffi-3.0.13-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/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(-)?] >=virtual/libintl-0-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] kernel_linux? ( >=sys-apps/util-linux-2.23[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-2.2.2-r5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xattr? ( !elibc_glibc? ( >=sys-apps/attr-2.4.47-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(-)?] ) ) elf? ( virtual/libelf:0= ) sysprof? ( >=dev-util/sysprof-capture-3.40.1:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+DESCRIPTION=The GLib library of C routines
+EAPI=8
+HOMEPAGE=https://www.gtk.org/
+INHERIT=flag-o-matic gnome.org gnome2-utils linux-info meson-multilib multilib python-any-r1 toolchain-funcs xdg
+IUSE=dbus debug +elf gtk-doc +mime selinux static-libs sysprof systemtap test utils xattr 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
+LICENSE=LGPL-2.1+
+PDEPEND=dbus? ( gnome-base/dconf ) mime? ( x11-misc/shared-mime-info )
+RDEPEND=!<dev-util/gdbus-codegen-2.74.1 >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libpcre2-10.32: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(-)?,static-libs?] >=dev-libs/libffi-3.0.13-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/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(-)?] >=virtual/libintl-0-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] kernel_linux? ( >=sys-apps/util-linux-2.23[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-2.2.2-r5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xattr? ( !elibc_glibc? ( >=sys-apps/attr-2.4.47-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(-)?] ) ) elf? ( virtual/libelf:0= ) sysprof? ( >=dev-util/sysprof-capture-3.40.1:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+RESTRICT=!test? ( test )
+SLOT=2
+SRC_URI=mirror://gnome/sources/glib/2.74/glib-2.74.1.tar.xz
+_eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	linux-info	bbfa385d6907d7948d49a5e107bd654d	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=e790be2f45f45301bf3d3899f792ad23
diff --git a/metadata/md5-cache/dev-libs/grantlee-5.2.0 b/metadata/md5-cache/dev-libs/grantlee-5.2.0
deleted file mode 100644
index dded5467a64b..000000000000
--- a/metadata/md5-cache/dev-libs/grantlee-5.2.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=doc? ( app-doc/doxygen[dot] ) test? ( dev-qt/linguist-tools:5 ) >=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=dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 test? ( dev-qt/qttest:5 )
-DESCRIPTION=C++ string template engine based on the Django template system
-EAPI=7
-HOMEPAGE=https://github.com/steveire/grantlee
-INHERIT=cmake virtualx
-IUSE=debug doc test test
-KEYWORDS=amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv x86
-LICENSE=LGPL-2.1+
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5
-SRC_URI=http://downloads.grantlee.org/grantlee-5.2.0.tar.gz
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	virtualx	644887c82aefdf12001489391fca4f02	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=01242c574a17bff110bcc77ea9714e9a
diff --git a/metadata/md5-cache/dev-libs/grantlee-5.3.0 b/metadata/md5-cache/dev-libs/grantlee-5.3.0
index 137d422ddc6d..4164059416fd 100644
--- a/metadata/md5-cache/dev-libs/grantlee-5.3.0
+++ b/metadata/md5-cache/dev-libs/grantlee-5.3.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/steveire/grantlee
 INHERIT=cmake virtualx
 IUSE=debug doc test test
-KEYWORDS=amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv x86
+KEYWORDS=amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv x86
 LICENSE=LGPL-2.1+
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=http://downloads.grantlee.org/grantlee-5.3.0.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	virtualx	644887c82aefdf12001489391fca4f02	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=837b0edf9f1ce8bc8d9cb0336e5467d3
+_md5_=672b233fe00edae381ad1d3e7ba5cf74
diff --git a/metadata/md5-cache/dev-libs/kreport-3.2.0-r3 b/metadata/md5-cache/dev-libs/kreport-3.2.0-r3
index 029c656c5745..bfd45fcd3009 100644
--- a/metadata/md5-cache/dev-libs/kreport-3.2.0-r3
+++ b/metadata/md5-cache/dev-libs/kreport-3.2.0-r3
@@ -1,6 +1,6 @@
 BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp: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/kproperty-3.2.0:5= >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kguiaddons-5.82.0:5 >=kde-frameworks/kwidgetsaddons-5.82.0:5 marble? ( kde-apps/marble:5= ) scripting? ( >=dev-qt/qtdeclarative-5.15.2:5 ) || ( >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DEPEND=>=dev-libs/kproperty-3.2.0:5= >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kguiaddons-5.82.0:5 >=kde-frameworks/kwidgetsaddons-5.82.0:5 marble? ( kde-apps/marble:5= ) scripting? ( >=dev-qt/qtdeclarative-5.15.2:5 ) || ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 DESCRIPTION=Framework for creation and generation of reports in multiple formats
 EAPI=8
 HOMEPAGE=https://community.kde.org/KReport
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5/4
 SRC_URI=mirror://kde/stable/kreport/src/kreport-3.2.0.tar.xz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	ecm	3dae552f761290722bcc848a12bfb538	flag-o-matic	29a755b1291d64133634d80b0328f153	kde.org	087d21100477ce987a8de6c1d613a176	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=5cfb3c9db9f467c1506b0ca18a29b408
+_md5_=619c09d76cf37ecf4f21558e185a1eac
diff --git a/metadata/md5-cache/dev-libs/libclc-15.0.3.9999 b/metadata/md5-cache/dev-libs/libclc-15.0.4.9999
similarity index 100%
rename from metadata/md5-cache/dev-libs/libclc-15.0.3.9999
rename to metadata/md5-cache/dev-libs/libclc-15.0.4.9999
diff --git a/metadata/md5-cache/dev-libs/libcpuid-0.6.1 b/metadata/md5-cache/dev-libs/libcpuid-0.6.1
new file mode 100644
index 000000000000..6885aa149c4d
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libcpuid-0.6.1
@@ -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 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare setup
+DEPEND=test? ( || ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 ) )
+DESCRIPTION=A small C library for x86 (and x86_64) CPU detection and feature extraction
+EAPI=8
+HOMEPAGE=http://libcpuid.sourceforge.net/
+INHERIT=autotools python-any-r1
+IUSE=static-libs test
+KEYWORDS=~amd64
+LICENSE=BSD-2
+RESTRICT=!test? ( test )
+SLOT=0/16
+SRC_URI=https://github.com/anrieff/libcpuid/archive/v0.6.1.tar.gz -> libcpuid-0.6.1.tar.gz
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=ba6f407345517498d116ee7a3c2ee298
diff --git a/metadata/md5-cache/dev-libs/libffi-3.4.2-r1 b/metadata/md5-cache/dev-libs/libffi-3.4.2-r1
deleted file mode 100644
index dfa386d0c4c0..000000000000
--- a/metadata/md5-cache/dev-libs/libffi-3.4.2-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=test? ( dev-util/dejagnu )
-DEFINED_PHASES=compile configure install postinst preinst prepare test
-DESCRIPTION=a portable, high level programming interface to various calling conventions
-EAPI=7
-HOMEPAGE=https://sourceware.org/libffi/
-INHERIT=multilib-minimal preserve-libs
-IUSE=debug exec-static-trampoline experimental-loong pax-kernel 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=~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
-RESTRICT=!test? ( test )
-SLOT=0/8
-SRC_URI=https://github.com/libffi/libffi/releases/download/v3.4.2/libffi-3.4.2.tar.gz experimental-loong? ( https://dev.gentoo.org/~xen0n/distfiles/libffi-3.4.2-loongarch64-20220428.patch.xz )
-_eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=067842e97bebc2f98982f7255bee45f3
diff --git a/metadata/md5-cache/dev-libs/libffi-3.4.3 b/metadata/md5-cache/dev-libs/libffi-3.4.4
similarity index 98%
rename from metadata/md5-cache/dev-libs/libffi-3.4.3
rename to metadata/md5-cache/dev-libs/libffi-3.4.4
index 2b4b68f14cc2..9c7016fcb2b3 100644
--- a/metadata/md5-cache/dev-libs/libffi-3.4.3
+++ b/metadata/md5-cache/dev-libs/libffi-3.4.4
@@ -9,6 +9,6 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~r
 LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0/8
-SRC_URI=https://github.com/libffi/libffi/releases/download/v3.4.3/libffi-3.4.3.tar.gz
+SRC_URI=https://github.com/libffi/libffi/releases/download/v3.4.4/libffi-3.4.4.tar.gz
 _eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
 _md5_=809fca0bf720541c3b5666fb76557dbb
diff --git a/metadata/md5-cache/dev-libs/libgpiod-1.4.1 b/metadata/md5-cache/dev-libs/libgpiod-1.4.1
deleted file mode 100644
index 473a1dbdc4de..000000000000
--- a/metadata/md5-cache/dev-libs/libgpiod-1.4.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install test
-DESCRIPTION=C library and tools for interacting with the linux GPIO character device
-EAPI=7
-HOMEPAGE=https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/
-INHERIT=multilib-minimal
-IUSE=static-libs +tools cxx python test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 arm arm64 ~riscv x86
-LICENSE=LGPL-2.1
-RESTRICT=!test? ( test )
-SLOT=0/1
-SRC_URI=https://mirrors.edge.kernel.org/pub/software/libs/libgpiod/libgpiod-1.4.1.tar.xz
-_eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=f8b60843b931bc654b956ec98ccd56d9
diff --git a/metadata/md5-cache/dev-libs/libgpiod-1.6.3-r1 b/metadata/md5-cache/dev-libs/libgpiod-1.6.3-r1
deleted file mode 100644
index 328f03fca6ae..000000000000
--- a/metadata/md5-cache/dev-libs/libgpiod-1.6.3-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst setup test
-DEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf )
-DESCRIPTION=C library and tools for interacting with the linux GPIO character device
-EAPI=8
-HOMEPAGE=https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/
-INHERIT=linux-mod multilib-minimal
-IUSE=static-libs +tools cxx python test dist-kernel 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 ~riscv x86
-LICENSE=LGPL-2.1
-RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
-RESTRICT=!test? ( test )
-SLOT=0/2
-SRC_URI=https://mirrors.edge.kernel.org/pub/software/libs/libgpiod/libgpiod-1.6.3.tar.xz
-_eclasses_=linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	3167123d17b3550117c7e554fd22ca02	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=515f89aa2beea155a0b30a1f364fb9fd
diff --git a/metadata/md5-cache/dev-libs/libgpiod-1.6.3-r4 b/metadata/md5-cache/dev-libs/libgpiod-1.6.3-r4
index 5edd571572ac..4bd06cbe980a 100644
--- a/metadata/md5-cache/dev-libs/libgpiod-1.6.3-r4
+++ b/metadata/md5-cache/dev-libs/libgpiod-1.6.3-r4
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/
 INHERIT=linux-info
 IUSE=+tools cxx python test
-KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
+KEYWORDS=amd64 arm arm64 ~riscv x86
 LICENSE=LGPL-2.1
 RESTRICT=!test? ( test )
 SLOT=0/2
 SRC_URI=https://mirrors.edge.kernel.org/pub/software/libs/libgpiod/libgpiod-1.6.3.tar.xz
 _eclasses_=linux-info	bbfa385d6907d7948d49a5e107bd654d	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=bd899a29dd3cddb655e6f1d92824f88c
+_md5_=985237337b159a6e180289e226859b48
diff --git a/metadata/md5-cache/dev-libs/libucl-0.8.1-r100 b/metadata/md5-cache/dev-libs/libucl-0.8.1-r100
index 1e8a3442f03f..90033608a3e8 100644
--- a/metadata/md5-cache/dev-libs/libucl-0.8.1-r100
+++ b/metadata/md5-cache/dev-libs/libucl-0.8.1-r100
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/vstakhov/libucl/archive/0.8.1.tar.gz -> libucl-0.8.1.tar.gz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=c3fcc9dc8d1ccded2ccd07862a9b8ef0
+_md5_=49a48a284f22c4571148c22394ea8c2a
diff --git a/metadata/md5-cache/dev-libs/libucl-9999 b/metadata/md5-cache/dev-libs/libucl-9999
index fc647bf9bd08..d6549827421b 100644
--- a/metadata/md5-cache/dev-libs/libucl-9999
+++ b/metadata/md5-cache/dev-libs/libucl-9999
@@ -13,4 +13,4 @@ REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-3 ) )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=c3fcc9dc8d1ccded2ccd07862a9b8ef0
+_md5_=49a48a284f22c4571148c22394ea8c2a
diff --git a/metadata/md5-cache/dev-libs/libzia-4.37 b/metadata/md5-cache/dev-libs/libzia-4.37
new file mode 100644
index 000000000000..fe148070822b
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libzia-4.37
@@ -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 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare
+DEPEND=dev-libs/glib:2 x11-libs/gtk+:2 media-libs/libsdl media-libs/libpng:0 ftdi? ( dev-embedded/libftdi:1 ) elibc_musl? ( sys-libs/libunwind )
+DESCRIPTION=Platform abstraction code for tucnak package
+EAPI=8
+HOMEPAGE=http://tucnak.nagano.cz
+INHERIT=autotools flag-o-matic
+IUSE=ftdi
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/glib:2 x11-libs/gtk+:2 media-libs/libsdl media-libs/libpng:0 ftdi? ( dev-embedded/libftdi:1 ) elibc_musl? ( sys-libs/libunwind )
+SLOT=0
+SRC_URI=http://tucnak.nagano.cz/libzia-4.37.tar.gz
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=bd3619554abd6bc85a1dc925b0d77f0c
diff --git a/metadata/md5-cache/dev-cpp/argparse-2.1-r1 b/metadata/md5-cache/dev-libs/mmtf-cpp-1.1.0
similarity index 57%
rename from metadata/md5-cache/dev-cpp/argparse-2.1-r1
rename to metadata/md5-cache/dev-libs/mmtf-cpp-1.1.0
index f4a10f552ea7..1f9cd885da67 100644
--- a/metadata/md5-cache/dev-cpp/argparse-2.1-r1
+++ b/metadata/md5-cache/dev-libs/mmtf-cpp-1.1.0
@@ -1,12 +1,14 @@
 BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Argument Parser for Modern C++
+DEPEND=dev-libs/msgpack
+DESCRIPTION=The pure C++ implementation of the MMTF API, decoder and encoder
 EAPI=8
-HOMEPAGE=https://github.com/p-ranav/argparse
+HOMEPAGE=https://github.com/rcsb/mmtf-cpp
 INHERIT=cmake
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=MIT
+RDEPEND=dev-libs/msgpack
 SLOT=0
-SRC_URI=https://github.com/p-ranav/argparse/archive/v2.1.tar.gz -> argparse-2.1.tar.gz
+SRC_URI=https://github.com/rcsb/mmtf-cpp/archive/v1.1.0.tar.gz -> mmtf-cpp-1.1.0.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=175b12f7b393001a7c0d0cba6ad793a0
+_md5_=fd19388229b99fe598d545f115cd75a5
diff --git a/metadata/md5-cache/dev-libs/nss-3.68.4 b/metadata/md5-cache/dev-libs/nss-3.68.4
deleted file mode 100644
index f7266fa2a703..000000000000
--- a/metadata/md5-cache/dev-libs/nss-3.68.4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-lang/perl
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=>=dev-libs/nspr-4.32[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-db/sqlite-3.8.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-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(-)?] virtual/pkgconfig
-DESCRIPTION=Mozilla's Network Security Services library that implements PKI support
-EAPI=7
-HOMEPAGE=https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS
-INHERIT=flag-o-matic multilib toolchain-funcs multilib-minimal
-IUSE=cacert utils cpu_flags_ppc_altivec cpu_flags_ppc_vsx 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 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
-LICENSE=|| ( MPL-2.0 GPL-2 LGPL-2.1 )
-RDEPEND=>=dev-libs/nspr-4.32[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-db/sqlite-3.8.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-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(-)?] virtual/pkgconfig
-RESTRICT=test
-SLOT=0
-SRC_URI=https://archive.mozilla.org/pub/security/nss/releases/NSS_3_68_4_RTM/src/nss-3.68.4.tar.gz cacert? ( https://dev.gentoo.org/~whissi/dist/ca-certificates/nss-cacert-class1-class3-r2.patch )
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=7ae8938a3b52acde0badd732640ba410
diff --git a/metadata/md5-cache/dev-libs/nss-pem-1.0.8 b/metadata/md5-cache/dev-libs/nss-pem-1.0.8
index 4c4a7fa9c384..e34c7482de71 100644
--- a/metadata/md5-cache/dev-libs/nss-pem-1.0.8
+++ b/metadata/md5-cache/dev-libs/nss-pem-1.0.8
@@ -6,10 +6,10 @@ EAPI=7
 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 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-solaris
 LICENSE=MPL-1.1
 RDEPEND=>=dev-libs/nss-3.50-r1
 SLOT=0
 SRC_URI=https://github.com/kdudka/nss-pem/releases/download/nss-pem-1.0.8/nss-pem-1.0.8.tar.xz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=b9a1270139c9f8cac62984d653e18b60
+_md5_=9c4e269a6169638cc08c1aa8a786fa9d
diff --git a/metadata/md5-cache/dev-libs/poco-1.11.2-r1 b/metadata/md5-cache/dev-libs/poco-1.11.2-r1
index e475e71e0dbf..e16576e0cf0c 100644
--- a/metadata/md5-cache/dev-libs/poco-1.11.2-r1
+++ b/metadata/md5-cache/dev-libs/poco-1.11.2-r1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://pocoproject.org/
 INHERIT=cmake
 IUSE=7z activerecord cppparser +crypto +data examples +file2pagecompiler iodbc +json mariadb +mongodb mysql +net odbc +pagecompiler pdf pocodoc sqlite +ssl test +util +xml +zip
-KEYWORDS=amd64 ~arm ~arm64 ppc64 x86
+KEYWORDS=amd64 arm arm64 ppc64 x86
 LICENSE=Boost-1.0
 RDEPEND=>=dev-libs/libpcre-8.42 activerecord? ( !app-arch/arc ) mysql? ( !mariadb? ( dev-db/mysql-connector-c:0= ) mariadb? ( dev-db/mariadb-connector-c:0= ) ) odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( dev-db/unixODBC ) ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl:0= ) xml? ( dev-libs/expat ) zip? ( sys-libs/zlib )
 REQUIRED_USE=7z? ( xml ) file2pagecompiler? ( pagecompiler ) iodbc? ( odbc ) mongodb? ( data ) mysql? ( data ) odbc? ( data ) pagecompiler? ( json net util xml ) pocodoc? ( cppparser util xml ) sqlite? ( data ) ssl? ( util ) test? ( data? ( sqlite ) json util xml )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pocoproject/poco/archive/poco-1.11.2-release.tar.gz -> poco-1.11.2.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=51b41adc481ede30fe7bc222a58c0789
+_md5_=59dcf9105eca4f88a3513804464eaaf4
diff --git a/metadata/md5-cache/dev-libs/ppl-1.2-r4 b/metadata/md5-cache/dev-libs/ppl-1.2-r4
deleted file mode 100644
index 024cafc51dfe..000000000000
--- a/metadata/md5-cache/dev-libs/ppl-1.2-r4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install prepare
-DEPEND=>=dev-libs/gmp-6[cxx(+)] lpsol? ( sci-mathematics/glpk ) app-arch/xz-utils sys-devel/m4
-DESCRIPTION=The Parma Polyhedra Library for numerical analysis of complex systems
-EAPI=7
-HOMEPAGE=http://bugseng.com/products/ppl
-INHERIT=autotools
-IUSE=cdd +cxx doc lpsol pch static-libs test
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~sparc-solaris
-LICENSE=GPL-3
-RDEPEND=>=dev-libs/gmp-6[cxx(+)] lpsol? ( sci-mathematics/glpk )
-RESTRICT=!test? ( test )
-SLOT=0/4.14
-SRC_URI=http://bugseng.com/products/ppl/download/ftp/releases/1.2/ppl-1.2.tar.xz https://dev.gentoo.org/~juippis/distfiles/tmp/ppl-1.2-r3-disable-boeing-tests.patch
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=f16fbf839d826716017e803b52809886
diff --git a/metadata/md5-cache/dev-libs/ppl-1.2-r5 b/metadata/md5-cache/dev-libs/ppl-1.2-r5
index e8850d01aaf2..0869d2062327 100644
--- a/metadata/md5-cache/dev-libs/ppl-1.2-r5
+++ b/metadata/md5-cache/dev-libs/ppl-1.2-r5
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=http://bugseng.com/products/ppl
 INHERIT=autotools
 IUSE=cdd +cxx doc lpsol pch test
-KEYWORDS=~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~sparc-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~sparc-solaris
 LICENSE=GPL-3
 RDEPEND=>=dev-libs/gmp-6[cxx(+)] lpsol? ( sci-mathematics/glpk )
 RESTRICT=!test? ( test )
 SLOT=0/4.14
 SRC_URI=http://bugseng.com/products/ppl/download/ftp/releases/1.2/ppl-1.2.tar.xz https://dev.gentoo.org/~juippis/distfiles/tmp/ppl-1.2-r3-disable-boeing-tests.patch
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=847c2cd48bb92c42f37fe3830471e707
+_md5_=07c9dce2fb440fc35d5eaf268e0ef4c5
diff --git a/metadata/md5-cache/dev-libs/protobuf-21.8 b/metadata/md5-cache/dev-libs/protobuf-21.8
new file mode 100644
index 000000000000..2e6ee9630f0d
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/protobuf-21.8
@@ -0,0 +1,16 @@
+BDEPEND=emacs? ( app-editors/emacs:* ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=test? ( >=dev-cpp/gtest-1.9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+DESCRIPTION=Google's Protocol Buffers - Extensible mechanism for serializing structured data
+EAPI=8
+HOMEPAGE=https://developers.google.com/protocol-buffers/
+INHERIT=autotools elisp-common flag-o-matic multilib-minimal toolchain-funcs
+IUSE=emacs examples static-libs test zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
+LICENSE=BSD
+RDEPEND=emacs? ( app-editors/emacs:* ) zlib? ( sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+RESTRICT=!test? ( test )
+SLOT=0/32
+SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v21.8.tar.gz -> protobuf-21.8.tar.gz
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=0b8d6ca8672fc810504244a779d8cdbf
diff --git a/metadata/md5-cache/dev-libs/protobuf-3.19.6 b/metadata/md5-cache/dev-libs/protobuf-3.19.6
new file mode 100644
index 000000000000..59e792e26253
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/protobuf-3.19.6
@@ -0,0 +1,16 @@
+BDEPEND=emacs? ( app-editors/emacs:* ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=test? ( >=dev-cpp/gtest-1.9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+DESCRIPTION=Google's Protocol Buffers - Extensible mechanism for serializing structured data
+EAPI=8
+HOMEPAGE=https://developers.google.com/protocol-buffers/
+INHERIT=autotools elisp-common flag-o-matic multilib-minimal toolchain-funcs
+IUSE=emacs examples static-libs test zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
+LICENSE=BSD
+RDEPEND=emacs? ( app-editors/emacs:* ) zlib? ( sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+RESTRICT=!test? ( test )
+SLOT=0/30
+SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.19.6.tar.gz -> protobuf-3.19.6.tar.gz
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=abb84b2b30995453282b9aa02d86db48
diff --git a/metadata/md5-cache/dev-libs/protobuf-3.20.3 b/metadata/md5-cache/dev-libs/protobuf-3.20.3
new file mode 100644
index 000000000000..b33714cb1a9e
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/protobuf-3.20.3
@@ -0,0 +1,16 @@
+BDEPEND=emacs? ( app-editors/emacs:* ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=test? ( >=dev-cpp/gtest-1.9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+DESCRIPTION=Google's Protocol Buffers - Extensible mechanism for serializing structured data
+EAPI=8
+HOMEPAGE=https://developers.google.com/protocol-buffers/
+INHERIT=autotools elisp-common flag-o-matic multilib-minimal toolchain-funcs
+IUSE=emacs examples static-libs test zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
+LICENSE=BSD
+RDEPEND=emacs? ( app-editors/emacs:* ) zlib? ( sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+RESTRICT=!test? ( test )
+SLOT=0/31
+SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.20.3.tar.gz -> protobuf-3.20.3.tar.gz
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=b35ca7f812bf689dba5de80a12eaa3e2
diff --git a/metadata/md5-cache/dev-libs/protobuf-9999 b/metadata/md5-cache/dev-libs/protobuf-9999
index 96852dee62ca..b2e001a48f52 100644
--- a/metadata/md5-cache/dev-libs/protobuf-9999
+++ b/metadata/md5-cache/dev-libs/protobuf-9999
@@ -3,13 +3,13 @@ DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
 DEPEND=test? ( >=dev-cpp/gtest-1.9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 DESCRIPTION=Google's Protocol Buffers - Extensible mechanism for serializing structured data
 EAPI=8
-HOMEPAGE=https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf
+HOMEPAGE=https://developers.google.com/protocol-buffers/
 INHERIT=autotools elisp-common flag-o-matic multilib-minimal toolchain-funcs git-r3
 IUSE=emacs examples static-libs test zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 LICENSE=BSD
 PROPERTIES=live
 RDEPEND=emacs? ( app-editors/emacs:* ) zlib? ( sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 RESTRICT=!test? ( test )
-SLOT=0/31
+SLOT=0/32
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	flag-o-matic	29a755b1291d64133634d80b0328f153	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=4bf5ed86f7338bf29dbc342b5e259939
+_md5_=80f580efbec0d633db1b9f98cd0e3b79
diff --git a/metadata/md5-cache/dev-libs/tree-sitter-0.20.7 b/metadata/md5-cache/dev-libs/tree-sitter-0.20.7
index a27c50b4d949..d7ae530444d9 100644
--- a/metadata/md5-cache/dev-libs/tree-sitter-0.20.7
+++ b/metadata/md5-cache/dev-libs/tree-sitter-0.20.7
@@ -3,9 +3,9 @@ DESCRIPTION=Tree-sitter is a parser generator tool and an incremental parsing li
 EAPI=8
 HOMEPAGE=https://github.com/tree-sitter/tree-sitter
 INHERIT=optfeature toolchain-funcs
-KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/tree-sitter/tree-sitter/archive/refs/tags/v0.20.7.tar.gz -> tree-sitter-0.20.7.tar.gz
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	optfeature	1a2157392a869265b2afcb63a26c12ac	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=87f717be583a6a41ec56fce9c4125c3c
+_md5_=2497fd8ad704a75ec4a66f8b3247c577
diff --git a/metadata/md5-cache/dev-ml/Manifest.gz b/metadata/md5-cache/dev-ml/Manifest.gz
index 01bb22aa2bd4..7523f874ad43 100644
Binary files a/metadata/md5-cache/dev-ml/Manifest.gz and b/metadata/md5-cache/dev-ml/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-15.0.3.9999 b/metadata/md5-cache/dev-ml/llvm-ocaml-15.0.3.9999
deleted file mode 100644
index 24c55e25cd5e..000000000000
--- a/metadata/md5-cache/dev-ml/llvm-ocaml-15.0.3.9999
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) dev-lang/perl dev-ml/findlib >=dev-util/cmake-3.16 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-15.0.3.9999:=[debug?] !sys-devel/llvm[ocaml(-)] llvm_targets_AArch64? ( ~sys-devel/llvm-15.0.3.9999[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-15.0.3.9999[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-15.0.3.9999[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-15.0.3.9999[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-15.0.3.9999[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-15.0.3.9999[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-15.0.3.9999[llvm_targets_Lanai] ) llvm_targets_Mips? ( ~sys-devel/llvm-15.0.3.9999[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-15.0.3.9999[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-15.0.3.9999[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-15.0.3.9999[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-15.0.3.9999[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-15.0.3.9999[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-15.0.3.9999[llvm_targets_SystemZ] ) llvm_targets_VE? ( ~sys-devel/llvm-15.0.3.9999[llvm_targets_VE] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-15.0.3.9999[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-15.0.3.9999[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-15.0.3.9999[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-15.0.3.9999[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-15.0.3.9999[llvm_targets_CSKY] ) llvm_targets_DirectX? ( ~sys-devel/llvm-15.0.3.9999[llvm_targets_DirectX] ) llvm_targets_LoongArch? ( ~sys-devel/llvm-15.0.3.9999[llvm_targets_LoongArch] ) llvm_targets_M68k? ( ~sys-devel/llvm-15.0.3.9999[llvm_targets_M68k] ) llvm_targets_SPIRV? ( ~sys-devel/llvm-15.0.3.9999[llvm_targets_SPIRV] ) !!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_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_LoongArch llvm_targets_M68k llvm_targets_SPIRV
-LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
-PROPERTIES=live
-RDEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-15.0.3.9999:=[debug?] !sys-devel/llvm[ocaml(-)] llvm_targets_AArch64? ( ~sys-devel/llvm-15.0.3.9999[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-15.0.3.9999[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-15.0.3.9999[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-15.0.3.9999[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-15.0.3.9999[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-15.0.3.9999[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-15.0.3.9999[llvm_targets_Lanai] ) llvm_targets_Mips? ( ~sys-devel/llvm-15.0.3.9999[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-15.0.3.9999[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-15.0.3.9999[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-15.0.3.9999[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-15.0.3.9999[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-15.0.3.9999[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-15.0.3.9999[llvm_targets_SystemZ] ) llvm_targets_VE? ( ~sys-devel/llvm-15.0.3.9999[llvm_targets_VE] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-15.0.3.9999[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-15.0.3.9999[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-15.0.3.9999[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-15.0.3.9999[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-15.0.3.9999[llvm_targets_CSKY] ) llvm_targets_DirectX? ( ~sys-devel/llvm-15.0.3.9999[llvm_targets_DirectX] ) llvm_targets_LoongArch? ( ~sys-devel/llvm-15.0.3.9999[llvm_targets_LoongArch] ) llvm_targets_M68k? ( ~sys-devel/llvm-15.0.3.9999[llvm_targets_M68k] ) llvm_targets_SPIRV? ( ~sys-devel/llvm-15.0.3.9999[llvm_targets_SPIRV] )
-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_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_LoongArch llvm_targets_M68k llvm_targets_SPIRV )
-RESTRICT=!test? ( test )
-SLOT=0/15.0.3.9999
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	llvm	29d5332b8530fb760c2ca71ad6706858	llvm.org	ab48c0803b67a958624f7600ef86081c	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=31ce9612f8264beb63ef452e8f3ae5d7
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-15.0.4.9999 b/metadata/md5-cache/dev-ml/llvm-ocaml-15.0.4.9999
new file mode 100644
index 000000000000..2a3c87f49789
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/llvm-ocaml-15.0.4.9999
@@ -0,0 +1,16 @@
+BDEPEND=|| ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) dev-lang/perl dev-ml/findlib >=dev-util/cmake-3.16 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-15.0.4.9999:=[debug?] !sys-devel/llvm[ocaml(-)] llvm_targets_AArch64? ( ~sys-devel/llvm-15.0.4.9999[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-15.0.4.9999[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-15.0.4.9999[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-15.0.4.9999[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-15.0.4.9999[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-15.0.4.9999[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-15.0.4.9999[llvm_targets_Lanai] ) llvm_targets_Mips? ( ~sys-devel/llvm-15.0.4.9999[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-15.0.4.9999[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-15.0.4.9999[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-15.0.4.9999[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-15.0.4.9999[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-15.0.4.9999[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-15.0.4.9999[llvm_targets_SystemZ] ) llvm_targets_VE? ( ~sys-devel/llvm-15.0.4.9999[llvm_targets_VE] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-15.0.4.9999[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-15.0.4.9999[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-15.0.4.9999[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-15.0.4.9999[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-15.0.4.9999[llvm_targets_CSKY] ) llvm_targets_DirectX? ( ~sys-devel/llvm-15.0.4.9999[llvm_targets_DirectX] ) llvm_targets_LoongArch? ( ~sys-devel/llvm-15.0.4.9999[llvm_targets_LoongArch] ) llvm_targets_M68k? ( ~sys-devel/llvm-15.0.4.9999[llvm_targets_M68k] ) llvm_targets_SPIRV? ( ~sys-devel/llvm-15.0.4.9999[llvm_targets_SPIRV] ) !!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_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_LoongArch llvm_targets_M68k llvm_targets_SPIRV
+LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
+PROPERTIES=live
+RDEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-15.0.4.9999:=[debug?] !sys-devel/llvm[ocaml(-)] llvm_targets_AArch64? ( ~sys-devel/llvm-15.0.4.9999[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-15.0.4.9999[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-15.0.4.9999[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-15.0.4.9999[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-15.0.4.9999[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-15.0.4.9999[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-15.0.4.9999[llvm_targets_Lanai] ) llvm_targets_Mips? ( ~sys-devel/llvm-15.0.4.9999[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-15.0.4.9999[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-15.0.4.9999[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-15.0.4.9999[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-15.0.4.9999[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-15.0.4.9999[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-15.0.4.9999[llvm_targets_SystemZ] ) llvm_targets_VE? ( ~sys-devel/llvm-15.0.4.9999[llvm_targets_VE] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-15.0.4.9999[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-15.0.4.9999[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-15.0.4.9999[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-15.0.4.9999[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-15.0.4.9999[llvm_targets_CSKY] ) llvm_targets_DirectX? ( ~sys-devel/llvm-15.0.4.9999[llvm_targets_DirectX] ) llvm_targets_LoongArch? ( ~sys-devel/llvm-15.0.4.9999[llvm_targets_LoongArch] ) llvm_targets_M68k? ( ~sys-devel/llvm-15.0.4.9999[llvm_targets_M68k] ) llvm_targets_SPIRV? ( ~sys-devel/llvm-15.0.4.9999[llvm_targets_SPIRV] )
+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_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_LoongArch llvm_targets_M68k llvm_targets_SPIRV )
+RESTRICT=!test? ( test )
+SLOT=0/15.0.4.9999
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	llvm	29d5332b8530fb760c2ca71ad6706858	llvm.org	ab48c0803b67a958624f7600ef86081c	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=31ce9612f8264beb63ef452e8f3ae5d7
diff --git a/metadata/md5-cache/dev-perl/GD-2.760.0 b/metadata/md5-cache/dev-perl/GD-2.760.0
new file mode 100644
index 000000000000..5026b6003c32
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/GD-2.760.0
@@ -0,0 +1,16 @@
+BDEPEND=>=media-libs/gd-2.2.3[png,jpeg] media-libs/giflib media-libs/libjpeg-turbo media-libs/libpng sys-libs/zlib truetype? ( media-libs/gd[truetype] media-libs/freetype:2 ) xpm? ( media-libs/gd[xpm] x11-libs/libXpm ) fcgi? ( dev-libs/fcgi ) >=virtual/perl-ExtUtils-Constant-0.230.0 dev-perl/ExtUtils-PkgConfig virtual/perl-ExtUtils-MakeMaker test? ( >=dev-perl/Test-Fork-0.20.0 >=virtual/perl-Test-Simple-0.880.0 ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=media-libs/gd-2.2.3[png,jpeg] media-libs/giflib media-libs/libjpeg-turbo media-libs/libpng sys-libs/zlib truetype? ( media-libs/gd[truetype] media-libs/freetype:2 ) xpm? ( media-libs/gd[xpm] x11-libs/libXpm ) fcgi? ( dev-libs/fcgi ) dev-lang/perl
+DESCRIPTION=Interface to Thomas Boutell's gd library
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/GD
+INHERIT=perl-module
+IUSE=animgif fcgi test truetype xpm test examples
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=media-libs/gd-2.2.3[png,jpeg] media-libs/giflib media-libs/libjpeg-turbo media-libs/libpng sys-libs/zlib truetype? ( media-libs/gd[truetype] media-libs/freetype:2 ) xpm? ( media-libs/gd[xpm] x11-libs/libXpm ) fcgi? ( dev-libs/fcgi ) dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/R/RU/RURBAN/GD-2.76.tar.gz
+_eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	21a0cb6221498d0e7894bdf445b79887	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
+_md5_=3ddc619d823d234bcad29747a705a995
diff --git a/metadata/md5-cache/dev-perl/Manifest.gz b/metadata/md5-cache/dev-perl/Manifest.gz
index 9394b0d1093c..157e39a9b729 100644
Binary files a/metadata/md5-cache/dev-perl/Manifest.gz and b/metadata/md5-cache/dev-perl/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-perl/Net-AMQP-RabbitMQ-2.40010 b/metadata/md5-cache/dev-perl/Net-AMQP-RabbitMQ-2.40010
new file mode 100644
index 000000000000..905420b3377f
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Net-AMQP-RabbitMQ-2.40010
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-perl/Math-Int64-0.540.0 >=virtual/perl-ExtUtils-MakeMaker-6.660.0 test? ( net-misc/rabbitmq-server ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=interact with RabbitMQ over AMQP using librabbitmq
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Net-AMQP-RabbitMQ
+INHERIT=perl-module
+IUSE=test test
+KEYWORDS=~amd64 ~arm64
+LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
+RDEPEND=>=dev-perl/Math-Int64-0.540.0 dev-lang/perl:=
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/M/MS/MSTEMLE/Net-AMQP-RabbitMQ-2.40010.tar.gz
+_eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	21a0cb6221498d0e7894bdf445b79887	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
+_md5_=e681e71cdfea3a53db4a17e0b7057e7e
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index c49366c8c2cd..e755172bacad 100644
Binary files a/metadata/md5-cache/dev-python/Manifest.gz and b/metadata/md5-cache/dev-python/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-python/aiohttp-3.8.3 b/metadata/md5-cache/dev-python/aiohttp-3.8.3
index 3b6ac6e418d6..9202fa2f2e39 100644
--- a/metadata/md5-cache/dev-python/aiohttp-3.8.3
+++ b/metadata/md5-cache/dev-python/aiohttp-3.8.3
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/aio-libs/aiohttp/ https://pypi.org/project/aiohttp/
 INHERIT=distutils-r1 multiprocessing
 IUSE=test-rust test doc python_targets_pypy3 python_targets_python3_8 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=Apache-2.0
 RDEPEND=app-arch/brotli[python,python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/aiosignal-1.1.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/async-timeout-4.0.0_alpha3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/attrs-17.3.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/charset_normalizer-2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/frozenlist-1.1.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/multidict-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/yarl-1.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 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/a/aiohttp/aiohttp-3.8.3.tar.gz
 _eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=992f50a758465b74c065ea00f6f17933
+_md5_=2e42646addc9dfd61d4c6718db6b9dcc
diff --git a/metadata/md5-cache/dev-python/aws-sam-translator-1.50.0 b/metadata/md5-cache/dev-python/aws-sam-translator-1.50.0
deleted file mode 100644
index a74930d30847..000000000000
--- a/metadata/md5-cache/dev-python/aws-sam-translator-1.50.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/parameterized[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( <dev-python/boto3-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/boto3-1.19.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-3.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A library that transform SAM templates into AWS CloudFormation templates
-EAPI=8
-HOMEPAGE=https://github.com/aws/serverless-application-model/ https://pypi.org/project/aws-sam-translator/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=<dev-python/boto3-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/boto3-1.19.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-3.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/aws/serverless-application-model/archive/v1.50.0.tar.gz -> aws-sam-translator-1.50.0.gh.tar.gz
-_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=c5dd96794b60920ec5d0d4b921b1e219
diff --git a/metadata/md5-cache/dev-python/aws-sam-translator-1.51.0 b/metadata/md5-cache/dev-python/aws-sam-translator-1.51.0
deleted file mode 100644
index 2f3ad0dc7a04..000000000000
--- a/metadata/md5-cache/dev-python/aws-sam-translator-1.51.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/parameterized[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( <dev-python/boto3-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/boto3-1.19.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-3.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A library that transform SAM templates into AWS CloudFormation templates
-EAPI=8
-HOMEPAGE=https://github.com/aws/serverless-application-model/ https://pypi.org/project/aws-sam-translator/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=<dev-python/boto3-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/boto3-1.19.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-3.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/aws/serverless-application-model/archive/v1.51.0.tar.gz -> aws-sam-translator-1.51.0.gh.tar.gz
-_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=485f35ba7ed8681c67a26dfc45c1d571
diff --git a/metadata/md5-cache/dev-python/aws-sam-translator-1.52.0 b/metadata/md5-cache/dev-python/aws-sam-translator-1.52.0
deleted file mode 100644
index 656cd88c2afb..000000000000
--- a/metadata/md5-cache/dev-python/aws-sam-translator-1.52.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/parameterized[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( <dev-python/boto3-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/boto3-1.19.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-3.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A library that transform SAM templates into AWS CloudFormation templates
-EAPI=8
-HOMEPAGE=https://github.com/aws/serverless-application-model/ https://pypi.org/project/aws-sam-translator/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=<dev-python/boto3-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/boto3-1.19.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-3.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/aws/serverless-application-model/archive/v1.52.0.tar.gz -> aws-sam-translator-1.52.0.gh.tar.gz
-_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=485f35ba7ed8681c67a26dfc45c1d571
diff --git a/metadata/md5-cache/dev-python/aws-sam-translator-1.53.0 b/metadata/md5-cache/dev-python/aws-sam-translator-1.53.0
index b99e1cd7e2a5..1cc3a95692c0 100644
--- a/metadata/md5-cache/dev-python/aws-sam-translator-1.53.0
+++ b/metadata/md5-cache/dev-python/aws-sam-translator-1.53.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/aws/serverless-application-model/ https://pypi.org/project/aws-sam-translator/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=<dev-python/boto3-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/boto3-1.19.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-3.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_8 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/aws/serverless-application-model/archive/v1.53.0.tar.gz -> aws-sam-translator-1.53.0.gh.tar.gz
 _eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=485f35ba7ed8681c67a26dfc45c1d571
+_md5_=c5dd96794b60920ec5d0d4b921b1e219
diff --git a/metadata/md5-cache/dev-python/boto3-1.24.80 b/metadata/md5-cache/dev-python/boto3-1.24.80
deleted file mode 100644
index bdca4099c49b..000000000000
--- a/metadata/md5-cache/dev-python/boto3-1.24.80
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_11(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-)] ) ) ) test? ( >=dev-python/botocore-1.27.80[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,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_8 python_targets_python3_9 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.27.80[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/boto/boto3/archive/1.24.80.tar.gz -> boto3-1.24.80.gh.tar.gz
-_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=41a241eaa8109dc566fb225cd48f1c86
diff --git a/metadata/md5-cache/dev-python/boto3-1.24.90 b/metadata/md5-cache/dev-python/boto3-1.24.90
deleted file mode 100644
index fadec71f702a..000000000000
--- a/metadata/md5-cache/dev-python/boto3-1.24.90
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_11(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-)] ) ) ) test? ( >=dev-python/botocore-1.27.90[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,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_8 python_targets_python3_9 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.27.90[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/boto/boto3/archive/1.24.90.tar.gz -> boto3-1.24.90.gh.tar.gz
-_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=50e9b19da5bcce80f05fd9be69fe0ff8
diff --git a/metadata/md5-cache/dev-python/boto3-1.24.91 b/metadata/md5-cache/dev-python/boto3-1.24.91
deleted file mode 100644
index 53e5bc1db1e8..000000000000
--- a/metadata/md5-cache/dev-python/boto3-1.24.91
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_11(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-)] ) ) ) test? ( >=dev-python/botocore-1.27.91[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,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_8 python_targets_python3_9 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.27.91[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/boto/boto3/archive/1.24.91.tar.gz -> boto3-1.24.91.gh.tar.gz
-_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=50e9b19da5bcce80f05fd9be69fe0ff8
diff --git a/metadata/md5-cache/dev-python/boto3-1.24.93 b/metadata/md5-cache/dev-python/boto3-1.24.93
deleted file mode 100644
index 7c128158ef8a..000000000000
--- a/metadata/md5-cache/dev-python/boto3-1.24.93
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_11(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-)] ) ) ) test? ( >=dev-python/botocore-1.27.93[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,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_8 python_targets_python3_9 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.27.93[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/boto/boto3/archive/1.24.93.tar.gz -> boto3-1.24.93.gh.tar.gz
-_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=50e9b19da5bcce80f05fd9be69fe0ff8
diff --git a/metadata/md5-cache/dev-python/boto3-1.24.95 b/metadata/md5-cache/dev-python/boto3-1.24.95
deleted file mode 100644
index 6908f27ec45a..000000000000
--- a/metadata/md5-cache/dev-python/boto3-1.24.95
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_11(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-)] ) ) ) test? ( >=dev-python/botocore-1.27.95[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,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_8 python_targets_python3_9 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.27.95[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/boto/boto3/archive/1.24.95.tar.gz -> boto3-1.24.95.gh.tar.gz
-_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=50e9b19da5bcce80f05fd9be69fe0ff8
diff --git a/metadata/md5-cache/dev-python/boto3-1.24.89 b/metadata/md5-cache/dev-python/boto3-1.25.0
similarity index 50%
rename from metadata/md5-cache/dev-python/boto3-1.24.89
rename to metadata/md5-cache/dev-python/boto3-1.25.0
index 2fb0c6529a12..f54c2ed2d6fc 100644
--- a/metadata/md5-cache/dev-python/boto3-1.24.89
+++ b/metadata/md5-cache/dev-python/boto3-1.25.0
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_11(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-)] ) ) ) test? ( >=dev-python/botocore-1.27.89[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_11(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-)] ) ) ) test? ( >=dev-python/botocore-1.28.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=The AWS SDK for Python
 EAPI=8
@@ -7,10 +7,10 @@ INHERIT=distutils-r1 multiprocessing
 IUSE=doc test python_targets_python3_8 python_targets_python3_9 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.27.89[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+RDEPEND=>=dev-python/botocore-1.28.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/boto/boto3/archive/1.24.89.tar.gz -> boto3-1.24.89.gh.tar.gz
+SRC_URI=https://github.com/boto/boto3/archive/1.25.0.tar.gz -> boto3-1.25.0.gh.tar.gz
 _eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
 _md5_=50e9b19da5bcce80f05fd9be69fe0ff8
diff --git a/metadata/md5-cache/dev-python/boto3-1.24.92 b/metadata/md5-cache/dev-python/boto3-1.25.1
similarity index 50%
rename from metadata/md5-cache/dev-python/boto3-1.24.92
rename to metadata/md5-cache/dev-python/boto3-1.25.1
index dbe8c855b285..f5d4349c9c91 100644
--- a/metadata/md5-cache/dev-python/boto3-1.24.92
+++ b/metadata/md5-cache/dev-python/boto3-1.25.1
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_11(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-)] ) ) ) test? ( >=dev-python/botocore-1.27.92[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_11(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-)] ) ) ) test? ( >=dev-python/botocore-1.28.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=The AWS SDK for Python
 EAPI=8
@@ -7,10 +7,10 @@ INHERIT=distutils-r1 multiprocessing
 IUSE=doc test python_targets_python3_8 python_targets_python3_9 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.27.92[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+RDEPEND=>=dev-python/botocore-1.28.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/boto/boto3/archive/1.24.92.tar.gz -> boto3-1.24.92.gh.tar.gz
+SRC_URI=https://github.com/boto/boto3/archive/1.25.1.tar.gz -> boto3-1.25.1.gh.tar.gz
 _eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
 _md5_=50e9b19da5bcce80f05fd9be69fe0ff8
diff --git a/metadata/md5-cache/dev-python/botocore-1.27.80 b/metadata/md5-cache/dev-python/botocore-1.27.80
deleted file mode 100644
index 3c0681bafd6c..000000000000
--- a/metadata/md5-cache/dev-python/botocore-1.27.80
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/jsonschema[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_11(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-)] ) ) ) test? ( dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jmespath-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,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_8 python_targets_python3_9 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_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jmespath-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/boto/botocore/archive/1.27.80.tar.gz -> botocore-1.27.80.gh.tar.gz
-_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=0eb97305edad438593d4de7e3f7dbf01
diff --git a/metadata/md5-cache/dev-python/botocore-1.27.90 b/metadata/md5-cache/dev-python/botocore-1.27.90
deleted file mode 100644
index 2b00944191c1..000000000000
--- a/metadata/md5-cache/dev-python/botocore-1.27.90
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/jsonschema[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_11(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-)] ) ) ) test? ( dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jmespath-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,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_8 python_targets_python3_9 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_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jmespath-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/boto/botocore/archive/1.27.90.tar.gz -> botocore-1.27.90.gh.tar.gz
-_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=bb152b00283104522fdf392996d7badc
diff --git a/metadata/md5-cache/dev-python/botocore-1.27.91 b/metadata/md5-cache/dev-python/botocore-1.27.91
deleted file mode 100644
index e521f36b6a4b..000000000000
--- a/metadata/md5-cache/dev-python/botocore-1.27.91
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/jsonschema[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_11(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-)] ) ) ) test? ( dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jmespath-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,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_8 python_targets_python3_9 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_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jmespath-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/boto/botocore/archive/1.27.91.tar.gz -> botocore-1.27.91.gh.tar.gz
-_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=bb152b00283104522fdf392996d7badc
diff --git a/metadata/md5-cache/dev-python/botocore-1.27.93 b/metadata/md5-cache/dev-python/botocore-1.27.93
deleted file mode 100644
index ba21fe21beb8..000000000000
--- a/metadata/md5-cache/dev-python/botocore-1.27.93
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/jsonschema[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_11(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-)] ) ) ) test? ( dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jmespath-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,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_8 python_targets_python3_9 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_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jmespath-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/boto/botocore/archive/1.27.93.tar.gz -> botocore-1.27.93.gh.tar.gz
-_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=bb152b00283104522fdf392996d7badc
diff --git a/metadata/md5-cache/dev-python/botocore-1.27.95 b/metadata/md5-cache/dev-python/botocore-1.27.95
deleted file mode 100644
index f55a7619b0c8..000000000000
--- a/metadata/md5-cache/dev-python/botocore-1.27.95
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/jsonschema[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_11(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-)] ) ) ) test? ( dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jmespath-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,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_8 python_targets_python3_9 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_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jmespath-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/boto/botocore/archive/1.27.95.tar.gz -> botocore-1.27.95.gh.tar.gz
-_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=bb152b00283104522fdf392996d7badc
diff --git a/metadata/md5-cache/dev-python/botocore-1.27.92 b/metadata/md5-cache/dev-python/botocore-1.28.0
similarity index 97%
rename from metadata/md5-cache/dev-python/botocore-1.27.92
rename to metadata/md5-cache/dev-python/botocore-1.28.0
index a2f1d76b0afc..a75c61053d8c 100644
--- a/metadata/md5-cache/dev-python/botocore-1.27.92
+++ b/metadata/md5-cache/dev-python/botocore-1.28.0
@@ -11,6 +11,6 @@ RDEPEND=dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/boto/botocore/archive/1.27.92.tar.gz -> botocore-1.27.92.gh.tar.gz
+SRC_URI=https://github.com/boto/botocore/archive/1.28.0.tar.gz -> botocore-1.28.0.gh.tar.gz
 _eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
 _md5_=bb152b00283104522fdf392996d7badc
diff --git a/metadata/md5-cache/dev-python/botocore-1.27.89 b/metadata/md5-cache/dev-python/botocore-1.28.1
similarity index 97%
rename from metadata/md5-cache/dev-python/botocore-1.27.89
rename to metadata/md5-cache/dev-python/botocore-1.28.1
index c6650e58e946..4007adce9586 100644
--- a/metadata/md5-cache/dev-python/botocore-1.27.89
+++ b/metadata/md5-cache/dev-python/botocore-1.28.1
@@ -11,6 +11,6 @@ RDEPEND=dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/boto/botocore/archive/1.27.89.tar.gz -> botocore-1.27.89.gh.tar.gz
+SRC_URI=https://github.com/boto/botocore/archive/1.28.1.tar.gz -> botocore-1.28.1.gh.tar.gz
 _eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
 _md5_=bb152b00283104522fdf392996d7badc
diff --git a/metadata/md5-cache/dev-python/brotlicffi-1.0.9.2-r1 b/metadata/md5-cache/dev-python/brotlicffi-1.0.9.2-r2
similarity index 81%
rename from metadata/md5-cache/dev-python/brotlicffi-1.0.9.2-r1
rename to metadata/md5-cache/dev-python/brotlicffi-1.0.9.2-r2
index 594a49b4a0ac..d527e24975e9 100644
--- a/metadata/md5-cache/dev-python/brotlicffi-1.0.9.2-r1
+++ b/metadata/md5-cache/dev-python/brotlicffi-1.0.9.2-r2
@@ -1,6 +1,6 @@
 BDEPEND=test? ( app-arch/brotli:= python_targets_python3_8? ( dev-python/cffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( dev-python/cffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( dev-python/cffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( dev-python/cffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/pytest-7.1.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=test? ( dev-python/hypothesis[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] )
+DEPEND=app-arch/brotli:= python_targets_python3_8? ( dev-python/cffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( dev-python/cffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( dev-python/cffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( dev-python/cffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/hypothesis[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] )
 DESCRIPTION=Python binding to the Brotli library
 EAPI=7
 HOMEPAGE=https://github.com/python-hyper/brotlicffi/ https://pypi.org/project/brotlicffi/
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/python-hyper/brotlicffi/archive/v1.0.9.2.tar.gz -> brotlicffi-1.0.9.2.gh.tar.gz test? ( https://github.com/google/brotli/archive/46c1a881b41bb638c76247558aa04b1591af3aa7.tar.gz -> brotli-46c1a881b41bb638c76247558aa04b1591af3aa7.tar.gz )
 _eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=f0304673e4ea37e9fd7b3e2be4f2a17e
+_md5_=94a0b5f1fd7b3a8158b0fe8404d81b5b
diff --git a/metadata/md5-cache/dev-python/brython-3.11 b/metadata/md5-cache/dev-python/brython-3.11
new file mode 100644
index 000000000000..a735172c9788
--- /dev/null
+++ b/metadata/md5-cache/dev-python/brython-3.11
@@ -0,0 +1,15 @@
+DEFINED_PHASES=install postinst prerm setup
+DEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) app-admin/webapp-config
+DESCRIPTION=Python 3 implementation for client-side web programming
+EAPI=8
+HOMEPAGE=http://www.brython.info
+INHERIT=webapp python-single-r1
+IUSE=vhosts python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=BSD
+RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) app-admin/webapp-config
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
+SLOT=3.11
+SRC_URI=https://github.com/brython-dev/brython/archive/3.11.tar.gz -> brython-3.11.gh.tar.gz
+_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	webapp	67df5bab481d0b9428f9ab7b3de690e4
+_md5_=8a60f6af973dcc44898a1e8a4d980ce1
diff --git a/metadata/md5-cache/dev-python/canonicaljson-1.6.2 b/metadata/md5-cache/dev-python/canonicaljson-1.6.2
deleted file mode 100644
index 4ae6113066c2..000000000000
--- a/metadata/md5-cache/dev-python/canonicaljson-1.6.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/simplejson[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/unittest-or-fail[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-9[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Canonical JSON
-EAPI=8
-HOMEPAGE=https://github.com/matrix-org/python-canonicaljson/ https://pypi.org/project/canonicaljson/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~ppc64
-LICENSE=Apache-2.0
-RDEPEND=dev-python/simplejson[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4: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/python-canonicaljson/archive/v1.6.2.tar.gz -> canonicaljson-1.6.2.gh.tar.gz
-_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=519a4a1f954ff0e0acd4e4f5687e394b
diff --git a/metadata/md5-cache/dev-python/canonicaljson-1.6.3 b/metadata/md5-cache/dev-python/canonicaljson-1.6.3
index 779849f399c3..abfc5ce19176 100644
--- a/metadata/md5-cache/dev-python/canonicaljson-1.6.3
+++ b/metadata/md5-cache/dev-python/canonicaljson-1.6.3
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/matrix-org/python-canonicaljson/ https://pypi.org/project/canonicaljson/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~ppc64
+KEYWORDS=amd64 ~ppc64
 LICENSE=Apache-2.0
 RDEPEND=dev-python/simplejson[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4: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/matrix-org/python-canonicaljson/archive/v1.6.3.tar.gz -> canonicaljson-1.6.3.gh.tar.gz
 _eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=5d87430308b4180c4f3c312208099712
+_md5_=6551a3ed004d955d33808a6a206a6f6e
diff --git a/metadata/md5-cache/dev-python/cfn-lint-0.64.1 b/metadata/md5-cache/dev-python/cfn-lint-0.64.1
deleted file mode 100644
index afc319f0a503..000000000000
--- a/metadata/md5-cache/dev-python/cfn-lint-0.64.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/aws-sam-translator-1.47.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jsonpatch[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jschema_to_python-1.2.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jsonschema-3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/junit-xml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/networkx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >dev-python/pyyaml-5.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-2.15.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sarif_om-1.0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=CloudFormation Linter
-EAPI=8
-HOMEPAGE=https://github.com/aws-cloudformation/cfn-lint/ https://pypi.org/project/cfn-lint/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv x86
-LICENSE=MIT
-RDEPEND=>=dev-python/aws-sam-translator-1.47.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jsonpatch[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jschema_to_python-1.2.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jsonschema-3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/junit-xml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/networkx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >dev-python/pyyaml-5.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-2.15.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sarif_om-1.0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/aws-cloudformation/cfn-lint/archive/v0.64.1.tar.gz -> cfn-lint-0.64.1.gh.tar.gz
-_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=f7f589c38e0511af26415b87d8e34a41
diff --git a/metadata/md5-cache/dev-python/cfn-lint-0.65.1 b/metadata/md5-cache/dev-python/cfn-lint-0.65.1
deleted file mode 100644
index fa5fdf103989..000000000000
--- a/metadata/md5-cache/dev-python/cfn-lint-0.65.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/aws-sam-translator-1.51.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jsonpatch[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jschema_to_python-1.2.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jsonschema-3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/junit-xml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/networkx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >dev-python/pyyaml-5.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-2.15.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sarif_om-1.0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=CloudFormation Linter
-EAPI=8
-HOMEPAGE=https://github.com/aws-cloudformation/cfn-lint/ https://pypi.org/project/cfn-lint/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/aws-sam-translator-1.51.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jsonpatch[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jschema_to_python-1.2.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jsonschema-3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/junit-xml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/networkx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >dev-python/pyyaml-5.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-2.15.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sarif_om-1.0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/aws-cloudformation/cfn-lint/archive/v0.65.1.tar.gz -> cfn-lint-0.65.1.gh.tar.gz
-_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=3503a1ccca3aa433cf56231d3b55970f
diff --git a/metadata/md5-cache/dev-python/cfn-lint-0.66.0 b/metadata/md5-cache/dev-python/cfn-lint-0.66.0
deleted file mode 100644
index 3187e3475edc..000000000000
--- a/metadata/md5-cache/dev-python/cfn-lint-0.66.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/aws-sam-translator-1.51.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jsonpatch[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jschema_to_python-1.2.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jsonschema-3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/junit-xml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/networkx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >dev-python/pyyaml-5.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-2.15.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sarif_om-1.0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=CloudFormation Linter
-EAPI=8
-HOMEPAGE=https://github.com/aws-cloudformation/cfn-lint/ https://pypi.org/project/cfn-lint/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/aws-sam-translator-1.51.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jsonpatch[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jschema_to_python-1.2.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jsonschema-3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/junit-xml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/networkx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >dev-python/pyyaml-5.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-2.15.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sarif_om-1.0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/aws-cloudformation/cfn-lint/archive/v0.66.0.tar.gz -> cfn-lint-0.66.0.gh.tar.gz
-_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=3503a1ccca3aa433cf56231d3b55970f
diff --git a/metadata/md5-cache/dev-python/cfn-lint-0.66.1 b/metadata/md5-cache/dev-python/cfn-lint-0.66.1
deleted file mode 100644
index b722580bb912..000000000000
--- a/metadata/md5-cache/dev-python/cfn-lint-0.66.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/aws-sam-translator-1.51.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jsonpatch[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jschema_to_python-1.2.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jsonschema-3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/junit-xml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/networkx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >dev-python/pyyaml-5.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-2.15.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sarif_om-1.0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=CloudFormation Linter
-EAPI=8
-HOMEPAGE=https://github.com/aws-cloudformation/cfn-lint/ https://pypi.org/project/cfn-lint/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/aws-sam-translator-1.51.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jsonpatch[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jschema_to_python-1.2.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jsonschema-3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/junit-xml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/networkx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >dev-python/pyyaml-5.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-2.15.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sarif_om-1.0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/aws-cloudformation/cfn-lint/archive/v0.66.1.tar.gz -> cfn-lint-0.66.1.gh.tar.gz
-_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=3503a1ccca3aa433cf56231d3b55970f
diff --git a/metadata/md5-cache/dev-python/cfn-lint-0.67.0 b/metadata/md5-cache/dev-python/cfn-lint-0.67.0
index fbe19efd9c68..791365a70bea 100644
--- a/metadata/md5-cache/dev-python/cfn-lint-0.67.0
+++ b/metadata/md5-cache/dev-python/cfn-lint-0.67.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/aws-cloudformation/cfn-lint/ https://pypi.org/project/cfn-lint/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv x86
 LICENSE=MIT
 RDEPEND=>=dev-python/aws-sam-translator-1.52.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jsonpatch[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jschema_to_python-1.2.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/junit-xml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/networkx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >dev-python/pyyaml-5.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.15.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sarif_om-1.0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_8 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/aws-cloudformation/cfn-lint/archive/v0.67.0.tar.gz -> cfn-lint-0.67.0.gh.tar.gz
 _eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=db8b3aafc77aae6f26a908bc76dfd734
+_md5_=57b090864856ec83a6651286fcd4c305
diff --git a/metadata/md5-cache/dev-python/cfn-lint-0.68.0 b/metadata/md5-cache/dev-python/cfn-lint-0.69.0
similarity index 99%
rename from metadata/md5-cache/dev-python/cfn-lint-0.68.0
rename to metadata/md5-cache/dev-python/cfn-lint-0.69.0
index f71fdef6db3b..ce9a2cdb57c5 100644
--- a/metadata/md5-cache/dev-python/cfn-lint-0.68.0
+++ b/metadata/md5-cache/dev-python/cfn-lint-0.69.0
@@ -11,6 +11,6 @@ RDEPEND=>=dev-python/aws-sam-translator-1.53.0[python_targets_python3_8(-)?,pyth
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/aws-cloudformation/cfn-lint/archive/v0.68.0.tar.gz -> cfn-lint-0.68.0.gh.tar.gz
+SRC_URI=https://github.com/aws-cloudformation/cfn-lint/archive/v0.69.0.tar.gz -> cfn-lint-0.69.0.gh.tar.gz
 _eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
 _md5_=f12595e66517ca4b94e1ba776190f17b
diff --git a/metadata/md5-cache/dev-python/cfn-lint-0.69.1 b/metadata/md5-cache/dev-python/cfn-lint-0.69.1
new file mode 100644
index 000000000000..3095d2440094
--- /dev/null
+++ b/metadata/md5-cache/dev-python/cfn-lint-0.69.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/aws-sam-translator-1.53.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jsonpatch[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jschema_to_python-1.2.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/junit-xml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/networkx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >dev-python/pyyaml-5.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.15.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sarif_om-1.0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=CloudFormation Linter
+EAPI=8
+HOMEPAGE=https://github.com/aws-cloudformation/cfn-lint/ https://pypi.org/project/cfn-lint/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/aws-sam-translator-1.53.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jsonpatch[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jschema_to_python-1.2.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/junit-xml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/networkx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >dev-python/pyyaml-5.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.15.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sarif_om-1.0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/aws-cloudformation/cfn-lint/archive/v0.69.1.tar.gz -> cfn-lint-0.69.1.gh.tar.gz
+_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=f12595e66517ca4b94e1ba776190f17b
diff --git a/metadata/md5-cache/dev-python/clang-python-15.0.3.9999 b/metadata/md5-cache/dev-python/clang-python-15.0.4.9999
similarity index 92%
rename from metadata/md5-cache/dev-python/clang-python-15.0.3.9999
rename to metadata/md5-cache/dev-python/clang-python-15.0.4.9999
index 2bd217990701..fe62f69086b8 100644
--- a/metadata/md5-cache/dev-python/clang-python-15.0.3.9999
+++ b/metadata/md5-cache/dev-python/clang-python-15.0.4.9999
@@ -1,6 +1,6 @@
 BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) test? ( sys-devel/clang:15 ) >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=install prepare test unpack
-DEPEND=>=sys-devel/clang-15.0.3.9999:* !sys-devel/llvm:0[clang(-),python(-)] !sys-devel/clang:0[python(-)]
+DEPEND=>=sys-devel/clang-15.0.4.9999:* !sys-devel/llvm:0[clang(-),python(-)] !sys-devel/clang:0[python(-)]
 DESCRIPTION=Python bindings for sys-devel/clang
 EAPI=8
 HOMEPAGE=https://llvm.org/
@@ -8,7 +8,7 @@ INHERIT=llvm.org python-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 PROPERTIES=live
-RDEPEND=>=sys-devel/clang-15.0.3.9999:* !sys-devel/llvm:0[clang(-),python(-)] !sys-devel/clang:0[python(-)] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+RDEPEND=>=sys-devel/clang-15.0.4.9999:* !sys-devel/llvm:0[clang(-),python(-)] !sys-devel/clang:0[python(-)] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
diff --git a/metadata/md5-cache/dev-python/colorama-0.4.6 b/metadata/md5-cache/dev-python/colorama-0.4.6
new file mode 100644
index 000000000000..7735ca2b4a63
--- /dev/null
+++ b/metadata/md5-cache/dev-python/colorama-0.4.6
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/pytest-7.1.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/hatchling-1.8.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=ANSI escape character sequences for colored terminal text & cursor positioning
+EAPI=8
+HOMEPAGE=https://pypi.org/project/colorama/ https://github.com/tartley/colorama/
+INHERIT=distutils-r1
+IUSE=examples test python_targets_pypy3 python_targets_python3_8 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
+LICENSE=BSD
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/tartley/colorama/archive/0.4.6.tar.gz -> colorama-0.4.6.gh.tar.gz
+_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=f42640bb41c5e0dbf9175c39c7dec1b5
diff --git a/metadata/md5-cache/dev-python/cssselect2-0.6.0 b/metadata/md5-cache/dev-python/cssselect2-0.6.0
deleted file mode 100644
index 75c0d35b27ab..000000000000
--- a/metadata/md5-cache/dev-python/cssselect2-0.6.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/tinycss2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/webencodings[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/flit_core-3.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Parses CSS3 Selectors and translates them to XPath 1.0
-EAPI=8
-HOMEPAGE=https://doc.courtbouillon.org/cssselect2/stable/ https://pypi.org/project/cssselect2/ https://github.com/Kozea/cssselect2/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~arm ~arm64 ~riscv x86
-LICENSE=BSD
-RDEPEND=dev-python/tinycss2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/webencodings[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/c/cssselect2/cssselect2-0.6.0.tar.gz
-_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=7826abe1e3fa88356927caef09fa83cd
diff --git a/metadata/md5-cache/dev-python/cssselect2-0.7.0 b/metadata/md5-cache/dev-python/cssselect2-0.7.0
index 7c2fd1ffa51e..532d09db8d71 100644
--- a/metadata/md5-cache/dev-python/cssselect2-0.7.0
+++ b/metadata/md5-cache/dev-python/cssselect2-0.7.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://doc.courtbouillon.org/cssselect2/stable/ https://pypi.org/project/cssselect2/ https://github.com/Kozea/cssselect2/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~riscv x86
 LICENSE=BSD
 RDEPEND=dev-python/tinycss2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/webencodings[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_8 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/cssselect2/cssselect2-0.7.0.tar.gz
 _eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=c8739afa82edd15389402d8229ebe10f
+_md5_=7826abe1e3fa88356927caef09fa83cd
diff --git a/metadata/md5-cache/dev-python/dask-2022.9.0 b/metadata/md5-cache/dev-python/dask-2022.9.0
deleted file mode 100644
index b66e1288df2e..000000000000
--- a/metadata/md5-cache/dev-python/dask-2022.9.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/toolz[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/moto[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numexpr[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-rerunfailures[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/cloudpickle-0.2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/fsspec-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/numpy-1.15.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pandas-0.25.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/packaging-20.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/partd-0.3.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyyaml-5.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/toolz-0.8.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Task scheduling and blocked algorithms for parallel processing
-EAPI=8
-HOMEPAGE=https://www.dask.org/ https://github.com/dask/dask/ https://pypi.org/project/dask/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=>=dev-python/cloudpickle-0.2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/fsspec-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/numpy-1.15.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pandas-0.25.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/packaging-20.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/partd-0.3.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyyaml-5.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/toolz-0.8.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/dask/dask/archive/2022.9.0.tar.gz -> dask-2022.9.0.gh.tar.gz
-_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=5bfea60e780bcbb8870241fbc46df644
diff --git a/metadata/md5-cache/dev-python/dask-2022.9.1 b/metadata/md5-cache/dev-python/dask-2022.9.1
deleted file mode 100644
index 74ecc3ae01c3..000000000000
--- a/metadata/md5-cache/dev-python/dask-2022.9.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/toolz[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/moto[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numexpr[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-rerunfailures[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/cloudpickle-0.2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/fsspec-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/numpy-1.15.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pandas-0.25.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/packaging-20.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/partd-0.3.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyyaml-5.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/toolz-0.8.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Task scheduling and blocked algorithms for parallel processing
-EAPI=8
-HOMEPAGE=https://www.dask.org/ https://github.com/dask/dask/ https://pypi.org/project/dask/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=>=dev-python/cloudpickle-0.2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/fsspec-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/numpy-1.15.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pandas-0.25.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/packaging-20.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/partd-0.3.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyyaml-5.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/toolz-0.8.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/dask/dask/archive/2022.9.1.tar.gz -> dask-2022.9.1.gh.tar.gz
-_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=a0b541c333193cb4c2e3eedae08472ce
diff --git a/metadata/md5-cache/dev-python/dask-2022.9.2 b/metadata/md5-cache/dev-python/dask-2022.9.2
index d63f782b0141..ba3ed98309f1 100644
--- a/metadata/md5-cache/dev-python/dask-2022.9.2
+++ b/metadata/md5-cache/dev-python/dask-2022.9.2
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://www.dask.org/ https://github.com/dask/dask/ https://pypi.org/project/dask/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=>=dev-python/cloudpickle-0.2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/fsspec-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/numpy-1.15.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pandas-0.25.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/packaging-20.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/partd-0.3.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyyaml-5.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/toolz-0.8.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/dask/dask/archive/2022.9.2.tar.gz -> dask-2022.9.2.gh.tar.gz
 _eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=a0b541c333193cb4c2e3eedae08472ce
+_md5_=5bfea60e780bcbb8870241fbc46df644
diff --git a/metadata/md5-cache/dev-python/deepmerge-1.1.0 b/metadata/md5-cache/dev-python/deepmerge-1.1.0
new file mode 100644
index 000000000000..879f3fbc288a
--- /dev/null
+++ b/metadata/md5-cache/dev-python/deepmerge-1.1.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/setuptools_scm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Tools to handle merging of nested data structures in python
+EAPI=8
+HOMEPAGE=https://deepmerge.readthedocs.io/en/latest/ https://github.com/toumorokoshi/deepmerge/ https://pypi.org/project/deepmerge/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 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=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/toumorokoshi/deepmerge/archive/v1.1.0.tar.gz -> deepmerge-1.1.0.gh.tar.gz
+_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=2aab3e879eece8a553bc876820ef492f
diff --git a/metadata/md5-cache/dev-python/fakeredis-1.10.0 b/metadata/md5-cache/dev-python/fakeredis-1.10.0
new file mode 100644
index 000000000000..102981c1f603
--- /dev/null
+++ b/metadata/md5-cache/dev-python/fakeredis-1.10.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-db/redis dev-python/pytest-asyncio[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/redis-py-4.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/redis-py-4.4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sortedcontainers-2.4.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/poetry-core-1.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,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_8 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-py-4.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/redis-py-4.4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sortedcontainers-2.4.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 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/v1.10.0.tar.gz -> fakeredis-py-1.10.0.gh.tar.gz
+_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=a23e159300c84d99f138bbbdade90102
diff --git a/metadata/md5-cache/dev-python/flask-compress-1.12 b/metadata/md5-cache/dev-python/flask-compress-1.12
deleted file mode 100644
index f1f71a8f3515..000000000000
--- a/metadata/md5-cache/dev-python/flask-compress-1.12
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( app-arch/brotli[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Compress responses in your Flask app with gzip
-EAPI=8
-HOMEPAGE=https://github.com/colour-science/flask-compress/ https://pypi.org/project/Flask-Compress/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=app-arch/brotli[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/F/Flask-Compress/Flask-Compress-1.12.tar.gz
-_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=d4c5630ba50b7916e5a8d5a299c808c0
diff --git a/metadata/md5-cache/dev-python/flask-compress-1.13 b/metadata/md5-cache/dev-python/flask-compress-1.13
index 725e3db6550d..74f8ca6ead2a 100644
--- a/metadata/md5-cache/dev-python/flask-compress-1.13
+++ b/metadata/md5-cache/dev-python/flask-compress-1.13
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/colour-science/flask-compress/ https://pypi.org/project/Flask-Compress/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=app-arch/brotli[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_8 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/F/Flask-Compress/Flask-Compress-1.13.tar.gz
 _eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=06046557119032390298e64ea0a08316
+_md5_=d4c5630ba50b7916e5a8d5a299c808c0
diff --git a/metadata/md5-cache/dev-python/flask-htmlmin-2.2.1 b/metadata/md5-cache/dev-python/flask-htmlmin-2.2.1
new file mode 100644
index 000000000000..e7cfcd5624ec
--- /dev/null
+++ b/metadata/md5-cache/dev-python/flask-htmlmin-2.2.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( app-text/cssmin[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] app-text/htmlmin[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Minimize your flask rendered html
+EAPI=8
+HOMEPAGE=https://github.com/hamidfzm/Flask-HTMLmin/ https://pypi.org/project/Flask-HTMLmin/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=app-text/cssmin[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] app-text/htmlmin[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/hamidfzm/Flask-HTMLmin/archive/v2.2.1.tar.gz -> Flask-HTMLmin-2.2.1.gh.tar.gz
+_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=99e1dfd8a5ac568b1419a2dd4fcd7837
diff --git a/metadata/md5-cache/dev-python/fonttools-4.36.0 b/metadata/md5-cache/dev-python/fonttools-4.36.0
deleted file mode 100644
index bd7482b4736f..000000000000
--- a/metadata/md5-cache/dev-python/fonttools-4.36.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-python/fs-2.4.9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( app-arch/brotli[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] app-arch/zopfli ) test? ( >=dev-python/fs-2.4.9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[xml(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[xml(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[xml(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[xml(+)] ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,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=Library for manipulating TrueType, OpenType, AFM and Type1 fonts
-EAPI=8
-HOMEPAGE=https://github.com/fonttools/fonttools/
-INHERIT=distutils-r1 virtualx
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 test
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
-LICENSE=BSD
-RDEPEND=>=dev-python/fs-2.4.9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[xml(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[xml(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[xml(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[xml(+)] )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/fonttools/fonttools/archive/4.36.0.tar.gz -> fonttools-4.36.0.gh.tar.gz
-_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	virtualx	644887c82aefdf12001489391fca4f02
-_md5_=77694b56f53d2c2e66b7b12051afdbda
diff --git a/metadata/md5-cache/dev-python/fonttools-4.37.2 b/metadata/md5-cache/dev-python/fonttools-4.37.2
deleted file mode 100644
index f13326b1edce..000000000000
--- a/metadata/md5-cache/dev-python/fonttools-4.37.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-python/fs-2.4.9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( app-arch/brotli[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] app-arch/zopfli ) test? ( >=dev-python/fs-2.4.9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[xml(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[xml(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[xml(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[xml(+)] ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,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=Library for manipulating TrueType, OpenType, AFM and Type1 fonts
-EAPI=8
-HOMEPAGE=https://github.com/fonttools/fonttools/
-INHERIT=distutils-r1 virtualx
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
-LICENSE=BSD
-RDEPEND=>=dev-python/fs-2.4.9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[xml(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[xml(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[xml(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[xml(+)] )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/fonttools/fonttools/archive/4.37.2.tar.gz -> fonttools-4.37.2.gh.tar.gz
-_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	virtualx	644887c82aefdf12001489391fca4f02
-_md5_=09643ba95b177f9bca0d065b4f878122
diff --git a/metadata/md5-cache/dev-python/fonttools-4.37.3 b/metadata/md5-cache/dev-python/fonttools-4.37.3
deleted file mode 100644
index e7fc832d1a80..000000000000
--- a/metadata/md5-cache/dev-python/fonttools-4.37.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( app-arch/brotli[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] app-arch/zopfli ) test? ( >=dev-python/fs-2.4.9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[xml(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[xml(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[xml(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[xml(+)] ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,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=Library for manipulating TrueType, OpenType, AFM and Type1 fonts
-EAPI=8
-HOMEPAGE=https://github.com/fonttools/fonttools/ https://pypi.org/project/fonttools/
-INHERIT=distutils-r1 virtualx
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
-LICENSE=BSD
-RDEPEND=>=dev-python/fs-2.4.9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[xml(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[xml(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[xml(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[xml(+)] )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/fonttools/fonttools/archive/4.37.3.tar.gz -> fonttools-4.37.3.gh.tar.gz
-_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	virtualx	644887c82aefdf12001489391fca4f02
-_md5_=5184af7dda336c9995f9ae80f64a940b
diff --git a/metadata/md5-cache/dev-python/fonttools-4.37.4 b/metadata/md5-cache/dev-python/fonttools-4.37.4
index 2a70f6f42c9e..00f322856c4f 100644
--- a/metadata/md5-cache/dev-python/fonttools-4.37.4
+++ b/metadata/md5-cache/dev-python/fonttools-4.37.4
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/fonttools/fonttools/ https://pypi.org/project/fonttools/
 INHERIT=distutils-r1 virtualx
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 test
-KEYWORDS=~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
 LICENSE=BSD
 RDEPEND=>=dev-python/fs-2.4.9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[xml(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[xml(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[xml(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[xml(+)] )
 REQUIRED_USE=|| ( python_targets_python3_8 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://github.com/fonttools/fonttools/archive/4.37.4.tar.gz -> fonttools-4.37.4.gh.tar.gz
 _eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	virtualx	644887c82aefdf12001489391fca4f02
-_md5_=880dc706acc518c31e6ccfe6378ebe09
+_md5_=1368f0531b333d36004ffa301d20dde0
diff --git a/metadata/md5-cache/dev-python/google-auth-2.11.0 b/metadata/md5-cache/dev-python/google-auth-2.11.0
deleted file mode 100644
index 02baaf4283f0..000000000000
--- a/metadata/md5-cache/dev-python/google-auth-2.11.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/freezegun[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/grpcio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/moto[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyopenssl[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-localserver[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyu2f[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/responses[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/urllib3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( <dev-python/cachetools-6.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyasn1-0.1.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyasn1-modules-0.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/rsa-3.1.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !dev-python/namespace-google >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Google Authentication Library
-EAPI=8
-HOMEPAGE=https://github.com/googleapis/google-auth-library-python/ https://pypi.org/project/google-auth/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=Apache-2.0
-RDEPEND=<dev-python/cachetools-6.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyasn1-0.1.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyasn1-modules-0.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/rsa-3.1.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !dev-python/namespace-google python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/g/google-auth/google-auth-2.11.0.tar.gz
-_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=09627420ed88246bc20150ebc9459863
diff --git a/metadata/md5-cache/dev-python/google-auth-2.11.1 b/metadata/md5-cache/dev-python/google-auth-2.11.1
deleted file mode 100644
index f81d55633455..000000000000
--- a/metadata/md5-cache/dev-python/google-auth-2.11.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/freezegun[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/grpcio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/moto[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyopenssl[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-localserver[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyu2f[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/responses[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/urllib3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( <dev-python/cachetools-6.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyasn1-0.1.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyasn1-modules-0.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/rsa-3.1.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !dev-python/namespace-google >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Google Authentication Library
-EAPI=8
-HOMEPAGE=https://github.com/googleapis/google-auth-library-python/ https://pypi.org/project/google-auth/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=<dev-python/cachetools-6.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyasn1-0.1.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyasn1-modules-0.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/rsa-3.1.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !dev-python/namespace-google python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/g/google-auth/google-auth-2.11.1.tar.gz
-_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=1872107c91c5a0201cf7ccbf7c7198a8
diff --git a/metadata/md5-cache/dev-python/google-auth-2.12.0 b/metadata/md5-cache/dev-python/google-auth-2.12.0
index c7bfff04ab74..d8a5c28f44c5 100644
--- a/metadata/md5-cache/dev-python/google-auth-2.12.0
+++ b/metadata/md5-cache/dev-python/google-auth-2.12.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/googleapis/google-auth-library-python/ https://pypi.org/project/google-auth/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=<dev-python/cachetools-6.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyasn1-0.1.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyasn1-modules-0.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/rsa-3.1.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !dev-python/namespace-google python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/g/google-auth/google-auth-2.12.0.tar.gz
 _eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=1872107c91c5a0201cf7ccbf7c7198a8
+_md5_=09627420ed88246bc20150ebc9459863
diff --git a/metadata/md5-cache/dev-python/google-auth-oauthlib-0.6.0 b/metadata/md5-cache/dev-python/google-auth-oauthlib-0.6.0
new file mode 100644
index 000000000000..877e60064ced
--- /dev/null
+++ b/metadata/md5-cache/dev-python/google-auth-oauthlib-0.6.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/click-6.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/google-auth-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-oauthlib-0.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Google Authentication Library
+EAPI=8
+HOMEPAGE=https://github.com/googleapis/google-auth-library-python-oauthlib/ https://pypi.org/project/google-auth-oauthlib/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/click-6.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/google-auth-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-oauthlib-0.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/googleapis/google-auth-library-python-oauthlib/archive/v0.6.0.tar.gz -> google-auth-library-python-oauthlib-0.6.0.gh.tar.gz
+_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=0e52fa73d1b9f6d39da18d6b182e0461
diff --git a/metadata/md5-cache/dev-python/google-auth-oauthlib-0.7.0 b/metadata/md5-cache/dev-python/google-auth-oauthlib-0.7.0
new file mode 100644
index 000000000000..7192958e05b2
--- /dev/null
+++ b/metadata/md5-cache/dev-python/google-auth-oauthlib-0.7.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/click-6.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/google-auth-2.13.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-oauthlib-0.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Google Authentication Library
+EAPI=8
+HOMEPAGE=https://github.com/googleapis/google-auth-library-python-oauthlib/ https://pypi.org/project/google-auth-oauthlib/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/click-6.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/google-auth-2.13.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-oauthlib-0.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/googleapis/google-auth-library-python-oauthlib/archive/v0.7.0.tar.gz -> google-auth-library-python-oauthlib-0.7.0.gh.tar.gz
+_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=3ef63506d4357f0cb7bd33e364c4ab31
diff --git a/metadata/md5-cache/dev-python/gssapi-1.8.2 b/metadata/md5-cache/dev-python/gssapi-1.8.2
new file mode 100644
index 000000000000..d34802dd9cf2
--- /dev/null
+++ b/metadata/md5-cache/dev-python/gssapi-1.8.2
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] virtual/krb5 test? ( dev-python/k5test[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/parameterized[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/decorator[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] virtual/krb5 >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Low and high level wrappers around the GSSAPI C libraries
+EAPI=8
+HOMEPAGE=https://github.com/pythongssapi/python-gssapi https://pypi.org/project/gssapi/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
+LICENSE=MIT
+RDEPEND=dev-python/decorator[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] virtual/krb5 python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/pythongssapi/python-gssapi/releases/download/v1.8.2/python-gssapi-1.8.2.tar.gz -> gssapi-1.8.2.gh.tar.gz
+_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=293f01bd25683b9def9936b2b04ff139
diff --git a/metadata/md5-cache/dev-python/hcloud-python-1.18.1 b/metadata/md5-cache/dev-python/hcloud-python-1.18.1
new file mode 100644
index 000000000000..f1c6b041413b
--- /dev/null
+++ b/metadata/md5-cache/dev-python/hcloud-python-1.18.1
@@ -0,0 +1,16 @@
+BDEPEND=doc? ( || ( ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_11(-)] dev-python/sphinx_rtd_theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_10(-)] dev-python/sphinx_rtd_theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)] ) ) ) test? ( >=dev-python/future-0.17.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-dateutil-2.7.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.20[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Official Hetzner Cloud python library
+EAPI=8
+HOMEPAGE=https://github.com/hetznercloud/hcloud-python
+INHERIT=distutils-r1
+IUSE=examples doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=>=dev-python/future-0.17.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-dateutil-2.7.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.20[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/hetznercloud/hcloud-python/archive/v1.18.1.tar.gz -> hcloud-python-1.18.1.gh.tar.gz
+_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=86b2ebc0e4902e59c2fdb7f097547b36
diff --git a/metadata/md5-cache/dev-python/humanize-4.3.0 b/metadata/md5-cache/dev-python/humanize-4.3.0
deleted file mode 100644
index 7f95f1d85618..000000000000
--- a/metadata/md5-cache/dev-python/humanize-4.3.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/freezegun[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/pytest-7.1.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Common humanization utilities
-EAPI=8
-HOMEPAGE=https://github.com/python-humanize/humanize/ https://pypi.org/project/humanize/
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/h/humanize/humanize-4.3.0.tar.gz
-_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=67b3910f7ce9cf3a51054eeaca806451
diff --git a/metadata/md5-cache/dev-python/humanize-4.4.0 b/metadata/md5-cache/dev-python/humanize-4.4.0
index c3a34bb4403b..59312ee559b3 100644
--- a/metadata/md5-cache/dev-python/humanize-4.4.0
+++ b/metadata/md5-cache/dev-python/humanize-4.4.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/python-humanize/humanize/ https://pypi.org/project/humanize/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 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/h/humanize/humanize-4.4.0.tar.gz
 _eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=abcc828d46d66b09f1d027adde5bc1c9
+_md5_=67b3910f7ce9cf3a51054eeaca806451
diff --git a/metadata/md5-cache/dev-python/hypothesis-6.56.2 b/metadata/md5-cache/dev-python/hypothesis-6.56.2
index 08c0f5965f4f..5857a841a65c 100644
--- a/metadata/md5-cache/dev-python/hypothesis-6.56.2
+++ b/metadata/md5-cache/dev-python/hypothesis-6.56.2
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pexpect[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) cli? ( python_targets_python3_8? ( dev-python/black[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/black[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/black[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) >=dev-python/pytest-7.1.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0=[threads(+),sqlite] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+),sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+),sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+),sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[threads(+),sqlite] ) >=dev-python/gpep517-9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+BDEPEND=test? ( dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pexpect[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !!<dev-python/requests-toolbelt-0.10.1 ) test? ( >=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) cli? ( python_targets_python3_8? ( dev-python/black[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/black[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/black[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) >=dev-python/pytest-7.1.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0=[threads(+),sqlite] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+),sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+),sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+),sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[threads(+),sqlite] ) >=dev-python/gpep517-9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install postinst prepare test
 DESCRIPTION=A library for property based testing
 EAPI=8
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-6.56.2.tar.gz -> hypothesis-6.56.2.gh.tar.gz
 _eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=0e95a35d172545cf2a5cd5340b8d9489
+_md5_=26cdf47f7a277fbfbeac16b01a3c67be
diff --git a/metadata/md5-cache/dev-python/hypothesis-6.56.3 b/metadata/md5-cache/dev-python/hypothesis-6.56.3
index bc38e3813adc..53572ae15e84 100644
--- a/metadata/md5-cache/dev-python/hypothesis-6.56.3
+++ b/metadata/md5-cache/dev-python/hypothesis-6.56.3
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pexpect[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !!dev-python/requests-toolbelt ) test? ( >=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) cli? ( python_targets_python3_8? ( dev-python/black[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/black[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/black[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) >=dev-python/pytest-7.1.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0=[threads(+),sqlite] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+),sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+),sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+),sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[threads(+),sqlite] ) >=dev-python/gpep517-9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+BDEPEND=test? ( dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pexpect[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !!<dev-python/requests-toolbelt-0.10.1 ) test? ( >=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) cli? ( python_targets_python3_8? ( dev-python/black[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/black[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/black[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) >=dev-python/pytest-7.1.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0=[threads(+),sqlite] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+),sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+),sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+),sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[threads(+),sqlite] ) >=dev-python/gpep517-9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install postinst prepare test
 DESCRIPTION=A library for property based testing
 EAPI=8
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-6.56.3.tar.gz -> hypothesis-6.56.3.gh.tar.gz
 _eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=c0f1e07b8df9ac0c4f9799a6c502b5ee
+_md5_=576ea89cdacb1d979c5220c96e136d06
diff --git a/metadata/md5-cache/dev-python/identify-2.5.7 b/metadata/md5-cache/dev-python/identify-2.5.7
new file mode 100644
index 000000000000..275cc21ee4c8
--- /dev/null
+++ b/metadata/md5-cache/dev-python/identify-2.5.7
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/ukkonen[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=File identification library for Python
+EAPI=8
+HOMEPAGE=https://github.com/pre-commit/identify/ https://pypi.org/project/identify/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~riscv ~x86
+LICENSE=MIT
+RDEPEND=dev-python/ukkonen[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/pre-commit/identify/archive/v2.5.7.tar.gz -> identify-2.5.7.gh.tar.gz
+_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=29defb420bf1f95c1a449e7e67cce4c0
diff --git a/metadata/md5-cache/dev-python/immutables-0.19 b/metadata/md5-cache/dev-python/immutables-0.19
index 84564acb29bb..676afb68f419 100644
--- a/metadata/md5-cache/dev-python/immutables-0.19
+++ b/metadata/md5-cache/dev-python/immutables-0.19
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/MagicStack/immutables/ https://pypi.org/project/immutables/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_8 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=Apache-2.0
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 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/MagicStack/immutables/archive/v0.19.tar.gz -> immutables-0.19.gh.tar.gz
 _eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=cee9ece335ec7ac592e85b8406e52c77
+_md5_=d23da6f518c1a5936dd43f417b969c1f
diff --git a/metadata/md5-cache/dev-python/ipykernel-6.16.2 b/metadata/md5-cache/dev-python/ipykernel-6.16.2
new file mode 100644
index 000000000000..8c6e43b1abc5
--- /dev/null
+++ b/metadata/md5-cache/dev-python/ipykernel-6.16.2
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-python/debugpy-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ipython-7.23.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jupyter_client-6.1.12[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/matplotlib-inline-0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/nest_asyncio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyzmq-17[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/tornado-6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/traitlets-5.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/flaky[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-timeout[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ipyparallel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/debugpy-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ipython-7.23.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jupyter_client-6.1.12[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/matplotlib-inline-0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/nest_asyncio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyzmq-17[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/tornado-6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/traitlets-5.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+)] ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/hatchling-1.8.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=IPython Kernel for Jupyter
+EAPI=8
+HOMEPAGE=https://github.com/ipython/ipykernel/ https://pypi.org/project/ipykernel/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=BSD
+RDEPEND=>=dev-python/debugpy-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ipython-7.23.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jupyter_client-6.1.12[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/matplotlib-inline-0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/nest_asyncio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyzmq-17[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/tornado-6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/traitlets-5.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+)] )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/i/ipykernel/ipykernel-6.16.2.tar.gz
+_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=71feeb2d3d4174c744809a361d9ef27e
diff --git a/metadata/md5-cache/dev-python/jc-1.21.2 b/metadata/md5-cache/dev-python/jc-1.21.2
deleted file mode 100644
index ae1fae64931d..000000000000
--- a/metadata/md5-cache/dev-python/jc-1.21.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pygments[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ruamel-yaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/xmltodict[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Converts the output of popular command-line tools and file-types to JSON
-EAPI=8
-HOMEPAGE=https://github.com/kellyjonbrazil/jc/ https://pypi.org/project/jc/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~ppc64
-LICENSE=MIT
-RDEPEND=dev-python/pygments[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ruamel-yaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/xmltodict[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/kellyjonbrazil/jc/archive/v1.21.2.tar.gz -> jc-1.21.2.gh.tar.gz
-_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=dcaea142aab83c7a2b0bf1caf4dfc7ec
diff --git a/metadata/md5-cache/dev-python/jc-1.22.0 b/metadata/md5-cache/dev-python/jc-1.22.0
deleted file mode 100644
index a83c5069376d..000000000000
--- a/metadata/md5-cache/dev-python/jc-1.22.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pygments[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ruamel-yaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/xmltodict[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Converts the output of popular command-line tools and file-types to JSON
-EAPI=8
-HOMEPAGE=https://github.com/kellyjonbrazil/jc/ https://pypi.org/project/jc/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~ppc64
-LICENSE=MIT
-RDEPEND=dev-python/pygments[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ruamel-yaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/xmltodict[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/kellyjonbrazil/jc/archive/v1.22.0.tar.gz -> jc-1.22.0.gh.tar.gz
-_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=dcaea142aab83c7a2b0bf1caf4dfc7ec
diff --git a/metadata/md5-cache/dev-python/jc-1.21.0 b/metadata/md5-cache/dev-python/jc-1.22.1
similarity index 96%
rename from metadata/md5-cache/dev-python/jc-1.21.0
rename to metadata/md5-cache/dev-python/jc-1.22.1
index 113ccd9a4824..a3799c2f1f14 100644
--- a/metadata/md5-cache/dev-python/jc-1.21.0
+++ b/metadata/md5-cache/dev-python/jc-1.22.1
@@ -11,6 +11,6 @@ RDEPEND=dev-python/pygments[python_targets_python3_8(-)?,python_targets_python3_
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/kellyjonbrazil/jc/archive/v1.21.0.tar.gz -> jc-1.21.0.gh.tar.gz
+SRC_URI=https://github.com/kellyjonbrazil/jc/archive/v1.22.1.tar.gz -> jc-1.22.1.gh.tar.gz
 _eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
 _md5_=dcaea142aab83c7a2b0bf1caf4dfc7ec
diff --git a/metadata/md5-cache/dev-python/jupyter_client-7.4.4 b/metadata/md5-cache/dev-python/jupyter_client-7.4.4
new file mode 100644
index 000000000000..9f322c8d6b01
--- /dev/null
+++ b/metadata/md5-cache/dev-python/jupyter_client-7.4.4
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/ipykernel-6.12[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ipython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-asyncio-0.18[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-timeout[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/entrypoints[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jupyter_core-4.9.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nest_asyncio-1.5.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-dateutil-2.8.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyzmq-23.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/tornado-6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/traitlets[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+)] ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/hatchling-1.8.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Jupyter protocol implementation and client libraries
+EAPI=8
+HOMEPAGE=https://jupyter.org/ https://github.com/jupyter/jupyter_client/ https://pypi.org/project/jupyter-client/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=BSD
+RDEPEND=dev-python/entrypoints[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jupyter_core-4.9.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nest_asyncio-1.5.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-dateutil-2.8.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyzmq-23.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/tornado-6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/traitlets[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+)] )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/j/jupyter_client/jupyter_client-7.4.4.tar.gz
+_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=5141592e1309cfa1a6b8bcaa5b3d853a
diff --git a/metadata/md5-cache/dev-python/jupyterlab-3.5.0 b/metadata/md5-cache/dev-python/jupyterlab-3.5.0
new file mode 100644
index 000000000000..6eae3054a358
--- /dev/null
+++ b/metadata/md5-cache/dev-python/jupyterlab-3.5.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/check-manifest[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ipykernel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jupyterlab_server[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/openapi-core[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/openapi-spec-validator[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-console-scripts[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-tornasync[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-timeout[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ruamel-yaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests-cache[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/strict-rfc3339[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/virtualenv[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/ipython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jupyter_core[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jupyterlab_server-2.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jupyter_server-1.16[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nbclassic-0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/notebook-7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jinja-2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/tornado-6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tomli[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] net-libs/nodejs >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jupyter_packaging-0.12.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=JupyterLab computational environment
+EAPI=8
+HOMEPAGE=https://jupyter.org/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD MIT GPL-3 Apache-2.0
+RDEPEND=dev-python/ipython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jupyter_core[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jupyterlab_server-2.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jupyter_server-1.16[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nbclassic-0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/notebook-7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jinja-2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/tornado-6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tomli[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] net-libs/nodejs python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/j/jupyterlab/jupyterlab-3.5.0.tar.gz
+_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=a523af8ab21df0a1f030e165ad78adc8
diff --git a/metadata/md5-cache/dev-python/jwcrypto-1.3.1 b/metadata/md5-cache/dev-python/jwcrypto-1.3.1
deleted file mode 100644
index 9cf83bae8720..000000000000
--- a/metadata/md5-cache/dev-python/jwcrypto-1.3.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=doc? ( || ( ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_8(-)] ) ( >=dev-python/pypy3-7.3.9_p1:0 >=dev-python/sphinx-4.5.0-r1[python_targets_pypy3(-)] ) ) ) test? ( >=dev-python/cryptography-2.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/deprecated[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Implements JWK,JWS,JWE specifications using python-cryptography
-EAPI=8
-HOMEPAGE=https://github.com/latchset/jwcrypto/ https://pypi.org/project/jwcrypto/
-INHERIT=distutils-r1
-IUSE=doc test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~arm64 ~riscv x86
-LICENSE=LGPL-3+
-RDEPEND=>=dev-python/cryptography-2.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/deprecated[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/latchset/jwcrypto/archive/v1.3.1.tar.gz -> jwcrypto-1.3.1.gh.tar.gz
-_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=ff0d6d69e3c1c895a15c498fc29cc08f
diff --git a/metadata/md5-cache/dev-python/jwcrypto-1.4.2 b/metadata/md5-cache/dev-python/jwcrypto-1.4.2
index 0cb3eb778c4e..620bc4b49986 100644
--- a/metadata/md5-cache/dev-python/jwcrypto-1.4.2
+++ b/metadata/md5-cache/dev-python/jwcrypto-1.4.2
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/latchset/jwcrypto/ https://pypi.org/project/jwcrypto/
 INHERIT=distutils-r1
 IUSE=doc test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~riscv x86
 LICENSE=LGPL-3+
 RDEPEND=>=dev-python/cryptography-2.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/deprecated[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 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/latchset/jwcrypto/archive/v1.4.2.tar.gz -> jwcrypto-1.4.2.gh.tar.gz
 _eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=c9c0a76e368fe11177ba1b5ae8ab5f3f
+_md5_=2fa36d853f242b826584d0f891e70fe6
diff --git a/metadata/md5-cache/dev-python/k5test-0.10.1-r1 b/metadata/md5-cache/dev-python/k5test-0.10.1-r2
similarity index 93%
rename from metadata/md5-cache/dev-python/k5test-0.10.1-r1
rename to metadata/md5-cache/dev-python/k5test-0.10.1-r2
index 0b47a773f61b..57220fb2619b 100644
--- a/metadata/md5-cache/dev-python/k5test-0.10.1-r1
+++ b/metadata/md5-cache/dev-python/k5test-0.10.1-r2
@@ -2,7 +2,7 @@ BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_target
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Library for testing Python applications in Kerberos 5 environments
 EAPI=8
-HOMEPAGE=https://pypi.org/project/k5test/ https://github.com/pythongssapi/k5test
+HOMEPAGE=https://github.com/pythongssapi/k5test/ https://pypi.org/project/k5test/
 INHERIT=distutils-r1
 IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=amd64 ~arm arm64 ~riscv x86
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/k/k5test/k5test-0.10.1.tar.gz
 _eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=68670e09dab0c766932bc1392f2c5577
+_md5_=f241186f8278a14a3ebb3dd4c77bedc9
diff --git a/metadata/md5-cache/dev-python/kgb-7.1.1 b/metadata/md5-cache/dev-python/kgb-7.1.1
index 3e3d81027eb5..0ebe99fafa75 100644
--- a/metadata/md5-cache/dev-python/kgb-7.1.1
+++ b/metadata/md5-cache/dev-python/kgb-7.1.1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/beanbaginc/kgb/ https://pypi.org/project/kgb/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 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/k/kgb/kgb-7.1.1.tar.gz
 _eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=efc4d267d4cb6cbc4a75f625b0143716
+_md5_=3275f5f47777d3f3ac3b887cbab03bb1
diff --git a/metadata/md5-cache/dev-python/krb5-0.4.1 b/metadata/md5-cache/dev-python/krb5-0.4.1
new file mode 100644
index 000000000000..853a6c9efad4
--- /dev/null
+++ b/metadata/md5-cache/dev-python/krb5-0.4.1
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/k5test[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( virtual/krb5 >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Kerberos API bindings for Python
+EAPI=8
+HOMEPAGE=https://github.com/jborean93/pykrb5/ https://pypi.org/project/krb5/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
+LICENSE=MIT
+RDEPEND=virtual/krb5 python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/k/krb5/krb5-0.4.1.tar.gz
+_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=d052281377413cdbe1cff9877763e4a1
diff --git a/metadata/md5-cache/dev-python/linkify-it-py-2.0.0 b/metadata/md5-cache/dev-python/linkify-it-py-2.0.0
index be0606c24d36..ff3f41e0c17b 100644
--- a/metadata/md5-cache/dev-python/linkify-it-py-2.0.0
+++ b/metadata/md5-cache/dev-python/linkify-it-py-2.0.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/tsutsu3/linkify-it-py/ https://pypi.org/project/linkify-it-py/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=dev-python/uc-micro-py[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 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/tsutsu3/linkify-it-py/archive/v2.0.0.tar.gz -> linkify-it-py-2.0.0.gh.tar.gz
 _eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=e89775f3b5c8eab30d6ab0d471726d1e
+_md5_=6dbe900b3f6b77cd84de30868734a964
diff --git a/metadata/md5-cache/dev-python/lit-15.0.3 b/metadata/md5-cache/dev-python/lit-15.0.3
index b19189690911..4b664132b88b 100644
--- a/metadata/md5-cache/dev-python/lit-15.0.3
+++ b/metadata/md5-cache/dev-python/lit-15.0.3
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://llvm.org/
 INHERIT=distutils-r1 llvm.org
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 verify-sig
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv sparc ~x86
 LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_8 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/llvm/llvm-project/releases/download/llvmorg-15.0.3/llvm-project-15.0.3.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.3/llvm-project-15.0.3.src.tar.xz.sig )
 _eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	llvm.org	ab48c0803b67a958624f7600ef86081c	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	0748d665fa664a87add00152ed046e16
-_md5_=2b332d05b5b02e70e0aca961ff11035b
+_md5_=d5bc97f05337a35e4b049963c9fb5135
diff --git a/metadata/md5-cache/dev-python/lit-15.0.3.9999 b/metadata/md5-cache/dev-python/lit-15.0.4.9999
similarity index 100%
rename from metadata/md5-cache/dev-python/lit-15.0.3.9999
rename to metadata/md5-cache/dev-python/lit-15.0.4.9999
diff --git a/metadata/md5-cache/dev-python/mako-1.2.2 b/metadata/md5-cache/dev-python/mako-1.2.2
deleted file mode 100644
index d223afaef304..000000000000
--- a/metadata/md5-cache/dev-python/mako-1.2.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/Babel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/markupsafe-0.9.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A Python templating language
-EAPI=8
-HOMEPAGE=https://www.makotemplates.org/ https://github.com/sqlalchemy/mako/ https://pypi.org/project/Mako/
-INHERIT=distutils-r1
-IUSE=doc test python_targets_pypy3 python_targets_python3_8 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=MIT
-RDEPEND=>=dev-python/markupsafe-0.9.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/M/Mako/Mako-1.2.2.tar.gz
-_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=dbf2e56529eb26e328f017b27f098c34
diff --git a/metadata/md5-cache/dev-python/mako-1.2.3 b/metadata/md5-cache/dev-python/mako-1.2.3
index 19d91e816abe..f2a72115230c 100644
--- a/metadata/md5-cache/dev-python/mako-1.2.3
+++ b/metadata/md5-cache/dev-python/mako-1.2.3
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://www.makotemplates.org/ https://github.com/sqlalchemy/mako/ https://pypi.org/project/Mako/
 INHERIT=distutils-r1
 IUSE=doc test python_targets_pypy3 python_targets_python3_8 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
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=MIT
 RDEPEND=>=dev-python/markupsafe-0.9.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 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/M/Mako/Mako-1.2.3.tar.gz
 _eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=cb3b37c743b3d17140332d8531ed9a07
+_md5_=dbf2e56529eb26e328f017b27f098c34
diff --git a/metadata/md5-cache/dev-python/markdown-it-py-2.1.0-r1 b/metadata/md5-cache/dev-python/markdown-it-py-2.1.0-r1
deleted file mode 100644
index f12d693cbde8..000000000000
--- a/metadata/md5-cache/dev-python/markdown-it-py-2.1.0-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pytest-regressions[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/mdurl[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/flit_core-3.7.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python port of markdown-it, Markdown parser
-EAPI=8
-HOMEPAGE=https://pypi.org/project/markdown-it-py/ https://github.com/executablebooks/markdown-it-py/
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=MIT
-RDEPEND=dev-python/mdurl[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/executablebooks/markdown-it-py/archive/v2.1.0.tar.gz -> markdown-it-py-2.1.0.gh.tar.gz
-_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=404d1a41b65600e18080acdfa023aea6
diff --git a/metadata/md5-cache/dev-python/markdown-it-py-2.1.0-r2 b/metadata/md5-cache/dev-python/markdown-it-py-2.1.0-r2
index 9d91bcb91b11..23dba737ab98 100644
--- a/metadata/md5-cache/dev-python/markdown-it-py-2.1.0-r2
+++ b/metadata/md5-cache/dev-python/markdown-it-py-2.1.0-r2
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/markdown-it-py/ https://github.com/executablebooks/markdown-it-py/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=dev-python/linkify-it-py[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/mdurl[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 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/executablebooks/markdown-it-py/archive/v2.1.0.tar.gz -> markdown-it-py-2.1.0.gh.tar.gz
 _eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=baf9eaf5de821407d53f0f0538aee880
+_md5_=787ca192f404557d2fba3c2e96e500bd
diff --git a/metadata/md5-cache/dev-python/matplotlib-3.5.1-r2 b/metadata/md5-cache/dev-python/matplotlib-3.5.1-r2
deleted file mode 100644
index b9020e2518a4..000000000000
--- a/metadata/md5-cache/dev-python/matplotlib-3.5.1-r2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/certifi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cycler-0.10.0-r1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/fonttools-4.22.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/kiwisolver-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/numpy-1.18.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/packaging-20.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pillow-7.1.1[jpeg,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyparsing-2.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-dateutil-2.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytz-2019.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/six-1.14.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] media-fonts/dejavu media-fonts/stix-fonts media-libs/freetype:2 media-libs/libpng:0 >=media-libs/qhull-2013:= virtual/imagemagick-tools[jpeg,tiff] cairo? ( dev-python/cairocffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) excel? ( dev-python/xlwt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) gtk3? ( >=dev-python/pygobject-3.40.1-r1:3[cairo?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] 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_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) webagg? ( >=dev-python/tornado-6.0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) wxwidgets? ( dev-python/wxpython:*[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) dev-python/setuptools_scm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/setuptools_scm_git_archive[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] virtual/pkgconfig doc? ( >=app-text/dvipng-1.15-r1 >=dev-python/colorspacious-1.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ipython-1.18.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/numpydoc-0.9.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/scipy-1.4.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sphinx-1.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sphinx-gallery-0.3.1-r1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/xlwt-1.3.0-r1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] 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/flaky[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pygobject-3.40.1-r1:3[cairo?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/tornado-6.0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] x11-libs/gtk+:3[introspection] ) test? ( dev-python/certifi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cycler-0.10.0-r1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/fonttools-4.22.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/kiwisolver-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/numpy-1.18.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/packaging-20.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pillow-7.1.1[jpeg,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyparsing-2.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-dateutil-2.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytz-2019.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/six-1.14.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] media-fonts/dejavu media-fonts/stix-fonts media-libs/freetype:2 media-libs/libpng:0 >=media-libs/qhull-2013:= virtual/imagemagick-tools[jpeg,tiff] cairo? ( dev-python/cairocffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) excel? ( dev-python/xlwt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) gtk3? ( >=dev-python/pygobject-3.40.1-r1:3[cairo?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] 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_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) webagg? ( >=dev-python/tornado-6.0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) wxwidgets? ( dev-python/wxpython:*[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[tk?,threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[tk?,threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[tk?,threads(+)] ) >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install prepare setup test
-DESCRIPTION=Pure python plotting library with matlab like syntax
-EAPI=8
-HOMEPAGE=https://matplotlib.org/
-INHERIT=distutils-r1 flag-o-matic virtualx toolchain-funcs prefix
-IUSE=cairo doc excel examples gtk3 latex qt5 tk webagg wxwidgets test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 test
-KEYWORDS=amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=BitstreamVera BSD matplotlib MIT OFL-1.1
-RDEPEND=dev-python/certifi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cycler-0.10.0-r1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/fonttools-4.22.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/kiwisolver-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/numpy-1.18.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/packaging-20.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pillow-7.1.1[jpeg,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyparsing-2.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-dateutil-2.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytz-2019.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/six-1.14.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] media-fonts/dejavu media-fonts/stix-fonts media-libs/freetype:2 media-libs/libpng:0 >=media-libs/qhull-2013:= virtual/imagemagick-tools[jpeg,tiff] cairo? ( dev-python/cairocffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) excel? ( dev-python/xlwt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) gtk3? ( >=dev-python/pygobject-3.40.1-r1:3[cairo?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] 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_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) webagg? ( >=dev-python/tornado-6.0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) wxwidgets? ( dev-python/wxpython:*[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[tk?,threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[tk?,threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[tk?,threads(+)] )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/m/matplotlib/matplotlib-3.5.1.tar.gz test? ( https://downloads.sourceforge.net/project/freetype/freetype2/2.6.1/freetype-2.6.1.tar.gz )
-_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	flag-o-matic	29a755b1291d64133634d80b0328f153	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	prefix	eab3c99d77fe00506c109c8a736186f7	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	virtualx	644887c82aefdf12001489391fca4f02
-_md5_=feb017677b5dc0cad52c2f4d2a604095
diff --git a/metadata/md5-cache/dev-python/matplotlib-3.5.2-r3 b/metadata/md5-cache/dev-python/matplotlib-3.5.2-r3
deleted file mode 100644
index 1906d68b8321..000000000000
--- a/metadata/md5-cache/dev-python/matplotlib-3.5.2-r3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/certifi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cycler-0.10.0-r1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/fonttools-4.22.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/kiwisolver-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/numpy-1.18.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-20.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pillow-7.1.1[jpeg,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyparsing-2.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-dateutil-2.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytz-2019.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/six-1.14.0[python_targets_python3_8(-)?,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] cairo? ( dev-python/cairocffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) excel? ( dev-python/xlwt[python_targets_python3_8(-)?,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_8(-)?,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_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) webagg? ( >=dev-python/tornado-6.0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) wxwidgets? ( python_targets_python3_8? ( dev-python/wxpython:*[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/wxpython:*[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/wxpython:*[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) dev-python/setuptools_scm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/setuptools_scm_git_archive[python_targets_python3_8(-)?,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_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ipython-1.18.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/numpydoc-0.9.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/scipy-1.4.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sphinx-1.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sphinx-gallery-0.3.1-r1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/xlwt-1.3.0-r1[python_targets_python3_8(-)?,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_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pygobject-3.40.1-r1:3[cairo?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tornado-6.0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] x11-libs/gtk+:3[introspection] ) test? ( dev-python/certifi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cycler-0.10.0-r1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/fonttools-4.22.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/kiwisolver-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/numpy-1.18.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-20.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pillow-7.1.1[jpeg,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyparsing-2.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-dateutil-2.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytz-2019.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/six-1.14.0[python_targets_python3_8(-)?,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] cairo? ( dev-python/cairocffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) excel? ( dev-python/xlwt[python_targets_python3_8(-)?,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_8(-)?,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_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) webagg? ( >=dev-python/tornado-6.0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) wxwidgets? ( python_targets_python3_8? ( dev-python/wxpython:*[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/wxpython:*[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/wxpython:*[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[tk?,threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[tk?,threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[tk?,threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[tk?,threads(+)] ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,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 toolchain-funcs virtualx
-IUSE=cairo doc excel examples gtk3 latex qt5 tk webagg wxwidgets test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 test
-KEYWORDS=amd64 arm ~arm64 hppa ~ia64 ppc ~ppc64 ~riscv ~s390 sparc x86
-LICENSE=BitstreamVera BSD matplotlib MIT OFL-1.1
-RDEPEND=dev-python/certifi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cycler-0.10.0-r1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/fonttools-4.22.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/kiwisolver-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/numpy-1.18.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-20.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pillow-7.1.1[jpeg,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyparsing-2.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-dateutil-2.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytz-2019.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/six-1.14.0[python_targets_python3_8(-)?,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] cairo? ( dev-python/cairocffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) excel? ( dev-python/xlwt[python_targets_python3_8(-)?,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_8(-)?,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_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) webagg? ( >=dev-python/tornado-6.0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) wxwidgets? ( python_targets_python3_8? ( dev-python/wxpython:*[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/wxpython:*[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/wxpython:*[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[tk?,threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[tk?,threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[tk?,threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[tk?,threads(+)] )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/m/matplotlib/matplotlib-3.5.2.tar.gz test? ( https://downloads.sourceforge.net/project/freetype/freetype2/2.6.1/freetype-2.6.1.tar.gz )
-_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	flag-o-matic	29a755b1291d64133634d80b0328f153	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	prefix	eab3c99d77fe00506c109c8a736186f7	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	virtualx	644887c82aefdf12001489391fca4f02
-_md5_=ffa020a5cf4f30c4152b82e46a8f71c4
diff --git a/metadata/md5-cache/dev-python/matplotlib-3.5.3 b/metadata/md5-cache/dev-python/matplotlib-3.5.3
index eabe6fcc80e6..ec9f33a74dfb 100644
--- a/metadata/md5-cache/dev-python/matplotlib-3.5.3
+++ b/metadata/md5-cache/dev-python/matplotlib-3.5.3
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://matplotlib.org/ https://github.com/matplotlib/matplotlib/ https://pypi.org/project/matplotlib/
 INHERIT=distutils-r1 flag-o-matic multiprocessing prefix toolchain-funcs virtualx
 IUSE=cairo doc excel examples gtk3 latex qt5 tk webagg wxwidgets test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 test
-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=BitstreamVera BSD matplotlib MIT OFL-1.1
 RDEPEND=dev-python/certifi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cycler-0.10.0-r1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/fonttools-4.22.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/kiwisolver-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/numpy-1.18.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-20.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pillow-7.1.1[jpeg,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyparsing-2.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-dateutil-2.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytz-2019.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/six-1.14.0[python_targets_python3_8(-)?,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] cairo? ( dev-python/cairocffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) excel? ( dev-python/xlwt[python_targets_python3_8(-)?,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_8(-)?,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_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) webagg? ( >=dev-python/tornado-6.0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) wxwidgets? ( python_targets_python3_8? ( dev-python/wxpython:*[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/wxpython:*[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/wxpython:*[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[tk?,threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[tk?,threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[tk?,threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[tk?,threads(+)] )
 REQUIRED_USE=|| ( python_targets_python3_8 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=mirror://pypi/m/matplotlib/matplotlib-3.5.3.tar.gz test? ( https://downloads.sourceforge.net/project/freetype/freetype2/2.6.1/freetype-2.6.1.tar.gz )
 _eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	flag-o-matic	29a755b1291d64133634d80b0328f153	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	prefix	eab3c99d77fe00506c109c8a736186f7	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	virtualx	644887c82aefdf12001489391fca4f02
-_md5_=b76994f5c3d67f7ce5b86bd6e4d1e961
+_md5_=cbefd1ba8dd69b9a53fb659c410f932f
diff --git a/metadata/md5-cache/dev-python/matplotlib-3.6.0-r1 b/metadata/md5-cache/dev-python/matplotlib-3.6.0-r1
deleted file mode 100644
index 094657a07243..000000000000
--- a/metadata/md5-cache/dev-python/matplotlib-3.6.0-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/certifi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/contourpy-1.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cycler-0.10.0-r1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/fonttools-4.22.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/kiwisolver-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/numpy-1.19[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-20.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pillow-7.1.1[jpeg,webp,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyparsing-2.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-dateutil-2.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytz-2019.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/six-1.14.0[python_targets_python3_8(-)?,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] cairo? ( dev-python/cairocffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) excel? ( dev-python/xlwt[python_targets_python3_8(-)?,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_8(-)?,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_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) webagg? ( >=dev-python/tornado-6.0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) wxwidgets? ( python_targets_python3_8? ( dev-python/wxpython:*[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/wxpython:*[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/wxpython:*[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) >=dev-python/setuptools_scm-7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/setuptools_scm_git_archive[python_targets_python3_8(-)?,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_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ipython-1.18.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/numpydoc-0.9.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/scipy-1.4.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sphinx-1.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sphinx-gallery-0.3.1-r1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/xlwt-1.3.0-r1[python_targets_python3_8(-)?,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_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pygobject-3.40.1-r1:3[cairo?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tornado-6.0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] x11-libs/gtk+:3[introspection] ) test? ( dev-python/certifi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/contourpy-1.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cycler-0.10.0-r1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/fonttools-4.22.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/kiwisolver-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/numpy-1.19[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-20.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pillow-7.1.1[jpeg,webp,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyparsing-2.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-dateutil-2.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytz-2019.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/six-1.14.0[python_targets_python3_8(-)?,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] cairo? ( dev-python/cairocffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) excel? ( dev-python/xlwt[python_targets_python3_8(-)?,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_8(-)?,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_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) webagg? ( >=dev-python/tornado-6.0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) wxwidgets? ( python_targets_python3_8? ( dev-python/wxpython:*[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/wxpython:*[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/wxpython:*[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[tk?,threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[tk?,threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[tk?,threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[tk?,threads(+)] ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,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 toolchain-funcs virtualx
-IUSE=cairo doc excel examples gtk3 latex qt5 tk webagg wxwidgets test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv
-LICENSE=BitstreamVera BSD matplotlib MIT OFL-1.1
-RDEPEND=dev-python/certifi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/contourpy-1.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cycler-0.10.0-r1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/fonttools-4.22.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/kiwisolver-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/numpy-1.19[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-20.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pillow-7.1.1[jpeg,webp,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyparsing-2.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-dateutil-2.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytz-2019.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/six-1.14.0[python_targets_python3_8(-)?,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] cairo? ( dev-python/cairocffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) excel? ( dev-python/xlwt[python_targets_python3_8(-)?,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_8(-)?,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_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) webagg? ( >=dev-python/tornado-6.0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) wxwidgets? ( python_targets_python3_8? ( dev-python/wxpython:*[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/wxpython:*[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/wxpython:*[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[tk?,threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[tk?,threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[tk?,threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[tk?,threads(+)] )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/m/matplotlib/matplotlib-3.6.0.tar.gz test? ( https://downloads.sourceforge.net/project/freetype/freetype2/2.6.1/freetype-2.6.1.tar.gz )
-_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	flag-o-matic	29a755b1291d64133634d80b0328f153	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	prefix	eab3c99d77fe00506c109c8a736186f7	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	virtualx	644887c82aefdf12001489391fca4f02
-_md5_=7a079f2f7f1ccb7cabba680be99aa92a
diff --git a/metadata/md5-cache/dev-python/mediafile-0.10.1 b/metadata/md5-cache/dev-python/mediafile-0.10.1
new file mode 100644
index 000000000000..0767313da6aa
--- /dev/null
+++ b/metadata/md5-cache/dev-python/mediafile-0.10.1
@@ -0,0 +1,16 @@
+BDEPEND=doc? ( || ( ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_8(-)] ) ) ) test? ( >=dev-python/six-1.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=media-libs/mutagen-1.46.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/flit_core-3.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Read and write audio files' tags in Python
+EAPI=8
+HOMEPAGE=https://github.com/beetbox/mediafile/ https://pypi.org/project/mediafile/
+INHERIT=distutils-r1
+IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/six-1.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=media-libs/mutagen-1.46.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/beetbox/mediafile/archive/v0.10.1.tar.gz -> mediafile-0.10.1.gh.tar.gz
+_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=20e1287c7e7e6ec19caf1f2b537b6927
diff --git a/metadata/md5-cache/dev-python/meson-python-0.10.0 b/metadata/md5-cache/dev-python/meson-python-0.10.0
index a39425b00623..f0e964797741 100644
--- a/metadata/md5-cache/dev-python/meson-python-0.10.0
+++ b/metadata/md5-cache/dev-python/meson-python-0.10.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/meson-python/ https://github.com/FFY00/meson-python/
 INHERIT=distutils-r1
 IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 arm arm64 ppc ppc64 ~riscv ~s390 ~x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv ~s390 x86
 LICENSE=MIT
 RDEPEND=>=dev-python/pyproject-metadata-0.6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-util/meson-0.63.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-util/patchelf python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_8 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/meson-python/archive/0.10.0.tar.gz -> meson-python-0.10.0.gh.tar.gz
 _eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=0456b423de682ee1453a03a262d67204
+_md5_=1c733661fcfc0c15df938708cd5d6d46
diff --git a/metadata/md5-cache/dev-python/mkdocs-material-8.4.3 b/metadata/md5-cache/dev-python/mkdocs-material-8.4.3
deleted file mode 100644
index 25fbe3c9f5cd..000000000000
--- a/metadata/md5-cache/dev-python/mkdocs-material-8.4.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] doc? ( || ( ( >=dev-lang/python-3.11.0_beta4:3.11 dev-python/mkdocs[python_targets_python3_11(-)] dev-python/mkdocs-material-extensions[python_targets_python3_11(-)] dev-python/mkdocs-minify-plugin[python_targets_python3_11(-)] dev-python/mkdocs-redirects[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 dev-python/mkdocs[python_targets_python3_10(-)] dev-python/mkdocs-material-extensions[python_targets_python3_10(-)] dev-python/mkdocs-minify-plugin[python_targets_python3_10(-)] dev-python/mkdocs-redirects[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-python/mkdocs[python_targets_python3_9(-)] dev-python/mkdocs-material-extensions[python_targets_python3_9(-)] dev-python/mkdocs-minify-plugin[python_targets_python3_9(-)] dev-python/mkdocs-redirects[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-python/mkdocs[python_targets_python3_8(-)] dev-python/mkdocs-material-extensions[python_targets_python3_8(-)] dev-python/mkdocs-minify-plugin[python_targets_python3_8(-)] dev-python/mkdocs-redirects[python_targets_python3_8(-)] ) ) )
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A Material Design theme for MkDocs
-EAPI=8
-HOMEPAGE=https://github.com/squidfunk/mkdocs-material/ https://pypi.org/project/mkdocs-material/
-INHERIT=distutils-r1 docs
-IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 doc
-KEYWORDS=amd64 ~riscv x86
-LICENSE=MIT
-PDEPEND=>=dev-python/mkdocs-material-extensions-1.0.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-RDEPEND=>=dev-python/jinja-2.11.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/markdown-3.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/mkdocs-1.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pygments-2.12[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pymdown-extensions-9.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-SLOT=0
-SRC_URI=https://github.com/squidfunk/mkdocs-material/archive/8.4.3.tar.gz -> mkdocs-material-8.4.3.gh.tar.gz
-_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	docs	8ed2a8a28ff109e7a3582c9abb7fe327	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=1bad5a51d3f6e4f44ce8cec2eb6b4df5
diff --git a/metadata/md5-cache/dev-python/mkdocs-material-8.5.2 b/metadata/md5-cache/dev-python/mkdocs-material-8.5.2
index 5151d711c379..95133ad258c3 100644
--- a/metadata/md5-cache/dev-python/mkdocs-material-8.5.2
+++ b/metadata/md5-cache/dev-python/mkdocs-material-8.5.2
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/squidfunk/mkdocs-material/ https://pypi.org/project/mkdocs-material/
 INHERIT=distutils-r1 docs
 IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 doc
-KEYWORDS=~amd64 ~riscv ~x86
+KEYWORDS=amd64 ~riscv x86
 LICENSE=MIT
 PDEPEND=>=dev-python/mkdocs-material-extensions-1.0.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 RDEPEND=>=dev-python/jinja-3.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/markdown-3.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/mkdocs-1.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pygments-2.12[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pymdown-extensions-9.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
@@ -13,4 +13,4 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 SLOT=0
 SRC_URI=https://github.com/squidfunk/mkdocs-material/archive/8.5.2.tar.gz -> mkdocs-material-8.5.2.gh.tar.gz
 _eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	docs	8ed2a8a28ff109e7a3582c9abb7fe327	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=33e3578726523bb0e60207da0141fdca
+_md5_=ce5d923d41e22d584e76e1621e8ae803
diff --git a/metadata/md5-cache/dev-python/mkdocs-minify-plugin-0.6.1 b/metadata/md5-cache/dev-python/mkdocs-minify-plugin-0.6.1
new file mode 100644
index 000000000000..f55e96952d4a
--- /dev/null
+++ b/metadata/md5-cache/dev-python/mkdocs-minify-plugin-0.6.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( ~dev-python/mkdocs-minify-plugin-0.6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/csscompressor-0.9.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/mkdocs-1.4.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=app-text/htmlmin-0.1.12[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsmin-3.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=An MkDocs plugin to minify HTML and/or JS files prior to being written to disk
+EAPI=8
+HOMEPAGE=https://github.com/byrnereese/mkdocs-minify-plugin https://pypi.org/project/mkdocs-minify-plugin/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~riscv ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/csscompressor-0.9.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/mkdocs-1.4.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=app-text/htmlmin-0.1.12[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsmin-3.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/byrnereese/mkdocs-minify-plugin/archive/0.6.1.tar.gz -> mkdocs-minify-plugin-0.6.1.gh.tar.gz
+_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=16b7cd73431601cd267352e94fc9cee6
diff --git a/metadata/md5-cache/dev-python/mkdocs-redirects-1.1.0 b/metadata/md5-cache/dev-python/mkdocs-redirects-1.1.0
deleted file mode 100644
index a4816dfa496c..000000000000
--- a/metadata/md5-cache/dev-python/mkdocs-redirects-1.1.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/mkdocs-1.0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/mkdocs-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/twine[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Plugin for Mkdocs page redirects
-EAPI=8
-HOMEPAGE=https://github.com/mkdocs/mkdocs-redirects https://pypi.org/project/mkdocs-redirects/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~riscv x86
-LICENSE=MIT
-RDEPEND=>=dev-python/mkdocs-1.0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/mkdocs-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/twine[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/mkdocs/mkdocs-redirects/archive/refs/tags/v1.1.0.tar.gz -> mkdocs-redirects-1.1.0.gh.tar.gz
-_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=41bf199762a39ac25548757ea81c981c
diff --git a/metadata/md5-cache/dev-python/mkdocs-redirects-1.2.0 b/metadata/md5-cache/dev-python/mkdocs-redirects-1.2.0
index 58ad4445f551..709d39d2ab40 100644
--- a/metadata/md5-cache/dev-python/mkdocs-redirects-1.2.0
+++ b/metadata/md5-cache/dev-python/mkdocs-redirects-1.2.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/mkdocs/mkdocs-redirects https://pypi.org/project/mkdocs-redirects/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~riscv ~x86
+KEYWORDS=amd64 ~riscv x86
 LICENSE=MIT
 RDEPEND=>=dev-python/mkdocs-1.0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/mkdocs-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/twine[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_8 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/mkdocs/mkdocs-redirects/archive/refs/tags/v1.2.0.tar.gz -> mkdocs-redirects-1.2.0.gh.tar.gz
 _eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=a6f2a3c5be30d66c43ce6141262df9e0
+_md5_=41bf199762a39ac25548757ea81c981c
diff --git a/metadata/md5-cache/dev-python/numpy-1.21.5 b/metadata/md5-cache/dev-python/numpy-1.21.5
deleted file mode 100644
index cc3333461cfc..000000000000
--- a/metadata/md5-cache/dev-python/numpy-1.21.5
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=lapack? ( >=virtual/cblas-3.8 >=virtual/lapack-3.8 ) app-arch/unzip >=dev-python/cython-0.29.24[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] lapack? ( virtual/pkgconfig ) test? ( >=dev-python/hypothesis-5.8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytz-2019.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cffi-1.14.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( lapack? ( >=virtual/cblas-3.8 >=virtual/lapack-3.8 ) >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+)] ) >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] lapack? ( virtual/fortran )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=lapack? ( virtual/fortran )
-DESCRIPTION=Fast array and numerical python library
-EAPI=7
-HOMEPAGE=https://numpy.org/
-INHERIT=distutils-r1 flag-o-matic fortran-2 toolchain-funcs
-IUSE=doc lapack test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-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 ~x64-solaris ~x86-solaris
-LICENSE=BSD
-RDEPEND=lapack? ( >=virtual/cblas-3.8 >=virtual/lapack-3.8 ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+)] ) lapack? ( virtual/fortran )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/n/numpy/numpy-1.21.5.zip doc? ( https://numpy.org/doc/1.21/numpy-html.zip -> numpy-html-1.21.5.zip https://numpy.org/doc/1.21/numpy-ref.pdf -> numpy-ref-1.21.5.pdf https://numpy.org/doc/1.21/numpy-user.pdf -> numpy-user-1.21.5.pdf )
-_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	fortran-2	72d28c6872beb1e7cb99684b0ae4715d	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=9ab982d00c6130d8a6df5c1a6041bce1
diff --git a/metadata/md5-cache/dev-python/numpy-1.22.4 b/metadata/md5-cache/dev-python/numpy-1.22.4
index 6984db3a0f54..7b11c48d04f1 100644
--- a/metadata/md5-cache/dev-python/numpy-1.22.4
+++ b/metadata/md5-cache/dev-python/numpy-1.22.4
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://numpy.org/
 INHERIT=distutils-r1 flag-o-matic fortran-2 toolchain-funcs
 IUSE=doc lapack test python_targets_python3_8 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 ~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=BSD
 RDEPEND=lapack? ( >=virtual/cblas-3.8 >=virtual/lapack-3.8 ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[threads(+)] ) lapack? ( virtual/fortran )
 REQUIRED_USE=|| ( python_targets_python3_8 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/n/numpy/numpy-1.22.4.zip doc? ( https://numpy.org/doc/1.22/numpy-html.zip -> numpy-html-1.22.4.zip https://numpy.org/doc/1.22/numpy-ref.pdf -> numpy-ref-1.22.4.pdf https://numpy.org/doc/1.22/numpy-user.pdf -> numpy-user-1.22.4.pdf )
 _eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	flag-o-matic	29a755b1291d64133634d80b0328f153	fortran-2	72d28c6872beb1e7cb99684b0ae4715d	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=7e299450fc99844c5bc0ae5c6f6aaecd
+_md5_=075a9fed3a7e76a606b6165149a7693a
diff --git a/metadata/md5-cache/dev-python/numpy-1.23.1 b/metadata/md5-cache/dev-python/numpy-1.23.1
deleted file mode 100644
index e4f6d0b5c3a1..000000000000
--- a/metadata/md5-cache/dev-python/numpy-1.23.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=lapack? ( >=virtual/cblas-3.8 >=virtual/lapack-3.8 ) >=dev-python/cython-0.29.30[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] lapack? ( virtual/pkgconfig ) doc? ( app-arch/unzip ) test? ( >=dev-python/hypothesis-5.8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytz-2019.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cffi-1.14.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( lapack? ( >=virtual/cblas-3.8 >=virtual/lapack-3.8 ) >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[threads(+)] ) >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] lapack? ( virtual/fortran )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=lapack? ( virtual/fortran )
-DESCRIPTION=Fast array and numerical python library
-EAPI=8
-HOMEPAGE=https://numpy.org/ https://github.com/numpy/numpy/ https://pypi.org/project/numpy/
-INHERIT=distutils-r1 flag-o-matic fortran-2 toolchain-funcs
-IUSE=doc lapack test python_targets_python3_8 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 ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=BSD
-RDEPEND=lapack? ( >=virtual/cblas-3.8 >=virtual/lapack-3.8 ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[threads(+)] ) lapack? ( virtual/fortran )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/n/numpy/numpy-1.23.1.tar.gz doc? ( https://numpy.org/doc/1.23/numpy-html.zip -> numpy-html-1.23.1.zip https://numpy.org/doc/1.23/numpy-ref.pdf -> numpy-ref-1.23.1.pdf https://numpy.org/doc/1.23/numpy-user.pdf -> numpy-user-1.23.1.pdf )
-_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	flag-o-matic	29a755b1291d64133634d80b0328f153	fortran-2	72d28c6872beb1e7cb99684b0ae4715d	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=17c0aba37a8d655fbbe5c46106af7e93
diff --git a/metadata/md5-cache/dev-python/numpy-1.23.3 b/metadata/md5-cache/dev-python/numpy-1.23.3
index 36d4f63d9ae8..af8ed312a51e 100644
--- a/metadata/md5-cache/dev-python/numpy-1.23.3
+++ b/metadata/md5-cache/dev-python/numpy-1.23.3
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://numpy.org/ https://github.com/numpy/numpy/ https://pypi.org/project/numpy/
 INHERIT=distutils-r1 flag-o-matic fortran-2 toolchain-funcs
 IUSE=doc lapack test python_targets_python3_8 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 ~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=BSD
 RDEPEND=lapack? ( >=virtual/cblas-3.8 >=virtual/lapack-3.8 ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[threads(+)] ) lapack? ( virtual/fortran )
 REQUIRED_USE=|| ( python_targets_python3_8 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/n/numpy/numpy-1.23.3.tar.gz doc? ( https://numpy.org/doc/1.23/numpy-html.zip -> numpy-html-1.23.3.zip https://numpy.org/doc/1.23/numpy-ref.pdf -> numpy-ref-1.23.3.pdf https://numpy.org/doc/1.23/numpy-user.pdf -> numpy-user-1.23.3.pdf )
 _eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	flag-o-matic	29a755b1291d64133634d80b0328f153	fortran-2	72d28c6872beb1e7cb99684b0ae4715d	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=dc165deabf2b5dd8dc9ec88f3a516aca
+_md5_=858b2b6dad94a50c1eb43cfcff29daa1
diff --git a/metadata/md5-cache/dev-python/pandas-1.4.4 b/metadata/md5-cache/dev-python/pandas-1.4.4
deleted file mode 100644
index dffb79fa0cd2..000000000000
--- a/metadata/md5-cache/dev-python/pandas-1.4.4
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+)] ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=dev-python/numpy-1.21.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-dateutil-2.8.1-r3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytz-2020.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cython-0.29.32[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] doc? ( x11-base/xorg-server[xvfb] x11-apps/xhost app-text/pandoc dev-python/beautifulsoup4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/html5lib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ipython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/nbsphinx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/numpydoc-0.9.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/openpyxl-1.6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytables-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/xlrd[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/xlwt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] x11-misc/xclip ) test? ( x11-base/xorg-server[xvfb] x11-apps/xhost >=dev-python/bottleneck-1.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/numexpr-2.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/beautifulsoup4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/blosc[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] || ( dev-python/html5lib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] || ( dev-python/openpyxl[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/xlsxwriter[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/pytables-3.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/xarray-0.12.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sqlalchemy-1.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/xlrd-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/xlwt-1.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !hppa? ( dev-python/statsmodels[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/scipy-1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) X? ( || ( dev-python/PyQt5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] x11-misc/xclip x11-misc/xsel ) ) dev-python/beautifulsoup4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/hypothesis-5.5.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/openpyxl[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pymysql[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-xdist-1.31[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/psycopg:2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/xlsxwriter[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] x11-misc/xclip x11-misc/xsel )
-DESCRIPTION=Powerful data structures for data analysis and statistics
-EAPI=8
-HOMEPAGE=https://pandas.pydata.org/ https://github.com/pandas-dev/pandas/
-INHERIT=distutils-r1 multiprocessing optfeature virtualx
-IUSE=doc full-support minimal test X python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86
-LICENSE=BSD
-RDEPEND=>=dev-python/numpy-1.21.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-dateutil-2.8.1-r3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytz-2020.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !minimal? ( >=dev-python/bottleneck-1.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/numexpr-2.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) full-support? ( dev-python/beautifulsoup4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/blosc[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] || ( dev-python/html5lib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] || ( dev-python/openpyxl[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/xlsxwriter[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/pytables-3.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/xarray-0.12.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sqlalchemy-1.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/xlrd-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/xlwt-1.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !hppa? ( dev-python/statsmodels[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/scipy-1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) X? ( || ( dev-python/PyQt5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] x11-misc/xclip x11-misc/xsel ) ) ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+)] )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/pandas-dev/pandas/releases/download/v1.4.4/pandas-1.4.4.tar.gz
-_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	virtualx	644887c82aefdf12001489391fca4f02
-_md5_=42e0438c25ad6428e9998164aa53a716
diff --git a/metadata/md5-cache/dev-python/pandas-1.5.0 b/metadata/md5-cache/dev-python/pandas-1.5.0
index db06a5808986..a077386e5cdf 100644
--- a/metadata/md5-cache/dev-python/pandas-1.5.0
+++ b/metadata/md5-cache/dev-python/pandas-1.5.0
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://pandas.pydata.org/ https://github.com/pandas-dev/pandas/
 INHERIT=distutils-r1 multiprocessing optfeature virtualx
 IUSE=doc full-support minimal test X python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-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=BSD
 RDEPEND=>=dev-python/numpy-1.21.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-dateutil-2.8.1-r3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytz-2020.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !minimal? ( >=dev-python/bottleneck-1.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/numexpr-2.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) full-support? ( dev-python/beautifulsoup4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/blosc[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] || ( dev-python/html5lib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] || ( dev-python/openpyxl[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/xlsxwriter[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/pytables-3.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/xarray-0.12.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sqlalchemy-1.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/xlrd-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/xlwt-1.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !hppa? ( dev-python/statsmodels[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/scipy-1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) X? ( || ( dev-python/PyQt5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] x11-misc/xclip x11-misc/xsel ) ) ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+)] )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pandas-dev/pandas/releases/download/v1.5.0/pandas-1.5.0.tar.gz
 _eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	virtualx	644887c82aefdf12001489391fca4f02
-_md5_=ed95d317474dcaba44d9013336537746
+_md5_=3a7668e53314fd98410f171a1ded04da
diff --git a/metadata/md5-cache/dev-python/pandas-1.5.0-r1 b/metadata/md5-cache/dev-python/pandas-1.5.0-r1
index 26c24299485b..00059279b698 100644
--- a/metadata/md5-cache/dev-python/pandas-1.5.0-r1
+++ b/metadata/md5-cache/dev-python/pandas-1.5.0-r1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://pandas.pydata.org/ https://github.com/pandas-dev/pandas/
 INHERIT=distutils-r1 multiprocessing optfeature virtualx
 IUSE=doc full-support minimal test X python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~x86
+KEYWORDS=amd64 ~arm arm64 ~hppa ~ppc ppc64 ~riscv ~s390 ~x86
 LICENSE=BSD
 RDEPEND=>=dev-python/numpy-1.21.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-dateutil-2.8.1-r3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytz-2020.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !minimal? ( >=dev-python/bottleneck-1.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/numexpr-2.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) full-support? ( dev-python/beautifulsoup4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/blosc[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( dev-python/html5lib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( dev-python/openpyxl[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/xlsxwriter[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/pytables-3.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/xarray-0.12.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sqlalchemy-1.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/xlrd-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/xlwt-1.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !hppa? ( python_targets_python3_8? ( dev-python/statsmodels[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/statsmodels[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/statsmodels[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/scipy-1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) X? ( || ( dev-python/PyQt5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] x11-misc/xclip x11-misc/xsel ) ) ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[threads(+)] )
 REQUIRED_USE=|| ( python_targets_python3_8 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/pandas-dev/pandas/releases/download/v1.5.0/pandas-1.5.0.tar.gz
 _eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	virtualx	644887c82aefdf12001489391fca4f02
-_md5_=03f6dea32ed2f7cb282ba72baef2be8c
+_md5_=17fa655a53f922b2e5d58d1423e8bec1
diff --git a/metadata/md5-cache/dev-python/peewee-3.15.2 b/metadata/md5-cache/dev-python/peewee-3.15.2
deleted file mode 100644
index 507e78ebaed6..000000000000
--- a/metadata/md5-cache/dev-python/peewee-3.15.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] doc? ( || ( ( >=dev-lang/python-3.11.0_beta4:3.11[sqlite] >=dev-python/sphinx-4.5.0-r1[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10[sqlite] >=dev-python/sphinx-4.5.0-r1[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9[sqlite] >=dev-python/sphinx-4.5.0-r1[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8[sqlite] >=dev-python/sphinx-4.5.0-r1[python_targets_python3_8(-)] ) ) ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[sqlite] ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Small Python ORM
-EAPI=8
-HOMEPAGE=https://github.com/coleifer/peewee/ https://pypi.org/project/peewee/
-INHERIT=distutils-r1
-IUSE=examples test doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~riscv x86
-LICENSE=BSD
-RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[sqlite] )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/coleifer/peewee/archive/3.15.2.tar.gz -> peewee-3.15.2.gh.tar.gz
-_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=874c3aca9354262e2962e257587be929
diff --git a/metadata/md5-cache/dev-python/peewee-3.15.3 b/metadata/md5-cache/dev-python/peewee-3.15.3
index 12e735f867d1..261044584803 100644
--- a/metadata/md5-cache/dev-python/peewee-3.15.3
+++ b/metadata/md5-cache/dev-python/peewee-3.15.3
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/coleifer/peewee/ https://pypi.org/project/peewee/
 INHERIT=distutils-r1
 IUSE=examples test doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~riscv ~x86
+KEYWORDS=amd64 ~riscv x86
 LICENSE=BSD
 RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[sqlite] )
 REQUIRED_USE=|| ( python_targets_python3_8 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/coleifer/peewee/archive/3.15.3.tar.gz -> peewee-3.15.3.gh.tar.gz
 _eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=ffaaeb1ea4b5116377f6934325123948
+_md5_=874c3aca9354262e2962e257587be929
diff --git a/metadata/md5-cache/dev-python/priority-1.3.0 b/metadata/md5-cache/dev-python/priority-1.3.0
deleted file mode 100644
index 51672ef4b89b..000000000000
--- a/metadata/md5-cache/dev-python/priority-1.3.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/hypothesis-3.4.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/pytest-7.1.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/setuptools-65.3.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A pure-Python implementation of the HTTP/2 priority tree
-EAPI=7
-HOMEPAGE=https://python-hyper.org/priority/en/latest/ https://github.com/python-hyper/priority https://pypi.org/project/priority/
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-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.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/p/priority/priority-1.3.0.tar.gz
-_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=7082135c78e7ff7bfbd49ad80482a2b9
diff --git a/metadata/md5-cache/dev-python/priority-1.3.0-r1 b/metadata/md5-cache/dev-python/priority-1.3.0-r1
index f7cd7fa962d8..bd5b21acb9d7 100644
--- a/metadata/md5-cache/dev-python/priority-1.3.0-r1
+++ b/metadata/md5-cache/dev-python/priority-1.3.0-r1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://python-hyper.org/projects/priority/en/latest/ https://github.com/python-hyper/priority/ https://pypi.org/project/priority/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_8 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=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 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/priority/priority-1.3.0.tar.gz
 _eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=5493687c7c9962e0bed78a5dc8697a01
+_md5_=4266a85d947f1644f0d079a5f01074b0
diff --git a/metadata/md5-cache/dev-python/protobuf-python-3.19.6 b/metadata/md5-cache/dev-python/protobuf-python-3.19.6
new file mode 100644
index 000000000000..ef4c3ab27480
--- /dev/null
+++ b/metadata/md5-cache/dev-python/protobuf-python-3.19.6
@@ -0,0 +1,17 @@
+BDEPEND=test? ( dev-libs/protobuf:0/30 ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
+DESCRIPTION=Google's Protocol Buffers - Python bindings
+EAPI=8
+HOMEPAGE=https://developers.google.com/protocol-buffers/ https://pypi.org/project/protobuf/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
+LICENSE=BSD
+RDEPEND=dev-libs/protobuf:0/30 python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0/30
+SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.19.6.tar.gz -> protobuf-3.19.6.tar.gz
+_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=b3ebe05610b19b1a713b3d1cf7c174a2
diff --git a/metadata/md5-cache/dev-python/protobuf-python-3.20.3 b/metadata/md5-cache/dev-python/protobuf-python-3.20.3
new file mode 100644
index 000000000000..5fa58528fb8e
--- /dev/null
+++ b/metadata/md5-cache/dev-python/protobuf-python-3.20.3
@@ -0,0 +1,17 @@
+BDEPEND=test? ( dev-libs/protobuf:0/31 ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+DESCRIPTION=Google's Protocol Buffers - Python bindings
+EAPI=8
+HOMEPAGE=https://developers.google.com/protocol-buffers/ https://pypi.org/project/protobuf/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 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 ~x64-macos
+LICENSE=BSD
+RDEPEND=dev-libs/protobuf:0/31 python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0/31
+SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.20.3.tar.gz -> protobuf-3.20.3.tar.gz
+_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=42038fcb324dab3a0cee79ff893dc393
diff --git a/metadata/md5-cache/dev-python/protobuf-python-4.21.8 b/metadata/md5-cache/dev-python/protobuf-python-4.21.8
new file mode 100644
index 000000000000..6514b9a39bc9
--- /dev/null
+++ b/metadata/md5-cache/dev-python/protobuf-python-4.21.8
@@ -0,0 +1,17 @@
+BDEPEND=test? ( dev-libs/protobuf:0/32 ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+DESCRIPTION=Google's Protocol Buffers - Python bindings
+EAPI=8
+HOMEPAGE=https://developers.google.com/protocol-buffers/ https://pypi.org/project/protobuf/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 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 ~x64-macos
+LICENSE=BSD
+RDEPEND=dev-libs/protobuf:0/32 python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0/32
+SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v21.8.tar.gz -> protobuf-21.8.tar.gz
+_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=a5bcab57b6dcd1808c2badedd3d12d0d
diff --git a/metadata/md5-cache/dev-python/protobuf-python-9999 b/metadata/md5-cache/dev-python/protobuf-python-9999
index 4989ad5ae6fa..8266efd9d8af 100644
--- a/metadata/md5-cache/dev-python/protobuf-python-9999
+++ b/metadata/md5-cache/dev-python/protobuf-python-9999
@@ -1,16 +1,16 @@
-BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) ~dev-libs/protobuf-9999 dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) ~dev-libs/protobuf-9999 dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !dev-python/namespace-google ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=dev-libs/protobuf:0/32 dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-libs/protobuf:0/32 dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) ~dev-libs/protobuf-9999
+DEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) dev-libs/protobuf:0/32
 DESCRIPTION=Google's Protocol Buffers - Python bindings
 EAPI=8
-HOMEPAGE=https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf/ https://pypi.org/project/protobuf/
+HOMEPAGE=https://developers.google.com/protocol-buffers/ https://pypi.org/project/protobuf/
 INHERIT=distutils-r1 git-r3
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) ~dev-libs/protobuf-9999 dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !dev-python/namespace-google python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RDEPEND=dev-libs/protobuf:0/32 dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
-SLOT=0/30
+SLOT=0/32
 _eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=1712b39d1a0b2d901aeb3313e775b48d
+_md5_=0f4a0180d7bd71df70d0631ea18f94f3
diff --git a/metadata/md5-cache/dev-python/regex-2022.8.17 b/metadata/md5-cache/dev-python/py-cpuinfo-9.0.0
similarity index 79%
rename from metadata/md5-cache/dev-python/regex-2022.8.17
rename to metadata/md5-cache/dev-python/py-cpuinfo-9.0.0
index 0e1b89986ed6..801b422a7831 100644
--- a/metadata/md5-cache/dev-python/regex-2022.8.17
+++ b/metadata/md5-cache/dev-python/py-cpuinfo-9.0.0
@@ -1,16 +1,16 @@
 BDEPEND=test? ( dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Alternative regular expression module to replace re
+DESCRIPTION=Get CPU info with pure Python 2 & 3
 EAPI=8
-HOMEPAGE=https://bitbucket.org/mrabarnett/mrab-regex/ https://pypi.org/project/regex/
+HOMEPAGE=https://github.com/workhorsy/py-cpuinfo/ https://pypi.org/project/py-cpuinfo/
 INHERIT=distutils-r1
-IUSE=doc test python_targets_pypy3 python_targets_python3_8 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=Apache-2.0
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/r/regex/regex-2022.8.17.tar.gz
+SRC_URI=mirror://pypi/p/py-cpuinfo/py-cpuinfo-9.0.0.tar.gz
 _eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=88d190d0d3122b83ecad6ab200cd8556
+_md5_=0822bca002d435aa7f032c4d66136402
diff --git a/metadata/md5-cache/dev-python/pycups-2.0.1-r1 b/metadata/md5-cache/dev-python/pycups-2.0.1-r1
index 6026f3289a90..54b0b0a5abbb 100644
--- a/metadata/md5-cache/dev-python/pycups-2.0.1-r1
+++ b/metadata/md5-cache/dev-python/pycups-2.0.1-r1
@@ -1,16 +1,16 @@
-BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=net-print/cups
 DESCRIPTION=Python bindings for the CUPS API
 EAPI=8
 HOMEPAGE=https://github.com/OpenPrinting/pycups
 INHERIT=distutils-r1
-IUSE=examples python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+IUSE=examples python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86
 LICENSE=GPL-2
-RDEPEND=net-print/cups python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RDEPEND=net-print/cups python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pycups/pycups-2.0.1.tar.gz
 _eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=fb87052ec8ddab71b23cf73faa272649
+_md5_=46e5c98c70ba0a0b4c44f9fed4c7b20d
diff --git a/metadata/md5-cache/dev-python/pydiffx-1.0.1-r1 b/metadata/md5-cache/dev-python/pydiffx-1.0.1-r1
index fab85bdbff27..9b6c081462af 100644
--- a/metadata/md5-cache/dev-python/pydiffx-1.0.1-r1
+++ b/metadata/md5-cache/dev-python/pydiffx-1.0.1-r1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://diffx.org/pydiffx/ https://github.com/beanbaginc/diffx/ https://pypi.org/project/pydiffx/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/beanbaginc/diffx/archive/pydiffx/release-1.0.1.tar.gz -> diffx-pydiffx-release-1.0.1.tar.gz
 _eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=6348270fb9136a14ac1a1a4e3a8e19fb
+_md5_=9f83676cfb0ba4c50ad0aceb071b9b1b
diff --git a/metadata/md5-cache/dev-python/pyicu-2.10.1 b/metadata/md5-cache/dev-python/pyicu-2.10.1
new file mode 100644
index 000000000000..95947cd80d28
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pyicu-2.10.1
@@ -0,0 +1,17 @@
+BDEPEND=test? ( dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-libs/icu:= >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/icu:=
+DESCRIPTION=Python bindings for dev-libs/icu
+EAPI=8
+HOMEPAGE=https://gitlab.pyicu.org/main/pyicu/ https://pypi.org/project/PyICU/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~riscv ~x86
+LICENSE=MIT
+RDEPEND=dev-libs/icu:= python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://gitlab.pyicu.org/main/pyicu/-/archive/v2.10.1/pyicu-v2.10.1.tar.bz2
+_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=b9447e3d395e032e2f183932f607cec9
diff --git a/metadata/md5-cache/dev-python/pyicu-2.10.2 b/metadata/md5-cache/dev-python/pyicu-2.10.2
new file mode 100644
index 000000000000..399b874e2029
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pyicu-2.10.2
@@ -0,0 +1,17 @@
+BDEPEND=test? ( dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-libs/icu:= >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/icu:=
+DESCRIPTION=Python bindings for dev-libs/icu
+EAPI=8
+HOMEPAGE=https://gitlab.pyicu.org/main/pyicu/ https://pypi.org/project/PyICU/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~riscv ~x86
+LICENSE=MIT
+RDEPEND=dev-libs/icu:= python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://gitlab.pyicu.org/main/pyicu/-/archive/v2.10.2/pyicu-v2.10.2.tar.bz2
+_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=b9447e3d395e032e2f183932f607cec9
diff --git a/metadata/md5-cache/dev-python/pykerberos-1.3.1 b/metadata/md5-cache/dev-python/pykerberos-1.3.1
deleted file mode 100644
index 89bf186bfdd9..000000000000
--- a/metadata/md5-cache/dev-python/pykerberos-1.3.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-crypt/mit-krb5
-DESCRIPTION=A high-level Python wrapper for Kerberos/GSSAPI operations
-EAPI=7
-HOMEPAGE=https://www.calendarserver.org/PyKerberos.html https://github.com/apple/ccs-pykerberos/ https://pypi.org/project/kerberos/
-INHERIT=distutils-r1
-IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm arm64 ~hppa ~ppc64 ~riscv x86
-LICENSE=Apache-2.0
-RDEPEND=app-crypt/mit-krb5 python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/apple/ccs-pykerberos/archive/PyKerberos-1.3.1.tar.gz
-_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=f7b0b0bcb40c83579fa9f309e32cf328
diff --git a/metadata/md5-cache/dev-python/pykerberos-1.3.1-r1 b/metadata/md5-cache/dev-python/pykerberos-1.3.1-r1
index 851ef06d604f..2615e87d5930 100644
--- a/metadata/md5-cache/dev-python/pykerberos-1.3.1-r1
+++ b/metadata/md5-cache/dev-python/pykerberos-1.3.1-r1
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://www.calendarserver.org/PyKerberos.html https://github.com/apple/ccs-pykerberos/ https://pypi.org/project/kerberos/
 INHERIT=distutils-r1
 IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm arm64 ~hppa ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~hppa ~ppc64 ~riscv x86
 LICENSE=Apache-2.0
 RDEPEND=app-crypt/mit-krb5 python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/apple/ccs-pykerberos/archive/PyKerberos-1.3.1.tar.gz
 _eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=2795eb53798d9e10c132bf792732ab6f
+_md5_=746867b15a3e64ccbb01130b6a363d1f
diff --git a/metadata/md5-cache/dev-python/pylast-5.1.0 b/metadata/md5-cache/dev-python/pylast-5.1.0
new file mode 100644
index 000000000000..2f9e770f51c0
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pylast-5.1.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/hatch-vcs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/flaky[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/httpx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/hatchling-1.8.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Python interface to last.fm and other api-compatible websites
+EAPI=8
+HOMEPAGE=https://pypi.org/project/pylast/ https://github.com/pylast/pylast/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-python/httpx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/pylast/pylast/archive/5.1.0.tar.gz -> pylast-5.1.0.gh.tar.gz
+_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=4c7903f331f34d30b6eee668c05094b5
diff --git a/metadata/md5-cache/dev-python/pyproj-3.4.0 b/metadata/md5-cache/dev-python/pyproj-3.4.0
index 43ff3f4d49fb..7a004e8159d1 100644
--- a/metadata/md5-cache/dev-python/pyproj-3.4.0
+++ b/metadata/md5-cache/dev-python/pyproj-3.4.0
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pyproj4/pyproj/archive/3.4.0.tar.gz -> pyproj-3.4.0.gh.tar.gz
 _eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=949c44e871cbb56872491203c984dc76
+_md5_=c52d3caad62acd8077bbad4d782bf223
diff --git a/metadata/md5-cache/dev-python/pyproject-metadata-0.6.1 b/metadata/md5-cache/dev-python/pyproject-metadata-0.6.1
index a3774cfdf228..919e346607e2 100644
--- a/metadata/md5-cache/dev-python/pyproject-metadata-0.6.1
+++ b/metadata/md5-cache/dev-python/pyproject-metadata-0.6.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_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 arm arm64 ppc ppc64 ~riscv ~s390 ~x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv ~s390 x86
 LICENSE=MIT
 RDEPEND=dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 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.6.1.tar.gz -> pyproject-metadata-0.6.1.gh.tar.gz
 _eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=b116cb16d781d43ada83c4b8e1a16ee3
+_md5_=e037ccb5ac9779302683db9c40410c75
diff --git a/metadata/md5-cache/dev-python/pyspnego-0.6.1 b/metadata/md5-cache/dev-python/pyspnego-0.6.1
new file mode 100644
index 000000000000..c8b69716f9c5
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pyspnego-0.6.1
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/gssapi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/krb5-0.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ruamel-yaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=Library to handle SPNEGO and CredSSP authentication
+EAPI=8
+HOMEPAGE=https://github.com/jborean93/pyspnego/ https://pypi.org/project/pyspnego/
+INHERIT=distutils-r1 optfeature
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
+LICENSE=MIT
+RDEPEND=dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/p/pyspnego/pyspnego-0.6.1.tar.gz
+_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=c3ed06de687879854f172930e0ea7204
diff --git a/metadata/md5-cache/dev-python/pytest-env-0.8.1 b/metadata/md5-cache/dev-python/pytest-env-0.8.1
new file mode 100644
index 000000000000..f66b78a843fa
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pytest-env-0.8.1
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/hatch-vcs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/pytest[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/hatchling-1.8.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=py.test plugin that allows you to add environment variables
+EAPI=8
+HOMEPAGE=https://github.com/pytest-dev/pytest-env
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=dev-python/pytest[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/p/pytest-env/pytest_env-0.8.1.tar.gz
+_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=30524a1438d6d33a6f594431276b8c46
diff --git a/metadata/md5-cache/dev-python/pytest-httpserver-1.0.5 b/metadata/md5-cache/dev-python/pytest-httpserver-1.0.5
deleted file mode 100644
index 2106ff034987..000000000000
--- a/metadata/md5-cache/dev-python/pytest-httpserver-1.0.5
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/requests[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/werkzeug[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/poetry-core-1.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=HTTP server for pytest to test HTTP clients
-EAPI=8
-HOMEPAGE=https://github.com/csernazs/pytest-httpserver
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=dev-python/werkzeug[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/csernazs/pytest-httpserver/archive/1.0.5.tar.gz -> pytest-httpserver-1.0.5.gh.tar.gz
-_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=7667336262cfee43b7d73ac7023e2023
diff --git a/metadata/md5-cache/dev-python/pytest-httpserver-1.0.6 b/metadata/md5-cache/dev-python/pytest-httpserver-1.0.6
index 2f4bfc834bb4..87a587a18d06 100644
--- a/metadata/md5-cache/dev-python/pytest-httpserver-1.0.6
+++ b/metadata/md5-cache/dev-python/pytest-httpserver-1.0.6
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/csernazs/pytest-httpserver/ https://pypi.org/project/pytest-httpserver/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=MIT
 RDEPEND=dev-python/werkzeug[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 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/csernazs/pytest-httpserver/archive/1.0.6.tar.gz -> pytest-httpserver-1.0.6.gh.tar.gz
 _eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=1de47c12b74db342415e08b9702f8d08
+_md5_=71005f56e383dc530fe9c5167ac32869
diff --git a/metadata/md5-cache/dev-python/pytest-metadata-2.0.3 b/metadata/md5-cache/dev-python/pytest-metadata-2.0.3
new file mode 100644
index 000000000000..85a47e85dca0
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pytest-metadata-2.0.3
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-python/setuptools_scm-6.2.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( <dev-python/pytest-8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/poetry-core-1.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A plugin for pytest that provides access to test session metadata
+EAPI=8
+HOMEPAGE=https://github.com/pytest-dev/pytest-metadata/ https://pypi.org/project/pytest-metadata/
+INHERIT=distutils-r1
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~riscv ~x86
+LICENSE=MPL-2.0
+RDEPEND=<dev-python/pytest-8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/pytest-dev/pytest-metadata/archive/v2.0.3.tar.gz -> pytest-metadata-2.0.3.gh.tar.gz
+_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=e7a84b536a2435a15158b527037951be
diff --git a/metadata/md5-cache/dev-python/pytest-qt-4.2.0 b/metadata/md5-cache/dev-python/pytest-qt-4.2.0
new file mode 100644
index 000000000000..29ad6fc35f70
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pytest-qt-4.2.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/PyQt5[gui,testlib,widgets,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( dev-python/pyside2[gui,testlib,widgets,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/pyside2[gui,testlib,widgets,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/pyside2[gui,testlib,widgets,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) test? ( dev-python/QtPy[gui,testlib,widgets(+),python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_11(-)] dev-python/sphinx_rtd_theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_10(-)] dev-python/sphinx_rtd_theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)] ) ) ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,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=Pytest plugin for PyQt5 and PySide2 applications
+EAPI=8
+HOMEPAGE=https://pypi.org/project/pytest-qt/ https://github.com/pytest-dev/pytest-qt/
+INHERIT=distutils-r1 virtualx
+IUSE=test doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=MIT
+RDEPEND=dev-python/QtPy[gui,testlib,widgets(+),python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/p/pytest-qt/pytest-qt-4.2.0.tar.gz
+_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	virtualx	644887c82aefdf12001489391fca4f02
+_md5_=6252f23ad96d54f93764b97863bd5948
diff --git a/metadata/md5-cache/dev-python/pytest-xdist-3.0.2 b/metadata/md5-cache/dev-python/pytest-xdist-3.0.2
new file mode 100644
index 000000000000..46bbab543116
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pytest-xdist-3.0.2
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/filelock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/execnet[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/psutil[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-6.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-forked[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Distributed testing and loop-on-failing modes
+EAPI=8
+HOMEPAGE=https://pypi.org/project/pytest-xdist/ https://github.com/pytest-dev/pytest-xdist/
+INHERIT=distutils-r1
+IUSE=test python_targets_pypy3 python_targets_python3_8 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 ~x64-macos
+LICENSE=MIT
+RDEPEND=dev-python/execnet[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/psutil[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-6.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-forked[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/p/pytest-xdist/pytest-xdist-3.0.2.tar.gz
+_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=9a9547d0d5a7febff74399843478692b
diff --git a/metadata/md5-cache/dev-python/python-cstruct-3.3 b/metadata/md5-cache/dev-python/python-cstruct-3.3
new file mode 100644
index 000000000000..67e19b4195bf
--- /dev/null
+++ b/metadata/md5-cache/dev-python/python-cstruct-3.3
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=C-style structs for Python
+EAPI=8
+HOMEPAGE=https://github.com/andreax79/python-cstruct https://pypi.org/project/cstruct/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/andreax79/python-cstruct/archive/v3.3.tar.gz -> python-cstruct-3.3.gh.tar.gz
+_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=6d6a2eaae86504cc8ac359445715b4d6
diff --git a/metadata/md5-cache/dev-python/python-docs-3.11.0 b/metadata/md5-cache/dev-python/python-docs-3.11.0
new file mode 100644
index 000000000000..405bcc08c779
--- /dev/null
+++ b/metadata/md5-cache/dev-python/python-docs-3.11.0
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install
+DESCRIPTION=HTML documentation for Python
+EAPI=7
+HOMEPAGE=https://www.python.org/doc/
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=PSF-2
+SLOT=3.11
+SRC_URI=https://www.python.org/ftp/python/doc/3.11.0/python-3.11.0-docs-html.tar.bz2
+_md5_=a40c5990b9325f6cb13b3809ae89dcb9
diff --git a/metadata/md5-cache/dev-python/python-ldap-3.4.2 b/metadata/md5-cache/dev-python/python-ldap-3.4.2
deleted file mode 100644
index 578aeff62781..000000000000
--- a/metadata/md5-cache/dev-python/python-ldap-3.4.2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( >=dev-python/pyasn1-0.3.7[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyasn1-modules-0.1.5[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] net-nds/openldap:=[sasl?,ssl?] >=dev-python/pytest-7.1.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_8(-)] ) ( >=dev-python/pypy3-7.3.9_p1:0 >=dev-python/sphinx-4.5.0-r1[python_targets_pypy3(-)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=net-nds/openldap:=[sasl?,ssl?] sasl? ( >=dev-libs/cyrus-sasl-2.1 )
-DESCRIPTION=Various LDAP-related Python modules
-EAPI=8
-HOMEPAGE=https://www.python-ldap.org/en/latest/ https://pypi.org/project/python-ldap/ https://github.com/python-ldap/python-ldap/
-INHERIT=distutils-r1
-IUSE=examples sasl ssl test doc python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv sparc x86 ~x86-solaris
-LICENSE=MIT PSF-2
-RDEPEND=>=dev-python/pyasn1-0.3.7[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyasn1-modules-0.1.5[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] net-nds/openldap:=[sasl?,ssl?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/python-ldap/python-ldap/archive/python-ldap-3.4.2.tar.gz -> python-ldap-3.4.2.gh.tar.gz
-_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=38f7a5ddf2562d482c1cb15627bd97c9
diff --git a/metadata/md5-cache/dev-python/python-ldap-3.4.3 b/metadata/md5-cache/dev-python/python-ldap-3.4.3
index 2f1ed52ead13..4f7b84892f87 100644
--- a/metadata/md5-cache/dev-python/python-ldap-3.4.3
+++ b/metadata/md5-cache/dev-python/python-ldap-3.4.3
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.python-ldap.org/en/latest/ https://pypi.org/project/python-ldap/ https://github.com/python-ldap/python-ldap/
 INHERIT=distutils-r1
 IUSE=examples sasl ssl test doc python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv sparc ~x86 ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv sparc x86 ~x86-solaris
 LICENSE=MIT PSF-2
 RDEPEND=>=dev-python/pyasn1-0.3.7[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyasn1-modules-0.1.5[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] net-nds/openldap:=[sasl?,ssl?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 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-ldap/python-ldap/archive/python-ldap-3.4.3.tar.gz -> python-ldap-3.4.3.gh.tar.gz
 _eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=b35fe7576318b91b2dd88631f6ed5c04
+_md5_=38f7a5ddf2562d482c1cb15627bd97c9
diff --git a/metadata/md5-cache/dev-python/python-nbxmpp-3.2.1 b/metadata/md5-cache/dev-python/python-nbxmpp-3.2.1
deleted file mode 100644
index e09baf53aa77..000000000000
--- a/metadata/md5-cache/dev-python/python-nbxmpp-3.2.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-libs/gobject-introspection net-libs/libsoup[introspection] dev-python/idna[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/precis-i18n[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pygobject[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/unittest-or-fail[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/gpep517-9[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-65.3.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python library to use Jabber/XMPP networks in a non-blocking way
-EAPI=8
-HOMEPAGE=https://dev.gajim.org/gajim/python-nbxmpp/ https://pypi.org/project/nbxmpp/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm64 ~riscv x86
-LICENSE=GPL-3
-RDEPEND=dev-libs/gobject-introspection net-libs/libsoup[introspection] dev-python/idna[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/precis-i18n[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pygobject[python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://dev.gajim.org/gajim/python-nbxmpp/-/archive/3.2.1/python-nbxmpp-3.2.1.tar.bz2
-_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=113d6d7eaedc960aa2b6fd1f95649257
diff --git a/metadata/md5-cache/dev-python/python-nbxmpp-3.2.2 b/metadata/md5-cache/dev-python/python-nbxmpp-3.2.2
deleted file mode 100644
index a99b64acde80..000000000000
--- a/metadata/md5-cache/dev-python/python-nbxmpp-3.2.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-libs/gobject-introspection net-libs/libsoup[introspection] dev-python/idna[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/precis-i18n[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pygobject[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/unittest-or-fail[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/gpep517-9[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-65.3.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python library to use Jabber/XMPP networks in a non-blocking way
-EAPI=8
-HOMEPAGE=https://dev.gajim.org/gajim/python-nbxmpp/ https://pypi.org/project/nbxmpp/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm64 ~riscv ~x86
-LICENSE=GPL-3
-RDEPEND=dev-libs/gobject-introspection net-libs/libsoup[introspection] dev-python/idna[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/precis-i18n[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pygobject[python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://dev.gajim.org/gajim/python-nbxmpp/-/archive/3.2.2/python-nbxmpp-3.2.2.tar.bz2
-_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=a639fe05660119d62769e67563c9904a
diff --git a/metadata/md5-cache/dev-python/python-nbxmpp-3.2.3 b/metadata/md5-cache/dev-python/python-nbxmpp-3.2.3
deleted file mode 100644
index 60be93ae711b..000000000000
--- a/metadata/md5-cache/dev-python/python-nbxmpp-3.2.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-libs/gobject-introspection net-libs/libsoup[introspection] dev-python/idna[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/precis-i18n[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pygobject[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/unittest-or-fail[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/gpep517-9[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-65.3.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python library to use Jabber/XMPP networks in a non-blocking way
-EAPI=8
-HOMEPAGE=https://dev.gajim.org/gajim/python-nbxmpp/ https://pypi.org/project/nbxmpp/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm64 ~riscv ~x86
-LICENSE=GPL-3
-RDEPEND=dev-libs/gobject-introspection net-libs/libsoup[introspection] dev-python/idna[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/precis-i18n[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pygobject[python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://dev.gajim.org/gajim/python-nbxmpp/-/archive/3.2.3/python-nbxmpp-3.2.3.tar.bz2
-_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=a639fe05660119d62769e67563c9904a
diff --git a/metadata/md5-cache/dev-python/python-nbxmpp-3.2.4 b/metadata/md5-cache/dev-python/python-nbxmpp-3.2.4
index b91554ec1f0f..06c8bf4390d2 100644
--- a/metadata/md5-cache/dev-python/python-nbxmpp-3.2.4
+++ b/metadata/md5-cache/dev-python/python-nbxmpp-3.2.4
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://dev.gajim.org/gajim/python-nbxmpp/ https://pypi.org/project/nbxmpp/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~riscv x86
 LICENSE=GPL-3
 RDEPEND=dev-libs/gobject-introspection net-libs/libsoup[introspection] dev-python/idna[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/precis-i18n[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pygobject[python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://dev.gajim.org/gajim/python-nbxmpp/-/archive/3.2.4/python-nbxmpp-3.2.4.tar.bz2
 _eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=a639fe05660119d62769e67563c9904a
+_md5_=113d6d7eaedc960aa2b6fd1f95649257
diff --git a/metadata/md5-cache/dev-python/python-poppler-qt5-0.75.0 b/metadata/md5-cache/dev-python/python-poppler-qt5-0.75.0
deleted file mode 100644
index ef8581bd8630..000000000000
--- a/metadata/md5-cache/dev-python/python-poppler-qt5-0.75.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-text/poppler[qt5] dev-python/PyQt5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sip-4.19:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/sip-5:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DESCRIPTION=Python binding for libpoppler-qt5
-EAPI=7
-HOMEPAGE=https://github.com/frescobaldi/python-poppler-qt5
-INHERIT=distutils-r1 qmake-utils
-IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2.1
-RDEPEND=app-text/poppler[qt5] dev-python/PyQt5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sip-4.19:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/sip-5:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-SLOT=0
-SRC_URI=https://github.com/frescobaldi/python-poppler-qt5/archive/v0.75.0.tar.gz -> python-poppler-qt5-0.75.0.tar.gz
-_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=a23621579b445a83afb8f720e37acc83
diff --git a/metadata/md5-cache/dev-python/python-xlib-0.31 b/metadata/md5-cache/dev-python/python-xlib-0.31
deleted file mode 100644
index 67c305f73b30..000000000000
--- a/metadata/md5-cache/dev-python/python-xlib-0.31
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/setuptools_scm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] doc? ( sys-apps/texinfo ) test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A fully functional X client library for Python, written in Python
-EAPI=7
-HOMEPAGE=https://github.com/python-xlib/python-xlib
-INHERIT=distutils-r1 virtualx
-IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 test
-KEYWORDS=amd64 ~arm ~arm64 ppc ~ppc64 ~riscv x86
-LICENSE=LGPL-2+
-RDEPEND=dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/python-xlib/python-xlib/releases/download/0.31/python-xlib-0.31.tar.bz2
-_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	virtualx	644887c82aefdf12001489391fca4f02
-_md5_=19c3ab43ea29bdfebb8661a1eb40325e
diff --git a/metadata/md5-cache/dev-python/python-xlib-0.31-r1 b/metadata/md5-cache/dev-python/python-xlib-0.31-r1
index acc890fc1f8a..f80959352576 100644
--- a/metadata/md5-cache/dev-python/python-xlib-0.31-r1
+++ b/metadata/md5-cache/dev-python/python-xlib-0.31-r1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/python-xlib/python-xlib
 INHERIT=distutils-r1 virtualx
 IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 test
-KEYWORDS=~amd64 ~arm ~arm64 ppc ~ppc64 ~riscv x86
+KEYWORDS=amd64 ~arm ~arm64 ppc ~ppc64 ~riscv x86
 LICENSE=LGPL-2+
 RDEPEND=dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_8 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://github.com/python-xlib/python-xlib/releases/download/0.31/python-xlib-0.31.tar.bz2
 _eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	virtualx	644887c82aefdf12001489391fca4f02
-_md5_=364d5f13e0fa0720647b06bad241cf6a
+_md5_=625fa912a2a056b242f323518083a9fa
diff --git a/metadata/md5-cache/dev-python/pytoolconfig-1.2.2-r1 b/metadata/md5-cache/dev-python/pytoolconfig-1.2.2-r1
new file mode 100644
index 000000000000..18121cd5c645
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pytoolconfig-1.2.2-r1
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-python/pdm-pep517-1.0.5[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( >=dev-python/sphinx-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tabulate-0.8.9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/pytest-7.1.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pdm-pep517-1.0.4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Python tool configuration
+EAPI=8
+HOMEPAGE=https://pypi.org/project/pytoolconfig/ https://github.com/bageljrkhanofemus/pytoolconfig/
+INHERIT=distutils-r1
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=LGPL-3
+RDEPEND=dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/p/pytoolconfig/pytoolconfig-1.2.2.tar.gz
+_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=5f245587799c4a2f3b37026d60118c70
diff --git a/metadata/md5-cache/dev-python/qtawesome-1.2.1 b/metadata/md5-cache/dev-python/qtawesome-1.2.1
new file mode 100644
index 000000000000..f035198baec4
--- /dev/null
+++ b/metadata/md5-cache/dev-python/qtawesome-1.2.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/pytest-qt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( media-fonts/fontawesome dev-python/QtPy[pyqt5(+),gui,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_8(-)] ) ) ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,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=Enables iconic fonts such as Font Awesome in PyQt
+EAPI=8
+HOMEPAGE=https://github.com/spyder-ide/qtawesome/ https://pypi.org/project/QtAwesome/
+INHERIT=distutils-r1 virtualx
+IUSE=test doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=media-fonts/fontawesome dev-python/QtPy[pyqt5(+),gui,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/Q/QtAwesome/QtAwesome-1.2.1.tar.gz
+_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	virtualx	644887c82aefdf12001489391fca4f02
+_md5_=b087dce18c53e1bb2a7ed55f151762ef
diff --git a/metadata/md5-cache/dev-python/rapidfuzz-2.12.0 b/metadata/md5-cache/dev-python/rapidfuzz-2.12.0
new file mode 100644
index 000000000000..38ae3c153756
--- /dev/null
+++ b/metadata/md5-cache/dev-python/rapidfuzz-2.12.0
@@ -0,0 +1,17 @@
+BDEPEND=dev-python/rapidfuzz_capi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/scikit-build-0.13.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/hypothesis[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-cpp/taskflow-3.0.0 >=dev-cpp/rapidfuzz-cpp-1.9.0 dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DESCRIPTION=Rapid fuzzy string matching in Python using various string metrics
+EAPI=8
+HOMEPAGE=https://github.com/maxbachmann/RapidFuzz/ https://pypi.org/project/rapidfuzz/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~riscv
+LICENSE=MIT
+RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/r/rapidfuzz/rapidfuzz-2.12.0.tar.gz
+_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=d1686e5189bd767dd8bb664fc83b7f4c
diff --git a/metadata/md5-cache/dev-python/readthedocs-sphinx-ext-2.2.0 b/metadata/md5-cache/dev-python/readthedocs-sphinx-ext-2.2.0
new file mode 100644
index 000000000000..2007b6c81b5c
--- /dev/null
+++ b/metadata/md5-cache/dev-python/readthedocs-sphinx-ext-2.2.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/jinja-2.9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sphinx[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Code specific for Read the Docs and Sphinx
+EAPI=8
+HOMEPAGE=https://github.com/readthedocs/readthedocs-sphinx-ext/ https://pypi.org/project/readthedocs-sphinx-ext/
+INHERIT=distutils-r1
+IUSE=test python_targets_pypy3 python_targets_python3_8 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=>=dev-python/jinja-2.9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sphinx[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/r/readthedocs-sphinx-ext/readthedocs-sphinx-ext-2.2.0.tar.gz
+_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=d8f41da5be2690be7ac854dd0f0fe2da
diff --git a/metadata/md5-cache/dev-python/regex-2022.9.13 b/metadata/md5-cache/dev-python/regex-2022.9.13
index 98e94e020481..ebd687729ceb 100644
--- a/metadata/md5-cache/dev-python/regex-2022.9.13
+++ b/metadata/md5-cache/dev-python/regex-2022.9.13
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://bitbucket.org/mrabarnett/mrab-regex/ https://pypi.org/project/regex/
 INHERIT=distutils-r1
 IUSE=doc test python_targets_pypy3 python_targets_python3_8 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=Apache-2.0
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 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/r/regex/regex-2022.9.13.tar.gz
 _eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=94c25d3036b4cd1cdd6a127e1ce45ef0
+_md5_=88d190d0d3122b83ecad6ab200cd8556
diff --git a/metadata/md5-cache/dev-python/requests-toolbelt-0.10.1 b/metadata/md5-cache/dev-python/requests-toolbelt-0.10.1
new file mode 100644
index 000000000000..d7217f6aa503
--- /dev/null
+++ b/metadata/md5-cache/dev-python/requests-toolbelt-0.10.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/betamax[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( <dev-python/requests-3.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A utility belt for advanced users of python-requests
+EAPI=8
+HOMEPAGE=https://toolbelt.readthedocs.io/ https://github.com/requests/toolbelt/ https://pypi.org/project/requests-toolbelt/
+INHERIT=distutils-r1
+IUSE=test python_targets_pypy3 python_targets_python3_8 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 ~x64-macos
+LICENSE=Apache-2.0
+RDEPEND=<dev-python/requests-3.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/requests/toolbelt/archive/0.10.1.tar.gz -> requests-toolbelt-0.10.1.gh.tar.gz
+_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=90daadf1d241ab32041af43ac410f66e
diff --git a/metadata/md5-cache/dev-python/scipy-1.9.2 b/metadata/md5-cache/dev-python/scipy-1.9.2
index 2fbe3fc71000..495c5d863f49 100644
--- a/metadata/md5-cache/dev-python/scipy-1.9.2
+++ b/metadata/md5-cache/dev-python/scipy-1.9.2
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://scipy.org/ https://github.com/scipy/scipy/ https://pypi.org/project/scipy/
 INHERIT=fortran-2 distutils-r1 multiprocessing
 IUSE=doc +pythran test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 arm arm64 -hppa ppc ppc64 ~riscv ~s390 ~x86
+KEYWORDS=amd64 arm arm64 -hppa ppc ppc64 ~riscv ~s390 x86
 LICENSE=BSD LGPL-2
 RDEPEND=>=dev-python/numpy-1.18.5[lapack,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] sci-libs/arpack:= sci-libs/umfpack virtual/cblas >=virtual/lapack-3.8 dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] virtual/fortran python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[threads(+)] )
 REQUIRED_USE=|| ( python_targets_python3_8 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/s/scipy/scipy-1.9.2.tar.gz doc? ( https://docs.scipy.org/doc/scipy-1.8.1/scipy-html-1.8.1.zip https://docs.scipy.org/doc/scipy-1.8.1/scipy-ref-1.8.1.pdf )
 _eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	fortran-2	72d28c6872beb1e7cb99684b0ae4715d	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=8ff725edca87703ae925d57878a003da
+_md5_=4b9950f197b1c2ae309fda19dd96f155
diff --git a/metadata/md5-cache/dev-python/setuptools-rust-1.5.2 b/metadata/md5-cache/dev-python/setuptools-rust-1.5.2
index bb75d94bde8e..072b2d626279 100644
--- a/metadata/md5-cache/dev-python/setuptools-rust-1.5.2
+++ b/metadata/md5-cache/dev-python/setuptools-rust-1.5.2
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/PyO3/setuptools-rust/ https://pypi.org/project/setuptools-rust/
 INHERIT=distutils-r1 cargo
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 debug
-KEYWORDS=~amd64 arm arm64 ppc ppc64 ~riscv ~s390 sparc ~x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv ~s390 sparc ~x86
 LICENSE=MIT
 RDEPEND=virtual/rust <dev-python/semantic_version-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/semantic_version-2.8.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/typing-extensions-3.7.4.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 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/PyO3/setuptools-rust/archive/v1.5.2.tar.gz -> setuptools-rust-1.5.2.gh.tar.gz test? ( 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/byteorder/1.4.3/download -> byteorder-1.4.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/convert_case/0.4.0/download -> convert_case-0.4.0.crate https://crates.io/api/v1/crates/cssparser/0.27.2/download -> cssparser-0.27.2.crate https://crates.io/api/v1/crates/cssparser-macros/0.6.0/download -> cssparser-macros-0.6.0.crate https://crates.io/api/v1/crates/derive_more/0.99.17/download -> derive_more-0.99.17.crate https://crates.io/api/v1/crates/dtoa/0.4.8/download -> dtoa-0.4.8.crate https://crates.io/api/v1/crates/dtoa-short/0.3.3/download -> dtoa-short-0.3.3.crate https://crates.io/api/v1/crates/futf/0.1.5/download -> futf-0.1.5.crate https://crates.io/api/v1/crates/fxhash/0.2.1/download -> fxhash-0.2.1.crate https://crates.io/api/v1/crates/getrandom/0.1.16/download -> getrandom-0.1.16.crate https://crates.io/api/v1/crates/html5ever/0.25.1/download -> html5ever-0.25.1.crate https://crates.io/api/v1/crates/indoc/1.0.4/download -> indoc-1.0.4.crate https://crates.io/api/v1/crates/instant/0.1.12/download -> instant-0.1.12.crate https://crates.io/api/v1/crates/itoa/0.4.8/download -> itoa-0.4.8.crate https://crates.io/api/v1/crates/kuchiki/0.8.1/download -> kuchiki-0.8.1.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.121/download -> libc-0.2.121.crate https://crates.io/api/v1/crates/lock_api/0.4.6/download -> lock_api-0.4.6.crate https://crates.io/api/v1/crates/log/0.4.14/download -> log-0.4.14.crate https://crates.io/api/v1/crates/mac/0.1.1/download -> mac-0.1.1.crate https://crates.io/api/v1/crates/markup5ever/0.10.1/download -> markup5ever-0.10.1.crate https://crates.io/api/v1/crates/matches/0.1.9/download -> matches-0.1.9.crate https://crates.io/api/v1/crates/memoffset/0.6.5/download -> memoffset-0.6.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/nodrop/0.1.14/download -> nodrop-0.1.14.crate https://crates.io/api/v1/crates/once_cell/1.10.0/download -> once_cell-1.10.0.crate https://crates.io/api/v1/crates/parking_lot/0.11.2/download -> parking_lot-0.11.2.crate https://crates.io/api/v1/crates/parking_lot_core/0.8.5/download -> parking_lot_core-0.8.5.crate https://crates.io/api/v1/crates/phf/0.8.0/download -> phf-0.8.0.crate https://crates.io/api/v1/crates/phf_codegen/0.8.0/download -> phf_codegen-0.8.0.crate https://crates.io/api/v1/crates/phf_generator/0.8.0/download -> phf_generator-0.8.0.crate https://crates.io/api/v1/crates/phf_macros/0.8.0/download -> phf_macros-0.8.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/phf_shared/0.8.0/download -> phf_shared-0.8.0.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.16/download -> ppv-lite86-0.2.16.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/proc-macro2/1.0.36/download -> proc-macro2-1.0.36.crate https://crates.io/api/v1/crates/proc-macro-hack/0.5.19/download -> proc-macro-hack-0.5.19.crate https://crates.io/api/v1/crates/pyo3/0.17.1/download -> pyo3-0.17.1.crate https://crates.io/api/v1/crates/pyo3-build-config/0.17.1/download -> pyo3-build-config-0.17.1.crate https://crates.io/api/v1/crates/pyo3-ffi/0.17.1/download -> pyo3-ffi-0.17.1.crate https://crates.io/api/v1/crates/pyo3-macros/0.17.1/download -> pyo3-macros-0.17.1.crate https://crates.io/api/v1/crates/pyo3-macros-backend/0.17.1/download -> pyo3-macros-backend-0.17.1.crate https://crates.io/api/v1/crates/quote/1.0.16/download -> quote-1.0.16.crate https://crates.io/api/v1/crates/rand/0.7.3/download -> rand-0.7.3.crate https://crates.io/api/v1/crates/rand_chacha/0.2.2/download -> rand_chacha-0.2.2.crate https://crates.io/api/v1/crates/rand_core/0.5.1/download -> rand_core-0.5.1.crate https://crates.io/api/v1/crates/rand_hc/0.2.0/download -> rand_hc-0.2.0.crate https://crates.io/api/v1/crates/rand_pcg/0.2.1/download -> rand_pcg-0.2.1.crate https://crates.io/api/v1/crates/redox_syscall/0.2.11/download -> redox_syscall-0.2.11.crate https://crates.io/api/v1/crates/rustc_version/0.4.0/download -> rustc_version-0.4.0.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/selectors/0.22.0/download -> selectors-0.22.0.crate https://crates.io/api/v1/crates/semver/1.0.6/download -> semver-1.0.6.crate https://crates.io/api/v1/crates/serde/1.0.136/download -> serde-1.0.136.crate https://crates.io/api/v1/crates/servo_arc/0.1.1/download -> servo_arc-0.1.1.crate https://crates.io/api/v1/crates/siphasher/0.3.10/download -> siphasher-0.3.10.crate https://crates.io/api/v1/crates/smallvec/1.8.0/download -> smallvec-1.8.0.crate https://crates.io/api/v1/crates/stable_deref_trait/1.2.0/download -> stable_deref_trait-1.2.0.crate https://crates.io/api/v1/crates/string_cache/0.8.3/download -> string_cache-0.8.3.crate https://crates.io/api/v1/crates/string_cache_codegen/0.5.1/download -> string_cache_codegen-0.5.1.crate https://crates.io/api/v1/crates/syn/1.0.89/download -> syn-1.0.89.crate https://crates.io/api/v1/crates/target-lexicon/0.12.3/download -> target-lexicon-0.12.3.crate https://crates.io/api/v1/crates/tendril/0.4.3/download -> tendril-0.4.3.crate https://crates.io/api/v1/crates/thin-slice/0.1.1/download -> thin-slice-0.1.1.crate https://crates.io/api/v1/crates/unicode-xid/0.2.2/download -> unicode-xid-0.2.2.crate https://crates.io/api/v1/crates/unindent/0.1.8/download -> unindent-0.1.8.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/wasi/0.9.0+wasi-snapshot-preview1/download -> wasi-0.9.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate )
 _eclasses_=cargo	52a92ed3815080c5f2caac1905687b1c	distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=f79dc8b1ede67b024990837f35b46b41
+_md5_=cc7f86c232f8608f175dff101d15b372
diff --git a/metadata/md5-cache/dev-python/spur-0.3.22 b/metadata/md5-cache/dev-python/spur-0.3.22
deleted file mode 100644
index a4482027c962..000000000000
--- a/metadata/md5-cache/dev-python/spur-0.3.22
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/paramiko[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nose-1.3.7_p20211111_p1-r1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Run commands locally or over SSH using the same interface
-EAPI=7
-HOMEPAGE=https://github.com/mwilliamson/spur.py
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv x86
-LICENSE=BSD-2
-RDEPEND=dev-python/paramiko[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/mwilliamson/spur.py/archive/0.3.22.tar.gz -> spur.py-0.3.22.gh.tar.gz
-_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=6d824fff873145c0f4d79e301df1e0d7
diff --git a/metadata/md5-cache/dev-python/spur-0.3.22-r1 b/metadata/md5-cache/dev-python/spur-0.3.22-r1
index 115146e38a20..f6f127745746 100644
--- a/metadata/md5-cache/dev-python/spur-0.3.22-r1
+++ b/metadata/md5-cache/dev-python/spur-0.3.22-r1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/mwilliamson/spur.py
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv x86
 LICENSE=BSD-2
 RDEPEND=dev-python/paramiko[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_8 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/mwilliamson/spur.py/archive/0.3.22.tar.gz -> spur.py-0.3.22.gh.tar.gz https://dev.gentoo.org/~andrewammerlaan/spur-0.3.22-nose2pytest.diff
 _eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=9810357b2134bfefaa8dc16cd9c6369f
+_md5_=82cb2571246d300284cf8e36e04198f1
diff --git a/metadata/md5-cache/dev-python/stestr-3.2.1 b/metadata/md5-cache/dev-python/stestr-3.2.1
deleted file mode 100644
index 7e9bd8e467cd..000000000000
--- a/metadata/md5-cache/dev-python/stestr-3.2.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( >=dev-python/ddt-1.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A parallel Python test runner built around subunit
-EAPI=8
-HOMEPAGE=https://github.com/mtreinish/stestr
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/future[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cliff-2.8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/subunit-1.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/fixtures-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/testtools-2.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyyaml-3.10.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/voluptuous-0.8.9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/s/stestr/stestr-3.2.1.tar.gz
-_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=c83536a2278ac6096040b08c3ecacb14
diff --git a/metadata/md5-cache/dev-python/stestr-4.0.1 b/metadata/md5-cache/dev-python/stestr-4.0.1
index 706d7405361a..bfe97a1d3cbc 100644
--- a/metadata/md5-cache/dev-python/stestr-4.0.1
+++ b/metadata/md5-cache/dev-python/stestr-4.0.1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/mtreinish/stestr
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/future[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cliff-2.8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/subunit-1.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/fixtures-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/testtools-2.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyyaml-3.10.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/voluptuous-0.8.9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_8 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/s/stestr/stestr-4.0.1.tar.gz
 _eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=e327e9dae0e9ef2efc8d3a8b289775fe
+_md5_=c83536a2278ac6096040b08c3ecacb14
diff --git a/metadata/md5-cache/dev-python/tenacity-8.0.1-r1 b/metadata/md5-cache/dev-python/tenacity-8.0.1-r1
deleted file mode 100644
index aae0aacb3431..000000000000
--- a/metadata/md5-cache/dev-python/tenacity-8.0.1-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/setuptools_scm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/tornado[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=General-purpose retrying library
-EAPI=8
-HOMEPAGE=https://github.com/jd/tenacity/ https://pypi.org/project/tenacity/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~arm64 ~riscv x86
-LICENSE=Apache-2.0
-RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/t/tenacity/tenacity-8.0.1.tar.gz
-_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=c865b40335ad5e978b6f37658f1fdbd7
diff --git a/metadata/md5-cache/dev-python/tenacity-8.1.0 b/metadata/md5-cache/dev-python/tenacity-8.1.0
index d42e1345003c..aecf9cad92c2 100644
--- a/metadata/md5-cache/dev-python/tenacity-8.1.0
+++ b/metadata/md5-cache/dev-python/tenacity-8.1.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/jd/tenacity/ https://pypi.org/project/tenacity/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~riscv x86
 LICENSE=Apache-2.0
 RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_8 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/t/tenacity/tenacity-8.1.0.tar.gz
 _eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=b6e4896004b68b4f79de1409efc9ffed
+_md5_=c865b40335ad5e978b6f37658f1fdbd7
diff --git a/metadata/md5-cache/dev-python/terminado-0.17.0 b/metadata/md5-cache/dev-python/terminado-0.17.0
new file mode 100644
index 000000000000..9c4ca9ed4482
--- /dev/null
+++ b/metadata/md5-cache/dev-python/terminado-0.17.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/ptyprocess[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tornado[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/hatchling-1.8.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Terminals served to term.js using Tornado websockets
+EAPI=8
+HOMEPAGE=https://github.com/jupyter/terminado/ https://pypi.org/project/terminado/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD-2
+RDEPEND=dev-python/ptyprocess[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tornado[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/t/terminado/terminado-0.17.0.tar.gz
+_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=d0d0af853fce433abaee430441c42468
diff --git a/metadata/md5-cache/dev-python/textdistance-4.4.0 b/metadata/md5-cache/dev-python/textdistance-4.4.0
deleted file mode 100644
index ca90e7f812f4..000000000000
--- a/metadata/md5-cache/dev-python/textdistance-4.4.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/abydos[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/hypothesis[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/isort[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jellyfish[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/Levenshtein[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyxDamerauLevenshtein[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Compute distance between the two texts
-EAPI=8
-HOMEPAGE=https://github.com/life4/textdistance
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~riscv x86
-LICENSE=MIT
-RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/life4/textdistance/archive/4.4.0.tar.gz -> textdistance-4.4.0.gh.tar.gz
-_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=96d70fe72006dc73cb146ab7d5238509
diff --git a/metadata/md5-cache/dev-python/textdistance-4.5.0 b/metadata/md5-cache/dev-python/textdistance-4.5.0
index 39abced27693..736a3822b877 100644
--- a/metadata/md5-cache/dev-python/textdistance-4.5.0
+++ b/metadata/md5-cache/dev-python/textdistance-4.5.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/life4/textdistance
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~riscv ~x86
+KEYWORDS=amd64 ~riscv x86
 LICENSE=MIT
 RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/life4/textdistance/archive/4.5.0.tar.gz -> textdistance-4.5.0.gh.tar.gz
 _eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=d0ed29c6321dbc9360a936438a85b4d3
+_md5_=96d70fe72006dc73cb146ab7d5238509
diff --git a/metadata/md5-cache/dev-python/tox-3.27.0 b/metadata/md5-cache/dev-python/tox-3.27.0
new file mode 100644
index 000000000000..be1435ff1ae1
--- /dev/null
+++ b/metadata/md5-cache/dev-python/tox-3.27.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( >=dev-python/flaky-3.4.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/freezegun-0.3.11[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/filelock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pluggy-0.12[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/py[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/six-1.14[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/virtualenv-20.1.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pip[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/tomli-1.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-python/tomli-1.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-python/tomli-1.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/tomli-1.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/pytest-7.1.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,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_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=dev-python/filelock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pluggy-0.12[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/py[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/six-1.14[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/virtualenv-20.1.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pip[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/tomli-1.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-python/tomli-1.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-python/tomli-1.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/tomli-1.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 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/3.27.0.tar.gz -> tox-3.27.0.gh.tar.gz
+_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=776c6237e3778e480a02253a9c7418fb
diff --git a/metadata/md5-cache/dev-python/trimesh-3.15.7 b/metadata/md5-cache/dev-python/trimesh-3.15.7
new file mode 100644
index 000000000000..36483b69c6b1
--- /dev/null
+++ b/metadata/md5-cache/dev-python/trimesh-3.15.7
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/chardet[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorlog[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jsonschema[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/msgpack[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/networkx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pycollada[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyglet[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/shapely-1.8.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/svg-path[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sympy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/xxhash[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sci-libs/rtree[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=Python library for loading and using triangular meshes
+EAPI=8
+HOMEPAGE=https://trimsh.org/ https://github.com/mikedh/trimesh/ https://pypi.org/project/trimesh/
+INHERIT=distutils-r1 multiprocessing optfeature
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=MIT
+RDEPEND=dev-python/chardet[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorlog[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jsonschema[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/msgpack[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/networkx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pycollada[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyglet[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/shapely-1.8.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/svg-path[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sympy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/xxhash[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sci-libs/rtree[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/mikedh/trimesh/archive/3.15.7.tar.gz -> trimesh-3.15.7.gh.tar.gz
+_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=838f01dcebb4615d2db7ea9115b9431e
diff --git a/metadata/md5-cache/dev-python/uc-micro-py-1.0.1 b/metadata/md5-cache/dev-python/uc-micro-py-1.0.1
index 57dc42adfc03..207458192ed5 100644
--- a/metadata/md5-cache/dev-python/uc-micro-py-1.0.1
+++ b/metadata/md5-cache/dev-python/uc-micro-py-1.0.1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/tsutsu3/uc.micro-py/ https://pypi.org/project/uc-micro-py/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 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/tsutsu3/uc.micro-py/archive/v1.0.1.tar.gz -> uc.micro-py-1.0.1.gh.tar.gz
 _eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=192ac3f9e0c9a5c72403ad5115ff02b7
+_md5_=cd3aac10693e75741516c9c9c74e35c4
diff --git a/metadata/md5-cache/dev-python/ujson-5.4.0 b/metadata/md5-cache/dev-python/ujson-5.4.0
deleted file mode 100644
index 459dd367daf1..000000000000
--- a/metadata/md5-cache/dev-python/ujson-5.4.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/pytz[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-libs/double-conversion:= >=dev-python/pytest-7.1.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/double-conversion:=
-DESCRIPTION=Ultra fast JSON encoder and decoder for Python
-EAPI=8
-HOMEPAGE=https://github.com/ultrajson/ultrajson/ https://pypi.org/project/ujson/
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 arm arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=dev-libs/double-conversion:= python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/u/ujson/ujson-5.4.0.tar.gz
-_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=560640af33b6e4f876edd1e077706680
diff --git a/metadata/md5-cache/dev-python/ujson-5.5.0 b/metadata/md5-cache/dev-python/ujson-5.5.0
index 645b084e904d..443caa18b8a3 100644
--- a/metadata/md5-cache/dev-python/ujson-5.5.0
+++ b/metadata/md5-cache/dev-python/ujson-5.5.0
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/ultrajson/ultrajson/ https://pypi.org/project/ujson/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-libs/double-conversion:= python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 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/u/ujson/ujson-5.5.0.tar.gz
 _eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=520f6b67e1626cb1c677a8941908ac32
+_md5_=560640af33b6e4f876edd1e077706680
diff --git a/metadata/md5-cache/dev-python/uvloop-0.17.0 b/metadata/md5-cache/dev-python/uvloop-0.17.0
index a941112952dd..65853a014def 100644
--- a/metadata/md5-cache/dev-python/uvloop-0.17.0
+++ b/metadata/md5-cache/dev-python/uvloop-0.17.0
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/magicstack/uvloop/ https://pypi.org/project/uvloop/
 INHERIT=distutils-r1
 IUSE=examples test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 arm arm64 ppc ppc64 -riscv sparc ~x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 -riscv sparc ~x86
 LICENSE=MIT
 RDEPEND=>=dev-libs/libuv-1.11.0:= python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_8 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/u/uvloop/uvloop-0.17.0.tar.gz
 _eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=14a2fa6716445afe1c58c82a36a472fb
+_md5_=62dad6b30e79d21230ef2933e0a43e0f
diff --git a/metadata/md5-cache/dev-python/versioningit-2.1.0 b/metadata/md5-cache/dev-python/versioningit-2.1.0
new file mode 100644
index 000000000000..b5ee10a925be
--- /dev/null
+++ b/metadata/md5-cache/dev-python/versioningit-2.1.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/pydantic[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/packaging-17.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( dev-python/importlib_metadata[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( dev-python/importlib_metadata[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( <dev-python/tomli-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( <dev-python/tomli-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( <dev-python/tomli-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A setuptools plugin for versioning based on git tags
+EAPI=8
+HOMEPAGE=https://github.com/jwodder/versioningit/ https://pypi.org/project/versioningit/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/packaging-17.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( dev-python/importlib_metadata[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( dev-python/importlib_metadata[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( <dev-python/tomli-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( <dev-python/tomli-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( <dev-python/tomli-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/v/versioningit/versioningit-2.1.0.tar.gz
+_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=b22a93e804b4ed7d4d09c06a1412d268
diff --git a/metadata/md5-cache/dev-python/virtualenv-20.16.6 b/metadata/md5-cache/dev-python/virtualenv-20.16.6
new file mode 100644
index 000000000000..7aea105066d9
--- /dev/null
+++ b/metadata/md5-cache/dev-python/virtualenv-20.16.6
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/coverage[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/flaky[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pip-22.2.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-freezegun-0.4.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-mock-3.6.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-timeout-2.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-20.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/distlib-0.3.6[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/filelock-3.4.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/platformdirs-2.4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-63.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/six-1.9.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=Virtual Python Environment builder
+EAPI=8
+HOMEPAGE=https://virtualenv.pypa.io/en/stable/ https://pypi.org/project/virtualenv/ https://github.com/pypa/virtualenv/
+INHERIT=distutils-r1
+IUSE=test python_targets_pypy3 python_targets_python3_8 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=>=dev-python/distlib-0.3.6[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/filelock-3.4.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/platformdirs-2.4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-63.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/six-1.9.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/v/virtualenv/virtualenv-20.16.6.tar.gz
+_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=a8a8d6f1b4b67c4b1e5c0f404e2de9f3
diff --git a/metadata/md5-cache/dev-python/vpython-7.6.4 b/metadata/md5-cache/dev-python/vpython-7.6.4
new file mode 100644
index 000000000000..090141a7e8f2
--- /dev/null
+++ b/metadata/md5-cache/dev-python/vpython-7.6.4
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( >=dev-python/autobahn-18.8.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ipykernel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jupyter[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jupyter-server-proxy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=VPython for Jupyter notebook
+EAPI=8
+HOMEPAGE=https://www.vpython.org/ https://pypi.org/project/vpython/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD-2
+RDEPEND=>=dev-python/autobahn-18.8.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ipykernel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jupyter[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jupyter-server-proxy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=test !test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/v/vpython/vpython-7.6.4.tar.gz
+_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=310f6c6761be1f298094a42314dadb22
diff --git a/metadata/md5-cache/dev-python/immutables-0.18 b/metadata/md5-cache/dev-python/websockets-10.4
similarity index 82%
rename from metadata/md5-cache/dev-python/immutables-0.18
rename to metadata/md5-cache/dev-python/websockets-10.4
index 029db0906c84..1315df93b6f7 100644
--- a/metadata/md5-cache/dev-python/immutables-0.18
+++ b/metadata/md5-cache/dev-python/websockets-10.4
@@ -1,16 +1,16 @@
 BDEPEND=test? ( >=dev-python/pytest-7.1.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A high-performance immutable mapping type for Python
+DESCRIPTION=Library for building WebSocket servers and clients in Python
 EAPI=8
-HOMEPAGE=https://github.com/MagicStack/immutables/ https://pypi.org/project/immutables/
+HOMEPAGE=https://websockets.readthedocs.io/ https://github.com/aaugustin/websockets/ https://pypi.org/project/websockets/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_8 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
-LICENSE=Apache-2.0
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=BSD
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/MagicStack/immutables/archive/v0.18.tar.gz -> immutables-0.18.gh.tar.gz
+SRC_URI=https://github.com/aaugustin/websockets/archive/10.4.tar.gz -> websockets-10.4.gh.tar.gz
 _eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=d23da6f518c1a5936dd43f417b969c1f
+_md5_=08ea81da5d81e06c0a6b98a8d7e13570
diff --git a/metadata/md5-cache/dev-python/zope-hookable-5.1.0 b/metadata/md5-cache/dev-python/zope-hookable-5.1.0
deleted file mode 100644
index 205d8b5a1f84..000000000000
--- a/metadata/md5-cache/dev-python/zope-hookable-5.1.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/zope-testing[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Efficient creation of 'hookable' objects
-EAPI=8
-HOMEPAGE=https://pypi.org/project/zope.hookable/ https://github.com/zopefoundation/zope.hookable/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv ~x86
-LICENSE=ZPL
-RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/z/zope.hookable/zope.hookable-5.1.0.tar.gz
-_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=8d00c6493d0f55fa4d5f366e46f7f0e6
diff --git a/metadata/md5-cache/dev-python/zope-hookable-5.2 b/metadata/md5-cache/dev-python/zope-hookable-5.2
index 1a2615646097..346c3170a1d6 100644
--- a/metadata/md5-cache/dev-python/zope-hookable-5.2
+++ b/metadata/md5-cache/dev-python/zope-hookable-5.2
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/zope.hookable/ https://github.com/zopefoundation/zope.hookable/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv ~x86
 LICENSE=ZPL
 RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_8 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/z/zope.hookable/zope.hookable-5.2.tar.gz
 _eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=2d74766a17d3c551e7642f1af39ef277
+_md5_=8d00c6493d0f55fa4d5f366e46f7f0e6
diff --git a/metadata/md5-cache/dev-ros/Manifest.gz b/metadata/md5-cache/dev-ros/Manifest.gz
index faae29798f78..8c9d40777f19 100644
Binary files a/metadata/md5-cache/dev-ros/Manifest.gz and b/metadata/md5-cache/dev-ros/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-ros/gencpp-0.6.5 b/metadata/md5-cache/dev-ros/gencpp-0.7.0
similarity index 94%
rename from metadata/md5-cache/dev-ros/gencpp-0.6.5
rename to metadata/md5-cache/dev-ros/gencpp-0.7.0
index d3eb5e6104d2..b3f26a36c611 100644
--- a/metadata/md5-cache/dev-ros/gencpp-0.6.5
+++ b/metadata/md5-cache/dev-ros/gencpp-0.7.0
@@ -11,7 +11,7 @@ LICENSE=BSD
 RDEPEND=dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 RESTRICT=!test? ( test )
-SLOT=0/0.6.5
-SRC_URI=https://github.com/ros/gencpp/archive/0.6.5.tar.gz -> gencpp-0.6.5.tar.gz
+SLOT=0/0.7.0
+SRC_URI=https://github.com/ros/gencpp/archive/0.7.0.tar.gz -> gencpp-0.7.0.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	ros-catkin	1cf3d3264f61ccd5d9f53bec7351df9d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=cf5e45c38cc680d7b2b694291cc14b16
+_md5_=f0c52e5ee09319504ec646e5a9afe246
diff --git a/metadata/md5-cache/dev-ros/genmsg-0.5.16 b/metadata/md5-cache/dev-ros/genmsg-0.6.0
similarity index 95%
rename from metadata/md5-cache/dev-ros/genmsg-0.5.16
rename to metadata/md5-cache/dev-ros/genmsg-0.6.0
index 39d646bf32b4..cc9b7cba2766 100644
--- a/metadata/md5-cache/dev-ros/genmsg-0.5.16
+++ b/metadata/md5-cache/dev-ros/genmsg-0.6.0
@@ -12,6 +12,6 @@ RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/ros/genmsg/archive/0.5.16.tar.gz -> genmsg-0.5.16.tar.gz
+SRC_URI=https://github.com/ros/genmsg/archive/0.6.0.tar.gz -> genmsg-0.6.0.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	ros-catkin	1cf3d3264f61ccd5d9f53bec7351df9d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=1b256532efa7c4d61b391eadf6fe72fe
+_md5_=6d0ab4ce63e8ce13b71869e9a04108da
diff --git a/metadata/md5-cache/dev-ros/test_tf2-0.7.6 b/metadata/md5-cache/dev-ros/test_tf2-0.7.6
new file mode 100644
index 000000000000..74018d8bb5f0
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/test_tf2-0.7.6
@@ -0,0 +1,17 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/rosconsole dev-ros/roscpp dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-ros/tf dev-ros/tf2 dev-ros/tf2_bullet dev-ros/tf2_eigen dev-ros/tf2_ros[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-ros/tf2_geometry_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-ros/tf2_kdl[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-ros/tf2_msgs dev-ros/rosbash sci-libs/orocos_kdl python_single_target_python3_8? ( dev-python/python_orocos_kdl[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/python_orocos_kdl[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/python_orocos_kdl[python_targets_python3_10(-)] ) dev-libs/boost:= dev-cpp/gtest python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-util/catkin[python_targets_python3_10(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/empy[python_targets_python3_10(-)] )
+DESCRIPTION=TF2 unit tests
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/test_tf2 https://github.com/ros/geometry2
+INHERIT=ros-catkin
+IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/geometry2/archive/0.7.6.tar.gz -> geometry2-0.7.6.tar.gz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	ros-catkin	1cf3d3264f61ccd5d9f53bec7351df9d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=92e0e30e60d18e1524d9c1c57b4ba3f8
diff --git a/metadata/md5-cache/dev-ros/tf2-0.7.6 b/metadata/md5-cache/dev-ros/tf2-0.7.6
new file mode 100644
index 000000000000..89dec27359a7
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/tf2-0.7.6
@@ -0,0 +1,17 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-libs/console_bridge:= dev-ros/rostime dev-libs/boost:= dev-ros/tf2_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] test? ( dev-ros/roscpp dev-cpp/gtest ) python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-util/catkin[python_targets_python3_10(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/empy[python_targets_python3_10(-)] )
+DESCRIPTION=The second generation Transform Library in ROS
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/tf2 https://github.com/ros/geometry2
+INHERIT=ros-catkin
+IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-libs/console_bridge:= dev-ros/rostime dev-libs/boost:= python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/geometry2/archive/0.7.6.tar.gz -> geometry2-0.7.6.tar.gz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	ros-catkin	1cf3d3264f61ccd5d9f53bec7351df9d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=0f50891b7e47b76a4fde487116b5cbac
diff --git a/metadata/md5-cache/dev-ros/tf2_bullet-0.7.6 b/metadata/md5-cache/dev-ros/tf2_bullet-0.7.6
new file mode 100644
index 000000000000..f9a165b236e9
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/tf2_bullet-0.7.6
@@ -0,0 +1,17 @@
+BDEPEND=virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/tf2 sci-physics/bullet dev-ros/geometry_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest ) python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-util/catkin[python_targets_python3_10(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/empy[python_targets_python3_10(-)] )
+DESCRIPTION=TF2 bullet support
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/tf2_bullet https://github.com/ros/geometry2
+INHERIT=ros-catkin
+IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-ros/tf2 sci-physics/bullet python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/geometry2/archive/0.7.6.tar.gz -> geometry2-0.7.6.tar.gz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	ros-catkin	1cf3d3264f61ccd5d9f53bec7351df9d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=80c79c56b23f543e342979b5b606cd85
diff --git a/metadata/md5-cache/dev-ros/tf2_eigen-0.7.6 b/metadata/md5-cache/dev-ros/tf2_eigen-0.7.6
new file mode 100644
index 000000000000..a5ddbe0ce836
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/tf2_eigen-0.7.6
@@ -0,0 +1,17 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/tf2 dev-ros/cmake_modules dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 test? ( dev-cpp/gtest ) python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-util/catkin[python_targets_python3_10(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/empy[python_targets_python3_10(-)] )
+DESCRIPTION=TF2 eigen support
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/tf2_eigen https://github.com/ros/geometry2
+INHERIT=ros-catkin
+IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/tf2 python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/geometry2/archive/0.7.6.tar.gz -> geometry2-0.7.6.tar.gz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	ros-catkin	1cf3d3264f61ccd5d9f53bec7351df9d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=6688f6f67ffb8595ab8460f040a97cf1
diff --git a/metadata/md5-cache/dev-ros/tf2_geometry_msgs-0.7.6 b/metadata/md5-cache/dev-ros/tf2_geometry_msgs-0.7.6
new file mode 100644
index 000000000000..a5c51dd3396c
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/tf2_geometry_msgs-0.7.6
@@ -0,0 +1,17 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-ros/tf2_ros[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] python_single_target_python3_8? ( dev-python/python_orocos_kdl[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/python_orocos_kdl[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/python_orocos_kdl[python_targets_python3_10(-)] ) dev-ros/tf2 sci-libs/orocos_kdl dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-ros/geometry_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-cpp/gtest ) python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-util/catkin[python_targets_python3_10(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/empy[python_targets_python3_10(-)] ) python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?]
+DESCRIPTION=The second generation Transform Library in ROS
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/tf2_geometry_msgs https://github.com/ros/geometry2
+INHERIT=ros-catkin
+IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-ros/tf2_ros[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] python_single_target_python3_8? ( dev-python/python_orocos_kdl[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/python_orocos_kdl[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/python_orocos_kdl[python_targets_python3_10(-)] ) dev-ros/tf2 sci-libs/orocos_kdl dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/geometry2/archive/0.7.6.tar.gz -> geometry2-0.7.6.tar.gz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	ros-catkin	1cf3d3264f61ccd5d9f53bec7351df9d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=6069c73f14e0ceece453c115cc8c5e84
diff --git a/metadata/md5-cache/dev-ros/tf2_kdl-0.7.6 b/metadata/md5-cache/dev-ros/tf2_kdl-0.7.6
new file mode 100644
index 000000000000..211a0e5841fd
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/tf2_kdl-0.7.6
@@ -0,0 +1,17 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/tf2 dev-ros/tf2_ros python_single_target_python3_8? ( dev-python/python_orocos_kdl[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/python_orocos_kdl[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/python_orocos_kdl[python_targets_python3_10(-)] ) sci-libs/orocos_kdl:= dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-ros/cmake_modules dev-cpp/eigen:3 test? ( dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-cpp/gtest ) python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-util/catkin[python_targets_python3_10(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/empy[python_targets_python3_10(-)] )
+DESCRIPTION=KDL binding for tf2
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/tf2_kdl https://github.com/ros/geometry2
+INHERIT=ros-catkin
+IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/tf2 dev-ros/tf2_ros python_single_target_python3_8? ( dev-python/python_orocos_kdl[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/python_orocos_kdl[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/python_orocos_kdl[python_targets_python3_10(-)] ) sci-libs/orocos_kdl:= dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/geometry2/archive/0.7.6.tar.gz -> geometry2-0.7.6.tar.gz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	ros-catkin	1cf3d3264f61ccd5d9f53bec7351df9d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=46fa27029078eacd6648022b211b4eb3
diff --git a/metadata/md5-cache/dev-ros/tf2_msgs-0.7.6 b/metadata/md5-cache/dev-ros/tf2_msgs-0.7.6
new file mode 100644
index 000000000000..57df954e27bf
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/tf2_msgs-0.7.6
@@ -0,0 +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_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-util/catkin[python_targets_python3_10(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/empy[python_targets_python3_10(-)] ) python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] )
+DESCRIPTION=TF2 messages
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/tf2_msgs https://github.com/ros/geometry2
+INHERIT=ros-catkin
+IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) dev-ros/message_runtime dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/geometry2/archive/0.7.6.tar.gz -> geometry2-0.7.6.tar.gz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	ros-catkin	1cf3d3264f61ccd5d9f53bec7351df9d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=4806356b99a6abcfe4e5ae1b4b26e7ef
diff --git a/metadata/md5-cache/dev-ros/tf2_py-0.7.6 b/metadata/md5-cache/dev-ros/tf2_py-0.7.6
new file mode 100644
index 000000000000..35ab491ae054
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/tf2_py-0.7.6
@@ -0,0 +1,17 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/tf2 dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-libs/boost:= python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-util/catkin[python_targets_python3_10(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/empy[python_targets_python3_10(-)] )
+DESCRIPTION=TF2 python bindings
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/tf2_py https://github.com/ros/geometry2
+INHERIT=ros-catkin
+IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/tf2 dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-libs/boost:= python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/geometry2/archive/0.7.6.tar.gz -> geometry2-0.7.6.tar.gz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	ros-catkin	1cf3d3264f61ccd5d9f53bec7351df9d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=063429ab2d312b87867ffd400c1d6989
diff --git a/metadata/md5-cache/dev-ros/tf2_ros-0.7.6 b/metadata/md5-cache/dev-ros/tf2_ros-0.7.6
new file mode 100644
index 000000000000..97940040947c
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/tf2_ros-0.7.6
@@ -0,0 +1,17 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/actionlib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-ros/message_filters dev-ros/roscpp dev-ros/rosgraph dev-libs/boost:= dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-ros/tf2 dev-ros/tf2_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-ros/actionlib_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] test? ( dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-cpp/gtest ) dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-util/catkin[python_targets_python3_10(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/empy[python_targets_python3_10(-)] )
+DESCRIPTION=ROS bindings for the tf2 library, for both Python and C++
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/tf2_ros https://github.com/ros/geometry2
+INHERIT=ros-catkin
+IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/actionlib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-ros/message_filters dev-ros/roscpp dev-ros/rosgraph dev-libs/boost:= dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-ros/tf2 dev-ros/tf2_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-ros/actionlib_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/geometry2/archive/0.7.6.tar.gz -> geometry2-0.7.6.tar.gz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	ros-catkin	1cf3d3264f61ccd5d9f53bec7351df9d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=ef83c5ec5c964b9e0c301e51d7b7b962
diff --git a/metadata/md5-cache/dev-ros/tf2_sensor_msgs-0.7.6 b/metadata/md5-cache/dev-ros/tf2_sensor_msgs-0.7.6
new file mode 100644
index 000000000000..badcb56fa998
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/tf2_sensor_msgs-0.7.6
@@ -0,0 +1,17 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/tf2_ros[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-ros/tf2 dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] python_single_target_python3_8? ( dev-python/python_orocos_kdl[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/python_orocos_kdl[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/python_orocos_kdl[python_targets_python3_10(-)] ) dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] test? ( python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/nose[python_targets_python3_10(-)] ) dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-cpp/gtest ) dev-ros/cmake_modules dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-util/catkin[python_targets_python3_10(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/empy[python_targets_python3_10(-)] )
+DESCRIPTION=Transform sensor_msgs with tf. Most notably, PointCloud2
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/tf2_sensor_msgs https://github.com/ros/geometry2
+INHERIT=ros-catkin
+IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/tf2_ros[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-ros/tf2 dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] python_single_target_python3_8? ( dev-python/python_orocos_kdl[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/python_orocos_kdl[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/python_orocos_kdl[python_targets_python3_10(-)] ) dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/geometry2/archive/0.7.6.tar.gz -> geometry2-0.7.6.tar.gz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	ros-catkin	1cf3d3264f61ccd5d9f53bec7351df9d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=69d0a9467cc486ac40796ac57d8d5a70
diff --git a/metadata/md5-cache/dev-ros/tf2_tools-0.7.6 b/metadata/md5-cache/dev-ros/tf2_tools-0.7.6
new file mode 100644
index 000000000000..5fb9fa13a755
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/tf2_tools-0.7.6
@@ -0,0 +1,17 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-ros/tf2_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-ros/tf2_ros[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pyyaml[python_targets_python3_10(-)] ) python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-util/catkin[python_targets_python3_10(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/empy[python_targets_python3_10(-)] )
+DESCRIPTION=Tools for 2nd gen Transform library
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/tf2_tools https://github.com/ros/geometry2
+INHERIT=ros-catkin
+IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-ros/tf2_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-ros/tf2_ros[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pyyaml[python_targets_python3_10(-)] ) python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/geometry2/archive/0.7.6.tar.gz -> geometry2-0.7.6.tar.gz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	ros-catkin	1cf3d3264f61ccd5d9f53bec7351df9d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=c2c029a0a178aea056110bb8e620e926
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index d4f684113077..cf7bc27974b7 100644
Binary files a/metadata/md5-cache/dev-util/Manifest.gz and b/metadata/md5-cache/dev-util/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-util/ccache-4.7.1 b/metadata/md5-cache/dev-util/ccache-4.7.1
new file mode 100644
index 000000000000..665144222eb9
--- /dev/null
+++ b/metadata/md5-cache/dev-util/ccache-4.7.1
@@ -0,0 +1,17 @@
+BDEPEND=doc? ( dev-ruby/asciidoctor ) verify-sig? ( sec-keys/openpgp-keys-joelrosdahl ) >=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 postinst prepare prerm test unpack
+DEPEND=app-arch/zstd:= redis? ( dev-libs/hiredis:= ) test? ( dev-libs/elfutils )
+DESCRIPTION=Fast compiler cache
+EAPI=8
+HOMEPAGE=https://ccache.dev/
+IDEPEND=dev-util/shadowman
+INHERIT=cmake toolchain-funcs flag-o-matic verify-sig
+IUSE=doc redis +static-c++ test verify-sig
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-3 LGPL-3
+RDEPEND=app-arch/zstd:= redis? ( dev-libs/hiredis:= ) dev-util/shadowman sys-apps/gentoo-functions
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ccache/ccache/releases/download/v4.7.1/ccache-4.7.1.tar.xz verify-sig? ( https://github.com/ccache/ccache/releases/download/v4.7.1/ccache-4.7.1.tar.xz.asc )
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	0748d665fa664a87add00152ed046e16	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=4e9a62ab4f0dd11e95729cbb56f4e2ce
diff --git a/metadata/md5-cache/dev-util/clazy-1.11-r2 b/metadata/md5-cache/dev-util/clazy-1.11-r2
new file mode 100644
index 000000000000..41a86bfa2e12
--- /dev/null
+++ b/metadata/md5-cache/dev-util/clazy-1.11-r2
@@ -0,0 +1,16 @@
+BDEPEND=test? ( || ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=<sys-devel/clang-16:= !!sys-devel/llvm:0
+DESCRIPTION=Compiler plugin which allows clang to understand Qt semantics
+EAPI=8
+HOMEPAGE=https://apps.kde.org/clazy
+INHERIT=cmake llvm python-any-r1
+IUSE=test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=<sys-devel/clang-16:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://kde/stable/clazy/1.11/src/clazy-1.11.tar.xz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	llvm	29d5332b8530fb760c2ca71ad6706858	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=5e059ac6474fb7a82d9bc7696b3f938d
diff --git a/metadata/md5-cache/dev-util/dbus-test-runner-19.04.0-r2 b/metadata/md5-cache/dev-util/dbus-test-runner-19.04.0-r2
index d9d57691467c..01c2ad795b9a 100644
--- a/metadata/md5-cache/dev-util/dbus-test-runner-19.04.0-r2
+++ b/metadata/md5-cache/dev-util/dbus-test-runner-19.04.0-r2
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/gdbus-codegen dev-util/intltool
 DEFINED_PHASES=configure install prepare setup
-DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) dev-libs/dbus-glib dev-libs/glib:2 test? ( python_single_target_python3_8? ( dev-python/python-dbusmock[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/python-dbusmock[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/python-dbusmock[python_targets_python3_10(-)] ) )
+DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) dev-libs/dbus-glib dev-libs/glib:2 test? ( python_single_target_python3_8? ( dev-python/python-dbusmock[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/python-dbusmock[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/python-dbusmock[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/python-dbusmock[python_targets_python3_11(-)] ) )
 DESCRIPTION=Run executables under a new DBus session for testing
 EAPI=8
 HOMEPAGE=https://launchpad.net/dbus-test-runner
 INHERIT=python-single-r1
-IUSE=test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+IUSE=test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86
 LICENSE=GPL-3
-RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) dev-libs/dbus-glib dev-libs/glib:2 python_single_target_python3_8? ( dev-python/python-dbusmock[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/python-dbusmock[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/python-dbusmock[python_targets_python3_10(-)] )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
+RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) dev-libs/dbus-glib dev-libs/glib:2 python_single_target_python3_8? ( dev-python/python-dbusmock[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/python-dbusmock[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/python-dbusmock[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/python-dbusmock[python_targets_python3_11(-)] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://launchpad.net/dbus-test-runner/19.04/19.04.0/+download/dbus-test-runner-19.04.0.tar.gz
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=fa74142e316f2d9f9182518da2e2a1fb
+_md5_=5819150b79afbc2b4b8c0f3c55b0e428
diff --git a/metadata/md5-cache/dev-util/gdbus-codegen-2.74.1 b/metadata/md5-cache/dev-util/gdbus-codegen-2.74.1
new file mode 100644
index 000000000000..303743194a24
--- /dev/null
+++ b/metadata/md5-cache/dev-util/gdbus-codegen-2.74.1
@@ -0,0 +1,16 @@
+BDEPEND=dev-libs/libxslt app-text/docbook-xsl-stylesheets app-arch/xz-utils python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8[xml(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9[xml(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10[xml(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[xml(+)] ) python_single_target_python3_8? ( >=dev-python/gpep517-9[python_targets_python3_8(-)] >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)] dev-python/wheel[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/gpep517-9[python_targets_python3_9(-)] >=dev-python/setuptools-65.3.0[python_targets_python3_9(-)] dev-python/wheel[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/gpep517-9[python_targets_python3_10(-)] >=dev-python/setuptools-65.3.0[python_targets_python3_10(-)] dev-python/wheel[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/gpep517-9[python_targets_python3_11(-)] >=dev-python/setuptools-65.3.0[python_targets_python3_11(-)] dev-python/wheel[python_targets_python3_11(-)] )
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8[xml(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9[xml(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10[xml(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[xml(+)] )
+DESCRIPTION=GDBus code and documentation generator
+EAPI=8
+HOMEPAGE=https://www.gtk.org/
+INHERIT=gnome.org distutils-r1
+IUSE=python_single_target_python3_8 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 ~x64-macos
+LICENSE=LGPL-2+
+RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8[xml(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9[xml(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10[xml(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[xml(+)] ) python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8[xml(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9[xml(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10[xml(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[xml(+)] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
+SLOT=0
+SRC_URI=mirror://gnome/sources/glib/2.74/glib-2.74.1.tar.xz
+_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	gnome.org	429073e99d7067d3462e875bf5c6e14a	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=3503e49fd1322a4ab0f456f40c42f21f
diff --git a/metadata/md5-cache/dev-util/geany-plugins-1.38-r2 b/metadata/md5-cache/dev-util/geany-plugins-1.38-r2
index f15e5f39cf57..48f89374b647 100644
--- a/metadata/md5-cache/dev-util/geany-plugins-1.38-r2
+++ b/metadata/md5-cache/dev-util/geany-plugins-1.38-r2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://plugins.geany.org
 INHERIT=lua-single
 IUSE=ctags debugger enchant git gpg gtkspell lua markdown nls pretty-printer scope soup workbench +lua_single_target_lua5-1
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~amd64 arm ~ppc ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 >=dev-util/geany-1.37[-gtk2(-)] x11-libs/gtk+:3 ctags? ( dev-util/ctags ) debugger? ( x11-libs/vte:2.91 ) enchant? ( app-text/enchant:= ) git? ( dev-libs/libgit2:= ) gpg? ( app-crypt/gpgme:= ) gtkspell? ( app-text/gtkspell:3= ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) markdown? ( app-text/discount net-libs/webkit-gtk:4 ) pretty-printer? ( dev-libs/libxml2:2 ) scope? ( x11-libs/vte:2.91 ) soup? ( net-libs/libsoup:2.4 ) workbench? ( dev-libs/libgit2:= ) scope? ( sys-devel/gdb )
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 ) )
 SLOT=0
 SRC_URI=https://plugins.geany.org/geany-plugins/geany-plugins-1.38.tar.gz
 _eclasses_=lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=dd474465145898c6c3617146729777cf
+_md5_=692b23046e1a3c4ff17e46122b08aa6f
diff --git a/metadata/md5-cache/dev-util/glib-utils-2.74.1 b/metadata/md5-cache/dev-util/glib-utils-2.74.1
new file mode 100644
index 000000000000..a16288e3bfe0
--- /dev/null
+++ b/metadata/md5-cache/dev-util/glib-utils-2.74.1
@@ -0,0 +1,16 @@
+BDEPEND=dev-libs/libxslt app-text/docbook-xsl-stylesheets app-arch/xz-utils
+DEFINED_PHASES=compile configure install setup
+DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+DESCRIPTION=Build utilities for GLib using projects
+EAPI=8
+HOMEPAGE=https://www.gtk.org/
+INHERIT=gnome.org python-single-r1
+IUSE=python_single_target_python3_8 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 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+LICENSE=LGPL-2.1+
+RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
+SLOT=0
+SRC_URI=mirror://gnome/sources/glib/2.74/glib-2.74.1.tar.xz
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=693d8649ce56ef1e7ccf644bd7e4c655
diff --git a/metadata/md5-cache/dev-util/kdevelop-pg-qt-2.2.1 b/metadata/md5-cache/dev-util/kdevelop-pg-qt-2.2.1
deleted file mode 100644
index 337ebe19e53f..000000000000
--- a/metadata/md5-cache/dev-util/kdevelop-pg-qt-2.2.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/bison sys-devel/flex >=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-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=LL(1) parser generator used mainly by KDevelop language plugins
-EAPI=7
-HOMEPAGE=https://www.kdevelop.org/
-INHERIT=ecm kde.org
-IUSE=debug test
-KEYWORDS=amd64 arm64 ~ppc64 x86
-LICENSE=LGPL-2+ LGPL-2.1+
-RDEPEND=|| ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/kdevelop-pg-qt/2.2.1/src/kdevelop-pg-qt-2.2.1.tar.xz
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	ecm	3dae552f761290722bcc848a12bfb538	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	kde.org	087d21100477ce987a8de6c1d613a176	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	virtualx	644887c82aefdf12001489391fca4f02	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=3d2d131e0bfb60c561e26e47341e50c9
diff --git a/metadata/md5-cache/dev-util/kdevelop-pg-qt-2.2.1_p20220904 b/metadata/md5-cache/dev-util/kdevelop-pg-qt-2.2.1_p20220904
index 6abae8476b8f..dfe709ebdfd6 100644
--- a/metadata/md5-cache/dev-util/kdevelop-pg-qt-2.2.1_p20220904
+++ b/metadata/md5-cache/dev-util/kdevelop-pg-qt-2.2.1_p20220904
@@ -7,11 +7,11 @@ HOMEPAGE=https://kdevelop.org/
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=ecm kde.org
 IUSE=debug test
-KEYWORDS=amd64 ~arm64 ~ppc64 x86
+KEYWORDS=amd64 arm64 ~ppc64 x86
 LICENSE=LGPL-2+ LGPL-2.1+
 RDEPEND=|| ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=https://invent.kde.org/kdevelop/kdevelop-pg-qt/-/archive/72138ed04d427f520e65b146525632e967177abe/kdevelop-pg-qt-72138ed04d427f520e65b146525632e967177abe.tar.gz -> kdevelop-pg-qt-2.2.1_p20220904-72138ed0.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	ecm	3dae552f761290722bcc848a12bfb538	flag-o-matic	29a755b1291d64133634d80b0328f153	kde.org	087d21100477ce987a8de6c1d613a176	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=cbedfbd2bfeaa6e8316c21df0ceadd2b
+_md5_=dbfcad6df3a7b2d0d2cc63540cbf12ee
diff --git a/metadata/md5-cache/dev-util/lldb-15.0.3.9999 b/metadata/md5-cache/dev-util/lldb-15.0.4.9999
similarity index 89%
rename from metadata/md5-cache/dev-util/lldb-15.0.3.9999
rename to metadata/md5-cache/dev-util/lldb-15.0.4.9999
index a9dd9b74bee0..c92209d1f37c 100644
--- a/metadata/md5-cache/dev-util/lldb-15.0.3.9999
+++ b/metadata/md5-cache/dev-util/lldb-15.0.4.9999
@@ -1,6 +1,6 @@
-BDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-util/cmake-3.16 python? ( >=dev-lang/swig-3.0.11 python_single_target_python3_8? ( dev-python/six[python_targets_python3_8(-)] ) 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_8? ( ~dev-python/lit-15.0.3.9999[python_targets_python3_8(-)] dev-python/psutil[python_targets_python3_8(-)] ) python_single_target_python3_9? ( ~dev-python/lit-15.0.3.9999[python_targets_python3_9(-)] dev-python/psutil[python_targets_python3_9(-)] ) python_single_target_python3_10? ( ~dev-python/lit-15.0.3.9999[python_targets_python3_10(-)] dev-python/psutil[python_targets_python3_10(-)] ) python_single_target_python3_11? ( ~dev-python/lit-15.0.3.9999[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 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-util/cmake-3.16 python? ( >=dev-lang/swig-3.0.11 python_single_target_python3_8? ( dev-python/six[python_targets_python3_8(-)] ) 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_8? ( ~dev-python/lit-15.0.4.9999[python_targets_python3_8(-)] dev-python/psutil[python_targets_python3_8(-)] ) python_single_target_python3_9? ( ~dev-python/lit-15.0.4.9999[python_targets_python3_9(-)] dev-python/psutil[python_targets_python3_9(-)] ) python_single_target_python3_10? ( ~dev-python/lit-15.0.4.9999[python_targets_python3_10(-)] dev-python/psutil[python_targets_python3_10(-)] ) python_single_target_python3_11? ( ~dev-python/lit-15.0.4.9999[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 >=dev-vcs/git-1.8.2.1[curl]
 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-15.0.3.9999 ~sys-devel/llvm-15.0.3.9999 !!sys-devel/llvm:0
+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-15.0.4.9999 ~sys-devel/llvm-15.0.4.9999 !!sys-devel/llvm:0
 DESCRIPTION=The LLVM debugger
 EAPI=8
 HOMEPAGE=https://llvm.org/
@@ -8,7 +8,7 @@ INHERIT=cmake llvm llvm.org python-single-r1
 IUSE=debug +libedit lzma ncurses +python test +xml test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
 LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 PROPERTIES=live
-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-15.0.3.9999 ~sys-devel/llvm-15.0.3.9999 python? ( python_single_target_python3_8? ( dev-python/six[python_targets_python3_8(-)] ) 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_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) )
+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-15.0.4.9999 ~sys-devel/llvm-15.0.4.9999 python? ( python_single_target_python3_8? ( dev-python/six[python_targets_python3_8(-)] ) 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_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) )
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
 RESTRICT=test !test? ( test )
 SLOT=0/15
diff --git a/metadata/md5-cache/dev-util/meson-0.63.0 b/metadata/md5-cache/dev-util/meson-0.63.0
deleted file mode 100644
index d72c6634751a..000000000000
--- a/metadata/md5-cache/dev-util/meson-0.63.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-libs/glib:2 dev-libs/gobject-introspection dev-util/ninja dev-vcs/git sys-libs/zlib[static-libs(+)] virtual/pkgconfig )
-DESCRIPTION=Open source build system
-EAPI=8
-HOMEPAGE=https://mesonbuild.com/
-INHERIT=bash-completion-r1 distutils-r1 toolchain-funcs
-IUSE=test python_targets_python3_8 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
-LICENSE=Apache-2.0
-RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/m/meson/meson-0.63.0.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=d0a71ad8dd710029c4c34b907030b200
diff --git a/metadata/md5-cache/dev-util/meson-0.63.2-r1 b/metadata/md5-cache/dev-util/meson-0.63.2-r1
index 218aad4f7c47..036409f8dc12 100644
--- a/metadata/md5-cache/dev-util/meson-0.63.2-r1
+++ b/metadata/md5-cache/dev-util/meson-0.63.2-r1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://mesonbuild.com/
 INHERIT=bash-completion-r1 distutils-r1 toolchain-funcs
 IUSE=test python_targets_python3_8 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=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_8 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-0.63.2.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=8bfe800c044471a891f0c2b60a7292d3
+_md5_=b2d6499333ca6f6ad60733443a01bf6e
diff --git a/metadata/md5-cache/dev-util/meson-0.63.1 b/metadata/md5-cache/dev-util/meson-0.63.3
similarity index 96%
rename from metadata/md5-cache/dev-util/meson-0.63.1
rename to metadata/md5-cache/dev-util/meson-0.63.3
index 9bb84132c4b6..5920e6b90192 100644
--- a/metadata/md5-cache/dev-util/meson-0.63.1
+++ b/metadata/md5-cache/dev-util/meson-0.63.3
@@ -12,6 +12,6 @@ RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_target
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/m/meson/meson-0.63.1.tar.gz
+SRC_URI=mirror://pypi/m/meson/meson-0.63.3.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=d0a71ad8dd710029c4c34b907030b200
+_md5_=0f7b8d54a3e7743d340b8b9102ae39b9
diff --git a/metadata/md5-cache/dev-util/patchelf-0.15.0 b/metadata/md5-cache/dev-util/patchelf-0.15.0
index bdccb7455a3b..28e37c57d7f9 100644
--- a/metadata/md5-cache/dev-util/patchelf-0.15.0
+++ b/metadata/md5-cache/dev-util/patchelf-0.15.0
@@ -4,9 +4,9 @@ DESCRIPTION=Small utility to modify the dynamic linker and RPATH of ELF executab
 EAPI=8
 HOMEPAGE=https://github.com/NixOS/patchelf
 INHERIT=autotools
-KEYWORDS=~amd64 arm arm64 ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~riscv-linux ~x86-linux
+KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~riscv-linux ~x86-linux
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=https://github.com/NixOS/patchelf/archive/0.15.0.tar.gz -> patchelf-0.15.0.tar.gz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=fc0dfa0ed2b67e18511b7dc745b52cc5
+_md5_=f1e50217dca78e3896f32dc24f2e9b2e
diff --git a/metadata/md5-cache/dev-util/rbtools-3.1.1 b/metadata/md5-cache/dev-util/rbtools-3.1.1
index 28867fafde2c..7e9bbed9406f 100644
--- a/metadata/md5-cache/dev-util/rbtools-3.1.1
+++ b/metadata/md5-cache/dev-util/rbtools-3.1.1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.reviewboard.org/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=>=dev-python/pydiffx-1.0.1-r1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/six-1.8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tqdm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/texttable[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://downloads.reviewboard.org/releases/RBTools/3.1/RBTools-3.1.1.tar.gz
 _eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=838e6721c020401fdc079f5a8541749d
+_md5_=66796da399a5403cec71f6325a743017
diff --git a/metadata/md5-cache/dev-util/rbtools-4.0 b/metadata/md5-cache/dev-util/rbtools-4.0
new file mode 100644
index 000000000000..8a28c6d1918e
--- /dev/null
+++ b/metadata/md5-cache/dev-util/rbtools-4.0
@@ -0,0 +1,17 @@
+BDEPEND=test? ( >=dev-python/importlib_metadata-4.12[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] =dev-python/importlib_metadata-4*[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pydiffx-1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] =dev-python/pydiffx-1.1*[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/six-1.8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/texttable[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/typing-extensions-4.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tqdm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/importlib_metadata-4.12[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] =dev-python/importlib_metadata-4*[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pydiffx-1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] =dev-python/pydiffx-1.1*[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/six-1.8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/texttable[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/typing-extensions-4.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tqdm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( >=dev-python/kgb-6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-env[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] )
+DESCRIPTION=Command line tools for use with Review Board
+EAPI=8
+HOMEPAGE=https://www.reviewboard.org/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/importlib_metadata-4.12[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] =dev-python/importlib_metadata-4*[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pydiffx-1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] =dev-python/pydiffx-1.1*[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/six-1.8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/texttable[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/typing-extensions-4.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tqdm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://downloads.reviewboard.org/releases/RBTools/4.0/RBTools-4.0.tar.gz
+_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=90f2a9ca2361eee092be33272460cddc
diff --git a/metadata/md5-cache/dev-util/seer-1.10 b/metadata/md5-cache/dev-util/seer-1.12
similarity index 88%
rename from metadata/md5-cache/dev-util/seer-1.10
rename to metadata/md5-cache/dev-util/seer-1.12
index 3d1b7b4a32ac..a9deee7e56f9 100644
--- a/metadata/md5-cache/dev-util/seer-1.10
+++ b/metadata/md5-cache/dev-util/seer-1.12
@@ -10,6 +10,6 @@ KEYWORDS=~amd64
 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.10.tar.gz -> seer-1.10.tar.gz
+SRC_URI=https://github.com/epasveer/seer/archive/refs/tags/v1.12.tar.gz -> seer-1.12.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	desktop	7eb20ad915a0a318176d51bc2508ff5c	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=86adb8d3c9d398bbac22232ff95c8a65
+_md5_=0845db448e97281eb7b3c0b072cbff43
diff --git a/metadata/md5-cache/dev-util/sgb-20030623-r1 b/metadata/md5-cache/dev-util/sgb-20030623-r1
index 82dd35c49ec0..1b3f69bacdbb 100644
--- a/metadata/md5-cache/dev-util/sgb-20030623-r1
+++ b/metadata/md5-cache/dev-util/sgb-20030623-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Stanford GraphBase
 EAPI=7
 HOMEPAGE=http://ftp.cs.stanford.edu/pub/sgb/
 KEYWORDS=~amd64 ~ppc x86
-LICENSE=BSD
+LICENSE=mmix
 SLOT=0
 SRC_URI=http://ftp.cs.stanford.edu/pub/sgb/sgb-2003-06-23.tar.gz
-_md5_=c0832c3022dc83b77dd4c494427c9acc
+_md5_=0889ef83a8cdbd4443a665a10eec5391
diff --git a/metadata/md5-cache/dev-util/sgb-20090810 b/metadata/md5-cache/dev-util/sgb-20090810-r1
similarity index 82%
rename from metadata/md5-cache/dev-util/sgb-20090810
rename to metadata/md5-cache/dev-util/sgb-20090810-r1
index 0cad98e28ca8..f94622f59cc2 100644
--- a/metadata/md5-cache/dev-util/sgb-20090810
+++ b/metadata/md5-cache/dev-util/sgb-20090810-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Stanford GraphBase
 EAPI=7
 HOMEPAGE=http://ftp.cs.stanford.edu/pub/sgb/
 KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=BSD
+LICENSE=mmix
 SLOT=0
 SRC_URI=http://ftp.cs.stanford.edu/pub/sgb/sgb-2009-08-10.tar.gz
-_md5_=c7110ce76381a55ce347e56521946de6
+_md5_=9daddf535c41d68fee8fecefac0c5ee8
diff --git a/metadata/md5-cache/dev-util/tree-sitter-cli-0.20.7 b/metadata/md5-cache/dev-util/tree-sitter-cli-0.20.7
index 8d21992107b3..0e19a3072aff 100644
--- a/metadata/md5-cache/dev-util/tree-sitter-cli-0.20.7
+++ b/metadata/md5-cache/dev-util/tree-sitter-cli-0.20.7
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://github.com/tree-sitter/tree-sitter
 INHERIT=cargo
 IUSE=debug
-KEYWORDS=~amd64 arm arm64 ppc64 ~riscv sparc ~x86
+KEYWORDS=amd64 arm arm64 ppc64 ~riscv sparc x86
 LICENSE=Apache-2.0 BSD-2 CC0-1.0 ISC MIT
 RDEPEND=~dev-libs/tree-sitter-0.20.7
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/tree-sitter/tree-sitter/archive/refs/tags/v0.20.7.tar.gz -> tree-sitter-0.20.7.tar.gz https://crates.io/api/v1/crates/aho-corasick/0.7.15/download -> aho-corasick-0.7.15.crate https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/ansi_term/0.12.1/download -> ansi_term-0.12.1.crate https://crates.io/api/v1/crates/anyhow/1.0.40/download -> anyhow-1.0.40.crate https://crates.io/api/v1/crates/arrayref/0.3.6/download -> arrayref-0.3.6.crate https://crates.io/api/v1/crates/arrayvec/0.5.2/download -> arrayvec-0.5.2.crate https://crates.io/api/v1/crates/ascii/1.0.0/download -> ascii-1.0.0.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/1.0.1/download -> autocfg-1.0.1.crate https://crates.io/api/v1/crates/base64/0.13.0/download -> base64-0.13.0.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/blake2b_simd/0.5.11/download -> blake2b_simd-0.5.11.crate https://crates.io/api/v1/crates/bumpalo/3.6.1/download -> bumpalo-3.6.1.crate https://crates.io/api/v1/crates/cc/1.0.67/download -> cc-1.0.67.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.19/download -> chrono-0.4.19.crate https://crates.io/api/v1/crates/chunked_transfer/1.4.0/download -> chunked_transfer-1.4.0.crate https://crates.io/api/v1/crates/clap/2.33.3/download -> clap-2.33.3.crate https://crates.io/api/v1/crates/constant_time_eq/0.1.5/download -> constant_time_eq-0.1.5.crate https://crates.io/api/v1/crates/crossbeam-utils/0.8.3/download -> crossbeam-utils-0.8.3.crate https://crates.io/api/v1/crates/ctor/0.1.20/download -> ctor-0.1.20.crate https://crates.io/api/v1/crates/diff/0.1.12/download -> diff-0.1.12.crate https://crates.io/api/v1/crates/difference/2.0.0/download -> difference-2.0.0.crate https://crates.io/api/v1/crates/dirs/3.0.1/download -> dirs-3.0.1.crate https://crates.io/api/v1/crates/dirs-sys/0.3.5/download -> dirs-sys-0.3.5.crate https://crates.io/api/v1/crates/either/1.6.1/download -> either-1.6.1.crate https://crates.io/api/v1/crates/form_urlencoded/1.0.1/download -> form_urlencoded-1.0.1.crate https://crates.io/api/v1/crates/getrandom/0.1.16/download -> getrandom-0.1.16.crate https://crates.io/api/v1/crates/getrandom/0.2.2/download -> getrandom-0.2.2.crate https://crates.io/api/v1/crates/glob/0.3.0/download -> glob-0.3.0.crate https://crates.io/api/v1/crates/hashbrown/0.9.1/download -> hashbrown-0.9.1.crate https://crates.io/api/v1/crates/hermit-abi/0.1.18/download -> hermit-abi-0.1.18.crate https://crates.io/api/v1/crates/html-escape/0.2.6/download -> html-escape-0.2.6.crate https://crates.io/api/v1/crates/idna/0.2.2/download -> idna-0.2.2.crate https://crates.io/api/v1/crates/indexmap/1.6.1/download -> indexmap-1.6.1.crate https://crates.io/api/v1/crates/itoa/0.4.7/download -> itoa-0.4.7.crate https://crates.io/api/v1/crates/js-sys/0.3.48/download -> js-sys-0.3.48.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.86/download -> libc-0.2.86.crate https://crates.io/api/v1/crates/libloading/0.7.0/download -> libloading-0.7.0.crate https://crates.io/api/v1/crates/log/0.4.14/download -> log-0.4.14.crate https://crates.io/api/v1/crates/matches/0.1.8/download -> matches-0.1.8.crate https://crates.io/api/v1/crates/memchr/2.3.4/download -> memchr-2.3.4.crate https://crates.io/api/v1/crates/num-integer/0.1.44/download -> num-integer-0.1.44.crate https://crates.io/api/v1/crates/num-traits/0.2.14/download -> num-traits-0.2.14.crate https://crates.io/api/v1/crates/once_cell/1.7.0/download -> once_cell-1.7.0.crate https://crates.io/api/v1/crates/output_vt100/0.1.2/download -> output_vt100-0.1.2.crate https://crates.io/api/v1/crates/percent-encoding/2.1.0/download -> percent-encoding-2.1.0.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.10/download -> ppv-lite86-0.2.10.crate https://crates.io/api/v1/crates/pretty_assertions/0.7.2/download -> pretty_assertions-0.7.2.crate https://crates.io/api/v1/crates/proc-macro2/1.0.24/download -> proc-macro2-1.0.24.crate https://crates.io/api/v1/crates/quote/1.0.9/download -> quote-1.0.9.crate https://crates.io/api/v1/crates/rand/0.8.3/download -> rand-0.8.3.crate https://crates.io/api/v1/crates/rand_chacha/0.3.0/download -> rand_chacha-0.3.0.crate https://crates.io/api/v1/crates/rand_core/0.6.2/download -> rand_core-0.6.2.crate https://crates.io/api/v1/crates/rand_hc/0.3.0/download -> rand_hc-0.3.0.crate https://crates.io/api/v1/crates/redox_syscall/0.1.57/download -> redox_syscall-0.1.57.crate https://crates.io/api/v1/crates/redox_syscall/0.2.5/download -> redox_syscall-0.2.5.crate https://crates.io/api/v1/crates/redox_users/0.3.5/download -> redox_users-0.3.5.crate https://crates.io/api/v1/crates/regex/1.4.3/download -> regex-1.4.3.crate https://crates.io/api/v1/crates/regex-syntax/0.6.22/download -> regex-syntax-0.6.22.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/rust-argon2/0.8.3/download -> rust-argon2-0.8.3.crate https://crates.io/api/v1/crates/rustc-hash/1.1.0/download -> rustc-hash-1.1.0.crate https://crates.io/api/v1/crates/ryu/1.0.5/download -> ryu-1.0.5.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/semver/1.0.5/download -> semver-1.0.5.crate https://crates.io/api/v1/crates/serde/1.0.130/download -> serde-1.0.130.crate https://crates.io/api/v1/crates/serde_derive/1.0.130/download -> serde_derive-1.0.130.crate https://crates.io/api/v1/crates/serde_json/1.0.63/download -> serde_json-1.0.63.crate https://crates.io/api/v1/crates/smallbitvec/2.5.1/download -> smallbitvec-2.5.1.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/syn/1.0.67/download -> syn-1.0.67.crate https://crates.io/api/v1/crates/tempfile/3.2.0/download -> tempfile-3.2.0.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/thiserror/1.0.25/download -> thiserror-1.0.25.crate https://crates.io/api/v1/crates/thiserror-impl/1.0.25/download -> thiserror-impl-1.0.25.crate https://crates.io/api/v1/crates/thread_local/1.1.3/download -> thread_local-1.1.3.crate https://crates.io/api/v1/crates/time/0.1.43/download -> time-0.1.43.crate https://crates.io/api/v1/crates/tiny_http/0.8.0/download -> tiny_http-0.8.0.crate https://crates.io/api/v1/crates/tinyvec/1.1.1/download -> tinyvec-1.1.1.crate https://crates.io/api/v1/crates/tinyvec_macros/0.1.0/download -> tinyvec_macros-0.1.0.crate https://crates.io/api/v1/crates/toml/0.5.8/download -> toml-0.5.8.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.4/download -> unicode-bidi-0.3.4.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.17/download -> unicode-normalization-0.1.17.crate https://crates.io/api/v1/crates/unicode-width/0.1.8/download -> unicode-width-0.1.8.crate https://crates.io/api/v1/crates/unicode-xid/0.2.1/download -> unicode-xid-0.2.1.crate https://crates.io/api/v1/crates/url/2.2.1/download -> url-2.2.1.crate https://crates.io/api/v1/crates/utf8-width/0.1.4/download -> utf8-width-0.1.4.crate https://crates.io/api/v1/crates/vec_map/0.8.2/download -> vec_map-0.8.2.crate https://crates.io/api/v1/crates/walkdir/2.3.1/download -> walkdir-2.3.1.crate https://crates.io/api/v1/crates/wasi/0.9.0+wasi-snapshot-preview1/download -> wasi-0.9.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasi/0.10.2+wasi-snapshot-preview1/download -> wasi-0.10.2+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasm-bindgen/0.2.71/download -> wasm-bindgen-0.2.71.crate https://crates.io/api/v1/crates/wasm-bindgen-backend/0.2.71/download -> wasm-bindgen-backend-0.2.71.crate https://crates.io/api/v1/crates/wasm-bindgen-macro/0.2.71/download -> wasm-bindgen-macro-0.2.71.crate https://crates.io/api/v1/crates/wasm-bindgen-macro-support/0.2.71/download -> wasm-bindgen-macro-support-0.2.71.crate https://crates.io/api/v1/crates/wasm-bindgen-shared/0.2.71/download -> wasm-bindgen-shared-0.2.71.crate https://crates.io/api/v1/crates/web-sys/0.3.48/download -> web-sys-0.3.48.crate https://crates.io/api/v1/crates/webbrowser/0.5.5/download -> webbrowser-0.5.5.crate https://crates.io/api/v1/crates/which/4.1.0/download -> which-4.1.0.crate https://crates.io/api/v1/crates/widestring/0.4.3/download -> widestring-0.4.3.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
 _eclasses_=cargo	52a92ed3815080c5f2caac1905687b1c	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=febb72ae014f80a67b1e0b4b2197dffb
+_md5_=ecb6511036c41b02837e32575025f7af
diff --git a/metadata/md5-cache/games-arcade/Manifest.gz b/metadata/md5-cache/games-arcade/Manifest.gz
index 46fff4ac21b1..7dada8945844 100644
Binary files a/metadata/md5-cache/games-arcade/Manifest.gz and b/metadata/md5-cache/games-arcade/Manifest.gz differ
diff --git a/metadata/md5-cache/games-arcade/amphetamine-0.8.10-r2 b/metadata/md5-cache/games-arcade/amphetamine-0.8.10-r2
new file mode 100644
index 000000000000..776bc15e9891
--- /dev/null
+++ b/metadata/md5-cache/games-arcade/amphetamine-0.8.10-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=media-libs/libsdl[sound,video] x11-libs/libXpm
+DESCRIPTION=A cool Jump'n Run game offering some unique visual effects
+EAPI=8
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
+INHERIT=desktop
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=media-libs/libsdl[sound,video] x11-libs/libXpm
+SLOT=0
+SRC_URI=mirror://gentoo/amphetamine-0.8.10.tar.bz2 mirror://debian/pool/main/a/amphetamine-data/amphetamine-data_0.8.7.orig.tar.gz https://dev.gentoo.org/~pacho/amphetamine/amphetamine.png
+_eclasses_=desktop	7eb20ad915a0a318176d51bc2508ff5c
+_md5_=8306a00c5af41878763ba19eaadf9035
diff --git a/metadata/md5-cache/games-fps/Manifest.gz b/metadata/md5-cache/games-fps/Manifest.gz
index f642e7b805d1..be19c2eea50b 100644
Binary files a/metadata/md5-cache/games-fps/Manifest.gz and b/metadata/md5-cache/games-fps/Manifest.gz differ
diff --git a/metadata/md5-cache/games-fps/qudos-0.40.1 b/metadata/md5-cache/games-fps/qudos-0.40.1
deleted file mode 100644
index 5135f8c42ad7..000000000000
--- a/metadata/md5-cache/games-fps/qudos-0.40.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup unpack
-DEPEND=opengl? ( virtual/opengl virtual/glu ) sdl? ( media-libs/libsdl[joystick?,opengl,sound,video] virtual/opengl virtual/glu ) virtual/jpeg:0 media-libs/libogg media-libs/libpng:0 media-libs/libvorbis sys-libs/zlib x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86dga x11-libs/libXxf86vm
-DESCRIPTION=Enhanced Quake 2 engine
-EAPI=7
-HOMEPAGE=https://github.com/ZwS/qudos
-INHERIT=desktop flag-o-matic toolchain-funcs
-IUSE=cdinstall debug dedicated demo dga ipv6 joystick mods opengl qmax oss sdl textures
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=opengl? ( virtual/opengl virtual/glu ) sdl? ( media-libs/libsdl[joystick?,opengl,sound,video] virtual/opengl virtual/glu ) virtual/jpeg:0 media-libs/libogg media-libs/libpng:0 media-libs/libvorbis sys-libs/zlib x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86dga x11-libs/libXxf86vm cdinstall? ( games-fps/quake2-data ) demo? ( games-fps/quake2-demodata[symlink] ) textures? ( games-fps/quake2-textures )
-SLOT=0
-SRC_URI=mirror://gentoo/QuDos-0.40.1-src.tar.bz2 https://github.com/ZwS/qudos/raw/master/quake2/baseq2/qudos.pk3 -> QuDos-0.40.1.pk3
-_eclasses_=desktop	7eb20ad915a0a318176d51bc2508ff5c	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=4abae2098eba9f5eddcd500757e5eba1
diff --git a/metadata/md5-cache/games-fps/qudos-0.40.1-r1 b/metadata/md5-cache/games-fps/qudos-0.40.1-r1
new file mode 100644
index 000000000000..ef625dc2e7f6
--- /dev/null
+++ b/metadata/md5-cache/games-fps/qudos-0.40.1-r1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare setup
+DEPEND=media-libs/libogg media-libs/libjpeg-turbo media-libs/libpng media-libs/libvorbis sys-libs/zlib x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86dga x11-libs/libXxf86vm opengl? ( virtual/opengl virtual/glu ) sdl? ( media-libs/libsdl[joystick?,opengl,sound,video] virtual/opengl virtual/glu )
+DESCRIPTION=Enhanced Quake 2 engine
+EAPI=8
+HOMEPAGE=https://github.com/ZwS/qudos
+INHERIT=desktop flag-o-matic toolchain-funcs
+IUSE=cdinstall debug dedicated demo dga ipv6 joystick mods opengl qmax oss sdl textures
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=media-libs/libogg media-libs/libjpeg-turbo media-libs/libpng media-libs/libvorbis sys-libs/zlib x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86dga x11-libs/libXxf86vm opengl? ( virtual/opengl virtual/glu ) sdl? ( media-libs/libsdl[joystick?,opengl,sound,video] virtual/opengl virtual/glu ) cdinstall? ( games-fps/quake2-data ) demo? ( games-fps/quake2-demodata[symlink] ) textures? ( games-fps/quake2-textures )
+SLOT=0
+SRC_URI=mirror://gentoo/QuDos-0.40.1-src.tar.bz2 https://github.com/ZwS/qudos/raw/master/quake2/baseq2/qudos.pk3 -> QuDos-0.40.1.pk3
+_eclasses_=desktop	7eb20ad915a0a318176d51bc2508ff5c	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=22814ac93ea28db2da9f3bd00c916942
diff --git a/metadata/md5-cache/games-util/Manifest.gz b/metadata/md5-cache/games-util/Manifest.gz
index 4d747959aba2..3b1291f1cd6f 100644
Binary files a/metadata/md5-cache/games-util/Manifest.gz and b/metadata/md5-cache/games-util/Manifest.gz differ
diff --git a/metadata/md5-cache/games-util/antimicrox-3.3.1 b/metadata/md5-cache/games-util/antimicrox-3.3.1
new file mode 100644
index 000000000000..1a0da61e419a
--- /dev/null
+++ b/metadata/md5-cache/games-util/antimicrox-3.3.1
@@ -0,0 +1,17 @@
+BDEPEND=dev-qt/linguist-tools:5 kde-frameworks/extra-cmake-modules doc? ( app-doc/doxygen[dot] ) 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-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 media-libs/libsdl2[X,joystick] virtual/udev x11-libs/libX11 x11-libs/libXi x11-libs/libXtst
+DESCRIPTION=Graphical program used to map keyboard buttons and mouse controls to a gamepad
+EAPI=8
+HOMEPAGE=https://github.com/AntiMicroX/antimicrox/
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=udev xdg cmake
+IUSE=doc
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 media-libs/libsdl2[X,joystick] virtual/udev x11-libs/libX11 x11-libs/libXi x11-libs/libXtst
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/AntiMicroX/antimicrox/archive/3.3.1.tar.gz -> antimicrox-3.3.1.tar.gz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	udev	eec0bbab06977f1cfc5597269c1fa152	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=2fa8e4a9fbf84b5a7ef0b9cc6c4e6863
diff --git a/metadata/md5-cache/gnome-extra/Manifest.gz b/metadata/md5-cache/gnome-extra/Manifest.gz
index 9dadda37ee5a..ce9d52523181 100644
Binary files a/metadata/md5-cache/gnome-extra/Manifest.gz and b/metadata/md5-cache/gnome-extra/Manifest.gz differ
diff --git a/metadata/md5-cache/gnome-extra/evolution-data-server-3.46.1 b/metadata/md5-cache/gnome-extra/evolution-data-server-3.46.1
new file mode 100644
index 000000000000..1924bedc4d2e
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/evolution-data-server-3.46.1
@@ -0,0 +1,18 @@
+BDEPEND=dev-util/gdbus-codegen dev-util/glib-utils dev-util/gperf gtk-doc? ( >=dev-util/gtk-doc-1.14 app-text/docbook-xml-dtd:4.1.2 ) >=dev-util/intltool-0.35.5 >=sys-devel/gettext-0.18.3 virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=app-portage/elt-patches-20170815 app-arch/xz-utils test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=app-crypt/libsecret-0.5[crypt] >=dev-db/sqlite-3.7.17 >=dev-libs/glib-2.70:2 >=dev-libs/libical-3.0.8:=[glib,introspection?] >=dev-libs/libxml2-2 >=dev-libs/nspr-4.4 >=dev-libs/nss-3.9 >=net-libs/libsoup-3.1.1:3.0 >=dev-libs/json-glib-1.0.4 dev-libs/icu:= sys-libs/zlib:= virtual/libiconv berkdb? ( >=sys-libs/db-4:= ) gtk? ( >=x11-libs/gtk+-3.20:3 >=gui-libs/gtk-4.4:4 >=media-libs/libcanberra-0.25[gtk3] oauth? ( >=net-libs/webkit-gtk-2.34.0:4.1 >=net-libs/webkit-gtk-2.36.0:5 ) ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.8:= ) introspection? ( >=dev-libs/gobject-introspection-0.9.12:= ) kerberos? ( virtual/krb5:= ) ldap? ( >=net-nds/openldap-2:= ) weather? ( >=dev-libs/libgweather-4.2.0:4= ) vala? ( || ( dev-lang/vala:0.56 ) >=net-libs/libsoup-3.1.1:3.0[vala] dev-libs/libical[vala] )
+DESCRIPTION=Evolution groupware backend
+EAPI=8
+HOMEPAGE=https://wiki.gnome.org/Apps/Evolution https://gitlab.gnome.org/GNOME/evolution-data-server
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=cmake db-use flag-o-matic gnome2 vala virtualx
+IUSE=berkdb +gnome-online-accounts +gtk gtk-doc +introspection ldap kerberos oauth vala +weather test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=|| ( LGPL-2 LGPL-3 ) BSD Sleepycat
+RDEPEND=>=app-crypt/libsecret-0.5[crypt] >=dev-db/sqlite-3.7.17 >=dev-libs/glib-2.70:2 >=dev-libs/libical-3.0.8:=[glib,introspection?] >=dev-libs/libxml2-2 >=dev-libs/nspr-4.4 >=dev-libs/nss-3.9 >=net-libs/libsoup-3.1.1:3.0 >=dev-libs/json-glib-1.0.4 dev-libs/icu:= sys-libs/zlib:= virtual/libiconv berkdb? ( >=sys-libs/db-4:= ) gtk? ( >=x11-libs/gtk+-3.20:3 >=gui-libs/gtk-4.4:4 >=media-libs/libcanberra-0.25[gtk3] oauth? ( >=net-libs/webkit-gtk-2.34.0:4.1 >=net-libs/webkit-gtk-2.36.0:5 ) ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.8:= ) introspection? ( >=dev-libs/gobject-introspection-0.9.12:= ) kerberos? ( virtual/krb5:= ) ldap? ( >=net-nds/openldap-2:= ) weather? ( >=dev-libs/libgweather-4.2.0:4= )
+REQUIRED_USE=oauth? ( gtk ) vala? ( introspection )
+RESTRICT=test !test? ( test ) !test? ( test )
+SLOT=0/63-26-20
+SRC_URI=mirror://gnome/sources/evolution-data-server/3.46/evolution-data-server-3.46.1.tar.xz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	db-use	867a9246a45efc09934e0f8e3380c813	flag-o-matic	29a755b1291d64133634d80b0328f153	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	vala	160a8a30a6cb9aa601e5441c643a7c61	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=c2f6a28fdcd7df8bfa6189d3e0bd0e20
diff --git a/metadata/md5-cache/gnome-extra/evolution-ews-3.46.1 b/metadata/md5-cache/gnome-extra/evolution-ews-3.46.1
new file mode 100644
index 000000000000..a2387d85e96f
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/evolution-ews-3.46.1
@@ -0,0 +1,17 @@
+BDEPEND=dev-util/gdbus-codegen dev-util/glib-utils >=dev-util/intltool-0.35.5 >=sys-devel/gettext-0.18.3 virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=app-portage/elt-patches-20170815 app-arch/xz-utils
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=dev-db/sqlite:3 >=dev-libs/glib-2.68:2 >=dev-libs/libical-3.0.5:0=[introspection(-)] >=dev-libs/json-glib-1.0.4 >=dev-libs/libmspack-0.4 dev-libs/libxml2:2 >=gnome-extra/evolution-data-server-3.46.1:0= >=mail-client/evolution-3.46.1:2.0 >=net-libs/libsoup-3.0:3.0 >=x11-libs/gtk+-3.10:3 test? ( >=net-libs/uhttpmock-0.9:1.0 )
+DESCRIPTION=Evolution module for connecting to Microsoft Exchange Web Services
+EAPI=8
+HOMEPAGE=https://wiki.gnome.org/Apps/Evolution https://gitlab.gnome.org/GNOME/evolution-ews
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=cmake gnome2 optfeature
+IUSE=test
+KEYWORDS=~amd64 ~riscv ~x86
+LICENSE=LGPL-2.1
+RDEPEND=dev-db/sqlite:3 >=dev-libs/glib-2.68:2 >=dev-libs/libical-3.0.5:0=[introspection(-)] >=dev-libs/json-glib-1.0.4 >=dev-libs/libmspack-0.4 dev-libs/libxml2:2 >=gnome-extra/evolution-data-server-3.46.1:0= >=mail-client/evolution-3.46.1:2.0 >=net-libs/libsoup-3.0:3.0 >=x11-libs/gtk+-3.10:3
+RESTRICT=test !test? ( test )
+SLOT=0
+SRC_URI=mirror://gnome/sources/evolution-ews/3.46/evolution-ews-3.46.1.tar.xz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	1a2157392a869265b2afcb63a26c12ac	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=216f805c665c66d1c52f721058fa608b
diff --git a/metadata/md5-cache/gnome-extra/gnome-software-43.1 b/metadata/md5-cache/gnome-extra/gnome-software-43.1
new file mode 100644
index 000000000000..1ce389140c12
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/gnome-software-43.1
@@ -0,0 +1,17 @@
+BDEPEND=dev-libs/libxml2:2 dev-util/gdbus-codegen >=sys-devel/gettext-0.19.8 virtual/pkgconfig gtk-doc? ( dev-util/gtk-doc app-text/docbook-xml-dtd:4.3 ) 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/appstream-0.14.0:0= >=x11-libs/gdk-pixbuf-2.32.0:2 >=dev-libs/libxmlb-0.1.7:= >=gui-libs/gtk-4.6:4 >=dev-libs/glib-2.70.0:2 >=dev-libs/json-glib-1.6.0 >=net-libs/libsoup-3.0:3.0 >=gui-libs/libadwaita-1.0.1:1 sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 ) gnome? ( >=gnome-base/gsettings-desktop-schemas-3.18.0 ) sys-auth/polkit firmware? ( >=sys-apps/fwupd-1.5.6 ) flatpak? ( >=sys-apps/flatpak-1.9.1 dev-util/ostree ) udev? ( dev-libs/libgudev ) >=gnome-base/gsettings-desktop-schemas-3.11.5 test? ( dev-libs/libglib-testing )
+DESCRIPTION=Gnome install & update software
+EAPI=8
+HOMEPAGE=https://wiki.gnome.org/Apps/Software https://gitlab.gnome.org/GNOME/gnome-software
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=gnome.org gnome2-utils meson virtualx xdg
+IUSE=flatpak +firmware gnome gtk-doc sysprof udev test test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/appstream-0.14.0:0= >=x11-libs/gdk-pixbuf-2.32.0:2 >=dev-libs/libxmlb-0.1.7:= >=gui-libs/gtk-4.6:4 >=dev-libs/glib-2.70.0:2 >=dev-libs/json-glib-1.6.0 >=net-libs/libsoup-3.0:3.0 >=gui-libs/libadwaita-1.0.1:1 sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 ) gnome? ( >=gnome-base/gsettings-desktop-schemas-3.18.0 ) sys-auth/polkit firmware? ( >=sys-apps/fwupd-1.5.6 ) flatpak? ( >=sys-apps/flatpak-1.9.1 dev-util/ostree ) udev? ( dev-libs/libgudev ) >=gnome-base/gsettings-desktop-schemas-3.11.5
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-software/43/gnome-software-43.1.tar.xz
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=55184892485e7d2976b943f5e9316d82
diff --git a/metadata/md5-cache/gnome-extra/gucharmap-15.0.1 b/metadata/md5-cache/gnome-extra/gucharmap-15.0.1
new file mode 100644
index 000000000000..cde76e74d953
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/gucharmap-15.0.1
@@ -0,0 +1,17 @@
+BDEPEND=|| ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) app-text/docbook-xml-dtd:4.1.2 dev-util/itstool >=sys-devel/gettext-0.19.8 virtual/pkgconfig gtk-doc? ( >=dev-util/gtk-doc-1 ) introspection? ( >=dev-libs/gobject-introspection-1.54:= ) vala? ( || ( dev-lang/vala:0.56 ) ) >=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=media-libs/freetype:2 >=dev-libs/glib-2.32:2 >=x11-libs/gtk+-3.22:3[introspection?] >=dev-libs/libpcre2-10.21:= =app-i18n/unicode-data-15.0* >=x11-libs/pango-1.42.4-r2[introspection?]
+DESCRIPTION=Unicode character map viewer and library
+EAPI=8
+HOMEPAGE=https://wiki.gnome.org/Apps/Gucharmap https://gitlab.gnome.org/GNOME/gucharmap/
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=gnome2-utils meson python-any-r1 vala xdg
+IUSE=+introspection gtk-doc vala
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=GPL-3+
+RDEPEND=media-libs/freetype:2 >=dev-libs/glib-2.32:2 >=x11-libs/gtk+-3.22:3[introspection?] >=dev-libs/libpcre2-10.21:= =app-i18n/unicode-data-15.0* >=x11-libs/pango-1.42.4-r2[introspection?]
+REQUIRED_USE=vala? ( introspection )
+SLOT=2.90
+SRC_URI=https://gitlab.gnome.org/GNOME/gucharmap/-/archive/15.0.1/gucharmap-15.0.1.tar.gz
+_eclasses_=gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	vala	160a8a30a6cb9aa601e5441c643a7c61	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=286cd43d319c53923ca65b789c1cc8b1
diff --git a/metadata/md5-cache/gui-libs/Manifest.gz b/metadata/md5-cache/gui-libs/Manifest.gz
index 2d84ff19cf55..ef3182fed271 100644
Binary files a/metadata/md5-cache/gui-libs/Manifest.gz and b/metadata/md5-cache/gui-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/gui-libs/gtk-4.8.2 b/metadata/md5-cache/gui-libs/gtk-4.8.2
new file mode 100644
index 000000000000..2a1cd6e51e86
--- /dev/null
+++ b/metadata/md5-cache/gui-libs/gtk-4.8.2
@@ -0,0 +1,19 @@
+BDEPEND=dev-libs/gobject-introspection-common introspection? ( || ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) || ( ( >=dev-lang/python-3.11.0_beta4:3.11 dev-python/pygobject:3[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 dev-python/pygobject:3[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-python/pygobject:3[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-python/pygobject:3[python_targets_python3_8(-)] ) ) ) 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 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/fribidi-0.19.7 >=dev-libs/glib-2.66.0:2 >=media-libs/graphene-1.9.1[introspection?] >=media-libs/libepoxy-1.4[egl,X(+)?] >=x11-libs/cairo-1.14[aqua?,glib,svg(+),X?] >=x11-libs/gdk-pixbuf-2.30:2[introspection?] >=x11-libs/pango-1.50.0[introspection?] media-libs/libpng:0= media-libs/tiff:0 media-libs/libjpeg-turbo:0= >=media-libs/harfbuzz-2.6.0:= x11-misc/shared-mime-info 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.39:= ) 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 >=app-accessibility/at-spi2-atk-2.5.3 ) 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 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/fribidi-0.19.7 >=dev-libs/glib-2.66.0:2 >=media-libs/graphene-1.9.1[introspection?] >=media-libs/libepoxy-1.4[egl,X(+)?] >=x11-libs/cairo-1.14[aqua?,glib,svg(+),X?] >=x11-libs/gdk-pixbuf-2.30:2[introspection?] >=x11-libs/pango-1.50.0[introspection?] media-libs/libpng:0= media-libs/tiff:0 media-libs/libjpeg-turbo:0= >=media-libs/harfbuzz-2.6.0:= x11-misc/shared-mime-info 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.39:= ) 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 >=app-accessibility/at-spi2-atk-2.5.3 ) 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.8/gtk-4.8.2.tar.xz
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	1a2157392a869265b2afcb63a26c12ac	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=30ec818d2d2a9b91df85ed7aa5e1fe65
diff --git a/metadata/md5-cache/gui-libs/vte-0.70.1 b/metadata/md5-cache/gui-libs/vte-0.70.1
new file mode 100644
index 000000000000..ad1459e399f1
--- /dev/null
+++ b/metadata/md5-cache/gui-libs/vte-0.70.1
@@ -0,0 +1,17 @@
+BDEPEND=|| ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) dev-libs/libxml2:2 dev-util/glib-utils gtk-doc? ( dev-util/gi-docgen ) >=sys-devel/gettext-0.19.8 virtual/pkgconfig 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
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=>=gui-libs/gtk-4.0.1:4[introspection?] >=dev-libs/fribidi-1.0.0 >=dev-libs/glib-2.52:2 crypt? ( >=net-libs/gnutls-3.2.7:0= ) icu? ( dev-libs/icu:= ) >=x11-libs/pango-1.22.0 >=dev-libs/libpcre2-10.21:= systemd? ( >=sys-apps/systemd-220:= ) sys-libs/zlib introspection? ( >=dev-libs/gobject-introspection-1.56:= ) x11-libs/pango[introspection?]
+DESCRIPTION=Library providing a virtual terminal emulator widget
+EAPI=8
+HOMEPAGE=https://wiki.gnome.org/Apps/Terminal/VTE https://gitlab.gnome.org/GNOME/vte
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=gnome.org meson python-any-r1 vala xdg
+IUSE=+crypt debug gtk-doc +icu +introspection systemd +vala vanilla
+KEYWORDS=~amd64
+LICENSE=LGPL-3+ GPL-3+
+RDEPEND=>=gui-libs/gtk-4.0.1:4[introspection?] >=dev-libs/fribidi-1.0.0 >=dev-libs/glib-2.52:2 crypt? ( >=net-libs/gnutls-3.2.7:0= ) icu? ( dev-libs/icu:= ) >=x11-libs/pango-1.22.0 >=dev-libs/libpcre2-10.21:= systemd? ( >=sys-apps/systemd-220:= ) sys-libs/zlib introspection? ( >=dev-libs/gobject-introspection-1.56:= ) x11-libs/pango[introspection?] ~gui-libs/vte-common-0.70.1[systemd?]
+REQUIRED_USE=gtk-doc? ( introspection ) vala? ( introspection )
+SLOT=2.91-gtk4
+SRC_URI=https://gitlab.gnome.org/GNOME/vte/-/archive/0.70.1/vte-0.70.1.tar.bz2 !vanilla? ( https://dev.gentoo.org/~mattst88/distfiles/vte-0.70.0-command-notify.patch.xz )
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	vala	160a8a30a6cb9aa601e5441c643a7c61	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=fa268dc541471602622a8ae09ffbae8b
diff --git a/metadata/md5-cache/gui-libs/vte-common-0.70.1 b/metadata/md5-cache/gui-libs/vte-common-0.70.1
new file mode 100644
index 000000000000..37511c235e59
--- /dev/null
+++ b/metadata/md5-cache/gui-libs/vte-common-0.70.1
@@ -0,0 +1,15 @@
+BDEPEND=|| ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) dev-libs/libxml2:2 dev-util/glib-utils >=sys-devel/gettext-0.19.8 virtual/pkgconfig 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 prepare setup test
+DEPEND=|| ( >=gui-libs/gtk-4.0.1:4 >=x11-libs/gtk+-3.24.22:3 ) >=dev-libs/fribidi-1.0.0 >=dev-libs/glib-2.52:2 >=x11-libs/pango-1.22.0 >=dev-libs/libpcre2-10.21 systemd? ( >=sys-apps/systemd-220:= ) sys-libs/zlib x11-libs/pango
+DESCRIPTION=Library providing a virtual terminal emulator widget
+EAPI=8
+HOMEPAGE=https://wiki.gnome.org/Apps/Terminal/VTE https://gitlab.gnome.org/GNOME/vte
+INHERIT=gnome.org meson python-any-r1
+IUSE=systemd
+KEYWORDS=~amd64
+LICENSE=LGPL-3+ GPL-3+
+RDEPEND=!<x11-libs/vte-0.70.0
+SLOT=2.91
+SRC_URI=https://gitlab.gnome.org/GNOME/vte/-/archive/0.70.1/vte-0.70.1.tar.bz2
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=987767f12707f7531df2c3b4afcf523c
diff --git a/metadata/md5-cache/kde-misc/Manifest.gz b/metadata/md5-cache/kde-misc/Manifest.gz
index f00cff4aded2..f5c3872dccb3 100644
Binary files a/metadata/md5-cache/kde-misc/Manifest.gz and b/metadata/md5-cache/kde-misc/Manifest.gz differ
diff --git a/metadata/md5-cache/kde-misc/kio-fuse-5.0.1 b/metadata/md5-cache/kde-misc/kio-fuse-5.0.1
deleted file mode 100644
index a53a20a5c1f7..000000000000
--- a/metadata/md5-cache/kde-misc/kio-fuse-5.0.1
+++ /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.74.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kio-5.74.0:5 sys-fs/fuse:3 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=FUSE interface for KIO
-EAPI=7
-HOMEPAGE=https://feverfew.home.blog/2019/12/24/kiofuse-beta-4-9-0-released/
-INHERIT=ecm kde.org linux-info
-IUSE=debug test
-KEYWORDS=amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86
-LICENSE=GPL-3+
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kio-5.74.0:5 sys-fs/fuse:3 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) test
-SLOT=5
-SRC_URI=mirror://kde/stable/kio-fuse/5.0.1/kio-fuse-5.0.1.tar.xz
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	ecm	3dae552f761290722bcc848a12bfb538	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	kde.org	087d21100477ce987a8de6c1d613a176	linux-info	bbfa385d6907d7948d49a5e107bd654d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	virtualx	644887c82aefdf12001489391fca4f02	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=38300773809f6cf0bdb0bda846fe73cf
diff --git a/metadata/md5-cache/kde-misc/kio-fuse-5.0.1_p20220906 b/metadata/md5-cache/kde-misc/kio-fuse-5.0.1_p20220906
index 7817b284b8ee..a2635b6703d1 100644
--- a/metadata/md5-cache/kde-misc/kio-fuse-5.0.1_p20220906
+++ b/metadata/md5-cache/kde-misc/kio-fuse-5.0.1_p20220906
@@ -7,11 +7,11 @@ HOMEPAGE=https://feverfew.home.blog/2019/12/24/kiofuse-beta-4-9-0-released/
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=ecm kde.org linux-info tmpfiles
 IUSE=debug test
-KEYWORDS=amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv x86
+KEYWORDS=amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86
 LICENSE=GPL-3+
 RDEPEND=>=dev-qt/qtdbus-5.15.5:5 >=dev-qt/qtgui-5.15.5:5 >=dev-qt/qtwidgets-5.15.5:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kio-5.82.0:5 sys-fs/fuse:3 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5 virtual/tmpfiles
 RESTRICT=test !test? ( test )
 SLOT=5
 SRC_URI=https://invent.kde.org/kde/kio-fuse/-/archive/fbd09a339f9880fe8d018001d4d2561593f90530/kio-fuse-fbd09a339f9880fe8d018001d4d2561593f90530.tar.gz -> kio-fuse-5.0.1_p20220906-fbd09a33.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	ecm	3dae552f761290722bcc848a12bfb538	flag-o-matic	29a755b1291d64133634d80b0328f153	kde.org	087d21100477ce987a8de6c1d613a176	linux-info	bbfa385d6907d7948d49a5e107bd654d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=00a60900e0ae7c55dca1b7759ddb9077
+_md5_=82bbcacd5956245880f4018bb9e62da7
diff --git a/metadata/md5-cache/mail-client/Manifest.gz b/metadata/md5-cache/mail-client/Manifest.gz
index d8ddc6a3e40f..f0354790ca1f 100644
Binary files a/metadata/md5-cache/mail-client/Manifest.gz and b/metadata/md5-cache/mail-client/Manifest.gz differ
diff --git a/metadata/md5-cache/mail-client/evolution-3.46.1 b/metadata/md5-cache/mail-client/evolution-3.46.1
new file mode 100644
index 000000000000..3c4277f80749
--- /dev/null
+++ b/metadata/md5-cache/mail-client/evolution-3.46.1
@@ -0,0 +1,16 @@
+BDEPEND=app-text/docbook-xml-dtd:4.1.2 dev-util/gdbus-codegen dev-util/glib-utils dev-util/itstool gtk-doc? ( dev-util/gtk-doc app-text/docbook-xml-dtd:4.3 ) >=dev-util/intltool-0.40.0 >=sys-devel/gettext-0.18.3 virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=app-portage/elt-patches-20170815 app-arch/xz-utils
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=app-text/enchant-2.2.0:2 >=dev-db/sqlite-3.7.17 >=dev-libs/glib-2.66:2[dbus] >=dev-libs/libxml2-2.7.3:2 >=gnome-base/gnome-desktop-2.91.3:3= >=gnome-base/gsettings-desktop-schemas-2.91.92 >=gnome-extra/evolution-data-server-3.46.1:=[gtk,weather?] >=media-libs/libcanberra-0.25[gtk3] >=net-libs/libsoup-3.0:3.0 >=net-libs/webkit-gtk-2.38.0:4.1=[spell?] >=x11-libs/cairo-1.9.15[glib] >=x11-libs/gdk-pixbuf-2.24:2 >=x11-libs/gtk+-3.22:3 >=x11-libs/libnotify-0.7 >=x11-misc/shared-mime-info-0.22 app-text/cmark:= >=app-text/iso-codes-0.49 || ( >=app-accessibility/at-spi2-core-2.46.0:2 dev-libs/atk ) gnome-base/dconf x11-libs/libSM x11-libs/libICE archive? ( >=app-arch/gnome-autoar-0.1.1[gtk] ) bogofilter? ( mail-filter/bogofilter ) geolocation? ( >=media-libs/libchamplain-0.12:0.12[gtk] >=media-libs/clutter-1.0.0:1.0 >=media-libs/clutter-gtk-0.90:1.0 >=sci-geosciences/geocode-glib-3.26.3:2 ) ldap? ( >=net-nds/openldap-2:= ) spamassassin? ( mail-filter/spamassassin ) spell? ( >=app-text/gspell-1.8:= ) ssl? ( >=dev-libs/nspr-4.6.1 >=dev-libs/nss-3.11 ) weather? ( >=dev-libs/libgweather-4.2.0:4= >=sci-geosciences/geocode-glib-3.26.3:2 ) ytnef? ( net-mail/ytnef )
+DESCRIPTION=Integrated mail, addressbook and calendaring functionality
+EAPI=8
+HOMEPAGE=https://wiki.gnome.org/Apps/Evolution https://gitlab.gnome.org/GNOME/evolution
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=cmake gnome2 readme.gentoo-r1
+IUSE=archive +bogofilter geolocation gtk-doc highlight ldap spamassassin spell ssl +weather ytnef
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=|| ( LGPL-2 LGPL-3 ) CC-BY-SA-3.0 FDL-1.3+ OPENLDAP
+RDEPEND=>=app-text/enchant-2.2.0:2 >=dev-db/sqlite-3.7.17 >=dev-libs/glib-2.66:2[dbus] >=dev-libs/libxml2-2.7.3:2 >=gnome-base/gnome-desktop-2.91.3:3= >=gnome-base/gsettings-desktop-schemas-2.91.92 >=gnome-extra/evolution-data-server-3.46.1:=[gtk,weather?] >=media-libs/libcanberra-0.25[gtk3] >=net-libs/libsoup-3.0:3.0 >=net-libs/webkit-gtk-2.38.0:4.1=[spell?] >=x11-libs/cairo-1.9.15[glib] >=x11-libs/gdk-pixbuf-2.24:2 >=x11-libs/gtk+-3.22:3 >=x11-libs/libnotify-0.7 >=x11-misc/shared-mime-info-0.22 app-text/cmark:= >=app-text/iso-codes-0.49 || ( >=app-accessibility/at-spi2-core-2.46.0:2 dev-libs/atk ) gnome-base/dconf x11-libs/libSM x11-libs/libICE archive? ( >=app-arch/gnome-autoar-0.1.1[gtk] ) bogofilter? ( mail-filter/bogofilter ) geolocation? ( >=media-libs/libchamplain-0.12:0.12[gtk] >=media-libs/clutter-1.0.0:1.0 >=media-libs/clutter-gtk-0.90:1.0 >=sci-geosciences/geocode-glib-3.26.3:2 ) ldap? ( >=net-nds/openldap-2:= ) spamassassin? ( mail-filter/spamassassin ) spell? ( >=app-text/gspell-1.8:= ) ssl? ( >=dev-libs/nspr-4.6.1 >=dev-libs/nss-3.11 ) weather? ( >=dev-libs/libgweather-4.2.0:4= >=sci-geosciences/geocode-glib-3.26.3:2 ) ytnef? ( net-mail/ytnef ) highlight? ( app-text/highlight )
+SLOT=2.0
+SRC_URI=mirror://gnome/sources/evolution/3.46/evolution-3.46.1.tar.xz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=f48b7c9fe26327225f6e30481d275056
diff --git a/metadata/md5-cache/mail-client/thunderbird-102.3.1 b/metadata/md5-cache/mail-client/thunderbird-102.3.1
deleted file mode 100644
index 0145d361c7f3..000000000000
--- a/metadata/md5-cache/mail-client/thunderbird-102.3.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.11.0_beta4:3.11[ncurses,sqlite,ssl] >=dev-lang/python-3.10.4:3.10[ncurses,sqlite,ssl] >=dev-lang/python-3.9.12:3.9[ncurses,sqlite,ssl] >=dev-lang/python-3.8.13:3.8[ncurses,sqlite,ssl] ) app-arch/unzip app-arch/zip >=dev-util/cbindgen-0.24.3 net-libs/nodejs virtual/pkgconfig virtual/rust || ( ( sys-devel/clang:14 sys-devel/llvm:14 clang? ( =sys-devel/lld-14* pgo? ( =sys-libs/compiler-rt-sanitizers-14*[profile] ) ) ) ( sys-devel/clang:13 sys-devel/llvm:13 clang? ( =sys-devel/lld-13* pgo? ( =sys-libs/compiler-rt-sanitizers-13*[profile] ) ) ) ) amd64? ( >=dev-lang/nasm-2.14 ) x86? ( >=dev-lang/nasm-2.14 ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) ~sys-devel/autoconf-2.13 >=sys-devel/libtool-2.4 pgo? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup unpack
-DEPEND=!<x11-plugins/enigmail-2.2 selinux? ( sec-policy/selinux-thunderbird ) !system-librnp? ( dev-libs/jsoncpp ) system-librnp? ( dev-util/librnp:= ) dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/libffi:= >=dev-libs/nss-3.79 >=dev-libs/nspr-4.34 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype media-libs/mesa media-video/ffmpeg sys-libs/zlib virtual/freedesktop-icon-theme virtual/opengl x11-libs/cairo[X] x11-libs/gdk-pixbuf x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXtst x11-libs/libxcb:= x11-libs/libxkbcommon[X] x11-libs/pango x11-libs/pixman dbus? ( dev-libs/dbus-glib sys-apps/dbus ) jack? ( virtual/jack ) libproxy? ( net-libs/libproxy ) sndio? ( >=media-sound/sndio-1.8.0-r1 ) system-av1? ( >=media-libs/dav1d-1.0.0:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-gfx/graphite2-1.3.13 >=media-libs/harfbuzz-2.8.1:0= ) system-icu? ( >=dev-libs/icu-71.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] ) system-png? ( >=media-libs/libpng-1.6.35:0=[apng] ) system-webp? ( >=media-libs/libwebp-1.1.0:0= ) wayland? ( x11-libs/gtk+:3[wayland] x11-libs/libdrm x11-libs/libxkbcommon[wayland] ) wifi? ( kernel_linux? ( dev-libs/dbus-glib net-misc/networkmanager sys-apps/dbus ) ) x11-libs/libICE x11-libs/libSM pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.12-r4[sdk] ) ) !!sys-devel/llvm:0
-DESCRIPTION=Thunderbird Mail Client
-EAPI=8
-HOMEPAGE=https://www.thunderbird.net/
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=autotools check-reqs desktop flag-o-matic gnome2-utils llvm multiprocessing optfeature pax-utils python-any-r1 toolchain-funcs virtualx xdg
-IUSE=+clang cpu_flags_arm_neon dbus debug eme-free hardened hwaccel jack libproxy lto +openh264 pgo pulseaudio sndio selinux +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent +system-libvpx system-png system-python-libs +system-webp wayland wifi +system-librnp l10n_af l10n_ar l10n_ast l10n_be l10n_bg l10n_br l10n_ca l10n_cak l10n_cs l10n_cy l10n_da l10n_de l10n_dsb l10n_el l10n_en-CA l10n_en-GB l10n_es-AR l10n_es-ES l10n_es-MX l10n_et l10n_eu l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_he l10n_hr l10n_hsb l10n_hu l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_kab l10n_kk l10n_ko l10n_lt l10n_lv l10n_ms l10n_nb l10n_nl l10n_nn l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_sk l10n_sl l10n_sq l10n_sr l10n_sv l10n_th l10n_tr l10n_uk l10n_uz l10n_vi l10n_zh-CN l10n_zh-TW pgo
-KEYWORDS=amd64 ~arm64 ~ppc64 x86
-LICENSE=MPL-2.0 GPL-2 LGPL-2.1
-RDEPEND=!<x11-plugins/enigmail-2.2 selinux? ( sec-policy/selinux-thunderbird ) !system-librnp? ( dev-libs/jsoncpp ) system-librnp? ( dev-util/librnp:= ) dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/libffi:= >=dev-libs/nss-3.79 >=dev-libs/nspr-4.34 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype media-libs/mesa media-video/ffmpeg sys-libs/zlib virtual/freedesktop-icon-theme virtual/opengl x11-libs/cairo[X] x11-libs/gdk-pixbuf x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXtst x11-libs/libxcb:= x11-libs/libxkbcommon[X] x11-libs/pango x11-libs/pixman dbus? ( dev-libs/dbus-glib sys-apps/dbus ) jack? ( virtual/jack ) libproxy? ( net-libs/libproxy ) sndio? ( >=media-sound/sndio-1.8.0-r1 ) system-av1? ( >=media-libs/dav1d-1.0.0:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-gfx/graphite2-1.3.13 >=media-libs/harfbuzz-2.8.1:0= ) system-icu? ( >=dev-libs/icu-71.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] ) system-png? ( >=media-libs/libpng-1.6.35:0=[apng] ) system-webp? ( >=media-libs/libwebp-1.1.0:0= ) wayland? ( x11-libs/gtk+:3[wayland] x11-libs/libdrm x11-libs/libxkbcommon[wayland] ) wifi? ( kernel_linux? ( dev-libs/dbus-glib net-misc/networkmanager sys-apps/dbus ) ) jack? ( virtual/jack ) openh264? ( media-libs/openh264:*[plugin] ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.12-r4 ) )
-REQUIRED_USE=debug? ( !system-av1 ) pgo? ( lto ) wifi? ( dbus )
-SLOT=0
-SRC_URI=https://archive.mozilla.org/pub/thunderbird/releases/102.3.1/source/thunderbird-102.3.1.source.tar.xz -> thunderbird-102.3.1.source.tar.xz https://dev.gentoo.org/~juippis/mozilla/patchsets/firefox-102esr-patches-04j.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-102esr-patches-04j.tar.xz https://dev.gentoo.org/~slashbeast/mozilla/patchsets/firefox-102esr-patches-04j.tar.xz l10n_af? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/xpi/af.xpi -> thunderbird-102.3.1-af.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/xpi/ar.xpi -> thunderbird-102.3.1-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/xpi/ast.xpi -> thunderbird-102.3.1-ast.xpi ) l10n_be? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/xpi/be.xpi -> thunderbird-102.3.1-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/xpi/bg.xpi -> thunderbird-102.3.1-bg.xpi ) l10n_br? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/xpi/br.xpi -> thunderbird-102.3.1-br.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/xpi/ca.xpi -> thunderbird-102.3.1-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/xpi/cak.xpi -> thunderbird-102.3.1-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/xpi/cs.xpi -> thunderbird-102.3.1-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/xpi/cy.xpi -> thunderbird-102.3.1-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/xpi/da.xpi -> thunderbird-102.3.1-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/xpi/de.xpi -> thunderbird-102.3.1-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/xpi/dsb.xpi -> thunderbird-102.3.1-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/xpi/el.xpi -> thunderbird-102.3.1-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/xpi/en-CA.xpi -> thunderbird-102.3.1-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/xpi/en-GB.xpi -> thunderbird-102.3.1-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/xpi/es-AR.xpi -> thunderbird-102.3.1-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/xpi/es-ES.xpi -> thunderbird-102.3.1-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/xpi/es-MX.xpi -> thunderbird-102.3.1-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/xpi/et.xpi -> thunderbird-102.3.1-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/xpi/eu.xpi -> thunderbird-102.3.1-eu.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/xpi/fi.xpi -> thunderbird-102.3.1-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/xpi/fr.xpi -> thunderbird-102.3.1-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/xpi/fy-NL.xpi -> thunderbird-102.3.1-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/xpi/ga-IE.xpi -> thunderbird-102.3.1-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/xpi/gd.xpi -> thunderbird-102.3.1-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/xpi/gl.xpi -> thunderbird-102.3.1-gl.xpi ) l10n_he? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/xpi/he.xpi -> thunderbird-102.3.1-he.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/xpi/hr.xpi -> thunderbird-102.3.1-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/xpi/hsb.xpi -> thunderbird-102.3.1-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/xpi/hu.xpi -> thunderbird-102.3.1-hu.xpi ) l10n_id? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/xpi/id.xpi -> thunderbird-102.3.1-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/xpi/is.xpi -> thunderbird-102.3.1-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/xpi/it.xpi -> thunderbird-102.3.1-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/xpi/ja.xpi -> thunderbird-102.3.1-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/xpi/ka.xpi -> thunderbird-102.3.1-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/xpi/kab.xpi -> thunderbird-102.3.1-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/xpi/kk.xpi -> thunderbird-102.3.1-kk.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/xpi/ko.xpi -> thunderbird-102.3.1-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/xpi/lt.xpi -> thunderbird-102.3.1-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/xpi/lv.xpi -> thunderbird-102.3.1-lv.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/xpi/ms.xpi -> thunderbird-102.3.1-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/xpi/nb-NO.xpi -> thunderbird-102.3.1-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/xpi/nl.xpi -> thunderbird-102.3.1-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/xpi/nn-NO.xpi -> thunderbird-102.3.1-nn-NO.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/xpi/pa-IN.xpi -> thunderbird-102.3.1-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/xpi/pl.xpi -> thunderbird-102.3.1-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/xpi/pt-BR.xpi -> thunderbird-102.3.1-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/xpi/pt-PT.xpi -> thunderbird-102.3.1-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/xpi/rm.xpi -> thunderbird-102.3.1-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/xpi/ro.xpi -> thunderbird-102.3.1-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/xpi/ru.xpi -> thunderbird-102.3.1-ru.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/xpi/sk.xpi -> thunderbird-102.3.1-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/xpi/sl.xpi -> thunderbird-102.3.1-sl.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/xpi/sq.xpi -> thunderbird-102.3.1-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/xpi/sr.xpi -> thunderbird-102.3.1-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/xpi/sv-SE.xpi -> thunderbird-102.3.1-sv-SE.xpi ) l10n_th? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/xpi/th.xpi -> thunderbird-102.3.1-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/xpi/tr.xpi -> thunderbird-102.3.1-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/xpi/uk.xpi -> thunderbird-102.3.1-uk.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/xpi/uz.xpi -> thunderbird-102.3.1-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/xpi/vi.xpi -> thunderbird-102.3.1-vi.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/xpi/zh-CN.xpi -> thunderbird-102.3.1-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/xpi/zh-TW.xpi -> thunderbird-102.3.1-zh-TW.xpi )
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	desktop	7eb20ad915a0a318176d51bc2508ff5c	flag-o-matic	29a755b1291d64133634d80b0328f153	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	llvm	29d5332b8530fb760c2ca71ad6706858	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=626a4b0816f1b78bd4354cf4704d177d
diff --git a/metadata/md5-cache/mail-client/thunderbird-102.3.2 b/metadata/md5-cache/mail-client/thunderbird-102.3.2
deleted file mode 100644
index 7a201b56891a..000000000000
--- a/metadata/md5-cache/mail-client/thunderbird-102.3.2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.11.0_beta4:3.11[ncurses,sqlite,ssl] >=dev-lang/python-3.10.4:3.10[ncurses,sqlite,ssl] >=dev-lang/python-3.9.12:3.9[ncurses,sqlite,ssl] >=dev-lang/python-3.8.13:3.8[ncurses,sqlite,ssl] ) app-arch/unzip app-arch/zip >=dev-util/cbindgen-0.24.3 net-libs/nodejs virtual/pkgconfig virtual/rust || ( ( sys-devel/clang:14 sys-devel/llvm:14 clang? ( =sys-devel/lld-14* pgo? ( =sys-libs/compiler-rt-sanitizers-14*[profile] ) ) ) ( sys-devel/clang:13 sys-devel/llvm:13 clang? ( =sys-devel/lld-13* pgo? ( =sys-libs/compiler-rt-sanitizers-13*[profile] ) ) ) ) amd64? ( >=dev-lang/nasm-2.14 ) x86? ( >=dev-lang/nasm-2.14 ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) ~sys-devel/autoconf-2.13 >=sys-devel/libtool-2.4 pgo? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup unpack
-DEPEND=!<x11-plugins/enigmail-2.2 selinux? ( sec-policy/selinux-thunderbird ) !system-librnp? ( dev-libs/jsoncpp ) system-librnp? ( dev-util/librnp:= ) dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/libffi:= >=dev-libs/nss-3.79 >=dev-libs/nspr-4.34 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype media-libs/mesa media-video/ffmpeg sys-libs/zlib virtual/freedesktop-icon-theme virtual/opengl x11-libs/cairo[X] x11-libs/gdk-pixbuf x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXtst x11-libs/libxcb:= x11-libs/libxkbcommon[X] x11-libs/pango x11-libs/pixman dbus? ( dev-libs/dbus-glib sys-apps/dbus ) jack? ( virtual/jack ) libproxy? ( net-libs/libproxy ) sndio? ( >=media-sound/sndio-1.8.0-r1 ) system-av1? ( >=media-libs/dav1d-1.0.0:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-gfx/graphite2-1.3.13 >=media-libs/harfbuzz-2.8.1:0= ) system-icu? ( >=dev-libs/icu-71.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] ) system-png? ( >=media-libs/libpng-1.6.35:0=[apng] ) system-webp? ( >=media-libs/libwebp-1.1.0:0= ) wayland? ( x11-libs/gtk+:3[wayland] x11-libs/libdrm x11-libs/libxkbcommon[wayland] ) wifi? ( kernel_linux? ( dev-libs/dbus-glib net-misc/networkmanager sys-apps/dbus ) ) x11-libs/libICE x11-libs/libSM pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.12-r4[sdk] ) ) !!sys-devel/llvm:0
-DESCRIPTION=Thunderbird Mail Client
-EAPI=8
-HOMEPAGE=https://www.thunderbird.net/
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=autotools check-reqs desktop flag-o-matic gnome2-utils llvm multiprocessing optfeature pax-utils python-any-r1 toolchain-funcs virtualx xdg
-IUSE=+clang cpu_flags_arm_neon dbus debug eme-free hardened hwaccel jack libproxy lto +openh264 pgo pulseaudio sndio selinux +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent +system-libvpx system-png system-python-libs +system-webp wayland wifi +system-librnp l10n_af l10n_ar l10n_ast l10n_be l10n_bg l10n_br l10n_ca l10n_cak l10n_cs l10n_cy l10n_da l10n_de l10n_dsb l10n_el l10n_en-CA l10n_en-GB l10n_es-AR l10n_es-ES l10n_es-MX l10n_et l10n_eu l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_he l10n_hr l10n_hsb l10n_hu l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_kab l10n_kk l10n_ko l10n_lt l10n_lv l10n_ms l10n_nb l10n_nl l10n_nn l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_sk l10n_sl l10n_sq l10n_sr l10n_sv l10n_th l10n_tr l10n_uk l10n_uz l10n_vi l10n_zh-CN l10n_zh-TW pgo
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=MPL-2.0 GPL-2 LGPL-2.1
-RDEPEND=!<x11-plugins/enigmail-2.2 selinux? ( sec-policy/selinux-thunderbird ) !system-librnp? ( dev-libs/jsoncpp ) system-librnp? ( dev-util/librnp:= ) dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/libffi:= >=dev-libs/nss-3.79 >=dev-libs/nspr-4.34 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype media-libs/mesa media-video/ffmpeg sys-libs/zlib virtual/freedesktop-icon-theme virtual/opengl x11-libs/cairo[X] x11-libs/gdk-pixbuf x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXtst x11-libs/libxcb:= x11-libs/libxkbcommon[X] x11-libs/pango x11-libs/pixman dbus? ( dev-libs/dbus-glib sys-apps/dbus ) jack? ( virtual/jack ) libproxy? ( net-libs/libproxy ) sndio? ( >=media-sound/sndio-1.8.0-r1 ) system-av1? ( >=media-libs/dav1d-1.0.0:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-gfx/graphite2-1.3.13 >=media-libs/harfbuzz-2.8.1:0= ) system-icu? ( >=dev-libs/icu-71.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] ) system-png? ( >=media-libs/libpng-1.6.35:0=[apng] ) system-webp? ( >=media-libs/libwebp-1.1.0:0= ) wayland? ( x11-libs/gtk+:3[wayland] x11-libs/libdrm x11-libs/libxkbcommon[wayland] ) wifi? ( kernel_linux? ( dev-libs/dbus-glib net-misc/networkmanager sys-apps/dbus ) ) jack? ( virtual/jack ) openh264? ( media-libs/openh264:*[plugin] ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.12-r4 ) )
-REQUIRED_USE=debug? ( !system-av1 ) pgo? ( lto ) wayland? ( dbus ) wifi? ( dbus )
-SLOT=0
-SRC_URI=https://archive.mozilla.org/pub/thunderbird/releases/102.3.2/source/thunderbird-102.3.2.source.tar.xz -> thunderbird-102.3.2.source.tar.xz https://dev.gentoo.org/~juippis/mozilla/patchsets/firefox-102esr-patches-04j.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-102esr-patches-04j.tar.xz https://dev.gentoo.org/~slashbeast/mozilla/patchsets/firefox-102esr-patches-04j.tar.xz l10n_af? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/xpi/af.xpi -> thunderbird-102.3.2-af.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/xpi/ar.xpi -> thunderbird-102.3.2-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/xpi/ast.xpi -> thunderbird-102.3.2-ast.xpi ) l10n_be? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/xpi/be.xpi -> thunderbird-102.3.2-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/xpi/bg.xpi -> thunderbird-102.3.2-bg.xpi ) l10n_br? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/xpi/br.xpi -> thunderbird-102.3.2-br.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/xpi/ca.xpi -> thunderbird-102.3.2-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/xpi/cak.xpi -> thunderbird-102.3.2-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/xpi/cs.xpi -> thunderbird-102.3.2-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/xpi/cy.xpi -> thunderbird-102.3.2-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/xpi/da.xpi -> thunderbird-102.3.2-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/xpi/de.xpi -> thunderbird-102.3.2-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/xpi/dsb.xpi -> thunderbird-102.3.2-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/xpi/el.xpi -> thunderbird-102.3.2-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/xpi/en-CA.xpi -> thunderbird-102.3.2-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/xpi/en-GB.xpi -> thunderbird-102.3.2-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/xpi/es-AR.xpi -> thunderbird-102.3.2-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/xpi/es-ES.xpi -> thunderbird-102.3.2-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/xpi/es-MX.xpi -> thunderbird-102.3.2-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/xpi/et.xpi -> thunderbird-102.3.2-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/xpi/eu.xpi -> thunderbird-102.3.2-eu.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/xpi/fi.xpi -> thunderbird-102.3.2-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/xpi/fr.xpi -> thunderbird-102.3.2-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/xpi/fy-NL.xpi -> thunderbird-102.3.2-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/xpi/ga-IE.xpi -> thunderbird-102.3.2-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/xpi/gd.xpi -> thunderbird-102.3.2-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/xpi/gl.xpi -> thunderbird-102.3.2-gl.xpi ) l10n_he? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/xpi/he.xpi -> thunderbird-102.3.2-he.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/xpi/hr.xpi -> thunderbird-102.3.2-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/xpi/hsb.xpi -> thunderbird-102.3.2-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/xpi/hu.xpi -> thunderbird-102.3.2-hu.xpi ) l10n_id? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/xpi/id.xpi -> thunderbird-102.3.2-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/xpi/is.xpi -> thunderbird-102.3.2-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/xpi/it.xpi -> thunderbird-102.3.2-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/xpi/ja.xpi -> thunderbird-102.3.2-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/xpi/ka.xpi -> thunderbird-102.3.2-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/xpi/kab.xpi -> thunderbird-102.3.2-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/xpi/kk.xpi -> thunderbird-102.3.2-kk.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/xpi/ko.xpi -> thunderbird-102.3.2-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/xpi/lt.xpi -> thunderbird-102.3.2-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/xpi/lv.xpi -> thunderbird-102.3.2-lv.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/xpi/ms.xpi -> thunderbird-102.3.2-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/xpi/nb-NO.xpi -> thunderbird-102.3.2-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/xpi/nl.xpi -> thunderbird-102.3.2-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/xpi/nn-NO.xpi -> thunderbird-102.3.2-nn-NO.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/xpi/pa-IN.xpi -> thunderbird-102.3.2-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/xpi/pl.xpi -> thunderbird-102.3.2-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/xpi/pt-BR.xpi -> thunderbird-102.3.2-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/xpi/pt-PT.xpi -> thunderbird-102.3.2-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/xpi/rm.xpi -> thunderbird-102.3.2-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/xpi/ro.xpi -> thunderbird-102.3.2-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/xpi/ru.xpi -> thunderbird-102.3.2-ru.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/xpi/sk.xpi -> thunderbird-102.3.2-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/xpi/sl.xpi -> thunderbird-102.3.2-sl.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/xpi/sq.xpi -> thunderbird-102.3.2-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/xpi/sr.xpi -> thunderbird-102.3.2-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/xpi/sv-SE.xpi -> thunderbird-102.3.2-sv-SE.xpi ) l10n_th? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/xpi/th.xpi -> thunderbird-102.3.2-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/xpi/tr.xpi -> thunderbird-102.3.2-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/xpi/uk.xpi -> thunderbird-102.3.2-uk.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/xpi/uz.xpi -> thunderbird-102.3.2-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/xpi/vi.xpi -> thunderbird-102.3.2-vi.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/xpi/zh-CN.xpi -> thunderbird-102.3.2-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/xpi/zh-TW.xpi -> thunderbird-102.3.2-zh-TW.xpi )
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	desktop	7eb20ad915a0a318176d51bc2508ff5c	flag-o-matic	29a755b1291d64133634d80b0328f153	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	llvm	29d5332b8530fb760c2ca71ad6706858	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=98ef7ad145503d069c91a1c007883b31
diff --git a/metadata/md5-cache/mail-client/thunderbird-102.3.3 b/metadata/md5-cache/mail-client/thunderbird-102.3.3
deleted file mode 100644
index 9d339d2fe3a2..000000000000
--- a/metadata/md5-cache/mail-client/thunderbird-102.3.3
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.11.0_beta4:3.11[ncurses,sqlite,ssl] >=dev-lang/python-3.10.4:3.10[ncurses,sqlite,ssl] >=dev-lang/python-3.9.12:3.9[ncurses,sqlite,ssl] >=dev-lang/python-3.8.13:3.8[ncurses,sqlite,ssl] ) app-arch/unzip app-arch/zip >=dev-util/cbindgen-0.24.3 net-libs/nodejs virtual/pkgconfig virtual/rust || ( ( sys-devel/clang:14 sys-devel/llvm:14 clang? ( =sys-devel/lld-14* pgo? ( =sys-libs/compiler-rt-sanitizers-14*[profile] ) ) ) ( sys-devel/clang:13 sys-devel/llvm:13 clang? ( =sys-devel/lld-13* pgo? ( =sys-libs/compiler-rt-sanitizers-13*[profile] ) ) ) ) amd64? ( >=dev-lang/nasm-2.14 ) x86? ( >=dev-lang/nasm-2.14 ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) ~sys-devel/autoconf-2.13 >=sys-devel/libtool-2.4 pgo? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup unpack
-DEPEND=!<x11-plugins/enigmail-2.2 selinux? ( sec-policy/selinux-thunderbird ) !system-librnp? ( dev-libs/jsoncpp ) system-librnp? ( dev-util/librnp ) dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/libffi:= >=dev-libs/nss-3.79 >=dev-libs/nspr-4.34 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype media-libs/mesa media-video/ffmpeg sys-libs/zlib virtual/freedesktop-icon-theme virtual/opengl x11-libs/cairo[X] x11-libs/gdk-pixbuf x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXtst x11-libs/libxcb:= x11-libs/libxkbcommon[X] x11-libs/pango x11-libs/pixman dbus? ( dev-libs/dbus-glib sys-apps/dbus ) jack? ( virtual/jack ) libproxy? ( net-libs/libproxy ) sndio? ( >=media-sound/sndio-1.8.0-r1 ) system-av1? ( >=media-libs/dav1d-1.0.0:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-gfx/graphite2-1.3.13 >=media-libs/harfbuzz-2.8.1:0= ) system-icu? ( >=dev-libs/icu-71.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] ) system-png? ( >=media-libs/libpng-1.6.35:0=[apng] ) system-webp? ( >=media-libs/libwebp-1.1.0:0= ) wayland? ( x11-libs/gtk+:3[wayland] x11-libs/libdrm x11-libs/libxkbcommon[wayland] ) wifi? ( kernel_linux? ( dev-libs/dbus-glib net-misc/networkmanager sys-apps/dbus ) ) x11-libs/libICE x11-libs/libSM pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.12-r4[sdk] ) ) !!sys-devel/llvm:0
-DESCRIPTION=Thunderbird Mail Client
-EAPI=8
-HOMEPAGE=https://www.thunderbird.net/
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=autotools check-reqs desktop flag-o-matic gnome2-utils llvm multiprocessing optfeature pax-utils python-any-r1 toolchain-funcs virtualx xdg
-IUSE=+clang cpu_flags_arm_neon dbus debug eme-free hardened hwaccel jack libproxy lto +openh264 pgo pulseaudio sndio selinux +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent +system-libvpx system-png system-python-libs +system-webp wayland wifi +system-librnp l10n_af l10n_ar l10n_ast l10n_be l10n_bg l10n_br l10n_ca l10n_cak l10n_cs l10n_cy l10n_da l10n_de l10n_dsb l10n_el l10n_en-CA l10n_en-GB l10n_es-AR l10n_es-ES l10n_es-MX l10n_et l10n_eu l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_he l10n_hr l10n_hsb l10n_hu l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_kab l10n_kk l10n_ko l10n_lt l10n_lv l10n_ms l10n_nb l10n_nl l10n_nn l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_sk l10n_sl l10n_sq l10n_sr l10n_sv l10n_th l10n_tr l10n_uk l10n_uz l10n_vi l10n_zh-CN l10n_zh-TW pgo
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=MPL-2.0 GPL-2 LGPL-2.1
-RDEPEND=!<x11-plugins/enigmail-2.2 selinux? ( sec-policy/selinux-thunderbird ) !system-librnp? ( dev-libs/jsoncpp ) system-librnp? ( dev-util/librnp ) dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/libffi:= >=dev-libs/nss-3.79 >=dev-libs/nspr-4.34 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype media-libs/mesa media-video/ffmpeg sys-libs/zlib virtual/freedesktop-icon-theme virtual/opengl x11-libs/cairo[X] x11-libs/gdk-pixbuf x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXtst x11-libs/libxcb:= x11-libs/libxkbcommon[X] x11-libs/pango x11-libs/pixman dbus? ( dev-libs/dbus-glib sys-apps/dbus ) jack? ( virtual/jack ) libproxy? ( net-libs/libproxy ) sndio? ( >=media-sound/sndio-1.8.0-r1 ) system-av1? ( >=media-libs/dav1d-1.0.0:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-gfx/graphite2-1.3.13 >=media-libs/harfbuzz-2.8.1:0= ) system-icu? ( >=dev-libs/icu-71.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] ) system-png? ( >=media-libs/libpng-1.6.35:0=[apng] ) system-webp? ( >=media-libs/libwebp-1.1.0:0= ) wayland? ( x11-libs/gtk+:3[wayland] x11-libs/libdrm x11-libs/libxkbcommon[wayland] ) wifi? ( kernel_linux? ( dev-libs/dbus-glib net-misc/networkmanager sys-apps/dbus ) ) jack? ( virtual/jack ) openh264? ( media-libs/openh264:*[plugin] ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.12-r4 ) )
-REQUIRED_USE=debug? ( !system-av1 ) pgo? ( lto ) wayland? ( dbus ) wifi? ( dbus )
-SLOT=0
-SRC_URI=https://archive.mozilla.org/pub/thunderbird/releases/102.3.3/source/thunderbird-102.3.3.source.tar.xz -> thunderbird-102.3.3.source.tar.xz https://dev.gentoo.org/~juippis/mozilla/patchsets/firefox-102esr-patches-04j.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-102esr-patches-04j.tar.xz https://dev.gentoo.org/~slashbeast/mozilla/patchsets/firefox-102esr-patches-04j.tar.xz l10n_af? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-x86_64/xpi/af.xpi -> thunderbird-102.3.3-af.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-x86_64/xpi/ar.xpi -> thunderbird-102.3.3-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-x86_64/xpi/ast.xpi -> thunderbird-102.3.3-ast.xpi ) l10n_be? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-x86_64/xpi/be.xpi -> thunderbird-102.3.3-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-x86_64/xpi/bg.xpi -> thunderbird-102.3.3-bg.xpi ) l10n_br? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-x86_64/xpi/br.xpi -> thunderbird-102.3.3-br.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-x86_64/xpi/ca.xpi -> thunderbird-102.3.3-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-x86_64/xpi/cak.xpi -> thunderbird-102.3.3-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-x86_64/xpi/cs.xpi -> thunderbird-102.3.3-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-x86_64/xpi/cy.xpi -> thunderbird-102.3.3-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-x86_64/xpi/da.xpi -> thunderbird-102.3.3-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-x86_64/xpi/de.xpi -> thunderbird-102.3.3-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-x86_64/xpi/dsb.xpi -> thunderbird-102.3.3-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-x86_64/xpi/el.xpi -> thunderbird-102.3.3-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-x86_64/xpi/en-CA.xpi -> thunderbird-102.3.3-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-x86_64/xpi/en-GB.xpi -> thunderbird-102.3.3-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-x86_64/xpi/es-AR.xpi -> thunderbird-102.3.3-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-x86_64/xpi/es-ES.xpi -> thunderbird-102.3.3-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-x86_64/xpi/es-MX.xpi -> thunderbird-102.3.3-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-x86_64/xpi/et.xpi -> thunderbird-102.3.3-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-x86_64/xpi/eu.xpi -> thunderbird-102.3.3-eu.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-x86_64/xpi/fi.xpi -> thunderbird-102.3.3-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-x86_64/xpi/fr.xpi -> thunderbird-102.3.3-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-x86_64/xpi/fy-NL.xpi -> thunderbird-102.3.3-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-x86_64/xpi/ga-IE.xpi -> thunderbird-102.3.3-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-x86_64/xpi/gd.xpi -> thunderbird-102.3.3-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-x86_64/xpi/gl.xpi -> thunderbird-102.3.3-gl.xpi ) l10n_he? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-x86_64/xpi/he.xpi -> thunderbird-102.3.3-he.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-x86_64/xpi/hr.xpi -> thunderbird-102.3.3-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-x86_64/xpi/hsb.xpi -> thunderbird-102.3.3-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-x86_64/xpi/hu.xpi -> thunderbird-102.3.3-hu.xpi ) l10n_id? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-x86_64/xpi/id.xpi -> thunderbird-102.3.3-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-x86_64/xpi/is.xpi -> thunderbird-102.3.3-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-x86_64/xpi/it.xpi -> thunderbird-102.3.3-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-x86_64/xpi/ja.xpi -> thunderbird-102.3.3-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-x86_64/xpi/ka.xpi -> thunderbird-102.3.3-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-x86_64/xpi/kab.xpi -> thunderbird-102.3.3-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-x86_64/xpi/kk.xpi -> thunderbird-102.3.3-kk.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-x86_64/xpi/ko.xpi -> thunderbird-102.3.3-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-x86_64/xpi/lt.xpi -> thunderbird-102.3.3-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-x86_64/xpi/lv.xpi -> thunderbird-102.3.3-lv.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-x86_64/xpi/ms.xpi -> thunderbird-102.3.3-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-x86_64/xpi/nb-NO.xpi -> thunderbird-102.3.3-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-x86_64/xpi/nl.xpi -> thunderbird-102.3.3-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-x86_64/xpi/nn-NO.xpi -> thunderbird-102.3.3-nn-NO.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-x86_64/xpi/pa-IN.xpi -> thunderbird-102.3.3-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-x86_64/xpi/pl.xpi -> thunderbird-102.3.3-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-x86_64/xpi/pt-BR.xpi -> thunderbird-102.3.3-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-x86_64/xpi/pt-PT.xpi -> thunderbird-102.3.3-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-x86_64/xpi/rm.xpi -> thunderbird-102.3.3-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-x86_64/xpi/ro.xpi -> thunderbird-102.3.3-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-x86_64/xpi/ru.xpi -> thunderbird-102.3.3-ru.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-x86_64/xpi/sk.xpi -> thunderbird-102.3.3-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-x86_64/xpi/sl.xpi -> thunderbird-102.3.3-sl.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-x86_64/xpi/sq.xpi -> thunderbird-102.3.3-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-x86_64/xpi/sr.xpi -> thunderbird-102.3.3-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-x86_64/xpi/sv-SE.xpi -> thunderbird-102.3.3-sv-SE.xpi ) l10n_th? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-x86_64/xpi/th.xpi -> thunderbird-102.3.3-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-x86_64/xpi/tr.xpi -> thunderbird-102.3.3-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-x86_64/xpi/uk.xpi -> thunderbird-102.3.3-uk.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-x86_64/xpi/uz.xpi -> thunderbird-102.3.3-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-x86_64/xpi/vi.xpi -> thunderbird-102.3.3-vi.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-x86_64/xpi/zh-CN.xpi -> thunderbird-102.3.3-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-x86_64/xpi/zh-TW.xpi -> thunderbird-102.3.3-zh-TW.xpi )
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	desktop	7eb20ad915a0a318176d51bc2508ff5c	flag-o-matic	29a755b1291d64133634d80b0328f153	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	llvm	29d5332b8530fb760c2ca71ad6706858	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=a9ee594de933e6d6c342dc4ae059637d
diff --git a/metadata/md5-cache/mail-client/thunderbird-102.4.0 b/metadata/md5-cache/mail-client/thunderbird-102.4.0
index 7a0172934949..38ebff26334b 100644
--- a/metadata/md5-cache/mail-client/thunderbird-102.4.0
+++ b/metadata/md5-cache/mail-client/thunderbird-102.4.0
@@ -7,11 +7,11 @@ HOMEPAGE=https://www.thunderbird.net/
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=autotools check-reqs desktop flag-o-matic gnome2-utils llvm multiprocessing optfeature pax-utils python-any-r1 toolchain-funcs virtualx xdg
 IUSE=+clang cpu_flags_arm_neon dbus debug eme-free hardened hwaccel jack libproxy lto +openh264 pgo pulseaudio sndio selinux +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent +system-libvpx system-png system-python-libs +system-webp wayland wifi +system-librnp l10n_af l10n_ar l10n_ast l10n_be l10n_bg l10n_br l10n_ca l10n_cak l10n_cs l10n_cy l10n_da l10n_de l10n_dsb l10n_el l10n_en-CA l10n_en-GB l10n_es-AR l10n_es-ES l10n_es-MX l10n_et l10n_eu l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_he l10n_hr l10n_hsb l10n_hu l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_kab l10n_kk l10n_ko l10n_lt l10n_lv l10n_ms l10n_nb l10n_nl l10n_nn l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_sk l10n_sl l10n_sq l10n_sr l10n_sv l10n_th l10n_tr l10n_uk l10n_uz l10n_vi l10n_zh-CN l10n_zh-TW pgo
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=MPL-2.0 GPL-2 LGPL-2.1
 RDEPEND=!<x11-plugins/enigmail-2.2 selinux? ( sec-policy/selinux-thunderbird ) !system-librnp? ( dev-libs/jsoncpp ) system-librnp? ( dev-util/librnp ) dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/libffi:= >=dev-libs/nss-3.79 >=dev-libs/nspr-4.34 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype media-libs/mesa media-video/ffmpeg sys-libs/zlib virtual/freedesktop-icon-theme virtual/opengl x11-libs/cairo[X] x11-libs/gdk-pixbuf x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXtst x11-libs/libxcb:= x11-libs/libxkbcommon[X] x11-libs/pango x11-libs/pixman dbus? ( dev-libs/dbus-glib sys-apps/dbus ) jack? ( virtual/jack ) libproxy? ( net-libs/libproxy ) sndio? ( >=media-sound/sndio-1.8.0-r1 ) system-av1? ( >=media-libs/dav1d-1.0.0:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-gfx/graphite2-1.3.13 >=media-libs/harfbuzz-2.8.1:0= ) system-icu? ( >=dev-libs/icu-71.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] ) system-png? ( >=media-libs/libpng-1.6.35:0=[apng] ) system-webp? ( >=media-libs/libwebp-1.1.0:0= ) wayland? ( x11-libs/gtk+:3[wayland] x11-libs/libdrm x11-libs/libxkbcommon[wayland] ) wifi? ( kernel_linux? ( dev-libs/dbus-glib net-misc/networkmanager sys-apps/dbus ) ) jack? ( virtual/jack ) openh264? ( media-libs/openh264:*[plugin] ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.12-r4 ) )
 REQUIRED_USE=debug? ( !system-av1 ) pgo? ( lto ) wayland? ( dbus ) wifi? ( dbus )
 SLOT=0
 SRC_URI=https://archive.mozilla.org/pub/thunderbird/releases/102.4.0/source/thunderbird-102.4.0.source.tar.xz -> thunderbird-102.4.0.source.tar.xz https://dev.gentoo.org/~juippis/mozilla/patchsets/firefox-102esr-patches-04j.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-102esr-patches-04j.tar.xz https://dev.gentoo.org/~slashbeast/mozilla/patchsets/firefox-102esr-patches-04j.tar.xz l10n_af? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/xpi/af.xpi -> thunderbird-102.4.0-af.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/xpi/ar.xpi -> thunderbird-102.4.0-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/xpi/ast.xpi -> thunderbird-102.4.0-ast.xpi ) l10n_be? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/xpi/be.xpi -> thunderbird-102.4.0-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/xpi/bg.xpi -> thunderbird-102.4.0-bg.xpi ) l10n_br? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/xpi/br.xpi -> thunderbird-102.4.0-br.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/xpi/ca.xpi -> thunderbird-102.4.0-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/xpi/cak.xpi -> thunderbird-102.4.0-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/xpi/cs.xpi -> thunderbird-102.4.0-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/xpi/cy.xpi -> thunderbird-102.4.0-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/xpi/da.xpi -> thunderbird-102.4.0-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/xpi/de.xpi -> thunderbird-102.4.0-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/xpi/dsb.xpi -> thunderbird-102.4.0-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/xpi/el.xpi -> thunderbird-102.4.0-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/xpi/en-CA.xpi -> thunderbird-102.4.0-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/xpi/en-GB.xpi -> thunderbird-102.4.0-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/xpi/es-AR.xpi -> thunderbird-102.4.0-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/xpi/es-ES.xpi -> thunderbird-102.4.0-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/xpi/es-MX.xpi -> thunderbird-102.4.0-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/xpi/et.xpi -> thunderbird-102.4.0-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/xpi/eu.xpi -> thunderbird-102.4.0-eu.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/xpi/fi.xpi -> thunderbird-102.4.0-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/xpi/fr.xpi -> thunderbird-102.4.0-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/xpi/fy-NL.xpi -> thunderbird-102.4.0-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/xpi/ga-IE.xpi -> thunderbird-102.4.0-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/xpi/gd.xpi -> thunderbird-102.4.0-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/xpi/gl.xpi -> thunderbird-102.4.0-gl.xpi ) l10n_he? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/xpi/he.xpi -> thunderbird-102.4.0-he.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/xpi/hr.xpi -> thunderbird-102.4.0-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/xpi/hsb.xpi -> thunderbird-102.4.0-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/xpi/hu.xpi -> thunderbird-102.4.0-hu.xpi ) l10n_id? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/xpi/id.xpi -> thunderbird-102.4.0-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/xpi/is.xpi -> thunderbird-102.4.0-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/xpi/it.xpi -> thunderbird-102.4.0-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/xpi/ja.xpi -> thunderbird-102.4.0-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/xpi/ka.xpi -> thunderbird-102.4.0-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/xpi/kab.xpi -> thunderbird-102.4.0-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/xpi/kk.xpi -> thunderbird-102.4.0-kk.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/xpi/ko.xpi -> thunderbird-102.4.0-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/xpi/lt.xpi -> thunderbird-102.4.0-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/xpi/lv.xpi -> thunderbird-102.4.0-lv.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/xpi/ms.xpi -> thunderbird-102.4.0-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/xpi/nb-NO.xpi -> thunderbird-102.4.0-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/xpi/nl.xpi -> thunderbird-102.4.0-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/xpi/nn-NO.xpi -> thunderbird-102.4.0-nn-NO.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/xpi/pa-IN.xpi -> thunderbird-102.4.0-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/xpi/pl.xpi -> thunderbird-102.4.0-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/xpi/pt-BR.xpi -> thunderbird-102.4.0-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/xpi/pt-PT.xpi -> thunderbird-102.4.0-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/xpi/rm.xpi -> thunderbird-102.4.0-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/xpi/ro.xpi -> thunderbird-102.4.0-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/xpi/ru.xpi -> thunderbird-102.4.0-ru.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/xpi/sk.xpi -> thunderbird-102.4.0-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/xpi/sl.xpi -> thunderbird-102.4.0-sl.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/xpi/sq.xpi -> thunderbird-102.4.0-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/xpi/sr.xpi -> thunderbird-102.4.0-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/xpi/sv-SE.xpi -> thunderbird-102.4.0-sv-SE.xpi ) l10n_th? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/xpi/th.xpi -> thunderbird-102.4.0-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/xpi/tr.xpi -> thunderbird-102.4.0-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/xpi/uk.xpi -> thunderbird-102.4.0-uk.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/xpi/uz.xpi -> thunderbird-102.4.0-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/xpi/vi.xpi -> thunderbird-102.4.0-vi.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/xpi/zh-CN.xpi -> thunderbird-102.4.0-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/xpi/zh-TW.xpi -> thunderbird-102.4.0-zh-TW.xpi )
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	desktop	7eb20ad915a0a318176d51bc2508ff5c	flag-o-matic	29a755b1291d64133634d80b0328f153	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	llvm	29d5332b8530fb760c2ca71ad6706858	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=b07e86096075d4ab506697c0a647615c
+_md5_=bd6b1fddf4ee6c31b887ac25a3481c19
diff --git a/metadata/md5-cache/mail-client/thunderbird-91.13.1 b/metadata/md5-cache/mail-client/thunderbird-91.13.1
deleted file mode 100644
index d9bad39452f6..000000000000
--- a/metadata/md5-cache/mail-client/thunderbird-91.13.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.10.4:3.10[ncurses,sqlite,ssl] >=dev-lang/python-3.9.12:3.9[ncurses,sqlite,ssl] >=dev-lang/python-3.8.13:3.8[ncurses,sqlite,ssl] ) app-arch/unzip app-arch/zip >=dev-util/cbindgen-0.24.0 >=net-libs/nodejs-10.23.1 virtual/pkgconfig >=virtual/rust-1.51.0 || ( ( sys-devel/clang:14 sys-devel/llvm:14 clang? ( =sys-devel/lld-14* pgo? ( =sys-libs/compiler-rt-sanitizers-14*[profile] ) ) ) ( sys-devel/clang:13 sys-devel/llvm:13 clang? ( =sys-devel/lld-13* pgo? ( =sys-libs/compiler-rt-sanitizers-13*[profile] ) ) ) ) amd64? ( >=dev-lang/nasm-2.13 ) x86? ( >=dev-lang/nasm-2.13 ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) ~sys-devel/autoconf-2.13 >=sys-devel/libtool-2.4 pgo? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup unpack
-DEPEND=>=dev-libs/nss-3.68 >=dev-libs/nspr-4.32 dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-3.4.0:3[X] x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) virtual/freedesktop-icon-theme >=x11-libs/pixman-0.19.2 >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=dev-libs/libffi-3.0.10:= media-video/ffmpeg x11-libs/libX11 x11-libs/libxcb:= x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt dbus? ( sys-apps/dbus dev-libs/dbus-glib ) system-av1? ( >=media-libs/dav1d-0.8.1:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-libs/harfbuzz-2.8.1:0= >=media-gfx/graphite2-1.3.13 ) system-icu? ( >=dev-libs/icu-69.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] ) system-png? ( >=media-libs/libpng-1.6.35:0=[apng] ) system-webp? ( >=media-libs/libwebp-1.1.0:0= ) wifi? ( kernel_linux? ( sys-apps/dbus dev-libs/dbus-glib net-misc/networkmanager ) ) jack? ( virtual/jack ) selinux? ( sec-policy/selinux-mozilla ) sndio? ( media-sound/sndio ) x11-libs/libICE x11-libs/libSM pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.12-r4[sdk] ) ) wayland? ( >=x11-libs/gtk+-3.11:3[wayland] ) amd64? ( virtual/opengl ) x86? ( virtual/opengl ) !!sys-devel/llvm:0
-DESCRIPTION=Thunderbird Mail Client
-EAPI=8
-HOMEPAGE=https://www.thunderbird.net/
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=autotools check-reqs desktop flag-o-matic gnome2-utils llvm multiprocessing optfeature pax-utils python-any-r1 toolchain-funcs virtualx xdg
-IUSE=+clang cpu_flags_arm_neon dbus debug eme-free hardened hwaccel jack lto +openh264 pgo pulseaudio sndio selinux +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent +system-libvpx system-png +system-webp wayland wifi l10n_af l10n_ar l10n_ast l10n_be l10n_bg l10n_br l10n_ca l10n_cak l10n_cs l10n_cy l10n_da l10n_de l10n_dsb l10n_el l10n_en-CA l10n_en-GB l10n_es-AR l10n_es-ES l10n_et l10n_eu l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_he l10n_hr l10n_hsb l10n_hu l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_kab l10n_kk l10n_ko l10n_lt l10n_lv l10n_ms l10n_nb l10n_nl l10n_nn l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_sk l10n_sl l10n_sq l10n_sr l10n_sv l10n_th l10n_tr l10n_uk l10n_uz l10n_vi l10n_zh-CN l10n_zh-TW pgo
-KEYWORDS=amd64 ~arm64 ~ppc64 x86
-LICENSE=MPL-2.0 GPL-2 LGPL-2.1
-RDEPEND=>=dev-libs/nss-3.68 >=dev-libs/nspr-4.32 dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-3.4.0:3[X] x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) virtual/freedesktop-icon-theme >=x11-libs/pixman-0.19.2 >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=dev-libs/libffi-3.0.10:= media-video/ffmpeg x11-libs/libX11 x11-libs/libxcb:= x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt dbus? ( sys-apps/dbus dev-libs/dbus-glib ) system-av1? ( >=media-libs/dav1d-0.8.1:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-libs/harfbuzz-2.8.1:0= >=media-gfx/graphite2-1.3.13 ) system-icu? ( >=dev-libs/icu-69.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] ) system-png? ( >=media-libs/libpng-1.6.35:0=[apng] ) system-webp? ( >=media-libs/libwebp-1.1.0:0= ) wifi? ( kernel_linux? ( sys-apps/dbus dev-libs/dbus-glib net-misc/networkmanager ) ) jack? ( virtual/jack ) selinux? ( sec-policy/selinux-mozilla ) sndio? ( media-sound/sndio ) jack? ( virtual/jack ) openh264? ( media-libs/openh264:*[plugin] ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.12-r4 ) ) selinux? ( sec-policy/selinux-mozilla ) !<x11-plugins/enigmail-2.2
-REQUIRED_USE=debug? ( !system-av1 ) pgo? ( lto ) wifi? ( dbus )
-SLOT=0
-SRC_URI=https://archive.mozilla.org/pub/thunderbird/releases/91.13.1/source/thunderbird-91.13.1.source.tar.xz -> thunderbird-91.13.1.source.tar.xz https://dev.gentoo.org/~juippis/mozilla/patchsets/firefox-91esr-patches-10j.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-91esr-patches-10j.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-91esr-patches-10j.tar.xz l10n_af? ( https://archive.mozilla.org/pub/thunderbird/releases/91.13.1/linux-x86_64/xpi/af.xpi -> thunderbird-91.13.1-af.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/thunderbird/releases/91.13.1/linux-x86_64/xpi/ar.xpi -> thunderbird-91.13.1-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/thunderbird/releases/91.13.1/linux-x86_64/xpi/ast.xpi -> thunderbird-91.13.1-ast.xpi ) l10n_be? ( https://archive.mozilla.org/pub/thunderbird/releases/91.13.1/linux-x86_64/xpi/be.xpi -> thunderbird-91.13.1-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/thunderbird/releases/91.13.1/linux-x86_64/xpi/bg.xpi -> thunderbird-91.13.1-bg.xpi ) l10n_br? ( https://archive.mozilla.org/pub/thunderbird/releases/91.13.1/linux-x86_64/xpi/br.xpi -> thunderbird-91.13.1-br.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/thunderbird/releases/91.13.1/linux-x86_64/xpi/ca.xpi -> thunderbird-91.13.1-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/thunderbird/releases/91.13.1/linux-x86_64/xpi/cak.xpi -> thunderbird-91.13.1-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/thunderbird/releases/91.13.1/linux-x86_64/xpi/cs.xpi -> thunderbird-91.13.1-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/thunderbird/releases/91.13.1/linux-x86_64/xpi/cy.xpi -> thunderbird-91.13.1-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/thunderbird/releases/91.13.1/linux-x86_64/xpi/da.xpi -> thunderbird-91.13.1-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/thunderbird/releases/91.13.1/linux-x86_64/xpi/de.xpi -> thunderbird-91.13.1-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/thunderbird/releases/91.13.1/linux-x86_64/xpi/dsb.xpi -> thunderbird-91.13.1-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/thunderbird/releases/91.13.1/linux-x86_64/xpi/el.xpi -> thunderbird-91.13.1-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/thunderbird/releases/91.13.1/linux-x86_64/xpi/en-CA.xpi -> thunderbird-91.13.1-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/thunderbird/releases/91.13.1/linux-x86_64/xpi/en-GB.xpi -> thunderbird-91.13.1-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/thunderbird/releases/91.13.1/linux-x86_64/xpi/es-AR.xpi -> thunderbird-91.13.1-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/thunderbird/releases/91.13.1/linux-x86_64/xpi/es-ES.xpi -> thunderbird-91.13.1-es-ES.xpi ) l10n_et? ( https://archive.mozilla.org/pub/thunderbird/releases/91.13.1/linux-x86_64/xpi/et.xpi -> thunderbird-91.13.1-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/thunderbird/releases/91.13.1/linux-x86_64/xpi/eu.xpi -> thunderbird-91.13.1-eu.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/thunderbird/releases/91.13.1/linux-x86_64/xpi/fi.xpi -> thunderbird-91.13.1-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/thunderbird/releases/91.13.1/linux-x86_64/xpi/fr.xpi -> thunderbird-91.13.1-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/thunderbird/releases/91.13.1/linux-x86_64/xpi/fy-NL.xpi -> thunderbird-91.13.1-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/thunderbird/releases/91.13.1/linux-x86_64/xpi/ga-IE.xpi -> thunderbird-91.13.1-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/thunderbird/releases/91.13.1/linux-x86_64/xpi/gd.xpi -> thunderbird-91.13.1-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/thunderbird/releases/91.13.1/linux-x86_64/xpi/gl.xpi -> thunderbird-91.13.1-gl.xpi ) l10n_he? ( https://archive.mozilla.org/pub/thunderbird/releases/91.13.1/linux-x86_64/xpi/he.xpi -> thunderbird-91.13.1-he.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/thunderbird/releases/91.13.1/linux-x86_64/xpi/hr.xpi -> thunderbird-91.13.1-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/thunderbird/releases/91.13.1/linux-x86_64/xpi/hsb.xpi -> thunderbird-91.13.1-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/thunderbird/releases/91.13.1/linux-x86_64/xpi/hu.xpi -> thunderbird-91.13.1-hu.xpi ) l10n_id? ( https://archive.mozilla.org/pub/thunderbird/releases/91.13.1/linux-x86_64/xpi/id.xpi -> thunderbird-91.13.1-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/thunderbird/releases/91.13.1/linux-x86_64/xpi/is.xpi -> thunderbird-91.13.1-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/thunderbird/releases/91.13.1/linux-x86_64/xpi/it.xpi -> thunderbird-91.13.1-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/thunderbird/releases/91.13.1/linux-x86_64/xpi/ja.xpi -> thunderbird-91.13.1-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/thunderbird/releases/91.13.1/linux-x86_64/xpi/ka.xpi -> thunderbird-91.13.1-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/thunderbird/releases/91.13.1/linux-x86_64/xpi/kab.xpi -> thunderbird-91.13.1-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/thunderbird/releases/91.13.1/linux-x86_64/xpi/kk.xpi -> thunderbird-91.13.1-kk.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/thunderbird/releases/91.13.1/linux-x86_64/xpi/ko.xpi -> thunderbird-91.13.1-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/thunderbird/releases/91.13.1/linux-x86_64/xpi/lt.xpi -> thunderbird-91.13.1-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/thunderbird/releases/91.13.1/linux-x86_64/xpi/lv.xpi -> thunderbird-91.13.1-lv.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/thunderbird/releases/91.13.1/linux-x86_64/xpi/ms.xpi -> thunderbird-91.13.1-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/thunderbird/releases/91.13.1/linux-x86_64/xpi/nb-NO.xpi -> thunderbird-91.13.1-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/thunderbird/releases/91.13.1/linux-x86_64/xpi/nl.xpi -> thunderbird-91.13.1-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/thunderbird/releases/91.13.1/linux-x86_64/xpi/nn-NO.xpi -> thunderbird-91.13.1-nn-NO.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/thunderbird/releases/91.13.1/linux-x86_64/xpi/pa-IN.xpi -> thunderbird-91.13.1-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/thunderbird/releases/91.13.1/linux-x86_64/xpi/pl.xpi -> thunderbird-91.13.1-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/thunderbird/releases/91.13.1/linux-x86_64/xpi/pt-BR.xpi -> thunderbird-91.13.1-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/thunderbird/releases/91.13.1/linux-x86_64/xpi/pt-PT.xpi -> thunderbird-91.13.1-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/thunderbird/releases/91.13.1/linux-x86_64/xpi/rm.xpi -> thunderbird-91.13.1-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/thunderbird/releases/91.13.1/linux-x86_64/xpi/ro.xpi -> thunderbird-91.13.1-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/thunderbird/releases/91.13.1/linux-x86_64/xpi/ru.xpi -> thunderbird-91.13.1-ru.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/thunderbird/releases/91.13.1/linux-x86_64/xpi/sk.xpi -> thunderbird-91.13.1-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/thunderbird/releases/91.13.1/linux-x86_64/xpi/sl.xpi -> thunderbird-91.13.1-sl.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/thunderbird/releases/91.13.1/linux-x86_64/xpi/sq.xpi -> thunderbird-91.13.1-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/thunderbird/releases/91.13.1/linux-x86_64/xpi/sr.xpi -> thunderbird-91.13.1-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/thunderbird/releases/91.13.1/linux-x86_64/xpi/sv-SE.xpi -> thunderbird-91.13.1-sv-SE.xpi ) l10n_th? ( https://archive.mozilla.org/pub/thunderbird/releases/91.13.1/linux-x86_64/xpi/th.xpi -> thunderbird-91.13.1-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/thunderbird/releases/91.13.1/linux-x86_64/xpi/tr.xpi -> thunderbird-91.13.1-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/thunderbird/releases/91.13.1/linux-x86_64/xpi/uk.xpi -> thunderbird-91.13.1-uk.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/thunderbird/releases/91.13.1/linux-x86_64/xpi/uz.xpi -> thunderbird-91.13.1-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/thunderbird/releases/91.13.1/linux-x86_64/xpi/vi.xpi -> thunderbird-91.13.1-vi.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/thunderbird/releases/91.13.1/linux-x86_64/xpi/zh-CN.xpi -> thunderbird-91.13.1-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/thunderbird/releases/91.13.1/linux-x86_64/xpi/zh-TW.xpi -> thunderbird-91.13.1-zh-TW.xpi )
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	desktop	7eb20ad915a0a318176d51bc2508ff5c	flag-o-matic	29a755b1291d64133634d80b0328f153	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	llvm	29d5332b8530fb760c2ca71ad6706858	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=3597cecb010444995828b6cdf0d46024
diff --git a/metadata/md5-cache/mail-filter/Manifest.gz b/metadata/md5-cache/mail-filter/Manifest.gz
index b1cd5d32aa87..7cd8830d6382 100644
Binary files a/metadata/md5-cache/mail-filter/Manifest.gz and b/metadata/md5-cache/mail-filter/Manifest.gz differ
diff --git a/metadata/md5-cache/mail-filter/mimedefang-2.84-r1 b/metadata/md5-cache/mail-filter/mimedefang-2.84-r1
deleted file mode 100644
index 934106126f7a..000000000000
--- a/metadata/md5-cache/mail-filter/mimedefang-2.84-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=acct-group/defang acct-user/defang dev-perl/Digest-SHA1 dev-perl/IO-stringy dev-perl/MailTools dev-perl/MIME-tools dev-perl/Unix-Syslog || ( mail-filter/libmilter mail-mta/sendmail ) virtual/perl-MIME-Base64 clamav? ( app-antivirus/clamav ) test? ( dev-perl/Test-Class dev-perl/Test-Most )
-DESCRIPTION=Antispam, antivirus and other customizable filters for MTAs with Milter support
-EAPI=7
-HOMEPAGE=http://www.mimedefang.org/
-IUSE=clamav +poll test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=acct-group/defang acct-user/defang dev-perl/Digest-SHA1 dev-perl/IO-stringy dev-perl/MailTools dev-perl/MIME-tools dev-perl/Unix-Syslog || ( mail-filter/libmilter mail-mta/sendmail ) virtual/perl-MIME-Base64 clamav? ( app-antivirus/clamav )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=http://www.mimedefang.org/static/mimedefang-2.84.tar.gz
-_md5_=5df39bcb859605ac583f60d9043dac68
diff --git a/metadata/md5-cache/mail-filter/mimedefang-3.1 b/metadata/md5-cache/mail-filter/mimedefang-3.1
new file mode 100644
index 000000000000..e30aab5f034b
--- /dev/null
+++ b/metadata/md5-cache/mail-filter/mimedefang-3.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst
+DEPEND=|| ( mail-mta/sendmail mail-mta/postfix ) acct-group/defang acct-user/defang dev-perl/Digest-SHA1 dev-perl/IO-stringy dev-perl/MailTools dev-perl/MIME-tools dev-perl/Unix-Syslog mail-filter/libmilter:= virtual/perl-MIME-Base64 clamav? ( app-antivirus/clamav ) test? ( dev-perl/Test-Class dev-perl/Test-Most )
+DESCRIPTION=Antispam, antivirus and other customizable filters for MTAs with Milter support
+EAPI=8
+HOMEPAGE=https://www.mimedefang.org/
+IUSE=clamav +poll test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=|| ( mail-mta/sendmail mail-mta/postfix ) acct-group/defang acct-user/defang dev-perl/Digest-SHA1 dev-perl/IO-stringy dev-perl/MailTools dev-perl/MIME-tools dev-perl/Unix-Syslog mail-filter/libmilter:= virtual/perl-MIME-Base64 clamav? ( app-antivirus/clamav )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://mimedefang.org/releases/mimedefang-3.1.tar.gz
+_md5_=31c3b984ddaa094d50ddf62fa4642c8c
diff --git a/metadata/md5-cache/mate-base/Manifest.gz b/metadata/md5-cache/mate-base/Manifest.gz
index 069aabf628b7..3f3d1e1608b7 100644
Binary files a/metadata/md5-cache/mate-base/Manifest.gz and b/metadata/md5-cache/mate-base/Manifest.gz differ
diff --git a/metadata/md5-cache/mate-base/mate-applets-1.26.0 b/metadata/md5-cache/mate-base/mate-applets-1.26.0
new file mode 100644
index 000000000000..d8c560764a58
--- /dev/null
+++ b/metadata/md5-cache/mate-base/mate-applets-1.26.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-libs/atk >=dev-libs/dbus-glib-0.74 >=dev-libs/glib-2.50:2 >=dev-libs/libmateweather-1.17.0 >=dev-libs/libxml2-2.5:2 >=gnome-base/libgtop-2.12.0:2= >=gnome-extra/gucharmap-3.0:2.90 >=mate-base/mate-panel-1.25.2 >=net-wireless/wireless-tools-28_pre9:0 >=sys-apps/dbus-1.10.0 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.22:3 x11-libs/gtksourceview:3.0 >=x11-libs/libnotify-0.7 x11-libs/libX11 >=x11-libs/libwnck-3.0:3 x11-libs/pango cpupower? ( sys-power/cpupower policykit? ( >=sys-auth/polkit-0.97:0 ) ) netlink? ( dev-libs/libnl:3 ) upower? ( >=sys-power/upower-0.99.8 ) app-text/docbook-xml-dtd:4.3 app-text/rarian >=app-text/scrollkeeper-dtd-1:1.0 app-text/yelp-tools dev-libs/libxslt >=sys-devel/gettext-0.19.8 virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils sys-devel/gnuconfig || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info >=mate-base/mate-common-1.26
+DESCRIPTION=Applets for the MATE Desktop and Panel
+EAPI=7
+HOMEPAGE=https://mate-desktop.org
+INHERIT=mate
+IUSE=X +cpupower ipv6 netlink policykit +upower
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~riscv ~x86
+LICENSE=CC-BY-SA-3.0 FDL-1.1+ GPL-2+ GPL-3+ LGPL-2+
+RDEPEND=dev-libs/atk >=dev-libs/dbus-glib-0.74 >=dev-libs/glib-2.50:2 >=dev-libs/libmateweather-1.17.0 >=dev-libs/libxml2-2.5:2 >=gnome-base/libgtop-2.12.0:2= >=gnome-extra/gucharmap-3.0:2.90 >=mate-base/mate-panel-1.25.2 >=net-wireless/wireless-tools-28_pre9:0 >=sys-apps/dbus-1.10.0 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.22:3 x11-libs/gtksourceview:3.0 >=x11-libs/libnotify-0.7 x11-libs/libX11 >=x11-libs/libwnck-3.0:3 x11-libs/pango cpupower? ( sys-power/cpupower policykit? ( >=sys-auth/polkit-0.97:0 ) ) netlink? ( dev-libs/libnl:3 ) upower? ( >=sys-power/upower-0.99.8 ) mate-base/caja mate-base/mate-desktop >=mate-base/mate-settings-daemon-1.6 virtual/libintl
+REQUIRED_USE=policykit? ( cpupower )
+SLOT=0
+SRC_URI=https://pub.mate-desktop.org/releases/1.26/mate-applets-1.26.0.tar.xz
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	mate	e29617c33d6e271931938d0073817dde	mate-desktop.org	0da897c64adb500292c6b9db3e424496	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=1c672b4551ec7877434ef065b045e613
diff --git a/metadata/md5-cache/mate-extra/Manifest.gz b/metadata/md5-cache/mate-extra/Manifest.gz
index 83a367ab62a8..b6c84b99e8d3 100644
Binary files a/metadata/md5-cache/mate-extra/Manifest.gz and b/metadata/md5-cache/mate-extra/Manifest.gz differ
diff --git a/metadata/md5-cache/mate-extra/caja-actions-1.26.0 b/metadata/md5-cache/mate-extra/caja-actions-1.26.0
new file mode 100644
index 000000000000..4c4754996e5f
--- /dev/null
+++ b/metadata/md5-cache/mate-extra/caja-actions-1.26.0
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-libs/glib-2.32:2 >=x11-libs/gtk+-3.22:3 >=gnome-base/libgtop-2.23.1:2= dev-libs/libxml2 >=mate-base/caja-1.17 x11-libs/libSM virtual/libintl >=sys-devel/gettext-0.19.8 >=sys-devel/autoconf-2.53:* >=sys-devel/libtool-2.2.6:2 virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils sys-devel/gnuconfig || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info >=mate-base/mate-common-1.26
+DESCRIPTION=Caja Actions
+EAPI=7
+HOMEPAGE=https://github.com/infirit/caja-admin
+INHERIT=mate
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/glib-2.32:2 >=x11-libs/gtk+-3.22:3 >=gnome-base/libgtop-2.23.1:2= dev-libs/libxml2 >=mate-base/caja-1.17 x11-libs/libSM virtual/libintl
+SLOT=0
+SRC_URI=https://pub.mate-desktop.org/releases/1.26/caja-actions-1.26.0.tar.xz
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	mate	e29617c33d6e271931938d0073817dde	mate-desktop.org	0da897c64adb500292c6b9db3e424496	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=ee5dddab12938c0f77f33d712f235b4f
diff --git a/metadata/md5-cache/mate-extra/caja-dropbox-1.26.0-r1 b/metadata/md5-cache/mate-extra/caja-dropbox-1.26.0-r1
new file mode 100644
index 000000000000..22e4eed8999f
--- /dev/null
+++ b/metadata/md5-cache/mate-extra/caja-dropbox-1.26.0-r1
@@ -0,0 +1,16 @@
+BDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) dev-libs/atk >=dev-libs/glib-2.50:2 python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-)] ) 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(-)] ) python_single_target_python3_11? ( dev-python/pygobject:3[python_targets_python3_11(-)] ) >=mate-base/caja-1.19.1 mate-extra/caja-extensions media-libs/fontconfig:1.0 media-libs/freetype:2 x11-libs/cairo x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.22:3 x11-libs/libXinerama x11-libs/pango dev-python/docutils virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils sys-devel/gnuconfig || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info >=mate-base/mate-common-1.26
+DESCRIPTION=Store, Sync and Share Files Online
+EAPI=7
+HOMEPAGE=https://mate-desktop.org
+INHERIT=mate python-single-r1 linux-info
+IUSE=debug nls python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
+KEYWORDS=~amd64 ~x86
+LICENSE=CC-BY-ND-3.0 GPL-3+ public-domain
+RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) dev-libs/atk >=dev-libs/glib-2.50:2 python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-)] ) 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(-)] ) python_single_target_python3_11? ( dev-python/pygobject:3[python_targets_python3_11(-)] ) >=mate-base/caja-1.19.1 mate-extra/caja-extensions media-libs/fontconfig:1.0 media-libs/freetype:2 x11-libs/cairo x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.22:3 x11-libs/libXinerama x11-libs/pango net-misc/dropbox
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
+SLOT=0
+SRC_URI=https://pub.mate-desktop.org/releases/1.26/caja-dropbox-1.26.0.tar.xz
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	bbfa385d6907d7948d49a5e107bd654d	mate	e29617c33d6e271931938d0073817dde	mate-desktop.org	0da897c64adb500292c6b9db3e424496	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=ed6f3b086838d24995cba74f310082ff
diff --git a/metadata/md5-cache/mate-extra/mate-indicator-applet-1.26.0 b/metadata/md5-cache/mate-extra/mate-indicator-applet-1.26.0
new file mode 100644
index 000000000000..68b9fb5d10f2
--- /dev/null
+++ b/metadata/md5-cache/mate-extra/mate-indicator-applet-1.26.0
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-libs/libindicator-0.4:3 >=mate-base/mate-panel-1.17.0 >=x11-libs/gtk+-3.22:3 >=sys-devel/gettext-0.19.8 virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils sys-devel/gnuconfig || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info >=mate-base/mate-common-1.26
+DESCRIPTION=MATE indicator applet
+EAPI=7
+HOMEPAGE=https://mate-desktop.org
+INHERIT=mate
+KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
+LICENSE=GPL-3 GPL-3+ LGPL-2+ LGPL-3+
+RDEPEND=>=dev-libs/libindicator-0.4:3 >=mate-base/mate-panel-1.17.0 >=x11-libs/gtk+-3.22:3 virtual/libintl
+SLOT=0
+SRC_URI=https://pub.mate-desktop.org/releases/1.26/mate-indicator-applet-1.26.0.tar.xz
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	mate	e29617c33d6e271931938d0073817dde	mate-desktop.org	0da897c64adb500292c6b9db3e424496	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=b68f8696c09b3ed248f720fa0ce79a96
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index a34acc3af027..a2e8e6bd40a5 100644
Binary files a/metadata/md5-cache/media-gfx/Manifest.gz and b/metadata/md5-cache/media-gfx/Manifest.gz differ
diff --git a/metadata/md5-cache/media-gfx/eog-43.1 b/metadata/md5-cache/media-gfx/eog-43.1
new file mode 100644
index 000000000000..46a528f8512c
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/eog-43.1
@@ -0,0 +1,17 @@
+BDEPEND=gtk-doc? ( dev-util/gi-docgen app-text/docbook-xml-dtd:4.1.2 ) dev-util/glib-utils dev-util/itstool >=sys-devel/gettext-0.19.8 virtual/pkgconfig 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 test
+DEPEND=>=dev-libs/glib-2.53.4:2 >=dev-libs/libpeas-0.7.4[gtk] >=gnome-base/gnome-desktop-2.91.2:3= >=gnome-base/gsettings-desktop-schemas-42_beta >=x11-misc/shared-mime-info-0.20 >=x11-libs/gdk-pixbuf-2.36.5:2[jpeg?,tiff?] >=x11-libs/gtk+-3.24.15:3[introspection,X] >=gui-libs/libhandy-1.5.0:1 sys-libs/zlib exif? ( >=media-libs/libexif-0.6.14 ) lcms? ( media-libs/lcms:2 ) xmp? ( media-libs/exempi:2 ) jpeg? ( media-libs/libjpeg-turbo:= ) introspection? ( >=dev-libs/gobject-introspection-1.54:= ) svg? ( >=gnome-base/librsvg-2.44.0:2 ) x11-libs/libX11
+DESCRIPTION=The Eye of GNOME image viewer
+EAPI=8
+HOMEPAGE=https://wiki.gnome.org/Apps/EyeOfGnome https://gitlab.gnome.org/GNOME/eog
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=gnome.org gnome2-utils meson xdg
+IUSE=+exif gtk-doc +introspection +jpeg lcms +svg xmp tiff
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/glib-2.53.4:2 >=dev-libs/libpeas-0.7.4[gtk] >=gnome-base/gnome-desktop-2.91.2:3= >=gnome-base/gsettings-desktop-schemas-42_beta >=x11-misc/shared-mime-info-0.20 >=x11-libs/gdk-pixbuf-2.36.5:2[jpeg?,tiff?] >=x11-libs/gtk+-3.24.15:3[introspection,X] >=gui-libs/libhandy-1.5.0:1 sys-libs/zlib exif? ( >=media-libs/libexif-0.6.14 ) lcms? ( media-libs/lcms:2 ) xmp? ( media-libs/exempi:2 ) jpeg? ( media-libs/libjpeg-turbo:= ) introspection? ( >=dev-libs/gobject-introspection-1.54:= ) svg? ( >=gnome-base/librsvg-2.44.0:2 ) x11-libs/libX11
+REQUIRED_USE=exif? ( jpeg ) gtk-doc? ( introspection )
+SLOT=1
+SRC_URI=mirror://gnome/sources/eog/43/eog-43.1.tar.xz
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=5ce4f04dafcaf3b73e2f6552ace7f39a
diff --git a/metadata/md5-cache/media-gfx/eom-1.26.0 b/metadata/md5-cache/media-gfx/eom-1.26.0
new file mode 100644
index 000000000000..a761cf29d214
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/eom-1.26.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-libs/atk >=dev-libs/glib-2.52:2 >=dev-libs/libpeas-1.8.0[gtk] >=dev-libs/libxml2-2:2 gnome-base/dconf >=mate-base/mate-desktop-1.17.0 sys-libs/zlib x11-libs/cairo >=x11-libs/gdk-pixbuf-2.36.5:2[introspection?,jpeg?,tiff?] >=x11-libs/gtk+-3.22:3[introspection?] x11-libs/libX11 >=x11-misc/shared-mime-info-0.20 exif? ( >=media-libs/libexif-0.6.22 virtual/jpeg:0 ) imagemagick? ( >=media-gfx/imagemagick-6.2.6 ) introspection? ( >=dev-libs/gobject-introspection-0.9.3:= ) jpeg? ( virtual/jpeg:0 ) lcms? ( media-libs/lcms:2 ) svg? ( >=gnome-base/librsvg-2.36.2:2 ) xmp? ( >=media-libs/exempi-1.99.5:2 ) app-text/yelp-tools dev-util/glib-utils dev-util/gtk-doc dev-util/gtk-doc-am >=sys-devel/gettext-0.19.8 virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils sys-devel/gnuconfig || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info >=mate-base/mate-common-1.26
+DESCRIPTION=The MATE image viewer
+EAPI=7
+HOMEPAGE=https://mate-desktop.org
+INHERIT=mate
+IUSE=X debug exif imagemagick +introspection nls jpeg lcms svg tiff xmp
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~riscv ~x86
+LICENSE=FDL-1.1+ GPL-2+ IJG LGPL-2+
+RDEPEND=dev-libs/atk >=dev-libs/glib-2.52:2 >=dev-libs/libpeas-1.8.0[gtk] >=dev-libs/libxml2-2:2 gnome-base/dconf >=mate-base/mate-desktop-1.17.0 sys-libs/zlib x11-libs/cairo >=x11-libs/gdk-pixbuf-2.36.5:2[introspection?,jpeg?,tiff?] >=x11-libs/gtk+-3.22:3[introspection?] x11-libs/libX11 >=x11-misc/shared-mime-info-0.20 exif? ( >=media-libs/libexif-0.6.22 virtual/jpeg:0 ) imagemagick? ( >=media-gfx/imagemagick-6.2.6 ) introspection? ( >=dev-libs/gobject-introspection-0.9.3:= ) jpeg? ( virtual/jpeg:0 ) lcms? ( media-libs/lcms:2 ) svg? ( >=gnome-base/librsvg-2.36.2:2 ) xmp? ( >=media-libs/exempi-1.99.5:2 ) virtual/libintl !!media-gfx/mate-image-viewer
+SLOT=0
+SRC_URI=https://pub.mate-desktop.org/releases/1.26/eom-1.26.0.tar.xz
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	mate	e29617c33d6e271931938d0073817dde	mate-desktop.org	0da897c64adb500292c6b9db3e424496	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=30e1f8df1fb48c7e0cf776b49c331faa
diff --git a/metadata/md5-cache/media-gfx/exiv2-0.27.5-r1 b/metadata/md5-cache/media-gfx/exiv2-0.27.5-r1
index 0edafb45b190..b91f33557251 100644
--- a/metadata/md5-cache/media-gfx/exiv2-0.27.5-r1
+++ b/metadata/md5-cache/media-gfx/exiv2-0.27.5-r1
@@ -1,8 +1,8 @@
-BDEPEND=doc? ( || ( >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) app-doc/doxygen dev-libs/libxslt media-gfx/graphviz virtual/pkgconfig ) nls? ( sys-devel/gettext ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+BDEPEND=doc? ( || ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) app-doc/doxygen dev-libs/libxslt media-gfx/graphviz virtual/pkgconfig ) nls? ( sys-devel/gettext ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=test? ( dev-cpp/gtest )
 DESCRIPTION=EXIF, IPTC and XMP metadata C++ library and command line utility
-EAPI=7
+EAPI=8
 HOMEPAGE=https://exiv2.org/
 INHERIT=cmake-multilib python-any-r1
 IUSE=+bmff doc examples nls +png test webready +xmp abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
@@ -12,5 +12,5 @@ RDEPEND=>=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,ab
 RESTRICT=!test? ( test )
 SLOT=0/27.5
 SRC_URI=https://exiv2.org/builds/exiv2-0.27.5-Source.tar.gz
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=730656391a1d864d2ac583f38d9d0347
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	29a755b1291d64133634d80b0328f153	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=54de4369074631d4d2b6a9420c20d6fd
diff --git a/metadata/md5-cache/media-gfx/geeqie-2.0.1-r1 b/metadata/md5-cache/media-gfx/geeqie-2.0.1-r1
index 426442c6bbd8..097921804d6a 100644
--- a/metadata/md5-cache/media-gfx/geeqie-2.0.1-r1
+++ b/metadata/md5-cache/media-gfx/geeqie-2.0.1-r1
@@ -1,17 +1,17 @@
 BDEPEND=|| ( dev-util/xxdi app-editors/vim-core ) dev-util/glib-utils dev-util/intltool sys-devel/gettext virtual/pkgconfig >=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=gnome-extra/zenity virtual/libintl x11-libs/gtk+:3 djvu? ( app-text/djvu ) doc? ( app-text/yelp-tools ) exif? ( >=media-gfx/exiv2-0.17:=[xmp?] ) ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) heif? ( >=media-libs/libheif-1.3.2 ) jpeg2k? ( >=media-libs/openjpeg-2.3.0:2 ) jpeg? ( media-libs/libjpeg-turbo:= ) jpegxl? ( >=media-libs/libjxl-0.3.7 ) lcms? ( media-libs/lcms:2 ) lua? ( lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) doc? ( app-doc/doxygen ) ) map? ( media-libs/clutter-gtk media-libs/libchamplain:0.12[gtk] ) pdf? ( >=app-text/poppler-0.62[cairo] ) raw? ( >=media-libs/libraw-0.20 ) spell? ( app-text/gspell ) tiff? ( media-libs/tiff:0 ) webp? ( >=media-libs/libwebp-0.6.1 ) zip? ( >=app-arch/libarchive-3.4.0 )
+DEPEND=gnome-extra/zenity virtual/libintl x11-libs/gtk+:3 djvu? ( app-text/djvu ) exif? ( >=media-gfx/exiv2-0.17:=[xmp?] ) ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) heif? ( >=media-libs/libheif-1.3.2 ) jpeg2k? ( >=media-libs/openjpeg-2.3.0:2 ) jpeg? ( media-libs/libjpeg-turbo:= ) jpegxl? ( >=media-libs/libjxl-0.3.7 ) lcms? ( media-libs/lcms:2 ) lua? ( lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) map? ( media-libs/clutter-gtk media-libs/libchamplain:0.12[gtk] ) pdf? ( >=app-text/poppler-0.62[cairo] ) raw? ( >=media-libs/libraw-0.20 ) spell? ( app-text/gspell ) tiff? ( media-libs/tiff:0 ) webp? ( >=media-libs/libwebp-0.6.1 ) zip? ( >=app-arch/libarchive-3.4.0 )
 DESCRIPTION=A lightweight GTK image viewer forked from GQview
 EAPI=8
 HOMEPAGE=http://www.geeqie.org
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=lua-single meson optfeature xdg
-IUSE=debug doc djvu exif ffmpegthumbnailer heif jpeg jpeg2k jpegxl lcms lua map pdf raw spell tiff webp xmp zip lua_single_target_lua5-3 lua_single_target_lua5-4
+IUSE=debug djvu exif ffmpegthumbnailer heif jpeg jpeg2k jpegxl lcms lua map pdf raw spell tiff webp xmp zip lua_single_target_lua5-3 lua_single_target_lua5-4
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2
-RDEPEND=gnome-extra/zenity virtual/libintl x11-libs/gtk+:3 djvu? ( app-text/djvu ) doc? ( app-text/yelp-tools ) exif? ( >=media-gfx/exiv2-0.17:=[xmp?] ) ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) heif? ( >=media-libs/libheif-1.3.2 ) jpeg2k? ( >=media-libs/openjpeg-2.3.0:2 ) jpeg? ( media-libs/libjpeg-turbo:= ) jpegxl? ( >=media-libs/libjxl-0.3.7 ) lcms? ( media-libs/lcms:2 ) lua? ( lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) doc? ( app-doc/doxygen ) ) map? ( media-libs/clutter-gtk media-libs/libchamplain:0.12[gtk] ) pdf? ( >=app-text/poppler-0.62[cairo] ) raw? ( >=media-libs/libraw-0.20 ) spell? ( app-text/gspell ) tiff? ( media-libs/tiff:0 ) webp? ( >=media-libs/libwebp-0.6.1 ) zip? ( >=app-arch/libarchive-3.4.0 )
+RDEPEND=gnome-extra/zenity virtual/libintl x11-libs/gtk+:3 djvu? ( app-text/djvu ) exif? ( >=media-gfx/exiv2-0.17:=[xmp?] ) ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) heif? ( >=media-libs/libheif-1.3.2 ) jpeg2k? ( >=media-libs/openjpeg-2.3.0:2 ) jpeg? ( media-libs/libjpeg-turbo:= ) jpegxl? ( >=media-libs/libjxl-0.3.7 ) lcms? ( media-libs/lcms:2 ) lua? ( lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) map? ( media-libs/clutter-gtk media-libs/libchamplain:0.12[gtk] ) pdf? ( >=app-text/poppler-0.62[cairo] ) raw? ( >=media-libs/libraw-0.20 ) spell? ( app-text/gspell ) tiff? ( media-libs/tiff:0 ) webp? ( >=media-libs/libwebp-0.6.1 ) zip? ( >=app-arch/libarchive-3.4.0 )
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-3 lua_single_target_lua5-4 ) )
 SLOT=0
 SRC_URI=https://github.com/BestImageViewer/geeqie/releases/download/v2.0.1/geeqie-2.0.1.tar.xz https://dev.gentoo.org/~voyageur/distfiles/geeqie-2.0.1-ChangeLog.tar.gz
 _eclasses_=lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	1a2157392a869265b2afcb63a26c12ac	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=e422380aca3cf0e81f894e898e409af3
+_md5_=29857efe2fab8eff13e55908e101ec34
diff --git a/metadata/md5-cache/media-gfx/geeqie-9999 b/metadata/md5-cache/media-gfx/geeqie-9999
index 4e9a240aeeef..e9c7a23adee4 100644
--- a/metadata/md5-cache/media-gfx/geeqie-9999
+++ b/metadata/md5-cache/media-gfx/geeqie-9999
@@ -1,16 +1,16 @@
 BDEPEND=|| ( dev-util/xxdi app-editors/vim-core ) dev-util/glib-utils dev-util/intltool sys-devel/gettext virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl] >=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 unpack
-DEPEND=gnome-extra/zenity virtual/libintl x11-libs/gtk+:3 djvu? ( app-text/djvu ) doc? ( app-text/yelp-tools ) exif? ( >=media-gfx/exiv2-0.17:=[xmp?] ) ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) heif? ( >=media-libs/libheif-1.3.2 ) jpeg2k? ( >=media-libs/openjpeg-2.3.0:2 ) jpeg? ( media-libs/libjpeg-turbo:= ) jpegxl? ( >=media-libs/libjxl-0.3.7 ) lcms? ( media-libs/lcms:2 ) lua? ( lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) doc? ( app-doc/doxygen ) ) map? ( media-libs/clutter-gtk media-libs/libchamplain:0.12[gtk] ) pdf? ( >=app-text/poppler-0.62[cairo] ) raw? ( >=media-libs/libraw-0.20 ) spell? ( app-text/gspell ) tiff? ( media-libs/tiff:0 ) webp? ( >=media-libs/libwebp-0.6.1 ) zip? ( >=app-arch/libarchive-3.4.0 )
+DEPEND=gnome-extra/zenity virtual/libintl x11-libs/gtk+:3 djvu? ( app-text/djvu ) exif? ( >=media-gfx/exiv2-0.17:=[xmp?] ) ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) heif? ( >=media-libs/libheif-1.3.2 ) jpeg2k? ( >=media-libs/openjpeg-2.3.0:2 ) jpeg? ( media-libs/libjpeg-turbo:= ) jpegxl? ( >=media-libs/libjxl-0.3.7 ) lcms? ( media-libs/lcms:2 ) lua? ( lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) map? ( media-libs/clutter-gtk media-libs/libchamplain:0.12[gtk] ) pdf? ( >=app-text/poppler-0.62[cairo] ) raw? ( >=media-libs/libraw-0.20 ) spell? ( app-text/gspell ) tiff? ( media-libs/tiff:0 ) webp? ( >=media-libs/libwebp-0.6.1 ) zip? ( >=app-arch/libarchive-3.4.0 )
 DESCRIPTION=A lightweight GTK image viewer forked from GQview
 EAPI=8
 HOMEPAGE=http://www.geeqie.org
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=git-r3 lua-single meson optfeature xdg
-IUSE=debug doc djvu exif ffmpegthumbnailer heif jpeg jpeg2k jpegxl lcms lua map pdf raw spell tiff webp xmp zip lua_single_target_lua5-3 lua_single_target_lua5-4
+IUSE=debug djvu exif ffmpegthumbnailer heif jpeg jpeg2k jpegxl lcms lua map pdf raw spell tiff webp xmp zip lua_single_target_lua5-3 lua_single_target_lua5-4
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=gnome-extra/zenity virtual/libintl x11-libs/gtk+:3 djvu? ( app-text/djvu ) doc? ( app-text/yelp-tools ) exif? ( >=media-gfx/exiv2-0.17:=[xmp?] ) ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) heif? ( >=media-libs/libheif-1.3.2 ) jpeg2k? ( >=media-libs/openjpeg-2.3.0:2 ) jpeg? ( media-libs/libjpeg-turbo:= ) jpegxl? ( >=media-libs/libjxl-0.3.7 ) lcms? ( media-libs/lcms:2 ) lua? ( lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) doc? ( app-doc/doxygen ) ) map? ( media-libs/clutter-gtk media-libs/libchamplain:0.12[gtk] ) pdf? ( >=app-text/poppler-0.62[cairo] ) raw? ( >=media-libs/libraw-0.20 ) spell? ( app-text/gspell ) tiff? ( media-libs/tiff:0 ) webp? ( >=media-libs/libwebp-0.6.1 ) zip? ( >=app-arch/libarchive-3.4.0 )
+RDEPEND=gnome-extra/zenity virtual/libintl x11-libs/gtk+:3 djvu? ( app-text/djvu ) exif? ( >=media-gfx/exiv2-0.17:=[xmp?] ) ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) heif? ( >=media-libs/libheif-1.3.2 ) jpeg2k? ( >=media-libs/openjpeg-2.3.0:2 ) jpeg? ( media-libs/libjpeg-turbo:= ) jpegxl? ( >=media-libs/libjxl-0.3.7 ) lcms? ( media-libs/lcms:2 ) lua? ( lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) map? ( media-libs/clutter-gtk media-libs/libchamplain:0.12[gtk] ) pdf? ( >=app-text/poppler-0.62[cairo] ) raw? ( >=media-libs/libraw-0.20 ) spell? ( app-text/gspell ) tiff? ( media-libs/tiff:0 ) webp? ( >=media-libs/libwebp-0.6.1 ) zip? ( >=app-arch/libarchive-3.4.0 )
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-3 lua_single_target_lua5-4 ) )
 SLOT=0
 _eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	1a2157392a869265b2afcb63a26c12ac	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=fac78ddd6248a9c260988041e6471345
+_md5_=7b938371daee48670dfd5c323d91f398
diff --git a/metadata/md5-cache/media-gfx/graphviz-7.0.0 b/metadata/md5-cache/media-gfx/graphviz-7.0.0
new file mode 100644
index 000000000000..b4df6f7e2f4b
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/graphviz-7.0.0
@@ -0,0 +1,17 @@
+BDEPEND=sys-devel/flex sys-devel/libtool virtual/pkgconfig doc? ( app-text/ghostscript-gpl sys-apps/groff ) guile? ( dev-lang/swig dev-scheme/guile ) nls? ( >=sys-devel/gettext-0.14.5 ) perl? ( dev-lang/swig ) python? ( dev-lang/swig ) ruby? ( dev-lang/swig ) tcl? ( dev-lang/swig )
+DEFINED_PHASES=configure install postinst postrm setup
+DEPEND=>=dev-libs/expat-2 >=dev-libs/glib-2.11.1:2 dev-libs/libltdl >=media-libs/fontconfig-2.3.95 >=media-libs/freetype-2.1.10 >=media-libs/gd-2.0.34:=[fontconfig,jpeg,png,truetype,zlib] media-libs/libjpeg-turbo:= >=media-libs/libpng-1.2:= sys-libs/zlib virtual/libiconv cairo? ( >=x11-libs/cairo-1.1.10[svg(+)] >=x11-libs/pango-1.12 ) devil? ( media-libs/devil[png,jpeg] ) gtk2? ( x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 ) gts? ( sci-libs/gts ) guile? ( dev-scheme/guile ) lasi? ( media-libs/lasi ) pdf? ( app-text/poppler ) perl? ( dev-lang/perl:= ) postscript? ( app-text/ghostscript-gpl ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 ) ruby? ( dev-lang/ruby:* ) svg? ( gnome-base/librsvg ) tcl? ( >=dev-lang/tcl-8.3:= ) webp? ( media-libs/libwebp:= ) X? ( x11-libs/libX11 ) X? ( x11-base/xorg-proto )
+DESCRIPTION=Open Source Graph Visualization Software
+EAPI=8
+HOMEPAGE=https://www.graphviz.org/ https://gitlab.com/graphviz/graphviz/
+INHERIT=python-single-r1
+IUSE=+cairo devil doc examples gtk2 gts guile lasi nls pdf perl postscript python qt5 ruby svg tcl webp X python_single_target_python3_8 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 ~x64-macos ~sparc-solaris ~x64-solaris
+LICENSE=CPL-1.0
+RDEPEND=>=dev-libs/expat-2 >=dev-libs/glib-2.11.1:2 dev-libs/libltdl >=media-libs/fontconfig-2.3.95 >=media-libs/freetype-2.1.10 >=media-libs/gd-2.0.34:=[fontconfig,jpeg,png,truetype,zlib] media-libs/libjpeg-turbo:= >=media-libs/libpng-1.2:= sys-libs/zlib virtual/libiconv cairo? ( >=x11-libs/cairo-1.1.10[svg(+)] >=x11-libs/pango-1.12 ) devil? ( media-libs/devil[png,jpeg] ) gtk2? ( x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 ) gts? ( sci-libs/gts ) guile? ( dev-scheme/guile ) lasi? ( media-libs/lasi ) pdf? ( app-text/poppler ) perl? ( dev-lang/perl:= ) postscript? ( app-text/ghostscript-gpl ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 ) ruby? ( dev-lang/ruby:* ) svg? ( gnome-base/librsvg ) tcl? ( >=dev-lang/tcl-8.3:= ) webp? ( media-libs/libwebp:= ) X? ( x11-libs/libX11 )
+REQUIRED_USE=!cairo? ( !X !gtk2 !postscript !lasi ) pdf? ( cairo ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://gitlab.com/api/v4/projects/4207231/packages/generic/graphviz-releases/7.0.0/graphviz-7.0.0.tar.xz
+_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=213afc3bceebf641869fe4b22697327c
diff --git a/metadata/md5-cache/media-gfx/kgraphviewer-2.4.3-r1 b/metadata/md5-cache/media-gfx/kgraphviewer-2.4.3-r1
deleted file mode 100644
index 5f62ab7b2dea..000000000000
--- a/metadata/md5-cache/media-gfx/kgraphviewer-2.4.3-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 handbook? ( >=kde-frameworks/kdoctools-5.60.0:5 ) dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.60.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=media-gfx/graphviz-2.30 dev-libs/boost dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Graphviz dot graph file viewer
-EAPI=7
-HOMEPAGE=https://apps.kde.org/en/kgraphviewer
-INHERIT=ecm kde.org
-IUSE=debug +handbook
-KEYWORDS=amd64 arm64 x86
-LICENSE=GPL-2 GPL-2+ LGPL-2+ LGPL-2.1+ handbook? ( FDL-1.2 )
-RDEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=media-gfx/graphviz-2.30 !media-gfx/kgraphviewer:4 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/kgraphviewer/2.4.3/kgraphviewer-2.4.3.tar.xz
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	ecm	3dae552f761290722bcc848a12bfb538	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	kde.org	087d21100477ce987a8de6c1d613a176	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	virtualx	644887c82aefdf12001489391fca4f02	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=8ca90f6c178125f641bac2e9cc576eb2
diff --git a/metadata/md5-cache/media-gfx/kgraphviewer-2.4.3-r2 b/metadata/md5-cache/media-gfx/kgraphviewer-2.4.3-r2
index 79f5415ea3cd..6dc644528762 100644
--- a/metadata/md5-cache/media-gfx/kgraphviewer-2.4.3-r2
+++ b/metadata/md5-cache/media-gfx/kgraphviewer-2.4.3-r2
@@ -7,10 +7,10 @@ HOMEPAGE=https://apps.kde.org/kgraphviewer
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=ecm kde.org
 IUSE=debug +handbook
-KEYWORDS=amd64 ~arm64 x86
+KEYWORDS=amd64 arm64 x86
 LICENSE=GPL-2 GPL-2+ LGPL-2+ LGPL-2.1+ handbook? ( FDL-1.2 )
 RDEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=media-gfx/graphviz-2.30 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/kgraphviewer/2.4.3/kgraphviewer-2.4.3.tar.xz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	ecm	3dae552f761290722bcc848a12bfb538	flag-o-matic	29a755b1291d64133634d80b0328f153	kde.org	087d21100477ce987a8de6c1d613a176	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=724210d034491d974543d592c3d75fc5
+_md5_=59bb233d312d7686a2da484e2f1df2b0
diff --git a/metadata/md5-cache/media-gfx/photoqt-1.7.1-r1 b/metadata/md5-cache/media-gfx/photoqt-1.7.1-r1
deleted file mode 100644
index a89ddbce239b..000000000000
--- a/metadata/md5-cache/media-gfx/photoqt-1.7.1-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-qt/linguist-tools:5 >=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 postinst postrm preinst prepare setup test
-DEPEND=dev-qt/qtdeclarative:5 dev-qt/qtgraphicaleffects:5 dev-qt/qtgui:5 dev-qt/qtimageformats:5 dev-qt/qtmultimedia:5[qml] dev-qt/qtnetwork:5 dev-qt/qtquickcontrols:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 app-arch/libarchive:= app-arch/unrar devil? ( media-libs/devil ) exif? ( media-gfx/exiv2:= ) freeimage? ( media-libs/freeimage ) graphicsmagick? ( >=media-gfx/graphicsmagick-1.3.20:= ) pdf? ( app-text/poppler[qt5] ) raw? ( media-libs/libraw:= ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Simple but powerful Qt-based image viewer
-EAPI=7
-HOMEPAGE=https://photoqt.org/
-INHERIT=ecm
-IUSE=devil exif freeimage graphicsmagick pdf raw debug
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+
-RDEPEND=dev-qt/qtdeclarative:5 dev-qt/qtgraphicaleffects:5 dev-qt/qtgui:5 dev-qt/qtimageformats:5 dev-qt/qtmultimedia:5[qml] dev-qt/qtnetwork:5 dev-qt/qtquickcontrols:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 app-arch/libarchive:= app-arch/unrar devil? ( media-libs/devil ) exif? ( media-gfx/exiv2:= ) freeimage? ( media-libs/freeimage ) graphicsmagick? ( >=media-gfx/graphicsmagick-1.3.20:= ) pdf? ( app-text/poppler[qt5] ) raw? ( media-libs/libraw:= ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=0
-SRC_URI=https://photoqt.org/pkgs/photoqt-1.7.1.tar.gz
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	ecm	3dae552f761290722bcc848a12bfb538	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	virtualx	644887c82aefdf12001489391fca4f02	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=7835834db2b6099185fcb5c3ac978b07
diff --git a/metadata/md5-cache/media-gfx/photoqt-2.9.1 b/metadata/md5-cache/media-gfx/photoqt-2.9.1
index 3fa1be7f2d86..73f29d1faef6 100644
--- a/metadata/md5-cache/media-gfx/photoqt-2.9.1
+++ b/metadata/md5-cache/media-gfx/photoqt-2.9.1
@@ -7,10 +7,10 @@ HOMEPAGE=https://photoqt.org/
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=ecm optfeature
 IUSE=devil exif freeimage graphicsmagick imagemagick mpv pdf raw debug
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2+
 RDEPEND=app-arch/libarchive:= app-arch/unrar dev-libs/pugixml dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5[jpeg] dev-qt/qtimageformats:5 dev-qt/qtmultimedia:5[qml] dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 devil? ( media-libs/devil ) exif? ( media-gfx/exiv2:= ) freeimage? ( media-libs/freeimage ) imagemagick? ( !graphicsmagick? ( media-gfx/imagemagick:=[cxx] ) graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] ) ) mpv? ( media-video/mpv[libmpv] ) pdf? ( app-text/poppler[qt5] ) raw? ( media-libs/libraw:= ) dev-qt/qtgraphicaleffects:5 dev-qt/qtquickcontrols:5 dev-qt/qtquickcontrols2:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=0
 SRC_URI=https://photoqt.org/pkgs/photoqt-2.9.1.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	ecm	3dae552f761290722bcc848a12bfb538	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	1a2157392a869265b2afcb63a26c12ac	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=74de66e21401a0f580cfb2c43a61c9df
+_md5_=220882738b02675c68776624ad33a173
diff --git a/metadata/md5-cache/media-gfx/pngtools-0.4_p20220314 b/metadata/md5-cache/media-gfx/pngtools-0.4_p20220314
index a0acb8fd77b4..48e3dcbf0b18 100644
--- a/metadata/md5-cache/media-gfx/pngtools-0.4_p20220314
+++ b/metadata/md5-cache/media-gfx/pngtools-0.4_p20220314
@@ -5,10 +5,10 @@ DESCRIPTION=A series of tools for the PNG image format
 EAPI=8
 HOMEPAGE=https://github.com/mikalstill/pngtools
 INHERIT=autotools
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
 RDEPEND=media-libs/libpng:=
 SLOT=0
 SRC_URI=https://github.com/mikalstill/pngtools/archive/1ccca3a0f3f6882661bbafbfb62feb774ca195d1.tar.gz -> pngtools-0.4_p20220314.tar.gz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=c6b09fb8b020dec5ced133a49aea9784
+_md5_=0e9d8b2dc48b43afaaee14a183f5b71b
diff --git a/metadata/md5-cache/media-gfx/renderdoc-1.22 b/metadata/md5-cache/media-gfx/renderdoc-1.22
index 5ff9da284658..d50d21f45720 100644
--- a/metadata/md5-cache/media-gfx/renderdoc-1.22
+++ b/metadata/md5-cache/media-gfx/renderdoc-1.22
@@ -7,11 +7,11 @@ HOMEPAGE=https://renderdoc.org https://github.com/baldurk/renderdoc
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=autotools cmake flag-o-matic optfeature python-single-r1 docs qmake-utils verify-sig xdg
 IUSE=pyside2 qt5 python_single_target_python3_9 python_single_target_python3_10 doc verify-sig
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=BSD BSD-2 CC-BY-3.0 GPL-3+ MIT OFL-1.1 public-domain ZLIB
 RDEPEND=app-arch/lz4:= app-arch/zstd:= dev-libs/miniz:= dev-util/glslang x11-libs/libX11 x11-libs/libxcb:= x11-libs/xcb-util-keysyms virtual/opengl pyside2? ( python_single_target_python3_9? ( dev-python/pyside2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pyside2[python_targets_python3_10(-)] ) ) qt5? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 )
 REQUIRED_USE=doc? ( qt5 ) pyside2? ( qt5 ) qt5? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 ) )
 SLOT=0
 SRC_URI=https://github.com/baldurk/renderdoc/archive/refs/tags/v1.22.tar.gz -> renderdoc-1.22.tar.gz qt5? ( https://github.com/baldurk/swig/archive/renderdoc-modified-7.tar.gz -> swig-renderdoc-7.tar.gz ) verify-sig? ( https://github.com/baldurk/renderdoc/releases/download/v1.22/v1.22.tar.gz.asc -> renderdoc-1.22.tar.gz.asc )
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	cmake	44afbf15c35884f7c840470f1cf05d0d	docs	8ed2a8a28ff109e7a3582c9abb7fe327	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	1a2157392a869265b2afcb63a26c12ac	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	0748d665fa664a87add00152ed046e16	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=92cd54accf6572422b880ca17d1f6e24
+_md5_=a010751ea5159d451056100bb631ffdf
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index 41c0747e0ba7..88317380a5c4 100644
Binary files a/metadata/md5-cache/media-libs/Manifest.gz and b/metadata/md5-cache/media-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/media-libs/flac-1.4.2 b/metadata/md5-cache/media-libs/flac-1.4.2
index c624b6deab36..550f50c89ac4 100644
--- a/metadata/md5-cache/media-libs/flac-1.4.2
+++ b/metadata/md5-cache/media-libs/flac-1.4.2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://xiph.org/flac/
 INHERIT=multilib-minimal
 IUSE=+cxx debug ogg cpu_flags_ppc_altivec cpu_flags_ppc_vsx cpu_flags_x86_avx2 cpu_flags_x86_avx 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 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD FDL-1.2 GPL-2 LGPL-2.1
 RDEPEND=ogg? ( media-libs/libogg[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=cpu_flags_x86_avx2? ( cpu_flags_x86_avx )
 SLOT=0/10-12
 SRC_URI=https://downloads.xiph.org/releases/flac/flac-1.4.2.tar.xz
 _eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=74d4ef9578209f1db4dbce4cfef07569
+_md5_=99ad71713255e04a09411dd67e56b57c
diff --git a/metadata/md5-cache/media-libs/harfbuzz-5.3.1 b/metadata/md5-cache/media-libs/harfbuzz-5.3.1
new file mode 100644
index 000000000000..38d882508446
--- /dev/null
+++ b/metadata/md5-cache/media-libs/harfbuzz-5.3.1
@@ -0,0 +1,17 @@
+BDEPEND=|| ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) virtual/pkgconfig doc? ( dev-util/gtk-doc ) introspection? ( dev-util/glib-utils ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=cairo? ( x11-libs/cairo:= ) glib? ( >=dev-libs/glib-2.38: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(-)?] ) graphite? ( >=media-gfx/graphite2-1.2.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(-)?] ) icu? ( >=dev-libs/icu-51.2-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(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.34:= ) truetype? ( >=media-libs/freetype-2.5.0.1:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-libs/gobject-introspection-common-1.34
+DESCRIPTION=An OpenType text shaping engine
+EAPI=8
+HOMEPAGE=https://www.freedesktop.org/wiki/Software/HarfBuzz
+INHERIT=flag-o-matic meson-multilib python-any-r1 xdg-utils
+IUSE=+cairo debug doc experimental +glib +graphite icu +introspection test +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
+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=Old-MIT ISC icu
+RDEPEND=cairo? ( x11-libs/cairo:= ) glib? ( >=dev-libs/glib-2.38: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(-)?] ) graphite? ( >=media-gfx/graphite2-1.2.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(-)?] ) icu? ( >=dev-libs/icu-51.2-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(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.34:= ) truetype? ( >=media-libs/freetype-2.5.0.1:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+REQUIRED_USE=introspection? ( glib )
+RESTRICT=!test? ( test )
+SLOT=0/4.0.0
+SRC_URI=https://github.com/harfbuzz/harfbuzz/releases/download/5.3.1/harfbuzz-5.3.1.tar.xz
+_eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=8906be84296b89003cbcece64761f899
diff --git a/metadata/md5-cache/media-libs/libcdaudio-0.99.12-r4 b/metadata/md5-cache/media-libs/libcdaudio-0.99.12-r4
index ff56e9e52891..76cfb32cee70 100644
--- a/metadata/md5-cache/media-libs/libcdaudio-0.99.12-r4
+++ b/metadata/md5-cache/media-libs/libcdaudio-0.99.12-r4
@@ -2,8 +2,8 @@ DEFINED_PHASES=configure install
 DESCRIPTION=Library of cd audio related routines
 EAPI=7
 HOMEPAGE=http://libcdaudio.sourceforge.net/
-KEYWORDS=~alpha ~amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc ~x86
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/libcdaudio/libcdaudio-0.99.12.tar.gz
-_md5_=cdb7fdbad07e594338d24e7c4fb37d33
+_md5_=2fe9069cdf8a9db90eda6f3e6d0041d2
diff --git a/metadata/md5-cache/media-libs/libjxl-0.7.0 b/metadata/md5-cache/media-libs/libjxl-0.7.0
new file mode 100644
index 000000000000..000e05dde28d
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libjxl-0.7.0
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=app-arch/brotli:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-cpp/highway-1.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/giflib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/lcms-2.13:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libjpeg-turbo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libpng:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-misc/shared-mime-info-2.2 openexr? ( media-libs/openexr:= )
+DESCRIPTION=JPEG XL image format reference implementation
+EAPI=8
+HOMEPAGE=https://github.com/libjxl/libjxl
+INHERIT=cmake-multilib flag-o-matic
+IUSE=openexr 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 ~riscv ~sparc ~x86
+LICENSE=BSD
+RDEPEND=app-arch/brotli:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-cpp/highway-1.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/giflib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/lcms-2.13:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libjpeg-turbo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libpng:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-misc/shared-mime-info-2.2 openexr? ( media-libs/openexr:= )
+SLOT=0
+SRC_URI=https://github.com/libjxl/libjxl/archive/refs/tags/v0.7.0.tar.gz -> libjxl-0.7.0.tar.gz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	29a755b1291d64133634d80b0328f153	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=a4a4bba02f03e01e282501a90f7cbb36
diff --git a/metadata/md5-cache/media-libs/libjxl-0.7.0_pre20220329 b/metadata/md5-cache/media-libs/libjxl-0.7.0_pre20220329
deleted file mode 100644
index 4cf49a490260..000000000000
--- a/metadata/md5-cache/media-libs/libjxl-0.7.0_pre20220329
+++ /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=app-arch/brotli:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-cpp/gflags:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-cpp/highway-0.16.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/giflib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/lcms-2.13:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libpng:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/jpeg[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-misc/shared-mime-info-2.2 openexr? ( media-libs/openexr:= )
-DESCRIPTION=JPEG XL image format reference implementation
-EAPI=8
-HOMEPAGE=https://github.com/libjxl/libjxl
-INHERIT=cmake-multilib
-IUSE=examples openexr 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 ~riscv sparc x86
-LICENSE=BSD
-RDEPEND=app-arch/brotli:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-cpp/gflags:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-cpp/highway-0.16.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/giflib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/lcms-2.13:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libpng:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/jpeg[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-misc/shared-mime-info-2.2 openexr? ( media-libs/openexr:= )
-SLOT=0
-SRC_URI=https://api.github.com/repos/libjxl/libjxl/tarball/fde214c5f4dc5ffd0360401a68df33182edf9226 -> libjxl-0.7.0_pre20220329.tar.gz
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	29a755b1291d64133634d80b0328f153	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=30b528876deb7128a6eadb13d25760b7
diff --git a/metadata/md5-cache/media-libs/libjxl-0.7.0_pre20220825 b/metadata/md5-cache/media-libs/libjxl-0.7.0_pre20220825
index fc9009a05620..e4e7154c02e5 100644
--- a/metadata/md5-cache/media-libs/libjxl-0.7.0_pre20220825
+++ b/metadata/md5-cache/media-libs/libjxl-0.7.0_pre20220825
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/libjxl/libjxl
 INHERIT=cmake-multilib
 IUSE=openexr 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 ~riscv sparc x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv sparc x86
 LICENSE=BSD
 RDEPEND=app-arch/brotli:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-cpp/gflags:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-cpp/highway-1.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/giflib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/lcms-2.13:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libjpeg-turbo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libpng:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-misc/shared-mime-info-2.2 openexr? ( media-libs/openexr:= )
 SLOT=0
 SRC_URI=https://api.github.com/repos/libjxl/libjxl/tarball/4c31ef03e3fd5239d6b794771d4ae7daa7815b28 -> libjxl-0.7.0_pre20220825.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	29a755b1291d64133634d80b0328f153	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=76271626531d73406048ad252fd8d943
+_md5_=e3142b90003355ea4d09d40d4967cd95
diff --git a/metadata/md5-cache/media-libs/libjxl-9999 b/metadata/md5-cache/media-libs/libjxl-9999
index b8112c59ebdc..dd3929583099 100644
--- a/metadata/md5-cache/media-libs/libjxl-9999
+++ b/metadata/md5-cache/media-libs/libjxl-9999
@@ -1,14 +1,14 @@
 BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=app-arch/brotli:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-cpp/gflags:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-cpp/highway-1.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/giflib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libpng:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] 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(-)?] >=x11-misc/shared-mime-info-2.2 gdk-pixbuf? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 ) gimp210? ( >=media-gfx/gimp-2.10.28:0/2 ) openexr? ( media-libs/openexr:= )
+DEPEND=app-arch/brotli:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-cpp/highway-1.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/giflib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libjpeg-turbo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libpng:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-misc/shared-mime-info-2.2 gdk-pixbuf? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 ) openexr? ( media-libs/openexr:= )
 DESCRIPTION=JPEG XL image format reference implementation
 EAPI=8
 HOMEPAGE=https://github.com/libjxl/libjxl
-INHERIT=cmake-multilib git-r3
-IUSE=gdk-pixbuf gimp210 openexr abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+INHERIT=cmake-multilib flag-o-matic git-r3
+IUSE=gdk-pixbuf openexr abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=app-arch/brotli:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-cpp/gflags:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-cpp/highway-1.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/giflib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libpng:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] 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(-)?] >=x11-misc/shared-mime-info-2.2 gdk-pixbuf? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 ) gimp210? ( >=media-gfx/gimp-2.10.28:0/2 ) openexr? ( media-libs/openexr:= )
+RDEPEND=app-arch/brotli:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-cpp/highway-1.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/giflib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libjpeg-turbo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libpng:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-misc/shared-mime-info-2.2 gdk-pixbuf? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 ) openexr? ( media-libs/openexr:= )
 SLOT=0
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	29a755b1291d64133634d80b0328f153	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=e6c947438b6aa1de075ac20408c1c381
+_md5_=eb7ff5670c43b18b06f324b362d0b631
diff --git a/metadata/md5-cache/media-libs/libquicktime-1.2.4-r3 b/metadata/md5-cache/media-libs/libquicktime-1.2.4-r4
similarity index 54%
rename from metadata/md5-cache/media-libs/libquicktime-1.2.4-r3
rename to metadata/md5-cache/media-libs/libquicktime-1.2.4-r4
index 45fcad32dc4d..5ae292057055 100644
--- a/metadata/md5-cache/media-libs/libquicktime-1.2.4-r3
+++ b/metadata/md5-cache/media-libs/libquicktime-1.2.4-r4
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig sys-devel/gettext doc? ( app-doc/doxygen ) X? ( x11-base/xorg-proto ) >=app-portage/elt-patches-20170815
 DEFINED_PHASES=compile configure install preinst prepare test
-DEPEND=sys-libs/zlib >=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(-)?] aac? ( >=media-libs/faad2-2.7-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(-)?] encode? ( >=media-libs/faac-1.28-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(-)?] ) ) alsa? ( >=media-libs/alsa-lib-1.0.20 ) dv? ( >=media-libs/libdv-1.0.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(-)?] ) ffmpeg? ( >=media-video/ffmpeg-3.2.6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gtk? ( x11-libs/gtk+:2 ) jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lame? ( >=media-sound/lame-3.99.5-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(-)?] ) opengl? ( virtual/opengl ) png? ( >=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(-)?] ) vorbis? ( >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libvorbis-1.3.3-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(-)?] ) X? ( x11-libs/libX11 x11-libs/libXaw x11-libs/libXext x11-libs/libXt x11-libs/libXv ) x264? ( >=media-libs/x264-0.0.20130506:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+DEPEND=sys-libs/zlib >=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(-)?] aac? ( >=media-libs/faad2-2.7-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(-)?] encode? ( >=media-libs/faac-1.28-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(-)?] ) ) alsa? ( >=media-libs/alsa-lib-1.0.20 ) dv? ( >=media-libs/libdv-1.0.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(-)?] ) ffmpeg? ( >=media-video/ffmpeg-3.2.6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gtk? ( x11-libs/gtk+:2 ) 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(-)?] ) lame? ( >=media-sound/lame-3.99.5-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(-)?] ) opengl? ( virtual/opengl ) png? ( >=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(-)?] ) vorbis? ( >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libvorbis-1.3.3-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(-)?] ) X? ( x11-libs/libX11 x11-libs/libXaw x11-libs/libXext x11-libs/libXt x11-libs/libXv ) x264? ( >=media-libs/x264-0.0.20130506:=[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=An enhanced version of the quicktime4linux library
 EAPI=7
 HOMEPAGE=http://libquicktime.sourceforge.net/
@@ -8,9 +8,9 @@ INHERIT=libtool multilib-minimal
 IUSE=aac alsa doc dv encode ffmpeg gtk jpeg lame cpu_flags_x86_mmx opengl png static-libs vorbis X x264 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 ppc ppc64 ~riscv sparc x86
 LICENSE=LGPL-2.1
-RDEPEND=sys-libs/zlib >=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(-)?] aac? ( >=media-libs/faad2-2.7-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(-)?] encode? ( >=media-libs/faac-1.28-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(-)?] ) ) alsa? ( >=media-libs/alsa-lib-1.0.20 ) dv? ( >=media-libs/libdv-1.0.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(-)?] ) ffmpeg? ( >=media-video/ffmpeg-3.2.6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gtk? ( x11-libs/gtk+:2 ) jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lame? ( >=media-sound/lame-3.99.5-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(-)?] ) opengl? ( virtual/opengl ) png? ( >=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(-)?] ) vorbis? ( >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libvorbis-1.3.3-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(-)?] ) X? ( x11-libs/libX11 x11-libs/libXaw x11-libs/libXext x11-libs/libXt x11-libs/libXv ) x264? ( >=media-libs/x264-0.0.20130506:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+RDEPEND=sys-libs/zlib >=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(-)?] aac? ( >=media-libs/faad2-2.7-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(-)?] encode? ( >=media-libs/faac-1.28-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(-)?] ) ) alsa? ( >=media-libs/alsa-lib-1.0.20 ) dv? ( >=media-libs/libdv-1.0.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(-)?] ) ffmpeg? ( >=media-video/ffmpeg-3.2.6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gtk? ( x11-libs/gtk+:2 ) 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(-)?] ) lame? ( >=media-sound/lame-3.99.5-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(-)?] ) opengl? ( virtual/opengl ) png? ( >=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(-)?] ) vorbis? ( >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libvorbis-1.3.3-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(-)?] ) X? ( x11-libs/libX11 x11-libs/libXaw x11-libs/libXext x11-libs/libXt x11-libs/libXv ) x264? ( >=media-libs/x264-0.0.20130506:=[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=opengl? ( X )
 SLOT=0
 SRC_URI=mirror://sourceforge/libquicktime/libquicktime-1.2.4.tar.gz
 _eclasses_=libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=6e564fe02c53773f90ddf85f30e50aee
+_md5_=7607c444c8359f3786dafc228dc4ba39
diff --git a/metadata/md5-cache/media-libs/libshumate-1.0.2 b/metadata/md5-cache/media-libs/libshumate-1.0.2
new file mode 100644
index 000000000000..a2427c39e2d7
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libshumate-1.0.2
@@ -0,0 +1,17 @@
+BDEPEND=gtk-doc? ( >=dev-util/gi-docgen-2021.1 ) 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 test
+DEPEND=>=dev-libs/glib-2.68.0:2 >=x11-libs/cairo-1.4 >=dev-db/sqlite-1.12:3 >=gui-libs/gtk-4:4 >=net-libs/libsoup-3.0:3.0 introspection? ( >=dev-libs/gobject-introspection-0.6.3:= )
+DESCRIPTION=Shumate is a GTK toolkit providing widgets for embedded maps
+EAPI=8
+HOMEPAGE=https://wiki.gnome.org/Projects/libshumate https://gitlab.gnome.org/GNOME/libshumate
+INHERIT=gnome.org meson vala virtualx
+IUSE=gtk-doc +introspection vala test
+KEYWORDS=~amd64
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-libs/glib-2.68.0:2 >=x11-libs/cairo-1.4 >=dev-db/sqlite-1.12:3 >=gui-libs/gtk-4:4 >=net-libs/libsoup-3.0:3.0 introspection? ( >=dev-libs/gobject-introspection-0.6.3:= )
+REQUIRED_USE=gtk-doc? ( introspection )
+RESTRICT=!test? ( test )
+SLOT=1.0/1
+SRC_URI=mirror://gnome/sources/libshumate/1.0/libshumate-1.0.2.tar.xz
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	vala	160a8a30a6cb9aa601e5441c643a7c61	virtualx	644887c82aefdf12001489391fca4f02
+_md5_=078bc7023c8dc31b7b067e247f54afaa
diff --git a/metadata/md5-cache/media-libs/libuninameslist-20221022 b/metadata/md5-cache/media-libs/libuninameslist-20221022
new file mode 100644
index 000000000000..adcf0ba54bae
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libuninameslist-20221022
@@ -0,0 +1,9 @@
+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
+LICENSE=BSD
+SLOT=0/1
+SRC_URI=https://github.com/fontforge/libuninameslist/releases/download/20221022/libuninameslist-dist-20221022.tar.gz
+_md5_=8407f4676cfa065aa9315143159cfa09
diff --git a/metadata/md5-cache/media-libs/mlt-7.8.0 b/metadata/md5-cache/media-libs/mlt-7.8.0
index 5e3f6a8931f3..b67cdd69f31a 100644
--- a/metadata/md5-cache/media-libs/mlt-7.8.0
+++ b/metadata/md5-cache/media-libs/mlt-7.8.0
@@ -1,17 +1,17 @@
 BDEPEND=virtual/pkgconfig python? ( >=dev-lang/swig-2.0 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=media-libs/libebur128-1.2.2:= sci-libs/fftw:3.0= ffmpeg? ( media-video/ffmpeg:0=[vdpau?,-flite] ) frei0r? ( media-plugins/frei0r-plugins ) gtk? ( media-libs/libexif x11-libs/pango ) jack? ( >=dev-libs/libxml2-2.5 media-libs/ladspa-sdk virtual/jack ) libsamplerate? ( >=media-libs/libsamplerate-0.1.2 ) opencv? ( >=media-libs/opencv-4.5.1:=[contrib] ) opengl? ( media-libs/libglvnd media-video/movit ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/libexif x11-libs/libX11 ) rtaudio? ( >=media-libs/rtaudio-4.1.2 kernel_linux? ( media-libs/alsa-lib ) ) rubberband? ( media-libs/rubberband ) sdl? ( media-libs/libsdl2[X,opengl,video] media-libs/sdl2-image ) vidstab? ( media-libs/vidstab ) xine? ( >=media-libs/xine-lib-1.1.2_pre20060328-r7 ) xml? ( >=dev-libs/libxml2-2.5 )
+DEPEND=>=media-libs/libebur128-1.2.2:= sci-libs/fftw:3.0= ffmpeg? ( media-video/ffmpeg:0=[vdpau?,-flite] ) frei0r? ( media-plugins/frei0r-plugins ) gtk? ( media-libs/libexif x11-libs/pango ) jack? ( >=dev-libs/libxml2-2.5 media-libs/ladspa-sdk virtual/jack ) libsamplerate? ( >=media-libs/libsamplerate-0.1.2 ) opencv? ( >=media-libs/opencv-4.5.1:=[contrib] ) opengl? ( media-libs/libglvnd media-video/movit ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/libexif x11-libs/libX11 ) rtaudio? ( >=media-libs/rtaudio-4.1.2 kernel_linux? ( media-libs/alsa-lib ) ) rubberband? ( media-libs/rubberband ) sdl? ( media-libs/libsdl2[X,opengl,video] media-libs/sdl2-image ) vidstab? ( media-libs/vidstab ) xine? ( >=media-libs/xine-lib-1.1.2_pre20060328-r7 ) xml? ( >=dev-libs/libxml2-2.5 )
 DESCRIPTION=Open source multimedia framework for television broadcasting
 EAPI=8
 HOMEPAGE=https://www.mltframework.org/
 INHERIT=python-single-r1 cmake
-IUSE=debug ffmpeg frei0r gtk jack libsamplerate opencv opengl python qt5 rtaudio rubberband sdl test vdpau vidstab xine xml python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+IUSE=debug ffmpeg frei0r gtk jack libsamplerate opencv opengl python qt5 rtaudio rubberband sdl test vdpau vidstab xine xml python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
 KEYWORDS=amd64 arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3
-RDEPEND=>=media-libs/libebur128-1.2.2:= sci-libs/fftw:3.0= ffmpeg? ( media-video/ffmpeg:0=[vdpau?,-flite] ) frei0r? ( media-plugins/frei0r-plugins ) gtk? ( media-libs/libexif x11-libs/pango ) jack? ( >=dev-libs/libxml2-2.5 media-libs/ladspa-sdk virtual/jack ) libsamplerate? ( >=media-libs/libsamplerate-0.1.2 ) opencv? ( >=media-libs/opencv-4.5.1:=[contrib] ) opengl? ( media-libs/libglvnd media-video/movit ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/libexif x11-libs/libX11 ) rtaudio? ( >=media-libs/rtaudio-4.1.2 kernel_linux? ( media-libs/alsa-lib ) ) rubberband? ( media-libs/rubberband ) sdl? ( media-libs/libsdl2[X,opengl,video] media-libs/sdl2-image ) vidstab? ( media-libs/vidstab ) xine? ( >=media-libs/xine-lib-1.1.2_pre20060328-r7 ) xml? ( >=dev-libs/libxml2-2.5 )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
+RDEPEND=>=media-libs/libebur128-1.2.2:= sci-libs/fftw:3.0= ffmpeg? ( media-video/ffmpeg:0=[vdpau?,-flite] ) frei0r? ( media-plugins/frei0r-plugins ) gtk? ( media-libs/libexif x11-libs/pango ) jack? ( >=dev-libs/libxml2-2.5 media-libs/ladspa-sdk virtual/jack ) libsamplerate? ( >=media-libs/libsamplerate-0.1.2 ) opencv? ( >=media-libs/opencv-4.5.1:=[contrib] ) opengl? ( media-libs/libglvnd media-video/movit ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/libexif x11-libs/libX11 ) rtaudio? ( >=media-libs/rtaudio-4.1.2 kernel_linux? ( media-libs/alsa-lib ) ) rubberband? ( media-libs/rubberband ) sdl? ( media-libs/libsdl2[X,opengl,video] media-libs/sdl2-image ) vidstab? ( media-libs/vidstab ) xine? ( >=media-libs/xine-lib-1.1.2_pre20060328-r7 ) xml? ( >=dev-libs/libxml2-2.5 )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) )
 RESTRICT=test
 SLOT=0/7
 SRC_URI=https://github.com/mltframework/mlt/releases/download/v7.8.0/mlt-7.8.0.tar.gz -> mlt-7.8.0a.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=ec3a5f50f4e53025ca1e34946cb9e128
+_md5_=d45048acbd036ed9622dec1bd72d4819
diff --git a/metadata/md5-cache/media-libs/mutagen-1.46.0 b/metadata/md5-cache/media-libs/mutagen-1.46.0
new file mode 100644
index 000000000000..b05e2a2e9f35
--- /dev/null
+++ b/metadata/md5-cache/media-libs/mutagen-1.46.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/eyeD3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/hypothesis[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] media-libs/flac[ogg] ) test? ( >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_11(-)] dev-python/sphinx_rtd_theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_10(-)] dev-python/sphinx_rtd_theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)] ) ) ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Audio metadata tag reader and writer implemented in pure Python
+EAPI=8
+HOMEPAGE=https://github.com/quodlibet/mutagen/ https://pypi.org/project/mutagen/
+INHERIT=distutils-r1
+IUSE=test doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/quodlibet/mutagen/releases/download/release-1.46.0/mutagen-1.46.0.tar.gz
+_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=8e8377a722fe1b81abc8f856bcb6506d
diff --git a/metadata/md5-cache/media-libs/openh264-2.3.1-r1 b/metadata/md5-cache/media-libs/openh264-2.3.1-r1
index eb7d4f985158..eb0852130cf5 100644
--- a/metadata/md5-cache/media-libs/openh264-2.3.1-r1
+++ b/metadata/md5-cache/media-libs/openh264-2.3.1-r1
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://www.openh264.org/ https://github.com/cisco/openh264
 INHERIT=toolchain-funcs multilib-minimal
 IUSE=cpu_flags_arm_neon cpu_flags_x86_avx2 +plugin utils 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 ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=BSD
 RESTRICT=bindist test
 SLOT=0/7
 SRC_URI=https://github.com/cisco/openh264/archive/refs/tags/v2.3.1.tar.gz -> openh264-2.3.1.tar.gz https://github.com/mozilla/gmp-api/archive/3a01c086d1b0394238ff1b5ad22e76022830625a.tar.gz -> gmp-api-Firefox39-3a01c086d1b0394238ff1b5ad22e76022830625a.tar.gz
 _eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=76e4c86dd796fb934f852af92845d8d3
+_md5_=01d8939977fd78ba6f66fffd25b305a0
diff --git a/metadata/md5-cache/media-radio/Manifest.gz b/metadata/md5-cache/media-radio/Manifest.gz
index 006cb4275872..beaadea144a8 100644
Binary files a/metadata/md5-cache/media-radio/Manifest.gz and b/metadata/md5-cache/media-radio/Manifest.gz differ
diff --git a/metadata/md5-cache/media-radio/fldigi-4.1.23 b/metadata/md5-cache/media-radio/fldigi-4.1.23
index ee3ce594c2b0..8dd408d55079 100644
--- a/metadata/md5-cache/media-radio/fldigi-4.1.23
+++ b/metadata/md5-cache/media-radio/fldigi-4.1.23
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=http://www.w1hkj.com
 INHERIT=flag-o-matic
 IUSE=hamlib nls pulseaudio cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=x11-libs/fltk:1[threads,xft] media-libs/libsamplerate media-libs/libpng:0 x11-misc/xdg-utils dev-perl/RPC-XML dev-perl/Term-ReadLine-Perl || ( media-libs/portaudio[oss] media-libs/portaudio[alsa] ) hamlib? ( media-libs/hamlib:= ) pulseaudio? ( media-sound/pulseaudio ) >=media-libs/libsndfile-1.0.10
 SLOT=0
 SRC_URI=mirror://sourceforge/fldigi/fldigi-4.1.23.tar.gz
 _eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=d5fe9a3a494ac432d04783bcb525e5c4
+_md5_=c5a1e82ea7f85b7163cbdc17d8528025
diff --git a/metadata/md5-cache/media-radio/flrig-1.4.7 b/metadata/md5-cache/media-radio/flrig-1.4.7
index 2a0753457e24..de0d26f95fe2 100644
--- a/metadata/md5-cache/media-radio/flrig-1.4.7
+++ b/metadata/md5-cache/media-radio/flrig-1.4.7
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=http://www.w1hkj.com/flrig-help/index.html
 INHERIT=flag-o-matic
 IUSE=nls
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 x11-libs/fltk:1 x11-misc/xdg-utils
 SLOT=0
 SRC_URI=mirror://sourceforge/fldigi/flrig-1.4.7.tar.gz
 _eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=82b3e5983bca655daf4d84bfddf65140
+_md5_=456ed0b54334120b01292a50cf8927cc
diff --git a/metadata/md5-cache/media-radio/tucnak-4.37 b/metadata/md5-cache/media-radio/tucnak-4.37
new file mode 100644
index 000000000000..20a6eef72d7f
--- /dev/null
+++ b/metadata/md5-cache/media-radio/tucnak-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 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=dev-libs/glib:2 dev-libs/libzia media-libs/libsndfile >=media-libs/libsdl-1.2 alsa? ( media-libs/alsa-lib ) fftw? ( sci-libs/fftw:3.0 ) gpm? ( sys-libs/gpm ) hamlib? ( media-libs/hamlib:= ) virtual/pkgconfig
+DESCRIPTION=Amateur Radio VHF Contest Logbook
+EAPI=8
+HOMEPAGE=http://tucnak.nagano.cz
+INHERIT=autotools flag-o-matic
+IUSE=alsa fftw gpm hamlib suid
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/glib:2 dev-libs/libzia media-libs/libsndfile >=media-libs/libsdl-1.2 alsa? ( media-libs/alsa-lib ) fftw? ( sci-libs/fftw:3.0 ) gpm? ( sys-libs/gpm ) hamlib? ( media-libs/hamlib:= )
+SLOT=0
+SRC_URI=http://tucnak.nagano.cz/tucnak-4.37.tar.gz
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=e18d6b9d8bf9e91a02358e013a2d35eb
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index 4df6be311747..38e315a5019f 100644
Binary files a/metadata/md5-cache/media-sound/Manifest.gz and b/metadata/md5-cache/media-sound/Manifest.gz differ
diff --git a/metadata/md5-cache/media-sound/pavucontrol-5.0-r1 b/metadata/md5-cache/media-sound/pavucontrol-5.0-r1
index afd53c09421a..742728cc2def 100644
--- a/metadata/md5-cache/media-sound/pavucontrol-5.0-r1
+++ b/metadata/md5-cache/media-sound/pavucontrol-5.0-r1
@@ -5,9 +5,9 @@ DESCRIPTION=Pulseaudio Volume Control, GTK based mixer for Pulseaudio
 EAPI=7
 HOMEPAGE=https://freedesktop.org/software/pulseaudio/pavucontrol/
 IUSE=nls
-KEYWORDS=amd64 arm ~arm64 ~hppa ppc ~ppc64 ~riscv ~sparc x86
+KEYWORDS=amd64 arm ~arm64 ~hppa ~loong ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/json-glib >=dev-cpp/gtkmm-3.22:3.0[X] >=dev-libs/libsigc++-2.2:2 >=media-libs/libcanberra-0.16[gtk3] >=media-sound/pulseaudio-15.0[glib] virtual/freedesktop-icon-theme
 SLOT=0
 SRC_URI=https://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-5.0.tar.xz
-_md5_=a21c26c7aed10a823516bc5424b2e0e1
+_md5_=85ab10b3feb2d759ba6298274a5b97d4
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index b2b9ecc6394a..fe9e30be70bc 100644
Binary files a/metadata/md5-cache/net-analyzer/Manifest.gz and b/metadata/md5-cache/net-analyzer/Manifest.gz differ
diff --git a/metadata/md5-cache/net-analyzer/vnstat-2.10 b/metadata/md5-cache/net-analyzer/vnstat-2.10
new file mode 100644
index 000000000000..1c7178b91a39
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/vnstat-2.10
@@ -0,0 +1,16 @@
+BDEPEND=verify-sig? ( sec-keys/openpgp-keys-teemutoivola ) virtual/pkgconfig verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile install postinst unpack
+DEPEND=acct-group/vnstat acct-user/vnstat dev-db/sqlite gd? ( media-libs/gd[png] ) test? ( dev-libs/check )
+DESCRIPTION=Console-based network traffic monitor that keeps statistics of network usage
+EAPI=8
+HOMEPAGE=https://humdi.net/vnstat/
+INHERIT=systemd tmpfiles verify-sig
+IUSE=gd selinux test verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=acct-group/vnstat acct-user/vnstat dev-db/sqlite gd? ( media-libs/gd[png] ) selinux? ( sec-policy/selinux-vnstatd ) virtual/tmpfiles
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://humdi.net/vnstat/vnstat-2.10.tar.gz https://github.com/vergoh/vnstat/releases/download/v2.10/vnstat-2.10.tar.gz verify-sig? ( https://humdi.net/vnstat/vnstat-2.10.tar.gz.asc https://github.com/vergoh/vnstat/releases/download/v2.10/vnstat-2.10.tar.gz.asc )
+_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	0748d665fa664a87add00152ed046e16
+_md5_=9912e34835ed48d6b31099bbfaacb727
diff --git a/metadata/md5-cache/net-analyzer/vnstat-9999 b/metadata/md5-cache/net-analyzer/vnstat-9999
index baf069184d0a..94faa1b535ba 100644
--- a/metadata/md5-cache/net-analyzer/vnstat-9999
+++ b/metadata/md5-cache/net-analyzer/vnstat-9999
@@ -12,4 +12,4 @@ RDEPEND=acct-group/vnstat acct-user/vnstat dev-db/sqlite gd? ( media-libs/gd[png
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=6edce34e4d019bebdac17e61e5ba7db3
+_md5_=9912e34835ed48d6b31099bbfaacb727
diff --git a/metadata/md5-cache/net-dns/Manifest.gz b/metadata/md5-cache/net-dns/Manifest.gz
index 5e3925314f90..4b4d58ca6ae3 100644
Binary files a/metadata/md5-cache/net-dns/Manifest.gz and b/metadata/md5-cache/net-dns/Manifest.gz differ
diff --git a/metadata/md5-cache/net-dns/dnsmasq-2.87 b/metadata/md5-cache/net-dns/dnsmasq-2.87
new file mode 100644
index 000000000000..2a9256027121
--- /dev/null
+++ b/metadata/md5-cache/net-dns/dnsmasq-2.87
@@ -0,0 +1,16 @@
+BDEPEND=app-arch/xz-utils virtual/pkgconfig nls? ( sys-devel/gettext ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst preinst prepare pretend setup
+DEPEND=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? ( dev-libs/nettle:=[gmp] static? ( >=dev-libs/nettle-3.4[static-libs(+)] ) ) nettlehash? ( static? ( >=dev-libs/nettle-3.4[static-libs(+)] ) )
+DESCRIPTION=Small forwarding DNS server
+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 ~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.87.tar.xz
+_eclasses_=lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=df0ae969219d25641a993c52366b7df4
diff --git a/metadata/md5-cache/net-dns/unbound-1.16.3 b/metadata/md5-cache/net-dns/unbound-1.16.3
index 28a756849fde..d7b8b638754e 100644
--- a/metadata/md5-cache/net-dns/unbound-1.16.3
+++ b/metadata/md5-cache/net-dns/unbound-1.16.3
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://unbound.net/ https://nlnetlabs.nl/projects/unbound/about/
 INHERIT=autotools flag-o-matic multilib-minimal python-single-r1 systemd verify-sig
 IUSE=debug dnscrypt dnstap +ecdsa ecs gost +http2 python redis selinux static-libs systemd test +tfo threads 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_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 verify-sig
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~x86
 LICENSE=BSD GPL-2
 RDEPEND=acct-group/unbound acct-user/unbound >=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(-)?] >=dev-libs/libevent-2.0.21: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/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dnscrypt? ( dev-libs/libsodium:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dnstap? ( dev-libs/fstrm[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/protobuf-c-1.0.2-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(-)?] ) ecdsa? ( dev-libs/openssl:0[-bindist(-)] ) http2? ( net-libs/nghttp2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) ) redis? ( dev-libs/hiredis:= ) systemd? ( sys-apps/systemd ) net-dns/dnssec-root selinux? ( sec-policy/selinux-bind ) net-dns/dnssec-root
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/8
 SRC_URI=https://nlnetlabs.nl/downloads/unbound/unbound-1.16.3.tar.gz verify-sig? ( https://nlnetlabs.nl/downloads/unbound/unbound-1.16.3.tar.gz.asc )
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	0748d665fa664a87add00152ed046e16
-_md5_=6cfbc056cbf80ce79fde62548218311a
+_md5_=8308ddd7013de4882209debc86475a1f
diff --git a/metadata/md5-cache/net-firewall/Manifest.gz b/metadata/md5-cache/net-firewall/Manifest.gz
index 8f70fe075ee6..7cecb762c77d 100644
Binary files a/metadata/md5-cache/net-firewall/Manifest.gz and b/metadata/md5-cache/net-firewall/Manifest.gz differ
diff --git a/metadata/md5-cache/net-firewall/ferm-2.7 b/metadata/md5-cache/net-firewall/ferm-2.7
index bed02a1c7ed4..24cc4462ae42 100644
--- a/metadata/md5-cache/net-firewall/ferm-2.7
+++ b/metadata/md5-cache/net-firewall/ferm-2.7
@@ -4,11 +4,11 @@ DESCRIPTION=Command line util for managing firewall rules
 EAPI=8
 HOMEPAGE=http://ferm.foo-projects.org/
 INHERIT=systemd
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc ~x86
 LICENSE=GPL-2+
 RDEPEND=dev-lang/perl:* net-firewall/iptables virtual/perl-File-Spec
 RESTRICT=test
 SLOT=0
 SRC_URI=http://ferm.foo-projects.org/download/2.7/ferm-2.7.tar.xz
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=e0ee44786f05c5b3c1b821f0bfa23ec7
+_md5_=dc71786d5d5977e716edabe289dda7e4
diff --git a/metadata/md5-cache/net-irc/Manifest.gz b/metadata/md5-cache/net-irc/Manifest.gz
index ae65bb82b9a3..3f4910ccf06b 100644
Binary files a/metadata/md5-cache/net-irc/Manifest.gz and b/metadata/md5-cache/net-irc/Manifest.gz differ
diff --git a/metadata/md5-cache/net-irc/psybnc-2.3.2.9-r4 b/metadata/md5-cache/net-irc/psybnc-2.3.2.9-r4
index adc7b1e804c3..701ea1879dc0 100644
--- a/metadata/md5-cache/net-irc/psybnc-2.3.2.9-r4
+++ b/metadata/md5-cache/net-irc/psybnc-2.3.2.9-r4
@@ -11,4 +11,4 @@ RDEPEND=acct-group/psybnc acct-user/psybnc ssl? ( >=dev-libs/openssl-0.9.7d:= )
 SLOT=0
 SRC_URI=http://www.psybnc.at/download/beta/psyBNC-2.3.2-9.tar.gz
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=3143046017b8baa9fd32ec3b4db9cfef
+_md5_=64598f28b48633a89adc4f2168cf28e5
diff --git a/metadata/md5-cache/net-irc/psybnc-2.4.3 b/metadata/md5-cache/net-irc/psybnc-2.4.3
new file mode 100644
index 000000000000..4dedb75375d9
--- /dev/null
+++ b/metadata/md5-cache/net-irc/psybnc-2.4.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile config install postinst prepare unpack
+DEPEND=acct-group/psybnc acct-user/psybnc ssl? ( >=dev-libs/openssl-0.9.7d:= ) oidentd? ( >=net-misc/oidentd-2.0 )
+DESCRIPTION=A multi-user and multi-server gateway to IRC networks
+EAPI=8
+HOMEPAGE=http://www.psybnc.at/index.html
+INHERIT=toolchain-funcs
+IUSE=ipv6 ssl oidentd scripting multinetwork
+KEYWORDS=~amd64 ~ppc ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=acct-group/psybnc acct-user/psybnc ssl? ( >=dev-libs/openssl-0.9.7d:= ) oidentd? ( >=net-misc/oidentd-2.0 )
+SLOT=0
+SRC_URI=http://psybnc.org/download/psyBNC-2.4.3.tar.gz
+_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=411a0937b1820542d89f0df493558989
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index b588cf80e60c..47274b67be7c 100644
Binary files a/metadata/md5-cache/net-libs/Manifest.gz and b/metadata/md5-cache/net-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/net-libs/kdsoap-2.0.0 b/metadata/md5-cache/net-libs/kdsoap-2.0.0
deleted file mode 100644
index 8f25076b702d..000000000000
--- a/metadata/md5-cache/net-libs/kdsoap-2.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-qt/qtcore:5 dev-qt/qtnetwork:5 dev-qt/qtxml:5 dev-libs/boost
-DESCRIPTION=Qt-based client-side and server-side SOAP component
-EAPI=8
-HOMEPAGE=https://www.kdab.com/development-resources/qt-tools/kd-soap/
-INHERIT=cmake
-KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
-LICENSE=GPL-3 AGPL-3
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtnetwork:5 dev-qt/qtxml:5
-SLOT=0/2
-SRC_URI=https://github.com/KDAB/KDSoap/releases/download/kdsoap-2.0.0/kdsoap-2.0.0.tar.gz
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=39f7d95ea464ffe294de0e825c4164a5
diff --git a/metadata/md5-cache/net-libs/kdsoap-2.1.1 b/metadata/md5-cache/net-libs/kdsoap-2.1.1
index 65f4912a9891..db8f4306ee99 100644
--- a/metadata/md5-cache/net-libs/kdsoap-2.1.1
+++ b/metadata/md5-cache/net-libs/kdsoap-2.1.1
@@ -5,10 +5,10 @@ DESCRIPTION=Qt-based client-side and server-side SOAP component
 EAPI=8
 HOMEPAGE=https://www.kdab.com/development-resources/qt-tools/kd-soap/
 INHERIT=cmake
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
 LICENSE=GPL-3 AGPL-3
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtnetwork:5 dev-qt/qtxml:5
 SLOT=0/2
 SRC_URI=https://github.com/KDAB/KDSoap/releases/download/kdsoap-2.1.1/kdsoap-2.1.1.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=56a16fb821642ecf1e56057d7d594107
+_md5_=d6e31830ef5ba6bc5f011e26272b2de2
diff --git a/metadata/md5-cache/net-libs/libaccounts-glib-1.25-r2 b/metadata/md5-cache/net-libs/libaccounts-glib-1.25-r2
deleted file mode 100644
index 5de77eccfb57..000000000000
--- a/metadata/md5-cache/net-libs/libaccounts-glib-1.25-r2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=|| ( dev-lang/vala:0.56 ) dev-util/gdbus-codegen dev-util/glib-utils dev-libs/check doc? ( dev-util/gtk-doc ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) dev-db/sqlite:3 dev-libs/glib:2 dev-libs/gobject-introspection:= dev-libs/libxml2 dev-python/pygobject:3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DESCRIPTION=Accounts SSO (Single Sign-On) management library for GLib applications
-EAPI=7
-HOMEPAGE=https://gitlab.com/accounts-sso/libaccounts-glib
-INHERIT=meson python-r1 vala
-IUSE=doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86
-LICENSE=LGPL-2.1
-RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) dev-db/sqlite:3 dev-libs/glib:2 dev-libs/gobject-introspection:= dev-libs/libxml2 dev-python/pygobject:3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://gitlab.com/accounts-sso/libaccounts-glib/-/archive/VERSION_1.25/libaccounts-glib-VERSION_1.25.tar.gz -> libaccounts-glib-1.25.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	meson	1994a5aef5d4f5798b92f64d6f9a6003	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	vala	160a8a30a6cb9aa601e5441c643a7c61	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=68081f7d592e207d2afe2b47c966739d
diff --git a/metadata/md5-cache/net-libs/libaccounts-glib-1.26-r1 b/metadata/md5-cache/net-libs/libaccounts-glib-1.26-r1
new file mode 100644
index 000000000000..50c8578490d7
--- /dev/null
+++ b/metadata/md5-cache/net-libs/libaccounts-glib-1.26-r1
@@ -0,0 +1,17 @@
+BDEPEND=|| ( dev-lang/vala:0.56 ) dev-libs/check dev-util/gdbus-codegen dev-util/glib-utils doc? ( dev-util/gtk-doc ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) dev-db/sqlite:3 dev-libs/glib:2 dev-libs/gobject-introspection:= dev-libs/libxml2 dev-python/pygobject:3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DESCRIPTION=Accounts SSO (Single Sign-On) management library for GLib applications
+EAPI=8
+HOMEPAGE=https://gitlab.com/accounts-sso/libaccounts-glib
+INHERIT=meson python-r1 vala
+IUSE=doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2.1
+RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) dev-db/sqlite:3 dev-libs/glib:2 dev-libs/gobject-introspection:= dev-libs/libxml2 dev-python/pygobject:3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://gitlab.com/accounts-sso/libaccounts-glib/-/archive/VERSION_1.26/libaccounts-glib-VERSION_1.26.tar.gz -> libaccounts-glib-1.26.tar.gz
+_eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	vala	160a8a30a6cb9aa601e5441c643a7c61
+_md5_=24cf9a9ef77b316006437a73e6f602ac
diff --git a/metadata/md5-cache/net-libs/liblockfile-1.17 b/metadata/md5-cache/net-libs/liblockfile-1.17
index 890bf5124947..9b9aacacfed3 100644
--- a/metadata/md5-cache/net-libs/liblockfile-1.17
+++ b/metadata/md5-cache/net-libs/liblockfile-1.17
@@ -1,6 +1,5 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+BDEPEND=acct-group/mail sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install prepare
-DEPEND=acct-group/mail
 DESCRIPTION=Implements functions designed to lock the standard mailboxes
 EAPI=7
 HOMEPAGE=https://github.com/miquels/liblockfile
@@ -12,4 +11,4 @@ RDEPEND=acct-group/mail
 SLOT=0
 SRC_URI=https://github.com/miquels/liblockfile/archive/v1.17.tar.gz -> liblockfile-1.17.tar.gz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=6c94605569619f334c0940098b8cedc0
+_md5_=64269be4881c46219ce328b08d40785e
diff --git a/metadata/md5-cache/net-libs/libsignon-glib-2.1-r1 b/metadata/md5-cache/net-libs/libsignon-glib-2.1-r2
similarity index 52%
rename from metadata/md5-cache/net-libs/libsignon-glib-2.1-r1
rename to metadata/md5-cache/net-libs/libsignon-glib-2.1-r2
index b1d5eff4371c..c84895643958 100644
--- a/metadata/md5-cache/net-libs/libsignon-glib-2.1-r1
+++ b/metadata/md5-cache/net-libs/libsignon-glib-2.1-r2
@@ -1,17 +1,17 @@
-BDEPEND=|| ( ( >=dev-lang/python-3.10.4:3.10 ) ( >=dev-lang/python-3.9.12:3.9 ) ( >=dev-lang/python-3.8.13:3.8 ) ) || ( dev-lang/vala:0.56 ) dev-util/gdbus-codegen dev-util/glib-utils doc? ( dev-util/gtk-doc ) test? ( dev-libs/check ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+BDEPEND=|| ( ( >=dev-lang/python-3.11.0_beta4:3.11 ) ( >=dev-lang/python-3.10.4:3.10 ) ( >=dev-lang/python-3.9.12:3.9 ) ( >=dev-lang/python-3.8.13:3.8 ) ) || ( dev-lang/vala:0.56 ) dev-util/gdbus-codegen dev-util/glib-utils doc? ( dev-util/gtk-doc ) test? ( dev-libs/check ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-libs/glib:2 net-libs/signond introspection? ( dev-libs/gobject-introspection:= ) python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) dev-python/pygobject:3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] )
+DEPEND=dev-libs/glib:2 net-libs/signond introspection? ( dev-libs/gobject-introspection:= ) python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) dev-python/pygobject:3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] )
 DESCRIPTION=GLib binding for the D-Bus API provided by signond
-EAPI=7
+EAPI=8
 HOMEPAGE=https://accounts-sso.gitlab.io/
 INHERIT=meson python-r1 vala
-IUSE=debug doc +introspection python test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+IUSE=debug doc +introspection python test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=amd64 arm64 ~riscv x86
 LICENSE=LGPL-2.1
-RDEPEND=dev-libs/glib:2 net-libs/signond introspection? ( dev-libs/gobject-introspection:= ) python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) dev-python/pygobject:3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] )
-REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) introspection )
+RDEPEND=dev-libs/glib:2 net-libs/signond introspection? ( dev-libs/gobject-introspection:= ) python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) dev-python/pygobject:3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] )
+REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 ) introspection )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://gitlab.com/accounts-sso/libsignon-glib/-/archive/VERSION_2.1/libsignon-glib-VERSION_2.1.tar.gz -> libsignon-glib-2.1.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	meson	1994a5aef5d4f5798b92f64d6f9a6003	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	vala	160a8a30a6cb9aa601e5441c643a7c61	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=3054c8d4a3870d3b77e75cfff30749b3
+_eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	vala	160a8a30a6cb9aa601e5441c643a7c61
+_md5_=09da632f77c17f543b73a264c79a3ac5
diff --git a/metadata/md5-cache/net-libs/libtorrent-rasterbar-1.2.16 b/metadata/md5-cache/net-libs/libtorrent-rasterbar-1.2.16
deleted file mode 100644
index 82eb376e405e..000000000000
--- a/metadata/md5-cache/net-libs/libtorrent-rasterbar-1.2.16
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=python? ( python_single_target_python3_8? ( dev-python/setuptools[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/setuptools[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/setuptools[python_targets_python3_10(-)] ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-libs/boost:= python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_8? ( dev-libs/boost[python,python_targets_python3_8(-)] ) 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(-)] ) ) ssl? ( dev-libs/openssl:= )
-DESCRIPTION=C++ BitTorrent implementation focusing on efficiency and scalability
-EAPI=7
-HOMEPAGE=https://libtorrent.org/ https://github.com/arvidn/libtorrent
-INHERIT=cmake python-single-r1
-IUSE=+dht debug python ssl test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86
-LICENSE=BSD
-RDEPEND=dev-libs/boost:= python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_8? ( dev-libs/boost[python,python_targets_python3_8(-)] ) 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(-)] ) ) ssl? ( dev-libs/openssl:= )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
-RESTRICT=!test? ( test )
-SLOT=0/10
-SRC_URI=https://github.com/arvidn/libtorrent/releases/download/v1.2.16/libtorrent-rasterbar-1.2.16.tar.gz
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=ce351f157287422c12d57eb0da8c4ddd
diff --git a/metadata/md5-cache/net-libs/libtorrent-rasterbar-1.2.17 b/metadata/md5-cache/net-libs/libtorrent-rasterbar-1.2.18
similarity index 97%
rename from metadata/md5-cache/net-libs/libtorrent-rasterbar-1.2.17
rename to metadata/md5-cache/net-libs/libtorrent-rasterbar-1.2.18
index 3797c43854f8..ef623ef06e8d 100644
--- a/metadata/md5-cache/net-libs/libtorrent-rasterbar-1.2.17
+++ b/metadata/md5-cache/net-libs/libtorrent-rasterbar-1.2.18
@@ -12,6 +12,6 @@ RDEPEND=dev-libs/boost:= python? ( python_single_target_python3_8? ( >=dev-lang/
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
 RESTRICT=!test? ( test )
 SLOT=0/10
-SRC_URI=https://github.com/arvidn/libtorrent/releases/download/v1.2.17/libtorrent-rasterbar-1.2.17.tar.gz
+SRC_URI=https://github.com/arvidn/libtorrent/releases/download/v1.2.18/libtorrent-rasterbar-1.2.18.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=ce351f157287422c12d57eb0da8c4ddd
+_md5_=04eeaba82e62e1638edfdb2f84028eb1
diff --git a/metadata/md5-cache/net-libs/pjproject-2.12.1-r2 b/metadata/md5-cache/net-libs/pjproject-2.12.1-r2
index d229056559e3..e27a274e4212 100644
--- a/metadata/md5-cache/net-libs/pjproject-2.12.1-r2
+++ b/metadata/md5-cache/net-libs/pjproject-2.12.1-r2
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://www.pjsip.org/
 INHERIT=autotools flag-o-matic toolchain-funcs
 IUSE=amr debug epoll examples opus resample silk ssl static-libs webrtc g711 g722 g7221 gsm ilbc speex l16 g729 sdl ffmpeg v4l2 openh264 libyuv vpx alsa portaudio
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=net-libs/libsrtp-2.3.0:= alsa? ( media-libs/alsa-lib ) amr? ( media-libs/opencore-amr ) ffmpeg? ( media-video/ffmpeg:= ) g729? ( media-libs/bcg729 ) gsm? ( media-sound/gsm ) ilbc? ( media-libs/libilbc ) openh264? ( media-libs/openh264 ) opus? ( media-libs/opus ) portaudio? ( media-libs/portaudio ) resample? ( media-libs/libsamplerate ) sdl? ( media-libs/libsdl ) speex? ( media-libs/speex media-libs/speexdsp ) ssl? ( dev-libs/openssl:0= )
 SLOT=0/2.12.1
 SRC_URI=https://github.com/pjsip/pjproject/archive/2.12.1.tar.gz -> pjproject-2.12.1.tar.gz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=0897d2d614c4989fd0d7d410a41d94ad
+_md5_=277ec9fc322f6e856e74d872ec28b514
diff --git a/metadata/md5-cache/net-libs/telepathy-logger-qt-17.09.0 b/metadata/md5-cache/net-libs/telepathy-logger-qt-17.09.0
deleted file mode 100644
index 82034ff35efc..000000000000
--- a/metadata/md5-cache/net-libs/telepathy-logger-qt-17.09.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) >=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/dbus-glib dev-libs/glib:2 dev-libs/libxml2 >=dev-qt/qtdbus-5.12.3:5 net-im/telepathy-logger net-libs/telepathy-glib net-libs/telepathy-qt[qt5(+)] sys-apps/dbus dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Qt bindings for the Telepathy logger
-EAPI=7
-HOMEPAGE=https://invent.kde.org/network/telepathy-logger-qt
-INHERIT=ecm kde.org python-any-r1
-IUSE=debug
-KEYWORDS=amd64 arm64 ~riscv x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-libs/dbus-glib dev-libs/glib:2 dev-libs/libxml2 >=dev-qt/qtdbus-5.12.3:5 net-im/telepathy-logger net-libs/telepathy-glib net-libs/telepathy-qt[qt5(+)] sys-apps/dbus || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/telepathy-logger-qt/17.09/src/telepathy-logger-qt-17.09.0.tar.xz
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	ecm	3dae552f761290722bcc848a12bfb538	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	kde.org	087d21100477ce987a8de6c1d613a176	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	virtualx	644887c82aefdf12001489391fca4f02	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=38aab52c3919d9792718c015c376dd42
diff --git a/metadata/md5-cache/net-libs/telepathy-logger-qt-17.09.0-r1 b/metadata/md5-cache/net-libs/telepathy-logger-qt-17.09.0-r1
new file mode 100644
index 000000000000..d6114883f23d
--- /dev/null
+++ b/metadata/md5-cache/net-libs/telepathy-logger-qt-17.09.0-r1
@@ -0,0 +1,16 @@
+BDEPEND=|| ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) >=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/dbus-glib dev-libs/glib:2 dev-libs/libxml2 dev-qt/qtdbus:5 net-im/telepathy-logger net-libs/telepathy-glib net-libs/telepathy-qt sys-apps/dbus dev-qt/qtcore:5
+DESCRIPTION=Qt bindings for the Telepathy logger
+EAPI=8
+HOMEPAGE=https://invent.kde.org/network/telepathy-logger-qt
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=ecm kde.org python-any-r1
+IUSE=debug
+KEYWORDS=amd64 arm64 ~riscv x86
+LICENSE=LGPL-2.1
+RDEPEND=dev-libs/dbus-glib dev-libs/glib:2 dev-libs/libxml2 dev-qt/qtdbus:5 net-im/telepathy-logger net-libs/telepathy-glib net-libs/telepathy-qt sys-apps/dbus || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/telepathy-logger-qt/17.09/src/telepathy-logger-qt-17.09.0.tar.xz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	ecm	3dae552f761290722bcc848a12bfb538	flag-o-matic	29a755b1291d64133634d80b0328f153	kde.org	087d21100477ce987a8de6c1d613a176	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=9ab06ce54c3331eac371397fca4316ea
diff --git a/metadata/md5-cache/net-libs/telepathy-qt-0.9.8-r1 b/metadata/md5-cache/net-libs/telepathy-qt-0.9.8-r2
similarity index 50%
rename from metadata/md5-cache/net-libs/telepathy-qt-0.9.8-r1
rename to metadata/md5-cache/net-libs/telepathy-qt-0.9.8-r2
index bf89958a2288..73942571c601 100644
--- a/metadata/md5-cache/net-libs/telepathy-qt-0.9.8-r1
+++ b/metadata/md5-cache/net-libs/telepathy-qt-0.9.8-r2
@@ -1,8 +1,8 @@
-BDEPEND=|| ( >=dev-lang/python-3.10.4:3.10[xml(+)] >=dev-lang/python-3.9.12:3.9[xml(+)] >=dev-lang/python-3.8.13:3.8[xml(+)] ) virtual/pkgconfig test? ( dev-libs/glib:2 || ( ( >=dev-lang/python-3.10.4:3.10[xml(+)] dev-python/dbus-python[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9[xml(+)] dev-python/dbus-python[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8[xml(+)] dev-python/dbus-python[python_targets_python3_8(-)] ) ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+BDEPEND=|| ( >=dev-lang/python-3.11.0_beta4:3.11[xml(+)] >=dev-lang/python-3.10.4:3.10[xml(+)] >=dev-lang/python-3.9.12:3.9[xml(+)] >=dev-lang/python-3.8.13:3.8[xml(+)] ) virtual/pkgconfig test? ( dev-libs/glib:2 || ( ( >=dev-lang/python-3.11.0_beta4:3.11[xml(+)] dev-python/dbus-python[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10[xml(+)] dev-python/dbus-python[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9[xml(+)] dev-python/dbus-python[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8[xml(+)] dev-python/dbus-python[python_targets_python3_8(-)] ) ) ) >=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 setup test
 DEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtxml:5 farstream? ( >=net-libs/telepathy-farstream-0.2.2 >=net-libs/telepathy-glib-0.18.0 ) test? ( dev-libs/dbus-glib dev-qt/qttest:5 )
 DESCRIPTION=Qt bindings for the Telepathy D-Bus protocol
-EAPI=7
+EAPI=8
 HOMEPAGE=https://telepathy.freedesktop.org/
 INHERIT=python-any-r1 cmake virtualx
 IUSE=debug farstream test test
@@ -10,8 +10,8 @@ KEYWORDS=amd64 ~arm arm64 ~riscv x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtxml:5 farstream? ( >=net-libs/telepathy-farstream-0.2.2 >=net-libs/telepathy-glib-0.18.0 )
 REQUIRED_USE=test? ( farstream )
-RESTRICT=!test? ( test )
+RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://telepathy.freedesktop.org/releases/telepathy-qt/telepathy-qt-0.9.8.tar.gz
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	virtualx	644887c82aefdf12001489391fca4f02	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=f3e376f5c216cbc83757e39a9a18821e
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	virtualx	644887c82aefdf12001489391fca4f02	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=a5199c887bcd7d2dad5bd0b3ef580c8b
diff --git a/metadata/md5-cache/net-libs/telepathy-qt-9999 b/metadata/md5-cache/net-libs/telepathy-qt-9999
index 7444b71cf5b8..0e7b6edd0a41 100644
--- a/metadata/md5-cache/net-libs/telepathy-qt-9999
+++ b/metadata/md5-cache/net-libs/telepathy-qt-9999
@@ -1,16 +1,16 @@
-BDEPEND=|| ( >=dev-lang/python-3.10.4:3.10[xml(+)] >=dev-lang/python-3.9.12:3.9[xml(+)] >=dev-lang/python-3.8.13:3.8[xml(+)] ) virtual/pkgconfig test? ( dev-libs/glib:2 || ( ( >=dev-lang/python-3.10.4:3.10[xml(+)] dev-python/dbus-python[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9[xml(+)] dev-python/dbus-python[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8[xml(+)] dev-python/dbus-python[python_targets_python3_8(-)] ) ) ) >=dev-vcs/git-1.8.2.1[curl] >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+BDEPEND=|| ( >=dev-lang/python-3.11.0_beta4:3.11[xml(+)] >=dev-lang/python-3.10.4:3.10[xml(+)] >=dev-lang/python-3.9.12:3.9[xml(+)] >=dev-lang/python-3.8.13:3.8[xml(+)] ) virtual/pkgconfig test? ( dev-libs/glib:2 || ( ( >=dev-lang/python-3.11.0_beta4:3.11[xml(+)] dev-python/dbus-python[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10[xml(+)] dev-python/dbus-python[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9[xml(+)] dev-python/dbus-python[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8[xml(+)] dev-python/dbus-python[python_targets_python3_8(-)] ) ) ) >=dev-vcs/git-1.8.2.1[curl] >=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 setup test unpack
 DEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtxml:5 farstream? ( >=net-libs/telepathy-farstream-0.2.2 >=net-libs/telepathy-glib-0.18.0 ) test? ( dev-libs/dbus-glib dev-qt/qttest:5 )
 DESCRIPTION=Qt bindings for the Telepathy D-Bus protocol
-EAPI=7
-HOMEPAGE=https://telepathy.freedesktop.org/
+EAPI=8
+HOMEPAGE=https://telepathy.freedesktop.org/ https://github.com/TelepathyIM/telepathy-qt/
 INHERIT=git-r3 python-any-r1 cmake virtualx
 IUSE=debug farstream test test
 LICENSE=LGPL-2.1
 PROPERTIES=live
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtxml:5 farstream? ( >=net-libs/telepathy-farstream-0.2.2 >=net-libs/telepathy-glib-0.18.0 )
 REQUIRED_USE=test? ( farstream )
-RESTRICT=!test? ( test )
+RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	virtualx	644887c82aefdf12001489391fca4f02	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=7c211520db6c1ce4583984d8c43c445e
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	virtualx	644887c82aefdf12001489391fca4f02	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=1ec7292ead5eda280ce39f2870bce494
diff --git a/metadata/md5-cache/net-libs/webkit-gtk-2.38.1 b/metadata/md5-cache/net-libs/webkit-gtk-2.38.1
new file mode 100644
index 000000000000..2cbbf4fcd695
--- /dev/null
+++ b/metadata/md5-cache/net-libs/webkit-gtk-2.38.1
@@ -0,0 +1,18 @@
+BDEPEND=|| ( >=dev-lang/python-3.11.0_beta4:3.11[xml(+)] >=dev-lang/python-3.10.4:3.10[xml(+)] >=dev-lang/python-3.9.12:3.9[xml(+)] >=dev-lang/python-3.8.13:3.8[xml(+)] ) || ( dev-lang/ruby:2.7 dev-lang/ruby:3.0 dev-lang/ruby:3.1 ) virtual/rubygems >=app-accessibility/at-spi2-core-2.5.3 dev-util/gdbus-codegen dev-util/glib-utils >=dev-util/gperf-3.0.1 >=sys-devel/bison-2.4.3 || ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 ) sys-devel/gettext virtual/pkgconfig >=dev-lang/perl-5.10 virtual/perl-Data-Dumper virtual/perl-Carp virtual/perl-JSON-PP >=app-portage/elt-patches-20170815 app-arch/xz-utils >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
+DEPEND=>=x11-libs/cairo-1.16.0[X?] >=media-libs/fontconfig-2.13.0:1.0 >=media-libs/freetype-2.9.0:2 >=dev-libs/libgcrypt-1.7.0:0= >=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?] >=media-libs/harfbuzz-1.4.2:=[icu(+)] >=dev-libs/icu-61.2:= media-libs/libjpeg-turbo:0= >=net-libs/libsoup-2.54:2.4[introspection?] >=dev-libs/libxml2-2.8.0:2 >=media-libs/libpng-1.4:0= dev-db/sqlite:3 sys-libs/zlib:0 || ( >=app-accessibility/at-spi2-core-2.46.0:2 >=dev-libs/atk-2.16.0 ) media-libs/libwebp:= >=dev-libs/glib-2.67.1:2 >=dev-libs/libxslt-1.1.7 media-libs/woff2 gnome-keyring? ( app-crypt/libsecret ) introspection? ( >=dev-libs/gobject-introspection-1.59.1:= ) dev-libs/libtasn1:= spell? ( >=app-text/enchant-0.22:2 ) gstreamer? ( >=media-libs/gstreamer-1.20:1.0 >=media-libs/gst-plugins-base-1.20:1.0[egl?,X?] gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] ) !gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] ) >=media-plugins/gst-plugins-opus-1.20:1.0 >=media-libs/gst-plugins-bad-1.20:1.0 ) X? ( x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXrender x11-libs/libXt ) dev-libs/hyphen jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= ) avif? ( >=media-libs/libavif-0.9.0:= ) lcms? ( media-libs/lcms:2 ) egl? ( media-libs/mesa[egl(+)] ) gles2-only? ( media-libs/mesa[gles2] ) !gles2-only? ( virtual/opengl ) wayland? ( dev-libs/wayland >=dev-libs/wayland-protocols-1.12 >=gui-libs/libwpe-1.5.0:1.0 >=gui-libs/wpebackend-fdo-1.7.0:1.0 ) seccomp? ( >=sys-apps/bubblewrap-0.3.1 sys-libs/libseccomp sys-apps/xdg-dbus-proxy ) systemd? ( sys-apps/systemd:= ) gamepad? ( >=dev-libs/libmanette-0.2.4 )
+DESCRIPTION=Open source web browser engine
+EAPI=8
+HOMEPAGE=https://www.webkitgtk.org
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
+IUSE=aqua avif +egl examples gamepad gles2-only gnome-keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd test wayland X
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=LGPL-2+ BSD
+RDEPEND=>=x11-libs/cairo-1.16.0[X?] >=media-libs/fontconfig-2.13.0:1.0 >=media-libs/freetype-2.9.0:2 >=dev-libs/libgcrypt-1.7.0:0= >=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?] >=media-libs/harfbuzz-1.4.2:=[icu(+)] >=dev-libs/icu-61.2:= media-libs/libjpeg-turbo:0= >=net-libs/libsoup-2.54:2.4[introspection?] >=dev-libs/libxml2-2.8.0:2 >=media-libs/libpng-1.4:0= dev-db/sqlite:3 sys-libs/zlib:0 || ( >=app-accessibility/at-spi2-core-2.46.0:2 >=dev-libs/atk-2.16.0 ) media-libs/libwebp:= >=dev-libs/glib-2.67.1:2 >=dev-libs/libxslt-1.1.7 media-libs/woff2 gnome-keyring? ( app-crypt/libsecret ) introspection? ( >=dev-libs/gobject-introspection-1.59.1:= ) dev-libs/libtasn1:= spell? ( >=app-text/enchant-0.22:2 ) gstreamer? ( >=media-libs/gstreamer-1.20:1.0 >=media-libs/gst-plugins-base-1.20:1.0[egl?,X?] gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] ) !gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] ) >=media-plugins/gst-plugins-opus-1.20:1.0 >=media-libs/gst-plugins-bad-1.20:1.0 ) X? ( x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXrender x11-libs/libXt ) dev-libs/hyphen jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= ) avif? ( >=media-libs/libavif-0.9.0:= ) lcms? ( media-libs/lcms:2 ) egl? ( media-libs/mesa[egl(+)] ) gles2-only? ( media-libs/mesa[gles2] ) !gles2-only? ( virtual/opengl ) wayland? ( dev-libs/wayland >=dev-libs/wayland-protocols-1.12 >=gui-libs/libwpe-1.5.0:1.0 >=gui-libs/wpebackend-fdo-1.7.0:1.0 ) seccomp? ( >=sys-apps/bubblewrap-0.3.1 sys-libs/libseccomp sys-apps/xdg-dbus-proxy ) systemd? ( sys-apps/systemd:= ) gamepad? ( >=dev-libs/libmanette-0.2.4 )
+REQUIRED_USE=gles2-only? ( egl ) gstreamer? ( egl ) wayland? ( egl ) || ( aqua wayland X )
+RESTRICT=test
+SLOT=4/37
+SRC_URI=https://www.webkitgtk.org/releases/webkitgtk-2.38.1.tar.xz
+_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	1a2157392a869265b2afcb63a26c12ac	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	ruby-single	4e65f388d03c4681739781edf3bbf119	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=7ae3977eb83f6cd00d7944718d7b7c3b
diff --git a/metadata/md5-cache/net-libs/webkit-gtk-2.38.1-r410 b/metadata/md5-cache/net-libs/webkit-gtk-2.38.1-r410
new file mode 100644
index 000000000000..06b1a4315641
--- /dev/null
+++ b/metadata/md5-cache/net-libs/webkit-gtk-2.38.1-r410
@@ -0,0 +1,18 @@
+BDEPEND=|| ( >=dev-lang/python-3.11.0_beta4:3.11[xml(+)] >=dev-lang/python-3.10.4:3.10[xml(+)] >=dev-lang/python-3.9.12:3.9[xml(+)] >=dev-lang/python-3.8.13:3.8[xml(+)] ) || ( dev-lang/ruby:2.7 dev-lang/ruby:3.0 dev-lang/ruby:3.1 ) virtual/rubygems >=app-accessibility/at-spi2-core-2.5.3 dev-util/gdbus-codegen dev-util/glib-utils >=dev-util/gperf-3.0.1 >=sys-devel/bison-2.4.3 || ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 ) sys-devel/gettext virtual/pkgconfig >=dev-lang/perl-5.10 virtual/perl-Data-Dumper virtual/perl-Carp virtual/perl-JSON-PP >=app-portage/elt-patches-20170815 app-arch/xz-utils >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
+DEPEND=>=x11-libs/cairo-1.16.0[X?] >=media-libs/fontconfig-2.13.0:1.0 >=media-libs/freetype-2.9.0:2 >=dev-libs/libgcrypt-1.7.0:0= >=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?] >=media-libs/harfbuzz-1.4.2:=[icu(+)] >=dev-libs/icu-61.2:= media-libs/libjpeg-turbo:0= >=net-libs/libsoup-3.0.8:3.0[introspection?] >=dev-libs/libxml2-2.8.0:2 >=media-libs/libpng-1.4:0= dev-db/sqlite:3 sys-libs/zlib:0 || ( >=app-accessibility/at-spi2-core-2.46.0:2 >=dev-libs/atk-2.16.0 ) media-libs/libwebp:= >=dev-libs/glib-2.67.1:2 >=dev-libs/libxslt-1.1.7 media-libs/woff2 gnome-keyring? ( app-crypt/libsecret ) introspection? ( >=dev-libs/gobject-introspection-1.59.1:= ) dev-libs/libtasn1:= spell? ( >=app-text/enchant-0.22:2 ) gstreamer? ( >=media-libs/gstreamer-1.20:1.0 >=media-libs/gst-plugins-base-1.20:1.0[egl?,X?] gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] ) !gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] ) >=media-plugins/gst-plugins-opus-1.20:1.0 >=media-libs/gst-plugins-bad-1.20:1.0 ) X? ( x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXrender x11-libs/libXt ) dev-libs/hyphen jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= ) avif? ( >=media-libs/libavif-0.9.0:= ) lcms? ( media-libs/lcms:2 ) egl? ( media-libs/mesa[egl(+)] ) gles2-only? ( media-libs/mesa[gles2] ) !gles2-only? ( virtual/opengl ) wayland? ( dev-libs/wayland >=dev-libs/wayland-protocols-1.12 >=gui-libs/libwpe-1.5.0:1.0 >=gui-libs/wpebackend-fdo-1.7.0:1.0 ) seccomp? ( >=sys-apps/bubblewrap-0.3.1 sys-libs/libseccomp sys-apps/xdg-dbus-proxy ) systemd? ( sys-apps/systemd:= ) gamepad? ( >=dev-libs/libmanette-0.2.4 ) !<net-libs/webkit-gtk-2.38:4
+DESCRIPTION=Open source web browser engine
+EAPI=8
+HOMEPAGE=https://www.webkitgtk.org
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
+IUSE=aqua avif +egl examples gamepad gles2-only gnome-keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd test wayland X
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=LGPL-2+ BSD
+RDEPEND=>=x11-libs/cairo-1.16.0[X?] >=media-libs/fontconfig-2.13.0:1.0 >=media-libs/freetype-2.9.0:2 >=dev-libs/libgcrypt-1.7.0:0= >=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?] >=media-libs/harfbuzz-1.4.2:=[icu(+)] >=dev-libs/icu-61.2:= media-libs/libjpeg-turbo:0= >=net-libs/libsoup-3.0.8:3.0[introspection?] >=dev-libs/libxml2-2.8.0:2 >=media-libs/libpng-1.4:0= dev-db/sqlite:3 sys-libs/zlib:0 || ( >=app-accessibility/at-spi2-core-2.46.0:2 >=dev-libs/atk-2.16.0 ) media-libs/libwebp:= >=dev-libs/glib-2.67.1:2 >=dev-libs/libxslt-1.1.7 media-libs/woff2 gnome-keyring? ( app-crypt/libsecret ) introspection? ( >=dev-libs/gobject-introspection-1.59.1:= ) dev-libs/libtasn1:= spell? ( >=app-text/enchant-0.22:2 ) gstreamer? ( >=media-libs/gstreamer-1.20:1.0 >=media-libs/gst-plugins-base-1.20:1.0[egl?,X?] gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] ) !gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] ) >=media-plugins/gst-plugins-opus-1.20:1.0 >=media-libs/gst-plugins-bad-1.20:1.0 ) X? ( x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXrender x11-libs/libXt ) dev-libs/hyphen jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= ) avif? ( >=media-libs/libavif-0.9.0:= ) lcms? ( media-libs/lcms:2 ) egl? ( media-libs/mesa[egl(+)] ) gles2-only? ( media-libs/mesa[gles2] ) !gles2-only? ( virtual/opengl ) wayland? ( dev-libs/wayland >=dev-libs/wayland-protocols-1.12 >=gui-libs/libwpe-1.5.0:1.0 >=gui-libs/wpebackend-fdo-1.7.0:1.0 ) seccomp? ( >=sys-apps/bubblewrap-0.3.1 sys-libs/libseccomp sys-apps/xdg-dbus-proxy ) systemd? ( sys-apps/systemd:= ) gamepad? ( >=dev-libs/libmanette-0.2.4 ) !<net-libs/webkit-gtk-2.38:4
+REQUIRED_USE=gles2-only? ( egl ) gstreamer? ( egl ) wayland? ( egl ) || ( aqua wayland X )
+RESTRICT=test
+SLOT=4.1/0
+SRC_URI=https://www.webkitgtk.org/releases/webkitgtk-2.38.1.tar.xz
+_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	1a2157392a869265b2afcb63a26c12ac	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	ruby-single	4e65f388d03c4681739781edf3bbf119	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=046cbe418b22c308ebcd4cba3e0d051e
diff --git a/metadata/md5-cache/net-libs/webkit-gtk-2.38.1-r500 b/metadata/md5-cache/net-libs/webkit-gtk-2.38.1-r500
new file mode 100644
index 000000000000..ecdb056e41d6
--- /dev/null
+++ b/metadata/md5-cache/net-libs/webkit-gtk-2.38.1-r500
@@ -0,0 +1,18 @@
+BDEPEND=|| ( >=dev-lang/python-3.11.0_beta4:3.11[xml(+)] >=dev-lang/python-3.10.4:3.10[xml(+)] >=dev-lang/python-3.9.12:3.9[xml(+)] >=dev-lang/python-3.8.13:3.8[xml(+)] ) || ( dev-lang/ruby:2.7 dev-lang/ruby:3.0 dev-lang/ruby:3.1 ) virtual/rubygems >=app-accessibility/at-spi2-core-2.5.3 dev-util/gdbus-codegen dev-util/glib-utils >=dev-util/gperf-3.0.1 >=sys-devel/bison-2.4.3 || ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 ) sys-devel/gettext virtual/pkgconfig >=dev-lang/perl-5.10 virtual/perl-Data-Dumper virtual/perl-Carp virtual/perl-JSON-PP >=app-portage/elt-patches-20170815 app-arch/xz-utils >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
+DEPEND=>=x11-libs/cairo-1.16.0[X?] >=media-libs/fontconfig-2.13.0:1.0 >=media-libs/freetype-2.9.0:2 >=dev-libs/libgcrypt-1.7.0:0= >=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?] gui-libs/gtk:4 >=media-libs/harfbuzz-1.4.2:=[icu(+)] >=dev-libs/icu-61.2:= media-libs/libjpeg-turbo:0= >=net-libs/libsoup-3.0.8:3.0[introspection?] >=dev-libs/libxml2-2.8.0:2 >=media-libs/libpng-1.4:0= dev-db/sqlite:3 sys-libs/zlib:0 || ( >=app-accessibility/at-spi2-core-2.46.0:2 >=dev-libs/atk-2.16.0 ) media-libs/libwebp:= >=dev-libs/glib-2.67.1:2 >=dev-libs/libxslt-1.1.7 media-libs/woff2 gnome-keyring? ( app-crypt/libsecret ) introspection? ( >=dev-libs/gobject-introspection-1.59.1:= ) dev-libs/libtasn1:= spell? ( >=app-text/enchant-0.22:2 ) gstreamer? ( >=media-libs/gstreamer-1.20:1.0 >=media-libs/gst-plugins-base-1.20:1.0[egl?,X?] gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] ) !gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] ) >=media-plugins/gst-plugins-opus-1.20:1.0 >=media-libs/gst-plugins-bad-1.20:1.0 ) X? ( x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXrender x11-libs/libXt ) dev-libs/hyphen jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= ) avif? ( >=media-libs/libavif-0.9.0:= ) lcms? ( media-libs/lcms:2 ) egl? ( media-libs/mesa[egl(+)] ) gles2-only? ( media-libs/mesa[gles2] ) !gles2-only? ( virtual/opengl ) wayland? ( dev-libs/wayland >=dev-libs/wayland-protocols-1.12 >=gui-libs/libwpe-1.5.0:1.0 >=gui-libs/wpebackend-fdo-1.7.0:1.0 ) seccomp? ( >=sys-apps/bubblewrap-0.3.1 sys-libs/libseccomp sys-apps/xdg-dbus-proxy ) systemd? ( sys-apps/systemd:= ) gamepad? ( >=dev-libs/libmanette-0.2.4 ) !<net-libs/webkit-gtk-2.38:4
+DESCRIPTION=Open source web browser engine
+EAPI=8
+HOMEPAGE=https://www.webkitgtk.org
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
+IUSE=aqua avif +egl examples gamepad gles2-only gnome-keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd test wayland X
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=LGPL-2+ BSD
+RDEPEND=>=x11-libs/cairo-1.16.0[X?] >=media-libs/fontconfig-2.13.0:1.0 >=media-libs/freetype-2.9.0:2 >=dev-libs/libgcrypt-1.7.0:0= >=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?] gui-libs/gtk:4 >=media-libs/harfbuzz-1.4.2:=[icu(+)] >=dev-libs/icu-61.2:= media-libs/libjpeg-turbo:0= >=net-libs/libsoup-3.0.8:3.0[introspection?] >=dev-libs/libxml2-2.8.0:2 >=media-libs/libpng-1.4:0= dev-db/sqlite:3 sys-libs/zlib:0 || ( >=app-accessibility/at-spi2-core-2.46.0:2 >=dev-libs/atk-2.16.0 ) media-libs/libwebp:= >=dev-libs/glib-2.67.1:2 >=dev-libs/libxslt-1.1.7 media-libs/woff2 gnome-keyring? ( app-crypt/libsecret ) introspection? ( >=dev-libs/gobject-introspection-1.59.1:= ) dev-libs/libtasn1:= spell? ( >=app-text/enchant-0.22:2 ) gstreamer? ( >=media-libs/gstreamer-1.20:1.0 >=media-libs/gst-plugins-base-1.20:1.0[egl?,X?] gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] ) !gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] ) >=media-plugins/gst-plugins-opus-1.20:1.0 >=media-libs/gst-plugins-bad-1.20:1.0 ) X? ( x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXrender x11-libs/libXt ) dev-libs/hyphen jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= ) avif? ( >=media-libs/libavif-0.9.0:= ) lcms? ( media-libs/lcms:2 ) egl? ( media-libs/mesa[egl(+)] ) gles2-only? ( media-libs/mesa[gles2] ) !gles2-only? ( virtual/opengl ) wayland? ( dev-libs/wayland >=dev-libs/wayland-protocols-1.12 >=gui-libs/libwpe-1.5.0:1.0 >=gui-libs/wpebackend-fdo-1.7.0:1.0 ) seccomp? ( >=sys-apps/bubblewrap-0.3.1 sys-libs/libseccomp sys-apps/xdg-dbus-proxy ) systemd? ( sys-apps/systemd:= ) gamepad? ( >=dev-libs/libmanette-0.2.4 ) !<net-libs/webkit-gtk-2.38:4
+REQUIRED_USE=gles2-only? ( egl ) gstreamer? ( egl ) wayland? ( egl ) || ( aqua wayland X )
+RESTRICT=test
+SLOT=5/0
+SRC_URI=https://www.webkitgtk.org/releases/webkitgtk-2.38.1.tar.xz
+_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	1a2157392a869265b2afcb63a26c12ac	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	ruby-single	4e65f388d03c4681739781edf3bbf119	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=f345864bbe7b2d9c3b05986f18896cb9
diff --git a/metadata/md5-cache/net-mail/Manifest.gz b/metadata/md5-cache/net-mail/Manifest.gz
index e340b42d5504..007513249bcd 100644
Binary files a/metadata/md5-cache/net-mail/Manifest.gz and b/metadata/md5-cache/net-mail/Manifest.gz differ
diff --git a/metadata/md5-cache/net-mail/mu-1.8.10 b/metadata/md5-cache/net-mail/mu-1.8.10
index eae20eb86d80..7df5dff8474b 100644
--- a/metadata/md5-cache/net-mail/mu-1.8.10
+++ b/metadata/md5-cache/net-mail/mu-1.8.10
@@ -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.10/mu-1.8.10.tar.xz
 _eclasses_=elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=ec9873cd03e36afd02ed16a39381e3a2
+_md5_=c79a9b4867770297eab6ab95b3c42c21
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index 3ea855c87210..24dd10fd9d8f 100644
Binary files a/metadata/md5-cache/net-misc/Manifest.gz and b/metadata/md5-cache/net-misc/Manifest.gz differ
diff --git a/metadata/md5-cache/net-misc/curl-7.85.0-r2 b/metadata/md5-cache/net-misc/curl-7.85.0-r2
index daf20f3de3cc..821c65c75cea 100644
--- a/metadata/md5-cache/net-misc/curl-7.85.0-r2
+++ b/metadata/md5-cache/net-misc/curl-7.85.0-r2
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://curl.haxx.se/
 INHERIT=autotools prefix multilib-minimal verify-sig
 IUSE=+adns alt-svc brotli +ftp gnutls gopher hsts +http2 idn +imap ipv6 kerberos ldap mbedtls nss +openssl +pop3 +progress-meter rtmp samba +smtp ssh ssl sslv3 static-libs test telnet +tftp zstd curl_ssl_gnutls curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl nghttp3 quiche 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 ~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=curl
 RDEPEND=ldap? ( net-nds/openldap:=[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(-)?] ) ssl? ( gnutls? ( net-libs/gnutls:0=[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(-)?] dev-libs/nettle: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(-)?] app-misc/ca-certificates ) mbedtls? ( net-libs/mbedtls: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(-)?] app-misc/ca-certificates ) openssl? ( dev-libs/openssl:0=[sslv3(-)=,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(-)?] ) nss? ( dev-libs/nss: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/nss-pem app-misc/ca-certificates ) ) http2? ( net-libs/nghttp2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nghttp3? ( net-libs/nghttp3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/ngtcp2[ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) quiche? ( >=net-libs/quiche-0.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) idn? ( net-dns/libidn2:0=[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(-)?] ) adns? ( net-dns/c-ares: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(-)?] ) kerberos? ( >=virtual/krb5-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(-)?] ) rtmp? ( media-video/rtmpdump[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssh? ( net-libs/libssh2[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[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(-)?] )
 REQUIRED_USE=ssl? ( ^^ ( curl_ssl_gnutls curl_ssl_mbedtls curl_ssl_nss curl_ssl_openssl ) )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://curl.haxx.se/download/curl-7.85.0.tar.xz verify-sig? ( https://curl.haxx.se/download/curl-7.85.0.tar.xz.asc )
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	0748d665fa664a87add00152ed046e16
-_md5_=1ba29f00a7429b6f8fdb3d5d8f3047a0
+_md5_=7401b61608525123521776102107b820
diff --git a/metadata/md5-cache/net-misc/dhcp-4.4.3_p1 b/metadata/md5-cache/net-misc/dhcp-4.4.3_p1
index c68045f67ca1..b761f8956246 100644
--- a/metadata/md5-cache/net-misc/dhcp-4.4.3_p1
+++ b/metadata/md5-cache/net-misc/dhcp-4.4.3_p1
@@ -1,6 +1,6 @@
-BDEPEND=virtual/pkgconfig
+BDEPEND=acct-group/dhcp acct-user/dhcp virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst preinst prepare unpack
-DEPEND=acct-group/dhcp acct-user/dhcp client? ( kernel_linux? ( ipv6? ( sys-apps/iproute2 ) sys-apps/net-tools ) ) ldap? ( net-nds/openldap:= ssl? ( dev-libs/openssl:= ) )
+DEPEND=client? ( kernel_linux? ( ipv6? ( sys-apps/iproute2 ) sys-apps/net-tools ) ) ldap? ( net-nds/openldap:= ssl? ( dev-libs/openssl:= ) )
 DESCRIPTION=ISC Dynamic Host Configuration Protocol (DHCP) client/server
 EAPI=7
 HOMEPAGE=https://www.isc.org/dhcp
@@ -12,4 +12,4 @@ RDEPEND=acct-group/dhcp acct-user/dhcp client? ( kernel_linux? ( ipv6? ( sys-app
 SLOT=0
 SRC_URI=ftp://ftp.isc.org/isc/dhcp/dhcp-4.4.3-P1.tar.gz ftp://ftp.isc.org/isc/dhcp/4.4.3-P1/dhcp-4.4.3-P1.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=a42ba7b5b52d713a89eba4151c51c510
+_md5_=001bd042da2b7ad732ee7f84695c1713
diff --git a/metadata/md5-cache/net-misc/gnome-remote-desktop-43.1 b/metadata/md5-cache/net-misc/gnome-remote-desktop-43.1
new file mode 100644
index 000000000000..82ea339771c7
--- /dev/null
+++ b/metadata/md5-cache/net-misc/gnome-remote-desktop-43.1
@@ -0,0 +1,18 @@
+BDEPEND=dev-util/gdbus-codegen dev-util/glib-utils virtual/pkgconfig doc? ( app-text/asciidoc ) app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm preinst test
+DEPEND=x11-libs/cairo x11-libs/libdrm >=media-libs/libepoxy-1.4 >=dev-libs/glib-2.68:2 x11-libs/libnotify app-crypt/libsecret >=media-video/pipewire-0.3.49:= app-crypt/tpm2-tss:= rdp? ( >=media-libs/nv-codec-headers-11.1.5.0 >=net-misc/freerdp-2.8.0:=[server] >=sys-fs/fuse-3.9.1:3 >=x11-libs/libxkbcommon-1.0.0 aac? ( media-libs/fdk-aac:= ) ) vnc? ( net-libs/libvncserver )
+DESCRIPTION=Remote desktop daemon for GNOME using pipewire
+EAPI=8
+HOMEPAGE=https://gitlab.gnome.org/GNOME/gnome-remote-desktop
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=gnome.org gnome2-utils meson systemd xdg
+IUSE=aac doc +rdp systemd +vnc
+KEYWORDS=~amd64
+LICENSE=GPL-2+
+RDEPEND=x11-libs/cairo x11-libs/libdrm >=media-libs/libepoxy-1.4 >=dev-libs/glib-2.68:2 x11-libs/libnotify app-crypt/libsecret >=media-video/pipewire-0.3.49:= app-crypt/tpm2-tss:= rdp? ( >=media-libs/nv-codec-headers-11.1.5.0 >=net-misc/freerdp-2.8.0:=[server] >=sys-fs/fuse-3.9.1:3 >=x11-libs/libxkbcommon-1.0.0 aac? ( media-libs/fdk-aac:= ) ) vnc? ( net-libs/libvncserver ) x11-wm/mutter[screencast]
+REQUIRED_USE=|| ( rdp vnc ) aac? ( rdp )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-remote-desktop/43/gnome-remote-desktop-43.1.tar.xz
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	b9fc5e97e886514e5132f50465185401	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=994ab546b1c9af1679feb991cedb62ee
diff --git a/metadata/md5-cache/net-misc/rsync-3.2.4-r1 b/metadata/md5-cache/net-misc/rsync-3.2.4-r1
deleted file mode 100644
index 8b140c4edca1..000000000000
--- a/metadata/md5-cache/net-misc/rsync-3.2.4-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=examples? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) ) verify-sig? ( sec-keys/openpgp-keys-waynedavison ) virtual/pkgconfig verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=configure install postinst prepare setup unpack
-DEPEND=acl? ( virtual/acl ) examples? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) dev-lang/perl ) lz4? ( app-arch/lz4 ) ssl? ( dev-libs/openssl:0= ) system-zlib? ( sys-libs/zlib ) xattr? ( kernel_linux? ( sys-apps/attr ) ) xxhash? ( dev-libs/xxhash ) zstd? ( >=app-arch/zstd-1.4 ) >=dev-libs/popt-1.5 iconv? ( virtual/libiconv )
-DESCRIPTION=File transfer program to keep remote files into sync
-EAPI=7
-HOMEPAGE=https://rsync.samba.org/
-INHERIT=flag-o-matic prefix python-single-r1 systemd verify-sig
-IUSE=acl examples iconv ipv6 lz4 ssl stunnel system-zlib xattr xxhash zstd python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 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
-LICENSE=GPL-3
-RDEPEND=acl? ( virtual/acl ) examples? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) dev-lang/perl ) lz4? ( app-arch/lz4 ) ssl? ( dev-libs/openssl:0= ) system-zlib? ( sys-libs/zlib ) xattr? ( kernel_linux? ( sys-apps/attr ) ) xxhash? ( dev-libs/xxhash ) zstd? ( >=app-arch/zstd-1.4 ) >=dev-libs/popt-1.5 iconv? ( virtual/libiconv )
-REQUIRED_USE=examples? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
-SLOT=0
-SRC_URI=https://rsync.samba.org/ftp/rsync/src/rsync-3.2.4.tar.gz verify-sig? ( https://rsync.samba.org/ftp/rsync/src/rsync-3.2.4.tar.gz.asc )
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	0748d665fa664a87add00152ed046e16	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=1271d03344ce1f6b33f5774d493762a6
diff --git a/metadata/md5-cache/net-misc/rsync-3.2.5-r1 b/metadata/md5-cache/net-misc/rsync-3.2.5-r1
deleted file mode 100644
index 45b52ac70ec6..000000000000
--- a/metadata/md5-cache/net-misc/rsync-3.2.5-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=examples? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) ) verify-sig? ( sec-keys/openpgp-keys-waynedavison ) virtual/pkgconfig verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install postinst prepare setup unpack
-DEPEND=>=dev-libs/popt-1.5 acl? ( virtual/acl ) examples? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) dev-lang/perl ) lz4? ( app-arch/lz4:= ) ssl? ( dev-libs/openssl:= ) system-zlib? ( sys-libs/zlib ) xattr? ( kernel_linux? ( sys-apps/attr ) ) xxhash? ( >=dev-libs/xxhash-0.8 ) zstd? ( >=app-arch/zstd-1.4:= ) iconv? ( virtual/libiconv )
-DESCRIPTION=File transfer program to keep remote files into sync
-EAPI=8
-HOMEPAGE=https://rsync.samba.org/
-INHERIT=prefix python-single-r1 systemd verify-sig autotools
-IUSE=acl examples iconv lz4 ssl stunnel system-zlib xattr xxhash zstd python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 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
-LICENSE=GPL-3
-RDEPEND=>=dev-libs/popt-1.5 acl? ( virtual/acl ) examples? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) dev-lang/perl ) lz4? ( app-arch/lz4:= ) ssl? ( dev-libs/openssl:= ) system-zlib? ( sys-libs/zlib ) xattr? ( kernel_linux? ( sys-apps/attr ) ) xxhash? ( >=dev-libs/xxhash-0.8 ) zstd? ( >=app-arch/zstd-1.4:= ) iconv? ( virtual/libiconv )
-REQUIRED_USE=examples? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
-SLOT=0
-SRC_URI=https://rsync.samba.org/ftp/rsync/src/rsync-3.2.5.tar.gz verify-sig? ( https://rsync.samba.org/ftp/rsync/src/rsync-3.2.5.tar.gz.asc )
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	0748d665fa664a87add00152ed046e16
-_md5_=43851586a05b80fd6d2ea97ff4bcf2a4
diff --git a/metadata/md5-cache/net-misc/rsync-3.2.7_pre1 b/metadata/md5-cache/net-misc/rsync-3.2.7
similarity index 86%
rename from metadata/md5-cache/net-misc/rsync-3.2.7_pre1
rename to metadata/md5-cache/net-misc/rsync-3.2.7
index cef3e3dd5dee..7f9fc69ad3b9 100644
--- a/metadata/md5-cache/net-misc/rsync-3.2.7_pre1
+++ b/metadata/md5-cache/net-misc/rsync-3.2.7
@@ -6,10 +6,11 @@ EAPI=8
 HOMEPAGE=https://rsync.samba.org/
 INHERIT=prefix python-single-r1 systemd verify-sig
 IUSE=acl examples iconv lz4 ssl stunnel system-zlib xattr xxhash zstd python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 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
 LICENSE=GPL-3
 RDEPEND=>=dev-libs/popt-1.5 acl? ( virtual/acl ) examples? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) dev-lang/perl ) lz4? ( app-arch/lz4:= ) ssl? ( dev-libs/openssl:= ) system-zlib? ( sys-libs/zlib ) xattr? ( kernel_linux? ( sys-apps/attr ) ) xxhash? ( >=dev-libs/xxhash-0.8 ) zstd? ( >=app-arch/zstd-1.4:= ) iconv? ( virtual/libiconv )
 REQUIRED_USE=examples? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
 SLOT=0
-SRC_URI=https://rsync.samba.org/ftp/rsync/src-previews/rsync-3.2.7pre1.tar.gz verify-sig? ( https://rsync.samba.org/ftp/rsync/src-previews/rsync-3.2.7pre1.tar.gz.asc )
+SRC_URI=https://rsync.samba.org/ftp/rsync/src/rsync-3.2.7.tar.gz verify-sig? ( https://rsync.samba.org/ftp/rsync/src/rsync-3.2.7.tar.gz.asc )
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	0748d665fa664a87add00152ed046e16
 _md5_=8217ce91ee3d298c555fd6245eb90302
diff --git a/metadata/md5-cache/net-misc/spice-gtk-0.39-r2 b/metadata/md5-cache/net-misc/spice-gtk-0.39-r2
deleted file mode 100644
index 5c61a4dc08d9..000000000000
--- a/metadata/md5-cache/net-misc/spice-gtk-0.39-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=|| ( ( >=dev-lang/python-3.10.4:3.10 dev-python/six[python_targets_python3_10(-)] dev-python/pyparsing[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-python/six[python_targets_python3_9(-)] dev-python/pyparsing[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-python/six[python_targets_python3_8(-)] dev-python/pyparsing[python_targets_python3_8(-)] ) ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-libs/glib-2.46:2 dev-libs/json-glib:0= media-libs/gst-plugins-base:1.0 media-libs/gst-plugins-good:1.0 media-libs/gstreamer:1.0[introspection?] media-libs/opus sys-libs/zlib virtual/jpeg:0= >=x11-libs/cairo-1.2 >=x11-libs/pixman-0.17.7 gtk3? ( x11-libs/gtk+:3[introspection?] ) introspection? ( dev-libs/gobject-introspection ) dev-libs/openssl:0= lz4? ( app-arch/lz4 ) sasl? ( dev-libs/cyrus-sasl ) smartcard? ( app-emulation/qemu[smartcard] ) usbredir? ( sys-apps/hwdata >=sys-apps/usbredir-0.4.2 virtual/libusb:1 policykit? ( sys-apps/acl >=sys-auth/polkit-0.110-r1 ) ) webdav? ( net-libs/phodav:2.0 >=net-libs/libsoup-2.49.91:2.4 ) amd64? ( media-libs/libva:= ) arm64? ( media-libs/libva:= ) x86? ( media-libs/libva:= ) >=app-emulation/spice-protocol-0.14.3 dev-perl/Text-CSV dev-util/glib-utils >=dev-util/gtk-doc-am-1.14 >=sys-devel/gettext-0.17 virtual/pkgconfig vala? ( || ( dev-lang/vala:0.56[vapigen(+)] ) )
-DESCRIPTION=Set of GObject and Gtk objects for connecting to Spice servers and a client GUI
-EAPI=7
-HOMEPAGE=https://www.spice-space.org https://cgit.freedesktop.org/spice/spice-gtk/
-INHERIT=desktop meson python-any-r1 readme.gentoo-r1 vala xdg-utils
-IUSE=+gtk3 +introspection lz4 mjpeg policykit sasl smartcard usbredir vala wayland webdav
-KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-libs/glib-2.46:2 dev-libs/json-glib:0= media-libs/gst-plugins-base:1.0 media-libs/gst-plugins-good:1.0 media-libs/gstreamer:1.0[introspection?] media-libs/opus sys-libs/zlib virtual/jpeg:0= >=x11-libs/cairo-1.2 >=x11-libs/pixman-0.17.7 gtk3? ( x11-libs/gtk+:3[introspection?] ) introspection? ( dev-libs/gobject-introspection ) dev-libs/openssl:0= lz4? ( app-arch/lz4 ) sasl? ( dev-libs/cyrus-sasl ) smartcard? ( app-emulation/qemu[smartcard] ) usbredir? ( sys-apps/hwdata >=sys-apps/usbredir-0.4.2 virtual/libusb:1 policykit? ( sys-apps/acl >=sys-auth/polkit-0.110-r1 ) ) webdav? ( net-libs/phodav:2.0 >=net-libs/libsoup-2.49.91:2.4 ) amd64? ( media-libs/libva:= ) arm64? ( media-libs/libva:= ) x86? ( media-libs/libva:= )
-SLOT=0
-SRC_URI=https://www.spice-space.org/download/gtk/spice-gtk-0.39.tar.xz
-_eclasses_=desktop	7eb20ad915a0a318176d51bc2508ff5c	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	vala	160a8a30a6cb9aa601e5441c643a7c61	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=877e4b12f549169ab1f29a1153c2e46e
diff --git a/metadata/md5-cache/net-misc/spice-gtk-0.40-r1 b/metadata/md5-cache/net-misc/spice-gtk-0.40-r1
index 2852269b15f5..e230cc999503 100644
--- a/metadata/md5-cache/net-misc/spice-gtk-0.40-r1
+++ b/metadata/md5-cache/net-misc/spice-gtk-0.40-r1
@@ -1,4 +1,4 @@
-BDEPEND=dev-perl/Text-CSV dev-util/glib-utils >=sys-devel/gettext-0.17 virtual/pkgconfig vala? ( || ( dev-lang/vala:0.56[vapigen(+)] ) ) || ( ( >=dev-lang/python-3.10.4:3.10 dev-python/six[python_targets_python3_10(-)] dev-python/pyparsing[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-python/six[python_targets_python3_9(-)] dev-python/pyparsing[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-python/six[python_targets_python3_8(-)] dev-python/pyparsing[python_targets_python3_8(-)] ) ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+BDEPEND=dev-perl/Text-CSV dev-util/glib-utils >=sys-devel/gettext-0.17 virtual/pkgconfig vala? ( || ( dev-lang/vala:0.56[vapigen(+)] ) ) || ( ( >=dev-lang/python-3.11.0_beta4:3.11 dev-python/six[python_targets_python3_11(-)] dev-python/pyparsing[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 dev-python/six[python_targets_python3_10(-)] dev-python/pyparsing[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-python/six[python_targets_python3_9(-)] dev-python/pyparsing[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-python/six[python_targets_python3_8(-)] dev-python/pyparsing[python_targets_python3_8(-)] ) ) >=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=>=dev-libs/glib-2.46:2 dev-libs/json-glib:0= media-libs/gst-plugins-base:1.0 media-libs/gst-plugins-good:1.0 media-libs/gstreamer:1.0[introspection?] media-libs/opus media-libs/libjpeg-turbo:= sys-libs/zlib >=x11-libs/cairo-1.2 >=x11-libs/pixman-0.17.7 x11-libs/libX11 gtk3? ( x11-libs/gtk+:3[introspection?] ) introspection? ( dev-libs/gobject-introspection ) dev-libs/openssl:= lz4? ( app-arch/lz4 ) sasl? ( dev-libs/cyrus-sasl ) smartcard? ( app-emulation/qemu[smartcard] ) usbredir? ( sys-apps/hwdata >=sys-apps/usbredir-0.4.2 virtual/libusb:1 policykit? ( sys-apps/acl >=sys-auth/polkit-0.110-r1 ) ) webdav? ( net-libs/phodav:2.0 >=net-libs/libsoup-2.49.91:2.4 ) amd64? ( media-libs/libva:= ) arm64? ( media-libs/libva:= ) x86? ( media-libs/libva:= ) >=app-emulation/spice-protocol-0.14.3
 DESCRIPTION=Set of GObject and Gtk objects for connecting to Spice servers and a client GUI
@@ -13,4 +13,4 @@ RDEPEND=>=dev-libs/glib-2.46:2 dev-libs/json-glib:0= media-libs/gst-plugins-base
 SLOT=0
 SRC_URI=https://www.spice-space.org/download/gtk/spice-gtk-0.40.tar.xz https://dev.gentoo.org/~sam/distfiles/net-misc/spice-gtk/spice-gtk-0.40-meson-0.63.patch.xz
 _eclasses_=desktop	7eb20ad915a0a318176d51bc2508ff5c	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	1a2157392a869265b2afcb63a26c12ac	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	vala	160a8a30a6cb9aa601e5441c643a7c61	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=afad6ea4d66c3e9b79bab70dd7342490
+_md5_=aba1dc6629913bba6a908c2c2a62f212
diff --git a/metadata/md5-cache/net-misc/spice-gtk-0.41 b/metadata/md5-cache/net-misc/spice-gtk-0.41
index 16a79c29bb05..15b058e446a4 100644
--- a/metadata/md5-cache/net-misc/spice-gtk-0.41
+++ b/metadata/md5-cache/net-misc/spice-gtk-0.41
@@ -1,4 +1,4 @@
-BDEPEND=dev-perl/Text-CSV dev-util/glib-utils >=sys-devel/gettext-0.17 virtual/pkgconfig vala? ( || ( dev-lang/vala:0.56[vapigen(+)] ) ) || ( ( >=dev-lang/python-3.10.4:3.10 dev-python/six[python_targets_python3_10(-)] dev-python/pyparsing[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-python/six[python_targets_python3_9(-)] dev-python/pyparsing[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-python/six[python_targets_python3_8(-)] dev-python/pyparsing[python_targets_python3_8(-)] ) ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+BDEPEND=dev-perl/Text-CSV dev-util/glib-utils >=sys-devel/gettext-0.17 virtual/pkgconfig vala? ( || ( dev-lang/vala:0.56[vapigen(+)] ) ) || ( ( >=dev-lang/python-3.11.0_beta4:3.11 dev-python/six[python_targets_python3_11(-)] dev-python/pyparsing[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 dev-python/six[python_targets_python3_10(-)] dev-python/pyparsing[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-python/six[python_targets_python3_9(-)] dev-python/pyparsing[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-python/six[python_targets_python3_8(-)] dev-python/pyparsing[python_targets_python3_8(-)] ) ) >=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=>=dev-libs/glib-2.46:2 dev-libs/json-glib:0= media-libs/gst-plugins-base:1.0 media-libs/gst-plugins-good:1.0 media-libs/gstreamer:1.0[introspection?] media-libs/opus media-libs/libjpeg-turbo:= sys-libs/zlib >=x11-libs/cairo-1.2 >=x11-libs/pixman-0.17.7 x11-libs/libX11 gtk3? ( x11-libs/gtk+:3[introspection?] ) introspection? ( dev-libs/gobject-introspection ) dev-libs/openssl:= lz4? ( app-arch/lz4 ) sasl? ( dev-libs/cyrus-sasl ) smartcard? ( app-emulation/qemu[smartcard] ) usbredir? ( sys-apps/hwdata >=sys-apps/usbredir-0.4.2 virtual/acl virtual/libusb:1 policykit? ( >=sys-auth/polkit-0.110-r1 ) ) webdav? ( net-libs/phodav:2.0 >=net-libs/libsoup-2.49.91:2.4 ) amd64? ( media-libs/libva:= ) arm64? ( media-libs/libva:= ) x86? ( media-libs/libva:= ) >=app-emulation/spice-protocol-0.14.3
 DESCRIPTION=Set of GObject and Gtk objects for connecting to Spice servers and a client GUI
@@ -13,4 +13,4 @@ RDEPEND=>=dev-libs/glib-2.46:2 dev-libs/json-glib:0= media-libs/gst-plugins-base
 SLOT=0
 SRC_URI=https://www.spice-space.org/download/gtk/spice-gtk-0.41.tar.xz
 _eclasses_=desktop	7eb20ad915a0a318176d51bc2508ff5c	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	1a2157392a869265b2afcb63a26c12ac	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	vala	160a8a30a6cb9aa601e5441c643a7c61	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=06d38ae8344dea5854eb3c4715c9aa40
+_md5_=f24dfd49d3cd0d7a65c0ccf924989917
diff --git a/metadata/md5-cache/net-misc/spice-gtk-0.40 b/metadata/md5-cache/net-misc/spice-gtk-0.41-r1
similarity index 65%
rename from metadata/md5-cache/net-misc/spice-gtk-0.40
rename to metadata/md5-cache/net-misc/spice-gtk-0.41-r1
index 94224fa07262..816ac0525f6b 100644
--- a/metadata/md5-cache/net-misc/spice-gtk-0.40
+++ b/metadata/md5-cache/net-misc/spice-gtk-0.41-r1
@@ -1,6 +1,6 @@
-BDEPEND=dev-perl/Text-CSV dev-util/glib-utils >=sys-devel/gettext-0.17 virtual/pkgconfig vala? ( || ( dev-lang/vala:0.56[vapigen(+)] ) ) || ( ( >=dev-lang/python-3.10.4:3.10 dev-python/six[python_targets_python3_10(-)] dev-python/pyparsing[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-python/six[python_targets_python3_9(-)] dev-python/pyparsing[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-python/six[python_targets_python3_8(-)] dev-python/pyparsing[python_targets_python3_8(-)] ) ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+BDEPEND=dev-perl/Text-CSV dev-util/glib-utils >=sys-devel/gettext-0.17 virtual/pkgconfig vala? ( || ( dev-lang/vala:0.56[vapigen(+)] ) ) || ( ( >=dev-lang/python-3.11.0_beta4:3.11 dev-python/six[python_targets_python3_11(-)] dev-python/pyparsing[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 dev-python/six[python_targets_python3_10(-)] dev-python/pyparsing[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-python/six[python_targets_python3_9(-)] dev-python/pyparsing[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-python/six[python_targets_python3_8(-)] dev-python/pyparsing[python_targets_python3_8(-)] ) ) >=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=>=dev-libs/glib-2.46:2 dev-libs/json-glib:0= media-libs/gst-plugins-base:1.0 media-libs/gst-plugins-good:1.0 media-libs/gstreamer:1.0[introspection?] media-libs/opus media-libs/libjpeg-turbo:= sys-libs/zlib >=x11-libs/cairo-1.2 >=x11-libs/pixman-0.17.7 x11-libs/libX11 gtk3? ( x11-libs/gtk+:3[introspection?] ) introspection? ( dev-libs/gobject-introspection ) dev-libs/openssl:= lz4? ( app-arch/lz4 ) sasl? ( dev-libs/cyrus-sasl ) smartcard? ( app-emulation/qemu[smartcard] ) usbredir? ( sys-apps/hwdata >=sys-apps/usbredir-0.4.2 virtual/libusb:1 policykit? ( sys-apps/acl >=sys-auth/polkit-0.110-r1 ) ) webdav? ( net-libs/phodav:2.0 >=net-libs/libsoup-2.49.91:2.4 ) amd64? ( media-libs/libva:= ) arm64? ( media-libs/libva:= ) x86? ( media-libs/libva:= ) >=app-emulation/spice-protocol-0.14.3
+DEPEND=>=dev-libs/glib-2.46:2 dev-libs/json-glib:0= media-libs/gst-plugins-base:1.0 media-libs/gst-plugins-good:1.0 media-libs/gstreamer:1.0[introspection?] media-libs/opus media-libs/libjpeg-turbo:= sys-libs/zlib >=x11-libs/cairo-1.2 >=x11-libs/pixman-0.17.7 x11-libs/libX11 gtk3? ( x11-libs/gtk+:3[introspection?] ) introspection? ( dev-libs/gobject-introspection ) dev-libs/openssl:= lz4? ( app-arch/lz4 ) sasl? ( dev-libs/cyrus-sasl ) smartcard? ( app-emulation/qemu[smartcard] ) usbredir? ( sys-apps/hwdata >=sys-apps/usbredir-0.4.2 virtual/acl virtual/libusb:1 policykit? ( >=sys-auth/polkit-0.110-r1 ) ) webdav? ( net-libs/phodav:3.0 net-libs/libsoup:3.0 ) amd64? ( media-libs/libva:= ) arm64? ( media-libs/libva:= ) x86? ( media-libs/libva:= ) >=app-emulation/spice-protocol-0.14.3
 DESCRIPTION=Set of GObject and Gtk objects for connecting to Spice servers and a client GUI
 EAPI=8
 HOMEPAGE=https://www.spice-space.org https://cgit.freedesktop.org/spice/spice-gtk/
@@ -9,8 +9,8 @@ INHERIT=desktop meson optfeature python-any-r1 readme.gentoo-r1 vala xdg
 IUSE=+gtk3 +introspection lz4 mjpeg policykit sasl smartcard usbredir vala wayland webdav
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=LGPL-2.1
-RDEPEND=>=dev-libs/glib-2.46:2 dev-libs/json-glib:0= media-libs/gst-plugins-base:1.0 media-libs/gst-plugins-good:1.0 media-libs/gstreamer:1.0[introspection?] media-libs/opus media-libs/libjpeg-turbo:= sys-libs/zlib >=x11-libs/cairo-1.2 >=x11-libs/pixman-0.17.7 x11-libs/libX11 gtk3? ( x11-libs/gtk+:3[introspection?] ) introspection? ( dev-libs/gobject-introspection ) dev-libs/openssl:= lz4? ( app-arch/lz4 ) sasl? ( dev-libs/cyrus-sasl ) smartcard? ( app-emulation/qemu[smartcard] ) usbredir? ( sys-apps/hwdata >=sys-apps/usbredir-0.4.2 virtual/libusb:1 policykit? ( sys-apps/acl >=sys-auth/polkit-0.110-r1 ) ) webdav? ( net-libs/phodav:2.0 >=net-libs/libsoup-2.49.91:2.4 ) amd64? ( media-libs/libva:= ) arm64? ( media-libs/libva:= ) x86? ( media-libs/libva:= )
+RDEPEND=>=dev-libs/glib-2.46:2 dev-libs/json-glib:0= media-libs/gst-plugins-base:1.0 media-libs/gst-plugins-good:1.0 media-libs/gstreamer:1.0[introspection?] media-libs/opus media-libs/libjpeg-turbo:= sys-libs/zlib >=x11-libs/cairo-1.2 >=x11-libs/pixman-0.17.7 x11-libs/libX11 gtk3? ( x11-libs/gtk+:3[introspection?] ) introspection? ( dev-libs/gobject-introspection ) dev-libs/openssl:= lz4? ( app-arch/lz4 ) sasl? ( dev-libs/cyrus-sasl ) smartcard? ( app-emulation/qemu[smartcard] ) usbredir? ( sys-apps/hwdata >=sys-apps/usbredir-0.4.2 virtual/acl virtual/libusb:1 policykit? ( >=sys-auth/polkit-0.110-r1 ) ) webdav? ( net-libs/phodav:3.0 net-libs/libsoup:3.0 ) amd64? ( media-libs/libva:= ) arm64? ( media-libs/libva:= ) x86? ( media-libs/libva:= )
 SLOT=0
-SRC_URI=https://www.spice-space.org/download/gtk/spice-gtk-0.40.tar.xz
+SRC_URI=https://www.spice-space.org/download/gtk/spice-gtk-0.41.tar.xz
 _eclasses_=desktop	7eb20ad915a0a318176d51bc2508ff5c	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	1a2157392a869265b2afcb63a26c12ac	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	vala	160a8a30a6cb9aa601e5441c643a7c61	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=734dd2fcb97b042587ab222f7dbff1fb
+_md5_=0efe76ba88c16bbcf1814b1b1b094fbb
diff --git a/metadata/md5-cache/net-misc/spice-gtk-9999 b/metadata/md5-cache/net-misc/spice-gtk-9999
index cef57a5add00..11019fa580de 100644
--- a/metadata/md5-cache/net-misc/spice-gtk-9999
+++ b/metadata/md5-cache/net-misc/spice-gtk-9999
@@ -1,6 +1,6 @@
-BDEPEND=dev-perl/Text-CSV dev-util/glib-utils >=sys-devel/gettext-0.17 virtual/pkgconfig vala? ( || ( dev-lang/vala:0.56[vapigen(+)] ) ) || ( ( >=dev-lang/python-3.10.4:3.10 dev-python/six[python_targets_python3_10(-)] dev-python/pyparsing[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-python/six[python_targets_python3_9(-)] dev-python/pyparsing[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-python/six[python_targets_python3_8(-)] dev-python/pyparsing[python_targets_python3_8(-)] ) ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=dev-perl/Text-CSV dev-util/glib-utils >=sys-devel/gettext-0.17 virtual/pkgconfig vala? ( || ( dev-lang/vala:0.56[vapigen(+)] ) ) || ( ( >=dev-lang/python-3.11.0_beta4:3.11 dev-python/six[python_targets_python3_11(-)] dev-python/pyparsing[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 dev-python/six[python_targets_python3_10(-)] dev-python/pyparsing[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-python/six[python_targets_python3_9(-)] dev-python/pyparsing[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-python/six[python_targets_python3_8(-)] dev-python/pyparsing[python_targets_python3_8(-)] ) ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-libs/glib-2.46:2 dev-libs/json-glib:0= media-libs/gst-plugins-base:1.0 media-libs/gst-plugins-good:1.0 media-libs/gstreamer:1.0[introspection?] media-libs/opus media-libs/libjpeg-turbo:= sys-libs/zlib >=x11-libs/cairo-1.2 >=x11-libs/pixman-0.17.7 x11-libs/libX11 gtk3? ( x11-libs/gtk+:3[introspection?] ) introspection? ( dev-libs/gobject-introspection ) dev-libs/openssl:= lz4? ( app-arch/lz4 ) sasl? ( dev-libs/cyrus-sasl ) smartcard? ( app-emulation/qemu[smartcard] ) usbredir? ( sys-apps/hwdata >=sys-apps/usbredir-0.4.2 virtual/acl virtual/libusb:1 policykit? ( >=sys-auth/polkit-0.110-r1 ) ) webdav? ( net-libs/phodav:2.0 >=net-libs/libsoup-2.49.91:2.4 ) amd64? ( media-libs/libva:= ) arm64? ( media-libs/libva:= ) x86? ( media-libs/libva:= ) >=app-emulation/spice-protocol-9999
+DEPEND=>=dev-libs/glib-2.46:2 dev-libs/json-glib:0= media-libs/gst-plugins-base:1.0 media-libs/gst-plugins-good:1.0 media-libs/gstreamer:1.0[introspection?] media-libs/opus media-libs/libjpeg-turbo:= sys-libs/zlib >=x11-libs/cairo-1.2 >=x11-libs/pixman-0.17.7 x11-libs/libX11 gtk3? ( x11-libs/gtk+:3[introspection?] ) introspection? ( dev-libs/gobject-introspection ) dev-libs/openssl:= lz4? ( app-arch/lz4 ) sasl? ( dev-libs/cyrus-sasl ) smartcard? ( app-emulation/qemu[smartcard] ) usbredir? ( sys-apps/hwdata >=sys-apps/usbredir-0.4.2 virtual/acl virtual/libusb:1 policykit? ( >=sys-auth/polkit-0.110-r1 ) ) webdav? ( net-libs/phodav:3.0 net-libs/libsoup:3.0 ) amd64? ( media-libs/libva:= ) arm64? ( media-libs/libva:= ) x86? ( media-libs/libva:= ) >=app-emulation/spice-protocol-9999
 DESCRIPTION=Set of GObject and Gtk objects for connecting to Spice servers and a client GUI
 EAPI=8
 HOMEPAGE=https://www.spice-space.org https://cgit.freedesktop.org/spice/spice-gtk/
@@ -9,7 +9,7 @@ INHERIT=desktop meson optfeature python-any-r1 readme.gentoo-r1 vala xdg git-r3
 IUSE=+gtk3 +introspection lz4 mjpeg policykit sasl smartcard usbredir vala wayland webdav
 LICENSE=LGPL-2.1
 PROPERTIES=live
-RDEPEND=>=dev-libs/glib-2.46:2 dev-libs/json-glib:0= media-libs/gst-plugins-base:1.0 media-libs/gst-plugins-good:1.0 media-libs/gstreamer:1.0[introspection?] media-libs/opus media-libs/libjpeg-turbo:= sys-libs/zlib >=x11-libs/cairo-1.2 >=x11-libs/pixman-0.17.7 x11-libs/libX11 gtk3? ( x11-libs/gtk+:3[introspection?] ) introspection? ( dev-libs/gobject-introspection ) dev-libs/openssl:= lz4? ( app-arch/lz4 ) sasl? ( dev-libs/cyrus-sasl ) smartcard? ( app-emulation/qemu[smartcard] ) usbredir? ( sys-apps/hwdata >=sys-apps/usbredir-0.4.2 virtual/acl virtual/libusb:1 policykit? ( >=sys-auth/polkit-0.110-r1 ) ) webdav? ( net-libs/phodav:2.0 >=net-libs/libsoup-2.49.91:2.4 ) amd64? ( media-libs/libva:= ) arm64? ( media-libs/libva:= ) x86? ( media-libs/libva:= )
+RDEPEND=>=dev-libs/glib-2.46:2 dev-libs/json-glib:0= media-libs/gst-plugins-base:1.0 media-libs/gst-plugins-good:1.0 media-libs/gstreamer:1.0[introspection?] media-libs/opus media-libs/libjpeg-turbo:= sys-libs/zlib >=x11-libs/cairo-1.2 >=x11-libs/pixman-0.17.7 x11-libs/libX11 gtk3? ( x11-libs/gtk+:3[introspection?] ) introspection? ( dev-libs/gobject-introspection ) dev-libs/openssl:= lz4? ( app-arch/lz4 ) sasl? ( dev-libs/cyrus-sasl ) smartcard? ( app-emulation/qemu[smartcard] ) usbredir? ( sys-apps/hwdata >=sys-apps/usbredir-0.4.2 virtual/acl virtual/libusb:1 policykit? ( >=sys-auth/polkit-0.110-r1 ) ) webdav? ( net-libs/phodav:3.0 net-libs/libsoup:3.0 ) amd64? ( media-libs/libva:= ) arm64? ( media-libs/libva:= ) x86? ( media-libs/libva:= )
 SLOT=0
 _eclasses_=desktop	7eb20ad915a0a318176d51bc2508ff5c	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	1a2157392a869265b2afcb63a26c12ac	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	vala	160a8a30a6cb9aa601e5441c643a7c61	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=06d38ae8344dea5854eb3c4715c9aa40
+_md5_=0efe76ba88c16bbcf1814b1b1b094fbb
diff --git a/metadata/md5-cache/net-misc/wol-0.7.1-r3 b/metadata/md5-cache/net-misc/wol-0.7.1-r3
index d9e0b770fe05..1bafa5a548c5 100644
--- a/metadata/md5-cache/net-misc/wol-0.7.1-r3
+++ b/metadata/md5-cache/net-misc/wol-0.7.1-r3
@@ -1,12 +1,13 @@
-DEFINED_PHASES=compile configure
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure prepare
 DESCRIPTION=Implements Wake On LAN (Magic Paket) functionality in a small program
 EAPI=8
 HOMEPAGE=http://ahh.sourceforge.net/wol/
-INHERIT=toolchain-funcs
+INHERIT=autotools toolchain-funcs
 IUSE=nls
 KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86
 LICENSE=GPL-2+
 SLOT=0
 SRC_URI=mirror://sourceforge/ahh/wol-0.7.1.tar.gz
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=2ad8d38a2210b470dfd5c4659df6280c
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=c71ea17beb98e02a16f9c4117b5c68e9
diff --git a/metadata/md5-cache/net-misc/wput-0.6.2_p20130413_p11 b/metadata/md5-cache/net-misc/wput-0.6.2_p20130413_p11
index e9ea5a36bec6..5960c80653a7 100644
--- a/metadata/md5-cache/net-misc/wput-0.6.2_p20130413_p11
+++ b/metadata/md5-cache/net-misc/wput-0.6.2_p20130413_p11
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=http://wput.sourceforge.net/
 INHERIT=autotools
 IUSE=debug ssl
-KEYWORDS=~amd64 ~ppc ~sparc ~x86
+KEYWORDS=amd64 ~ppc ~sparc x86
 LICENSE=GPL-2
 RDEPEND=ssl? ( net-libs/gnutls:= )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/w/wput/wput_0.6.2+git20130413.orig.tar.bz2 mirror://debian/pool/main/w/wput/wput_0.6.2+git20130413-11.debian.tar.xz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=52ea68ab81a664ad8cba4328e29e90f6
+_md5_=beda169118219c7457ba81458e38acbd
diff --git a/metadata/md5-cache/net-p2p/Manifest.gz b/metadata/md5-cache/net-p2p/Manifest.gz
index f784cd8757b1..4459f54ae4f3 100644
Binary files a/metadata/md5-cache/net-p2p/Manifest.gz and b/metadata/md5-cache/net-p2p/Manifest.gz differ
diff --git a/metadata/md5-cache/net-p2p/cpuminer-opt-3.16.4-r1 b/metadata/md5-cache/net-p2p/cpuminer-opt-3.16.4-r1
deleted file mode 100644
index 280eb793a3a3..000000000000
--- a/metadata/md5-cache/net-p2p/cpuminer-opt-3.16.4-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DEFINED_PHASES=configure install prepare test
-DEPEND=dev-libs/gmp:= dev-libs/jansson:= >=net-misc/curl-7.15[ssl] dev-libs/openssl:0=
-DESCRIPTION=Optimized multi algo CPU miner
-EAPI=7
-HOMEPAGE=https://github.com/JayDDee/cpuminer-opt
-INHERIT=autotools flag-o-matic systemd
-IUSE=cpu_flags_x86_sse2 curl
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=dev-libs/gmp:= dev-libs/jansson:= >=net-misc/curl-7.15[ssl] dev-libs/openssl:0=
-REQUIRED_USE=cpu_flags_x86_sse2
-SLOT=0
-SRC_URI=https://github.com/JayDDee/cpuminer-opt/archive/v3.16.4.tar.gz -> cpuminer-opt-3.16.4.tar.gz
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=c63e5f7ea68b1cfb8051e80d59ae1d58
diff --git a/metadata/md5-cache/net-p2p/cpuminer-opt-3.17.1-r1 b/metadata/md5-cache/net-p2p/cpuminer-opt-3.17.1-r1
deleted file mode 100644
index fdfdc279e67d..000000000000
--- a/metadata/md5-cache/net-p2p/cpuminer-opt-3.17.1-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DEFINED_PHASES=configure install prepare test
-DEPEND=dev-libs/gmp:= dev-libs/jansson:= >=net-misc/curl-7.15[ssl] dev-libs/openssl:0=
-DESCRIPTION=Optimized multi algo CPU miner
-EAPI=7
-HOMEPAGE=https://github.com/JayDDee/cpuminer-opt
-INHERIT=autotools flag-o-matic systemd
-IUSE=cpu_flags_x86_sse2 curl
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=dev-libs/gmp:= dev-libs/jansson:= >=net-misc/curl-7.15[ssl] dev-libs/openssl:0=
-REQUIRED_USE=cpu_flags_x86_sse2
-SLOT=0
-SRC_URI=https://github.com/JayDDee/cpuminer-opt/archive/v3.17.1.tar.gz -> cpuminer-opt-3.17.1.tar.gz
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=c63e5f7ea68b1cfb8051e80d59ae1d58
diff --git a/metadata/md5-cache/net-p2p/cpuminer-opt-3.18.0 b/metadata/md5-cache/net-p2p/cpuminer-opt-3.18.0
deleted file mode 100644
index acdc89c78801..000000000000
--- a/metadata/md5-cache/net-p2p/cpuminer-opt-3.18.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DEFINED_PHASES=configure install prepare test
-DEPEND=dev-libs/gmp:= dev-libs/jansson:= >=net-misc/curl-7.15[ssl] dev-libs/openssl:0=
-DESCRIPTION=Optimized multi algo CPU miner
-EAPI=7
-HOMEPAGE=https://github.com/JayDDee/cpuminer-opt
-INHERIT=autotools flag-o-matic systemd
-IUSE=cpu_flags_x86_sse2 curl
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=dev-libs/gmp:= dev-libs/jansson:= >=net-misc/curl-7.15[ssl] dev-libs/openssl:0=
-REQUIRED_USE=cpu_flags_x86_sse2
-SLOT=0
-SRC_URI=https://github.com/JayDDee/cpuminer-opt/archive/v3.18.0.tar.gz -> cpuminer-opt-3.18.0.tar.gz
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=c63e5f7ea68b1cfb8051e80d59ae1d58
diff --git a/metadata/md5-cache/net-p2p/cpuminer-opt-3.19.8 b/metadata/md5-cache/net-p2p/cpuminer-opt-3.20.3
similarity index 90%
rename from metadata/md5-cache/net-p2p/cpuminer-opt-3.19.8
rename to metadata/md5-cache/net-p2p/cpuminer-opt-3.20.3
index de81d80b98be..f2dd0dee2f78 100644
--- a/metadata/md5-cache/net-p2p/cpuminer-opt-3.19.8
+++ b/metadata/md5-cache/net-p2p/cpuminer-opt-3.20.3
@@ -11,6 +11,6 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/gmp:= dev-libs/jansson:= >=net-misc/curl-7.15[ssl] dev-libs/openssl:0=
 REQUIRED_USE=cpu_flags_x86_sse2
 SLOT=0
-SRC_URI=https://github.com/JayDDee/cpuminer-opt/archive/v3.19.8.tar.gz -> cpuminer-opt-3.19.8.tar.gz
+SRC_URI=https://github.com/JayDDee/cpuminer-opt/archive/v3.20.3.tar.gz -> cpuminer-opt-3.20.3.tar.gz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
 _md5_=6c11a74efd0400bc52045ad4deb985e4
diff --git a/metadata/md5-cache/net-p2p/transmission-3.00-r4 b/metadata/md5-cache/net-p2p/transmission-3.00-r5
similarity index 95%
rename from metadata/md5-cache/net-p2p/transmission-3.00-r4
rename to metadata/md5-cache/net-p2p/transmission-3.00-r5
index f065a3150b2b..5947eb41b73d 100644
--- a/metadata/md5-cache/net-p2p/transmission-3.00-r4
+++ b/metadata/md5-cache/net-p2p/transmission-3.00-r5
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://transmissionbt.com/
 INHERIT=cmake systemd xdg-utils
 IUSE=appindicator cli gtk lightweight nls mbedtls qt5 systemd test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 ~riscv ~x86
 LICENSE=|| ( GPL-2 GPL-3 Transmission-OpenSSL-exception ) GPL-2 MIT
 RDEPEND=>=dev-libs/libevent-2.0.10:= !mbedtls? ( dev-libs/openssl:0= ) mbedtls? ( net-libs/mbedtls:0= ) net-libs/libnatpmp >=net-libs/miniupnpc-1.7:= >=net-misc/curl-7.16.3[ssl] sys-libs/zlib:= nls? ( virtual/libintl ) gtk? ( >=dev-libs/glib-2.32:2 >=x11-libs/gtk+-3.4:3 appindicator? ( >=dev-libs/libappindicator-0.4.30:3 ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtnetwork:5 dev-qt/qtdbus:5 ) systemd? ( >=sys-apps/systemd-209:= ) acct-group/transmission acct-user/transmission
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~floppym/dist/transmission-3.00.tar.xz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=b4347c3919092c20b70268211327c99d
+_md5_=5f2a2008fadf164a5e5c63e0c859f626
diff --git a/metadata/md5-cache/net-proxy/Manifest.gz b/metadata/md5-cache/net-proxy/Manifest.gz
index 4f2e8d8e90c4..961871c4ee1f 100644
Binary files a/metadata/md5-cache/net-proxy/Manifest.gz and b/metadata/md5-cache/net-proxy/Manifest.gz differ
diff --git a/metadata/md5-cache/net-proxy/tayga-0.9.2-r2 b/metadata/md5-cache/net-proxy/tayga-0.9.2-r2
deleted file mode 100644
index b17bef38bbdc..000000000000
--- a/metadata/md5-cache/net-proxy/tayga-0.9.2-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=prepare
-DEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
-DESCRIPTION=out-of-kernel stateless NAT64 implementation based on TUN
-EAPI=6
-HOMEPAGE=http://www.litech.org/tayga/
-INHERIT=autotools
-KEYWORDS=~amd64
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://www.litech.org/tayga/tayga-0.9.2.tar.bz2
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	desktop	7eb20ad915a0a318176d51bc2508ff5c	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	447396341f5f896d722e435a06f87a4f	eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	8f942ebdcf04334697649d4a0bf65a32	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	5ca4e49abed8e3a2f7b56920eadee157	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=a3a526dac6de5d78a90767342c7bcf41
diff --git a/metadata/md5-cache/net-proxy/tayga-0.9.2-r3 b/metadata/md5-cache/net-proxy/tayga-0.9.2-r3
deleted file mode 100644
index 712ae0945deb..000000000000
--- a/metadata/md5-cache/net-proxy/tayga-0.9.2-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
-DESCRIPTION=out-of-kernel stateless NAT64 implementation based on TUN
-EAPI=6
-HOMEPAGE=http://www.litech.org/tayga/
-INHERIT=autotools
-KEYWORDS=~amd64 ~arm64 ~riscv
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://www.litech.org/tayga/tayga-0.9.2.tar.bz2
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	desktop	7eb20ad915a0a318176d51bc2508ff5c	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	447396341f5f896d722e435a06f87a4f	eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	8f942ebdcf04334697649d4a0bf65a32	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	5ca4e49abed8e3a2f7b56920eadee157	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=75c4b622e0adb049e017f230ddb2cbe7
diff --git a/metadata/md5-cache/dev-games/KXL-1.1.7-r3 b/metadata/md5-cache/net-proxy/tayga-0.9.2-r4
similarity index 59%
rename from metadata/md5-cache/dev-games/KXL-1.1.7-r3
rename to metadata/md5-cache/net-proxy/tayga-0.9.2-r4
index cfd151e1b267..8fe2357a534a 100644
--- a/metadata/md5-cache/dev-games/KXL-1.1.7-r3
+++ b/metadata/md5-cache/net-proxy/tayga-0.9.2-r4
@@ -1,14 +1,12 @@
 BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install prepare
-DEPEND=x11-libs/libX11
-DESCRIPTION=Development Library for making games for X
-EAPI=7
-HOMEPAGE=http://kxl.orz.hm/
+DEFINED_PHASES=install prepare
+DESCRIPTION=Out-of-kernel stateless NAT64 implementation based on TUN
+EAPI=8
+HOMEPAGE=http://www.litech.org/tayga/
 INHERIT=autotools
-KEYWORDS=amd64 x86
+KEYWORDS=~amd64 ~arm64 ~riscv
 LICENSE=GPL-2
-RDEPEND=x11-libs/libX11
 SLOT=0
-SRC_URI=http://kxl.hn.org/download/KXL-1.1.7.tar.gz
+SRC_URI=http://www.litech.org/tayga/tayga-0.9.2.tar.bz2
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=d2ee72d62f84b23a31c355f73d5f3b61
+_md5_=27bd87f49eb135d8ec49f9f5b021b34c
diff --git a/metadata/md5-cache/net-wireless/Manifest.gz b/metadata/md5-cache/net-wireless/Manifest.gz
index ab98a0ff54fc..b883c544be5f 100644
Binary files a/metadata/md5-cache/net-wireless/Manifest.gz and b/metadata/md5-cache/net-wireless/Manifest.gz differ
diff --git a/metadata/md5-cache/net-wireless/bluez-5.65 b/metadata/md5-cache/net-wireless/bluez-5.65
index 0d59bd0b0860..1ec4accaff8a 100644
--- a/metadata/md5-cache/net-wireless/bluez-5.65
+++ b/metadata/md5-cache/net-wireless/bluez-5.65
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=http://www.bluez.org
 INHERIT=autotools linux-info python-single-r1 readme.gentoo-r1 systemd udev multilib-minimal
 IUSE=btpclient cups doc debug deprecated extra-tools experimental +mesh midi +obex +readline selinux systemd test test-programs +udev python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_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
-KEYWORDS=~amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~x86
+KEYWORDS=amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv x86
 LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.28: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(-)?] btpclient? ( >=dev-libs/ell-0.39 ) cups? ( net-print/cups:= ) mesh? ( >=dev-libs/ell-0.39 >=dev-libs/json-c-0.13:= sys-libs/readline:0= ) midi? ( media-libs/alsa-lib ) obex? ( dev-libs/libical:= ) readline? ( sys-libs/readline:0= ) systemd? ( sys-apps/systemd ) >=sys-apps/dbus-1.6:= udev? ( >=virtual/udev-172 ) selinux? ( sec-policy/selinux-bluetooth ) test-programs? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_8? ( >=dev-python/dbus-python-1[python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/dbus-python-1[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/dbus-python-1[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] ) )
 REQUIRED_USE=btpclient? ( mesh ) extra-tools? ( deprecated readline ) test? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) ) test-programs? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/3
 SRC_URI=https://www.kernel.org/pub/linux/bluetooth/bluez-5.65.tar.xz https://dev.gentoo.org/~pacho/bluez/power-state-adapter-property.patch
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	bbfa385d6907d7948d49a5e107bd654d	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	udev	eec0bbab06977f1cfc5597269c1fa152
-_md5_=d83a79f8fa4233aeaaf38bd234fb2913
+_md5_=a9c8064cf12ff90e809b19d1a6d3bd4e
diff --git a/metadata/md5-cache/ros-meta/Manifest.gz b/metadata/md5-cache/ros-meta/Manifest.gz
index e0fcd092b51b..2260253e5f9c 100644
Binary files a/metadata/md5-cache/ros-meta/Manifest.gz and b/metadata/md5-cache/ros-meta/Manifest.gz differ
diff --git a/metadata/md5-cache/ros-meta/geometry2-0.7.6 b/metadata/md5-cache/ros-meta/geometry2-0.7.6
new file mode 100644
index 000000000000..a6c586f05718
--- /dev/null
+++ b/metadata/md5-cache/ros-meta/geometry2-0.7.6
@@ -0,0 +1,17 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/test_tf2 dev-ros/tf2 dev-ros/tf2_bullet dev-ros/tf2_eigen dev-ros/tf2_geometry_msgs dev-ros/tf2_kdl dev-ros/tf2_msgs dev-ros/tf2_py dev-ros/tf2_ros dev-ros/tf2_sensor_msgs dev-ros/tf2_tools python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-util/catkin[python_targets_python3_10(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/empy[python_targets_python3_10(-)] )
+DESCRIPTION=The second generation Transform Library in ros
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/geometry2 https://github.com/ros/geometry2
+INHERIT=ros-catkin
+IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-ros/test_tf2 dev-ros/tf2 dev-ros/tf2_bullet dev-ros/tf2_eigen dev-ros/tf2_geometry_msgs dev-ros/tf2_kdl dev-ros/tf2_msgs dev-ros/tf2_py dev-ros/tf2_ros dev-ros/tf2_sensor_msgs dev-ros/tf2_tools python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/geometry2/archive/0.7.6.tar.gz -> geometry2-0.7.6.tar.gz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	ros-catkin	1cf3d3264f61ccd5d9f53bec7351df9d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=df68a1df197e5260b12ac2adf690a938
diff --git a/metadata/md5-cache/sci-astronomy/Manifest.gz b/metadata/md5-cache/sci-astronomy/Manifest.gz
index c1fd6e5217bc..5b598a53723d 100644
Binary files a/metadata/md5-cache/sci-astronomy/Manifest.gz and b/metadata/md5-cache/sci-astronomy/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-astronomy/celestia-1.7.0_pre20200316-r100 b/metadata/md5-cache/sci-astronomy/celestia-1.7.0_pre20200316-r100
deleted file mode 100644
index 00fdf7642601..000000000000
--- a/metadata/md5-cache/sci-astronomy/celestia-1.7.0_pre20200316-r100
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-cpp/eigen virtual/pkgconfig nls? ( sys-devel/gettext ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=<dev-libs/libfmt-9.0.0:= media-libs/glew:0= media-libs/libpng:0= sys-libs/zlib:= virtual/glu virtual/jpeg:0 virtual/opengl glut? ( media-libs/freeglut ) 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 ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) theora? ( media-libs/libogg media-libs/libtheora ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=OpenGL 3D space simulator
-EAPI=7
-HOMEPAGE=https://celestia.space
-INHERIT=desktop flag-o-matic lua-single xdg cmake
-IUSE=glut lua nls +qt5 theora lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-3
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=<dev-libs/libfmt-9.0.0:= media-libs/glew:0= media-libs/libpng:0= sys-libs/zlib:= virtual/glu virtual/jpeg:0 virtual/opengl glut? ( media-libs/freeglut ) 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 ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) theora? ( media-libs/libogg media-libs/libtheora )
-REQUIRED_USE=|| ( glut qt5 ) lua? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-3 ) )
-SLOT=0
-SRC_URI=https://github.com/CelestiaProject/Celestia/archive/df508a0c597a3d96c1c039fa4a973e294021cfba.tar.gz -> celestia-1.7.0_pre20200316.tar.gz
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	desktop	7eb20ad915a0a318176d51bc2508ff5c	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=c982569c9eafc0c5a1adc9e1ed7e1805
diff --git a/metadata/md5-cache/sci-astronomy/celestia-1.7.0_pre20220120 b/metadata/md5-cache/sci-astronomy/celestia-1.7.0_pre20220120
index 1d2e624613f0..a2040727128e 100644
--- a/metadata/md5-cache/sci-astronomy/celestia-1.7.0_pre20220120
+++ b/metadata/md5-cache/sci-astronomy/celestia-1.7.0_pre20220120
@@ -1,17 +1,17 @@
 BDEPEND=dev-cpp/eigen virtual/pkgconfig nls? ( sys-devel/gettext ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=<dev-libs/libfmt-9.0.0:= media-libs/glew:0= media-libs/libepoxy media-libs/libpng:0= sys-libs/zlib:= virtual/glu virtual/jpeg:0 virtual/opengl ffmpeg? ( media-video/ffmpeg:0 ) glut? ( media-libs/freeglut ) 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 ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 )
+DEPEND=<dev-libs/libfmt-9.0.0:= media-libs/glew:0= media-libs/libepoxy media-libs/libjpeg-turbo:0= media-libs/libpng:0= sys-libs/zlib:= virtual/glu virtual/opengl ffmpeg? ( media-video/ffmpeg:0 ) glut? ( media-libs/freeglut ) 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 ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 )
 DESCRIPTION=OpenGL 3D space simulator
 EAPI=8
 HOMEPAGE=https://celestia.space
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=desktop flag-o-matic lua-single xdg cmake
+INHERIT=desktop lua-single xdg cmake
 IUSE=ffmpeg glut lua nls +qt5 lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-3
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
-RDEPEND=<dev-libs/libfmt-9.0.0:= media-libs/glew:0= media-libs/libepoxy media-libs/libpng:0= sys-libs/zlib:= virtual/glu virtual/jpeg:0 virtual/opengl ffmpeg? ( media-video/ffmpeg:0 ) glut? ( media-libs/freeglut ) 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 ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 )
+RDEPEND=<dev-libs/libfmt-9.0.0:= media-libs/glew:0= media-libs/libepoxy media-libs/libjpeg-turbo:0= media-libs/libpng:0= sys-libs/zlib:= virtual/glu virtual/opengl ffmpeg? ( media-video/ffmpeg:0 ) glut? ( media-libs/freeglut ) 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 ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 )
 REQUIRED_USE=|| ( glut qt5 ) lua? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-3 ) )
 SLOT=0
 SRC_URI=https://github.com/CelestiaProject/Celestia/archive/f969b37c3ee783ed51bf4d1cbeefca4132031316.tar.gz -> celestia-1.7.0_pre20220120.tar.gz https://github.com/CelestiaProject/CelestiaContent/archive/cc0bc0bb4b77e47115a31fbeb42babb30da3b790.tar.gz -> celestia-1.7.0_pre20220120-data.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	desktop	7eb20ad915a0a318176d51bc2508ff5c	flag-o-matic	29a755b1291d64133634d80b0328f153	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=e5a8421796edf105c32d718513131f12
+_md5_=d5b427ec4460b87e5f7caeb5c4371cb3
diff --git a/metadata/md5-cache/sci-astronomy/celestia-9999 b/metadata/md5-cache/sci-astronomy/celestia-9999
index 3678ebcb5330..69c6dac9fa4b 100644
--- a/metadata/md5-cache/sci-astronomy/celestia-9999
+++ b/metadata/md5-cache/sci-astronomy/celestia-9999
@@ -1,6 +1,6 @@
 BDEPEND=dev-cpp/eigen virtual/pkgconfig nls? ( sys-devel/gettext virtual/libintl ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=<dev-libs/libfmt-9.0.0:= media-libs/freetype media-libs/glew:0= media-libs/libepoxy media-libs/libglvnd media-libs/libpng:0= sys-libs/zlib:= virtual/glu virtual/jpeg:0 virtual/opengl ffmpeg? ( media-video/ffmpeg ) glut? ( media-libs/freeglut ) 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 ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=<dev-libs/libfmt-9.0.0:= media-libs/freetype media-libs/glew:0= media-libs/libepoxy media-libs/libglvnd media-libs/libjpeg-turbo:0= media-libs/libpng:0= sys-libs/zlib:= virtual/glu virtual/opengl ffmpeg? ( media-video/ffmpeg ) glut? ( media-libs/freeglut ) 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 ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=OpenGL 3D space simulator
 EAPI=7
 HOMEPAGE=https://celestia.space
@@ -8,8 +8,8 @@ INHERIT=desktop flag-o-matic lua-single xdg cmake git-r3
 IUSE=ffmpeg glut lua nls +qt5 lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-3
 LICENSE=GPL-2+
 PROPERTIES=live
-RDEPEND=<dev-libs/libfmt-9.0.0:= media-libs/freetype media-libs/glew:0= media-libs/libepoxy media-libs/libglvnd media-libs/libpng:0= sys-libs/zlib:= virtual/glu virtual/jpeg:0 virtual/opengl ffmpeg? ( media-video/ffmpeg ) glut? ( media-libs/freeglut ) 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 ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 )
+RDEPEND=<dev-libs/libfmt-9.0.0:= media-libs/freetype media-libs/glew:0= media-libs/libepoxy media-libs/libglvnd media-libs/libjpeg-turbo:0= media-libs/libpng:0= sys-libs/zlib:= virtual/glu virtual/opengl ffmpeg? ( media-video/ffmpeg ) glut? ( media-libs/freeglut ) 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 ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 )
 REQUIRED_USE=|| ( glut qt5 ) lua? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-3 ) )
 SLOT=0
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	desktop	7eb20ad915a0a318176d51bc2508ff5c	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=245dd53237676542de475bf77c3c7f56
+_md5_=9bf9d8996837acfeb306b7cea435a891
diff --git a/metadata/md5-cache/sci-chemistry/Manifest.gz b/metadata/md5-cache/sci-chemistry/Manifest.gz
index a67169ced46f..13e76456e853 100644
Binary files a/metadata/md5-cache/sci-chemistry/Manifest.gz and b/metadata/md5-cache/sci-chemistry/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-chemistry/chemex-2021.4.0_p6-r1 b/metadata/md5-cache/sci-chemistry/chemex-2021.4.0_p6-r1
deleted file mode 100644
index c2b43aaa74a6..000000000000
--- a/metadata/md5-cache/sci-chemistry/chemex-2021.4.0_p6-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( python_single_target_python3_8? ( >=dev-python/asteval-0.9.25[python_targets_python3_8(-)] >=dev-python/jsonschema-4.1.0[python_targets_python3_8(-)] >=dev-python/lmfit-1.0.3[python_targets_python3_8(-)] >=dev-python/matplotlib-3.4.3[python_targets_python3_8(-)] >=dev-python/numpy-1.21.2[python_targets_python3_8(-)] >=dev-python/scipy-1.7.0[python_targets_python3_8(-)] >=dev-python/tomlkit-0.7.2[python_targets_python3_8(-)] >=dev-python/tqdm-4.61.1[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/asteval-0.9.25[python_targets_python3_9(-)] >=dev-python/jsonschema-4.1.0[python_targets_python3_9(-)] >=dev-python/lmfit-1.0.3[python_targets_python3_9(-)] >=dev-python/matplotlib-3.4.3[python_targets_python3_9(-)] >=dev-python/numpy-1.21.2[python_targets_python3_9(-)] >=dev-python/scipy-1.7.0[python_targets_python3_9(-)] >=dev-python/tomlkit-0.7.2[python_targets_python3_9(-)] >=dev-python/tqdm-4.61.1[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/asteval-0.9.25[python_targets_python3_10(-)] >=dev-python/jsonschema-4.1.0[python_targets_python3_10(-)] >=dev-python/lmfit-1.0.3[python_targets_python3_10(-)] >=dev-python/matplotlib-3.4.3[python_targets_python3_10(-)] >=dev-python/numpy-1.21.2[python_targets_python3_10(-)] >=dev-python/scipy-1.7.0[python_targets_python3_10(-)] >=dev-python/tomlkit-0.7.2[python_targets_python3_10(-)] >=dev-python/tqdm-4.61.1[python_targets_python3_10(-)] ) python_single_target_python3_8? ( >=dev-python/pytest-7.1.3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/pytest-7.1.3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pytest-7.1.3[python_targets_python3_10(-)] ) ) python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_8? ( >=dev-python/gpep517-9[python_targets_python3_8(-)] >=dev-python/poetry-core-1.2.0[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/gpep517-9[python_targets_python3_9(-)] >=dev-python/poetry-core-1.2.0[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/gpep517-9[python_targets_python3_10(-)] >=dev-python/poetry-core-1.2.0[python_targets_python3_10(-)] )
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_8? ( >=dev-python/asteval-0.9.25[python_targets_python3_8(-)] >=dev-python/jsonschema-4.1.0[python_targets_python3_8(-)] >=dev-python/lmfit-1.0.3[python_targets_python3_8(-)] >=dev-python/matplotlib-3.4.3[python_targets_python3_8(-)] >=dev-python/numpy-1.21.2[python_targets_python3_8(-)] >=dev-python/scipy-1.7.0[python_targets_python3_8(-)] >=dev-python/tomlkit-0.7.2[python_targets_python3_8(-)] >=dev-python/tqdm-4.61.1[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/asteval-0.9.25[python_targets_python3_9(-)] >=dev-python/jsonschema-4.1.0[python_targets_python3_9(-)] >=dev-python/lmfit-1.0.3[python_targets_python3_9(-)] >=dev-python/matplotlib-3.4.3[python_targets_python3_9(-)] >=dev-python/numpy-1.21.2[python_targets_python3_9(-)] >=dev-python/scipy-1.7.0[python_targets_python3_9(-)] >=dev-python/tomlkit-0.7.2[python_targets_python3_9(-)] >=dev-python/tqdm-4.61.1[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/asteval-0.9.25[python_targets_python3_10(-)] >=dev-python/jsonschema-4.1.0[python_targets_python3_10(-)] >=dev-python/lmfit-1.0.3[python_targets_python3_10(-)] >=dev-python/matplotlib-3.4.3[python_targets_python3_10(-)] >=dev-python/numpy-1.21.2[python_targets_python3_10(-)] >=dev-python/scipy-1.7.0[python_targets_python3_10(-)] >=dev-python/tomlkit-0.7.2[python_targets_python3_10(-)] >=dev-python/tqdm-4.61.1[python_targets_python3_10(-)] )
-DESCRIPTION=Program to fit chemical exchange induced shift and relaxation data
-EAPI=8
-HOMEPAGE=https://github.com/gbouvignies/chemex
-INHERIT=distutils-r1
-IUSE=test test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=python_single_target_python3_8? ( >=dev-python/asteval-0.9.25[python_targets_python3_8(-)] >=dev-python/jsonschema-4.1.0[python_targets_python3_8(-)] >=dev-python/lmfit-1.0.3[python_targets_python3_8(-)] >=dev-python/matplotlib-3.4.3[python_targets_python3_8(-)] >=dev-python/numpy-1.21.2[python_targets_python3_8(-)] >=dev-python/scipy-1.7.0[python_targets_python3_8(-)] >=dev-python/tomlkit-0.7.2[python_targets_python3_8(-)] >=dev-python/tqdm-4.61.1[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/asteval-0.9.25[python_targets_python3_9(-)] >=dev-python/jsonschema-4.1.0[python_targets_python3_9(-)] >=dev-python/lmfit-1.0.3[python_targets_python3_9(-)] >=dev-python/matplotlib-3.4.3[python_targets_python3_9(-)] >=dev-python/numpy-1.21.2[python_targets_python3_9(-)] >=dev-python/scipy-1.7.0[python_targets_python3_9(-)] >=dev-python/tomlkit-0.7.2[python_targets_python3_9(-)] >=dev-python/tqdm-4.61.1[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/asteval-0.9.25[python_targets_python3_10(-)] >=dev-python/jsonschema-4.1.0[python_targets_python3_10(-)] >=dev-python/lmfit-1.0.3[python_targets_python3_10(-)] >=dev-python/matplotlib-3.4.3[python_targets_python3_10(-)] >=dev-python/numpy-1.21.2[python_targets_python3_10(-)] >=dev-python/scipy-1.7.0[python_targets_python3_10(-)] >=dev-python/tomlkit-0.7.2[python_targets_python3_10(-)] >=dev-python/tqdm-4.61.1[python_targets_python3_10(-)] ) python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
-RESTRICT=test !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/gbouvignies/chemex/archive/2021.4.0-dev6.tar.gz -> chemex-2021.4.0_p6.tar.gz
-_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=4cc795e53a69163691239c881ed9435a
diff --git a/metadata/md5-cache/sci-chemistry/chemex-2022.1.0 b/metadata/md5-cache/sci-chemistry/chemex-2022.1.0
new file mode 100644
index 000000000000..a862790a3ac5
--- /dev/null
+++ b/metadata/md5-cache/sci-chemistry/chemex-2022.1.0
@@ -0,0 +1,17 @@
+BDEPEND=test? ( python_single_target_python3_9? ( >=dev-python/asteval-0.9.25[python_targets_python3_9(-)] >=dev-python/cachetools-5.2.0[python_targets_python3_9(-)] >=dev-python/lmfit-1.0.3[python_targets_python3_9(-)] >=dev-python/matplotlib-3.6.1[python_targets_python3_9(-)] >=dev-python/numpy-1.23.4[python_targets_python3_9(-)] >=dev-python/pydantic-1.10.2[python_targets_python3_9(-)] >=dev-python/rapidfuzz-2.11.0[python_targets_python3_9(-)] >=dev-python/rich-12.6.0[python_targets_python3_9(-)] >=dev-python/scipy-1.9.3[python_targets_python3_9(-)] >=dev-python/tomli-2.0.1[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/asteval-0.9.25[python_targets_python3_10(-)] >=dev-python/cachetools-5.2.0[python_targets_python3_10(-)] >=dev-python/lmfit-1.0.3[python_targets_python3_10(-)] >=dev-python/matplotlib-3.6.1[python_targets_python3_10(-)] >=dev-python/numpy-1.23.4[python_targets_python3_10(-)] >=dev-python/pydantic-1.10.2[python_targets_python3_10(-)] >=dev-python/rapidfuzz-2.11.0[python_targets_python3_10(-)] >=dev-python/rich-12.6.0[python_targets_python3_10(-)] >=dev-python/scipy-1.9.3[python_targets_python3_10(-)] >=dev-python/tomli-2.0.1[python_targets_python3_10(-)] ) python_single_target_python3_9? ( >=dev-python/pytest-7.1.3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pytest-7.1.3[python_targets_python3_10(-)] ) ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_9? ( >=dev-python/gpep517-9[python_targets_python3_9(-)] >=dev-python/poetry-core-1.2.0[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/gpep517-9[python_targets_python3_10(-)] >=dev-python/poetry-core-1.2.0[python_targets_python3_10(-)] )
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_9? ( >=dev-python/asteval-0.9.25[python_targets_python3_9(-)] >=dev-python/cachetools-5.2.0[python_targets_python3_9(-)] >=dev-python/lmfit-1.0.3[python_targets_python3_9(-)] >=dev-python/matplotlib-3.6.1[python_targets_python3_9(-)] >=dev-python/numpy-1.23.4[python_targets_python3_9(-)] >=dev-python/pydantic-1.10.2[python_targets_python3_9(-)] >=dev-python/rapidfuzz-2.11.0[python_targets_python3_9(-)] >=dev-python/rich-12.6.0[python_targets_python3_9(-)] >=dev-python/scipy-1.9.3[python_targets_python3_9(-)] >=dev-python/tomli-2.0.1[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/asteval-0.9.25[python_targets_python3_10(-)] >=dev-python/cachetools-5.2.0[python_targets_python3_10(-)] >=dev-python/lmfit-1.0.3[python_targets_python3_10(-)] >=dev-python/matplotlib-3.6.1[python_targets_python3_10(-)] >=dev-python/numpy-1.23.4[python_targets_python3_10(-)] >=dev-python/pydantic-1.10.2[python_targets_python3_10(-)] >=dev-python/rapidfuzz-2.11.0[python_targets_python3_10(-)] >=dev-python/rich-12.6.0[python_targets_python3_10(-)] >=dev-python/scipy-1.9.3[python_targets_python3_10(-)] >=dev-python/tomli-2.0.1[python_targets_python3_10(-)] )
+DESCRIPTION=Program to fit chemical exchange induced shift and relaxation data
+EAPI=8
+HOMEPAGE=https://github.com/gbouvignies/chemex
+INHERIT=distutils-r1
+IUSE=test test python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=python_single_target_python3_9? ( >=dev-python/asteval-0.9.25[python_targets_python3_9(-)] >=dev-python/cachetools-5.2.0[python_targets_python3_9(-)] >=dev-python/lmfit-1.0.3[python_targets_python3_9(-)] >=dev-python/matplotlib-3.6.1[python_targets_python3_9(-)] >=dev-python/numpy-1.23.4[python_targets_python3_9(-)] >=dev-python/pydantic-1.10.2[python_targets_python3_9(-)] >=dev-python/rapidfuzz-2.11.0[python_targets_python3_9(-)] >=dev-python/rich-12.6.0[python_targets_python3_9(-)] >=dev-python/scipy-1.9.3[python_targets_python3_9(-)] >=dev-python/tomli-2.0.1[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/asteval-0.9.25[python_targets_python3_10(-)] >=dev-python/cachetools-5.2.0[python_targets_python3_10(-)] >=dev-python/lmfit-1.0.3[python_targets_python3_10(-)] >=dev-python/matplotlib-3.6.1[python_targets_python3_10(-)] >=dev-python/numpy-1.23.4[python_targets_python3_10(-)] >=dev-python/pydantic-1.10.2[python_targets_python3_10(-)] >=dev-python/rapidfuzz-2.11.0[python_targets_python3_10(-)] >=dev-python/rich-12.6.0[python_targets_python3_10(-)] >=dev-python/scipy-1.9.3[python_targets_python3_10(-)] >=dev-python/tomli-2.0.1[python_targets_python3_10(-)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
+REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 )
+RESTRICT=test !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/gbouvignies/ChemEx/archive/refs/tags/v2022.1.0.tar.gz -> chemex-2022.1.0.tar.gz
+_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=baa6d065a5d7949a7225fde3814f578a
diff --git a/metadata/md5-cache/sci-geosciences/Manifest.gz b/metadata/md5-cache/sci-geosciences/Manifest.gz
index ad099f10c180..bf6ee29dde6e 100644
Binary files a/metadata/md5-cache/sci-geosciences/Manifest.gz and b/metadata/md5-cache/sci-geosciences/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-geosciences/gnome-maps-43.1 b/metadata/md5-cache/sci-geosciences/gnome-maps-43.1
new file mode 100644
index 000000000000..a498f2604120
--- /dev/null
+++ b/metadata/md5-cache/sci-geosciences/gnome-maps-43.1
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/glib-utils >=sys-devel/gettext-0.19.8 virtual/pkgconfig 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 test
+DEPEND=>=dev-libs/glib-2.66.0:2 >=dev-libs/gjs-1.69.2 >=dev-libs/gobject-introspection-0.10.1:= gui-libs/gtk:4[introspection] >=app-misc/geoclue-0.12.99:2.0[introspection] >=gui-libs/libadwaita-1.0:1[introspection] >=dev-libs/libgweather-4.2.0:4=[introspection] >=sci-geosciences/geocode-glib-3.15.2:2[introspection] >=media-libs/libshumate-1.0:1.0=[introspection] dev-libs/libxml2:2 >=net-libs/rest-0.9.1:1.0[introspection] app-crypt/libsecret[introspection] media-libs/graphene[introspection] net-libs/libsoup:3.0[introspection] x11-libs/pango[introspection]
+DESCRIPTION=A map application for GNOME
+EAPI=8
+HOMEPAGE=https://wiki.gnome.org/Apps/Maps
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=gnome.org gnome2-utils meson xdg
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2+ LGPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0
+RDEPEND=>=dev-libs/glib-2.66.0:2 >=dev-libs/gjs-1.69.2 >=dev-libs/gobject-introspection-0.10.1:= gui-libs/gtk:4[introspection] >=app-misc/geoclue-0.12.99:2.0[introspection] >=gui-libs/libadwaita-1.0:1[introspection] >=dev-libs/libgweather-4.2.0:4=[introspection] >=sci-geosciences/geocode-glib-3.15.2:2[introspection] >=media-libs/libshumate-1.0:1.0=[introspection] dev-libs/libxml2:2 >=net-libs/rest-0.9.1:1.0[introspection] app-crypt/libsecret[introspection] media-libs/graphene[introspection] net-libs/libsoup:3.0[introspection] x11-libs/pango[introspection]
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-maps/43/gnome-maps-43.1.tar.xz
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=64a91046246fe95623957e83d1c0bdb6
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index 26cfa96db9a9..7593eefabb06 100644
Binary files a/metadata/md5-cache/sci-libs/Manifest.gz and b/metadata/md5-cache/sci-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-libs/brial-1.2.10 b/metadata/md5-cache/sci-libs/brial-1.2.10
deleted file mode 100644
index 5c655410558d..000000000000
--- a/metadata/md5-cache/sci-libs/brial-1.2.10
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=configure install
-DEPEND=dev-libs/boost sci-libs/m4ri[png=]
-DESCRIPTION=A C++ library for polynomials over boolean rings
-EAPI=7
-HOMEPAGE=https://github.com/BRiAl/BRiAl
-INHERIT=toolchain-funcs
-IUSE=png static-libs
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=BSD GPL-2+
-RDEPEND=dev-libs/boost sci-libs/m4ri[png=]
-SLOT=0
-SRC_URI=https://github.com/BRiAl/BRiAl/releases/download/1.2.10/brial-1.2.10.tar.bz2
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=a7243a9cba0e53e45b312d9aa04eb3d1
diff --git a/metadata/md5-cache/sci-libs/givaro-4.1.1-r2 b/metadata/md5-cache/sci-libs/givaro-4.1.1-r2
deleted file mode 100644
index a7aea356a758..000000000000
--- a/metadata/md5-cache/sci-libs/givaro-4.1.1-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=doc? ( app-doc/doxygen[dot] dev-texlive/texlive-bibtexextra dev-texlive/texlive-fontsextra dev-texlive/texlive-fontutils dev-texlive/texlive-latex dev-texlive/texlive-latexextra )
-DEFINED_PHASES=configure install
-DEPEND=dev-libs/gmp:0[cxx(+)]
-DESCRIPTION=C++ library for arithmetic and algebraic computations
-EAPI=7
-HOMEPAGE=https://casys.gricad-pages.univ-grenoble-alpes.fr/givaro/
-IUSE=cpu_flags_x86_fma3 cpu_flags_x86_fma4 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 doc static-libs test
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
-LICENSE=CeCILL-B
-RDEPEND=dev-libs/gmp:0[cxx(+)]
-RESTRICT=!test? ( test )
-SLOT=0/9
-SRC_URI=https://github.com/linbox-team/givaro/releases/download/v4.1.1/givaro-4.1.1.tar.gz
-_md5_=f9770c163b26ab20f4972f0ec35da7fc
diff --git a/metadata/md5-cache/sci-libs/openblas-0.3.18 b/metadata/md5-cache/sci-libs/openblas-0.3.18
index df0cfa898d13..a26bc1bf0777 100644
--- a/metadata/md5-cache/sci-libs/openblas-0.3.18
+++ b/metadata/md5-cache/sci-libs/openblas-0.3.18
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile install postinst postrm prepare pretend setup test
 DEPEND=virtual/fortran
 DESCRIPTION=Optimized BLAS library based on GotoBLAS2
 EAPI=7
-HOMEPAGE=http://xianyi.github.com/OpenBLAS/
+HOMEPAGE=http://xianyi.github.io/OpenBLAS/
 INHERIT=flag-o-matic fortran-2 toolchain-funcs
 IUSE=dynamic eselect-ldso index-64bit openmp pthread relapack test
 KEYWORDS=amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-macos
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/xianyi/OpenBLAS/archive/v0.3.18.tar.gz -> openblas-0.3.18.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	fortran-2	72d28c6872beb1e7cb99684b0ae4715d	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=e9435656422d17291c59fbbf4414149c
+_md5_=0861da1b26f74a0161d3ae5d58f0579a
diff --git a/metadata/md5-cache/sci-libs/openblas-0.3.19 b/metadata/md5-cache/sci-libs/openblas-0.3.19
index 35c1adea87a5..164987f21942 100644
--- a/metadata/md5-cache/sci-libs/openblas-0.3.19
+++ b/metadata/md5-cache/sci-libs/openblas-0.3.19
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile install postinst postrm prepare pretend setup test
 DEPEND=virtual/fortran
 DESCRIPTION=Optimized BLAS library based on GotoBLAS2
 EAPI=7
-HOMEPAGE=http://xianyi.github.com/OpenBLAS/
+HOMEPAGE=http://xianyi.github.io/OpenBLAS/
 INHERIT=flag-o-matic fortran-2 toolchain-funcs
 IUSE=dynamic eselect-ldso index-64bit openmp pthread relapack test
 KEYWORDS=amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-macos
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/xianyi/OpenBLAS/archive/v0.3.19.tar.gz -> openblas-0.3.19.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	fortran-2	72d28c6872beb1e7cb99684b0ae4715d	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=e9435656422d17291c59fbbf4414149c
+_md5_=0861da1b26f74a0161d3ae5d58f0579a
diff --git a/metadata/md5-cache/sci-libs/openblas-0.3.20 b/metadata/md5-cache/sci-libs/openblas-0.3.20
index 3a22cb8845e0..06d27906088b 100644
--- a/metadata/md5-cache/sci-libs/openblas-0.3.20
+++ b/metadata/md5-cache/sci-libs/openblas-0.3.20
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile install postinst postrm prepare pretend setup test
 DEPEND=virtual/fortran
 DESCRIPTION=Optimized BLAS library based on GotoBLAS2
 EAPI=7
-HOMEPAGE=http://xianyi.github.com/OpenBLAS/
+HOMEPAGE=http://xianyi.github.io/OpenBLAS/
 INHERIT=flag-o-matic fortran-2 toolchain-funcs
 IUSE=dynamic eselect-ldso index-64bit openmp pthread relapack test
 KEYWORDS=~amd64 ~arm ~arm64 ~loong ~riscv ~x86 ~amd64-linux ~x86-linux ~x64-macos
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/xianyi/OpenBLAS/archive/v0.3.20.tar.gz -> openblas-0.3.20.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	fortran-2	72d28c6872beb1e7cb99684b0ae4715d	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=5b4226cf2d57adffc01bb103d2e5b4d1
+_md5_=5315b7c6f146efb351d9381f7c57ed81
diff --git a/metadata/md5-cache/sci-mathematics/Manifest.gz b/metadata/md5-cache/sci-mathematics/Manifest.gz
index dbd11c1cf749..06a151421834 100644
Binary files a/metadata/md5-cache/sci-mathematics/Manifest.gz and b/metadata/md5-cache/sci-mathematics/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-mathematics/nauty-2.7.4 b/metadata/md5-cache/sci-mathematics/nauty-2.7.4
index 78bb672f47be..0af035cb63e1 100644
--- a/metadata/md5-cache/sci-mathematics/nauty-2.7.4
+++ b/metadata/md5-cache/sci-mathematics/nauty-2.7.4
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://pallini.di.uniroma1.it/
 INHERIT=autotools
 IUSE=examples
-KEYWORDS=~amd64 ~arm ~riscv ~x86
+KEYWORDS=amd64 ~arm ~riscv ~x86
 LICENSE=Apache-2.0
 RDEPEND=dev-libs/gmp:0 sys-libs/zlib sci-mathematics/cliquer
 SLOT=0
 SRC_URI=https://pallini.di.uniroma1.it/nauty27r4.tar.gz mirror://debian/pool/main/n/nauty/nauty_2.7r4+ds-1.debian.tar.xz https://src.fedoraproject.org/rpms/nauty/raw/f35/f/nauty-includes.patch
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=608800b3e657aacc49b30b18e9380d83
+_md5_=13f778c5113ff843f49f857ec2670a6a
diff --git a/metadata/md5-cache/sci-mathematics/rkward-0.7.4 b/metadata/md5-cache/sci-mathematics/rkward-0.7.4
deleted file mode 100644
index 247dd4dd44c0..000000000000
--- a/metadata/md5-cache/sci-mathematics/rkward-0.7.4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/gettext >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 handbook? ( >=kde-frameworks/kdoctools-5.82.0: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-lang/R dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtwebengine:5[widgets] dev-qt/qtwidgets:5 dev-qt/qtxml:5 kde-frameworks/karchive:5 kde-frameworks/kcompletion:5 kde-frameworks/kconfig:5 kde-frameworks/kconfigwidgets:5 kde-frameworks/kcoreaddons:5 kde-frameworks/kcrash:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kjobwidgets:5 kde-frameworks/knotifications:5 kde-frameworks/kparts:5 kde-frameworks/kservice:5 kde-frameworks/ktexteditor:5 kde-frameworks/kwidgetsaddons:5 kde-frameworks/kwindowsystem:5 kde-frameworks/kxmlgui:5 dev-qt/qtcore:5
-DESCRIPTION=IDE for the R-project
-EAPI=8
-HOMEPAGE=https://rkward.kde.org/
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=ecm kde.org optfeature
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2+ LGPL-2
-RDEPEND=dev-lang/R dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtwebengine:5[widgets] dev-qt/qtwidgets:5 dev-qt/qtxml:5 kde-frameworks/karchive:5 kde-frameworks/kcompletion:5 kde-frameworks/kconfig:5 kde-frameworks/kconfigwidgets:5 kde-frameworks/kcoreaddons:5 kde-frameworks/kcrash:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kjobwidgets:5 kde-frameworks/knotifications:5 kde-frameworks/kparts:5 kde-frameworks/kservice:5 kde-frameworks/ktexteditor:5 kde-frameworks/kwidgetsaddons:5 kde-frameworks/kwindowsystem:5 kde-frameworks/kxmlgui: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/rkward/0.7.4/rkward-0.7.4.tar.gz
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	ecm	3dae552f761290722bcc848a12bfb538	flag-o-matic	29a755b1291d64133634d80b0328f153	kde.org	087d21100477ce987a8de6c1d613a176	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	1a2157392a869265b2afcb63a26c12ac	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=1daa6954375883216e19fc192cd54b42
diff --git a/metadata/md5-cache/sci-mathematics/singular-4.3.1_p1 b/metadata/md5-cache/sci-mathematics/singular-4.3.1_p1
index e4523168efbf..d17faf87c471 100644
--- a/metadata/md5-cache/sci-mathematics/singular-4.3.1_p1
+++ b/metadata/md5-cache/sci-mathematics/singular-4.3.1_p1
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://www.singular.uni-kl.de/ https://github.com/Singular/Singular
 INHERIT=elisp-common
 IUSE=emacs examples polymake +readline static-libs
-KEYWORDS=~amd64 ~ppc ~riscv ~x86 ~x86-linux
+KEYWORDS=amd64 ~ppc ~riscv ~x86 ~x86-linux
 LICENSE=BSD GPL-2 GPL-3
 RDEPEND=dev-lang/perl dev-libs/gmp:0 dev-libs/ntl:= sci-libs/cddlib sci-mathematics/flint emacs? ( >=app-editors/emacs-23.1:* ) polymake? ( sci-mathematics/polymake ) readline? ( sys-libs/readline )
 SLOT=0
 SRC_URI=ftp://jim.mathematik.uni-kl.de/pub/Math/Singular/SOURCES/4-3-1/singular-4.3.1p1.tar.gz
 _eclasses_=elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
-_md5_=bee9fd5a9cef832bf0c9d7d32531e82f
+_md5_=504355d40dcf4864568bb4383def8d51
diff --git a/metadata/md5-cache/sci-misc/Manifest.gz b/metadata/md5-cache/sci-misc/Manifest.gz
index d1947984502c..a64215df3ae6 100644
Binary files a/metadata/md5-cache/sci-misc/Manifest.gz and b/metadata/md5-cache/sci-misc/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-misc/gt-itm-19961004-r2 b/metadata/md5-cache/sci-misc/gt-itm-19961004-r3
similarity index 70%
rename from metadata/md5-cache/sci-misc/gt-itm-19961004-r2
rename to metadata/md5-cache/sci-misc/gt-itm-19961004-r3
index 613644dcae71..fe0c04961d16 100644
--- a/metadata/md5-cache/sci-misc/gt-itm-19961004-r2
+++ b/metadata/md5-cache/sci-misc/gt-itm-19961004-r3
@@ -1,9 +1,9 @@
 DEFINED_PHASES=compile install prepare unpack
 DEPEND=dev-util/sgb
 DESCRIPTION=Routines to generate / analyze graphs using models for internetwork topology
-EAPI=6
+EAPI=8
 HOMEPAGE=http://www.cc.gatech.edu/fac/Ellen.Zegura/graphs.html http://www.isi.edu/nsnam/ns/ns-topogen.html#gt-itm
-INHERIT=toolchain-funcs
+INHERIT=flag-o-matic toolchain-funcs
 IUSE=doc
 KEYWORDS=~amd64 ~x86
 LICENSE=all-rights-reserved sgb2ns
@@ -11,5 +11,5 @@ RDEPEND=dev-util/sgb
 RESTRICT=mirror bindist
 SLOT=0
 SRC_URI=http://www.cc.gatech.edu/fac/Ellen.Zegura/gt-itm/gt-itm.tar.gz -> gt-itm-19961004.tar.gz http://www.isi.edu/nsnam/dist/sgb2ns.tar.gz -> sgb2ns-19961004.tar.gz
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=d689f5929b3b5540318ba9be1adf411c
+_eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=30426e9accf4e60f06bea977d116e410
diff --git a/metadata/md5-cache/sec-keys/Manifest.gz b/metadata/md5-cache/sec-keys/Manifest.gz
index eb93eb8cc17e..53bc0c98c8cc 100644
Binary files a/metadata/md5-cache/sec-keys/Manifest.gz and b/metadata/md5-cache/sec-keys/Manifest.gz differ
diff --git a/metadata/md5-cache/sec-keys/openpgp-keys-python-20221025 b/metadata/md5-cache/sec-keys/openpgp-keys-python-20221025
new file mode 100644
index 000000000000..af7c89106b09
--- /dev/null
+++ b/metadata/md5-cache/sec-keys/openpgp-keys-python-20221025
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install
+DESCRIPTION=OpenPGP keys used to sign CPython releases
+EAPI=7
+HOMEPAGE=https://www.python.org/downloads/
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
+LICENSE=public-domain
+SLOT=0
+SRC_URI=https://keybase.io/pablogsal/pgp_keys.asc?fingerprint=a035c8c19219ba821ecea86b64e628f8d684696d -> a035c8c19219ba821ecea86b64e628f8d684696d.asc https://keybase.io/ambv/pgp_keys.asc?fingerprint=e3ff2839c048b25c084debe9b26995e310250568 -> e3ff2839c048b25c084debe9b26995e310250568-r1.asc https://keybase.io/nad/pgp_keys.asc?fingerprint=0d96df4d4110e5c43fbfb17f2d347ea6aa65421d -> 0d96df4d4110e5c43fbfb17f2d347ea6aa65421d.asc https://keybase.io/nad/pgp_keys.asc?fingerprint=c9b104b3dd3aa72d7ccb1066fb9921286f5e1540 -> c9b104b3dd3aa72d7ccb1066fb9921286f5e1540.asc https://keybase.io/bp/pgp_keys.asc?fingerprint=c01e1cad5ea2c4f0b8e3571504c367c218add4ff -> c01e1cad5ea2c4f0b8e3571504c367c218add4ff.asc https://github.com/Yhg1s.gpg
+_md5_=d13a1ee85fe848ec5841e07351c4f79e
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index 1680c50a266b..4a3df88229d5 100644
Binary files a/metadata/md5-cache/sys-apps/Manifest.gz and b/metadata/md5-cache/sys-apps/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-apps/cpu-x-4.5.1 b/metadata/md5-cache/sys-apps/cpu-x-4.5.1
new file mode 100644
index 000000000000..165b25d6ef2a
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/cpu-x-4.5.1
@@ -0,0 +1,17 @@
+BDEPEND=dev-lang/nasm nls? ( sys-devel/gettext ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=test? ( sys-apps/mawk sys-apps/nawk ) dev-libs/glib:2 x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/pango force-libstatgrab? ( sys-libs/libstatgrab ) !force-libstatgrab? ( sys-process/procps:= ) gui? ( >=x11-libs/gtk+-3.12:3 ) cpu? ( >=dev-libs/libcpuid-0.6.0:= ) gpu? ( >=media-libs/glfw-3.3 media-libs/libglvnd ) pci? ( sys-apps/pciutils ) ncurses? ( sys-libs/ncurses:=[tinfo] ) opencl? ( virtual/opencl )
+DESCRIPTION=A Free software that gathers information on CPU, motherboard and more
+EAPI=8
+HOMEPAGE=https://x0rg.github.io/CPU-X/
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=cmake gnome2-utils xdg
+IUSE=+cpu force-libstatgrab +gpu +gui +ncurses +nls opencl +pci test
+KEYWORDS=-* ~amd64
+LICENSE=GPL-3
+RDEPEND=dev-libs/glib:2 x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/pango force-libstatgrab? ( sys-libs/libstatgrab ) !force-libstatgrab? ( sys-process/procps:= ) gui? ( >=x11-libs/gtk+-3.12:3 ) cpu? ( >=dev-libs/libcpuid-0.6.0:= ) gpu? ( >=media-libs/glfw-3.3 media-libs/libglvnd ) pci? ( sys-apps/pciutils ) ncurses? ( sys-libs/ncurses:=[tinfo] ) opencl? ( virtual/opencl )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/X0rg/CPU-X/archive/v4.5.1.tar.gz -> cpu-x-4.5.1.tar.gz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=7937e16f48bf7376e2c070e8a1ff62ac
diff --git a/metadata/md5-cache/sys-apps/memtest86+-6.00 b/metadata/md5-cache/sys-apps/memtest86+-6.00
new file mode 100644
index 000000000000..5dcaba56c91d
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/memtest86+-6.00
@@ -0,0 +1,13 @@
+BDEPEND=iso32? ( dev-libs/libisoburn sys-fs/dosfstools sys-fs/mtools ) iso64? ( dev-libs/libisoburn sys-fs/dosfstools sys-fs/mtools )
+DEFINED_PHASES=compile install postinst postrm preinst prepare prerm pretend
+DESCRIPTION=Memory tester based on PCMemTest
+EAPI=8
+HOMEPAGE=https://www.memtest.org/
+INHERIT=mount-boot toolchain-funcs
+IUSE=bios32 bios64 +boot efi32 efi64 iso32 iso64
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=https://github.com/memtest86plus/memtest86plus/archive/refs/tags/v6.00.tar.gz -> memtest86+-6.00.tar.gz
+_eclasses_=mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=2bc62953cbfd1dbe27de95f79a28281e
diff --git a/metadata/md5-cache/sys-apps/openrc-0.44.10-r1 b/metadata/md5-cache/sys-apps/openrc-0.44.10-r1
deleted file mode 100644
index 8d93db8266a8..000000000000
--- a/metadata/md5-cache/sys-apps/openrc-0.44.10-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst preinst test
-DEPEND=ncurses? ( sys-libs/ncurses:0= ) pam? ( sys-libs/pam ) audit? ( sys-process/audit ) sys-process/psmisc !<sys-process/procps-3.3.9-r2 selinux? ( sys-apps/policycoreutils >=sys-libs/libselinux-2.6 ) !<sys-apps/baselayout-2.1-r1 !<sys-fs/udev-init-scripts-27 virtual/os-headers ncurses? ( virtual/pkgconfig )
-DESCRIPTION=OpenRC manages the services, startup and shutdown of a host
-EAPI=7
-HOMEPAGE=https://github.com/openrc/openrc/
-INHERIT=flag-o-matic meson pam toolchain-funcs
-IUSE=audit bash debug ncurses pam newnet +netifrc selinux sysv-utils unicode
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=BSD-2
-PDEPEND=netifrc? ( net-misc/netifrc )
-RDEPEND=ncurses? ( sys-libs/ncurses:0= ) pam? ( sys-libs/pam ) audit? ( sys-process/audit ) sys-process/psmisc !<sys-process/procps-3.3.9-r2 selinux? ( sys-apps/policycoreutils >=sys-libs/libselinux-2.6 ) !<sys-apps/baselayout-2.1-r1 !<sys-fs/udev-init-scripts-27 bash? ( app-shells/bash ) !prefix? ( sysv-utils? ( !sys-apps/systemd[sysv-utils(-)] !sys-apps/sysvinit ) !sysv-utils? ( || ( >=sys-apps/sysvinit-2.86-r6[selinux?] sys-apps/s6-linux-init[sysv-utils(-)] ) ) virtual/tmpfiles ) selinux? ( >=sec-policy/selinux-base-policy-2.20170204-r4 >=sec-policy/selinux-openrc-2.20170204-r4 ) !<app-shells/gentoo-bashcomp-20180302 !<app-shells/gentoo-zsh-completions-20180228
-SLOT=0
-SRC_URI=https://github.com/OpenRC/openrc/archive/0.44.10.tar.gz -> openrc-0.44.10.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	pam	e44a1dd98f13e1ad76de01e919bde1f1	python-utils-r1	b9fc5e97e886514e5132f50465185401	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=692c0a289660efe0a737fb4ce3dd8931
diff --git a/metadata/md5-cache/sys-apps/openrc-0.45.1-r1 b/metadata/md5-cache/sys-apps/openrc-0.45.1-r1
deleted file mode 100644
index 45a4dc402343..000000000000
--- a/metadata/md5-cache/sys-apps/openrc-0.45.1-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst preinst test
-DEPEND=ncurses? ( sys-libs/ncurses:0= ) pam? ( sys-libs/pam ) audit? ( sys-process/audit ) sys-process/psmisc selinux? ( sys-apps/policycoreutils >=sys-libs/libselinux-2.6 ) virtual/os-headers ncurses? ( virtual/pkgconfig )
-DESCRIPTION=OpenRC manages the services, startup and shutdown of a host
-EAPI=8
-HOMEPAGE=https://github.com/openrc/openrc/
-INHERIT=meson pam
-IUSE=audit bash debug ncurses pam newnet +netifrc selinux sysv-utils unicode
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=BSD-2
-PDEPEND=netifrc? ( net-misc/netifrc )
-RDEPEND=ncurses? ( sys-libs/ncurses:0= ) pam? ( sys-libs/pam ) audit? ( sys-process/audit ) sys-process/psmisc selinux? ( sys-apps/policycoreutils >=sys-libs/libselinux-2.6 ) bash? ( app-shells/bash ) !prefix? ( sysv-utils? ( !sys-apps/systemd[sysv-utils(-)] !sys-apps/sysvinit ) !sysv-utils? ( || ( >=sys-apps/sysvinit-2.86-r6[selinux?] sys-apps/s6-linux-init[sysv-utils(-)] ) ) virtual/tmpfiles ) selinux? ( >=sec-policy/selinux-base-policy-2.20170204-r4 >=sec-policy/selinux-openrc-2.20170204-r4 )
-SLOT=0
-SRC_URI=https://github.com/OpenRC/openrc/archive/0.45.1.tar.gz -> openrc-0.45.1.tar.gz
-_eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	pam	e44a1dd98f13e1ad76de01e919bde1f1	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=715d2ae3b42ad1f3bb9e7e31d5c10b11
diff --git a/metadata/md5-cache/sys-apps/portage-3.0.38.1-r1 b/metadata/md5-cache/sys-apps/portage-3.0.38.1-r2
similarity index 100%
rename from metadata/md5-cache/sys-apps/portage-3.0.38.1-r1
rename to metadata/md5-cache/sys-apps/portage-3.0.38.1-r2
diff --git a/metadata/md5-cache/sys-apps/systemd-251.7 b/metadata/md5-cache/sys-apps/systemd-251.7
new file mode 100644
index 000000000000..6492ae1f41e9
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/systemd-251.7
@@ -0,0 +1,18 @@
+BDEPEND=app-arch/xz-utils:0 dev-util/gperf >=dev-util/meson-0.46 >=sys-apps/coreutils-8.16 sys-devel/gettext virtual/pkgconfig test? ( app-text/tree dev-lang/perl sys-apps/dbus ) app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-libs/libxslt:0 || ( ( >=dev-lang/python-3.11.0_beta4:3.11 dev-python/jinja[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 dev-python/jinja[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-python/jinja[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-python/jinja[python_targets_python3_8(-)] ) ) || ( ( >=dev-lang/python-3.11.0_beta4:3.11 dev-python/lxml[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 dev-python/lxml[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-python/lxml[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-python/lxml[python_targets_python3_8(-)] ) ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst preinst prepare prerm pretend setup test unpack
+DEPEND=>=sys-apps/util-linux-2.30:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] acl? ( sys-apps/acl:0= ) apparmor? ( sys-libs/libapparmor:0= ) audit? ( >=sys-process/audit-2:0= ) cryptsetup? ( >=sys-fs/cryptsetup-2.0.1:0= ) curl? ( net-misc/curl:0= ) elfutils? ( >=dev-libs/elfutils-0.158:0= ) fido2? ( dev-libs/libfido2:0= ) gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gnutls? ( >=net-libs/gnutls-3.6.0:0= ) http? ( >=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)] ) idn? ( net-dns/libidn2:= ) importd? ( app-arch/bzip2:0= sys-libs/zlib:0= ) kmod? ( >=sys-apps/kmod-15:0= ) lz4? ( >=app-arch/lz4-0_p131:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iptables? ( net-firewall/iptables:0= ) openssl? ( >=dev-libs/openssl-1.1.0:0= ) pam? ( sys-libs/pam:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pkcs11? ( app-crypt/p11-kit:0= ) pcre? ( dev-libs/libpcre2 ) pwquality? ( dev-libs/libpwquality:0= ) qrcode? ( media-gfx/qrencode:0= ) seccomp? ( >=sys-libs/libseccomp-2.3.3:0= ) selinux? ( sys-libs/libselinux:0= ) tpm? ( app-crypt/tpm2-tss:0= ) xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= ) zstd? ( >=app-arch/zstd-1.4.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=sys-kernel/linux-headers-4.15 gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
+DESCRIPTION=System and service manager for Linux
+EAPI=7
+HOMEPAGE=http://systemd.io/
+INHERIT=bash-completion-r1 flag-o-matic linux-info meson-multilib pam python-any-r1 systemd toolchain-funcs udev usr-ldscript
+IUSE=acl apparmor audit build cgroup-hybrid cryptsetup curl +dns-over-tls elfutils fido2 +gcrypt gnuefi gnutls homed http idn importd iptables +kmod +lz4 lzma +openssl pam pcre pkcs11 policykit pwquality qrcode +resolvconf +seccomp selinux split-usr +sysv-utils test tpm vanilla xkb +zstd abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2 LGPL-2.1 MIT public-domain
+PDEPEND=>=sys-apps/dbus-1.9.8[systemd] >=sys-fs/udev-init-scripts-34 policykit? ( sys-auth/polkit ) !vanilla? ( sys-apps/gentoo-systemd-integration )
+RDEPEND=>=sys-apps/util-linux-2.30:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] acl? ( sys-apps/acl:0= ) apparmor? ( sys-libs/libapparmor:0= ) audit? ( >=sys-process/audit-2:0= ) cryptsetup? ( >=sys-fs/cryptsetup-2.0.1:0= ) curl? ( net-misc/curl:0= ) elfutils? ( >=dev-libs/elfutils-0.158:0= ) fido2? ( dev-libs/libfido2:0= ) gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gnutls? ( >=net-libs/gnutls-3.6.0:0= ) http? ( >=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)] ) idn? ( net-dns/libidn2:= ) importd? ( app-arch/bzip2:0= sys-libs/zlib:0= ) kmod? ( >=sys-apps/kmod-15:0= ) lz4? ( >=app-arch/lz4-0_p131:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iptables? ( net-firewall/iptables:0= ) openssl? ( >=dev-libs/openssl-1.1.0:0= ) pam? ( sys-libs/pam:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pkcs11? ( app-crypt/p11-kit:0= ) pcre? ( dev-libs/libpcre2 ) pwquality? ( dev-libs/libpwquality:0= ) qrcode? ( media-gfx/qrencode:0= ) seccomp? ( >=sys-libs/libseccomp-2.3.3:0= ) selinux? ( sys-libs/libselinux:0= ) tpm? ( app-crypt/tpm2-tss:0= ) xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= ) zstd? ( >=app-arch/zstd-1.4.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=acct-group/adm-0-r1 >=acct-group/wheel-0-r1 >=acct-group/kmem-0-r1 >=acct-group/tty-0-r1 >=acct-group/utmp-0-r1 >=acct-group/audio-0-r1 >=acct-group/cdrom-0-r1 >=acct-group/dialout-0-r1 >=acct-group/disk-0-r1 >=acct-group/input-0-r1 >=acct-group/kvm-0-r1 >=acct-group/lp-0-r1 >=acct-group/render-0-r1 acct-group/sgx >=acct-group/tape-0-r1 acct-group/users >=acct-group/video-0-r1 >=acct-group/systemd-journal-0-r1 >=acct-user/root-0-r1 acct-user/nobody >=acct-user/systemd-journal-remote-0-r1 >=acct-user/systemd-coredump-0-r1 >=acct-user/systemd-network-0-r1 acct-user/systemd-oom >=acct-user/systemd-resolve-0-r1 >=acct-user/systemd-timesync-0-r1 >=sys-apps/baselayout-2.2 selinux? ( sec-policy/selinux-base-policy[systemd] sec-policy/selinux-ntp ) sysv-utils? ( !sys-apps/openrc[sysv-utils(-)] !sys-apps/sysvinit ) !sysv-utils? ( sys-apps/sysvinit ) resolvconf? ( !net-dns/openresolv ) !build? ( || ( sys-apps/util-linux[kill(-)] sys-process/procps[kill(+)] sys-apps/coreutils[kill(-)] ) ) !sys-apps/hwids[udev] !sys-auth/nss-myhostname !sys-fs/eudev !sys-fs/udev
+REQUIRED_USE=dns-over-tls? ( || ( gnutls openssl ) ) homed? ( cryptsetup pam openssl ) importd? ( curl lzma || ( gcrypt openssl ) ) pwquality? ( homed )
+RESTRICT=!test? ( test )
+SLOT=0/2
+SRC_URI=https://github.com/systemd/systemd-stable/archive/v251.7/systemd-stable-251.7.tar.gz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	linux-info	bbfa385d6907d7948d49a5e107bd654d	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	pam	e44a1dd98f13e1ad76de01e919bde1f1	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	udev	eec0bbab06977f1cfc5597269c1fa152	usr-ldscript	5c738dce357b54d5a90e30094d2f983c	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=5096dc32de6d590add81ede4262dad68
diff --git a/metadata/md5-cache/sys-apps/systemd-252_rc2 b/metadata/md5-cache/sys-apps/systemd-252_rc3
similarity index 99%
rename from metadata/md5-cache/sys-apps/systemd-252_rc2
rename to metadata/md5-cache/sys-apps/systemd-252_rc3
index c0e065600c73..8740f751faed 100644
--- a/metadata/md5-cache/sys-apps/systemd-252_rc2
+++ b/metadata/md5-cache/sys-apps/systemd-252_rc3
@@ -12,6 +12,6 @@ RDEPEND=>=sys-apps/util-linux-2.30:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(
 REQUIRED_USE=dns-over-tls? ( || ( gnutls openssl ) ) homed? ( cryptsetup pam openssl ) importd? ( curl lzma || ( gcrypt openssl ) ) pwquality? ( homed )
 RESTRICT=!test? ( test )
 SLOT=0/2
-SRC_URI=https://github.com/systemd/systemd/archive/v252-rc2/systemd-252-rc2.tar.gz
+SRC_URI=https://github.com/systemd/systemd/archive/v252-rc3/systemd-252-rc3.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	linux-info	bbfa385d6907d7948d49a5e107bd654d	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	pam	e44a1dd98f13e1ad76de01e919bde1f1	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	udev	eec0bbab06977f1cfc5597269c1fa152	usr-ldscript	5c738dce357b54d5a90e30094d2f983c	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=0e289c36798f3a6c74237c7ae801435f
diff --git a/metadata/md5-cache/sys-apps/systemd-utils-251.7 b/metadata/md5-cache/sys-apps/systemd-utils-251.7
new file mode 100644
index 000000000000..b1d6e62f69dc
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/systemd-utils-251.7
@@ -0,0 +1,18 @@
+BDEPEND=|| ( ( >=dev-lang/python-3.11.0_beta4:3.11 dev-python/jinja[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 dev-python/jinja[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-python/jinja[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-python/jinja[python_targets_python3_8(-)] ) ) app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-libs/libxslt dev-util/gperf >=sys-apps/coreutils-8.16 sys-devel/gettext virtual/pkgconfig >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=elibc_musl? ( >=sys-libs/musl-1.2.3 ) selinux? ( sys-libs/libselinux:0= ) tmpfiles? ( acl? ( sys-apps/acl:0= ) ) udev? ( >=sys-apps/util-linux-2.30:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] acl? ( sys-apps/acl:0= ) kmod? ( >=sys-apps/kmod-15:0= ) ) !udev? ( >=sys-apps/util-linux-2.30:0= sys-libs/libcap:0= virtual/libcrypt:= ) >=sys-kernel/linux-headers-3.11 boot? ( >=sys-boot/gnu-efi-3.0.2 )
+DESCRIPTION=Utilities split out from systemd for OpenRC users
+EAPI=8
+HOMEPAGE=https://systemd.io/
+INHERIT=bash-completion-r1 flag-o-matic meson-multilib python-any-r1 toolchain-funcs udev usr-ldscript
+IUSE=+acl boot +kmod selinux split-usr sysusers +tmpfiles test +udev abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2 LGPL-2.1 MIT public-domain
+PDEPEND=udev? ( >=sys-fs/udev-init-scripts-34 )
+RDEPEND=elibc_musl? ( >=sys-libs/musl-1.2.3 ) selinux? ( sys-libs/libselinux:0= ) tmpfiles? ( acl? ( sys-apps/acl:0= ) ) udev? ( >=sys-apps/util-linux-2.30:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] acl? ( sys-apps/acl:0= ) kmod? ( >=sys-apps/kmod-15:0= ) ) !udev? ( >=sys-apps/util-linux-2.30:0= sys-libs/libcap:0= virtual/libcrypt:= ) boot? ( !<sys-boot/systemd-boot-250 ) tmpfiles? ( !<sys-apps/systemd-tmpfiles-250 ) udev? ( acct-group/audio acct-group/cdrom acct-group/dialout acct-group/disk acct-group/input acct-group/kmem acct-group/kvm acct-group/lp acct-group/render acct-group/sgx acct-group/tape acct-group/tty acct-group/video !sys-apps/gentoo-systemd-integration !sys-apps/hwids[udev] !<sys-fs/udev-250 !sys-fs/eudev ) !sys-apps/systemd
+REQUIRED_USE=|| ( boot tmpfiles sysusers udev )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/systemd/systemd-stable/archive/refs/tags/v251.7.tar.gz -> systemd-stable-251.7.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	29a755b1291d64133634d80b0328f153	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	udev	eec0bbab06977f1cfc5597269c1fa152	usr-ldscript	5c738dce357b54d5a90e30094d2f983c
+_md5_=73d449763793f8a98e5d115dbf59e123
diff --git a/metadata/md5-cache/sys-boot/Manifest.gz b/metadata/md5-cache/sys-boot/Manifest.gz
index 4ca09de99ab7..10d2a8132a14 100644
Binary files a/metadata/md5-cache/sys-boot/Manifest.gz and b/metadata/md5-cache/sys-boot/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-boot/raspberrypi-firmware-1.20220830 b/metadata/md5-cache/sys-boot/raspberrypi-firmware-1.20220830
new file mode 100644
index 000000000000..a876d3a3e2d8
--- /dev/null
+++ b/metadata/md5-cache/sys-boot/raspberrypi-firmware-1.20220830
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst postrm preinst prepare prerm pretend
+DESCRIPTION=Raspberry Pi (all versions) bootloader and GPU firmware
+EAPI=8
+HOMEPAGE=https://github.com/raspberrypi/firmware
+INHERIT=mount-boot readme.gentoo-r1
+KEYWORDS=-* ~arm ~arm64
+LICENSE=GPL-2 raspberrypi-videocore-bin
+RESTRICT=binchecks strip
+SLOT=0
+SRC_URI=https://github.com/raspberrypi/firmware/archive/1.20220830.tar.gz -> raspberrypi-firmware-1.20220830.tar.gz
+_eclasses_=mount-boot	02a45c5e022c08dbc05178522b2772f2	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
+_md5_=d859c8f8408b41b64081a1da08ce5c31
diff --git a/metadata/md5-cache/sys-boot/raspberrypi-firmware-9999 b/metadata/md5-cache/sys-boot/raspberrypi-firmware-9999
index e7ab318aae4c..38d5e801629e 100644
--- a/metadata/md5-cache/sys-boot/raspberrypi-firmware-9999
+++ b/metadata/md5-cache/sys-boot/raspberrypi-firmware-9999
@@ -1,7 +1,7 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=install postinst postrm preinst prepare prerm pretend unpack
 DESCRIPTION=Raspberry Pi (all versions) bootloader and GPU firmware
-EAPI=7
+EAPI=8
 HOMEPAGE=https://github.com/raspberrypi/firmware
 INHERIT=mount-boot readme.gentoo-r1 git-r3
 LICENSE=GPL-2 raspberrypi-videocore-bin
@@ -9,4 +9,4 @@ PROPERTIES=live
 RESTRICT=binchecks strip
 SLOT=0
 _eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	mount-boot	02a45c5e022c08dbc05178522b2772f2	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
-_md5_=9778c544cd8f443d7ebbae6d489a54ec
+_md5_=d859c8f8408b41b64081a1da08ce5c31
diff --git a/metadata/md5-cache/sys-cluster/Manifest.gz b/metadata/md5-cache/sys-cluster/Manifest.gz
index ac16443ffdbc..8fb4c9cfaab6 100644
Binary files a/metadata/md5-cache/sys-cluster/Manifest.gz and b/metadata/md5-cache/sys-cluster/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-cluster/k3s-1.25.3_p1 b/metadata/md5-cache/sys-cluster/k3s-1.25.3_p1
new file mode 100644
index 000000000000..eff02cc62432
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/k3s-1.25.3_p1
@@ -0,0 +1,17 @@
+BDEPEND=>=dev-lang/go-1.18 app-arch/unzip virtual/pkgconfig
+DEFINED_PHASES=compile install prepare setup unpack
+DEPEND=app-misc/yq net-firewall/conntrack-tools sys-fs/btrfs-progs rootless? ( app-containers/slirp4netns )
+DESCRIPTION=Lightweight Kubernetes
+EAPI=7
+HOMEPAGE=https://k3s.io
+INHERIT=go-module linux-info systemd
+IUSE=+kubectl-symlink rootless
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=kubectl-symlink? ( !sys-cluster/kubectl )
+REQUIRED_USE=|| ( amd64 )
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/zmedico/k3s/archive/refs/tags/v1.25.3+k3s1-vendor.tar.gz -> k3s-1.25.3_p1-vendor.tar.gz https://github.com/k3s-io/containerd/archive/refs/tags/v1.6.8-k3s1.tar.gz -> k3s-containerd-1.6.8-k3s1.tar.gz https://github.com/opencontainers/runc/archive/refs/tags/v1.1.4.tar.gz -> k3s-runc-v1.1.4.tar.gz https://helm.traefik.io/traefik/traefik-12.0.0.tgz https://github.com/rancher/plugins/archive/refs/tags/v1.1.1-k3s1.tar.gz -> k3s-cni-plugins-1.1.1.tar.gz amd64? ( https://github.com/rancher/k3s-root/releases/download/v0.11.0/k3s-root-amd64.tar -> k3s-root-amd64-0.11.0.tar )
+_eclasses_=go-module	15312495dc4fd84f8c37bbe228ea2abd	linux-info	bbfa385d6907d7948d49a5e107bd654d	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=2f97f4554637d6472b5589f7ad8a45d3
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index 8f1b5fca7ab0..bec1e85d2c3d 100644
Binary files a/metadata/md5-cache/sys-devel/Manifest.gz and b/metadata/md5-cache/sys-devel/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-devel/clang-15.0.3 b/metadata/md5-cache/sys-devel/clang-15.0.3
index 8e13253c3cfc..c4f20f2d99e3 100644
--- a/metadata/md5-cache/sys-devel/clang-15.0.3
+++ b/metadata/md5-cache/sys-devel/clang-15.0.3
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://llvm.org/
 INHERIT=cmake llvm llvm.org multilib multilib-minimal prefix python-single-r1 toolchain-funcs
 IUSE=debug doc +extra +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_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_LoongArch llvm_targets_M68k llvm_targets_SPIRV verify-sig abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x64-macos
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv sparc ~x86 ~amd64-linux ~x64-macos
 LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT
 PDEPEND=sys-devel/clang-toolchain-symlinks:15 ~sys-devel/clang-runtime-15.0.3
 RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) ~sys-devel/llvm-15.0.3:15=[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-15.0.3 llvm_targets_AArch64? ( ~sys-devel/llvm-15.0.3[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-15.0.3[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-15.0.3[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-15.0.3[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-15.0.3[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-15.0.3[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-15.0.3[llvm_targets_Lanai] ) llvm_targets_Mips? ( ~sys-devel/llvm-15.0.3[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-15.0.3[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-15.0.3[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-15.0.3[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-15.0.3[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-15.0.3[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-15.0.3[llvm_targets_SystemZ] ) llvm_targets_VE? ( ~sys-devel/llvm-15.0.3[llvm_targets_VE] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-15.0.3[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-15.0.3[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-15.0.3[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-15.0.3[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-15.0.3[llvm_targets_CSKY] ) llvm_targets_DirectX? ( ~sys-devel/llvm-15.0.3[llvm_targets_DirectX] ) llvm_targets_LoongArch? ( ~sys-devel/llvm-15.0.3[llvm_targets_LoongArch] ) llvm_targets_M68k? ( ~sys-devel/llvm-15.0.3[llvm_targets_M68k] ) llvm_targets_SPIRV? ( ~sys-devel/llvm-15.0.3[llvm_targets_SPIRV] )
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=15/15
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.3/llvm-project-15.0.3.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.3/llvm-project-15.0.3.src.tar.xz.sig ) !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-15.0.3-manpages.tar.bz2 ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-15.0.3.tar.xz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	llvm	29d5332b8530fb760c2ca71ad6706858	llvm.org	ab48c0803b67a958624f7600ef86081c	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	0748d665fa664a87add00152ed046e16	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=1f001664c02e18b5cbada9f8ec9af1c1
+_md5_=03d0301d4478f005e53b97c2554bbeee
diff --git a/metadata/md5-cache/sys-devel/clang-15.0.3.9999 b/metadata/md5-cache/sys-devel/clang-15.0.4.9999
similarity index 60%
rename from metadata/md5-cache/sys-devel/clang-15.0.3.9999
rename to metadata/md5-cache/sys-devel/clang-15.0.4.9999
index 3ae6e2655d0a..d7c3c85b8974 100644
--- a/metadata/md5-cache/sys-devel/clang-15.0.3.9999
+++ b/metadata/md5-cache/sys-devel/clang-15.0.4.9999
@@ -1,15 +1,15 @@
 BDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-util/cmake-3.16 doc? ( python_single_target_python3_8? ( dev-python/recommonmark[python_targets_python3_8(-)] dev-python/sphinx[python_targets_python3_8(-)] ) 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 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=~sys-devel/llvm-15.0.3.9999:15=[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-15.0.3.9999[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-15.0.3.9999[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-15.0.3.9999[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-15.0.3.9999[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-15.0.3.9999[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-15.0.3.9999[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-15.0.3.9999[llvm_targets_Lanai] ) llvm_targets_Mips? ( ~sys-devel/llvm-15.0.3.9999[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-15.0.3.9999[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-15.0.3.9999[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-15.0.3.9999[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-15.0.3.9999[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-15.0.3.9999[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-15.0.3.9999[llvm_targets_SystemZ] ) llvm_targets_VE? ( ~sys-devel/llvm-15.0.3.9999[llvm_targets_VE] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-15.0.3.9999[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-15.0.3.9999[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-15.0.3.9999[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-15.0.3.9999[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-15.0.3.9999[llvm_targets_CSKY] ) llvm_targets_DirectX? ( ~sys-devel/llvm-15.0.3.9999[llvm_targets_DirectX] ) llvm_targets_LoongArch? ( ~sys-devel/llvm-15.0.3.9999[llvm_targets_LoongArch] ) llvm_targets_M68k? ( ~sys-devel/llvm-15.0.3.9999[llvm_targets_M68k] ) llvm_targets_SPIRV? ( ~sys-devel/llvm-15.0.3.9999[llvm_targets_SPIRV] ) !!sys-devel/llvm:0
+DEPEND=~sys-devel/llvm-15.0.4.9999:15=[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-15.0.4.9999[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-15.0.4.9999[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-15.0.4.9999[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-15.0.4.9999[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-15.0.4.9999[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-15.0.4.9999[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-15.0.4.9999[llvm_targets_Lanai] ) llvm_targets_Mips? ( ~sys-devel/llvm-15.0.4.9999[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-15.0.4.9999[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-15.0.4.9999[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-15.0.4.9999[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-15.0.4.9999[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-15.0.4.9999[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-15.0.4.9999[llvm_targets_SystemZ] ) llvm_targets_VE? ( ~sys-devel/llvm-15.0.4.9999[llvm_targets_VE] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-15.0.4.9999[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-15.0.4.9999[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-15.0.4.9999[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-15.0.4.9999[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-15.0.4.9999[llvm_targets_CSKY] ) llvm_targets_DirectX? ( ~sys-devel/llvm-15.0.4.9999[llvm_targets_DirectX] ) llvm_targets_LoongArch? ( ~sys-devel/llvm-15.0.4.9999[llvm_targets_LoongArch] ) llvm_targets_M68k? ( ~sys-devel/llvm-15.0.4.9999[llvm_targets_M68k] ) llvm_targets_SPIRV? ( ~sys-devel/llvm-15.0.4.9999[llvm_targets_SPIRV] ) !!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
 IUSE=debug doc +extra +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_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_LoongArch llvm_targets_M68k llvm_targets_SPIRV 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_8 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-toolchain-symlinks:15 ~sys-devel/clang-runtime-15.0.3.9999
+PDEPEND=sys-devel/clang-toolchain-symlinks:15 ~sys-devel/clang-runtime-15.0.4.9999
 PROPERTIES=live
-RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) ~sys-devel/llvm-15.0.3.9999:15=[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-15.0.3.9999 llvm_targets_AArch64? ( ~sys-devel/llvm-15.0.3.9999[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-15.0.3.9999[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-15.0.3.9999[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-15.0.3.9999[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-15.0.3.9999[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-15.0.3.9999[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-15.0.3.9999[llvm_targets_Lanai] ) llvm_targets_Mips? ( ~sys-devel/llvm-15.0.3.9999[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-15.0.3.9999[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-15.0.3.9999[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-15.0.3.9999[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-15.0.3.9999[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-15.0.3.9999[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-15.0.3.9999[llvm_targets_SystemZ] ) llvm_targets_VE? ( ~sys-devel/llvm-15.0.3.9999[llvm_targets_VE] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-15.0.3.9999[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-15.0.3.9999[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-15.0.3.9999[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-15.0.3.9999[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-15.0.3.9999[llvm_targets_CSKY] ) llvm_targets_DirectX? ( ~sys-devel/llvm-15.0.3.9999[llvm_targets_DirectX] ) llvm_targets_LoongArch? ( ~sys-devel/llvm-15.0.3.9999[llvm_targets_LoongArch] ) llvm_targets_M68k? ( ~sys-devel/llvm-15.0.3.9999[llvm_targets_M68k] ) llvm_targets_SPIRV? ( ~sys-devel/llvm-15.0.3.9999[llvm_targets_SPIRV] )
+RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) ~sys-devel/llvm-15.0.4.9999:15=[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-15.0.4.9999 llvm_targets_AArch64? ( ~sys-devel/llvm-15.0.4.9999[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-15.0.4.9999[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-15.0.4.9999[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-15.0.4.9999[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-15.0.4.9999[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-15.0.4.9999[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-15.0.4.9999[llvm_targets_Lanai] ) llvm_targets_Mips? ( ~sys-devel/llvm-15.0.4.9999[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-15.0.4.9999[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-15.0.4.9999[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-15.0.4.9999[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-15.0.4.9999[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-15.0.4.9999[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-15.0.4.9999[llvm_targets_SystemZ] ) llvm_targets_VE? ( ~sys-devel/llvm-15.0.4.9999[llvm_targets_VE] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-15.0.4.9999[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-15.0.4.9999[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-15.0.4.9999[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-15.0.4.9999[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-15.0.4.9999[llvm_targets_CSKY] ) llvm_targets_DirectX? ( ~sys-devel/llvm-15.0.4.9999[llvm_targets_DirectX] ) llvm_targets_LoongArch? ( ~sys-devel/llvm-15.0.4.9999[llvm_targets_LoongArch] ) llvm_targets_M68k? ( ~sys-devel/llvm-15.0.4.9999[llvm_targets_M68k] ) llvm_targets_SPIRV? ( ~sys-devel/llvm-15.0.4.9999[llvm_targets_SPIRV] )
 REQUIRED_USE=^^ ( python_single_target_python3_8 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_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_LoongArch llvm_targets_M68k llvm_targets_SPIRV )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=15/15
diff --git a/metadata/md5-cache/sys-devel/clang-common-15.0.3-r2 b/metadata/md5-cache/sys-devel/clang-common-15.0.3-r2
index 283e5fd24d6d..bce55031190d 100644
--- a/metadata/md5-cache/sys-devel/clang-common-15.0.3-r2
+++ b/metadata/md5-cache/sys-devel/clang-common-15.0.3-r2
@@ -6,10 +6,10 @@ 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 stricter verify-sig
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos
 LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 PDEPEND=sys-devel/clang:* default-compiler-rt? ( sys-devel/clang-runtime[compiler-rt] llvm-libunwind? ( sys-libs/llvm-libunwind ) !llvm-libunwind? ( sys-libs/libunwind ) ) !default-compiler-rt? ( sys-devel/gcc ) default-libcxx? ( >=sys-libs/libcxx-15.0.3 ) !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.3/llvm-project-15.0.3.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.3/llvm-project-15.0.3.src.tar.xz.sig )
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	llvm.org	ab48c0803b67a958624f7600ef86081c	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	0748d665fa664a87add00152ed046e16
-_md5_=3b4079d32675710e9552656a1cf843fc
+_md5_=34c8270ab9e9076f082d7f9b6d6d0c9d
diff --git a/metadata/md5-cache/sys-devel/clang-common-15.0.3.9999 b/metadata/md5-cache/sys-devel/clang-common-15.0.4.9999
similarity index 94%
rename from metadata/md5-cache/sys-devel/clang-common-15.0.3.9999
rename to metadata/md5-cache/sys-devel/clang-common-15.0.4.9999
index 516517b42af6..886fcf6181de 100644
--- a/metadata/md5-cache/sys-devel/clang-common-15.0.3.9999
+++ b/metadata/md5-cache/sys-devel/clang-common-15.0.4.9999
@@ -7,7 +7,7 @@ IDEPEND=!default-compiler-rt? ( sys-devel/gcc-config ) !default-libcxx? ( sys-de
 INHERIT=bash-completion-r1 llvm.org
 IUSE=default-compiler-rt default-libcxx default-lld llvm-libunwind 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 ) !llvm-libunwind? ( sys-libs/libunwind ) ) !default-compiler-rt? ( sys-devel/gcc ) default-libcxx? ( >=sys-libs/libcxx-15.0.3.9999 ) !default-libcxx? ( sys-devel/gcc ) default-lld? ( sys-devel/lld ) !default-lld? ( sys-devel/binutils )
+PDEPEND=sys-devel/clang:* default-compiler-rt? ( sys-devel/clang-runtime[compiler-rt] llvm-libunwind? ( sys-libs/llvm-libunwind ) !llvm-libunwind? ( sys-libs/libunwind ) ) !default-compiler-rt? ( sys-devel/gcc ) default-libcxx? ( >=sys-libs/libcxx-15.0.4.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	b9ac6f96d2a88edb5b351df634dc5e53	llvm.org	ab48c0803b67a958624f7600ef86081c	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
diff --git a/metadata/md5-cache/sys-devel/clang-runtime-15.0.3 b/metadata/md5-cache/sys-devel/clang-runtime-15.0.3
index 848312c42c86..77a0a29d84bd 100644
--- a/metadata/md5-cache/sys-devel/clang-runtime-15.0.3
+++ b/metadata/md5-cache/sys-devel/clang-runtime-15.0.3
@@ -4,10 +4,10 @@ EAPI=8
 HOMEPAGE=https://clang.llvm.org/
 INHERIT=multilib-build
 IUSE=+compiler-rt libcxx openmp +sanitize abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos
 LICENSE=metapackage
 RDEPEND=compiler-rt? ( ~sys-libs/compiler-rt-15.0.3:15.0.3[abi_x86_32(+)?,abi_x86_64(+)?] sanitize? ( ~sys-libs/compiler-rt-sanitizers-15.0.3:15.0.3[abi_x86_32(+)?,abi_x86_64(+)?] ) ) libcxx? ( >=sys-libs/libcxx-15.0.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(-)?] ) openmp? ( >=sys-libs/libomp-15.0.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(-)?] )
 REQUIRED_USE=sanitize? ( compiler-rt )
 SLOT=15.0.3
 _eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=3353e9fe517fac80acb5afa4d991bc21
+_md5_=e0ac99b287f014a70d89cf3e07b57dfd
diff --git a/metadata/md5-cache/sys-devel/clang-runtime-15.0.3.9999 b/metadata/md5-cache/sys-devel/clang-runtime-15.0.4.9999
similarity index 76%
rename from metadata/md5-cache/sys-devel/clang-runtime-15.0.3.9999
rename to metadata/md5-cache/sys-devel/clang-runtime-15.0.4.9999
index 80654530f4a7..54cdc1bb3691 100644
--- a/metadata/md5-cache/sys-devel/clang-runtime-15.0.3.9999
+++ b/metadata/md5-cache/sys-devel/clang-runtime-15.0.4.9999
@@ -6,8 +6,8 @@ INHERIT=multilib-build
 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-15.0.3.9999:15.0.3[abi_x86_32(+)?,abi_x86_64(+)?] sanitize? ( ~sys-libs/compiler-rt-sanitizers-15.0.3.9999:15.0.3[abi_x86_32(+)?,abi_x86_64(+)?] ) ) libcxx? ( >=sys-libs/libcxx-15.0.3.9999[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-15.0.3.9999[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+RDEPEND=compiler-rt? ( ~sys-libs/compiler-rt-15.0.4.9999:15.0.4[abi_x86_32(+)?,abi_x86_64(+)?] sanitize? ( ~sys-libs/compiler-rt-sanitizers-15.0.4.9999:15.0.4[abi_x86_32(+)?,abi_x86_64(+)?] ) ) libcxx? ( >=sys-libs/libcxx-15.0.4.9999[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-15.0.4.9999[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=15.0.3
+SLOT=15.0.4
 _eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
 _md5_=0997184533adb3bbad1e40a4e4156d57
diff --git a/metadata/md5-cache/sys-devel/clang-toolchain-symlinks-15-r2 b/metadata/md5-cache/sys-devel/clang-toolchain-symlinks-15-r2
index b7bdde767e81..5d613bb82a38 100644
--- a/metadata/md5-cache/sys-devel/clang-toolchain-symlinks-15-r2
+++ b/metadata/md5-cache/sys-devel/clang-toolchain-symlinks-15-r2
@@ -4,9 +4,9 @@ EAPI=8
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:LLVM
 INHERIT=multilib
 IUSE=gcc-symlinks multilib-symlinks +native-symlinks
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x64-macos
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv sparc ~x86 ~amd64-linux ~x64-macos
 LICENSE=public-domain
 RDEPEND=!<sys-devel/gcc-config-2.6 sys-devel/clang:15
 SLOT=15
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=29305f7465f5abab9d18490385472eeb
+_md5_=f559eae3d1ed3fe8c807e262a2269523
diff --git a/metadata/md5-cache/sys-devel/flex-2.6.4-r3 b/metadata/md5-cache/sys-devel/flex-2.6.4-r3
new file mode 100644
index 000000000000..2607e1d83e06
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/flex-2.6.4-r3
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/m4 nls? ( sys-devel/gettext ) test? ( sys-devel/bison ) >=app-portage/elt-patches-20170815
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=The Fast Lexical Analyzer
+EAPI=8
+HOMEPAGE=https://github.com/westes/flex
+INHERIT=flag-o-matic libtool multilib-minimal toolchain-funcs
+IUSE=nls static 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
+LICENSE=FLEX
+RDEPEND=sys-devel/m4
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/westes/flex/releases/download/v2.6.4/flex-2.6.4.tar.gz
+_eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=8891ae322079fb4bafbeee7f0b1cae0e
diff --git a/metadata/md5-cache/sys-devel/gcc-10.4.1_p20220922 b/metadata/md5-cache/sys-devel/gcc-10.4.1_p20220922
deleted file mode 100644
index a65666cc0e2b..000000000000
--- a/metadata/md5-cache/sys-devel/gcc-10.4.1_p20220922
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/binutils 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
-DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
-DEPEND=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
-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=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=10
-SRC_URI=https://gcc.gnu.org/pub/gcc/snapshots/10-20220922/gcc-10-20220922.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-10.5.0-patches-0.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-10.5.0-musl-patches-1.tar.xz
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	10e9276df53714742535b4cd5ccf7b75	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=0a8ea3893328fee07ec65057a33ed32f
diff --git a/metadata/md5-cache/sys-devel/gcc-10.4.1_p20220929 b/metadata/md5-cache/sys-devel/gcc-10.4.1_p20220929
deleted file mode 100644
index 346907755ad5..000000000000
--- a/metadata/md5-cache/sys-devel/gcc-10.4.1_p20220929
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/binutils 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
-DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
-DEPEND=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
-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=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=10
-SRC_URI=https://gcc.gnu.org/pub/gcc/snapshots/10-20220929/gcc-10-20220929.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-10.5.0-patches-0.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-10.5.0-musl-patches-1.tar.xz
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	10e9276df53714742535b4cd5ccf7b75	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=0a8ea3893328fee07ec65057a33ed32f
diff --git a/metadata/md5-cache/sys-devel/gcc-10.4.1_p20221013 b/metadata/md5-cache/sys-devel/gcc-10.4.1_p20221013
deleted file mode 100644
index 27c1bc0be719..000000000000
--- a/metadata/md5-cache/sys-devel/gcc-10.4.1_p20221013
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/binutils 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
-DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
-DEPEND=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
-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=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=10
-SRC_URI=https://gcc.gnu.org/pub/gcc/snapshots/10-20221013/gcc-10-20221013.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-10.5.0-patches-0.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-10.5.0-musl-patches-1.tar.xz
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	10e9276df53714742535b4cd5ccf7b75	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=0a8ea3893328fee07ec65057a33ed32f
diff --git a/metadata/md5-cache/sys-devel/gcc-11.3.1_p20220909 b/metadata/md5-cache/sys-devel/gcc-11.3.1_p20220909
deleted file mode 100644
index af0228a20c06..000000000000
--- a/metadata/md5-cache/sys-devel/gcc-11.3.1_p20220909
+++ /dev/null
@@ -1,17 +0,0 @@
-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 )
-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
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-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=11
-SRC_URI=https://gcc.gnu.org/pub/gcc/snapshots/11-20220909/gcc-11-20220909.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-11.4.0-patches-2.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-11.4.0-musl-patches-0.tar.xz
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	10e9276df53714742535b4cd5ccf7b75	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=90e7e8615012af4618ab6979b8da56d6
diff --git a/metadata/md5-cache/sys-devel/gcc-11.3.1_p20220930 b/metadata/md5-cache/sys-devel/gcc-11.3.1_p20220930
deleted file mode 100644
index bb83f2a099b2..000000000000
--- a/metadata/md5-cache/sys-devel/gcc-11.3.1_p20220930
+++ /dev/null
@@ -1,16 +0,0 @@
-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 )
-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
-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=11
-SRC_URI=https://gcc.gnu.org/pub/gcc/snapshots/11-20220930/gcc-11-20220930.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-11.4.0-patches-2.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-11.4.0-musl-patches-0.tar.xz
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	10e9276df53714742535b4cd5ccf7b75	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=3a72e2cb137d035c1bd4bb6273a4c1c5
diff --git a/metadata/md5-cache/sys-devel/gcc-11.3.1_p20221014 b/metadata/md5-cache/sys-devel/gcc-11.3.1_p20221014
deleted file mode 100644
index 928e9eded0e7..000000000000
--- a/metadata/md5-cache/sys-devel/gcc-11.3.1_p20221014
+++ /dev/null
@@ -1,16 +0,0 @@
-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 )
-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
-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=11
-SRC_URI=https://gcc.gnu.org/pub/gcc/snapshots/11-20221014/gcc-11-20221014.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-11.4.0-patches-2.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-11.4.0-musl-patches-0.tar.xz
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	10e9276df53714742535b4cd5ccf7b75	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=3a72e2cb137d035c1bd4bb6273a4c1c5
diff --git a/metadata/md5-cache/sys-devel/gcc-12.2.1_p20220917 b/metadata/md5-cache/sys-devel/gcc-12.2.1_p20220917
deleted file mode 100644
index 322a3cf34a75..000000000000
--- a/metadata/md5-cache/sys-devel/gcc-12.2.1_p20220917
+++ /dev/null
@@ -1,16 +0,0 @@
-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 )
-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
-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-20220917/gcc-12-20220917.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-12.2.0-patches-1.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-12.2.0-musl-patches-1.tar.xz
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	10e9276df53714742535b4cd5ccf7b75	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=9624ff2f545339d3ee11225f931bda32
diff --git a/metadata/md5-cache/sys-devel/gcc-12.2.1_p20220924 b/metadata/md5-cache/sys-devel/gcc-12.2.1_p20220924
deleted file mode 100644
index a2664c998ab6..000000000000
--- a/metadata/md5-cache/sys-devel/gcc-12.2.1_p20220924
+++ /dev/null
@@ -1,16 +0,0 @@
-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 )
-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
-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-20220924/gcc-12-20220924.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-12.2.0-patches-1.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-12.2.0-musl-patches-1.tar.xz
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	10e9276df53714742535b4cd5ccf7b75	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=9624ff2f545339d3ee11225f931bda32
diff --git a/metadata/md5-cache/sys-devel/gcc-12.2.1_p20221001 b/metadata/md5-cache/sys-devel/gcc-12.2.1_p20221001
deleted file mode 100644
index da5d4afa8306..000000000000
--- a/metadata/md5-cache/sys-devel/gcc-12.2.1_p20221001
+++ /dev/null
@@ -1,16 +0,0 @@
-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 )
-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
-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-20221001/gcc-12-20221001.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-12.2.0-patches-1.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-12.2.0-musl-patches-1.tar.xz
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	10e9276df53714742535b4cd5ccf7b75	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=9624ff2f545339d3ee11225f931bda32
diff --git a/metadata/md5-cache/sys-devel/gcc-12.2.1_p20221015 b/metadata/md5-cache/sys-devel/gcc-12.2.1_p20221015
deleted file mode 100644
index 6a50d3e8c719..000000000000
--- a/metadata/md5-cache/sys-devel/gcc-12.2.1_p20221015
+++ /dev/null
@@ -1,16 +0,0 @@
-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 )
-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
-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-20221015/gcc-12-20221015.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-12.2.0-patches-1.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-12.2.0-musl-patches-1.tar.xz
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	10e9276df53714742535b4cd5ccf7b75	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=9624ff2f545339d3ee11225f931bda32
diff --git a/metadata/md5-cache/sys-devel/gcc-13.0.0_pre20220918 b/metadata/md5-cache/sys-devel/gcc-13.0.0_pre20220918
deleted file mode 100644
index 3fcb34d15781..000000000000
--- a/metadata/md5-cache/sys-devel/gcc-13.0.0_pre20220918
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=sys-devel/binutils[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 )
-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
-KEYWORDS=~loong
-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=13
-SRC_URI=https://gcc.gnu.org/pub/gcc/snapshots/13-20220918/gcc-13-20220918.tar.xz https://dev.gentoo.org/~xen0n/distfiles/sys-devel/gcc/gcc-13.0.0-patches-1.tar.xz
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	10e9276df53714742535b4cd5ccf7b75	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=d4804665563c18b688f5fc23a110c531
diff --git a/metadata/md5-cache/sys-devel/lld-13.0.1 b/metadata/md5-cache/sys-devel/lld-13.0.1
deleted file mode 100644
index 1ae62ea4bf64..000000000000
--- a/metadata/md5-cache/sys-devel/lld-13.0.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-util/cmake-3.16 || ( ( >=dev-lang/python-3.10.4:3.10 ~dev-python/lit-13.0.1[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 ~dev-python/lit-13.0.1[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 ~dev-python/lit-13.0.1[python_targets_python3_8(-)] ) ) ) >=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-13.0.1 !!sys-devel/llvm:0
-DESCRIPTION=The LLVM linker (link editor)
-EAPI=7
-HOMEPAGE=https://llvm.org/
-INHERIT=cmake flag-o-matic llvm llvm.org python-any-r1
-IUSE=debug test test
-KEYWORDS=amd64 arm arm64 ~ppc ppc64 ~riscv x86
-LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
-RDEPEND=~sys-devel/llvm-13.0.1
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-13.0.1.tar.gz
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	llvm	29d5332b8530fb760c2ca71ad6706858	llvm.org	ab48c0803b67a958624f7600ef86081c	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=9b73b33b70aeeb14f7d2312b161b3444
diff --git a/metadata/md5-cache/sys-devel/lld-13.0.1-r1 b/metadata/md5-cache/sys-devel/lld-13.0.1-r1
index f6cc7db99bec..e02a0a8fad22 100644
--- a/metadata/md5-cache/sys-devel/lld-13.0.1-r1
+++ b/metadata/md5-cache/sys-devel/lld-13.0.1-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://llvm.org/
 INHERIT=cmake flag-o-matic llvm llvm.org python-any-r1
 IUSE=debug test test
-KEYWORDS=~amd64 arm arm64 ~ppc ppc64 ~riscv ~x86
+KEYWORDS=amd64 arm arm64 ~ppc ppc64 ~riscv x86
 LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 RDEPEND=~sys-devel/llvm-13.0.1 !sys-devel/lld:0
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=13/13
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-13.0.1.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	llvm	29d5332b8530fb760c2ca71ad6706858	llvm.org	ab48c0803b67a958624f7600ef86081c	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=28d2fad99744517a5746968352764241
+_md5_=d00e25db62f65b54741ee4877c7058c1
diff --git a/metadata/md5-cache/sys-devel/lld-14.0.6 b/metadata/md5-cache/sys-devel/lld-14.0.6
deleted file mode 100644
index f8064ca5c39e..000000000000
--- a/metadata/md5-cache/sys-devel/lld-14.0.6
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-util/cmake-3.16 || ( ( >=dev-lang/python-3.10.4:3.10 ~dev-python/lit-14.0.6[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 ~dev-python/lit-14.0.6[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 ~dev-python/lit-14.0.6[python_targets_python3_8(-)] ) ) ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-15 ) >=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 setup test unpack
-DEPEND=~sys-devel/llvm-14.0.6 !!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
-IUSE=debug test test verify-sig
-KEYWORDS=amd64 arm arm64 ~ppc ppc64 ~riscv x86
-LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
-RDEPEND=~sys-devel/llvm-14.0.6
-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	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	llvm	29d5332b8530fb760c2ca71ad6706858	llvm.org	ab48c0803b67a958624f7600ef86081c	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	0748d665fa664a87add00152ed046e16	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=46571645d6e537be1ad359c5eaf57aa4
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 ddffbe56b8d9..e627ab3b115d 100644
--- a/metadata/md5-cache/sys-devel/lld-14.0.6-r1
+++ b/metadata/md5-cache/sys-devel/lld-14.0.6-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://llvm.org/
 INHERIT=cmake flag-o-matic llvm llvm.org python-any-r1
 IUSE=debug test test verify-sig
-KEYWORDS=~amd64 arm arm64 ~ppc ppc64 ~riscv ~x86
+KEYWORDS=amd64 arm arm64 ~ppc ppc64 ~riscv x86
 LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 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	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	llvm	29d5332b8530fb760c2ca71ad6706858	llvm.org	ab48c0803b67a958624f7600ef86081c	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	0748d665fa664a87add00152ed046e16	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=c9d79d6f0336c2707f0f745eee32872d
+_md5_=12210589a93ffdab05f796a95cf17bf9
diff --git a/metadata/md5-cache/sys-devel/lld-15.0.3.9999 b/metadata/md5-cache/sys-devel/lld-15.0.4.9999
similarity index 76%
rename from metadata/md5-cache/sys-devel/lld-15.0.3.9999
rename to metadata/md5-cache/sys-devel/lld-15.0.4.9999
index 1fede5d4b38d..802987335e2b 100644
--- a/metadata/md5-cache/sys-devel/lld-15.0.3.9999
+++ b/metadata/md5-cache/sys-devel/lld-15.0.4.9999
@@ -1,6 +1,6 @@
-BDEPEND=test? ( >=dev-util/cmake-3.16 || ( ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-python/lit-15.0.3.9999[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 >=dev-python/lit-15.0.3.9999[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 >=dev-python/lit-15.0.3.9999[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 >=dev-python/lit-15.0.3.9999[python_targets_python3_8(-)] ) ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=test? ( >=dev-util/cmake-3.16 || ( ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-python/lit-15.0.4.9999[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 >=dev-python/lit-15.0.4.9999[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 >=dev-python/lit-15.0.4.9999[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 >=dev-python/lit-15.0.4.9999[python_targets_python3_8(-)] ) ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=~sys-devel/llvm-15.0.3.9999 sys-libs/zlib:= !!sys-devel/llvm:0
+DEPEND=~sys-devel/llvm-15.0.4.9999 sys-libs/zlib:= !!sys-devel/llvm:0
 DESCRIPTION=The LLVM linker (link editor)
 EAPI=8
 HOMEPAGE=https://llvm.org/
@@ -9,7 +9,7 @@ IUSE=debug test test
 LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 PDEPEND=>=sys-devel/lld-toolchain-symlinks-15-r2:15
 PROPERTIES=live
-RDEPEND=~sys-devel/llvm-15.0.3.9999 sys-libs/zlib:= !sys-devel/lld:0
+RDEPEND=~sys-devel/llvm-15.0.4.9999 sys-libs/zlib:= !sys-devel/lld:0
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=15/15
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	llvm	29d5332b8530fb760c2ca71ad6706858	llvm.org	ab48c0803b67a958624f7600ef86081c	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
diff --git a/metadata/md5-cache/sys-devel/llvm-15.0.3 b/metadata/md5-cache/sys-devel/llvm-15.0.3
index 488b1bebb59a..b8e36406a631 100644
--- a/metadata/md5-cache/sys-devel/llvm-15.0.3
+++ b/metadata/md5-cache/sys-devel/llvm-15.0.3
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://llvm.org/
 INHERIT=cmake llvm.org multilib-minimal pax-utils python-any-r1 toolchain-funcs
 IUSE=+binutils-plugin debug doc exegesis libedit +libffi ncurses test xar xml z3 zstd doc llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_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_LoongArch llvm_targets_M68k llvm_targets_SPIRV verify-sig abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos
 LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc
 PDEPEND=sys-devel/llvm-common sys-devel/llvm-toolchain-symlinks:15 binutils-plugin? ( >=sys-devel/llvmgold-15 )
 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
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=15/15
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.3/llvm-project-15.0.3.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.3/llvm-project-15.0.3.src.tar.xz.sig ) !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-15.0.3-manpages.tar.bz2 ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-15.0.3.tar.xz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	llvm.org	ab48c0803b67a958624f7600ef86081c	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	0748d665fa664a87add00152ed046e16	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=88625fc773f14b34550e6393da8bc125
+_md5_=b9a7e35d57dca4e790fe6d46c6380e8f
diff --git a/metadata/md5-cache/sys-devel/llvm-15.0.3.9999 b/metadata/md5-cache/sys-devel/llvm-15.0.4.9999
similarity index 98%
rename from metadata/md5-cache/sys-devel/llvm-15.0.3.9999
rename to metadata/md5-cache/sys-devel/llvm-15.0.4.9999
index 3d0101c79f82..eca520844f5a 100644
--- a/metadata/md5-cache/sys-devel/llvm-15.0.3.9999
+++ b/metadata/md5-cache/sys-devel/llvm-15.0.4.9999
@@ -1,4 +1,4 @@
-BDEPEND=|| ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) dev-lang/perl >=dev-util/cmake-3.16 sys-devel/gnuconfig kernel_Darwin? ( <sys-libs/libcxx-15.0.3.9999 >=sys-devel/binutils-apple-5.1 ) doc? ( || ( ( >=dev-lang/python-3.11.0_beta4:3.11 dev-python/recommonmark[python_targets_python3_11(-)] dev-python/sphinx[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 dev-python/recommonmark[python_targets_python3_10(-)] dev-python/sphinx[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-python/recommonmark[python_targets_python3_9(-)] dev-python/sphinx[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-python/recommonmark[python_targets_python3_8(-)] dev-python/sphinx[python_targets_python3_8(-)] ) ) ) libffi? ( virtual/pkgconfig ) dev-python/sphinx >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=|| ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) dev-lang/perl >=dev-util/cmake-3.16 sys-devel/gnuconfig kernel_Darwin? ( <sys-libs/libcxx-15.0.4.9999 >=sys-devel/binutils-apple-5.1 ) doc? ( || ( ( >=dev-lang/python-3.11.0_beta4:3.11 dev-python/recommonmark[python_targets_python3_11(-)] dev-python/sphinx[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 dev-python/recommonmark[python_targets_python3_10(-)] dev-python/sphinx[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-python/recommonmark[python_targets_python3_9(-)] dev-python/sphinx[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-python/recommonmark[python_targets_python3_8(-)] dev-python/sphinx[python_targets_python3_8(-)] ) ) ) libffi? ( virtual/pkgconfig ) dev-python/sphinx >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 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
diff --git a/metadata/md5-cache/sys-devel/llvm-common-15.0.3 b/metadata/md5-cache/sys-devel/llvm-common-15.0.3
index b1f2b36e4b73..e1c5bcd4acf6 100644
--- a/metadata/md5-cache/sys-devel/llvm-common-15.0.3
+++ b/metadata/md5-cache/sys-devel/llvm-common-15.0.3
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://llvm.org/
 INHERIT=llvm.org
 IUSE=verify-sig
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos
 LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 RDEPEND=!sys-devel/llvm:0
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.3/llvm-project-15.0.3.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.3/llvm-project-15.0.3.src.tar.xz.sig )
 _eclasses_=llvm.org	ab48c0803b67a958624f7600ef86081c	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	verify-sig	0748d665fa664a87add00152ed046e16
-_md5_=ed021fba4e89582498067e8128d00dea
+_md5_=af68b85f1105f1478d433582f59ba669
diff --git a/metadata/md5-cache/sys-devel/llvm-common-15.0.3.9999 b/metadata/md5-cache/sys-devel/llvm-common-15.0.4.9999
similarity index 100%
rename from metadata/md5-cache/sys-devel/llvm-common-15.0.3.9999
rename to metadata/md5-cache/sys-devel/llvm-common-15.0.4.9999
diff --git a/metadata/md5-cache/sys-devel/llvm-toolchain-symlinks-15-r1 b/metadata/md5-cache/sys-devel/llvm-toolchain-symlinks-15-r1
index 152aff83af5b..8765c4ed1661 100644
--- a/metadata/md5-cache/sys-devel/llvm-toolchain-symlinks-15-r1
+++ b/metadata/md5-cache/sys-devel/llvm-toolchain-symlinks-15-r1
@@ -4,9 +4,9 @@ EAPI=8
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:LLVM
 INHERIT=multilib
 IUSE=multilib-symlinks +native-symlinks
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos
 LICENSE=public-domain
 RDEPEND=sys-devel/llvm:15
 SLOT=15
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=8a081408e7aabdf2e9f057b2fc1190f0
+_md5_=8dea4d25fa15af448091000159773342
diff --git a/metadata/md5-cache/sys-devel/llvmgold-15 b/metadata/md5-cache/sys-devel/llvmgold-15
index 59caea77a95a..c5f08dd688ef 100644
--- a/metadata/md5-cache/sys-devel/llvmgold-15
+++ b/metadata/md5-cache/sys-devel/llvmgold-15
@@ -2,8 +2,8 @@ DEFINED_PHASES=install
 DESCRIPTION=LLVMgold plugin symlink for autoloading
 EAPI=8
 HOMEPAGE=https://llvm.org/
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv sparc ~x86 ~amd64-linux
 LICENSE=public-domain
 RDEPEND=sys-devel/llvm:15[binutils-plugin] !sys-devel/llvm:0
 SLOT=0
-_md5_=2e801cd8592d2642e1f2f900b6a34c6b
+_md5_=e263a79917e2f8ffdcc49a454e034eb3
diff --git a/metadata/md5-cache/sys-devel/make-4.3.91 b/metadata/md5-cache/sys-devel/make-4.3.92
similarity index 84%
rename from metadata/md5-cache/sys-devel/make-4.3.91
rename to metadata/md5-cache/sys-devel/make-4.3.92
index a94096ede87d..a0a69278f1fa 100644
--- a/metadata/md5-cache/sys-devel/make-4.3.91
+++ b/metadata/md5-cache/sys-devel/make-4.3.92
@@ -9,6 +9,6 @@ IUSE=guile nls static verify-sig
 LICENSE=GPL-3+
 RDEPEND=guile? ( >=dev-scheme/guile-1.8:= ) nls? ( virtual/libintl )
 SLOT=0
-SRC_URI=https://alpha.gnu.org/gnu/make/make-4.3.91.tar.gz verify-sig? ( https://alpha.gnu.org/gnu/make/make-4.3.91.tar.gz.sig )
+SRC_URI=https://alpha.gnu.org/gnu/make/make-4.3.92.tar.gz verify-sig? ( https://alpha.gnu.org/gnu/make/make-4.3.92.tar.gz.sig )
 _eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	0748d665fa664a87add00152ed046e16
 _md5_=81a8d5e78a3411add148146957c8e2d7
diff --git a/metadata/md5-cache/sys-firmware/Manifest.gz b/metadata/md5-cache/sys-firmware/Manifest.gz
index 56749309b636..1307a1624608 100644
Binary files a/metadata/md5-cache/sys-firmware/Manifest.gz and b/metadata/md5-cache/sys-firmware/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-firmware/raspberrypi-wifi-ucode-20210315.3_p5 b/metadata/md5-cache/sys-firmware/raspberrypi-wifi-ucode-20210315.3_p7
similarity index 66%
rename from metadata/md5-cache/sys-firmware/raspberrypi-wifi-ucode-20210315.3_p5
rename to metadata/md5-cache/sys-firmware/raspberrypi-wifi-ucode-20210315.3_p7
index f5baac43f82e..69314e6065c8 100644
--- a/metadata/md5-cache/sys-firmware/raspberrypi-wifi-ucode-20210315.3_p5
+++ b/metadata/md5-cache/sys-firmware/raspberrypi-wifi-ucode-20210315.3_p7
@@ -4,7 +4,7 @@ EAPI=8
 HOMEPAGE=https://github.com/RPi-Distro/firmware-nonfree https://archive.raspberrypi.org/debian/pool/main/f/firmware-nonfree
 KEYWORDS=~arm ~arm64
 LICENSE=Broadcom
-RDEPEND=!sys-kernel/linux-firmware[-savedconfig]
+RDEPEND=net-wireless/wireless-regdb !sys-kernel/linux-firmware[-savedconfig]
 SLOT=0
-SRC_URI=https://archive.raspberrypi.org/debian/pool/main/f/firmware-nonfree/firmware-nonfree_20210315-3+rpt5.debian.tar.xz
-_md5_=092a140ef0eadb51dc524c23e09ef841
+SRC_URI=https://archive.raspberrypi.org/debian/pool/main/f/firmware-nonfree/firmware-nonfree_20210315-3+rpt7.debian.tar.xz
+_md5_=21fbf68d47b4eee8a1e5146de0faca8e
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index f17cfb392773..7a90df941dfd 100644
Binary files a/metadata/md5-cache/sys-fs/Manifest.gz and b/metadata/md5-cache/sys-fs/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-fs/btrfs-progs-5.15.1 b/metadata/md5-cache/sys-fs/btrfs-progs-5.15.1
index c07b81237fad..124e05ab7085 100644
--- a/metadata/md5-cache/sys-fs/btrfs-progs-5.15.1
+++ b/metadata/md5-cache/sys-fs/btrfs-progs-5.15.1
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install postrm prepare setup
 DEPEND=dev-libs/lzo:2= sys-apps/util-linux:0=[static-libs(+)?] sys-libs/zlib:0= convert? ( sys-fs/e2fsprogs:= reiserfs? ( >=sys-fs/reiserfsprogs-3.6.27 ) ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) ) zstd? ( app-arch/zstd:0= ) >=sys-kernel/linux-headers-5.10 convert? ( sys-apps/acl ) python? ( python_single_target_python3_8? ( dev-python/setuptools[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/setuptools[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/setuptools[python_targets_python3_10(-)] ) ) static? ( dev-libs/lzo:2[static-libs(+)] sys-apps/util-linux:0[static-libs(+)] sys-libs/zlib:0[static-libs(+)] convert? ( sys-fs/e2fsprogs[static-libs(+)] reiserfs? ( >=sys-fs/reiserfsprogs-3.6.27[static-libs(+)] ) ) zstd? ( app-arch/zstd:0[static-libs(+)] ) )
 DESCRIPTION=Btrfs filesystem utilities
 EAPI=7
-HOMEPAGE=https://btrfs.wiki.kernel.org
+HOMEPAGE=https://btrfs.wiki.kernel.org https://btrfs.readthedocs.io/en/latest/
 INHERIT=bash-completion-r1 python-single-r1 udev
 IUSE=+convert doc python reiserfs static static-libs +zstd python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
 KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0/0
 SRC_URI=https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v5.15.1.tar.xz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	udev	eec0bbab06977f1cfc5597269c1fa152
-_md5_=719d994e8d0210dcd108761bb3c530b7
+_md5_=c1b561f213f5cae467b91114016364f1
diff --git a/metadata/md5-cache/sys-fs/btrfs-progs-5.18.1-r1 b/metadata/md5-cache/sys-fs/btrfs-progs-5.18.1-r1
index eb6b96c794b8..72361a56cb5e 100644
--- a/metadata/md5-cache/sys-fs/btrfs-progs-5.18.1-r1
+++ b/metadata/md5-cache/sys-fs/btrfs-progs-5.18.1-r1
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup
 DEPEND=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_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) ) udev? ( virtual/libudev:= ) zstd? ( app-arch/zstd:= ) >=sys-kernel/linux-headers-5.10 convert? ( sys-apps/acl ) python? ( python_single_target_python3_8? ( dev-python/setuptools[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/setuptools[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/setuptools[python_targets_python3_10(-)] ) ) static? ( dev-libs/lzo:2[static-libs(+)] sys-apps/util-linux:0[static-libs(+)] sys-libs/zlib:0[static-libs(+)] convert? ( sys-fs/e2fsprogs[static-libs(+)] reiserfs? ( >=sys-fs/reiserfsprogs-3.6.27[static-libs(+)] ) ) zstd? ( app-arch/zstd[static-libs(+)] ) )
 DESCRIPTION=Btrfs filesystem utilities
 EAPI=7
-HOMEPAGE=https://btrfs.wiki.kernel.org
+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_8 python_single_target_python3_9 python_single_target_python3_10
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0/0
 SRC_URI=https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v5.18.1.tar.xz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	udev	eec0bbab06977f1cfc5597269c1fa152
-_md5_=a52f630b096ebf28ea5237a3c76e2f8d
+_md5_=4aeb1828ad83eead9b54fe6be1ee4927
diff --git a/metadata/md5-cache/sys-fs/btrfs-progs-5.19.1 b/metadata/md5-cache/sys-fs/btrfs-progs-5.19.1
index e6247403541f..5508fb9a56aa 100644
--- a/metadata/md5-cache/sys-fs/btrfs-progs-5.19.1
+++ b/metadata/md5-cache/sys-fs/btrfs-progs-5.19.1
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup
 DEPEND=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_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) ) udev? ( virtual/libudev:= ) zstd? ( app-arch/zstd:= ) >=sys-kernel/linux-headers-5.10 convert? ( sys-apps/acl ) python? ( python_single_target_python3_8? ( dev-python/setuptools[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/setuptools[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/setuptools[python_targets_python3_10(-)] ) ) static? ( dev-libs/lzo:2[static-libs(+)] sys-apps/util-linux:0[static-libs(+)] sys-libs/zlib:0[static-libs(+)] convert? ( sys-fs/e2fsprogs[static-libs(+)] reiserfs? ( >=sys-fs/reiserfsprogs-3.6.27[static-libs(+)] ) ) zstd? ( app-arch/zstd[static-libs(+)] ) )
 DESCRIPTION=Btrfs filesystem utilities
 EAPI=8
-HOMEPAGE=https://btrfs.wiki.kernel.org
+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_8 python_single_target_python3_9 python_single_target_python3_10
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0/0
 SRC_URI=https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v5.19.1.tar.xz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	udev	eec0bbab06977f1cfc5597269c1fa152
-_md5_=c24fcb6b1ec38a8f6cf1801e62cea59b
+_md5_=a212df480a94e33ca714da46f1c21a97
diff --git a/metadata/md5-cache/sys-fs/btrfs-progs-6.0 b/metadata/md5-cache/sys-fs/btrfs-progs-6.0
new file mode 100644
index 000000000000..912f8a3219cf
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/btrfs-progs-6.0
@@ -0,0 +1,17 @@
+BDEPEND=virtual/pkgconfig man? ( dev-python/sphinx ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare setup
+DEPEND=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_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) ) udev? ( virtual/libudev:= ) zstd? ( app-arch/zstd:= ) >=sys-kernel/linux-headers-5.10 convert? ( sys-apps/acl ) python? ( python_single_target_python3_8? ( dev-python/setuptools[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/setuptools[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/setuptools[python_targets_python3_10(-)] ) ) static? ( dev-libs/lzo:2[static-libs(+)] sys-apps/util-linux:0[static-libs(+)] sys-libs/zlib:0[static-libs(+)] convert? ( sys-fs/e2fsprogs[static-libs(+)] reiserfs? ( >=sys-fs/reiserfsprogs-3.6.27[static-libs(+)] ) ) zstd? ( app-arch/zstd[static-libs(+)] ) )
+DESCRIPTION=Btrfs filesystem utilities
+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_8 python_single_target_python3_9 python_single_target_python3_10
+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_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) ) udev? ( virtual/libudev:= ) zstd? ( app-arch/zstd:= )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
+RESTRICT=test
+SLOT=0/0
+SRC_URI=https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v6.0.tar.xz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	udev	eec0bbab06977f1cfc5597269c1fa152
+_md5_=a212df480a94e33ca714da46f1c21a97
diff --git a/metadata/md5-cache/sys-fs/btrfs-progs-9999 b/metadata/md5-cache/sys-fs/btrfs-progs-9999
index d1e8fe8892c9..f0f82aa43102 100644
--- a/metadata/md5-cache/sys-fs/btrfs-progs-9999
+++ b/metadata/md5-cache/sys-fs/btrfs-progs-9999
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DEPEND=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_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) ) udev? ( virtual/libudev:= ) zstd? ( app-arch/zstd:= ) >=sys-kernel/linux-headers-5.10 convert? ( sys-apps/acl ) python? ( python_single_target_python3_8? ( dev-python/setuptools[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/setuptools[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/setuptools[python_targets_python3_10(-)] ) ) static? ( dev-libs/lzo:2[static-libs(+)] sys-apps/util-linux:0[static-libs(+)] sys-libs/zlib:0[static-libs(+)] convert? ( sys-fs/e2fsprogs[static-libs(+)] reiserfs? ( >=sys-fs/reiserfsprogs-3.6.27[static-libs(+)] ) ) zstd? ( app-arch/zstd[static-libs(+)] ) )
 DESCRIPTION=Btrfs filesystem utilities
 EAPI=8
-HOMEPAGE=https://btrfs.wiki.kernel.org
+HOMEPAGE=https://btrfs.wiki.kernel.org https://btrfs.readthedocs.io/en/latest/
 INHERIT=bash-completion-r1 python-single-r1 udev autotools git-r3
 IUSE=+convert python +man reiserfs static static-libs udev +zstd python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
 LICENSE=GPL-2
@@ -13,4 +13,4 @@ REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_
 RESTRICT=test
 SLOT=0/0
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	udev	eec0bbab06977f1cfc5597269c1fa152
-_md5_=c24fcb6b1ec38a8f6cf1801e62cea59b
+_md5_=a212df480a94e33ca714da46f1c21a97
diff --git a/metadata/md5-cache/sys-fs/cryptsetup-2.4.3-r2 b/metadata/md5-cache/sys-fs/cryptsetup-2.4.3-r2
index f60c8b1d0975..5d3465789969 100644
--- a/metadata/md5-cache/sys-fs/cryptsetup-2.4.3-r2
+++ b/metadata/md5-cache/sys-fs/cryptsetup-2.4.3-r2
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://gitlab.com/cryptsetup/cryptsetup/blob/master/README.md
 INHERIT=linux-info tmpfiles
 IUSE=gcrypt kernel nettle +openssl +argon2 fips nls pwquality reencrypt ssh static static-libs test +udev urandom
-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=static-libs? ( dev-libs/json-c:=[static-libs(+)] dev-libs/popt[static-libs(+)] >=sys-apps/util-linux-2.31-r1[static-libs(+)] argon2? ( app-crypt/argon2:=[static-libs(+)] ) gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] dev-libs/libgpg-error[static-libs(+)] ) nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] ) openssl? ( dev-libs/openssl:0=[static-libs(+)] ) pwquality? ( dev-libs/libpwquality[static-libs(+)] ) ssh? ( net-libs/libssh[static-libs(+)] ) sys-fs/lvm2[static-libs(+)] ) dev-libs/json-c:= dev-libs/popt >=sys-apps/util-linux-2.31-r1 argon2? ( app-crypt/argon2:= ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error ) nettle? ( >=dev-libs/nettle-2.4 ) openssl? ( dev-libs/openssl:0= ) pwquality? ( dev-libs/libpwquality ) ssh? ( net-libs/libssh ) sys-fs/lvm2 udev? ( virtual/libudev:= ) virtual/tmpfiles
 REQUIRED_USE=^^ ( gcrypt kernel nettle openssl ) static? ( !gcrypt !ssh !udev !fips ) fips? ( !kernel !nettle )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/12
 SRC_URI=https://www.kernel.org/pub/linux/utils/cryptsetup/v2.4/cryptsetup-2.4.3.tar.xz
 _eclasses_=linux-info	bbfa385d6907d7948d49a5e107bd654d	multilib	5ca4e49abed8e3a2f7b56920eadee157	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=a9b4b49e300a0cd32e71e87a7704320d
+_md5_=3548db233e54ab147476ad740e81c1c8
diff --git a/metadata/md5-cache/sys-fs/f2fs-tools-1.15.0-r1 b/metadata/md5-cache/sys-fs/f2fs-tools-1.15.0-r1
index a1ed80b4b1c0..ee6723a8e0d6 100644
--- a/metadata/md5-cache/sys-fs/f2fs-tools-1.15.0-r1
+++ b/metadata/md5-cache/sys-fs/f2fs-tools-1.15.0-r1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git/about/
 INHERIT=autotools
 IUSE=selinux
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~x86
 LICENSE=GPL-2
 RDEPEND=selinux? ( sys-libs/libselinux ) elibc_musl? ( sys-libs/queue-standalone )
 SLOT=0/9
 SRC_URI=https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git/snapshot/f2fs-tools-1.15.0.tar.gz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=4adb0cb7f80c341a93825abe2c471996
+_md5_=05eec2590b8b851d4eee03a39f6c9e4e
diff --git a/metadata/md5-cache/sys-fs/mtools-4.0.42 b/metadata/md5-cache/sys-fs/mtools-4.0.42
new file mode 100644
index 000000000000..dc28128621e7
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/mtools-4.0.42
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install
+DEPEND=virtual/libiconv gui? ( x11-libs/libICE x11-libs/libXau x11-libs/libSM x11-libs/libX11 x11-libs/libXt )
+DESCRIPTION=Utilities to access MS-DOS disks from Unix without mounting them
+EAPI=8
+HOMEPAGE=https://www.gnu.org/software/mtools/ https://savannah.gnu.org/projects/mtools
+INHERIT=flag-o-matic
+IUSE=gui
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos ~x64-solaris
+LICENSE=GPL-3
+RDEPEND=virtual/libiconv gui? ( x11-libs/libICE x11-libs/libXau x11-libs/libSM x11-libs/libX11 x11-libs/libXt )
+SLOT=0
+SRC_URI=mirror://gnu/mtools/mtools-4.0.42.tar.bz2
+_eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=cbadda7a76a6bff9b6b5e02853b169b5
diff --git a/metadata/md5-cache/sys-fs/xfsprogs-5.19.0 b/metadata/md5-cache/sys-fs/xfsprogs-5.19.0
new file mode 100644
index 000000000000..c89eeccb9adf
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/xfsprogs-5.19.0
@@ -0,0 +1,15 @@
+BDEPEND=nls? ( sys-devel/gettext ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare
+DEPEND=dev-libs/inih dev-libs/userspace-rcu:= >=sys-apps/util-linux-2.17.2 icu? ( dev-libs/icu:= ) libedit? ( dev-libs/libedit )
+DESCRIPTION=XFS filesystem utilities
+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
+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-5.19.0.tar.xz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	usr-ldscript	5c738dce357b54d5a90e30094d2f983c	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=6dc395067c096dbd087b0df68c038a10
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index c93301f9755a..22acaf916ced 100644
Binary files a/metadata/md5-cache/sys-kernel/Manifest.gz and b/metadata/md5-cache/sys-kernel/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.19.17 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.19.17
new file mode 100644
index 000000000000..cf18d5eb1bf0
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.19.17
@@ -0,0 +1,18 @@
+BDEPEND=debug? ( dev-util/pahole ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test
+DESCRIPTION=Linux kernel built with Gentoo patches
+EAPI=8
+HOMEPAGE=https://www.kernel.org/
+IDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+INHERIT=kernel-build toolchain-funcs
+IUSE=debug hardened savedconfig +initramfs test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.19.17
+RDEPEND=!sys-kernel/gentoo-kernel-bin:5.19.17 virtual/libelf
+REQUIRED_USE=arm? ( savedconfig ) hppa? ( savedconfig ) riscv? ( savedconfig )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.19.17
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.19.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.19-19.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.19-19.extras.tar.xz https://github.com/projg2/gentoo-kernel-config/archive/g3.tar.gz -> gentoo-kernel-config-g3.tar.gz amd64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/5.19.13-gentoo/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.19.13-gentoo ) arm64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/5.19.13-gentoo/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.19.13-gentoo ) ppc64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/5.19.13-gentoo/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.19.13-gentoo ) x86? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/5.19.13-gentoo/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.19.13-gentoo )
+_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-build	a65583ca022627a0388ef5d5567359c0	kernel-install	90e2236c06284613f83d6f40bfba8b47	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	58227860123d3e8da23290064ce3373e	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=372181c62e2f5df5e9b2ac8b79ed483d
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-6.0.3 b/metadata/md5-cache/sys-kernel/gentoo-kernel-6.0.3
new file mode 100644
index 000000000000..f98d5e4744e5
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-6.0.3
@@ -0,0 +1,18 @@
+BDEPEND=debug? ( dev-util/pahole ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test
+DESCRIPTION=Linux kernel built with Gentoo patches
+EAPI=8
+HOMEPAGE=https://www.kernel.org/
+IDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+INHERIT=kernel-build toolchain-funcs
+IUSE=debug hardened savedconfig +initramfs test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-6.0.3
+RDEPEND=!sys-kernel/gentoo-kernel-bin:6.0.3 virtual/libelf
+REQUIRED_USE=arm? ( savedconfig ) hppa? ( savedconfig ) riscv? ( savedconfig )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=6.0.3
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.0.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.0-4.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.0-4.extras.tar.xz https://github.com/projg2/gentoo-kernel-config/archive/g3.tar.gz -> gentoo-kernel-config-g3.tar.gz amd64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.0.3-gentoo/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.6.0.3-gentoo ) arm64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.0.3-gentoo/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.6.0.3-gentoo ) ppc64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.0.3-gentoo/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.6.0.3-gentoo ) x86? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.0.3-gentoo/kernel-i686-fedora.config -> kernel-i686-fedora.config.6.0.3-gentoo )
+_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-build	a65583ca022627a0388ef5d5567359c0	kernel-install	90e2236c06284613f83d6f40bfba8b47	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	58227860123d3e8da23290064ce3373e	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=bf7f6a7140768d3177b6555b08378d5e
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.19.17 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.19.17
new file mode 100644
index 000000000000..a82d4fdb8b07
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.19.17
@@ -0,0 +1,17 @@
+BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
+DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
+DESCRIPTION=Pre-built Linux kernel with Gentoo patches
+EAPI=8
+HOMEPAGE=https://www.kernel.org/
+IDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+INHERIT=kernel-install toolchain-funcs unpacker
+IUSE=+initramfs test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.19.17
+RDEPEND=!sys-kernel/gentoo-kernel:5.19.17 virtual/libelf
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.19.17
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.19.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.19-19.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.19-19.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.19.17-1.gpkg.tar -> gentoo-kernel-5.19.17-1.amd64.gpkg.tar ) arm64? ( https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.19.17-1.gpkg.tar -> gentoo-kernel-5.19.17-1.arm64.gpkg.tar ) ppc64? ( https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.19.17-1.gpkg.tar -> gentoo-kernel-5.19.17-1.ppc64le.gpkg.tar ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.19.17-1.gpkg.tar -> gentoo-kernel-5.19.17-1.x86.gpkg.tar )
+_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-install	90e2236c06284613f83d6f40bfba8b47	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	unpacker	bc57272a0491765c71d973c8cfd35063
+_md5_=b9fc349d438d5f0d230a0ba60c7a79bc
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-6.0.3 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-6.0.3
new file mode 100644
index 000000000000..d2584e453f0f
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-6.0.3
@@ -0,0 +1,17 @@
+BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
+DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
+DESCRIPTION=Pre-built Linux kernel with Gentoo patches
+EAPI=8
+HOMEPAGE=https://www.kernel.org/
+IDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+INHERIT=kernel-install toolchain-funcs unpacker
+IUSE=+initramfs test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-6.0.3
+RDEPEND=!sys-kernel/gentoo-kernel:6.0.3 virtual/libelf
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=6.0.3
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.0.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.0-4.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.0-4.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-6.0.3-1.gpkg.tar -> gentoo-kernel-6.0.3-1.amd64.gpkg.tar ) arm64? ( https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-6.0.3-1.gpkg.tar -> gentoo-kernel-6.0.3-1.arm64.gpkg.tar ) ppc64? ( https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-6.0.3-1.gpkg.tar -> gentoo-kernel-6.0.3-1.ppc64le.gpkg.tar ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-6.0.3-1.gpkg.tar -> gentoo-kernel-6.0.3-1.x86.gpkg.tar )
+_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-install	90e2236c06284613f83d6f40bfba8b47	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	unpacker	bc57272a0491765c71d973c8cfd35063
+_md5_=b78ae1a39b2103332b5d8719ce9727ad
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.148 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.148
deleted file mode 100644
index e87c5f70e779..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.148
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=!build? ( sys-apps/sed )
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DESCRIPTION=Full sources including the Gentoo patchset for the 5.10 kernel tree
-EAPI=8
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
-INHERIT=kernel-2
-IUSE=experimental symlink build
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=GPL-2
-RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
-RESTRICT=binchecks strip
-SLOT=5.10.148
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-157.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-157.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-157.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-157.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-157.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-157.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-157.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-157.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-157.experimental.tar.xz )
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6058f6e6a6269e48cd88f4956944c8d5	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=7a8631b0deb45a925387fe1aca282030
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.19.16 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.19.16
deleted file mode 100644
index e35ca4517b22..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.19.16
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=!build? ( sys-apps/sed )
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DESCRIPTION=Full sources including the Gentoo patchset for the 5.19 kernel tree
-EAPI=8
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
-INHERIT=kernel-2
-IUSE=experimental symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
-RESTRICT=binchecks strip
-SLOT=5.19.16
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.19.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.19-18.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.19-18.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.19-18.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.19-18.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.19-18.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.19-18.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.19-18.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.19-18.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.19-18.experimental.tar.xz )
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6058f6e6a6269e48cd88f4956944c8d5	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=3fe0db5763f670c62418e6e28454508a
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.218 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.218
deleted file mode 100644
index fdda579af98c..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.218
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=!build? ( sys-apps/sed )
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DESCRIPTION=Full sources including the Gentoo patchset for the 5.4 kernel tree
-EAPI=8
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
-INHERIT=kernel-2
-IUSE=experimental symlink build
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86
-LICENSE=GPL-2
-RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
-RESTRICT=binchecks strip
-SLOT=5.4.218
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-223.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-223.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-223.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-223.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-223.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-223.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-223.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-223.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-223.experimental.tar.xz )
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6058f6e6a6269e48cd88f4956944c8d5	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=665fb270f71e415ab740c6366fc4975e
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-6.0.2 b/metadata/md5-cache/sys-kernel/gentoo-sources-6.0.2
deleted file mode 100644
index 8a30cbca31f7..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-6.0.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=!build? ( sys-apps/sed )
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DESCRIPTION=Full sources including the Gentoo patchset for the 6.0 kernel tree
-EAPI=8
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
-INHERIT=kernel-2
-IUSE=experimental symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
-RESTRICT=binchecks strip
-SLOT=6.0.2
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.0.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-6.0-3.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.0-3.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-6.0-3.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-6.0-3.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.0-3.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-6.0-3.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-6.0-3.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.0-3.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-6.0-3.experimental.tar.xz )
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6058f6e6a6269e48cd88f4956944c8d5	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=d08e032fdcba3e09e41b93805f955f58
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.19.17 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.19.17
new file mode 100644
index 000000000000..0fc8f61d5400
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.19.17
@@ -0,0 +1,18 @@
+BDEPEND=debug? ( dev-util/pahole ) verify-sig? ( sec-keys/openpgp-keys-kernel ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test unpack
+DESCRIPTION=Linux kernel built from vanilla upstream sources
+EAPI=8
+HOMEPAGE=https://www.kernel.org/
+IDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+INHERIT=kernel-build toolchain-funcs verify-sig
+IUSE=debug hardened savedconfig +initramfs test verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.19.17
+RDEPEND=virtual/libelf
+REQUIRED_USE=arm? ( savedconfig )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.19.17
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.19.17.tar.xz https://github.com/projg2/gentoo-kernel-config/archive/g3.tar.gz -> gentoo-kernel-config-g3.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.19.17.tar.sign ) amd64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/5.19.13-gentoo/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.19.13-gentoo ) arm64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/5.19.13-gentoo/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.19.13-gentoo ) ppc64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/5.19.13-gentoo/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.19.13-gentoo ) x86? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/5.19.13-gentoo/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.19.13-gentoo )
+_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-build	a65583ca022627a0388ef5d5567359c0	kernel-install	90e2236c06284613f83d6f40bfba8b47	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	58227860123d3e8da23290064ce3373e	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	0748d665fa664a87add00152ed046e16
+_md5_=e8868bc49dfad531ca20884c3bfa62f2
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-6.0.3 b/metadata/md5-cache/sys-kernel/vanilla-kernel-6.0.3
new file mode 100644
index 000000000000..108971acd6c3
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-6.0.3
@@ -0,0 +1,18 @@
+BDEPEND=debug? ( dev-util/pahole ) verify-sig? ( sec-keys/openpgp-keys-kernel ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test unpack
+DESCRIPTION=Linux kernel built from vanilla upstream sources
+EAPI=8
+HOMEPAGE=https://www.kernel.org/
+IDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+INHERIT=kernel-build toolchain-funcs verify-sig
+IUSE=debug hardened savedconfig +initramfs test verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-6.0.3
+RDEPEND=virtual/libelf
+REQUIRED_USE=arm? ( savedconfig )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=6.0.3
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.0.3.tar.xz https://github.com/projg2/gentoo-kernel-config/archive/g3.tar.gz -> gentoo-kernel-config-g3.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.0.3.tar.sign ) amd64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.0.3-gentoo/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.6.0.3-gentoo ) arm64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.0.3-gentoo/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.6.0.3-gentoo ) ppc64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.0.3-gentoo/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.6.0.3-gentoo ) x86? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.0.3-gentoo/kernel-i686-fedora.config -> kernel-i686-fedora.config.6.0.3-gentoo )
+_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-build	a65583ca022627a0388ef5d5567359c0	kernel-install	90e2236c06284613f83d6f40bfba8b47	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	58227860123d3e8da23290064ce3373e	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	0748d665fa664a87add00152ed046e16
+_md5_=a56fb036abb203780bf66c279bc24490
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index 2628529754ce..6ae557128465 100644
Binary files a/metadata/md5-cache/sys-libs/Manifest.gz and b/metadata/md5-cache/sys-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-15.0.3.9999 b/metadata/md5-cache/sys-libs/compiler-rt-15.0.4.9999
similarity index 95%
rename from metadata/md5-cache/sys-libs/compiler-rt-15.0.3.9999
rename to metadata/md5-cache/sys-libs/compiler-rt-15.0.4.9999
index 4c10fb183b11..e414553f60b5 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-15.0.3.9999
+++ b/metadata/md5-cache/sys-libs/compiler-rt-15.0.4.9999
@@ -1,4 +1,4 @@
-BDEPEND=>=dev-util/cmake-3.16 clang? ( sys-devel/clang ) test? ( || ( ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-python/lit-15[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 >=dev-python/lit-15[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 >=dev-python/lit-15[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 >=dev-python/lit-15[python_targets_python3_8(-)] ) ) =sys-devel/clang-15.0.3*:15 ) !test? ( || ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=>=dev-util/cmake-3.16 clang? ( sys-devel/clang ) test? ( || ( ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-python/lit-15[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 >=dev-python/lit-15[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 >=dev-python/lit-15[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 >=dev-python/lit-15[python_targets_python3_8(-)] ) ) =sys-devel/clang-15.0.4*:15 ) !test? ( || ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare pretend setup test unpack
 DEPEND=sys-devel/llvm:15 !!sys-devel/llvm:0
 DESCRIPTION=Compiler runtime library for clang (built-in part)
@@ -9,7 +9,7 @@ IUSE=+abi_x86_32 abi_x86_64 +clang debug test
 LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
 PROPERTIES=live
 RESTRICT=!test? ( test ) !clang? ( test )
-SLOT=15.0.3
+SLOT=15.0.4
 SRC_URI=https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-9999-1.tar.xz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	llvm	29d5332b8530fb760c2ca71ad6706858	llvm.org	ab48c0803b67a958624f7600ef86081c	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=9ccbe2192a16eefa1b5960a39d3d5a6e
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-15.0.3.9999 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-15.0.4.9999
similarity index 93%
rename from metadata/md5-cache/sys-libs/compiler-rt-sanitizers-15.0.3.9999
rename to metadata/md5-cache/sys-libs/compiler-rt-sanitizers-15.0.4.9999
index 0d6d8635957d..e23ea31c7a88 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-15.0.3.9999
+++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-15.0.4.9999
@@ -1,4 +1,4 @@
-BDEPEND=>=dev-util/cmake-3.16 clang? ( sys-devel/clang ) elibc_glibc? ( net-libs/libtirpc ) test? ( !!<sys-apps/sandbox-2.13 || ( ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-python/lit-15[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 >=dev-python/lit-15[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 >=dev-python/lit-15[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 >=dev-python/lit-15[python_targets_python3_8(-)] ) ) =sys-devel/clang-15.0.3*:15 sys-libs/compiler-rt:15.0.3 ) !test? ( || ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=>=dev-util/cmake-3.16 clang? ( sys-devel/clang ) elibc_glibc? ( net-libs/libtirpc ) test? ( !!<sys-apps/sandbox-2.13 || ( ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-python/lit-15[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 >=dev-python/lit-15[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 >=dev-python/lit-15[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 >=dev-python/lit-15[python_targets_python3_8(-)] ) ) =sys-devel/clang-15.0.4*:15 sys-libs/compiler-rt:15.0.4 ) !test? ( || ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare pretend setup test unpack
 DEPEND=sys-devel/llvm:15 virtual/libcrypt[abi_x86_32(-)?,abi_x86_64(-)?] !!sys-devel/llvm:0
 DESCRIPTION=Compiler runtime libraries for clang (sanitizers & xray)
@@ -10,7 +10,7 @@ LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
 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=15.0.3
+SLOT=15.0.4
 SRC_URI=https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-9999-1.tar.xz
 _eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	llvm	29d5332b8530fb760c2ca71ad6706858	llvm.org	ab48c0803b67a958624f7600ef86081c	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=8286e2b394c9a005ebb838db58c1c7ef
diff --git a/metadata/md5-cache/sys-libs/libcxx-15.0.3 b/metadata/md5-cache/sys-libs/libcxx-15.0.3
index 921af4284bdb..0a07780bbe1f 100644
--- a/metadata/md5-cache/sys-libs/libcxx-15.0.3
+++ b/metadata/md5-cache/sys-libs/libcxx-15.0.3
@@ -6,7 +6,7 @@ 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 verify-sig
-KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~sparc ~x86 ~x64-macos
+KEYWORDS=~amd64 ~arm ~arm64 ~riscv sparc ~x86 ~x64-macos
 LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
 RDEPEND=libcxxabi? ( ~sys-libs/libcxxabi-15.0.3[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 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.3/llvm-project-15.0.3.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.3/llvm-project-15.0.3.src.tar.xz.sig )
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	29a755b1291d64133634d80b0328f153	llvm	29d5332b8530fb760c2ca71ad6706858	llvm.org	ab48c0803b67a958624f7600ef86081c	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	0748d665fa664a87add00152ed046e16	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=205a957ca14a7fbca8a5b4aa9bb42c95
+_md5_=0592b5a3822a2da7635e84f618bd4177
diff --git a/metadata/md5-cache/sys-libs/libcxx-15.0.3.9999 b/metadata/md5-cache/sys-libs/libcxx-15.0.4.9999
similarity index 94%
rename from metadata/md5-cache/sys-libs/libcxx-15.0.3.9999
rename to metadata/md5-cache/sys-libs/libcxx-15.0.4.9999
index ff9f11fb3bc6..18d553ed9694 100644
--- a/metadata/md5-cache/sys-libs/libcxx-15.0.3.9999
+++ b/metadata/md5-cache/sys-libs/libcxx-15.0.4.9999
@@ -1,6 +1,6 @@
 BDEPEND=clang? ( sys-devel/clang:15 ) !test? ( || ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) ) test? ( >=dev-util/cmake-3.16 sys-devel/gdb[python] || ( ( >=dev-lang/python-3.11.0_beta4:3.11 dev-python/lit[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 dev-python/lit[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-python/lit[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-python/lit[python_targets_python3_8(-)] ) ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=libcxxabi? ( ~sys-libs/libcxxabi-15.0.3.9999[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:15 !!sys-devel/llvm:0
+DEPEND=libcxxabi? ( ~sys-libs/libcxxabi-15.0.4.9999[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:15 !!sys-devel/llvm:0
 DESCRIPTION=New implementation of the C++ standard library, targeting C++11
 EAPI=8
 HOMEPAGE=https://libcxx.llvm.org/
@@ -8,7 +8,7 @@ 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 )
 PROPERTIES=live
-RDEPEND=libcxxabi? ( ~sys-libs/libcxxabi-15.0.3.9999[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] )
+RDEPEND=libcxxabi? ( ~sys-libs/libcxxabi-15.0.4.9999[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
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-15.0.3 b/metadata/md5-cache/sys-libs/libcxxabi-15.0.3
index 4b90cd235517..25b87c118e74 100644
--- a/metadata/md5-cache/sys-libs/libcxxabi-15.0.3
+++ b/metadata/md5-cache/sys-libs/libcxxabi-15.0.3
@@ -6,7 +6,7 @@ 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 verify-sig
-KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~sparc ~x86 ~x64-macos
+KEYWORDS=~amd64 ~arm ~arm64 ~riscv sparc ~x86 ~x64-macos
 LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
 RDEPEND=!<sys-libs/libcxx-15
 REQUIRED_USE=test? ( clang )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.3/llvm-project-15.0.3.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.3/llvm-project-15.0.3.src.tar.xz.sig )
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	29a755b1291d64133634d80b0328f153	llvm	29d5332b8530fb760c2ca71ad6706858	llvm.org	ab48c0803b67a958624f7600ef86081c	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	0748d665fa664a87add00152ed046e16	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=aac9572d298122895433d9c50151b5ef
+_md5_=cf3ffbe187e226ab03a045924eb179b9
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-15.0.3.9999 b/metadata/md5-cache/sys-libs/libcxxabi-15.0.4.9999
similarity index 100%
rename from metadata/md5-cache/sys-libs/libcxxabi-15.0.3.9999
rename to metadata/md5-cache/sys-libs/libcxxabi-15.0.4.9999
diff --git a/metadata/md5-cache/sys-libs/libomp-15.0.3.9999 b/metadata/md5-cache/sys-libs/libomp-15.0.4.9999
similarity index 96%
rename from metadata/md5-cache/sys-libs/libomp-15.0.3.9999
rename to metadata/md5-cache/sys-libs/libomp-15.0.4.9999
index 6d4bb165bfed..9a102864d0b4 100644
--- a/metadata/md5-cache/sys-libs/libomp-15.0.3.9999
+++ b/metadata/md5-cache/sys-libs/libomp-15.0.4.9999
@@ -1,6 +1,6 @@
 BDEPEND=dev-lang/perl offload? ( llvm_targets_AMDGPU? ( sys-devel/clang ) llvm_targets_NVPTX? ( sys-devel/clang ) virtual/pkgconfig ) test? ( || ( ( >=dev-lang/python-3.11.0_beta4:3.11 dev-python/lit[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 dev-python/lit[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-python/lit[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-python/lit[python_targets_python3_8(-)] ) ) sys-devel/clang ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare pretend setup test unpack
-DEPEND=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? ( virtual/libelf:=[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/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-15.0.3.9999[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
+DEPEND=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? ( virtual/libelf:=[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/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-15.0.4.9999[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
 DESCRIPTION=OpenMP runtime library for LLVM/clang compiler
 EAPI=8
 HOMEPAGE=https://openmp.llvm.org
@@ -8,7 +8,7 @@ INHERIT=flag-o-matic cmake-multilib linux-info llvm llvm.org python-any-r1
 IUSE=debug 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
 LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
 PROPERTIES=live
-RDEPEND=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? ( virtual/libelf:=[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/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-15.0.3.9999[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+RDEPEND=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? ( virtual/libelf:=[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/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-15.0.4.9999[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 )
 SLOT=0/15
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	29a755b1291d64133634d80b0328f153	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	linux-info	bbfa385d6907d7948d49a5e107bd654d	llvm	29d5332b8530fb760c2ca71ad6706858	llvm.org	ab48c0803b67a958624f7600ef86081c	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-15.0.3 b/metadata/md5-cache/sys-libs/llvm-libunwind-15.0.3
index 9fec82551e80..14f2a3f47e76 100644
--- a/metadata/md5-cache/sys-libs/llvm-libunwind-15.0.3
+++ b/metadata/md5-cache/sys-libs/llvm-libunwind-15.0.3
@@ -6,7 +6,7 @@ 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 verify-sig
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv sparc ~x86 ~x64-macos
 LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
 RDEPEND=!sys-libs/libunwind
 REQUIRED_USE=test? ( clang )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.3/llvm-project-15.0.3.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.3/llvm-project-15.0.3.src.tar.xz.sig )
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	29a755b1291d64133634d80b0328f153	llvm	29d5332b8530fb760c2ca71ad6706858	llvm.org	ab48c0803b67a958624f7600ef86081c	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	0748d665fa664a87add00152ed046e16	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=649ee3c8ad687bc88664fbd7f38aaf04
+_md5_=35eb2e463dc673dfcd731d9b9222539f
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-15.0.3.9999 b/metadata/md5-cache/sys-libs/llvm-libunwind-15.0.4.9999
similarity index 100%
rename from metadata/md5-cache/sys-libs/llvm-libunwind-15.0.3.9999
rename to metadata/md5-cache/sys-libs/llvm-libunwind-15.0.4.9999
diff --git a/metadata/md5-cache/sys-process/Manifest.gz b/metadata/md5-cache/sys-process/Manifest.gz
index 870eb761685e..dba24713ffa3 100644
Binary files a/metadata/md5-cache/sys-process/Manifest.gz and b/metadata/md5-cache/sys-process/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-process/cronie-1.6.1-r1 b/metadata/md5-cache/sys-process/cronie-1.6.1-r1
index efa79c3e87b2..d3337eebe03f 100644
--- a/metadata/md5-cache/sys-process/cronie-1.6.1-r1
+++ b/metadata/md5-cache/sys-process/cronie-1.6.1-r1
@@ -1,6 +1,6 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 virtual/pkgconfig
+BDEPEND=acct-group/crontab sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 virtual/pkgconfig
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=acct-group/crontab pam? ( sys-libs/pam ) anacron? ( !sys-process/anacron !sys-process/systemd-cron elibc_musl? ( sys-libs/obstack-standalone ) ) selinux? ( sys-libs/libselinux )
+DEPEND=pam? ( sys-libs/pam ) anacron? ( !sys-process/anacron !sys-process/systemd-cron elibc_musl? ( sys-libs/obstack-standalone ) ) selinux? ( sys-libs/libselinux )
 DESCRIPTION=Cronie is a standard UNIX daemon cron based on the original vixie-cron
 EAPI=7
 HOMEPAGE=https://github.com/cronie-crond/cronie
@@ -12,4 +12,4 @@ RDEPEND=acct-group/crontab pam? ( sys-libs/pam ) anacron? ( !sys-process/anacron
 SLOT=0
 SRC_URI=https://github.com/cronie-crond/cronie/archive/cronie-1.6.1.tar.gz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	cron	b3117529d23cf99d6166b59608ed94e4	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pam	e44a1dd98f13e1ad76de01e919bde1f1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=97cc70ca36463b11cfb15e538aa87f78
+_md5_=a81743a40ad1ae301f9dfa3d4eb4bc66
diff --git a/metadata/md5-cache/sys-process/cronie-1.6.1-r2 b/metadata/md5-cache/sys-process/cronie-1.6.1-r2
index d5acc552c2a1..abd4401db403 100644
--- a/metadata/md5-cache/sys-process/cronie-1.6.1-r2
+++ b/metadata/md5-cache/sys-process/cronie-1.6.1-r2
@@ -1,6 +1,6 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 virtual/pkgconfig
+BDEPEND=acct-group/crontab sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 virtual/pkgconfig
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=acct-group/crontab pam? ( sys-libs/pam ) anacron? ( !sys-process/anacron !sys-process/systemd-cron elibc_musl? ( sys-libs/obstack-standalone ) ) selinux? ( sys-libs/libselinux )
+DEPEND=pam? ( sys-libs/pam ) anacron? ( !sys-process/anacron !sys-process/systemd-cron elibc_musl? ( sys-libs/obstack-standalone ) ) selinux? ( sys-libs/libselinux )
 DESCRIPTION=Cronie is a standard UNIX daemon cron based on the original vixie-cron
 EAPI=7
 HOMEPAGE=https://github.com/cronie-crond/cronie
@@ -12,4 +12,4 @@ RDEPEND=acct-group/crontab pam? ( sys-libs/pam ) anacron? ( !sys-process/anacron
 SLOT=0
 SRC_URI=https://github.com/cronie-crond/cronie/archive/cronie-1.6.1.tar.gz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	cron	b3117529d23cf99d6166b59608ed94e4	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pam	e44a1dd98f13e1ad76de01e919bde1f1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=f4ab102ebc09edb4a53f699d6d1b7cc2
+_md5_=6cc103b4e220925d60a8f0bd59f114dc
diff --git a/metadata/md5-cache/sys-process/parallel-20220722 b/metadata/md5-cache/sys-process/parallel-20221022
similarity index 74%
rename from metadata/md5-cache/sys-process/parallel-20220722
rename to metadata/md5-cache/sys-process/parallel-20221022
index 54c412f53f76..beff1a906bb6 100644
--- a/metadata/md5-cache/sys-process/parallel-20220722
+++ b/metadata/md5-cache/sys-process/parallel-20221022
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://www.gnu.org/software/parallel/ https://git.savannah.gnu.org/cgit/parallel.git/
 INHERIT=verify-sig
 IUSE=verify-sig
-KEYWORDS=amd64 arm arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=GPL-3+
 RDEPEND=dev-lang/perl dev-perl/Devel-Size dev-perl/Text-CSV virtual/perl-Data-Dumper virtual/perl-File-Temp virtual/perl-IO
 SLOT=0
-SRC_URI=mirror://gnu/parallel/parallel-20220722.tar.bz2 verify-sig? ( mirror://gnu/parallel/parallel-20220722.tar.bz2.sig )
+SRC_URI=mirror://gnu/parallel/parallel-20221022.tar.bz2 verify-sig? ( mirror://gnu/parallel/parallel-20221022.tar.bz2.sig )
 _eclasses_=verify-sig	0748d665fa664a87add00152ed046e16
-_md5_=1914107741f25dd16a29b24c56c14ddc
+_md5_=9ac9c1b38bfa689bed61a81e0663fdf9
diff --git a/metadata/md5-cache/virtual/Manifest.gz b/metadata/md5-cache/virtual/Manifest.gz
index 97922d73a4cf..b0b626fe9ccc 100644
Binary files a/metadata/md5-cache/virtual/Manifest.gz and b/metadata/md5-cache/virtual/Manifest.gz differ
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.19.17 b/metadata/md5-cache/virtual/dist-kernel-5.19.17
new file mode 100644
index 000000000000..386b0fa37f6d
--- /dev/null
+++ b/metadata/md5-cache/virtual/dist-kernel-5.19.17
@@ -0,0 +1,7 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual to depend on any Distribution Kernel
+EAPI=7
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86
+RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.19.17 ~sys-kernel/gentoo-kernel-bin-5.19.17 ~sys-kernel/vanilla-kernel-5.19.17 )
+SLOT=0/5.19.17
+_md5_=62eff3c91f3533c035b4103dfd4b6dd7
diff --git a/metadata/md5-cache/virtual/dist-kernel-6.0.3 b/metadata/md5-cache/virtual/dist-kernel-6.0.3
new file mode 100644
index 000000000000..3a4cd3682ac7
--- /dev/null
+++ b/metadata/md5-cache/virtual/dist-kernel-6.0.3
@@ -0,0 +1,7 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual to depend on any Distribution Kernel
+EAPI=7
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86
+RDEPEND=|| ( ~sys-kernel/gentoo-kernel-6.0.3 ~sys-kernel/gentoo-kernel-bin-6.0.3 ~sys-kernel/vanilla-kernel-6.0.3 )
+SLOT=0/6.0.3
+_md5_=62eff3c91f3533c035b4103dfd4b6dd7
diff --git a/metadata/md5-cache/www-apache/Manifest.gz b/metadata/md5-cache/www-apache/Manifest.gz
index 179b9d22c778..b74d8f619a52 100644
Binary files a/metadata/md5-cache/www-apache/Manifest.gz and b/metadata/md5-cache/www-apache/Manifest.gz differ
diff --git a/metadata/md5-cache/www-apache/mod_h2-2.0.10 b/metadata/md5-cache/www-apache/mod_h2-2.0.11
similarity index 91%
rename from metadata/md5-cache/www-apache/mod_h2-2.0.10
rename to metadata/md5-cache/www-apache/mod_h2-2.0.11
index 182e4ed4e20a..08b0ed610b67 100644
--- a/metadata/md5-cache/www-apache/mod_h2-2.0.10
+++ b/metadata/md5-cache/www-apache/mod_h2-2.0.11
@@ -10,6 +10,6 @@ KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=>=net-libs/nghttp2-1.0 >=www-servers/apache-2.4.48[-apache2_modules_http2,ssl?] =www-servers/apache-2.4*
 SLOT=0
-SRC_URI=https://github.com/icing/mod_h2/archive/v2.0.10.tar.gz -> mod_h2-2.0.10.tar.gz
+SRC_URI=https://github.com/icing/mod_h2/archive/v2.0.11.tar.gz -> mod_h2-2.0.11.tar.gz
 _eclasses_=apache-module	4d0ccd357b5f2d92599030b72f6efb62	autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	depend.apache	416d1c5005c5f4594e79812fb7323f0d	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
 _md5_=c8215956b76b2c09f08b2ea7b6dc44e0
diff --git a/metadata/md5-cache/www-apache/mod_h2-2.0.9 b/metadata/md5-cache/www-apache/mod_h2-2.0.9
deleted file mode 100644
index 7df16d3874a8..000000000000
--- a/metadata/md5-cache/www-apache/mod_h2-2.0.9
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile install postinst prepare setup
-DEPEND=>=net-libs/nghttp2-1.0 >=www-servers/apache-2.4.48[-apache2_modules_http2,ssl?] =www-servers/apache-2.4*
-DESCRIPTION=HTTP/2 module for Apache
-EAPI=7
-HOMEPAGE=https://github.com/icing/mod_h2
-INHERIT=apache-module autotools
-IUSE=ssl
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=net-libs/nghttp2-1.0 >=www-servers/apache-2.4.48[-apache2_modules_http2,ssl?] =www-servers/apache-2.4*
-SLOT=0
-SRC_URI=https://github.com/icing/mod_h2/archive/v2.0.9.tar.gz -> mod_h2-2.0.9.tar.gz
-_eclasses_=apache-module	4d0ccd357b5f2d92599030b72f6efb62	autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	depend.apache	416d1c5005c5f4594e79812fb7323f0d	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=c8215956b76b2c09f08b2ea7b6dc44e0
diff --git a/metadata/md5-cache/www-apache/mod_qos-11.72 b/metadata/md5-cache/www-apache/mod_qos-11.72
index 362fc14fbf15..a1226a04dce4 100644
--- a/metadata/md5-cache/www-apache/mod_qos-11.72
+++ b/metadata/md5-cache/www-apache/mod_qos-11.72
@@ -5,10 +5,10 @@ DESCRIPTION=A QOS module for the apache webserver
 EAPI=7
 HOMEPAGE=http://mod-qos.sourceforge.net/
 INHERIT=autotools apache-module
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/libpcre:3 dev-libs/openssl:0= media-libs/libpng:0= sys-libs/zlib:0= =www-servers/apache-2*
 SLOT=0
 SRC_URI=mirror://sourceforge/mod-qos/mod_qos-11.72.tar.gz
 _eclasses_=apache-module	4d0ccd357b5f2d92599030b72f6efb62	autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	depend.apache	416d1c5005c5f4594e79812fb7323f0d	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=8ea60baa78625a1a5864318f4561a935
+_md5_=34362708979e73aeed25b9983cf82267
diff --git a/metadata/md5-cache/www-apps/Manifest.gz b/metadata/md5-cache/www-apps/Manifest.gz
index f95892b81ab0..661dbc7b5d0e 100644
Binary files a/metadata/md5-cache/www-apps/Manifest.gz and b/metadata/md5-cache/www-apps/Manifest.gz differ
diff --git a/metadata/md5-cache/www-apps/cgit-1.2.3-r201 b/metadata/md5-cache/www-apps/cgit-1.2.3-r201
index 87f1fc66b78a..b074e461d2eb 100644
--- a/metadata/md5-cache/www-apps/cgit-1.2.3-r201
+++ b/metadata/md5-cache/www-apps/cgit-1.2.3-r201
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://git.zx2c4.com/cgit/about
 INHERIT=lua-single python-single-r1 toolchain-funcs webapp
 IUSE=doc +highlight +lua test lua_single_target_luajit lua_single_target_lua5-1 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 vhosts
-KEYWORDS=amd64 arm x86
+KEYWORDS=amd64 arm ~riscv x86
 LICENSE=GPL-2
 RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) acct-group/cgit acct-user/cgit dev-libs/openssl:0= dev-vcs/git highlight? ( python_single_target_python3_8? ( dev-python/pygments[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pygments[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pygments[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pygments[python_targets_python3_11(-)] ) ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) sys-libs/zlib virtual/httpd-cgi app-admin/webapp-config
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 ) ) ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/software/scm/git/git-2.25.1.tar.xz https://git.zx2c4.com/cgit/snapshot/cgit-1.2.3.tar.xz
 _eclasses_=lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	webapp	67df5bab481d0b9428f9ab7b3de690e4
-_md5_=d5a23e588ef1c1d516b429db78af6442
+_md5_=5ef246bf20bd7916f60477287d1ef23c
diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index 1a6699c7398f..61bd014b9558 100644
Binary files a/metadata/md5-cache/www-client/Manifest.gz and b/metadata/md5-cache/www-client/Manifest.gz differ
diff --git a/metadata/md5-cache/www-client/firefox-102.3.0 b/metadata/md5-cache/www-client/firefox-102.3.0
deleted file mode 100644
index 3aa8d3e4175a..000000000000
--- a/metadata/md5-cache/www-client/firefox-102.3.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.11.0_beta4:3.11[ncurses,sqlite,ssl] >=dev-lang/python-3.10.4:3.10[ncurses,sqlite,ssl] >=dev-lang/python-3.9.12:3.9[ncurses,sqlite,ssl] >=dev-lang/python-3.8.13:3.8[ncurses,sqlite,ssl] ) app-arch/unzip app-arch/zip >=dev-util/cbindgen-0.24.3 net-libs/nodejs virtual/pkgconfig virtual/rust || ( ( sys-devel/clang:14 sys-devel/llvm:14 clang? ( =sys-devel/lld-14* pgo? ( =sys-libs/compiler-rt-sanitizers-14*[profile] ) ) ) ( sys-devel/clang:13 sys-devel/llvm:13 clang? ( =sys-devel/lld-13* pgo? ( =sys-libs/compiler-rt-sanitizers-13*[profile] ) ) ) ) amd64? ( >=dev-lang/nasm-2.14 ) x86? ( >=dev-lang/nasm-2.14 ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) ~sys-devel/autoconf-2.13 >=sys-devel/libtool-2.4 pgo? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup unpack
-DEPEND=!www-client/firefox:0 !www-client/firefox:rapid screencast? ( media-video/pipewire:= ) selinux? ( sec-policy/selinux-mozilla ) || ( >=app-accessibility/at-spi2-core-2.46.0:2 dev-libs/atk ) dev-libs/expat dev-libs/glib:2 dev-libs/libffi:= >=dev-libs/nss-3.79.1 >=dev-libs/nspr-4.34 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype media-libs/mesa media-video/ffmpeg sys-libs/zlib virtual/freedesktop-icon-theme virtual/opengl x11-libs/cairo[X] x11-libs/gdk-pixbuf x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXtst x11-libs/libxcb:= x11-libs/libxkbcommon[X] x11-libs/pango x11-libs/pixman dbus? ( dev-libs/dbus-glib sys-apps/dbus ) jack? ( virtual/jack ) libproxy? ( net-libs/libproxy ) sndio? ( >=media-sound/sndio-1.8.0-r1 ) system-av1? ( >=media-libs/dav1d-1.0.0:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-gfx/graphite2-1.3.13 >=media-libs/harfbuzz-2.8.1:0= ) system-icu? ( >=dev-libs/icu-71.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] ) system-png? ( >=media-libs/libpng-1.6.35:0=[apng] ) system-webp? ( >=media-libs/libwebp-1.1.0:0= ) wayland? ( x11-libs/gtk+:3[wayland] x11-libs/libdrm x11-libs/libxkbcommon[wayland] ) wifi? ( kernel_linux? ( dev-libs/dbus-glib net-misc/networkmanager sys-apps/dbus ) ) x11-libs/libICE x11-libs/libSM pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.12-r4[sdk] ) ) !!sys-devel/llvm:0
-DESCRIPTION=Firefox Web Browser
-EAPI=8
-HOMEPAGE=https://www.mozilla.com/firefox
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=autotools check-reqs desktop flag-o-matic gnome2-utils linux-info llvm multiprocessing pax-utils python-any-r1 toolchain-funcs virtualx xdg
-IUSE=+clang cpu_flags_arm_neon dbus debug eme-free hardened hwaccel jack libproxy lto +openh264 pgo pulseaudio sndio selinux +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent +system-libvpx system-png system-python-libs +system-webp wayland wifi geckodriver +gmp-autoupdate screencast l10n_af l10n_ar l10n_ast l10n_be l10n_bg l10n_br l10n_ca l10n_cak l10n_cs l10n_cy l10n_da l10n_de l10n_dsb l10n_el l10n_en-CA l10n_en-GB l10n_es-AR l10n_es-ES l10n_et l10n_eu l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_he l10n_hr l10n_hsb l10n_hu l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_kab l10n_kk l10n_ko l10n_lt l10n_lv l10n_ms l10n_nb l10n_nl l10n_nn l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_sk l10n_sl l10n_sq l10n_sr l10n_sv l10n_th l10n_tr l10n_uk l10n_uz l10n_vi l10n_zh-CN l10n_zh-TW l10n_ach l10n_an l10n_az l10n_bn l10n_bs l10n_ca-valencia l10n_eo l10n_es-CL l10n_es-MX l10n_fa l10n_ff l10n_gn l10n_gu l10n_hi l10n_hy l10n_ia l10n_km l10n_kn l10n_lij l10n_mk l10n_mr l10n_my l10n_ne l10n_oc l10n_sco l10n_si l10n_son l10n_szl l10n_ta l10n_te l10n_tl l10n_trs l10n_ur l10n_xh pgo
-KEYWORDS=amd64 arm64 ~ppc64 x86
-LICENSE=MPL-2.0 GPL-2 LGPL-2.1
-RDEPEND=!www-client/firefox:0 !www-client/firefox:rapid screencast? ( media-video/pipewire:= ) selinux? ( sec-policy/selinux-mozilla ) || ( >=app-accessibility/at-spi2-core-2.46.0:2 dev-libs/atk ) dev-libs/expat dev-libs/glib:2 dev-libs/libffi:= >=dev-libs/nss-3.79.1 >=dev-libs/nspr-4.34 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype media-libs/mesa media-video/ffmpeg sys-libs/zlib virtual/freedesktop-icon-theme virtual/opengl x11-libs/cairo[X] x11-libs/gdk-pixbuf x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXtst x11-libs/libxcb:= x11-libs/libxkbcommon[X] x11-libs/pango x11-libs/pixman dbus? ( dev-libs/dbus-glib sys-apps/dbus ) jack? ( virtual/jack ) libproxy? ( net-libs/libproxy ) sndio? ( >=media-sound/sndio-1.8.0-r1 ) system-av1? ( >=media-libs/dav1d-1.0.0:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-gfx/graphite2-1.3.13 >=media-libs/harfbuzz-2.8.1:0= ) system-icu? ( >=dev-libs/icu-71.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] ) system-png? ( >=media-libs/libpng-1.6.35:0=[apng] ) system-webp? ( >=media-libs/libwebp-1.1.0:0= ) wayland? ( x11-libs/gtk+:3[wayland] x11-libs/libdrm x11-libs/libxkbcommon[wayland] ) wifi? ( kernel_linux? ( dev-libs/dbus-glib net-misc/networkmanager sys-apps/dbus ) ) jack? ( virtual/jack ) openh264? ( media-libs/openh264:*[plugin] ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.12-r4 ) )
-REQUIRED_USE=debug? ( !system-av1 ) pgo? ( lto ) wayland? ( dbus ) wifi? ( dbus ) screencast? ( wayland )
-SLOT=esr
-SRC_URI=https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/source/firefox-102.3.0esr.source.tar.xz -> firefox-102.3.0esr.source.tar.xz https://dev.gentoo.org/~juippis/mozilla/patchsets/firefox-102esr-patches-03j.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-102esr-patches-03j.tar.xz https://dev.gentoo.org/~slashbeast/mozilla/patchsets/firefox-102esr-patches-03j.tar.xz l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/af.xpi -> firefox-102.3.0esr-af.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/ar.xpi -> firefox-102.3.0esr-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/ast.xpi -> firefox-102.3.0esr-ast.xpi ) l10n_be? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/be.xpi -> firefox-102.3.0esr-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/bg.xpi -> firefox-102.3.0esr-bg.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/br.xpi -> firefox-102.3.0esr-br.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/ca.xpi -> firefox-102.3.0esr-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/cak.xpi -> firefox-102.3.0esr-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/cs.xpi -> firefox-102.3.0esr-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/cy.xpi -> firefox-102.3.0esr-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/da.xpi -> firefox-102.3.0esr-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/de.xpi -> firefox-102.3.0esr-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/dsb.xpi -> firefox-102.3.0esr-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/el.xpi -> firefox-102.3.0esr-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/en-CA.xpi -> firefox-102.3.0esr-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/en-GB.xpi -> firefox-102.3.0esr-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/es-AR.xpi -> firefox-102.3.0esr-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/es-ES.xpi -> firefox-102.3.0esr-es-ES.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/et.xpi -> firefox-102.3.0esr-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/eu.xpi -> firefox-102.3.0esr-eu.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/fi.xpi -> firefox-102.3.0esr-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/fr.xpi -> firefox-102.3.0esr-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/fy-NL.xpi -> firefox-102.3.0esr-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/ga-IE.xpi -> firefox-102.3.0esr-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/gd.xpi -> firefox-102.3.0esr-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/gl.xpi -> firefox-102.3.0esr-gl.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/he.xpi -> firefox-102.3.0esr-he.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/hr.xpi -> firefox-102.3.0esr-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/hsb.xpi -> firefox-102.3.0esr-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/hu.xpi -> firefox-102.3.0esr-hu.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/id.xpi -> firefox-102.3.0esr-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/is.xpi -> firefox-102.3.0esr-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/it.xpi -> firefox-102.3.0esr-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/ja.xpi -> firefox-102.3.0esr-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/ka.xpi -> firefox-102.3.0esr-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/kab.xpi -> firefox-102.3.0esr-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/kk.xpi -> firefox-102.3.0esr-kk.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/ko.xpi -> firefox-102.3.0esr-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/lt.xpi -> firefox-102.3.0esr-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/lv.xpi -> firefox-102.3.0esr-lv.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/ms.xpi -> firefox-102.3.0esr-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/nb-NO.xpi -> firefox-102.3.0esr-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/nl.xpi -> firefox-102.3.0esr-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/nn-NO.xpi -> firefox-102.3.0esr-nn-NO.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/pa-IN.xpi -> firefox-102.3.0esr-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/pl.xpi -> firefox-102.3.0esr-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/pt-BR.xpi -> firefox-102.3.0esr-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/pt-PT.xpi -> firefox-102.3.0esr-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/rm.xpi -> firefox-102.3.0esr-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/ro.xpi -> firefox-102.3.0esr-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/ru.xpi -> firefox-102.3.0esr-ru.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/sk.xpi -> firefox-102.3.0esr-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/sl.xpi -> firefox-102.3.0esr-sl.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/sq.xpi -> firefox-102.3.0esr-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/sr.xpi -> firefox-102.3.0esr-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/sv-SE.xpi -> firefox-102.3.0esr-sv-SE.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/th.xpi -> firefox-102.3.0esr-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/tr.xpi -> firefox-102.3.0esr-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/uk.xpi -> firefox-102.3.0esr-uk.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/uz.xpi -> firefox-102.3.0esr-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/vi.xpi -> firefox-102.3.0esr-vi.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/zh-CN.xpi -> firefox-102.3.0esr-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/zh-TW.xpi -> firefox-102.3.0esr-zh-TW.xpi ) l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/ach.xpi -> firefox-102.3.0esr-ach.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/an.xpi -> firefox-102.3.0esr-an.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/az.xpi -> firefox-102.3.0esr-az.xpi ) l10n_bn? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/bn.xpi -> firefox-102.3.0esr-bn.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/bs.xpi -> firefox-102.3.0esr-bs.xpi ) l10n_ca-valencia? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/ca-valencia.xpi -> firefox-102.3.0esr-ca-valencia.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/eo.xpi -> firefox-102.3.0esr-eo.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/es-CL.xpi -> firefox-102.3.0esr-es-CL.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/es-MX.xpi -> firefox-102.3.0esr-es-MX.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/fa.xpi -> firefox-102.3.0esr-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/ff.xpi -> firefox-102.3.0esr-ff.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/gn.xpi -> firefox-102.3.0esr-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/gu-IN.xpi -> firefox-102.3.0esr-gu-IN.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/hi-IN.xpi -> firefox-102.3.0esr-hi-IN.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/hy-AM.xpi -> firefox-102.3.0esr-hy-AM.xpi ) l10n_ia? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/ia.xpi -> firefox-102.3.0esr-ia.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/km.xpi -> firefox-102.3.0esr-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/kn.xpi -> firefox-102.3.0esr-kn.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/lij.xpi -> firefox-102.3.0esr-lij.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/mk.xpi -> firefox-102.3.0esr-mk.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/mr.xpi -> firefox-102.3.0esr-mr.xpi ) l10n_my? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/my.xpi -> firefox-102.3.0esr-my.xpi ) l10n_ne? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/ne-NP.xpi -> firefox-102.3.0esr-ne-NP.xpi ) l10n_oc? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/oc.xpi -> firefox-102.3.0esr-oc.xpi ) l10n_sco? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/sco.xpi -> firefox-102.3.0esr-sco.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/si.xpi -> firefox-102.3.0esr-si.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/son.xpi -> firefox-102.3.0esr-son.xpi ) l10n_szl? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/szl.xpi -> firefox-102.3.0esr-szl.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/ta.xpi -> firefox-102.3.0esr-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/te.xpi -> firefox-102.3.0esr-te.xpi ) l10n_tl? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/tl.xpi -> firefox-102.3.0esr-tl.xpi ) l10n_trs? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/trs.xpi -> firefox-102.3.0esr-trs.xpi ) l10n_ur? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/ur.xpi -> firefox-102.3.0esr-ur.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/xh.xpi -> firefox-102.3.0esr-xh.xpi )
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	desktop	7eb20ad915a0a318176d51bc2508ff5c	flag-o-matic	29a755b1291d64133634d80b0328f153	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	bbfa385d6907d7948d49a5e107bd654d	llvm	29d5332b8530fb760c2ca71ad6706858	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=75ae4e30ca0d3c3e95e1114d7c2d5a35
diff --git a/metadata/md5-cache/www-client/firefox-102.4.0 b/metadata/md5-cache/www-client/firefox-102.4.0
index a7470f505bd6..5fd19e97b274 100644
--- a/metadata/md5-cache/www-client/firefox-102.4.0
+++ b/metadata/md5-cache/www-client/firefox-102.4.0
@@ -7,11 +7,11 @@ HOMEPAGE=https://www.mozilla.com/firefox
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=autotools check-reqs desktop flag-o-matic gnome2-utils linux-info llvm multiprocessing pax-utils python-any-r1 toolchain-funcs virtualx xdg
 IUSE=+clang cpu_flags_arm_neon dbus debug eme-free hardened hwaccel jack libproxy lto +openh264 pgo pulseaudio sndio selinux +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent +system-libvpx system-png system-python-libs +system-webp wayland wifi geckodriver +gmp-autoupdate screencast l10n_af l10n_ar l10n_ast l10n_be l10n_bg l10n_br l10n_ca l10n_cak l10n_cs l10n_cy l10n_da l10n_de l10n_dsb l10n_el l10n_en-CA l10n_en-GB l10n_es-AR l10n_es-ES l10n_et l10n_eu l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_he l10n_hr l10n_hsb l10n_hu l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_kab l10n_kk l10n_ko l10n_lt l10n_lv l10n_ms l10n_nb l10n_nl l10n_nn l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_sk l10n_sl l10n_sq l10n_sr l10n_sv l10n_th l10n_tr l10n_uk l10n_uz l10n_vi l10n_zh-CN l10n_zh-TW l10n_ach l10n_an l10n_az l10n_bn l10n_bs l10n_ca-valencia l10n_eo l10n_es-CL l10n_es-MX l10n_fa l10n_ff l10n_gn l10n_gu l10n_hi l10n_hy l10n_ia l10n_km l10n_kn l10n_lij l10n_mk l10n_mr l10n_my l10n_ne l10n_oc l10n_sco l10n_si l10n_son l10n_szl l10n_ta l10n_te l10n_tl l10n_trs l10n_ur l10n_xh pgo
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 arm64 ~ppc64 x86
 LICENSE=MPL-2.0 GPL-2 LGPL-2.1
 RDEPEND=!www-client/firefox:0 !www-client/firefox:rapid screencast? ( media-video/pipewire:= ) selinux? ( sec-policy/selinux-mozilla ) || ( >=app-accessibility/at-spi2-core-2.46.0:2 dev-libs/atk ) dev-libs/expat dev-libs/glib:2 dev-libs/libffi:= >=dev-libs/nss-3.79.1 >=dev-libs/nspr-4.34 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype media-libs/mesa media-video/ffmpeg sys-libs/zlib virtual/freedesktop-icon-theme virtual/opengl x11-libs/cairo[X] x11-libs/gdk-pixbuf x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXtst x11-libs/libxcb:= x11-libs/libxkbcommon[X] x11-libs/pango x11-libs/pixman dbus? ( dev-libs/dbus-glib sys-apps/dbus ) jack? ( virtual/jack ) libproxy? ( net-libs/libproxy ) sndio? ( >=media-sound/sndio-1.8.0-r1 ) system-av1? ( >=media-libs/dav1d-1.0.0:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-gfx/graphite2-1.3.13 >=media-libs/harfbuzz-2.8.1:0= ) system-icu? ( >=dev-libs/icu-71.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] ) system-png? ( >=media-libs/libpng-1.6.35:0=[apng] ) system-webp? ( >=media-libs/libwebp-1.1.0:0= ) wayland? ( x11-libs/gtk+:3[wayland] x11-libs/libdrm x11-libs/libxkbcommon[wayland] ) wifi? ( kernel_linux? ( dev-libs/dbus-glib net-misc/networkmanager sys-apps/dbus ) ) jack? ( virtual/jack ) openh264? ( media-libs/openh264:*[plugin] ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.12-r4 ) )
 REQUIRED_USE=debug? ( !system-av1 ) pgo? ( lto ) wayland? ( dbus ) wifi? ( dbus ) screencast? ( wayland )
 SLOT=esr
 SRC_URI=https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/source/firefox-102.4.0esr.source.tar.xz -> firefox-102.4.0esr.source.tar.xz https://dev.gentoo.org/~juippis/mozilla/patchsets/firefox-102esr-patches-04j.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-102esr-patches-04j.tar.xz https://dev.gentoo.org/~slashbeast/mozilla/patchsets/firefox-102esr-patches-04j.tar.xz l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/af.xpi -> firefox-102.4.0esr-af.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/ar.xpi -> firefox-102.4.0esr-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/ast.xpi -> firefox-102.4.0esr-ast.xpi ) l10n_be? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/be.xpi -> firefox-102.4.0esr-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/bg.xpi -> firefox-102.4.0esr-bg.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/br.xpi -> firefox-102.4.0esr-br.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/ca.xpi -> firefox-102.4.0esr-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/cak.xpi -> firefox-102.4.0esr-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/cs.xpi -> firefox-102.4.0esr-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/cy.xpi -> firefox-102.4.0esr-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/da.xpi -> firefox-102.4.0esr-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/de.xpi -> firefox-102.4.0esr-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/dsb.xpi -> firefox-102.4.0esr-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/el.xpi -> firefox-102.4.0esr-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/en-CA.xpi -> firefox-102.4.0esr-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/en-GB.xpi -> firefox-102.4.0esr-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/es-AR.xpi -> firefox-102.4.0esr-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/es-ES.xpi -> firefox-102.4.0esr-es-ES.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/et.xpi -> firefox-102.4.0esr-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/eu.xpi -> firefox-102.4.0esr-eu.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/fi.xpi -> firefox-102.4.0esr-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/fr.xpi -> firefox-102.4.0esr-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/fy-NL.xpi -> firefox-102.4.0esr-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/ga-IE.xpi -> firefox-102.4.0esr-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/gd.xpi -> firefox-102.4.0esr-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/gl.xpi -> firefox-102.4.0esr-gl.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/he.xpi -> firefox-102.4.0esr-he.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/hr.xpi -> firefox-102.4.0esr-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/hsb.xpi -> firefox-102.4.0esr-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/hu.xpi -> firefox-102.4.0esr-hu.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/id.xpi -> firefox-102.4.0esr-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/is.xpi -> firefox-102.4.0esr-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/it.xpi -> firefox-102.4.0esr-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/ja.xpi -> firefox-102.4.0esr-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/ka.xpi -> firefox-102.4.0esr-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/kab.xpi -> firefox-102.4.0esr-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/kk.xpi -> firefox-102.4.0esr-kk.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/ko.xpi -> firefox-102.4.0esr-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/lt.xpi -> firefox-102.4.0esr-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/lv.xpi -> firefox-102.4.0esr-lv.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/ms.xpi -> firefox-102.4.0esr-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/nb-NO.xpi -> firefox-102.4.0esr-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/nl.xpi -> firefox-102.4.0esr-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/nn-NO.xpi -> firefox-102.4.0esr-nn-NO.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/pa-IN.xpi -> firefox-102.4.0esr-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/pl.xpi -> firefox-102.4.0esr-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/pt-BR.xpi -> firefox-102.4.0esr-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/pt-PT.xpi -> firefox-102.4.0esr-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/rm.xpi -> firefox-102.4.0esr-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/ro.xpi -> firefox-102.4.0esr-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/ru.xpi -> firefox-102.4.0esr-ru.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/sk.xpi -> firefox-102.4.0esr-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/sl.xpi -> firefox-102.4.0esr-sl.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/sq.xpi -> firefox-102.4.0esr-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/sr.xpi -> firefox-102.4.0esr-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/sv-SE.xpi -> firefox-102.4.0esr-sv-SE.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/th.xpi -> firefox-102.4.0esr-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/tr.xpi -> firefox-102.4.0esr-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/uk.xpi -> firefox-102.4.0esr-uk.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/uz.xpi -> firefox-102.4.0esr-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/vi.xpi -> firefox-102.4.0esr-vi.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/zh-CN.xpi -> firefox-102.4.0esr-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/zh-TW.xpi -> firefox-102.4.0esr-zh-TW.xpi ) l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/ach.xpi -> firefox-102.4.0esr-ach.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/an.xpi -> firefox-102.4.0esr-an.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/az.xpi -> firefox-102.4.0esr-az.xpi ) l10n_bn? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/bn.xpi -> firefox-102.4.0esr-bn.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/bs.xpi -> firefox-102.4.0esr-bs.xpi ) l10n_ca-valencia? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/ca-valencia.xpi -> firefox-102.4.0esr-ca-valencia.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/eo.xpi -> firefox-102.4.0esr-eo.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/es-CL.xpi -> firefox-102.4.0esr-es-CL.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/es-MX.xpi -> firefox-102.4.0esr-es-MX.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/fa.xpi -> firefox-102.4.0esr-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/ff.xpi -> firefox-102.4.0esr-ff.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/gn.xpi -> firefox-102.4.0esr-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/gu-IN.xpi -> firefox-102.4.0esr-gu-IN.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/hi-IN.xpi -> firefox-102.4.0esr-hi-IN.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/hy-AM.xpi -> firefox-102.4.0esr-hy-AM.xpi ) l10n_ia? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/ia.xpi -> firefox-102.4.0esr-ia.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/km.xpi -> firefox-102.4.0esr-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/kn.xpi -> firefox-102.4.0esr-kn.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/lij.xpi -> firefox-102.4.0esr-lij.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/mk.xpi -> firefox-102.4.0esr-mk.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/mr.xpi -> firefox-102.4.0esr-mr.xpi ) l10n_my? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/my.xpi -> firefox-102.4.0esr-my.xpi ) l10n_ne? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/ne-NP.xpi -> firefox-102.4.0esr-ne-NP.xpi ) l10n_oc? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/oc.xpi -> firefox-102.4.0esr-oc.xpi ) l10n_sco? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/sco.xpi -> firefox-102.4.0esr-sco.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/si.xpi -> firefox-102.4.0esr-si.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/son.xpi -> firefox-102.4.0esr-son.xpi ) l10n_szl? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/szl.xpi -> firefox-102.4.0esr-szl.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/ta.xpi -> firefox-102.4.0esr-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/te.xpi -> firefox-102.4.0esr-te.xpi ) l10n_tl? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/tl.xpi -> firefox-102.4.0esr-tl.xpi ) l10n_trs? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/trs.xpi -> firefox-102.4.0esr-trs.xpi ) l10n_ur? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/ur.xpi -> firefox-102.4.0esr-ur.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/xh.xpi -> firefox-102.4.0esr-xh.xpi )
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	desktop	7eb20ad915a0a318176d51bc2508ff5c	flag-o-matic	29a755b1291d64133634d80b0328f153	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	bbfa385d6907d7948d49a5e107bd654d	llvm	29d5332b8530fb760c2ca71ad6706858	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=99b2d024469103c5be8e3e5cc4a739b4
+_md5_=bd93f24d9a6dcca4108663283818adb6
diff --git a/metadata/md5-cache/www-client/firefox-105.0.2 b/metadata/md5-cache/www-client/firefox-105.0.2
deleted file mode 100644
index ef985184a628..000000000000
--- a/metadata/md5-cache/www-client/firefox-105.0.2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.11.0_beta4:3.11[ncurses,sqlite,ssl] >=dev-lang/python-3.10.4:3.10[ncurses,sqlite,ssl] >=dev-lang/python-3.9.12:3.9[ncurses,sqlite,ssl] >=dev-lang/python-3.8.13:3.8[ncurses,sqlite,ssl] ) app-arch/unzip app-arch/zip >=dev-util/cbindgen-0.24.3 net-libs/nodejs virtual/pkgconfig >=virtual/rust-1.61.0 || ( ( sys-devel/clang:14 sys-devel/llvm:14 clang? ( =sys-devel/lld-14* pgo? ( =sys-libs/compiler-rt-sanitizers-14*[profile] ) ) ) ( sys-devel/clang:13 sys-devel/llvm:13 clang? ( =sys-devel/lld-13* pgo? ( =sys-libs/compiler-rt-sanitizers-13*[profile] ) ) ) ) amd64? ( >=dev-lang/nasm-2.14 ) x86? ( >=dev-lang/nasm-2.14 ) pgo? ( X? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) wayland? ( >=gui-libs/wlroots-0.15.1-r1[tinywl] x11-misc/xkeyboard-config ) ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) ~sys-devel/autoconf-2.13 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup unpack
-DEPEND=!www-client/firefox:0 !www-client/firefox:esr screencast? ( media-video/pipewire:= ) selinux? ( sec-policy/selinux-mozilla ) || ( >=app-accessibility/at-spi2-core-2.46.0:2 dev-libs/atk ) dev-libs/expat dev-libs/glib:2 dev-libs/libffi:= >=dev-libs/nss-3.82 >=dev-libs/nspr-4.34.1 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype media-libs/mesa media-video/ffmpeg sys-libs/zlib virtual/freedesktop-icon-theme x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/pango x11-libs/pixman dbus? ( dev-libs/dbus-glib sys-apps/dbus ) jack? ( virtual/jack ) libproxy? ( net-libs/libproxy ) selinux? ( sec-policy/selinux-mozilla ) sndio? ( >=media-sound/sndio-1.8.0-r1 ) screencast? ( media-video/pipewire:= ) system-av1? ( >=media-libs/dav1d-1.0.0:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-gfx/graphite2-1.3.13 >=media-libs/harfbuzz-2.8.1:0= ) system-icu? ( >=dev-libs/icu-71.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] ) system-png? ( >=media-libs/libpng-1.6.35:0=[apng] ) system-webp? ( >=media-libs/libwebp-1.1.0:0= ) wayland? ( >=media-libs/libepoxy-1.5.10-r1 x11-libs/gtk+:3[wayland] x11-libs/libdrm x11-libs/libxkbcommon[wayland] ) wifi? ( kernel_linux? ( dev-libs/dbus-glib net-misc/networkmanager sys-apps/dbus ) ) X? ( virtual/opengl x11-libs/cairo[X] x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libxkbcommon[X] x11-libs/libXrandr x11-libs/libXtst x11-libs/libxcb:= ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.12-r4[sdk] ) ) X? ( x11-libs/libICE x11-libs/libSM ) !!sys-devel/llvm:0
-DESCRIPTION=Firefox Web Browser
-EAPI=8
-HOMEPAGE=https://www.mozilla.com/firefox
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=autotools check-reqs desktop flag-o-matic gnome2-utils linux-info llvm multiprocessing pax-utils python-any-r1 toolchain-funcs virtualx xdg
-IUSE=+clang cpu_flags_arm_neon dbus debug eme-free hardened hwaccel jack libproxy lto +openh264 pgo pulseaudio sndio selinux +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent +system-libvpx system-png system-python-libs +system-webp wayland wifi geckodriver +gmp-autoupdate screencast +X l10n_af l10n_ar l10n_ast l10n_be l10n_bg l10n_br l10n_ca l10n_cak l10n_cs l10n_cy l10n_da l10n_de l10n_dsb l10n_el l10n_en-CA l10n_en-GB l10n_es-AR l10n_es-ES l10n_et l10n_eu l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_he l10n_hr l10n_hsb l10n_hu l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_kab l10n_kk l10n_ko l10n_lt l10n_lv l10n_ms l10n_nb l10n_nl l10n_nn l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_sk l10n_sl l10n_sq l10n_sr l10n_sv l10n_th l10n_tr l10n_uk l10n_uz l10n_vi l10n_zh-CN l10n_zh-TW l10n_ach l10n_an l10n_az l10n_bn l10n_bs l10n_ca-valencia l10n_eo l10n_es-CL l10n_es-MX l10n_fa l10n_ff l10n_gn l10n_gu l10n_hi l10n_hy l10n_ia l10n_km l10n_kn l10n_lij l10n_mk l10n_mr l10n_my l10n_ne l10n_oc l10n_sco l10n_si l10n_son l10n_szl l10n_ta l10n_te l10n_tl l10n_trs l10n_ur l10n_xh
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=MPL-2.0 GPL-2 LGPL-2.1
-RDEPEND=!www-client/firefox:0 !www-client/firefox:esr screencast? ( media-video/pipewire:= ) selinux? ( sec-policy/selinux-mozilla ) || ( >=app-accessibility/at-spi2-core-2.46.0:2 dev-libs/atk ) dev-libs/expat dev-libs/glib:2 dev-libs/libffi:= >=dev-libs/nss-3.82 >=dev-libs/nspr-4.34.1 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype media-libs/mesa media-video/ffmpeg sys-libs/zlib virtual/freedesktop-icon-theme x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/pango x11-libs/pixman dbus? ( dev-libs/dbus-glib sys-apps/dbus ) jack? ( virtual/jack ) libproxy? ( net-libs/libproxy ) selinux? ( sec-policy/selinux-mozilla ) sndio? ( >=media-sound/sndio-1.8.0-r1 ) screencast? ( media-video/pipewire:= ) system-av1? ( >=media-libs/dav1d-1.0.0:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-gfx/graphite2-1.3.13 >=media-libs/harfbuzz-2.8.1:0= ) system-icu? ( >=dev-libs/icu-71.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] ) system-png? ( >=media-libs/libpng-1.6.35:0=[apng] ) system-webp? ( >=media-libs/libwebp-1.1.0:0= ) wayland? ( >=media-libs/libepoxy-1.5.10-r1 x11-libs/gtk+:3[wayland] x11-libs/libdrm x11-libs/libxkbcommon[wayland] ) wifi? ( kernel_linux? ( dev-libs/dbus-glib net-misc/networkmanager sys-apps/dbus ) ) X? ( virtual/opengl x11-libs/cairo[X] x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libxkbcommon[X] x11-libs/libXrandr x11-libs/libXtst x11-libs/libxcb:= ) jack? ( virtual/jack ) openh264? ( media-libs/openh264:*[plugin] ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.12-r4 ) )
-REQUIRED_USE=debug? ( !system-av1 ) pgo? ( lto ) wifi? ( dbus ) || ( X wayland ) screencast? ( wayland )
-SLOT=rapid
-SRC_URI=https://archive.mozilla.org/pub/firefox/releases/105.0.2/source/firefox-105.0.2.source.tar.xz -> firefox-105.0.2.source.tar.xz https://dev.gentoo.org/~juippis/mozilla/patchsets/firefox-105-patches-05j.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-105-patches-05j.tar.xz https://dev.gentoo.org/~slashbeast/mozilla/patchsets/firefox-105-patches-05j.tar.xz l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/af.xpi -> firefox-105.0.2-af.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/ar.xpi -> firefox-105.0.2-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/ast.xpi -> firefox-105.0.2-ast.xpi ) l10n_be? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/be.xpi -> firefox-105.0.2-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/bg.xpi -> firefox-105.0.2-bg.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/br.xpi -> firefox-105.0.2-br.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/ca.xpi -> firefox-105.0.2-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/cak.xpi -> firefox-105.0.2-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/cs.xpi -> firefox-105.0.2-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/cy.xpi -> firefox-105.0.2-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/da.xpi -> firefox-105.0.2-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/de.xpi -> firefox-105.0.2-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/dsb.xpi -> firefox-105.0.2-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/el.xpi -> firefox-105.0.2-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/en-CA.xpi -> firefox-105.0.2-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/en-GB.xpi -> firefox-105.0.2-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/es-AR.xpi -> firefox-105.0.2-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/es-ES.xpi -> firefox-105.0.2-es-ES.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/et.xpi -> firefox-105.0.2-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/eu.xpi -> firefox-105.0.2-eu.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/fi.xpi -> firefox-105.0.2-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/fr.xpi -> firefox-105.0.2-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/fy-NL.xpi -> firefox-105.0.2-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/ga-IE.xpi -> firefox-105.0.2-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/gd.xpi -> firefox-105.0.2-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/gl.xpi -> firefox-105.0.2-gl.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/he.xpi -> firefox-105.0.2-he.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/hr.xpi -> firefox-105.0.2-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/hsb.xpi -> firefox-105.0.2-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/hu.xpi -> firefox-105.0.2-hu.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/id.xpi -> firefox-105.0.2-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/is.xpi -> firefox-105.0.2-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/it.xpi -> firefox-105.0.2-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/ja.xpi -> firefox-105.0.2-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/ka.xpi -> firefox-105.0.2-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/kab.xpi -> firefox-105.0.2-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/kk.xpi -> firefox-105.0.2-kk.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/ko.xpi -> firefox-105.0.2-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/lt.xpi -> firefox-105.0.2-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/lv.xpi -> firefox-105.0.2-lv.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/ms.xpi -> firefox-105.0.2-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/nb-NO.xpi -> firefox-105.0.2-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/nl.xpi -> firefox-105.0.2-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/nn-NO.xpi -> firefox-105.0.2-nn-NO.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/pa-IN.xpi -> firefox-105.0.2-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/pl.xpi -> firefox-105.0.2-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/pt-BR.xpi -> firefox-105.0.2-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/pt-PT.xpi -> firefox-105.0.2-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/rm.xpi -> firefox-105.0.2-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/ro.xpi -> firefox-105.0.2-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/ru.xpi -> firefox-105.0.2-ru.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/sk.xpi -> firefox-105.0.2-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/sl.xpi -> firefox-105.0.2-sl.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/sq.xpi -> firefox-105.0.2-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/sr.xpi -> firefox-105.0.2-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/sv-SE.xpi -> firefox-105.0.2-sv-SE.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/th.xpi -> firefox-105.0.2-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/tr.xpi -> firefox-105.0.2-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/uk.xpi -> firefox-105.0.2-uk.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/uz.xpi -> firefox-105.0.2-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/vi.xpi -> firefox-105.0.2-vi.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/zh-CN.xpi -> firefox-105.0.2-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/zh-TW.xpi -> firefox-105.0.2-zh-TW.xpi ) l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/ach.xpi -> firefox-105.0.2-ach.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/an.xpi -> firefox-105.0.2-an.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/az.xpi -> firefox-105.0.2-az.xpi ) l10n_bn? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/bn.xpi -> firefox-105.0.2-bn.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/bs.xpi -> firefox-105.0.2-bs.xpi ) l10n_ca-valencia? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/ca-valencia.xpi -> firefox-105.0.2-ca-valencia.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/eo.xpi -> firefox-105.0.2-eo.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/es-CL.xpi -> firefox-105.0.2-es-CL.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/es-MX.xpi -> firefox-105.0.2-es-MX.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/fa.xpi -> firefox-105.0.2-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/ff.xpi -> firefox-105.0.2-ff.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/gn.xpi -> firefox-105.0.2-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/gu-IN.xpi -> firefox-105.0.2-gu-IN.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/hi-IN.xpi -> firefox-105.0.2-hi-IN.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/hy-AM.xpi -> firefox-105.0.2-hy-AM.xpi ) l10n_ia? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/ia.xpi -> firefox-105.0.2-ia.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/km.xpi -> firefox-105.0.2-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/kn.xpi -> firefox-105.0.2-kn.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/lij.xpi -> firefox-105.0.2-lij.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/mk.xpi -> firefox-105.0.2-mk.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/mr.xpi -> firefox-105.0.2-mr.xpi ) l10n_my? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/my.xpi -> firefox-105.0.2-my.xpi ) l10n_ne? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/ne-NP.xpi -> firefox-105.0.2-ne-NP.xpi ) l10n_oc? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/oc.xpi -> firefox-105.0.2-oc.xpi ) l10n_sco? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/sco.xpi -> firefox-105.0.2-sco.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/si.xpi -> firefox-105.0.2-si.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/son.xpi -> firefox-105.0.2-son.xpi ) l10n_szl? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/szl.xpi -> firefox-105.0.2-szl.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/ta.xpi -> firefox-105.0.2-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/te.xpi -> firefox-105.0.2-te.xpi ) l10n_tl? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/tl.xpi -> firefox-105.0.2-tl.xpi ) l10n_trs? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/trs.xpi -> firefox-105.0.2-trs.xpi ) l10n_ur? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/ur.xpi -> firefox-105.0.2-ur.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/105.0.2/linux-x86_64/xpi/xh.xpi -> firefox-105.0.2-xh.xpi )
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	desktop	7eb20ad915a0a318176d51bc2508ff5c	flag-o-matic	29a755b1291d64133634d80b0328f153	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	bbfa385d6907d7948d49a5e107bd654d	llvm	29d5332b8530fb760c2ca71ad6706858	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=56b0a8892f87e12697700d956b89e936
diff --git a/metadata/md5-cache/www-client/firefox-106.0 b/metadata/md5-cache/www-client/firefox-106.0
deleted file mode 100644
index b381d6d8ba8e..000000000000
--- a/metadata/md5-cache/www-client/firefox-106.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.11.0_beta4:3.11[ncurses,sqlite,ssl] >=dev-lang/python-3.10.4:3.10[ncurses,sqlite,ssl] >=dev-lang/python-3.9.12:3.9[ncurses,sqlite,ssl] >=dev-lang/python-3.8.13:3.8[ncurses,sqlite,ssl] ) app-arch/unzip app-arch/zip >=dev-util/cbindgen-0.24.3 net-libs/nodejs virtual/pkgconfig >=virtual/rust-1.61.0 || ( ( sys-devel/clang:14 sys-devel/llvm:14 clang? ( sys-devel/lld:14 pgo? ( =sys-libs/compiler-rt-sanitizers-14*[profile] ) ) ) ( sys-devel/clang:13 sys-devel/llvm:13 clang? ( sys-devel/lld:13 pgo? ( =sys-libs/compiler-rt-sanitizers-13*[profile] ) ) ) ) amd64? ( >=dev-lang/nasm-2.14 ) x86? ( >=dev-lang/nasm-2.14 ) pgo? ( X? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) wayland? ( >=gui-libs/wlroots-0.15.1-r1[tinywl] x11-misc/xkeyboard-config ) ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) ~sys-devel/autoconf-2.13 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup unpack
-DEPEND=!www-client/firefox:0 !www-client/firefox:esr screencast? ( media-video/pipewire:= ) selinux? ( sec-policy/selinux-mozilla ) || ( >=app-accessibility/at-spi2-core-2.46.0:2 dev-libs/atk ) dev-libs/expat dev-libs/glib:2 dev-libs/libffi:= >=dev-libs/nss-3.83 >=dev-libs/nspr-4.35 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype media-libs/mesa media-video/ffmpeg sys-libs/zlib virtual/freedesktop-icon-theme x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/pango x11-libs/pixman dbus? ( dev-libs/dbus-glib sys-apps/dbus ) jack? ( virtual/jack ) libproxy? ( net-libs/libproxy ) selinux? ( sec-policy/selinux-mozilla ) sndio? ( >=media-sound/sndio-1.8.0-r1 ) screencast? ( media-video/pipewire:= ) system-av1? ( >=media-libs/dav1d-1.0.0:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-gfx/graphite2-1.3.13 >=media-libs/harfbuzz-2.8.1:0= ) system-icu? ( >=dev-libs/icu-71.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] ) system-png? ( >=media-libs/libpng-1.6.35:0=[apng] ) system-webp? ( >=media-libs/libwebp-1.1.0:0= ) wayland? ( >=media-libs/libepoxy-1.5.10-r1 x11-libs/gtk+:3[wayland] x11-libs/libdrm x11-libs/libxkbcommon[wayland] ) wifi? ( kernel_linux? ( dev-libs/dbus-glib net-misc/networkmanager sys-apps/dbus ) ) X? ( virtual/opengl x11-libs/cairo[X] x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libxkbcommon[X] x11-libs/libXrandr x11-libs/libXtst x11-libs/libxcb:= ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.12-r4[sdk] ) ) X? ( x11-libs/libICE x11-libs/libSM ) !!sys-devel/llvm:0
-DESCRIPTION=Firefox Web Browser
-EAPI=8
-HOMEPAGE=https://www.mozilla.com/firefox
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=autotools check-reqs desktop flag-o-matic gnome2-utils linux-info llvm multiprocessing pax-utils python-any-r1 toolchain-funcs virtualx xdg
-IUSE=+clang cpu_flags_arm_neon dbus debug eme-free hardened hwaccel jack libproxy lto +openh264 pgo pulseaudio sndio selinux +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent +system-libvpx system-png system-python-libs +system-webp wayland wifi geckodriver +gmp-autoupdate screencast +X l10n_af l10n_ar l10n_ast l10n_be l10n_bg l10n_br l10n_ca l10n_cak l10n_cs l10n_cy l10n_da l10n_de l10n_dsb l10n_el l10n_en-CA l10n_en-GB l10n_es-AR l10n_es-ES l10n_et l10n_eu l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_he l10n_hr l10n_hsb l10n_hu l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_kab l10n_kk l10n_ko l10n_lt l10n_lv l10n_ms l10n_nb l10n_nl l10n_nn l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_sk l10n_sl l10n_sq l10n_sr l10n_sv l10n_th l10n_tr l10n_uk l10n_uz l10n_vi l10n_zh-CN l10n_zh-TW l10n_ach l10n_an l10n_az l10n_bn l10n_bs l10n_ca-valencia l10n_eo l10n_es-CL l10n_es-MX l10n_fa l10n_ff l10n_gn l10n_gu l10n_hi l10n_hy l10n_ia l10n_km l10n_kn l10n_lij l10n_mk l10n_mr l10n_my l10n_ne l10n_oc l10n_sco l10n_si l10n_son l10n_szl l10n_ta l10n_te l10n_tl l10n_trs l10n_ur l10n_xh
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=MPL-2.0 GPL-2 LGPL-2.1
-RDEPEND=!www-client/firefox:0 !www-client/firefox:esr screencast? ( media-video/pipewire:= ) selinux? ( sec-policy/selinux-mozilla ) || ( >=app-accessibility/at-spi2-core-2.46.0:2 dev-libs/atk ) dev-libs/expat dev-libs/glib:2 dev-libs/libffi:= >=dev-libs/nss-3.83 >=dev-libs/nspr-4.35 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype media-libs/mesa media-video/ffmpeg sys-libs/zlib virtual/freedesktop-icon-theme x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/pango x11-libs/pixman dbus? ( dev-libs/dbus-glib sys-apps/dbus ) jack? ( virtual/jack ) libproxy? ( net-libs/libproxy ) selinux? ( sec-policy/selinux-mozilla ) sndio? ( >=media-sound/sndio-1.8.0-r1 ) screencast? ( media-video/pipewire:= ) system-av1? ( >=media-libs/dav1d-1.0.0:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-gfx/graphite2-1.3.13 >=media-libs/harfbuzz-2.8.1:0= ) system-icu? ( >=dev-libs/icu-71.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] ) system-png? ( >=media-libs/libpng-1.6.35:0=[apng] ) system-webp? ( >=media-libs/libwebp-1.1.0:0= ) wayland? ( >=media-libs/libepoxy-1.5.10-r1 x11-libs/gtk+:3[wayland] x11-libs/libdrm x11-libs/libxkbcommon[wayland] ) wifi? ( kernel_linux? ( dev-libs/dbus-glib net-misc/networkmanager sys-apps/dbus ) ) X? ( virtual/opengl x11-libs/cairo[X] x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libxkbcommon[X] x11-libs/libXrandr x11-libs/libXtst x11-libs/libxcb:= ) jack? ( virtual/jack ) openh264? ( media-libs/openh264:*[plugin] ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.12-r4 ) )
-REQUIRED_USE=debug? ( !system-av1 ) pgo? ( lto ) wifi? ( dbus ) || ( X wayland ) screencast? ( wayland )
-SLOT=rapid
-SRC_URI=https://archive.mozilla.org/pub/firefox/releases/106.0/source/firefox-106.0.source.tar.xz -> firefox-106.0.source.tar.xz https://dev.gentoo.org/~juippis/mozilla/patchsets/firefox-106-patches-01j.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-106-patches-01j.tar.xz https://dev.gentoo.org/~slashbeast/mozilla/patchsets/firefox-106-patches-01j.tar.xz l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/xpi/af.xpi -> firefox-106.0-af.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/xpi/ar.xpi -> firefox-106.0-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/xpi/ast.xpi -> firefox-106.0-ast.xpi ) l10n_be? ( https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/xpi/be.xpi -> firefox-106.0-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/xpi/bg.xpi -> firefox-106.0-bg.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/xpi/br.xpi -> firefox-106.0-br.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/xpi/ca.xpi -> firefox-106.0-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/xpi/cak.xpi -> firefox-106.0-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/xpi/cs.xpi -> firefox-106.0-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/xpi/cy.xpi -> firefox-106.0-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/xpi/da.xpi -> firefox-106.0-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/xpi/de.xpi -> firefox-106.0-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/xpi/dsb.xpi -> firefox-106.0-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/xpi/el.xpi -> firefox-106.0-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/xpi/en-CA.xpi -> firefox-106.0-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/xpi/en-GB.xpi -> firefox-106.0-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/xpi/es-AR.xpi -> firefox-106.0-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/xpi/es-ES.xpi -> firefox-106.0-es-ES.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/xpi/et.xpi -> firefox-106.0-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/xpi/eu.xpi -> firefox-106.0-eu.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/xpi/fi.xpi -> firefox-106.0-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/xpi/fr.xpi -> firefox-106.0-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/xpi/fy-NL.xpi -> firefox-106.0-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/xpi/ga-IE.xpi -> firefox-106.0-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/xpi/gd.xpi -> firefox-106.0-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/xpi/gl.xpi -> firefox-106.0-gl.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/xpi/he.xpi -> firefox-106.0-he.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/xpi/hr.xpi -> firefox-106.0-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/xpi/hsb.xpi -> firefox-106.0-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/xpi/hu.xpi -> firefox-106.0-hu.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/xpi/id.xpi -> firefox-106.0-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/xpi/is.xpi -> firefox-106.0-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/xpi/it.xpi -> firefox-106.0-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/xpi/ja.xpi -> firefox-106.0-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/xpi/ka.xpi -> firefox-106.0-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/xpi/kab.xpi -> firefox-106.0-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/xpi/kk.xpi -> firefox-106.0-kk.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/xpi/ko.xpi -> firefox-106.0-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/xpi/lt.xpi -> firefox-106.0-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/xpi/lv.xpi -> firefox-106.0-lv.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/xpi/ms.xpi -> firefox-106.0-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/xpi/nb-NO.xpi -> firefox-106.0-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/xpi/nl.xpi -> firefox-106.0-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/xpi/nn-NO.xpi -> firefox-106.0-nn-NO.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/xpi/pa-IN.xpi -> firefox-106.0-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/xpi/pl.xpi -> firefox-106.0-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/xpi/pt-BR.xpi -> firefox-106.0-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/xpi/pt-PT.xpi -> firefox-106.0-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/xpi/rm.xpi -> firefox-106.0-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/xpi/ro.xpi -> firefox-106.0-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/xpi/ru.xpi -> firefox-106.0-ru.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/xpi/sk.xpi -> firefox-106.0-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/xpi/sl.xpi -> firefox-106.0-sl.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/xpi/sq.xpi -> firefox-106.0-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/xpi/sr.xpi -> firefox-106.0-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/xpi/sv-SE.xpi -> firefox-106.0-sv-SE.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/xpi/th.xpi -> firefox-106.0-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/xpi/tr.xpi -> firefox-106.0-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/xpi/uk.xpi -> firefox-106.0-uk.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/xpi/uz.xpi -> firefox-106.0-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/xpi/vi.xpi -> firefox-106.0-vi.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/xpi/zh-CN.xpi -> firefox-106.0-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/xpi/zh-TW.xpi -> firefox-106.0-zh-TW.xpi ) l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/xpi/ach.xpi -> firefox-106.0-ach.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/xpi/an.xpi -> firefox-106.0-an.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/xpi/az.xpi -> firefox-106.0-az.xpi ) l10n_bn? ( https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/xpi/bn.xpi -> firefox-106.0-bn.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/xpi/bs.xpi -> firefox-106.0-bs.xpi ) l10n_ca-valencia? ( https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/xpi/ca-valencia.xpi -> firefox-106.0-ca-valencia.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/xpi/eo.xpi -> firefox-106.0-eo.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/xpi/es-CL.xpi -> firefox-106.0-es-CL.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/xpi/es-MX.xpi -> firefox-106.0-es-MX.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/xpi/fa.xpi -> firefox-106.0-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/xpi/ff.xpi -> firefox-106.0-ff.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/xpi/gn.xpi -> firefox-106.0-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/xpi/gu-IN.xpi -> firefox-106.0-gu-IN.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/xpi/hi-IN.xpi -> firefox-106.0-hi-IN.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/xpi/hy-AM.xpi -> firefox-106.0-hy-AM.xpi ) l10n_ia? ( https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/xpi/ia.xpi -> firefox-106.0-ia.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/xpi/km.xpi -> firefox-106.0-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/xpi/kn.xpi -> firefox-106.0-kn.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/xpi/lij.xpi -> firefox-106.0-lij.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/xpi/mk.xpi -> firefox-106.0-mk.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/xpi/mr.xpi -> firefox-106.0-mr.xpi ) l10n_my? ( https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/xpi/my.xpi -> firefox-106.0-my.xpi ) l10n_ne? ( https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/xpi/ne-NP.xpi -> firefox-106.0-ne-NP.xpi ) l10n_oc? ( https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/xpi/oc.xpi -> firefox-106.0-oc.xpi ) l10n_sco? ( https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/xpi/sco.xpi -> firefox-106.0-sco.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/xpi/si.xpi -> firefox-106.0-si.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/xpi/son.xpi -> firefox-106.0-son.xpi ) l10n_szl? ( https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/xpi/szl.xpi -> firefox-106.0-szl.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/xpi/ta.xpi -> firefox-106.0-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/xpi/te.xpi -> firefox-106.0-te.xpi ) l10n_tl? ( https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/xpi/tl.xpi -> firefox-106.0-tl.xpi ) l10n_trs? ( https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/xpi/trs.xpi -> firefox-106.0-trs.xpi ) l10n_ur? ( https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/xpi/ur.xpi -> firefox-106.0-ur.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/xpi/xh.xpi -> firefox-106.0-xh.xpi )
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	desktop	7eb20ad915a0a318176d51bc2508ff5c	flag-o-matic	29a755b1291d64133634d80b0328f153	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	bbfa385d6907d7948d49a5e107bd654d	llvm	29d5332b8530fb760c2ca71ad6706858	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=6219fd33a73b9525f95ccb36996629eb
diff --git a/metadata/md5-cache/x11-base/Manifest.gz b/metadata/md5-cache/x11-base/Manifest.gz
index f620a62ab9a3..83e0a4e3abda 100644
Binary files a/metadata/md5-cache/x11-base/Manifest.gz and b/metadata/md5-cache/x11-base/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-base/xwayland-22.1.4 b/metadata/md5-cache/x11-base/xwayland-22.1.4
new file mode 100644
index 000000000000..ba3c0a506ded
--- /dev/null
+++ b/metadata/md5-cache/x11-base/xwayland-22.1.4
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/flex 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=dev-libs/libbsd dev-libs/openssl:= >=dev-libs/wayland-1.20 >=dev-libs/wayland-protocols-1.22 media-fonts/font-util >=media-libs/libepoxy-1.5.4[X,egl(+)] media-libs/libglvnd[X] >=media-libs/mesa-21.1[X(+),egl(+),gbm(+)] >=x11-libs/libdrm-2.4.89 >=x11-libs/libXau-1.0.4 x11-libs/libxcvt >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont2-2.0.1 x11-libs/libxkbfile >=x11-libs/libxshmfence-1.1 >=x11-libs/pixman-0.27.2 >=x11-misc/xkeyboard-config-2.4.1-r3 unwind? ( sys-libs/libunwind ) video_cards_nvidia? ( gui-libs/egl-wayland ) x11-base/xorg-proto >=x11-libs/xtrans-1.3.5
+DESCRIPTION=Standalone X server running under Wayland
+EAPI=8
+HOMEPAGE=https://wayland.freedesktop.org/xserver.html
+INHERIT=meson
+IUSE=selinux video_cards_nvidia unwind xcsecurity
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=dev-libs/libbsd dev-libs/openssl:= >=dev-libs/wayland-1.20 >=dev-libs/wayland-protocols-1.22 media-fonts/font-util >=media-libs/libepoxy-1.5.4[X,egl(+)] media-libs/libglvnd[X] >=media-libs/mesa-21.1[X(+),egl(+),gbm(+)] >=x11-libs/libdrm-2.4.89 >=x11-libs/libXau-1.0.4 x11-libs/libxcvt >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont2-2.0.1 x11-libs/libxkbfile >=x11-libs/libxshmfence-1.1 >=x11-libs/pixman-0.27.2 >=x11-misc/xkeyboard-config-2.4.1-r3 unwind? ( sys-libs/libunwind ) video_cards_nvidia? ( gui-libs/egl-wayland ) x11-apps/xkbcomp !<=x11-base/xorg-server-1.20.11 selinux? ( sec-policy/selinux-xserver )
+SLOT=0
+SRC_URI=https://xorg.freedesktop.org/archive/individual/xserver/xwayland-22.1.4.tar.xz
+_eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=eef35da6e842e56a006c53a8511bc9ff
diff --git a/metadata/md5-cache/x11-drivers/Manifest.gz b/metadata/md5-cache/x11-drivers/Manifest.gz
index 06d6b2b979e5..ba8a09f8ef64 100644
Binary files a/metadata/md5-cache/x11-drivers/Manifest.gz and b/metadata/md5-cache/x11-drivers/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-515.49.19 b/metadata/md5-cache/x11-drivers/nvidia-drivers-515.49.24
similarity index 93%
rename from metadata/md5-cache/x11-drivers/nvidia-drivers-515.49.19
rename to metadata/md5-cache/x11-drivers/nvidia-drivers-515.49.24
index 84169f6d3afc..99b7fa0aacad 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-515.49.19
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-515.49.24
@@ -11,6 +11,6 @@ LICENSE=NVIDIA-r2 BSD BSD-2 GPL-2 MIT ZLIB curl openssl
 RDEPEND=acct-group/video sys-libs/glibc X? ( x11-libs/libpciaccess ) persistenced? ( acct-user/nvpd net-libs/libtirpc:= ) tools? ( || ( >=app-accessibility/at-spi2-core-2.46:2 dev-libs/atk ) dev-libs/glib:2 dev-libs/jansson:= media-libs/harfbuzz:= x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm x11-libs/pango ) X? ( media-libs/libglvnd[X,abi_x86_32(-)?] x11-libs/libX11[abi_x86_32(-)?] x11-libs/libXext[abi_x86_32(-)?] ) wayland? ( gui-libs/egl-gbm >=gui-libs/egl-wayland-1.1.10 media-libs/libglvnd ) driver? ( kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) )
 REQUIRED_USE=kernel-open? ( driver )
 SLOT=0/vulkan
-SRC_URI=https://developer.nvidia.com/vulkan-beta-5154919-linux -> NVIDIA-Linux-x86_64-515.49.19.run https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-515.65.01.tar.bz2 https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-515.65.01.tar.bz2 https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-515.65.01.tar.bz2 https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-515.65.01.tar.bz2 https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-515.65.01.tar.bz2 https://github.com/NVIDIA/open-gpu-kernel-modules/archive/refs/tags/515.49.19.tar.gz -> open-gpu-kernel-modules-515.49.19.tar.gz
+SRC_URI=https://developer.nvidia.com/vulkan-beta-5154924-linux -> NVIDIA-Linux-x86_64-515.49.24.run https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-515.65.01.tar.bz2 https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-515.65.01.tar.bz2 https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-515.65.01.tar.bz2 https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-515.65.01.tar.bz2 https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-515.65.01.tar.bz2 https://github.com/NVIDIA/open-gpu-kernel-modules/archive/refs/tags/515.49.24.tar.gz -> open-gpu-kernel-modules-515.49.24.tar.gz
 _eclasses_=desktop	7eb20ad915a0a318176d51bc2508ff5c	flag-o-matic	29a755b1291d64133634d80b0328f153	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	3167123d17b3550117c7e554fd22ca02	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	unpacker	bc57272a0491765c71d973c8cfd35063	user-info	69a1ed744ec33cf2c910ff2bd6084d11
 _md5_=423c793a84045cee835a815c66255c15
diff --git a/metadata/md5-cache/x11-libs/Manifest.gz b/metadata/md5-cache/x11-libs/Manifest.gz
index 4858b9957a57..90341e68cfc2 100644
Binary files a/metadata/md5-cache/x11-libs/Manifest.gz and b/metadata/md5-cache/x11-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-libs/gdk-pixbuf-2.42.10 b/metadata/md5-cache/x11-libs/gdk-pixbuf-2.42.10
new file mode 100644
index 000000000000..8c61c67622cc
--- /dev/null
+++ b/metadata/md5-cache/x11-libs/gdk-pixbuf-2.42.10
@@ -0,0 +1,17 @@
+BDEPEND=gtk-doc? ( >=dev-util/gi-docgen-2021.1 ) app-text/docbook-xsl-stylesheets app-text/docbook-xml-dtd:4.3 dev-libs/glib:2 dev-libs/libxslt dev-python/docutils dev-util/glib-utils >=sys-devel/gettext-0.19.8 virtual/pkgconfig 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 test
+DEPEND=>=dev-libs/glib-2.56.0: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-misc/shared-mime-info >=media-libs/libpng-1.4: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(-)?] jpeg? ( media-libs/libjpeg-turbo: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(-)?] ) tiff? ( >=media-libs/tiff-3.9.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(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+DESCRIPTION=Image loading library for GTK+
+EAPI=8
+HOMEPAGE=https://gitlab.gnome.org/GNOME/gdk-pixbuf
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=gnome.org gnome2-utils meson-multilib multilib xdg
+IUSE=gtk-doc +introspection jpeg test tiff 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
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-libs/glib-2.56.0: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-misc/shared-mime-info >=media-libs/libpng-1.4: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(-)?] jpeg? ( media-libs/libjpeg-turbo: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(-)?] ) tiff? ( >=media-libs/tiff-3.9.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(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+RESTRICT=!test? ( test )
+SLOT=2
+SRC_URI=mirror://gnome/sources/gdk-pixbuf/2.42/gdk-pixbuf-2.42.10.tar.xz
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=77b14a739fc83bfbca88806c1e82be2b
diff --git a/metadata/md5-cache/x11-libs/libXrender-0.9.11 b/metadata/md5-cache/x11-libs/libXrender-0.9.11
new file mode 100644
index 000000000000..354891c54b7c
--- /dev/null
+++ b/metadata/md5-cache/x11-libs/libXrender-0.9.11
@@ -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 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=>=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-base/xorg-proto
+DESCRIPTION=X.Org Xrender library
+EAPI=8
+HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/lib/libXrender
+INHERIT=xorg-3
+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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+LICENSE=MIT
+RDEPEND=>=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=0
+SRC_URI=https://www.x.org/releases/individual/lib/libXrender-0.9.11.tar.xz
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xorg-3	38a663574d97f06b6b729046865c8fb6
+_md5_=139c845a57548d046ac895a8d3e974bd
diff --git a/metadata/md5-cache/x11-libs/vte-0.70.1 b/metadata/md5-cache/x11-libs/vte-0.70.1
new file mode 100644
index 000000000000..085a302047a8
--- /dev/null
+++ b/metadata/md5-cache/x11-libs/vte-0.70.1
@@ -0,0 +1,17 @@
+BDEPEND=|| ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) dev-libs/libxml2:2 dev-util/glib-utils gtk-doc? ( dev-util/gi-docgen ) >=sys-devel/gettext-0.19.8 virtual/pkgconfig 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
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=>=x11-libs/gtk+-3.24.22:3[introspection?] >=dev-libs/fribidi-1.0.0 >=dev-libs/glib-2.52:2 crypt? ( >=net-libs/gnutls-3.2.7:0= ) icu? ( dev-libs/icu:= ) >=x11-libs/pango-1.22.0 >=dev-libs/libpcre2-10.21:= systemd? ( >=sys-apps/systemd-220:= ) sys-libs/zlib introspection? ( >=dev-libs/gobject-introspection-1.56:= ) x11-libs/pango[introspection?]
+DESCRIPTION=Library providing a virtual terminal emulator widget
+EAPI=8
+HOMEPAGE=https://wiki.gnome.org/Apps/Terminal/VTE https://gitlab.gnome.org/GNOME/vte
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=gnome.org meson python-any-r1 vala xdg
+IUSE=+crypt debug gtk-doc +icu +introspection systemd +vala vanilla
+KEYWORDS=~amd64
+LICENSE=LGPL-3+ GPL-3+
+RDEPEND=>=x11-libs/gtk+-3.24.22:3[introspection?] >=dev-libs/fribidi-1.0.0 >=dev-libs/glib-2.52:2 crypt? ( >=net-libs/gnutls-3.2.7:0= ) icu? ( dev-libs/icu:= ) >=x11-libs/pango-1.22.0 >=dev-libs/libpcre2-10.21:= systemd? ( >=sys-apps/systemd-220:= ) sys-libs/zlib introspection? ( >=dev-libs/gobject-introspection-1.56:= ) x11-libs/pango[introspection?] ~gui-libs/vte-common-0.70.1[systemd?]
+REQUIRED_USE=gtk-doc? ( introspection ) vala? ( introspection )
+SLOT=2.91
+SRC_URI=https://gitlab.gnome.org/GNOME/vte/-/archive/0.70.1/vte-0.70.1.tar.bz2 !vanilla? ( https://dev.gentoo.org/~mattst88/distfiles/vte-0.70.0-command-notify.patch.xz )
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	vala	160a8a30a6cb9aa601e5441c643a7c61	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=f101fd54b448c037d9f39367eb1457f2
diff --git a/metadata/md5-cache/x11-misc/Manifest.gz b/metadata/md5-cache/x11-misc/Manifest.gz
index b7dce641ea7e..13f22aef7fd9 100644
Binary files a/metadata/md5-cache/x11-misc/Manifest.gz and b/metadata/md5-cache/x11-misc/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-misc/qtfm-6.2.0 b/metadata/md5-cache/x11-misc/qtfm-6.2.0
deleted file mode 100644
index 7be1e8bc34e6..000000000000
--- a/metadata/md5-cache/x11-misc/qtfm-6.2.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-arch/unzip dev-qt/linguist-tools:5
-DEFINED_PHASES=configure install postinst postrm
-DEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 sys-apps/file dbus? ( dev-qt/qtdbus:5 )
-DESCRIPTION=Small, lightweight file manager based on pure Qt
-EAPI=7
-HOMEPAGE=https://qtfm.eu/
-INHERIT=qmake-utils xdg-utils
-IUSE=+dbus shared
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+
-RDEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 sys-apps/file dbus? ( dev-qt/qtdbus:5 )
-SLOT=0
-SRC_URI=https://github.com/rodlie/qtfm/archive/6.2.0.tar.gz -> qtfm-6.2.0.tar.gz
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=440ee9671cfc55d608cc11423062c6a2
diff --git a/metadata/md5-cache/x11-misc/qtfm-6.2.1 b/metadata/md5-cache/x11-misc/qtfm-6.2.1
index bd1831dddecf..23e1266e4270 100644
--- a/metadata/md5-cache/x11-misc/qtfm-6.2.1
+++ b/metadata/md5-cache/x11-misc/qtfm-6.2.1
@@ -7,10 +7,10 @@ HOMEPAGE=https://qtfm.eu/
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=qmake-utils xdg
 IUSE=+dbus shared
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2+
 RDEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 sys-apps/file dbus? ( dev-qt/qtdbus:5 )
 SLOT=0
 SRC_URI=https://github.com/rodlie/qtfm/archive/6.2.1.tar.gz -> qtfm-6.2.1.tar.gz
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=f2ba8a8e25bf2535b30a6ad8844840e8
+_md5_=25534f235988a13a99cf78133bfc7846
diff --git a/metadata/md5-cache/x11-terms/Manifest.gz b/metadata/md5-cache/x11-terms/Manifest.gz
index d0e63b8b8419..37a83da79d38 100644
Binary files a/metadata/md5-cache/x11-terms/Manifest.gz and b/metadata/md5-cache/x11-terms/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-terms/gnome-terminal-3.46.3 b/metadata/md5-cache/x11-terms/gnome-terminal-3.46.3
new file mode 100644
index 000000000000..77dc9d861fd0
--- /dev/null
+++ b/metadata/md5-cache/x11-terms/gnome-terminal-3.46.3
@@ -0,0 +1,16 @@
+BDEPEND=|| ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) dev-libs/libxml2:2 dev-libs/libxslt dev-util/gdbus-codegen dev-util/glib-utils dev-util/itstool >=sys-devel/gettext-0.19.8 virtual/pkgconfig 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=>=dev-libs/glib-2.52:2 >=x11-libs/gtk+-3.22.27:3 >=x11-libs/vte-0.70.0:2.91[!vanilla?] >=dev-libs/libpcre2-10 >=gnome-base/gsettings-desktop-schemas-0.1.0 sys-apps/util-linux gnome-shell? ( gnome-base/gnome-shell ) nautilus? ( >=gnome-base/nautilus-43.0 )
+DESCRIPTION=A terminal emulator for GNOME
+EAPI=8
+HOMEPAGE=https://wiki.gnome.org/Apps/Terminal/ https://gitlab.gnome.org/GNOME/gnome-terminal
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=gnome.org gnome2-utils meson python-any-r1 readme.gentoo-r1 xdg
+IUSE=debug +gnome-shell +nautilus vanilla
+KEYWORDS=~amd64
+LICENSE=GPL-3+
+RDEPEND=>=dev-libs/glib-2.52:2 >=x11-libs/gtk+-3.22.27:3 >=x11-libs/vte-0.70.0:2.91[!vanilla?] >=dev-libs/libpcre2-10 >=gnome-base/gsettings-desktop-schemas-0.1.0 sys-apps/util-linux gnome-shell? ( gnome-base/gnome-shell ) nautilus? ( >=gnome-base/nautilus-43.0 )
+SLOT=0
+SRC_URI=https://gitlab.gnome.org/GNOME/gnome-terminal/-/archive/3.46.3/gnome-terminal-3.46.3.tar.gz !vanilla? ( https://dev.gentoo.org/~mattst88/distfiles/gnome-terminal-3.46.2-cntr-ntfy-autottl-ts.patch.xz )
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=b38b0b69765e63c583ccb68daef0d11c
diff --git a/metadata/md5-cache/x11-terms/xterm-373 b/metadata/md5-cache/x11-terms/xterm-373
deleted file mode 100644
index 54b16a77b506..000000000000
--- a/metadata/md5-cache/x11-terms/xterm-373
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=configure install
-DEPEND=kernel_linux? ( sys-libs/libutempter ) media-libs/fontconfig:1.0 >=sys-libs/ncurses-5.7-r7:0= x11-apps/xmessage x11-libs/libICE x11-libs/libX11 x11-libs/libXaw x11-libs/libXft x11-libs/libxkbfile x11-libs/libXmu x11-libs/libXrender x11-libs/libXt unicode? ( x11-apps/luit ) Xaw3d? ( x11-libs/libXaw3d ) xinerama? ( x11-libs/libXinerama ) x11-base/xorg-proto
-DESCRIPTION=Terminal Emulator for X Windows
-EAPI=8
-HOMEPAGE=https://invisible-island.net/xterm/
-INHERIT=desktop flag-o-matic toolchain-funcs
-IUSE=+openpty sixel toolbar truetype unicode Xaw3d xinerama
-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=MIT
-RDEPEND=kernel_linux? ( sys-libs/libutempter ) media-libs/fontconfig:1.0 >=sys-libs/ncurses-5.7-r7:0= x11-apps/xmessage x11-libs/libICE x11-libs/libX11 x11-libs/libXaw x11-libs/libXft x11-libs/libxkbfile x11-libs/libXmu x11-libs/libXrender x11-libs/libXt unicode? ( x11-apps/luit ) Xaw3d? ( x11-libs/libXaw3d ) xinerama? ( x11-libs/libXinerama ) media-fonts/font-misc-misc x11-apps/rgb
-SLOT=0
-SRC_URI=ftp://ftp.invisible-island.net/xterm/xterm-373.tgz
-_eclasses_=desktop	7eb20ad915a0a318176d51bc2508ff5c	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=4ccba5f16b052bbf893cf5e041ade277
diff --git a/metadata/md5-cache/x11-terms/xterm-374 b/metadata/md5-cache/x11-terms/xterm-375
similarity index 95%
rename from metadata/md5-cache/x11-terms/xterm-374
rename to metadata/md5-cache/x11-terms/xterm-375
index b17b11ef645c..e4aff2ca84bc 100644
--- a/metadata/md5-cache/x11-terms/xterm-374
+++ b/metadata/md5-cache/x11-terms/xterm-375
@@ -10,6 +10,6 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~r
 LICENSE=MIT
 RDEPEND=kernel_linux? ( sys-libs/libutempter ) media-libs/fontconfig:1.0 >=sys-libs/ncurses-5.7-r7:= x11-apps/xmessage x11-libs/libICE x11-libs/libX11 x11-libs/libXaw x11-libs/libXft x11-libs/libxkbfile x11-libs/libXmu x11-libs/libXrender x11-libs/libXt unicode? ( x11-apps/luit ) Xaw3d? ( x11-libs/libXaw3d ) xinerama? ( x11-libs/libXinerama ) media-fonts/font-misc-misc x11-apps/rgb
 SLOT=0
-SRC_URI=https://invisible-island.net/archives/xterm/xterm-374.tgz verify-sig? ( https://invisible-island.net/archives/xterm/xterm-374.tgz.asc )
+SRC_URI=https://invisible-island.net/archives/xterm/xterm-375.tgz verify-sig? ( https://invisible-island.net/archives/xterm/xterm-375.tgz.asc )
 _eclasses_=desktop	7eb20ad915a0a318176d51bc2508ff5c	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	0748d665fa664a87add00152ed046e16
 _md5_=1ca345df4bef15774fb102fa64705227
diff --git a/metadata/md5-cache/xfce-extra/Manifest.gz b/metadata/md5-cache/xfce-extra/Manifest.gz
index 83d85e1ffbd3..86a7f79364f6 100644
Binary files a/metadata/md5-cache/xfce-extra/Manifest.gz and b/metadata/md5-cache/xfce-extra/Manifest.gz differ
diff --git a/metadata/md5-cache/xfce-extra/xfce4-screenshooter-1.9.11 b/metadata/md5-cache/xfce-extra/xfce4-screenshooter-1.9.11
index 620d043f5c21..a84eae7c888c 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-screenshooter-1.9.11
+++ b/metadata/md5-cache/xfce-extra/xfce4-screenshooter-1.9.11
@@ -5,10 +5,10 @@ DESCRIPTION=Xfce4 screenshooter application and panel plugin
 EAPI=8
 HOMEPAGE=https://goodies.xfce.org/projects/applications/xfce4-screenshooter
 INHERIT=xdg-utils
-KEYWORDS=amd64 arm ~arm64 ~ia64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm ~arm64 ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.16:= >=net-libs/libsoup-2.26:= >=x11-libs/gdk-pixbuf-2.16:= >=x11-libs/gtk+-3.20:3= >=x11-libs/pango-1.44:= dev-libs/libxml2:= x11-libs/libX11:= x11-libs/libXext:= x11-libs/libXfixes:= >=xfce-base/exo-0.11:= >=xfce-base/xfce4-panel-4.14:= >=xfce-base/libxfce4util-4.14:= >=xfce-base/libxfce4ui-4.14:=
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/apps/xfce4-screenshooter/1.9/xfce4-screenshooter-1.9.11.tar.bz2
 _eclasses_=xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=5df2e6efb5c4539a5bb517ea7ded2fb1
+_md5_=1bfeeccf2ec6c5ff25fa9890bc653dd1
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 2c1126a98ed8..d1e29e4afc43 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 14053 BLAKE2B c0a5bea7cd069c2e9b07dab158b876c74e027945a8fdd50fee280ec7abb59b03a223e89d53d1563fc784c8a353890e9928577f3cf4c4daaf3eebee6f871aa5c0 SHA512 43691780e35724149b779ecf32c3d83556a2e30fb3c35c56b8841fc4c866de83cb09e4b9be3071940181a4933de197417647dd3921df2f61e100510b23a9e327
-TIMESTAMP 2022-10-24T11:39:42Z
+TIMESTAMP 2022-10-26T04:39:48Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNWeX5fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNYuhRfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBx6A//Vv3CkXb3wdw/j0J4sPw+/8T5hBWGGw+yCfUHxxbPPhBlGPN0byUEh1Wb
-vWUysrBmwMoUusWbLuB8IIH7qatONk5hPo1fuzVWcWxiumNQVJnFIEP2AtaKbrNw
-OsMIXL1QrC/f8P7duJeMYDDGZVh1Gl7BNV13fVmQRH4Ov2zPx+QS5VlNsawMuXgm
-waTfthSuU+4k4TkOVhd3lY3EzpZQblphxEScfc6CQpWRO1KLvK+zzl0CHvJaTarq
-We1XNbUaeuHq7wXs6AxBCH9+TcIzKQzkAxAEeMTTm5JnnOorlAc+2ulnBo4c3gAP
-ThV94Y0e1equOPo9DreP4hiE94boz5hEcfSI4J1lMjuy5GlFfookVECgkOyCxyLH
-B8Bsd3ZIJhh/gChvkCp94eME+7tXPIyjQcKxZkJ0eo4Xf+pN1Nli1dB58c3BmcNY
-xy5+PL8rJyqWxCzoJYOL+p/9g8tZQC68LMamF4dBVq60RO6AD7o3WUg3WNsDTmwA
-BLUThxsiiEb7xIkPgSRSY54973YdYiX+OyR/a1+O1fcyuTgvOQzLklfLDTmsUq03
-Ve/l0EdwRh+1/4H7EROYUOLxsoeIJ73Htsvv+ZBQyecA7ie73WrpxeEA0ddT4wpE
-2hC0AScYPwnbTVKgu381YnN2DGyoysqX2XbxVrCIOFqtO/kZj04=
-=OgUd
+klBABBAAsXQ41DFuD5aCE+GyDh+go2BFZ0Tvrolu/Dsd0GCRep7S7Hmm7j6RqHfZ
+RLUvC4hKv9R0HgC3Z8KhZzrMoh/kgtHSwwMASpjHg+4QogqxGsOw9EJ4uigsMqn/
+tOF9/GBUHBHFvkQ6tKaz5D72K4LVrlAofl5V+Y5OlvH6bWVio3ayYhMuXYHDZJYU
+0qZQdWJoEOzVMnSIvL2fe2XHzWJurgQosLT/B8nbNBAwFR028KG/hKvWwyf3BfC4
+mLS64r6f5A6J03r3FTSmRzJ/lsr3x2dyVOfPiX39ng9i7HYO/Onq/RheaSmUa2yW
+QIIA8vkR6ipo0qOKBQ19YZ1J0z+QLISgcV+ZeDZSTIZ5vJeI6MSaKsPFcYD2uffK
+Ej/DTIQ0GGun9LGXhbZuFCdJqpr9q0VGVtBmgiqqkKz5JUQoAw4Lybrbn1UTSsHh
+jF6GU7bt3b/BGQ03TqirjNm4BibSLOx1rKhAH7/lbl4ICsG1FgcgvncU6Dzwc4ce
+IU6wuGJGvJRASxiLT3Vbt4VI6FT+gjtofSGvOhfp93nMqxuvpg2CGJl6BzN2J7xY
+SFq2znCt1RjAKE+lEPvD5nWxAJiv+2TUxr8RdgPCShFDhrBerm53JL2SOY5lYDA1
+zZ+fh+24HnBw1p1kqKsMoAq/CmuTXKVTPb1rDb3zCcVMsOgj7LE=
+=OMFk
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index ab52cd2cd0a6..877fc60a9ed4 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Mon, 24 Oct 2022 11:39:39 +0000
+Wed, 26 Oct 2022 04:39:44 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 506705116f94..0e8194e3dc0c 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Mon Oct 24 11:39:39 AM UTC 2022
+Wed Oct 26 04:39:44 AM UTC 2022
diff --git a/metadata/timestamp.calculate b/metadata/timestamp.calculate
index 32ac11e36753..1b0f481ee1c7 100644
--- a/metadata/timestamp.calculate
+++ b/metadata/timestamp.calculate
@@ -976,15 +976,10 @@
 2210051910 ./app-admin/augeas/augeas-1.13.0.ebuild
 2103271839 ./app-admin/authbind/authbind-2.1.2.ebuild
 2010061639 ./app-admin/aws-elb-tools/aws-elb-tools-1.0.15.1-r1.ebuild
-2210071010 ./app-admin/awscli/awscli-1.25.89.ebuild
-2210081110 ./app-admin/awscli/awscli-1.25.90.ebuild
-2210102310 ./app-admin/awscli/awscli-1.25.81.ebuild
-2210140840 ./app-admin/awscli/awscli-1.25.91.ebuild
-2210151110 ./app-admin/awscli/awscli-1.25.92.ebuild
-2210181010 ./app-admin/awscli/awscli-1.25.93.ebuild
-2210190710 ./app-admin/awscli/awscli-1.25.94.ebuild
-2210210840 ./app-admin/awscli/awscli-1.25.96.ebuild
 2210220940 ./app-admin/awscli/awscli-1.25.97.ebuild
+2210251240 ./app-admin/awscli/awscli-1.25.89.ebuild
+2210251140 ./app-admin/awscli/awscli-1.26.0.ebuild
+2210252340 ./app-admin/awscli/awscli-1.26.1.ebuild
 2207050340 ./app-admin/bastille/bastille-3.0.9-r3.ebuild
 2210052210 ./app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-2022.6.0-r1.ebuild
 2210052210 ./app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-2022.9.1-r1.ebuild
@@ -1188,7 +1183,7 @@
 2206190210 ./app-admin/rsyslog/rsyslog-8.2112.0-r1.ebuild
 2209181540 ./app-admin/rsyslog/rsyslog-8.2206.0-r1.ebuild
 2209181540 ./app-admin/rsyslog/rsyslog-8.2208.0-r1.ebuild
-2210192340 ./app-admin/rsyslog/rsyslog-8.2210.0.ebuild
+2210241840 ./app-admin/rsyslog/rsyslog-8.2210.0-r1.ebuild
 2207031410 ./app-admin/ryzen_monitor/ryzen_monitor-1.0.4-r1.ebuild
 2207022340 ./app-admin/ryzen_monitor/ryzen_monitor-1.0.5.ebuild
 2109150109 ./app-admin/ryzen_smu/ryzen_smu-0.1.2.ebuild
@@ -1228,6 +1223,7 @@
 2112231139 ./app-admin/sud/sud-1.3-r1.ebuild
 2209230410 ./app-admin/sudo/sudo-1.9.11_p3-r1.ebuild
 2209230410 ./app-admin/sudo/sudo-9999.ebuild
+2210241510 ./app-admin/sudo/sudo-1.9.12.ebuild
 2206301640 ./app-admin/superadduser/superadduser-1.15.ebuild
 2106031139 ./app-admin/supervisor/supervisor-4.2.2.ebuild
 2112310239 ./app-admin/supervisor/supervisor-4.2.4.ebuild
@@ -1243,7 +1239,7 @@
 2106302209 ./app-admin/sysrqd/sysrqd-17-r2.ebuild
 2208311840 ./app-admin/sysstat/sysstat-12.6.0.ebuild
 2209071115 ./app-admin/system-config-printer/system-config-printer-1.5.16-r1.ebuild
-2209071115 ./app-admin/system-config-printer/system-config-printer-1.5.18.ebuild
+2210252210 ./app-admin/system-config-printer/system-config-printer-1.5.18.ebuild
 2010281139 ./app-admin/systemdgenie/systemdgenie-0.99.0.ebuild
 2204070309 ./app-admin/tenshi/tenshi-0.17-r1.ebuild
 2206222240 ./app-admin/terraform/terraform-1.2.2.ebuild
@@ -1272,7 +1268,7 @@
 2205070740 ./app-admin/xstow/xstow-1.0.2-r1.ebuild
 2207271140 ./app-admin/xstow/xstow-1.1.0.ebuild
 1712300140 ./app-admin/xtail/xtail-2.1-r1.ebuild
-2209261540 ./app-admin/xtail/xtail-2.1_p8.ebuild
+2210252110 ./app-admin/xtail/xtail-2.1_p8.ebuild
 2203212309 ./app-admin/yadm/yadm-3.2.1.ebuild
 2112080309 ./app-admin/mkosi/mkosi-12-r1.ebuild
 2205070910 ./app-admin/tpm/tpm-1.3.3.ebuild
@@ -1306,8 +1302,8 @@
 2210010940 ./app-arch/atool/atool-0.39.0-r1.ebuild
 2109161309 ./app-arch/bloscpack/bloscpack-0.16.0.ebuild
 2205010511 ./app-arch/brotli/brotli-1.0.9-r3.ebuild
-2209010512 ./app-arch/brotli/brotli-1.0.9-r5.ebuild
 2209010512 ./app-arch/brotli/brotli-9999.ebuild
+2210251410 ./app-arch/brotli/brotli-1.0.9-r5.ebuild
 2207022340 ./app-arch/bsdsfv/bsdsfv-1.18-r3.ebuild
 2209061940 ./app-arch/bzip2/bzip2-1.0.8-r3.ebuild
 2209230910 ./app-arch/bzip2/bzip2-9999.ebuild
@@ -1325,6 +1321,7 @@
 2011141839 ./app-arch/duff/duff-0.5.2.ebuild
 2109132339 ./app-arch/dump/dump-0.4.47-r1.ebuild
 2207040110 ./app-arch/engrampa/engrampa-1.24.2-r1.ebuild
+2210241710 ./app-arch/engrampa/engrampa-1.26.0.ebuild
 2205280910 ./app-arch/file-roller/file-roller-3.42.0.ebuild
 2210012340 ./app-arch/file-roller/file-roller-43.0.ebuild
 2207210140 ./app-arch/funzix/funzix-1.0-r1.ebuild
@@ -1376,8 +1373,7 @@
 2205161140 ./app-arch/pxz/pxz-9999.ebuild
 2207311740 ./app-arch/qpress/qpress-1.1-r1.ebuild
 2206051740 ./app-arch/rar/rar-6.12.ebuild
-2210141010 ./app-arch/rpm/rpm-4.17.1.ebuild
-2210221040 ./app-arch/rpm/rpm-4.18.0.ebuild
+2210251610 ./app-arch/rpm/rpm-4.18.0.ebuild
 2205141340 ./app-arch/rpm2targz/rpm2targz-2021.03.16.ebuild
 2207022340 ./app-arch/rzip/rzip-2.1-r4.ebuild
 2208222040 ./app-arch/sharutils/sharutils-4.15.2-r2.ebuild
@@ -1430,9 +1426,9 @@
 2209250440 ./app-arch/zstd/zstd-1.5.2-r3.ebuild
 2204070239 ./app-arch/lunzip/lunzip-1.13.ebuild
 2204070239 ./app-arch/clzip/clzip-1.13.ebuild
-2206222010 ./app-arch/bzip3/bzip3-1.1.4.ebuild
-2209042210 ./app-arch/bzip3/bzip3-1.1.5.ebuild
 2210060340 ./app-arch/bzip3/bzip3-1.1.6.ebuild
+2210251410 ./app-arch/bzip3/bzip3-1.1.5.ebuild
+2210260210 ./app-arch/bzip3/bzip3-1.1.8.ebuild
 2206281910 ./app-arch/csnappy/csnappy-0_pre20220804.ebuild
 2209242340 ./app-arch/pack/pack-0.0.0.1.ebuild
 2205150410 ./app-backup/amanda/amanda-3.5.1-r3.ebuild
@@ -1453,20 +1449,15 @@
 2110122209 ./app-backup/borgbackup/borgbackup-1.1.17-r1.ebuild
 2206221710 ./app-backup/borgbackup/borgbackup-9999.ebuild
 2208161840 ./app-backup/borgbackup/borgbackup-1.2.1-r2.ebuild
-2208241540 ./app-backup/borgbackup/borgbackup-1.2.2.ebuild
+2210250010 ./app-backup/borgbackup/borgbackup-1.2.2-r1.ebuild
 2208261210 ./app-backup/borgmatic/borgmatic-1.6.6.ebuild
-2209091710 ./app-backup/borgmatic/borgmatic-1.7.2.ebuild
 2210211340 ./app-backup/borgmatic/borgmatic-1.7.4.ebuild
+2210251440 ./app-backup/borgmatic/borgmatic-1.7.2.ebuild
 2106011339 ./app-backup/borgweb/borgweb-0.2.0-r2.ebuild
 2106011339 ./app-backup/borgweb/borgweb-0.3.0.ebuild
 2108111010 ./app-backup/btrbk/btrbk-0.31.2.ebuild
-2108070410 ./app-backup/btrbk/btrbk-0.31.3.ebuild
-2202061839 ./app-backup/btrbk/btrbk-0.32.0.ebuild
-2202270609 ./app-backup/btrbk/btrbk-0.32.1.ebuild
-2206271710 ./app-backup/btrbk/btrbk-0.32.2.ebuild
 2206271710 ./app-backup/btrbk/btrbk-9999.ebuild
-2208091640 ./app-backup/btrbk/btrbk-0.32.3.ebuild
-2208230340 ./app-backup/btrbk/btrbk-0.32.4.ebuild
+2210241810 ./app-backup/btrbk/btrbk-0.32.5.ebuild
 2202181110 ./app-backup/burp/burp-2.4.0.ebuild
 2202230709 ./app-backup/burp/burp-2.5.4.ebuild
 2208100740 ./app-backup/burp/burp-2.5.4-r1.ebuild
@@ -1668,6 +1659,7 @@
 2105022009 ./app-crypt/easy-rsa/easy-rsa-3.0.7.ebuild
 2210172240 ./app-crypt/easy-rsa/easy-rsa-3.0.8.ebuild
 2110060709 ./app-crypt/efitools/efitools-1.9.2.ebuild
+2210250010 ./app-crypt/efitools/efitools-1.9.2-r1.ebuild
 2109092339 ./app-crypt/eid-mw/eid-mw-9999.ebuild
 2208011240 ./app-crypt/eid-mw/eid-mw-5.1.4-r1.ebuild
 2201041339 ./app-crypt/ekeyd/ekeyd-1.1.5-r101.ebuild
@@ -1794,7 +1786,7 @@
 2202100210 ./app-crypt/ssss/ssss-0.5.7-r1.ebuild
 1809280333 ./app-crypt/stan/stan-0.4.1-r1.ebuild
 2110202009 ./app-crypt/stoken/stoken-0.92-r2.ebuild
-2205201240 ./app-crypt/swtpm/swtpm-0.7.3.ebuild
+2210260710 ./app-crypt/swtpm/swtpm-0.7.3.ebuild
 2208010640 ./app-crypt/tc-play/tc-play-2.0-r2.ebuild
 2208010640 ./app-crypt/tc-play/tc-play-3.3.ebuild
 2101201339 ./app-crypt/tpm-emulator/tpm-emulator-0.7.5-r3.ebuild
@@ -2653,9 +2645,6 @@
 2207110710 ./app-editors/pyvim/pyvim-3.0.2.ebuild
 2207150512 ./app-editors/pyvim/pyvim-3.0.3.ebuild
 2110291639 ./app-editors/qemacs/qemacs-0.4.1_pre20170225.ebuild
-2204211009 ./app-editors/qhexedit2/qhexedit2-0.8.6_p20190316.ebuild
-2205021540 ./app-editors/qhexedit2/qhexedit2-0.8.9_p20210525.ebuild
-2206161940 ./app-editors/qhexedit2/qhexedit2-0.8.6_p20190316-r2.ebuild
 2206161940 ./app-editors/qhexedit2/qhexedit2-0.8.9_p20210525-r2.ebuild
 2110291639 ./app-editors/qxmledit/qxmledit-0.9.12.ebuild
 2209201840 ./app-editors/remarkable/remarkable-1.9.0_pre20210320-r1.ebuild
@@ -2801,6 +2790,7 @@
 2202151809 ./app-emacs/edit-server/edit-server-1.16.ebuild
 2204080339 ./app-emacs/editorconfig-emacs/editorconfig-emacs-0.7.8-r3.ebuild
 2205310240 ./app-emacs/editorconfig-emacs/editorconfig-emacs-0.8.2-r2.ebuild
+2210241540 ./app-emacs/editorconfig-emacs/editorconfig-emacs-0.9.0.ebuild
 2206262140 ./app-emacs/eglot/eglot-1.6-r1.ebuild
 2206262140 ./app-emacs/eglot/eglot-1.8-r1.ebuild
 2210110310 ./app-emacs/eglot/eglot-1.9.ebuild
@@ -3261,6 +3251,7 @@
 2210150110 ./app-emacs/docker/docker-2.2.0_p20221012.ebuild
 2210150411 ./app-emacs/elfeed/elfeed-3.4.1_p20210822.ebuild
 2210152010 ./app-emacs/metamath-mode/metamath-mode-0_p20221005.ebuild
+2210250440 ./app-emacs/systemd-mode/systemd-mode-1.6.ebuild
 2201021453 ./app-emulation/aqemu/aqemu-0.9.2-r2.ebuild
 2204170010 ./app-emulation/aranym/aranym-1.1.0.ebuild
 1912171039 ./app-emulation/bochs/bochs-2.6.10.ebuild
@@ -3333,8 +3324,8 @@
 2210141640 ./app-emulation/punes/punes-0.109-r1.ebuild
 2005112009 ./app-emulation/q4wine/q4wine-1.3.12.ebuild
 2209241210 ./app-emulation/q4wine/q4wine-1.3.13.ebuild
-2210131740 ./app-emulation/qemu-guest-agent/qemu-guest-agent-6.0.0.ebuild
-2210191810 ./app-emulation/qemu-guest-agent/qemu-guest-agent-7.1.0.ebuild
+2210260640 ./app-emulation/qemu-guest-agent/qemu-guest-agent-6.0.0.ebuild
+2210260640 ./app-emulation/qemu-guest-agent/qemu-guest-agent-7.1.0.ebuild
 2001291739 ./app-emulation/qemu-init-scripts/qemu-init-scripts-0.3.0-r1.ebuild
 2209270640 ./app-emulation/qemu/qemu-7.0.0-r3.ebuild
 2209272040 ./app-emulation/qemu/qemu-7.1.0.ebuild
@@ -3409,12 +3400,12 @@
 2204290440 ./app-emulation/xe-guest-utilities/xe-guest-utilities-6.2.0_p1120-r1.ebuild
 2209021710 ./app-emulation/xen-tools/xen-tools-4.16.2.ebuild
 2209051040 ./app-emulation/xen-tools/xen-tools-4.15.3.ebuild
-2210191210 ./app-emulation/xen-tools/xen-tools-4.15.4_pre1.ebuild
 2210191240 ./app-emulation/xen-tools/xen-tools-4.16.3_pre.ebuild
+2210252110 ./app-emulation/xen-tools/xen-tools-4.15.4_pre1.ebuild
 2207100940 ./app-emulation/xen/xen-4.15.3.ebuild
 2209021710 ./app-emulation/xen/xen-4.16.2.ebuild
-2210191210 ./app-emulation/xen/xen-4.15.4_pre1.ebuild
 2210191240 ./app-emulation/xen/xen-4.16.3_pre.ebuild
+2210252110 ./app-emulation/xen/xen-4.15.4_pre1.ebuild
 2006280009 ./app-emulation/xtrs/xtrs-4.9d-r5.ebuild
 2210071110 ./app-emulation/xtrs/xtrs-4.9d-r6.ebuild
 2210150840 ./app-emulation/ruffle/ruffle-0_p20221015.ebuild
@@ -3822,7 +3813,7 @@
 2207312310 ./app-misc/cpipe/cpipe-3.0.3-r1.ebuild
 2104040109 ./app-misc/crunch/crunch-3.6.ebuild
 1912120010 ./app-misc/cstream/cstream-3.1.1-r1.ebuild
-2207030210 ./app-misc/cstream/cstream-3.2.1.ebuild
+2210251610 ./app-misc/cstream/cstream-3.2.1-r1.ebuild
 2104040109 ./app-misc/cw/cw-1.0.16-r3.ebuild
 2210201410 ./app-misc/cw/cw-1.0.16-r5.ebuild
 2207312310 ./app-misc/dailystrips/dailystrips-1.0.28-r4.ebuild
@@ -4001,7 +3992,7 @@
 2103302139 ./app-misc/mmv/mmv-1.01b_p19.ebuild
 2201081409 ./app-misc/mosquitto/mosquitto-2.0.14.ebuild
 2210091210 ./app-misc/mosquitto/mosquitto-2.0.15.ebuild
-2203200240 ./app-misc/mouseremote/mouseremote-0.90-r3.ebuild
+2210251440 ./app-misc/mouseremote/mouseremote-0.90-r4.ebuild
 2102110639 ./app-misc/muttprint/muttprint-0.73-r5.ebuild
 2207312310 ./app-misc/mvcase/mvcase-0.1-r3.ebuild
 2202100210 ./app-misc/mx5000tools/mx5000tools-0.1.2-r2.ebuild
@@ -4077,6 +4068,7 @@
 2202100210 ./app-misc/rioutil/rioutil-1.5.4-r1.ebuild
 2207312310 ./app-misc/rl/rl-0.2.7-r2.ebuild
 2201201609 ./app-misc/rlwrap/rlwrap-0.45.2-r1.ebuild
+2210250910 ./app-misc/rlwrap/rlwrap-0.46.ebuild
 2204292210 ./app-misc/rmlint/rmlint-2.10.1.ebuild
 2103052139 ./app-misc/rox-filer/rox-filer-2.11.ebuild
 2206161110 ./app-misc/rpick/rpick-0.8.10.ebuild
@@ -4355,6 +4347,7 @@
 2210060940 ./app-portage/hackport/hackport-0.7.2.2.ebuild
 2206192340 ./app-portage/iwdevtools/iwdevtools-9999.ebuild
 2209192010 ./app-portage/iwdevtools/iwdevtools-0.11.9.ebuild
+2210242340 ./app-portage/iwdevtools/iwdevtools-0.12.0.ebuild
 2105041239 ./app-portage/java-ebuilder/java-ebuilder-0.5.1-r1.ebuild
 2105041239 ./app-portage/java-ebuilder/java-ebuilder-9999.ebuild
 2208101740 ./app-portage/kuroneko/kuroneko-0.1.3.ebuild
@@ -4368,10 +4361,8 @@
 2205252310 ./app-portage/metagen/metagen-9999.ebuild
 2207311940 ./app-portage/metagen/metagen-0.7.3-r1.ebuild
 2208082310 ./app-portage/metagen/metagen-0.7.3.ebuild
-2209042110 ./app-portage/mgorny-dev-scripts/mgorny-dev-scripts-25.ebuild
-2209201440 ./app-portage/mgorny-dev-scripts/mgorny-dev-scripts-26.ebuild
-2209211140 ./app-portage/mgorny-dev-scripts/mgorny-dev-scripts-27.ebuild
-2209211810 ./app-portage/mgorny-dev-scripts/mgorny-dev-scripts-28.ebuild
+2210251010 ./app-portage/mgorny-dev-scripts/mgorny-dev-scripts-28.ebuild
+2210251140 ./app-portage/mgorny-dev-scripts/mgorny-dev-scripts-29.ebuild
 2209071115 ./app-portage/mirrorselect/mirrorselect-2.2.6-r2.ebuild
 2209071115 ./app-portage/mirrorselect/mirrorselect-2.3.0-r1.ebuild
 2209071115 ./app-portage/mirrorselect/mirrorselect-9999.ebuild
@@ -4386,8 +4377,8 @@
 2009011409 ./app-portage/pgo/pgo-9999.ebuild
 2203100610 ./app-portage/pkg-testing-tools/pkg-testing-tools-0.1.0.ebuild
 2208291040 ./app-portage/portage-utils/portage-utils-0.94.1.ebuild
-2208291210 ./app-portage/portage-utils/portage-utils-0.94.3.ebuild
 2208290110 ./app-portage/portage-utils/portage-utils-9999.ebuild
+2210251610 ./app-portage/portage-utils/portage-utils-0.94.3.ebuild
 2208082310 ./app-portage/porticron/porticron-0.7.1.ebuild
 2205092345 ./app-portage/portpeek/portpeek-3.2.2.ebuild
 2208082310 ./app-portage/portpeek/portpeek-3.2.2-r1.ebuild
@@ -4755,8 +4746,8 @@
 2206060940 ./app-text/pdfminer/pdfminer-20220506.ebuild
 2209052340 ./app-text/pdfsandwich/pdfsandwich-0.1.7.ebuild
 2112241139 ./app-text/pdftk/pdftk-9999.ebuild
-2209231310 ./app-text/pdftk/pdftk-3.3.3.ebuild
 2210111010 ./app-text/pdftk/pdftk-3.3.2-r1.ebuild
+2210251440 ./app-text/pdftk/pdftk-3.3.3.ebuild
 2205311010 ./app-text/pelican/pelican-4.7.2-r1.ebuild
 2207121410 ./app-text/pelican/pelican-4.8.0.ebuild
 2210010040 ./app-text/pep/pep-2.8-r2.ebuild
@@ -4783,8 +4774,6 @@
 2110291639 ./app-text/pytextile/pytextile-4.0.1.ebuild
 2101310343 ./app-text/q-text-as-data/q-text-as-data-2.0.10.ebuild
 2205181110 ./app-text/qpdf/qpdf-10.6.3.ebuild
-2209140240 ./app-text/qpdf/qpdf-11.0.0.ebuild
-2209250710 ./app-text/qpdf/qpdf-11.1.0-r2.ebuild
 2210091410 ./app-text/qpdf/qpdf-11.1.1.ebuild
 2112241039 ./app-text/qpdfview/qpdfview-0.4.18_p1.ebuild
 2112271440 ./app-text/qpdfview/qpdfview-0.4.18_p20211227.ebuild
@@ -5325,12 +5314,10 @@
 2208231040 ./dev-cpp/abseil-cpp/abseil-cpp-20211102.0-r2.ebuild
 2009281609 ./dev-cpp/aixlog/aixlog-9999.ebuild
 2210031810 ./dev-cpp/aixlog/aixlog-1.5.0.ebuild
-2209091110 ./dev-cpp/amqp-cpp/amqp-cpp-4.3.16.ebuild
-2209151340 ./dev-cpp/amqp-cpp/amqp-cpp-4.3.17.ebuild
+2210260140 ./dev-cpp/amqp-cpp/amqp-cpp-4.3.18.ebuild
 1911131109 ./dev-cpp/antlr-cpp/antlr-cpp-2.7.7-r1.ebuild
 2104180939 ./dev-cpp/antlr-cpp/antlr-cpp-4.7.2.ebuild
-2209091110 ./dev-cpp/argparse/argparse-2.1-r1.ebuild
-2209091110 ./dev-cpp/argparse/argparse-2.6.ebuild
+2210260140 ./dev-cpp/argparse/argparse-2.9.ebuild
 2207081010 ./dev-cpp/asio/asio-1.10.8.ebuild
 2209251110 ./dev-cpp/asio/asio-1.22.2.ebuild
 2209240710 ./dev-cpp/atkmm/atkmm-2.28.2-r1.ebuild
@@ -5447,7 +5434,7 @@
 2208201940 ./dev-cpp/sdbus-c++/sdbus-c++-1.2.0.ebuild
 2208152240 ./dev-cpp/highway/highway-0.16.0-r1.ebuild
 2210101540 ./dev-cpp/highway/highway-9999.ebuild
-2210171010 ./dev-cpp/highway/highway-1.0.1-r1.ebuild
+2210252140 ./dev-cpp/highway/highway-1.0.1-r1.ebuild
 2205051910 ./dev-cpp/opentelemetry-cpp/opentelemetry-cpp-1.3.0-r2.ebuild
 2205182210 ./dev-cpp/opentelemetry-cpp/opentelemetry-cpp-1.4.0.ebuild
 2208192140 ./dev-cpp/opentelemetry-cpp/opentelemetry-cpp-1.6.0.ebuild
@@ -5462,6 +5449,7 @@
 2210042240 ./dev-cpp/jarowinkler-cpp/jarowinkler-cpp-1.0.2.ebuild
 2209270940 ./dev-cpp/rapidfuzz-cpp/rapidfuzz-cpp-1.7.0.ebuild
 2210042240 ./dev-cpp/rapidfuzz-cpp/rapidfuzz-cpp-1.8.0.ebuild
+2210251140 ./dev-cpp/rapidfuzz-cpp/rapidfuzz-cpp-1.9.0.ebuild
 2110040939 ./dev-db/apgdiff/apgdiff-2.7.0.ebuild
 2206041110 ./dev-db/barman/barman-2.12-r1.ebuild
 2206181840 ./dev-db/barman/barman-2.19.ebuild
@@ -5488,7 +5476,7 @@
 2008272139 ./dev-db/influxdb/influxdb-1.8.2.ebuild
 2010041939 ./dev-db/influxdb/influxdb-1.8.3.ebuild
 2104082239 ./dev-db/innotop/innotop-1.13.0.ebuild
-2209141640 ./dev-db/kdb/kdb-3.2.0-r2.ebuild
+2210252310 ./dev-db/kdb/kdb-3.2.0-r2.ebuild
 2107131439 ./dev-db/kyotocabinet/kyotocabinet-1.2.77.ebuild
 2107060009 ./dev-db/libdbi-drivers/libdbi-drivers-0.9.0-r1.ebuild
 2107060009 ./dev-db/libdbi/libdbi-0.9.0.ebuild
@@ -5520,7 +5508,7 @@
 2204221639 ./dev-db/mycli/mycli-1.25.0.ebuild
 2204291539 ./dev-db/mydumper/mydumper-0.11.5.2.ebuild
 2205132310 ./dev-db/mydumper/mydumper-0.12.1.ebuild
-2208041010 ./dev-db/mydumper/mydumper-0.12.5.3.ebuild
+2210252110 ./dev-db/mydumper/mydumper-0.12.5.3.ebuild
 2208191140 ./dev-db/myodbc/myodbc-8.0.27-r1.ebuild
 2109071509 ./dev-db/mysql++/mysql++-3.3.0.ebuild
 2202280139 ./dev-db/mysql-connector-c++/mysql-connector-c++-8.0.27.ebuild
@@ -5567,12 +5555,8 @@
 2110231809 ./dev-db/pgmemcache/pgmemcache-2.3.0.ebuild
 2108230109 ./dev-db/pgmodeler/pgmodeler-0.9.2.ebuild
 2202141039 ./dev-db/pgmodeler/pgmodeler-0.9.4.ebuild
-2203160710 ./dev-db/pgpool2/pgpool2-4.3.1.ebuild
-2206141340 ./dev-db/pgpool2/pgpool2-4.2.1-r2.ebuild
-2206141340 ./dev-db/pgpool2/pgpool2-4.2.2-r2.ebuild
-2206141340 ./dev-db/pgpool2/pgpool2-4.2.9.ebuild
-2206141340 ./dev-db/pgpool2/pgpool2-9999.ebuild
 2210201410 ./dev-db/pgpool2/pgpool2-4.3.2.ebuild
+2210241610 ./dev-db/pgpool2/pgpool2-9999.ebuild
 2112260340 ./dev-db/pgrouting/pgrouting-3.1.1.ebuild
 2112260340 ./dev-db/pgrouting/pgrouting-3.1.2.ebuild
 2112260340 ./dev-db/pgrouting/pgrouting-3.1.3.ebuild
@@ -5616,6 +5600,7 @@
 2210160310 ./dev-db/rqlite/rqlite-7.7.2.ebuild
 2210210310 ./dev-db/rqlite/rqlite-7.8.0.ebuild
 2210230140 ./dev-db/rqlite/rqlite-7.9.0.ebuild
+2210250310 ./dev-db/rqlite/rqlite-7.9.2.ebuild
 2205231140 ./dev-db/slony1/slony1-2.2.10.ebuild
 2103032009 ./dev-db/spatialite-tools/spatialite-tools-5.0.1-r1.ebuild
 2108150239 ./dev-db/spatialite/spatialite-5.0.1-r1.ebuild
@@ -5774,8 +5759,7 @@
 2207051210 ./dev-erlang/stun/stun-1.2.2.ebuild
 2207051210 ./dev-erlang/xmpp/xmpp-1.5.8.ebuild
 2207051210 ./dev-erlang/yconf/yconf-1.0.13.ebuild
-2104062139 ./dev-games/KXL/KXL-1.1.7-r3.ebuild
-2209261540 ./dev-games/KXL/KXL-1.1.7_p17.ebuild
+2210252110 ./dev-games/KXL/KXL-1.1.7_p17.ebuild
 2106210210 ./dev-games/aseprite/aseprite-1.1.9.ebuild
 2208181040 ./dev-games/aseprite/aseprite-1.2.37.ebuild
 2012311940 ./dev-games/cardpics/cardpics-0.4-r1.ebuild
@@ -6386,8 +6370,7 @@
 2210142110 ./dev-java/commons-logging/commons-logging-1.2-r6.ebuild
 2208232140 ./dev-java/commons-math/commons-math-3.6.1-r2.ebuild
 2202112309 ./dev-java/commons-net/commons-net-3.8.0.ebuild
-2112260340 ./dev-java/commons-text/commons-text-1.9.ebuild
-2210202240 ./dev-java/commons-text/commons-text-1.10.0.ebuild
+2210251610 ./dev-java/commons-text/commons-text-1.10.0.ebuild
 2107020939 ./dev-java/commons-validator/commons-validator-1.7.ebuild
 2202112309 ./dev-java/commons-vfs/commons-vfs-2.0-r2.ebuild
 2103301609 ./dev-java/core-specs-alpha/core-specs-alpha-0.2.56.ebuild
@@ -6450,8 +6433,7 @@
 2205101010 ./dev-java/jakarta-activation/jakarta-activation-2.0.1-r1.ebuild
 2203081640 ./dev-java/jakarta-oro/jakarta-oro-2.0.8-r5.ebuild
 2203081640 ./dev-java/jakarta-regexp/jakarta-regexp-1.4-r3.ebuild
-2209201940 ./dev-java/jakartaee-migration/jakartaee-migration-1.0.4.ebuild
-2210201410 ./dev-java/jakartaee-migration/jakartaee-migration-1.0.3.ebuild
+2210251240 ./dev-java/jakartaee-migration/jakartaee-migration-1.0.4.ebuild
 2203171240 ./dev-java/jal/jal-20031117-r6.ebuild
 2112222209 ./dev-java/jansi-native/jansi-native-1.8.ebuild
 2112222209 ./dev-java/jansi/jansi-1.13.ebuild
@@ -6578,7 +6560,10 @@
 2210221240 ./dev-java/poi/poi-5.2.3.ebuild
 2205040340 ./dev-java/protobuf-java/protobuf-java-3.19.3.ebuild
 2209050040 ./dev-java/protobuf-java/protobuf-java-3.20.1.ebuild
-2209050040 ./dev-java/protobuf-java/protobuf-java-9999.ebuild
+2210260110 ./dev-java/protobuf-java/protobuf-java-3.19.6.ebuild
+2210260110 ./dev-java/protobuf-java/protobuf-java-3.20.3.ebuild
+2210260110 ./dev-java/protobuf-java/protobuf-java-3.21.8.ebuild
+2210260110 ./dev-java/protobuf-java/protobuf-java-9999.ebuild
 2205050840 ./dev-java/qdox/qdox-1.12.1-r3.ebuild
 2208220310 ./dev-java/randomized-runner/randomized-runner-2.8.0.ebuild
 2112260340 ./dev-java/rat/rat-0.13.ebuild
@@ -6723,7 +6708,7 @@
 2208220310 ./dev-java/junit-dataprovider/junit-dataprovider-2.9.ebuild
 2208220310 ./dev-java/memoryfilesystem/memoryfilesystem-2.3.0.ebuild
 2210041410 ./dev-java/jakarta-servlet-api/jakarta-servlet-api-4.0.4.ebuild
-2210210940 ./dev-java/jakarta-servlet-api/jakarta-servlet-api-6.0.0.ebuild
+2210251310 ./dev-java/jakarta-servlet-api/jakarta-servlet-api-6.0.0.ebuild
 2210101510 ./dev-java/fishbowl/fishbowl-1.4.1.ebuild
 2210101510 ./dev-java/system-rules/system-rules-1.19.0.ebuild
 2210192040 ./dev-java/aqute-bnd-annotation/aqute-bnd-annotation-6.3.1.ebuild
@@ -6899,10 +6884,12 @@
 2204290540 ./dev-lang/python-exec-conf/python-exec-conf-2.4.6.ebuild
 2206100840 ./dev-lang/python-exec/python-exec-2.4.9.ebuild
 2210082240 ./dev-lang/python/python-2.7.18_p15-r1.ebuild
-2210130110 ./dev-lang/python/python-3.10.8.ebuild
 2210120840 ./dev-lang/python/python-3.11.0_rc2_p1.ebuild
-2210130110 ./dev-lang/python/python-3.8.15.ebuild
-2210130110 ./dev-lang/python/python-3.9.15.ebuild
+2210251440 ./dev-lang/python/python-3.10.8.ebuild
+2210251440 ./dev-lang/python/python-3.11.0.ebuild
+2210251340 ./dev-lang/python/python-3.12.0_alpha1.ebuild
+2210251440 ./dev-lang/python/python-3.8.15.ebuild
+2210251440 ./dev-lang/python/python-3.9.15.ebuild
 2205210910 ./dev-lang/qu-prolog/qu-prolog-10.6.ebuild
 2210152010 ./dev-lang/qu-prolog/qu-prolog-10.7.ebuild
 2111290409 ./dev-lang/rakudo/rakudo-2021.06.ebuild
@@ -6940,6 +6927,7 @@
 2206041110 ./dev-lang/swi-prolog/swi-prolog-8.4.2.ebuild
 2206040940 ./dev-lang/swi-prolog/swi-prolog-8.5.12.ebuild
 2205010512 ./dev-lang/swig/swig-4.0.2.ebuild
+2210251410 ./dev-lang/swig/swig-4.1.0.ebuild
 2201012339 ./dev-lang/tcc/tcc-9999.ebuild
 2202071210 ./dev-lang/tcc/tcc-0.9.27_p20211022.ebuild
 2201021239 ./dev-lang/tcl/tcl-8.6.11.ebuild
@@ -7122,6 +7110,7 @@
 2210121010 ./dev-libs/ell/ell-0.53.ebuild
 2210010240 ./dev-libs/eventlog/eventlog-0.2.12.ebuild
 2209252340 ./dev-libs/expat/expat-2.4.9.ebuild
+2210252340 ./dev-libs/expat/expat-2.5.0.ebuild
 2202140039 ./dev-libs/faxpp/faxpp-0.4-r2.ebuild
 2209220740 ./dev-libs/fcgi/fcgi-2.4.1_pre0910052249-r2.ebuild
 2103191609 ./dev-libs/fddl/fddl-20111124-r1.ebuild
@@ -7150,6 +7139,7 @@
 2210080240 ./dev-libs/gjs/gjs-1.74.0.ebuild
 2208170910 ./dev-libs/glib/glib-2.72.3.ebuild
 2210110210 ./dev-libs/glib/glib-2.74.0-r1.ebuild
+2210251840 ./dev-libs/glib/glib-2.74.1.ebuild
 2204140710 ./dev-libs/gmime/gmime-2.6.23-r1.ebuild
 2209302210 ./dev-libs/gmime/gmime-3.2.13.ebuild
 2201021239 ./dev-libs/gmp/gmp-6.2.1-r1.ebuild
@@ -7170,8 +7160,7 @@
 2102011639 ./dev-libs/granite/granite-5.2.5-r1.ebuild
 2112192009 ./dev-libs/granite/granite-6.2.0.ebuild
 2112262210 ./dev-libs/granite/granite-6.0.0.ebuild
-2206291040 ./dev-libs/grantlee/grantlee-5.2.0.ebuild
-2210041040 ./dev-libs/grantlee/grantlee-5.3.0.ebuild
+2210252210 ./dev-libs/grantlee/grantlee-5.3.0.ebuild
 2107191739 ./dev-libs/gumbo/gumbo-0.10.1.ebuild
 2111081609 ./dev-libs/half/half-1.12.0.ebuild
 2208250710 ./dev-libs/hidapi/hidapi-0.11.0.ebuild
@@ -7233,7 +7222,7 @@
 2208151740 ./dev-libs/kpublictransport/kpublictransport-22.04.3.ebuild
 2210131640 ./dev-libs/kpublictransport/kpublictransport-22.08.2.ebuild
 2104161439 ./dev-libs/kqoauth/kqoauth-0.98-r3.ebuild
-2206020940 ./dev-libs/kreport/kreport-3.2.0-r3.ebuild
+2210252310 ./dev-libs/kreport/kreport-3.2.0-r3.ebuild
 2203262009 ./dev-libs/kuserfeedback/kuserfeedback-1.2.0.ebuild
 2209041610 ./dev-libs/leatherman/leatherman-1.12.7.ebuild
 2209041610 ./dev-libs/leatherman/leatherman-1.12.8.ebuild
@@ -7278,10 +7267,10 @@
 2205082310 ./dev-libs/libcharon/libcharon-4.13.0.ebuild
 2209211140 ./dev-libs/libclc/libclc-14.0.6.ebuild
 2209211140 ./dev-libs/libclc/libclc-16.0.0.9999.ebuild
-2210101140 ./dev-libs/libclc/libclc-15.0.3.9999.ebuild
 2210162210 ./dev-libs/libclc/libclc-16.0.0_pre20221016.ebuild
 2210181810 ./dev-libs/libclc/libclc-15.0.3.ebuild
 2210231840 ./dev-libs/libclc/libclc-16.0.0_pre20221023.ebuild
+2210241640 ./dev-libs/libclc/libclc-15.0.4.9999.ebuild
 2104161439 ./dev-libs/libclthreads/libclthreads-2.4.2.ebuild
 2205190840 ./dev-libs/libconfig/libconfig-1.7.3.ebuild
 2205171110 ./dev-libs/libcroco/libcroco-0.6.13-r1.ebuild
@@ -7326,9 +7315,8 @@
 2201061240 ./dev-libs/libffi-compat/libffi-compat-3.2.1-r3.ebuild
 2206142010 ./dev-libs/libffi-compat/libffi-compat-3.3-r2.ebuild
 2201061240 ./dev-libs/libffi/libffi-3.3-r2.ebuild
-2206142010 ./dev-libs/libffi/libffi-3.4.2-r1.ebuild
 2208240840 ./dev-libs/libffi/libffi-3.4.2-r2.ebuild
-2210191140 ./dev-libs/libffi/libffi-3.4.3.ebuild
+2210241510 ./dev-libs/libffi/libffi-3.4.4.ebuild
 2206020740 ./dev-libs/libfido2/libfido2-1.11.0.ebuild
 2207231140 ./dev-libs/libfilezilla/libfilezilla-0.38.1.ebuild
 2208150940 ./dev-libs/libfilezilla/libfilezilla-0.37.2.ebuild
@@ -7370,9 +7358,7 @@
 2206151140 ./dev-libs/libgpg-error/libgpg-error-1.45.ebuild
 2209010540 ./dev-libs/libgpg-error/libgpg-error-1.45-r1.ebuild
 2210100040 ./dev-libs/libgpg-error/libgpg-error-1.46-r1.ebuild
-2108101609 ./dev-libs/libgpiod/libgpiod-1.4.1.ebuild
-2209091240 ./dev-libs/libgpiod/libgpiod-1.6.3-r1.ebuild
-2209091240 ./dev-libs/libgpiod/libgpiod-1.6.3-r4.ebuild
+2210252110 ./dev-libs/libgpiod/libgpiod-1.6.3-r4.ebuild
 2109072109 ./dev-libs/libgudev/libgudev-236.ebuild
 2205241440 ./dev-libs/libgudev/libgudev-237-r1.ebuild
 2205171640 ./dev-libs/libgusb/libgusb-0.3.10.ebuild
@@ -7546,8 +7532,8 @@
 2202192010 ./dev-libs/libtsm/libtsm-4.0.1.ebuild
 2202192010 ./dev-libs/libtsm/libtsm-4.0.2.ebuild
 2011142339 ./dev-libs/libtubo/libtubo-5.0.15.ebuild
-2106222139 ./dev-libs/libucl/libucl-0.8.1-r100.ebuild
-2106222139 ./dev-libs/libucl/libucl-9999.ebuild
+2210241910 ./dev-libs/libucl/libucl-0.8.1-r100.ebuild
+2210241910 ./dev-libs/libucl/libucl-9999.ebuild
 2009010639 ./dev-libs/libudfread/libudfread-1.1.0.ebuild
 2107260510 ./dev-libs/libudfread/libudfread-1.1.1.ebuild
 2108211209 ./dev-libs/libudfread/libudfread-1.1.2.ebuild
@@ -7604,6 +7590,7 @@
 2205010512 ./dev-libs/libyaml/libyaml-0.2.5.ebuild
 2210110840 ./dev-libs/libzia/libzia-4.34.ebuild
 2210110840 ./dev-libs/libzia/libzia-4.36.ebuild
+2210242010 ./dev-libs/libzia/libzia-4.37.ebuild
 2208011740 ./dev-libs/libzip/libzip-1.9.2.ebuild
 2204280640 ./dev-libs/light/light-1.2.2-r2.ebuild
 2208152010 ./dev-libs/link-grammar/link-grammar-5.10.5-r1.ebuild
@@ -7626,6 +7613,7 @@
 2207031210 ./dev-libs/miniz/miniz-2.2.0-r1.ebuild
 2108291209 ./dev-libs/mm/mm-1.4.2-r2.ebuild
 2201131910 ./dev-libs/mmtf-cpp/mmtf-cpp-1.0.0-r1.ebuild
+2210260140 ./dev-libs/mmtf-cpp/mmtf-cpp-1.1.0.ebuild
 2207091810 ./dev-libs/mongo-c-driver/mongo-c-driver-1.18.0-r1.ebuild
 2204290540 ./dev-libs/mpc/mpc-1.2.1.ebuild
 2204290540 ./dev-libs/mpfr/mpfr-4.1.0_p13-r1.ebuild
@@ -7641,8 +7629,7 @@
 2205170840 ./dev-libs/npth/npth-1.6-r1.ebuild
 2203222209 ./dev-libs/nsgenbind/nsgenbind-0.8-r1.ebuild
 2210181340 ./dev-libs/nspr/nspr-4.35.ebuild
-2209051940 ./dev-libs/nss-pem/nss-pem-1.0.8.ebuild
-2206041440 ./dev-libs/nss/nss-3.68.4.ebuild
+2210251840 ./dev-libs/nss-pem/nss-pem-1.0.8.ebuild
 2209231010 ./dev-libs/nss/nss-3.79.1.ebuild
 2210141040 ./dev-libs/nss/nss-3.84.ebuild
 2209091110 ./dev-libs/nsync/nsync-1.24.0-r1.ebuild
@@ -7689,16 +7676,18 @@
 2208080940 ./dev-libs/pocl/pocl-3.0.ebuild
 2202150009 ./dev-libs/poco/poco-1.10.1.ebuild
 2210101640 ./dev-libs/poco/poco-1.12.2.ebuild
-2210241040 ./dev-libs/poco/poco-1.11.2-r1.ebuild
+2210252210 ./dev-libs/poco/poco-1.11.2-r1.ebuild
 2204290540 ./dev-libs/popt/popt-1.18.ebuild
 2209170310 ./dev-libs/popt/popt-1.19.ebuild
-2203040040 ./dev-libs/ppl/ppl-1.2-r4.ebuild
-2210210310 ./dev-libs/ppl/ppl-1.2-r5.ebuild
+2210251610 ./dev-libs/ppl/ppl-1.2-r5.ebuild
 2202030009 ./dev-libs/protobuf-c/protobuf-c-1.4.0-r1.ebuild
 2208281110 ./dev-libs/protobuf-c/protobuf-c-1.4.1.ebuild
 2205041040 ./dev-libs/protobuf/protobuf-3.19.3.ebuild
-2209022340 ./dev-libs/protobuf/protobuf-9999.ebuild
 2210061010 ./dev-libs/protobuf/protobuf-3.20.1-r1.ebuild
+2210260110 ./dev-libs/protobuf/protobuf-21.8.ebuild
+2210260110 ./dev-libs/protobuf/protobuf-3.19.6.ebuild
+2210260110 ./dev-libs/protobuf/protobuf-3.20.3.ebuild
+2210260110 ./dev-libs/protobuf/protobuf-9999.ebuild
 2207272340 ./dev-libs/pslib/pslib-0.4.5-r1.ebuild
 2210041040 ./dev-libs/pslib/pslib-0.4.6.ebuild
 2205141340 ./dev-libs/ptexenc/ptexenc-1.3.9_p20210325-r1.ebuild
@@ -7850,7 +7839,7 @@
 2204151310 ./dev-libs/tree-sitter-typescript/tree-sitter-typescript-0.20.1.ebuild
 2207282310 ./dev-libs/tree-sitter/tree-sitter-0.20.6.ebuild
 2207282310 ./dev-libs/tree-sitter/tree-sitter-9999.ebuild
-2210210040 ./dev-libs/tree-sitter/tree-sitter-0.20.7.ebuild
+2210251440 ./dev-libs/tree-sitter/tree-sitter-0.20.7.ebuild
 2210112240 ./dev-libs/trio/trio-1.17.ebuild
 2108090410 ./dev-libs/tvision/tvision-2.2.3.ebuild
 2104200439 ./dev-libs/tvmet/tvmet-1.7.2-r2.ebuild
@@ -7987,6 +7976,7 @@
 2209301840 ./dev-libs/json-parser/json-parser-1.1.0_p20211208.ebuild
 2208191911 ./dev-libs/libcpuid/libcpuid-0.5.1.ebuild
 2209281740 ./dev-libs/libcpuid/libcpuid-0.6.0.ebuild
+2210251610 ./dev-libs/libcpuid/libcpuid-0.6.1.ebuild
 2210172310 ./dev-libs/libxlsxwriter/libxlsxwriter-1.1.4-r1.ebuild
 2209161840 ./dev-libs/optix/optix-7.4.0.ebuild
 2209161840 ./dev-libs/optix/optix-7.5.0.ebuild
@@ -8201,11 +8191,11 @@
 2206282340 ./dev-ml/labltk/labltk-8.06.12.ebuild
 2202030039 ./dev-ml/llvm-ocaml/llvm-ocaml-13.0.1.ebuild
 2206251640 ./dev-ml/llvm-ocaml/llvm-ocaml-14.0.6.ebuild
-2210101140 ./dev-ml/llvm-ocaml/llvm-ocaml-15.0.3.9999.ebuild
 2210102340 ./dev-ml/llvm-ocaml/llvm-ocaml-16.0.0.9999.ebuild
 2210162210 ./dev-ml/llvm-ocaml/llvm-ocaml-16.0.0_pre20221016.ebuild
 2210181810 ./dev-ml/llvm-ocaml/llvm-ocaml-15.0.3.ebuild
 2210231840 ./dev-ml/llvm-ocaml/llvm-ocaml-16.0.0_pre20221023.ebuild
+2210241640 ./dev-ml/llvm-ocaml/llvm-ocaml-15.0.4.9999.ebuild
 2204190039 ./dev-ml/logs/logs-0.7.0-r1.ebuild
 2201100109 ./dev-ml/luv/luv-0.5.10-r3.ebuild
 2210192110 ./dev-ml/luv/luv-0.5.11-r2.ebuild
@@ -9165,6 +9155,7 @@
 2110301839 ./dev-perl/GD-Graph3d/GD-Graph3d-0.630.0-r3.ebuild
 2106032239 ./dev-perl/GD-SVG/GD-SVG-0.330.0-r2.ebuild
 2205251240 ./dev-perl/GD/GD-2.730.0-r1.ebuild
+2210252340 ./dev-perl/GD/GD-2.760.0.ebuild
 2110301839 ./dev-perl/GDGraph/GDGraph-1.540.0-r1.ebuild
 2110301839 ./dev-perl/GDTextUtil/GDTextUtil-0.860.0-r3.ebuild
 2205131810 ./dev-perl/GSSAPI/GSSAPI-0.280.0-r2.ebuild
@@ -10328,6 +10319,7 @@
 2112150709 ./dev-perl/MooseX-NonMoose/MooseX-NonMoose-0.260.0.ebuild
 2201131240 ./dev-perl/File-Pid/File-Pid-1.01.ebuild
 2201131410 ./dev-perl/Net-AMQP-RabbitMQ/Net-AMQP-RabbitMQ-2.40009.ebuild
+2210260140 ./dev-perl/Net-AMQP-RabbitMQ/Net-AMQP-RabbitMQ-2.40010.ebuild
 2202171909 ./dev-perl/PerlMol/PerlMol-0.3500.ebuild
 2203140009 ./dev-perl/Search-Sitemap/Search-Sitemap-2.130.0.ebuild
 2203140809 ./dev-perl/Test-Mock-LWP/Test-Mock-LWP-0.80.0.ebuild
@@ -10791,7 +10783,7 @@
 2108221109 ./dev-python/aiohttp-jinja2/aiohttp-jinja2-1.5.ebuild
 2210182210 ./dev-python/aiohttp-socks/aiohttp-socks-0.7.1.ebuild
 2210130810 ./dev-python/aiohttp/aiohttp-3.8.1-r1.ebuild
-2210130810 ./dev-python/aiohttp/aiohttp-3.8.3.ebuild
+2210251310 ./dev-python/aiohttp/aiohttp-3.8.3.ebuild
 2110270109 ./dev-python/aiopylgtv/aiopylgtv-0.4.1.ebuild
 2206110940 ./dev-python/aioresponses/aioresponses-0.7.3-r1.ebuild
 2108071714 ./dev-python/aiorpcX/aiorpcX-0.19.1.ebuild
@@ -10851,10 +10843,7 @@
 2210141510 ./dev-python/autopep8/autopep8-1.7.0-r1.ebuild
 2210141510 ./dev-python/autopep8/autopep8-9999.ebuild
 2205310940 ./dev-python/autoprop/autoprop-4.1.0.ebuild
-2209192340 ./dev-python/aws-sam-translator/aws-sam-translator-1.50.0.ebuild
-2209220940 ./dev-python/aws-sam-translator/aws-sam-translator-1.51.0.ebuild
-2210071010 ./dev-python/aws-sam-translator/aws-sam-translator-1.52.0.ebuild
-2210112110 ./dev-python/aws-sam-translator/aws-sam-translator-1.53.0.ebuild
+2210251310 ./dev-python/aws-sam-translator/aws-sam-translator-1.53.0.ebuild
 2210151740 ./dev-python/aws-xray-sdk-python/aws-xray-sdk-python-2.10.0.ebuild
 2209220940 ./dev-python/awxkit/awxkit-21.6.0.ebuild
 2210051310 ./dev-python/awxkit/awxkit-21.7.0.ebuild
@@ -10899,25 +10888,15 @@
 2205141040 ./dev-python/booleanOperations/booleanOperations-0.9.0-r1.ebuild
 2112141539 ./dev-python/boto/boto-2.49.0-r4.ebuild
 2206011110 ./dev-python/boto3/boto3-9999.ebuild
-2210102140 ./dev-python/boto3/boto3-1.24.80.ebuild
-2210081110 ./dev-python/boto3/boto3-1.24.89.ebuild
-2210140840 ./dev-python/boto3/boto3-1.24.90.ebuild
-2210151110 ./dev-python/boto3/boto3-1.24.91.ebuild
-2210181010 ./dev-python/boto3/boto3-1.24.92.ebuild
-2210190710 ./dev-python/boto3/boto3-1.24.93.ebuild
 2210221110 ./dev-python/boto3/boto3-1.24.88.ebuild
-2210210840 ./dev-python/boto3/boto3-1.24.95.ebuild
 2210220940 ./dev-python/boto3/boto3-1.24.96.ebuild
+2210251140 ./dev-python/boto3/boto3-1.25.0.ebuild
+2210252340 ./dev-python/boto3/boto3-1.25.1.ebuild
 2208311240 ./dev-python/botocore/botocore-9999.ebuild
-2210102140 ./dev-python/botocore/botocore-1.27.80.ebuild
-2210081110 ./dev-python/botocore/botocore-1.27.89.ebuild
-2210140840 ./dev-python/botocore/botocore-1.27.90.ebuild
-2210151110 ./dev-python/botocore/botocore-1.27.91.ebuild
-2210181010 ./dev-python/botocore/botocore-1.27.92.ebuild
-2210190710 ./dev-python/botocore/botocore-1.27.93.ebuild
 2210221110 ./dev-python/botocore/botocore-1.27.88.ebuild
-2210210840 ./dev-python/botocore/botocore-1.27.95.ebuild
 2210220940 ./dev-python/botocore/botocore-1.27.96.ebuild
+2210251140 ./dev-python/botocore/botocore-1.28.0.ebuild
+2210252340 ./dev-python/botocore/botocore-1.28.1.ebuild
 2209062210 ./dev-python/bottle/bottle-0.12.23.ebuild
 2208031110 ./dev-python/bottleneck/bottleneck-1.3.5.ebuild
 2210031140 ./dev-python/bpython/bpython-0.23.ebuild
@@ -10927,9 +10906,10 @@
 2210050910 ./dev-python/braintree/braintree-4.17.0.ebuild
 2210151110 ./dev-python/braintree/braintree-4.17.1.ebuild
 2207242240 ./dev-python/breathe/breathe-4.34.0.ebuild
-2206170210 ./dev-python/brotlicffi/brotlicffi-1.0.9.2-r1.ebuild
+2210251440 ./dev-python/brotlicffi/brotlicffi-1.0.9.2-r2.ebuild
 2105171109 ./dev-python/brython/brython-3.9.0.ebuild
 2203092140 ./dev-python/brython/brython-3.10.5.ebuild
+2210242240 ./dev-python/brython/brython-3.11.ebuild
 2205181440 ./dev-python/bsddb3/bsddb3-6.2.9.ebuild
 2206212140 ./dev-python/cached-property/cached-property-1.5.2-r1.ebuild
 2207251040 ./dev-python/cachelib/cachelib-0.9.0.ebuild
@@ -10954,13 +10934,10 @@
 2206100640 ./dev-python/certifi/certifi-3021.3.16-r2.ebuild
 2208272110 ./dev-python/cffi/cffi-1.15.1.ebuild
 2205301410 ./dev-python/cfgv/cfgv-3.3.1.ebuild
-2209221110 ./dev-python/cfn-lint/cfn-lint-0.65.1.ebuild
-2209301140 ./dev-python/cfn-lint/cfn-lint-0.66.0.ebuild
-2210030410 ./dev-python/cfn-lint/cfn-lint-0.64.1.ebuild
-2210032310 ./dev-python/cfn-lint/cfn-lint-0.66.1.ebuild
-2210171510 ./dev-python/cfn-lint/cfn-lint-0.67.0.ebuild
-2210190710 ./dev-python/cfn-lint/cfn-lint-0.68.0.ebuild
 2210220940 ./dev-python/cfn-lint/cfn-lint-0.68.1.ebuild
+2210251610 ./dev-python/cfn-lint/cfn-lint-0.67.0.ebuild
+2210252340 ./dev-python/cfn-lint/cfn-lint-0.69.0.ebuild
+2210260610 ./dev-python/cfn-lint/cfn-lint-0.69.1.ebuild
 2206302040 ./dev-python/cftime/cftime-1.6.1.ebuild
 2209192140 ./dev-python/cftime/cftime-1.6.2.ebuild
 2205310540 ./dev-python/cgroup-utils/cgroup-utils-0.8-r1.ebuild
@@ -10980,10 +10957,10 @@
 2203110309 ./dev-python/clang-python/clang-python-13.0.1.ebuild
 2207302110 ./dev-python/clang-python/clang-python-14.0.6.ebuild
 2210072010 ./dev-python/clang-python/clang-python-16.0.0.9999.ebuild
-2210101140 ./dev-python/clang-python/clang-python-15.0.3.9999.ebuild
 2210162210 ./dev-python/clang-python/clang-python-16.0.0_pre20221016.ebuild
 2210181810 ./dev-python/clang-python/clang-python-15.0.3.ebuild
 2210231840 ./dev-python/clang-python/clang-python-16.0.0_pre20221023.ebuild
+2210241640 ./dev-python/clang-python/clang-python-15.0.4.9999.ebuild
 2208210210 ./dev-python/cleo/cleo-0.8.1-r1.ebuild
 2205252110 ./dev-python/cli_helpers/cli_helpers-2.2.1.ebuild
 2205252110 ./dev-python/cli_helpers/cli_helpers-9999.ebuild
@@ -11002,6 +10979,7 @@
 2208131510 ./dev-python/cmd2/cmd2-2.4.2.ebuild
 2112260340 ./dev-python/collective-checkdocs/collective-checkdocs-0.2-r1.ebuild
 2207242240 ./dev-python/colorama/colorama-0.4.5.ebuild
+2210251140 ./dev-python/colorama/colorama-0.4.6.ebuild
 2205231240 ./dev-python/colorclass/colorclass-2.2.2-r1.ebuild
 2108081639 ./dev-python/coloredlogs/coloredlogs-15.0.1.ebuild
 2210030410 ./dev-python/colorlog/colorlog-6.7.0.ebuild
@@ -11030,8 +11008,7 @@
 2208101610 ./dev-python/css-parser/css-parser-1.0.7-r1.ebuild
 2209261340 ./dev-python/css-parser/css-parser-1.0.8.ebuild
 2206121510 ./dev-python/cssselect/cssselect-1.1.0-r2.ebuild
-2206221010 ./dev-python/cssselect2/cssselect2-0.6.0.ebuild
-2209192140 ./dev-python/cssselect2/cssselect2-0.7.0.ebuild
+2210251310 ./dev-python/cssselect2/cssselect2-0.7.0.ebuild
 2209252140 ./dev-python/cssutils/cssutils-2.6.0.ebuild
 2203092240 ./dev-python/csvkit/csvkit-1.0.7.ebuild
 2210031140 ./dev-python/curtsies/curtsies-0.4.0.ebuild
@@ -11044,10 +11021,8 @@
 2205131240 ./dev-python/cython-test-exception-raiser/cython-test-exception-raiser-1.0.2-r1.ebuild
 2208311540 ./dev-python/cython/cython-0.29.32.ebuild
 2206131040 ./dev-python/daemonize/daemonize-2.5.0-r1.ebuild
-2209221110 ./dev-python/dask/dask-2022.9.1.ebuild
-2210011240 ./dev-python/dask/dask-2022.9.2.ebuild
-2210051440 ./dev-python/dask/dask-2022.9.0.ebuild
 2210171510 ./dev-python/dask/dask-2022.10.0.ebuild
+2210251610 ./dev-python/dask/dask-2022.9.2.ebuild
 2108082339 ./dev-python/dbfread/dbfread-2.0.7.ebuild
 2206171140 ./dev-python/dbfread/dbfread-2.0.7-r1.ebuild
 2210112040 ./dev-python/dbus-python/dbus-python-1.3.2.ebuild
@@ -11056,6 +11031,7 @@
 2209221110 ./dev-python/debugpy/debugpy-1.6.3.ebuild
 2206161210 ./dev-python/decorator/decorator-5.1.1-r1.ebuild
 2205212140 ./dev-python/deepmerge/deepmerge-1.0.1.ebuild
+2210252340 ./dev-python/deepmerge/deepmerge-1.1.0.ebuild
 2209192310 ./dev-python/defcon/defcon-0.10.2.ebuild
 2206121510 ./dev-python/defusedxml/defusedxml-0.7.1-r1.ebuild
 2205161640 ./dev-python/denonavr/denonavr-0.10.11.ebuild
@@ -11161,6 +11137,7 @@
 2209272140 ./dev-python/fakeredis/fakeredis-1.9.2.ebuild
 2209282140 ./dev-python/fakeredis/fakeredis-1.9.3.ebuild
 2210160910 ./dev-python/fakeredis/fakeredis-1.9.4.ebuild
+2210252340 ./dev-python/fakeredis/fakeredis-1.10.0.ebuild
 2210221910 ./dev-python/fasteners/fasteners-0.18.ebuild
 2205271310 ./dev-python/fastimport/fastimport-0.9.14.ebuild
 2210221910 ./dev-python/fastjsonschema/fastjsonschema-2.16.2.ebuild
@@ -11183,12 +11160,12 @@
 2109210939 ./dev-python/flask-api/flask-api-3.0.ebuild
 2201131910 ./dev-python/flask-assets/flask-assets-0.12.ebuild
 2203250209 ./dev-python/flask-babel/flask-babel-2.0.0.ebuild
-2206171140 ./dev-python/flask-compress/flask-compress-1.12.ebuild
-2209221110 ./dev-python/flask-compress/flask-compress-1.13.ebuild
+2210251310 ./dev-python/flask-compress/flask-compress-1.13.ebuild
 2206220840 ./dev-python/flask-cors/flask-cors-3.0.10-r1.ebuild
 2106051709 ./dev-python/flask-debug/flask-debug-0.4.3-r1.ebuild
 2106051709 ./dev-python/flask-gravatar/flask-gravatar-0.5.0.ebuild
 2111221109 ./dev-python/flask-htmlmin/flask-htmlmin-2.2.0.ebuild
+2210251140 ./dev-python/flask-htmlmin/flask-htmlmin-2.2.1.ebuild
 2208262110 ./dev-python/flask-login/flask-login-0.6.2.ebuild
 2111052009 ./dev-python/flask-migrate/flask-migrate-3.1.0.ebuild
 2112260340 ./dev-python/flask-nav/flask-nav-0.6-r4.ebuild
@@ -11212,11 +11189,8 @@
 2202221309 ./dev-python/flufl-lock/flufl-lock-7.0-r1.ebuild
 2208282340 ./dev-python/flufl-lock/flufl-lock-7.1.ebuild
 2209051040 ./dev-python/flufl-lock/flufl-lock-7.1.1.ebuild
-2209161010 ./dev-python/fonttools/fonttools-4.37.2.ebuild
-2209201110 ./dev-python/fonttools/fonttools-4.36.0.ebuild
-2209221110 ./dev-python/fonttools/fonttools-4.37.3.ebuild
-2210231110 ./dev-python/fonttools/fonttools-4.37.4.ebuild
 2210220940 ./dev-python/fonttools/fonttools-4.38.0.ebuild
+2210251610 ./dev-python/fonttools/fonttools-4.37.4.ebuild
 2206121510 ./dev-python/fqdn/fqdn-1.5.1-r2.ebuild
 2209192310 ./dev-python/freezegun/freezegun-1.2.2.ebuild
 2209051040 ./dev-python/fritzconnection/fritzconnection-1.10.2.ebuild
@@ -11262,10 +11236,10 @@
 2203270940 ./dev-python/google-auth-httplib2/google-auth-httplib2-0.1.0-r1.ebuild
 2206092240 ./dev-python/google-auth-oauthlib/google-auth-oauthlib-0.5.2.ebuild
 2209161240 ./dev-python/google-auth-oauthlib/google-auth-oauthlib-0.5.3.ebuild
-2209200340 ./dev-python/google-auth/google-auth-2.11.0.ebuild
-2209221110 ./dev-python/google-auth/google-auth-2.11.1.ebuild
-2209282140 ./dev-python/google-auth/google-auth-2.12.0.ebuild
+2210251140 ./dev-python/google-auth-oauthlib/google-auth-oauthlib-0.6.0.ebuild
+2210260610 ./dev-python/google-auth-oauthlib/google-auth-oauthlib-0.7.0.ebuild
 2210181010 ./dev-python/google-auth/google-auth-2.13.0.ebuild
+2210251410 ./dev-python/google-auth/google-auth-2.12.0.ebuild
 2111252209 ./dev-python/google-pasta/google-pasta-0.2.0-r1.ebuild
 2205221910 ./dev-python/google-reauth-python/google-reauth-python-0.1.1.ebuild
 2207242240 ./dev-python/googleapis-common-protos/googleapis-common-protos-1.56.4.ebuild
@@ -11280,6 +11254,7 @@
 2206231040 ./dev-python/gsd/gsd-2.5.3.ebuild
 2208192240 ./dev-python/gsd/gsd-2.6.0.ebuild
 2209200340 ./dev-python/gssapi/gssapi-1.8.1.ebuild
+2210252340 ./dev-python/gssapi/gssapi-1.8.2.ebuild
 2205280440 ./dev-python/gst-python/gst-python-1.20.2.ebuild
 2210202010 ./dev-python/gst-python/gst-python-1.20.3.ebuild
 2206221010 ./dev-python/guessit/guessit-3.4.3.ebuild
@@ -11292,6 +11267,7 @@
 2210061340 ./dev-python/h5py/h5py-3.7.0.ebuild
 2206162010 ./dev-python/happybase/happybase-1.2.0.ebuild
 2209200340 ./dev-python/hcloud-python/hcloud-python-1.18.0.ebuild
+2210252340 ./dev-python/hcloud-python/hcloud-python-1.18.1.ebuild
 2205171540 ./dev-python/helpdev/helpdev-0.7.1.ebuild
 2205311340 ./dev-python/hiredis/hiredis-2.0.0-r2.ebuild
 2205010512 ./dev-python/hpack/hpack-3.0.0.ebuild
@@ -11312,8 +11288,7 @@
 2210032310 ./dev-python/huawei-lte-api/huawei-lte-api-1.6.3.ebuild
 2210181010 ./dev-python/huawei-lte-api/huawei-lte-api-1.6.4.ebuild
 2109180139 ./dev-python/humanfriendly/humanfriendly-10.0.ebuild
-2209070040 ./dev-python/humanize/humanize-4.3.0.ebuild
-2209221110 ./dev-python/humanize/humanize-4.4.0.ebuild
+2210251210 ./dev-python/humanize/humanize-4.4.0.ebuild
 2109240940 ./dev-python/hvac/hvac-0.11.2.ebuild
 2209161110 ./dev-python/hvac/hvac-1.0.0.ebuild
 2210140740 ./dev-python/hvac/hvac-1.0.2.ebuild
@@ -11321,13 +11296,14 @@
 2205121940 ./dev-python/hyperframe/hyperframe-5.2.0-r1.ebuild
 2205121940 ./dev-python/hyperframe/hyperframe-6.0.1-r1.ebuild
 2205121710 ./dev-python/hyperlink/hyperlink-21.0.0-r1.ebuild
-2210181010 ./dev-python/hypothesis/hypothesis-6.56.3.ebuild
-2210221910 ./dev-python/hypothesis/hypothesis-6.56.2.ebuild
+2210251140 ./dev-python/hypothesis/hypothesis-6.56.2.ebuild
+2210251140 ./dev-python/hypothesis/hypothesis-6.56.3.ebuild
 2208151110 ./dev-python/icalendar/icalendar-4.1.0.ebuild
 2210181010 ./dev-python/icalendar/icalendar-5.0.0.ebuild
 2210232210 ./dev-python/icalendar/icalendar-5.0.1.ebuild
 2210032310 ./dev-python/identify/identify-2.5.6.ebuild
 2210082240 ./dev-python/identify/identify-2.5.5.ebuild
+2210251140 ./dev-python/identify/identify-2.5.7.ebuild
 2210221910 ./dev-python/idna/idna-3.4.ebuild
 2207251040 ./dev-python/ifaddr/ifaddr-0.2.0.ebuild
 2207111940 ./dev-python/ijson/ijson-3.1.4.ebuild
@@ -11336,8 +11312,7 @@
 2207241940 ./dev-python/imapclient/imapclient-2.3.1.ebuild
 2208162210 ./dev-python/iminuit/iminuit-2.16.0.ebuild
 2209272140 ./dev-python/iminuit/iminuit-2.17.0.ebuild
-2206241010 ./dev-python/immutables/immutables-0.18.ebuild
-2210222010 ./dev-python/immutables/immutables-0.19.ebuild
+2210251410 ./dev-python/immutables/immutables-0.19.ebuild
 2207291510 ./dev-python/importlib_metadata/importlib_metadata-4.12.0.ebuild
 2210022210 ./dev-python/importlib_metadata/importlib_metadata-4.13.0.ebuild
 2210032310 ./dev-python/importlib_metadata/importlib_metadata-5.0.0.ebuild
@@ -11363,6 +11338,7 @@
 2209270511 ./dev-python/ipykernel/ipykernel-6.16.0.ebuild
 2210022310 ./dev-python/ipykernel/ipykernel-6.15.3.ebuild
 2210210840 ./dev-python/ipykernel/ipykernel-6.16.1.ebuild
+2210260710 ./dev-python/ipykernel/ipykernel-6.16.2.ebuild
 2209261040 ./dev-python/ipyparallel/ipyparallel-8.4.1.ebuild
 2210102240 ./dev-python/ipython/ipython-8.5.0.ebuild
 2208172210 ./dev-python/ipython_genutils/ipython_genutils-0.2.0-r4.ebuild
@@ -11389,9 +11365,7 @@
 2208291410 ./dev-python/jaraco-stream/jaraco-stream-3.0.3-r1.ebuild
 2210090840 ./dev-python/jaraco-text/jaraco-text-3.9.1.ebuild
 2210210840 ./dev-python/jaraco-text/jaraco-text-3.10.0.ebuild
-2208222240 ./dev-python/jc/jc-1.21.0.ebuild
-2208292110 ./dev-python/jc/jc-1.21.2.ebuild
-2209280513 ./dev-python/jc/jc-1.22.0.ebuild
+2210242240 ./dev-python/jc/jc-1.22.1.ebuild
 2206161240 ./dev-python/jdcal/jdcal-1.4.1-r1.ebuild
 2205271240 ./dev-python/jedi/jedi-0.18.1.ebuild
 2210202310 ./dev-python/jedi/jedi-0.18.1-r1.ebuild
@@ -11431,6 +11405,7 @@
 2209261040 ./dev-python/jupyter_client/jupyter_client-7.3.5.ebuild
 2210121440 ./dev-python/jupyter_client/jupyter_client-7.4.2.ebuild
 2210210840 ./dev-python/jupyter_client/jupyter_client-7.4.3.ebuild
+2210260710 ./dev-python/jupyter_client/jupyter_client-7.4.4.ebuild
 2207250240 ./dev-python/jupyter_console/jupyter_console-6.4.4.ebuild
 2208082310 ./dev-python/jupyter_core/jupyter_core-4.11.1.ebuild
 2210211110 ./dev-python/jupyter_core/jupyter_core-4.11.2.ebuild
@@ -11446,12 +11421,12 @@
 2209261040 ./dev-python/jupyterlab/jupyterlab-3.4.5.ebuild
 2209261040 ./dev-python/jupyterlab/jupyterlab-3.4.7.ebuild
 2210122240 ./dev-python/jupyterlab/jupyterlab-3.4.8.ebuild
+2210242240 ./dev-python/jupyterlab/jupyterlab-3.5.0.ebuild
 2207161540 ./dev-python/jupyterlab_pygments/jupyterlab_pygments-0.2.2.ebuild
 2210132040 ./dev-python/jupyterlab_server/jupyterlab_server-2.16.0.ebuild
 2210211110 ./dev-python/jupyterlab_server/jupyterlab_server-2.16.1.ebuild
-2206221010 ./dev-python/jwcrypto/jwcrypto-1.3.1.ebuild
-2209152310 ./dev-python/jwcrypto/jwcrypto-1.4.2.ebuild
-2206161240 ./dev-python/k5test/k5test-0.10.1-r1.ebuild
+2210251440 ./dev-python/jwcrypto/jwcrypto-1.4.2.ebuild
+2210260710 ./dev-python/k5test/k5test-0.10.1-r2.ebuild
 2108021009 ./dev-python/kafka-python/kafka-python-2.0.2.ebuild
 2208091110 ./dev-python/kaitaistruct/kaitaistruct-0.10.ebuild
 2206251210 ./dev-python/kaptan/kaptan-0.5.12-r2.ebuild
@@ -11466,6 +11441,7 @@
 2210170840 ./dev-python/kombu/kombu-5.2.4.ebuild
 2210232210 ./dev-python/kombu/kombu-5.3.0_beta2.ebuild
 2209111110 ./dev-python/krb5/krb5-0.4.0.ebuild
+2210260710 ./dev-python/krb5/krb5-0.4.1.ebuild
 2205171540 ./dev-python/latexcodec/latexcodec-2.0.1.ebuild
 2206171610 ./dev-python/lazy-object-proxy/lazy-object-proxy-1.7.1-r1.ebuild
 2207200110 ./dev-python/ldap3/ldap3-2.9.1.ebuild
@@ -11493,10 +11469,10 @@
 2204212009 ./dev-python/lit/lit-13.0.1.ebuild
 2208022310 ./dev-python/lit/lit-14.0.6.ebuild
 2208052310 ./dev-python/lit/lit-16.0.0.9999.ebuild
-2210101140 ./dev-python/lit/lit-15.0.3.9999.ebuild
 2210162210 ./dev-python/lit/lit-16.0.0_pre20221016.ebuild
-2210181810 ./dev-python/lit/lit-15.0.3.ebuild
 2210231840 ./dev-python/lit/lit-16.0.0_pre20221023.ebuild
+2210251340 ./dev-python/lit/lit-15.0.3.ebuild
+2210241640 ./dev-python/lit/lit-15.0.4.9999.ebuild
 2209261040 ./dev-python/livereload/livereload-2.6.3.ebuild
 2207022141 ./dev-python/llfuse/llfuse-1.4.2.ebuild
 2206011110 ./dev-python/lmdb/lmdb-1.3.0.ebuild
@@ -11513,8 +11489,7 @@
 2207072010 ./dev-python/lxml/lxml-4.9.1.ebuild
 2208270240 ./dev-python/lz4/lz4-4.0.2.ebuild
 2206031140 ./dev-python/m2crypto/m2crypto-0.38.0.ebuild
-2209080010 ./dev-python/mako/mako-1.2.2.ebuild
-2209232340 ./dev-python/mako/mako-1.2.3.ebuild
+2210242240 ./dev-python/mako/mako-1.2.3.ebuild
 2206241640 ./dev-python/mamba/mamba-0.11.2.ebuild
 2206122240 ./dev-python/mando/mando-0.7.1.ebuild
 2207292010 ./dev-python/manuel/manuel-1.12.4.ebuild
@@ -11531,11 +11506,8 @@
 2208232110 ./dev-python/marshmallow/marshmallow-3.17.1.ebuild
 2209221340 ./dev-python/marshmallow/marshmallow-3.18.0.ebuild
 2209192310 ./dev-python/matplotlib-inline/matplotlib-inline-0.1.6.ebuild
-2209261040 ./dev-python/matplotlib/matplotlib-3.5.1-r2.ebuild
-2209261040 ./dev-python/matplotlib/matplotlib-3.5.2-r3.ebuild
-2209261040 ./dev-python/matplotlib/matplotlib-3.5.3.ebuild
-2210051110 ./dev-python/matplotlib/matplotlib-3.6.0-r1.ebuild
 2210110310 ./dev-python/matplotlib/matplotlib-3.6.1.ebuild
+2210251110 ./dev-python/matplotlib/matplotlib-3.5.3.ebuild
 2207041010 ./dev-python/matterhook/matterhook-0.2-r2.ebuild
 2110260909 ./dev-python/mccabe/mccabe-0.6.1-r2.ebuild
 2206170210 ./dev-python/mccabe/mccabe-0.7.0.ebuild
@@ -11544,6 +11516,7 @@
 2206011040 ./dev-python/mechanize/mechanize-0.4.8.ebuild
 2206221640 ./dev-python/mediafile/mediafile-0.9.0-r1.ebuild
 2210220940 ./dev-python/mediafile/mediafile-0.10.0.ebuild
+2210260640 ./dev-python/mediafile/mediafile-0.10.1.ebuild
 2206111440 ./dev-python/memory_profiler/memory_profiler-0.60.ebuild
 2205162340 ./dev-python/mergedeep/mergedeep-1.3.4.ebuild
 2207022141 ./dev-python/mergedict/mergedict-1.0.0-r1.ebuild
@@ -11565,13 +11538,12 @@
 2208022340 ./dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-1.1.0.ebuild
 2205241610 ./dev-python/mkdocs-material-extensions/mkdocs-material-extensions-1.0.3-r1.ebuild
 2210221040 ./dev-python/mkdocs-material-extensions/mkdocs-material-extensions-1.1.ebuild
-2209192140 ./dev-python/mkdocs-material/mkdocs-material-8.5.2.ebuild
-2210102140 ./dev-python/mkdocs-material/mkdocs-material-8.4.3.ebuild
 2210221410 ./dev-python/mkdocs-material/mkdocs-material-8.5.7.ebuild
+2210251610 ./dev-python/mkdocs-material/mkdocs-material-8.5.2.ebuild
 2206251210 ./dev-python/mkdocs-minify-plugin/mkdocs-minify-plugin-0.5.0-r2.ebuild
 2210221110 ./dev-python/mkdocs-minify-plugin/mkdocs-minify-plugin-0.6.0.ebuild
-2209221410 ./dev-python/mkdocs-redirects/mkdocs-redirects-1.2.0.ebuild
-2209260310 ./dev-python/mkdocs-redirects/mkdocs-redirects-1.1.0.ebuild
+2210252340 ./dev-python/mkdocs-minify-plugin/mkdocs-minify-plugin-0.6.1.ebuild
+2210251410 ./dev-python/mkdocs-redirects/mkdocs-redirects-1.2.0.ebuild
 2208192010 ./dev-python/mkdocs/mkdocs-1.3.1.ebuild
 2210021340 ./dev-python/mkdocs/mkdocs-1.4.0.ebuild
 2210160910 ./dev-python/mkdocs/mkdocs-1.4.1.ebuild
@@ -11644,11 +11616,9 @@
 2210141940 ./dev-python/nuitka/nuitka-1.1.5.ebuild
 2210211110 ./dev-python/nuitka/nuitka-1.1.6.ebuild
 2207251810 ./dev-python/numexpr/numexpr-2.8.3.ebuild
-2201260939 ./dev-python/numpy/numpy-1.21.5.ebuild
-2207112140 ./dev-python/numpy/numpy-1.22.4.ebuild
-2207291810 ./dev-python/numpy/numpy-1.23.1.ebuild
-2210091210 ./dev-python/numpy/numpy-1.23.3.ebuild
 2210132240 ./dev-python/numpy/numpy-1.23.4.ebuild
+2210251110 ./dev-python/numpy/numpy-1.22.4.ebuild
+2210251110 ./dev-python/numpy/numpy-1.23.3.ebuild
 2208311610 ./dev-python/numpydoc/numpydoc-1.4.0.ebuild
 2210101710 ./dev-python/numpydoc/numpydoc-1.5.0.ebuild
 2203312110 ./dev-python/oauth2client/oauth2client-4.1.3-r2.ebuild
@@ -11689,10 +11659,9 @@
 2202230809 ./dev-python/paho-mqtt/paho-mqtt-1.6.1.ebuild
 2112112340 ./dev-python/pallets-sphinx-themes/pallets-sphinx-themes-2.0.2.ebuild
 2107152139 ./dev-python/pandas-datareader/pandas-datareader-0.10.0.ebuild
-2209222140 ./dev-python/pandas/pandas-1.5.0.ebuild
-2210031140 ./dev-python/pandas/pandas-1.4.4.ebuild
-2210142040 ./dev-python/pandas/pandas-1.5.0-r1.ebuild
 2210191510 ./dev-python/pandas/pandas-1.5.1.ebuild
+2210251440 ./dev-python/pandas/pandas-1.5.0-r1.ebuild
+2210251110 ./dev-python/pandas/pandas-1.5.0.ebuild
 2207161540 ./dev-python/pandocfilters/pandocfilters-1.5.0.ebuild
 2105081609 ./dev-python/parallax/parallax-1.0.6.ebuild
 2209232010 ./dev-python/parameterized/parameterized-0.8.1-r2.ebuild
@@ -11725,8 +11694,7 @@
 2110201339 ./dev-python/pdoc3/pdoc3-0.10.0.ebuild
 2210221910 ./dev-python/pebble/pebble-5.0.2.ebuild
 2208022340 ./dev-python/pecan/pecan-1.4.2.ebuild
-2209221540 ./dev-python/peewee/peewee-3.15.3.ebuild
-2209260310 ./dev-python/peewee/peewee-3.15.2.ebuild
+2210251240 ./dev-python/peewee/peewee-3.15.3.ebuild
 2205200511 ./dev-python/pelican-minify/pelican-minify-0.9-r1.ebuild
 2209181710 ./dev-python/pendulum/pendulum-2.1.2-r2.ebuild
 2208301940 ./dev-python/pep517/pep517-0.13.0.ebuild
@@ -11786,9 +11754,8 @@
 2205181740 ./dev-python/pretty-yaml/pretty-yaml-21.10.1.ebuild
 2206212140 ./dev-python/prettytable/prettytable-3.3.0.ebuild
 2210030410 ./dev-python/prettytable/prettytable-3.4.1.ebuild
-2205010512 ./dev-python/priority/priority-1.3.0.ebuild
-2205121940 ./dev-python/priority/priority-1.3.0-r1.ebuild
 2205121940 ./dev-python/priority/priority-2.0.0-r1.ebuild
+2210251140 ./dev-python/priority/priority-1.3.0-r1.ebuild
 2207102010 ./dev-python/process-tests/process-tests-2.1.2-r1.ebuild
 2207102010 ./dev-python/progress/progress-1.6-r1.ebuild
 2201221539 ./dev-python/progressbar/progressbar-2.5.ebuild
@@ -11799,9 +11766,12 @@
 2210221910 ./dev-python/prompt_toolkit/prompt_toolkit-3.0.31.ebuild
 2210051440 ./dev-python/proto-plus/proto-plus-1.22.1.ebuild
 2204221509 ./dev-python/protobuf-python/protobuf-python-3.19.3-r2.ebuild
-2205181010 ./dev-python/protobuf-python/protobuf-python-9999.ebuild
 2207102240 ./dev-python/protobuf-python/protobuf-python-3.19.3-r3.ebuild
 2209021840 ./dev-python/protobuf-python/protobuf-python-3.20.1.ebuild
+2210260110 ./dev-python/protobuf-python/protobuf-python-3.19.6.ebuild
+2210260110 ./dev-python/protobuf-python/protobuf-python-3.20.3.ebuild
+2210260210 ./dev-python/protobuf-python/protobuf-python-4.21.8.ebuild
+2210260110 ./dev-python/protobuf-python/protobuf-python-9999.ebuild
 2110211709 ./dev-python/prov/prov-2.0.0.ebuild
 2203151640 ./dev-python/pslab-python/pslab-python-2.5.0.ebuild
 2207072240 ./dev-python/psutil/psutil-5.9.1.ebuild
@@ -11820,6 +11790,7 @@
 2112131909 ./dev-python/pweave/pweave-0.30.3-r1.ebuild
 2210170910 ./dev-python/py-amqp/py-amqp-5.1.1-r1.ebuild
 2107131039 ./dev-python/py-cpuinfo/py-cpuinfo-8.0.0.ebuild
+2210260640 ./dev-python/py-cpuinfo/py-cpuinfo-9.0.0.ebuild
 2206221910 ./dev-python/py-ubjson/py-ubjson-0.16.1-r1.ebuild
 2205100010 ./dev-python/py/py-1.11.0-r1.ebuild
 2203152140 ./dev-python/pyClamd/pyClamd-0.4.0-r3.ebuild
@@ -11858,7 +11829,7 @@
 2207251040 ./dev-python/pycryptodome/pycryptodome-3.15.0.ebuild
 2206232210 ./dev-python/pycson/pycson-0.8-r3.ebuild
 2205311310 ./dev-python/pycuda/pycuda-2021.1.ebuild
-2203181240 ./dev-python/pycups/pycups-2.0.1-r1.ebuild
+2210252210 ./dev-python/pycups/pycups-2.0.1-r1.ebuild
 2107030009 ./dev-python/pycurl-requests/pycurl-requests-0.2.1.ebuild
 2210101140 ./dev-python/pycurl-requests/pycurl-requests-0.5.0.ebuild
 2207150910 ./dev-python/pycurl/pycurl-7.45.1.ebuild
@@ -11901,16 +11872,18 @@
 2210140740 ./dev-python/pyhcl/pyhcl-0.4.4.ebuild
 2205151410 ./dev-python/pyicu/pyicu-2.9.ebuild
 2210240910 ./dev-python/pyicu/pyicu-2.10.ebuild
+2210242240 ./dev-python/pyicu/pyicu-2.10.1.ebuild
+2210260710 ./dev-python/pyicu/pyicu-2.10.2.ebuild
 2208172210 ./dev-python/pyinotify/pyinotify-0.9.6-r1.ebuild
 2207021740 ./dev-python/pyjsparser/pyjsparser-2.7.1_p20190421-r1.ebuild
 2210221910 ./dev-python/pyjwt/pyjwt-2.5.0.ebuild
 2210210840 ./dev-python/pyjwt/pyjwt-2.6.0.ebuild
-2107121909 ./dev-python/pykerberos/pykerberos-1.3.1.ebuild
-2210221910 ./dev-python/pykerberos/pykerberos-1.3.1-r1.ebuild
+2210251610 ./dev-python/pykerberos/pykerberos-1.3.1-r1.ebuild
 2205280810 ./dev-python/pykka/pykka-3.1.1.ebuild
 2208302040 ./dev-python/pykwalify/pykwalify-1.8.0-r2.ebuild
 2209110210 ./dev-python/pylama/pylama-8.4.1.ebuild
 2205282140 ./dev-python/pylast/pylast-5.0.0.ebuild
+2210252340 ./dev-python/pylast/pylast-5.1.0.ebuild
 2204251010 ./dev-python/pylatex/pylatex-1.4.1.ebuild
 2208210210 ./dev-python/pylev/pylev-1.4.0-r1.ebuild
 2105181909 ./dev-python/pylibacl/pylibacl-0.6.0.ebuild
@@ -11962,7 +11935,7 @@
 2208181010 ./dev-python/pypng/pypng-0.20220715.0.ebuild
 2205282140 ./dev-python/pyprof2calltree/pyprof2calltree-1.4.5-r1.ebuild
 2207021940 ./dev-python/pyproj/pyproj-3.3.1.ebuild
-2209100910 ./dev-python/pyproj/pyproj-3.4.0.ebuild
+2210252340 ./dev-python/pyproj/pyproj-3.4.0.ebuild
 2205161910 ./dev-python/pyproject2setuppy/pyproject2setuppy-22-r1.ebuild
 2209261040 ./dev-python/pypugjs/pypugjs-5.9.11.ebuild
 2209261040 ./dev-python/pypugjs/pypugjs-5.9.12.ebuild
@@ -12002,6 +11975,7 @@
 2208191140 ./dev-python/pyspelling/pyspelling-2.8.1.ebuild
 2203152111 ./dev-python/pyspf/pyspf-2.0.14-r3.ebuild
 2209192340 ./dev-python/pyspnego/pyspnego-0.6.0.ebuild
+2210260640 ./dev-python/pyspnego/pyspnego-0.6.1.ebuild
 2206010440 ./dev-python/pysrt/pysrt-9999.ebuild
 2207022141 ./dev-python/pysrt/pysrt-1.1.2-r1.ebuild
 2206051940 ./dev-python/pysvg/pysvg-0.2.2_p3-r1.ebuild
@@ -12021,6 +11995,7 @@
 2206161310 ./dev-python/pytest-describe/pytest-describe-2.0.1-r1.ebuild
 2201012139 ./dev-python/pytest-django/pytest-django-4.5.2.ebuild
 2206161310 ./dev-python/pytest-env/pytest-env-0.6.2-r1.ebuild
+2210250840 ./dev-python/pytest-env/pytest-env-0.8.1.ebuild
 2206131040 ./dev-python/pytest-expect/pytest-expect-1.1.0-r2.ebuild
 2206161310 ./dev-python/pytest-faulthandler/pytest-faulthandler-2.0.1-r1.ebuild
 2206131040 ./dev-python/pytest-fixture-config/pytest-fixture-config-1.7.0-r2.ebuild
@@ -12038,12 +12013,14 @@
 2210022240 ./dev-python/pytest-localserver/pytest-localserver-0.7.0.ebuild
 2206252010 ./dev-python/pytest-metadata/pytest-metadata-2.0.1.ebuild
 2207152140 ./dev-python/pytest-metadata/pytest-metadata-2.0.2.ebuild
+2210260610 ./dev-python/pytest-metadata/pytest-metadata-2.0.3.ebuild
 2207291510 ./dev-python/pytest-mock/pytest-mock-3.8.2.ebuild
 2209282140 ./dev-python/pytest-mock/pytest-mock-3.9.0.ebuild
 2210062010 ./dev-python/pytest-mock/pytest-mock-3.10.0.ebuild
 2205171540 ./dev-python/pytest-ordering/pytest-ordering-0.6.ebuild
 2209271040 ./dev-python/pytest-plus/pytest-plus-0.2-r1.ebuild
 2207242240 ./dev-python/pytest-qt/pytest-qt-4.1.0.ebuild
+2210260710 ./dev-python/pytest-qt/pytest-qt-4.2.0.ebuild
 2210221910 ./dev-python/pytest-regressions/pytest-regressions-2.4.1.ebuild
 2206131040 ./dev-python/pytest-rerunfailures/pytest-rerunfailures-10.2-r1.ebuild
 2203310510 ./dev-python/pytest-salt-factories/pytest-salt-factories-0.121.1-r1.ebuild
@@ -12067,6 +12044,7 @@
 2106111809 ./dev-python/pytest-verbose-parametrize/pytest-verbose-parametrize-1.7.0.ebuild
 2206131040 ./dev-python/pytest-virtualenv/pytest-virtualenv-1.7.0-r2.ebuild
 2206100640 ./dev-python/pytest-xdist/pytest-xdist-2.5.0-r1.ebuild
+2210252340 ./dev-python/pytest-xdist/pytest-xdist-3.0.2.ebuild
 2210022240 ./dev-python/pytest-xprocess/pytest-xprocess-0.20.0.ebuild
 2209100210 ./dev-python/pytest-xvfb/pytest-xvfb-2.0.0-r2.ebuild
 2210022240 ./dev-python/pytest/pytest-7.1.3.ebuild
@@ -12079,6 +12057,7 @@
 2209062110 ./dev-python/python-cstruct/python-cstruct-3.0.ebuild
 2209152340 ./dev-python/python-cstruct/python-cstruct-3.1.ebuild
 2210232210 ./dev-python/python-cstruct/python-cstruct-3.2.ebuild
+2210242240 ./dev-python/python-cstruct/python-cstruct-3.3.ebuild
 2108052239 ./dev-python/python-ctags/python-ctags-1.5.0.ebuild
 2208191140 ./dev-python/python-daemon/python-daemon-2.3.1.ebuild
 2210230810 ./dev-python/python-daemon/python-daemon-2.3.2.ebuild
@@ -12099,6 +12078,7 @@
 2210130110 ./dev-python/python-docs/python-docs-3.10.8.ebuild
 2210130110 ./dev-python/python-docs/python-docs-3.8.15.ebuild
 2210130110 ./dev-python/python-docs/python-docs-3.9.15.ebuild
+2210250010 ./dev-python/python-docs/python-docs-3.11.0.ebuild
 2210091940 ./dev-python/python-dotenv/python-dotenv-0.21.0.ebuild
 2208151110 ./dev-python/python-editor/python-editor-1.0.4-r2.ebuild
 2203141939 ./dev-python/python-efl/python-efl-1.26.0.ebuild
@@ -12114,8 +12094,7 @@
 2210030410 ./dev-python/python-keystoneclient/python-keystoneclient-5.0.1.ebuild
 2207251740 ./dev-python/python-keyutils/python-keyutils-0.6.ebuild
 2205140610 ./dev-python/python-ldap/python-ldap-9999.ebuild
-2208121410 ./dev-python/python-ldap/python-ldap-3.4.2.ebuild
-2210231110 ./dev-python/python-ldap/python-ldap-3.4.3.ebuild
+2210251610 ./dev-python/python-ldap/python-ldap-3.4.3.ebuild
 2111192339 ./dev-python/python-lhafile/python-lhafile-0.3.0.ebuild
 2207021510 ./dev-python/python-libevdev/python-libevdev-0.11.ebuild
 2110041109 ./dev-python/python-linux-procfs/python-linux-procfs-0.6.3.ebuild
@@ -12135,15 +12114,11 @@
 2205162310 ./dev-python/python-mpv/python-mpv-1.0.1.ebuild
 2108181109 ./dev-python/python-musicbrainzngs/python-musicbrainzngs-0.7.1.ebuild
 2204270240 ./dev-python/python-nbxmpp/python-nbxmpp-2.0.6.ebuild
-2209161240 ./dev-python/python-nbxmpp/python-nbxmpp-3.2.2.ebuild
-2209292140 ./dev-python/python-nbxmpp/python-nbxmpp-3.2.3.ebuild
-2210030410 ./dev-python/python-nbxmpp/python-nbxmpp-3.2.1.ebuild
-2210101140 ./dev-python/python-nbxmpp/python-nbxmpp-3.2.4.ebuild
+2210251410 ./dev-python/python-nbxmpp/python-nbxmpp-3.2.4.ebuild
 2108211009 ./dev-python/python-netlink/python-netlink-0.1.ebuild
 2210030410 ./dev-python/python-neutronclient/python-neutronclient-8.1.0.ebuild
 2210030410 ./dev-python/python-novaclient/python-novaclient-18.1.0.ebuild
 2209192340 ./dev-python/python-openstackclient/python-openstackclient-6.0.0.ebuild
-2110310939 ./dev-python/python-poppler-qt5/python-poppler-qt5-0.75.0.ebuild
 2206010511 ./dev-python/python-poppler-qt5/python-poppler-qt5-21.3.0.ebuild
 2105221409 ./dev-python/python-redmine/python-redmine-2.3.0.ebuild
 2208121940 ./dev-python/python-sense-hat/python-sense-hat-2.2.0-r3.ebuild
@@ -12158,8 +12133,7 @@
 2206161840 ./dev-python/python-utils/python-utils-3.3.3.ebuild
 2108201109 ./dev-python/python-varlink/python-varlink-30.3.1.ebuild
 2205162310 ./dev-python/python-vlc/python-vlc-3.0.16120.ebuild
-2110190339 ./dev-python/python-xlib/python-xlib-0.31.ebuild
-2207021910 ./dev-python/python-xlib/python-xlib-0.31-r1.ebuild
+2210251040 ./dev-python/python-xlib/python-xlib-0.31-r1.ebuild
 2203311710 ./dev-python/python-xmlsec/python-xmlsec-1.3.12-r1.ebuild
 2210172240 ./dev-python/python-xmp-toolkit/python-xmp-toolkit-2.0.1-r2.ebuild
 2106052139 ./dev-python/python-zipstream/python-zipstream-1.1.4.ebuild
@@ -12207,6 +12181,7 @@
 2209051610 ./dev-python/qstylizer/qstylizer-0.2.2.ebuild
 2206150040 ./dev-python/qtawesome/qtawesome-1.1.1-r1.ebuild
 2210201410 ./dev-python/qtawesome/qtawesome-1.2.0.ebuild
+2210251140 ./dev-python/qtawesome/qtawesome-1.2.1.ebuild
 2210040110 ./dev-python/qtconsole/qtconsole-5.3.2.ebuild
 2210082240 ./dev-python/qtsass/qtsass-0.3.2.ebuild
 2203152140 ./dev-python/quantities/quantities-0.13.0-r1.ebuild
@@ -12220,13 +12195,13 @@
 2206161310 ./dev-python/re-assert/re-assert-1.1.0-r1.ebuild
 2210081910 ./dev-python/readme_renderer/readme_renderer-37.2.ebuild
 2210221910 ./dev-python/readthedocs-sphinx-ext/readthedocs-sphinx-ext-2.1.9.ebuild
+2210260710 ./dev-python/readthedocs-sphinx-ext/readthedocs-sphinx-ext-2.2.0.ebuild
 2206221340 ./dev-python/rebulk/rebulk-3.1.0-r1.ebuild
 2207021540 ./dev-python/recommonmark/recommonmark-0.7.1-r1.ebuild
 2207260511 ./dev-python/redis-py/redis-py-4.3.4.ebuild
 2206290910 ./dev-python/reedsolomon/reedsolomon-1.5.4-r2.ebuild
 2206221640 ./dev-python/reflink/reflink-0.2.1-r3.ebuild
-2209201110 ./dev-python/regex/regex-2022.8.17.ebuild
-2210231110 ./dev-python/regex/regex-2022.9.13.ebuild
+2210252110 ./dev-python/regex/regex-2022.9.13.ebuild
 2209160610 ./dev-python/rencode/rencode-1.0.6-r3.ebuild
 2205281910 ./dev-python/reno/reno-3.5.0.ebuild
 2209260310 ./dev-python/reportlab/reportlab-3.6.11-r1.ebuild
@@ -12241,6 +12216,7 @@
 2206011040 ./dev-python/requests-oauthlib/requests-oauthlib-1.3.1.ebuild
 2206212210 ./dev-python/requests-toolbelt/requests-toolbelt-0.9.1-r1.ebuild
 2210071010 ./dev-python/requests-toolbelt/requests-toolbelt-0.10.0.ebuild
+2210251140 ./dev-python/requests-toolbelt/requests-toolbelt-0.10.1.ebuild
 2206220940 ./dev-python/requests-unixsocket/requests-unixsocket-0.3.0-r2.ebuild
 2210230910 ./dev-python/requests/requests-2.28.1-r1.ebuild
 2207022141 ./dev-python/requests_download/requests_download-0.1.2-r1.ebuild
@@ -12297,8 +12273,8 @@
 2206231210 ./dev-python/scipy/scipy-1.8.1.ebuild
 2208302010 ./dev-python/scipy/scipy-1.9.1.ebuild
 2210090310 ./dev-python/scipy/scipy-1.9.9999.ebuild
-2210241010 ./dev-python/scipy/scipy-1.9.2.ebuild
 2210211110 ./dev-python/scipy/scipy-1.9.3.ebuild
+2210251140 ./dev-python/scipy/scipy-1.9.2.ebuild
 2206131040 ./dev-python/scripttest/scripttest-1.3.0-r2.ebuild
 2205181810 ./dev-python/scrypt/scrypt-0.8.20.ebuild
 2210082240 ./dev-python/seaborn/seaborn-0.12.0.ebuild
@@ -12407,8 +12383,7 @@
 2205171540 ./dev-python/sphinxcontrib-trio/sphinxcontrib-trio-1.1.2.ebuild
 2206241510 ./dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.2.4-r2.ebuild
 2206011410 ./dev-python/sphobjinv/sphobjinv-2.2.2.ebuild
-2201282210 ./dev-python/spur/spur-0.3.22.ebuild
-2210151740 ./dev-python/spur/spur-0.3.22-r1.ebuild
+2210251310 ./dev-python/spur/spur-0.3.22-r1.ebuild
 2208291510 ./dev-python/spyder-kernels/spyder-kernels-2.3.3.ebuild
 2209261040 ./dev-python/spyder-terminal/spyder-terminal-1.2.2.ebuild
 2209051540 ./dev-python/spyder-unittest/spyder-unittest-0.5.1.ebuild
@@ -12427,8 +12402,7 @@
 2205290040 ./dev-python/statsd/statsd-3.3.0.ebuild
 2205072110 ./dev-python/statsmodels/statsmodels-0.13.2.ebuild
 2205171540 ./dev-python/stdio-mgr/stdio-mgr-1.0.1.ebuild
-2207151710 ./dev-python/stestr/stestr-3.2.1.ebuild
-2209231140 ./dev-python/stestr/stestr-4.0.1.ebuild
+2210242310 ./dev-python/stestr/stestr-4.0.1.ebuild
 2208131440 ./dev-python/stevedore/stevedore-4.0.0.ebuild
 2210132040 ./dev-python/stevedore/stevedore-4.0.1.ebuild
 2210210840 ./dev-python/stevedore/stevedore-4.0.2.ebuild
@@ -12458,11 +12432,11 @@
 2210221910 ./dev-python/tempest/tempest-32.0.0.ebuild
 2109100139 ./dev-python/tempita/tempita-0.5.3-r3.ebuild
 2208172210 ./dev-python/tempora/tempora-5.0.2.ebuild
-2209261040 ./dev-python/tenacity/tenacity-8.0.1-r1.ebuild
-2209261040 ./dev-python/tenacity/tenacity-8.1.0.ebuild
+2210251310 ./dev-python/tenacity/tenacity-8.1.0.ebuild
 2210221910 ./dev-python/termcolor/termcolor-2.0.1.ebuild
 2209261040 ./dev-python/terminado/terminado-0.15.0.ebuild
 2209292140 ./dev-python/terminado/terminado-0.16.0.ebuild
+2210260710 ./dev-python/terminado/terminado-0.17.0.ebuild
 2201271310 ./dev-python/terminaltables/terminaltables-9999.ebuild
 2202271539 ./dev-python/terminaltables/terminaltables-3.1.10-r1.ebuild
 2205162210 ./dev-python/test_server/test_server-0.0.40.ebuild
@@ -12472,8 +12446,7 @@
 2206281010 ./dev-python/testscenarios/testscenarios-0.5.0-r3.ebuild
 2206212140 ./dev-python/testtools/testtools-2.5.0-r1.ebuild
 2205171540 ./dev-python/text-unidecode/text-unidecode-1.3-r1.ebuild
-2209192140 ./dev-python/textdistance/textdistance-4.5.0.ebuild
-2209260310 ./dev-python/textdistance/textdistance-4.4.0.ebuild
+2210251410 ./dev-python/textdistance/textdistance-4.5.0.ebuild
 2206160910 ./dev-python/texttable/texttable-1.6.4-r1.ebuild
 2205162210 ./dev-python/threadpoolctl/threadpoolctl-3.1.0.ebuild
 2205171540 ./dev-python/three-merge/three-merge-0.1.1.ebuild
@@ -12497,6 +12470,7 @@
 2205162210 ./dev-python/toposort/toposort-1.7-r1.ebuild
 2210022240 ./dev-python/towncrier/towncrier-22.8.0.ebuild
 2210102140 ./dev-python/tox/tox-3.26.0.ebuild
+2210260640 ./dev-python/tox/tox-3.27.0.ebuild
 2210051110 ./dev-python/tqdm/tqdm-4.64.1.ebuild
 2210221910 ./dev-python/traitlets/traitlets-5.5.0.ebuild
 2210030410 ./dev-python/transitions/transitions-0.9.0.ebuild
@@ -12528,8 +12502,7 @@
 2208032040 ./dev-python/ubelt/ubelt-1.2.0.ebuild
 2208071140 ./dev-python/ubelt/ubelt-1.2.1.ebuild
 2209062110 ./dev-python/ubelt/ubelt-1.2.2.ebuild
-2210022210 ./dev-python/ujson/ujson-5.4.0.ebuild
-2210022210 ./dev-python/ujson/ujson-5.5.0.ebuild
+2210251440 ./dev-python/ujson/ujson-5.5.0.ebuild
 2112260340 ./dev-python/unasync/unasync-0.5.0.ebuild
 2108252139 ./dev-python/uncertainties/uncertainties-3.1.6.ebuild
 2210191240 ./dev-python/uncertainties/uncertainties-3.1.7.ebuild
@@ -12557,7 +12530,7 @@
 2109200939 ./dev-python/uvloop/uvloop-0.15.3.ebuild
 2207041010 ./dev-python/uvloop/uvloop-0.15.3-r1.ebuild
 2207041010 ./dev-python/uvloop/uvloop-0.16.0.ebuild
-2210231110 ./dev-python/uvloop/uvloop-0.17.0.ebuild
+2210251410 ./dev-python/uvloop/uvloop-0.17.0.ebuild
 2206052140 ./dev-python/validators/validators-0.20.0.ebuild
 2210022240 ./dev-python/vcrpy/vcrpy-4.2.1.ebuild
 2109262109 ./dev-python/vcstools/vcstools-0.1.42.ebuild
@@ -12569,6 +12542,7 @@
 2210170840 ./dev-python/vine/vine-5.0.0-r1.ebuild
 2206221340 ./dev-python/virtualenv-clone/virtualenv-clone-0.5.7.ebuild
 2210022310 ./dev-python/virtualenv/virtualenv-20.16.5.ebuild
+2210260710 ./dev-python/virtualenv/virtualenv-20.16.6.ebuild
 2112311009 ./dev-python/virtualenvwrapper/virtualenvwrapper-4.8.4-r1.ebuild
 2210120940 ./dev-python/virtualenvwrapper/virtualenvwrapper-4.8.4-r2.ebuild
 2205162010 ./dev-python/visitor/visitor-0.1.3-r2.ebuild
@@ -12577,6 +12551,7 @@
 2206161340 ./dev-python/vobject/vobject-0.9.6.1-r3.ebuild
 2205290040 ./dev-python/voluptuous/voluptuous-0.13.1-r1.ebuild
 2206171440 ./dev-python/vpython/vpython-7.6.3.ebuild
+2210252040 ./dev-python/vpython/vpython-7.6.4.ebuild
 2207021640 ./dev-python/waitress/waitress-2.1.2.ebuild
 2208042110 ./dev-python/wand/wand-0.6.9.ebuild
 2208152240 ./dev-python/wand/wand-0.6.10.ebuild
@@ -12596,6 +12571,7 @@
 2206161210 ./dev-python/webob/webob-1.8.7-r1.ebuild
 2209252110 ./dev-python/websocket-client/websocket-client-1.4.1.ebuild
 2206051240 ./dev-python/websockets/websockets-10.3.ebuild
+2210260710 ./dev-python/websockets/websockets-10.4.ebuild
 2206171440 ./dev-python/websockify/websockify-0.10.0-r1.ebuild
 2206161240 ./dev-python/webtest/webtest-3.0.0-r1.ebuild
 2210130810 ./dev-python/werkzeug/werkzeug-2.2.2.ebuild
@@ -12705,8 +12681,7 @@
 2205150940 ./dev-python/socksio/socksio-1.0.0.ebuild
 2210130240 ./dev-python/python3-xapp/python3-xapp-2.2.1-r1.ebuild
 2210130240 ./dev-python/python3-xapp/python3-xapp-2.2.2.ebuild
-2209181140 ./dev-python/markdown-it-py/markdown-it-py-2.1.0-r1.ebuild
-2210231110 ./dev-python/markdown-it-py/markdown-it-py-2.1.0-r2.ebuild
+2210251610 ./dev-python/markdown-it-py/markdown-it-py-2.1.0-r2.ebuild
 2207070110 ./dev-python/mdit-py-plugins/mdit-py-plugins-0.3.0.ebuild
 2210071010 ./dev-python/mdit-py-plugins/mdit-py-plugins-0.3.1.ebuild
 2210071010 ./dev-python/mdurl/mdurl-0.1.2.ebuild
@@ -12729,6 +12704,7 @@
 2210032310 ./dev-python/trimesh/trimesh-3.15.3.ebuild
 2210121440 ./dev-python/trimesh/trimesh-3.15.4.ebuild
 2210140840 ./dev-python/trimesh/trimesh-3.15.5.ebuild
+2210260640 ./dev-python/trimesh/trimesh-3.15.7.ebuild
 2205011710 ./dev-python/antlr4-python3-runtime/antlr4-python3-runtime-4.10.1.ebuild
 2209051040 ./dev-python/antlr4-python3-runtime/antlr4-python3-runtime-4.11.1.ebuild
 2209221810 ./dev-python/mapbox_earcut/mapbox_earcut-1.0.0.ebuild
@@ -12785,14 +12761,13 @@
 2209281510 ./dev-python/exceptiongroup/exceptiongroup-1.0.0_rc9.ebuild
 2209261040 ./dev-python/flit_scm/flit_scm-1.7.0.ebuild
 2209152040 ./dev-python/setuptools-rust/setuptools-rust-1.5.1.ebuild
-2210222010 ./dev-python/setuptools-rust/setuptools-rust-1.5.2.ebuild
+2210251310 ./dev-python/setuptools-rust/setuptools-rust-1.5.2.ebuild
 2208131440 ./dev-python/dirty-equals/dirty-equals-0.4-r1.ebuild
 2208311240 ./dev-python/dirty-equals/dirty-equals-0.5.0.ebuild
 2209051640 ./dev-python/tpm2-pytss/tpm2-pytss-1.2.0.ebuild
 2210042310 ./dev-python/watchfiles/watchfiles-0.17.0.ebuild
 2210211110 ./dev-python/watchfiles/watchfiles-0.18.0.ebuild
-2206080240 ./dev-python/zope-hookable/zope-hookable-5.1.0.ebuild
-2210221910 ./dev-python/zope-hookable/zope-hookable-5.2.ebuild
+2210251410 ./dev-python/zope-hookable/zope-hookable-5.2.ebuild
 2205271410 ./dev-python/lark/lark-1.1.2.ebuild
 2210111540 ./dev-python/lark/lark-1.1.3.ebuild
 2210231510 ./dev-python/python-pam/python-pam-2.0.2-r2.ebuild
@@ -12811,19 +12786,19 @@
 2208212110 ./dev-python/pathvalidate/pathvalidate-2.5.2.ebuild
 2205282010 ./dev-python/tcolorpy/tcolorpy-0.1.2.ebuild
 2207312140 ./dev-python/tcolorpy/tcolorpy-0.1.2-r1.ebuild
-2208071110 ./dev-python/kgb/kgb-7.1.1.ebuild
-2206250010 ./dev-python/pydiffx/pydiffx-1.0.1-r1.ebuild
+2210251610 ./dev-python/kgb/kgb-7.1.1.ebuild
 2209192140 ./dev-python/pydiffx/pydiffx-1.1.ebuild
+2210251610 ./dev-python/pydiffx/pydiffx-1.0.1-r1.ebuild
 2205242210 ./dev-python/openapi-schema-validator/openapi-schema-validator-0.2.3.ebuild
 2210072340 ./dev-python/openapi-schema-validator/openapi-schema-validator-0.3.4.ebuild
 2206251210 ./dev-python/openapi-spec-validator/openapi-spec-validator-0.4.0.ebuild
 2210081540 ./dev-python/openapi-spec-validator/openapi-spec-validator-0.5.1.ebuild
 2206131040 ./dev-python/versioningit/versioningit-2.0.0.ebuild
 2208252240 ./dev-python/versioningit/versioningit-2.0.1.ebuild
-2208302040 ./dev-python/pytest-httpserver/pytest-httpserver-1.0.5.ebuild
-2210140740 ./dev-python/pytest-httpserver/pytest-httpserver-1.0.6.ebuild
+2210260610 ./dev-python/versioningit/versioningit-2.1.0.ebuild
+2210251310 ./dev-python/pytest-httpserver/pytest-httpserver-1.0.6.ebuild
 2210011240 ./dev-python/meson-python/meson-python-0.9.0.ebuild
-2210241010 ./dev-python/meson-python/meson-python-0.10.0.ebuild
+2210251140 ./dev-python/meson-python/meson-python-0.10.0.ebuild
 2210221910 ./dev-python/sphinx-pytest/sphinx-pytest-0.0.5.ebuild
 2208310140 ./dev-python/tlsh/tlsh-4.8.2.ebuild
 2210122240 ./dev-python/check-manifest/check-manifest-0.48.ebuild
@@ -12832,10 +12807,11 @@
 2210122240 ./dev-python/openapi-core/openapi-core-0.14.5.ebuild
 2210122240 ./dev-python/openapi-core/openapi-core-0.16.1.ebuild
 2206120940 ./dev-python/pyproject-metadata/pyproject-metadata-0.5.0.ebuild
-2210241010 ./dev-python/pyproject-metadata/pyproject-metadata-0.6.1.ebuild
+2210251140 ./dev-python/pyproject-metadata/pyproject-metadata-0.6.1.ebuild
 2208150840 ./dev-python/yaxmldiff/yaxmldiff-0.1.0.ebuild
 2209161010 ./dev-python/qpageview/qpageview-0.6.2.ebuild
 2209070040 ./dev-python/pytoolconfig/pytoolconfig-1.2.2.ebuild
+2210251210 ./dev-python/pytoolconfig/pytoolconfig-1.2.2-r1.ebuild
 2206251440 ./dev-python/calver/calver-2021.7.30.ebuild
 2206290940 ./dev-python/calver/calver-2022.06.26.ebuild
 2209222340 ./dev-python/configupdater/configupdater-3.1.1.ebuild
@@ -12853,8 +12829,7 @@
 2210030410 ./dev-python/shapely/shapely-1.8.4.ebuild
 2210132040 ./dev-python/shapely/shapely-1.8.5_p1.ebuild
 2209082310 ./dev-python/pygccxml/pygccxml-2.2.1.ebuild
-2209221110 ./dev-python/canonicaljson/canonicaljson-1.6.2.ebuild
-2209232340 ./dev-python/canonicaljson/canonicaljson-1.6.3.ebuild
+2210251240 ./dev-python/canonicaljson/canonicaljson-1.6.3.ebuild
 2209221110 ./dev-python/frozendict/frozendict-2.3.4.ebuild
 2208232340 ./dev-python/matrix-common/matrix-common-1.2.1.ebuild
 2210171540 ./dev-python/matrix-common/matrix-common-1.3.0.ebuild
@@ -12906,11 +12881,12 @@
 2210151110 ./dev-python/Levenshtein/Levenshtein-0.20.6.ebuild
 2210181010 ./dev-python/Levenshtein/Levenshtein-0.20.7.ebuild
 2210042240 ./dev-python/jarowinkler/jarowinkler-1.2.3.ebuild
-2210231110 ./dev-python/linkify-it-py/linkify-it-py-2.0.0.ebuild
+2210251610 ./dev-python/linkify-it-py/linkify-it-py-2.0.0.ebuild
 2210042240 ./dev-python/rapidfuzz/rapidfuzz-2.11.0.ebuild
 2210052240 ./dev-python/rapidfuzz/rapidfuzz-2.11.1-r1.ebuild
+2210251140 ./dev-python/rapidfuzz/rapidfuzz-2.12.0.ebuild
 2210042240 ./dev-python/rapidfuzz_capi/rapidfuzz_capi-1.0.5.ebuild
-2210231110 ./dev-python/uc-micro-py/uc-micro-py-1.0.1.ebuild
+2210251610 ./dev-python/uc-micro-py/uc-micro-py-1.0.1.ebuild
 2209250040 ./dev-python/colour/colour-0.1.5.ebuild
 2210110310 ./dev-python/contourpy/contourpy-1.0.5.ebuild
 2209232010 ./dev-python/keyrings-alt/keyrings-alt-4.2.0.ebuild
@@ -13302,14 +13278,14 @@
 2209041540 ./dev-ros/gazebo_ros_control/gazebo_ros_control-2.9.1-r1.ebuild
 2209041540 ./dev-ros/gazebo_ros_control/gazebo_ros_control-2.9.2-r1.ebuild
 2209041540 ./dev-ros/gazebo_ros_control/gazebo_ros_control-9999.ebuild
-2008171609 ./dev-ros/gencpp/gencpp-0.6.5.ebuild
 2008171609 ./dev-ros/gencpp/gencpp-9999.ebuild
+2210251440 ./dev-ros/gencpp/gencpp-0.7.0.ebuild
 2009041539 ./dev-ros/geneus/geneus-3.0.0-r1.ebuild
 2009041539 ./dev-ros/geneus/geneus-9999.ebuild
 2007291539 ./dev-ros/genlisp/genlisp-0.4.18.ebuild
 2007291539 ./dev-ros/genlisp/genlisp-9999.ebuild
-2007291539 ./dev-ros/genmsg/genmsg-0.5.16.ebuild
 2007291539 ./dev-ros/genmsg/genmsg-9999.ebuild
+2210251440 ./dev-ros/genmsg/genmsg-0.6.0.ebuild
 2008171609 ./dev-ros/gennodejs/gennodejs-2.0.1.ebuild
 2008171609 ./dev-ros/gennodejs/gennodejs-9999.ebuild
 2108091909 ./dev-ros/genpy/genpy-0.6.16.ebuild
@@ -14087,48 +14063,59 @@
 2203081940 ./dev-ros/test_rosservice/test_rosservice-1.15.14.ebuild
 2209041540 ./dev-ros/test_tf2/test_tf2-0.7.5-r1.ebuild
 2209041540 ./dev-ros/test_tf2/test_tf2-9999.ebuild
+2210251440 ./dev-ros/test_tf2/test_tf2-0.7.6.ebuild
 2209041540 ./dev-ros/tf/tf-1.13.2-r4.ebuild
 2209041540 ./dev-ros/tf/tf-9999.ebuild
 2209041540 ./dev-ros/tf2/tf2-0.7.2-r1.ebuild
 2209041540 ./dev-ros/tf2/tf2-0.7.3-r1.ebuild
 2209041540 ./dev-ros/tf2/tf2-0.7.5-r1.ebuild
 2209041540 ./dev-ros/tf2/tf2-9999.ebuild
+2210251440 ./dev-ros/tf2/tf2-0.7.6.ebuild
 2008241709 ./dev-ros/tf2_bullet/tf2_bullet-0.7.2.ebuild
 2008311239 ./dev-ros/tf2_bullet/tf2_bullet-0.7.3.ebuild
 2009032009 ./dev-ros/tf2_bullet/tf2_bullet-0.7.5.ebuild
 2008241709 ./dev-ros/tf2_bullet/tf2_bullet-9999.ebuild
+2210251440 ./dev-ros/tf2_bullet/tf2_bullet-0.7.6.ebuild
 2008241709 ./dev-ros/tf2_eigen/tf2_eigen-0.7.2.ebuild
 2008311239 ./dev-ros/tf2_eigen/tf2_eigen-0.7.3.ebuild
 2009032009 ./dev-ros/tf2_eigen/tf2_eigen-0.7.5.ebuild
 2008241709 ./dev-ros/tf2_eigen/tf2_eigen-9999.ebuild
+2210251440 ./dev-ros/tf2_eigen/tf2_eigen-0.7.6.ebuild
 2007301809 ./dev-ros/tf2_geometry_msgs/tf2_geometry_msgs-0.7.2.ebuild
 2008311239 ./dev-ros/tf2_geometry_msgs/tf2_geometry_msgs-0.7.3.ebuild
 2009032009 ./dev-ros/tf2_geometry_msgs/tf2_geometry_msgs-0.7.5.ebuild
 2007301809 ./dev-ros/tf2_geometry_msgs/tf2_geometry_msgs-9999.ebuild
+2210251440 ./dev-ros/tf2_geometry_msgs/tf2_geometry_msgs-0.7.6.ebuild
 2007291539 ./dev-ros/tf2_kdl/tf2_kdl-0.7.2.ebuild
 2008311239 ./dev-ros/tf2_kdl/tf2_kdl-0.7.3.ebuild
 2009032009 ./dev-ros/tf2_kdl/tf2_kdl-0.7.5.ebuild
 2007291539 ./dev-ros/tf2_kdl/tf2_kdl-9999.ebuild
+2210251440 ./dev-ros/tf2_kdl/tf2_kdl-0.7.6.ebuild
 2007091409 ./dev-ros/tf2_msgs/tf2_msgs-0.7.2.ebuild
 2008311239 ./dev-ros/tf2_msgs/tf2_msgs-0.7.3.ebuild
 2009032009 ./dev-ros/tf2_msgs/tf2_msgs-0.7.5.ebuild
 2007091409 ./dev-ros/tf2_msgs/tf2_msgs-9999.ebuild
+2210251440 ./dev-ros/tf2_msgs/tf2_msgs-0.7.6.ebuild
 2007291539 ./dev-ros/tf2_py/tf2_py-0.7.2.ebuild
 2008311239 ./dev-ros/tf2_py/tf2_py-0.7.3.ebuild
 2009032009 ./dev-ros/tf2_py/tf2_py-0.7.5.ebuild
 2007291539 ./dev-ros/tf2_py/tf2_py-9999.ebuild
+2210251440 ./dev-ros/tf2_py/tf2_py-0.7.6.ebuild
 2209041540 ./dev-ros/tf2_ros/tf2_ros-0.7.2-r1.ebuild
 2209041540 ./dev-ros/tf2_ros/tf2_ros-0.7.3-r1.ebuild
 2209041540 ./dev-ros/tf2_ros/tf2_ros-0.7.5-r1.ebuild
 2209041540 ./dev-ros/tf2_ros/tf2_ros-9999.ebuild
+2210251440 ./dev-ros/tf2_ros/tf2_ros-0.7.6.ebuild
 2008071809 ./dev-ros/tf2_sensor_msgs/tf2_sensor_msgs-0.7.2.ebuild
 2008311239 ./dev-ros/tf2_sensor_msgs/tf2_sensor_msgs-0.7.3.ebuild
 2009032009 ./dev-ros/tf2_sensor_msgs/tf2_sensor_msgs-0.7.5.ebuild
 2008071809 ./dev-ros/tf2_sensor_msgs/tf2_sensor_msgs-9999.ebuild
+2210251440 ./dev-ros/tf2_sensor_msgs/tf2_sensor_msgs-0.7.6.ebuild
 2007291539 ./dev-ros/tf2_tools/tf2_tools-0.7.2.ebuild
 2008311239 ./dev-ros/tf2_tools/tf2_tools-0.7.3.ebuild
 2009032009 ./dev-ros/tf2_tools/tf2_tools-0.7.5.ebuild
 2007291539 ./dev-ros/tf2_tools/tf2_tools-9999.ebuild
+2210251440 ./dev-ros/tf2_tools/tf2_tools-0.7.6.ebuild
 2008071809 ./dev-ros/tf_conversions/tf_conversions-1.13.2-r1.ebuild
 2008071809 ./dev-ros/tf_conversions/tf_conversions-9999.ebuild
 2007091409 ./dev-ros/theora_image_transport/theora_image_transport-1.14.0.ebuild
@@ -15781,6 +15768,7 @@
 2201031609 ./dev-util/ccache/ccache-4.5.1.ebuild
 2208272210 ./dev-util/ccache/ccache-4.6.3.ebuild
 2210182240 ./dev-util/ccache/ccache-4.7.ebuild
+2210241540 ./dev-util/ccache/ccache-4.7.1.ebuild
 2207122340 ./dev-util/cccc/cccc-3.1.6-r1.ebuild
 2203280440 ./dev-util/ccls/ccls-0.20210330-r1.ebuild
 2203280440 ./dev-util/ccls/ccls-0.20210330.ebuild
@@ -15797,6 +15785,7 @@
 2205112210 ./dev-util/chroot-wrapper/chroot-wrapper-0.9.9.ebuild
 2209122040 ./dev-util/clair/clair-4.4.4.ebuild
 2205271010 ./dev-util/clazy/clazy-1.11-r1.ebuild
+2210252210 ./dev-util/clazy/clazy-1.11-r2.ebuild
 2102220109 ./dev-util/clinfo/clinfo-3.0.21.02.21.ebuild
 2004090109 ./dev-util/clinfo/clinfo-9999.ebuild
 2210052210 ./dev-util/clion/clion-2022.1.3-r1.ebuild
@@ -15885,7 +15874,7 @@
 2201121510 ./dev-util/cwdiff/cwdiff-0.4.0.ebuild
 2201121510 ./dev-util/cwdiff/cwdiff-9999.ebuild
 2205202240 ./dev-util/d-feet/d-feet-0.3.16.ebuild
-2210191340 ./dev-util/dbus-test-runner/dbus-test-runner-19.04.0-r2.ebuild
+2210252210 ./dev-util/dbus-test-runner/dbus-test-runner-19.04.0-r2.ebuild
 2202060009 ./dev-util/ddd/ddd-3.3.12-r5.ebuild
 2208222040 ./dev-util/debhelper/debhelper-13.2.1.ebuild
 2109230439 ./dev-util/debootstrap/debootstrap-1.0.123.ebuild
@@ -15945,8 +15934,9 @@
 2208150840 ./dev-util/gcovr/gcovr-5.2.ebuild
 2208170910 ./dev-util/gdbus-codegen/gdbus-codegen-2.72.3.ebuild
 2209180740 ./dev-util/gdbus-codegen/gdbus-codegen-2.74.0.ebuild
+2210251840 ./dev-util/gdbus-codegen/gdbus-codegen-2.74.1.ebuild
 2206161210 ./dev-util/geany-plugins/geany-plugins-1.38-r1.ebuild
-2210101640 ./dev-util/geany-plugins/geany-plugins-1.38-r2.ebuild
+2210251610 ./dev-util/geany-plugins/geany-plugins-1.38-r2.ebuild
 2106301339 ./dev-util/geany/geany-1.37.1.ebuild
 2110101739 ./dev-util/geany/geany-9999.ebuild
 2206161210 ./dev-util/geany/geany-1.38.ebuild
@@ -15963,6 +15953,7 @@
 2210191340 ./dev-util/glade/glade-3.40.0.ebuild
 2208170910 ./dev-util/glib-utils/glib-utils-2.72.3.ebuild
 2209180740 ./dev-util/glib-utils/glib-utils-2.74.0.ebuild
+2210251840 ./dev-util/glib-utils/glib-utils-2.74.1.ebuild
 2210030410 ./dev-util/global/global-6.6.4.ebuild
 2208191140 ./dev-util/glslang/glslang-1.3.216.ebuild
 2208191140 ./dev-util/glslang/glslang-9999.ebuild
@@ -16043,8 +16034,7 @@
 2202262309 ./dev-util/kcov/kcov-9999.ebuild
 2209180110 ./dev-util/kcov/kcov-40.ebuild
 2111072039 ./dev-util/kdbg/kdbg-3.0.1-r1.ebuild
-2204222140 ./dev-util/kdevelop-pg-qt/kdevelop-pg-qt-2.2.1.ebuild
-2210041040 ./dev-util/kdevelop-pg-qt/kdevelop-pg-qt-2.2.1_p20220904.ebuild
+2210252210 ./dev-util/kdevelop-pg-qt/kdevelop-pg-qt-2.2.1_p20220904.ebuild
 2208151740 ./dev-util/kdevelop-php/kdevelop-php-22.04.3.ebuild
 2210131640 ./dev-util/kdevelop-php/kdevelop-php-22.08.2.ebuild
 2208151740 ./dev-util/kdevelop-python/kdevelop-python-22.04.3.ebuild
@@ -16066,11 +16056,11 @@
 2104192239 ./dev-util/linklint/linklint-2.3.5.ebuild
 2204212009 ./dev-util/lldb/lldb-13.0.1.ebuild
 2207311440 ./dev-util/lldb/lldb-14.0.6.ebuild
-2210101140 ./dev-util/lldb/lldb-15.0.3.9999.ebuild
 2210162210 ./dev-util/lldb/lldb-16.0.0_pre20221016.ebuild
 2210181810 ./dev-util/lldb/lldb-15.0.3.ebuild
 2210231610 ./dev-util/lldb/lldb-16.0.0.9999.ebuild
 2210231840 ./dev-util/lldb/lldb-16.0.0_pre20221023.ebuild
+2210241640 ./dev-util/lldb/lldb-15.0.4.9999.ebuild
 2203200410 ./dev-util/lockrun/lockrun-20120508-r1.ebuild
 1911050009 ./dev-util/lsuio/lsuio-0.2.0-r1.ebuild
 2111252139 ./dev-util/ltrace/ltrace-0.7.3.6.1.ebuild
@@ -16104,11 +16094,10 @@
 2210131940 ./dev-util/meld/meld-3.22.0-r1.ebuild
 2103152309 ./dev-util/memprof/memprof-0.6.2-r1.ebuild
 2207072310 ./dev-util/meson-format-array/meson-format-array-0.ebuild
-2207050240 ./dev-util/meson/meson-0.63.0.ebuild
 2207060910 ./dev-util/meson/meson-0.62.2.ebuild
-2208190240 ./dev-util/meson/meson-0.63.1.ebuild
 2209111840 ./dev-util/meson/meson-9999.ebuild
-2210222010 ./dev-util/meson/meson-0.63.2-r1.ebuild
+2210251140 ./dev-util/meson/meson-0.63.2-r1.ebuild
+2210251140 ./dev-util/meson/meson-0.63.3.ebuild
 2210080410 ./dev-util/min-cscope/min-cscope-16.1.0-r2.ebuild
 2210231040 ./dev-util/mingw64-runtime/mingw64-runtime-10.0.0-r1.ebuild
 2210231040 ./dev-util/mingw64-runtime/mingw64-runtime-8.0.0-r3.ebuild
@@ -16143,7 +16132,7 @@
 2201061240 ./dev-util/patchbin/patchbin-20160208.ebuild
 2201061240 ./dev-util/patchbin/patchbin-99999999.ebuild
 2203211239 ./dev-util/patchelf/patchelf-0.14.5.ebuild
-2210241010 ./dev-util/patchelf/patchelf-0.15.0.ebuild
+2210251140 ./dev-util/patchelf/patchelf-0.15.0.ebuild
 2202021409 ./dev-util/patchutils/patchutils-0.4.2.ebuild
 2204190039 ./dev-util/patdiff/patdiff-0.14.0-r1.ebuild
 2204272340 ./dev-util/patdiff/patdiff-0.15.0.ebuild
@@ -16204,8 +16193,9 @@
 2206282010 ./dev-util/rats/rats-2.4-r1.ebuild
 2201221309 ./dev-util/rbtools/rbtools-2.0.1.ebuild
 2206250010 ./dev-util/rbtools/rbtools-3.1.ebuild
-2209010410 ./dev-util/rbtools/rbtools-3.1.1.ebuild
 2210050840 ./dev-util/rbtools/rbtools-3.1.2.ebuild
+2210251610 ./dev-util/rbtools/rbtools-3.1.1.ebuild
+2210250910 ./dev-util/rbtools/rbtools-4.0.ebuild
 2105101839 ./dev-util/re2c/re2c-2.1.1-r1.ebuild
 2204291110 ./dev-util/re2c/re2c-2.2.ebuild
 2006212039 ./dev-util/rebar/rebar-2.6.4-r1.ebuild
@@ -16274,8 +16264,8 @@
 2106190039 ./dev-util/sel/sel-0.08.4-r2.ebuild
 2007171109 ./dev-util/serialtalk/serialtalk-1.2-r1.ebuild
 2005042039 ./dev-util/serialtalk/serialtalk-9999.ebuild
-2004060109 ./dev-util/sgb/sgb-20030623-r1.ebuild
-2004060109 ./dev-util/sgb/sgb-20090810.ebuild
+2210242240 ./dev-util/sgb/sgb-20030623-r1.ebuild
+2210242240 ./dev-util/sgb/sgb-20090810-r1.ebuild
 2205140840 ./dev-util/shadowman/shadowman-3.ebuild
 2108261409 ./dev-util/shards/shards-0.15.0-r1.ebuild
 1812181639 ./dev-util/shc/shc-3.9.6.ebuild
@@ -16422,7 +16412,7 @@
 2210030440 ./dev-util/FlameGraph/FlameGraph-1.0_p20210830.ebuild
 2210030440 ./dev-util/FlameGraph/FlameGraph-9999.ebuild
 2204181240 ./dev-util/tree-sitter-cli/tree-sitter-cli-0.20.6.ebuild
-2210210040 ./dev-util/tree-sitter-cli/tree-sitter-cli-0.20.7.ebuild
+2210251440 ./dev-util/tree-sitter-cli/tree-sitter-cli-0.20.7.ebuild
 2203270640 ./dev-util/Tensile/Tensile-4.3.0-r1.ebuild
 2209220440 ./dev-util/Tensile/Tensile-5.0.2-r2.ebuild
 2209220440 ./dev-util/Tensile/Tensile-5.1.3.ebuild
@@ -16469,9 +16459,9 @@
 2208230840 ./dev-util/peda/peda-9999.ebuild
 2210151710 ./dev-util/repolite/repolite-0.3.1.ebuild
 2208300210 ./dev-util/scap-driver/scap-driver-0.29.3.ebuild
-2209140140 ./dev-util/seer/seer-1.10.ebuild
 2209140140 ./dev-util/seer/seer-9999.ebuild
 2210020610 ./dev-util/seer/seer-1.11.ebuild
+2210250910 ./dev-util/seer/seer-1.12.ebuild
 2209091310 ./dev-util/b2/b2-4.9.2.ebuild
 2209061910 ./dev-util/directx-headers/directx-headers-1.606.4.ebuild
 2209061910 ./dev-util/directx-headers/directx-headers-9999.ebuild
@@ -16692,6 +16682,7 @@
 2105071940 ./games-arcade/afternoonstalker/afternoonstalker-1.1.6.ebuild
 2106190039 ./games-arcade/alienwave/alienwave-0.4.0-r2.ebuild
 2003011909 ./games-arcade/amphetamine/amphetamine-0.8.10-r1.ebuild
+2210241610 ./games-arcade/amphetamine/amphetamine-0.8.10-r2.ebuild
 2104200039 ./games-arcade/aop/aop-0.6-r2.ebuild
 2109180739 ./games-arcade/apricots/apricots-0.2.7.ebuild
 2108230739 ./games-arcade/aquaria/aquaria-1.1.3-r3.ebuild
@@ -17030,7 +17021,7 @@
 2104070509 ./games-fps/quake2-textures/quake2-textures-0_beta8-r1.ebuild
 2209101210 ./games-fps/quakeforge/quakeforge-0.7.2_p20210722-r1.ebuild
 2209101210 ./games-fps/quakeforge/quakeforge-9999.ebuild
-2104070009 ./games-fps/qudos/qudos-0.40.1.ebuild
+2210251440 ./games-fps/qudos/qudos-0.40.1-r1.ebuild
 2104070209 ./games-fps/red-blue-quake2/red-blue-quake2-0.1-r1.ebuild
 2111170540 ./games-fps/redeclipse/redeclipse-2.0.0-r1.ebuild
 2204021210 ./games-fps/rott/rott-1.1.2-r1.ebuild
@@ -17511,6 +17502,7 @@
 2205312340 ./games-util/joycond/joycond-0.1.0_p20210730-r1.ebuild
 2209221140 ./games-util/libstrangle/libstrangle-0.1.1_p20220222-r1.ebuild
 2209021710 ./games-util/antimicrox/antimicrox-3.2.5.ebuild
+2210250110 ./games-util/antimicrox/antimicrox-3.3.1.ebuild
 2202080810 ./gnome-base/dconf-editor/dconf-editor-3.38.3.ebuild
 2210140440 ./gnome-base/dconf-editor/dconf-editor-43.0.ebuild
 2205190840 ./gnome-base/dconf/dconf-0.40.0.ebuild
@@ -17583,8 +17575,10 @@
 2201240710 ./gnome-extra/eiciel/eiciel-0.9.13.1.ebuild
 2210012040 ./gnome-extra/evolution-data-server/evolution-data-server-3.44.4-r2.ebuild
 2210140440 ./gnome-extra/evolution-data-server/evolution-data-server-3.46.0-r1.ebuild
+2210251840 ./gnome-extra/evolution-data-server/evolution-data-server-3.46.1.ebuild
 2209281610 ./gnome-extra/evolution-ews/evolution-ews-3.44.4-r1.ebuild
 2209302010 ./gnome-extra/evolution-ews/evolution-ews-3.46.0.ebuild
+2210251840 ./gnome-extra/evolution-ews/evolution-ews-3.46.1.ebuild
 2105090839 ./gnome-extra/gconf-editor/gconf-editor-3.0.1-r1.ebuild
 2208070840 ./gnome-extra/gnome-boxes/gnome-boxes-42.3.ebuild
 2210100210 ./gnome-extra/gnome-boxes/gnome-boxes-43.0.ebuild
@@ -17635,6 +17629,7 @@
 2210172110 ./gnome-extra/gnome-shell-frippery/gnome-shell-frippery-43.0.ebuild
 2208060010 ./gnome-extra/gnome-software/gnome-software-42.4.ebuild
 2210080640 ./gnome-extra/gnome-software/gnome-software-43.0.ebuild
+2210251840 ./gnome-extra/gnome-software/gnome-software-43.1.ebuild
 2205280910 ./gnome-extra/gnome-system-monitor/gnome-system-monitor-42.0.ebuild
 2210120440 ./gnome-extra/gnome-tweaks/gnome-tweaks-40.10-r1.ebuild
 2205280910 ./gnome-extra/gnome-user-docs/gnome-user-docs-42.0.ebuild
@@ -17646,6 +17641,7 @@
 2004032241 ./gnome-extra/gucharmap/gucharmap-3.0.1-r200.ebuild
 2206280511 ./gnome-extra/gucharmap/gucharmap-14.0.3.ebuild
 2209161710 ./gnome-extra/gucharmap/gucharmap-15.0.0.ebuild
+2210251840 ./gnome-extra/gucharmap/gucharmap-15.0.1.ebuild
 2204161540 ./gnome-extra/libgda/libgda-5.2.9.ebuild
 2205311240 ./gnome-extra/libgsf/libgsf-1.14.49.ebuild
 2208280840 ./gnome-extra/libgsf/libgsf-1.14.50.ebuild
@@ -17812,6 +17808,7 @@
 2207290640 ./gui-libs/gtk-layer-shell/gtk-layer-shell-0.7.0.ebuild
 2210082140 ./gui-libs/gtk/gtk-4.6.7-r1.ebuild
 2210140710 ./gui-libs/gtk/gtk-4.8.1-r1.ebuild
+2210252340 ./gui-libs/gtk/gtk-4.8.2.ebuild
 2209040640 ./gui-libs/libhandy/libhandy-1.6.3.ebuild
 2209160610 ./gui-libs/libhandy/libhandy-1.8.0.ebuild
 2209241840 ./gui-libs/libwpe/libwpe-1.14.0.ebuild
@@ -17842,7 +17839,9 @@
 2209241810 ./gui-libs/gtksourceview/gtksourceview-5.6.1.ebuild
 2207261010 ./gui-libs/xdg-desktop-portal-lxqt/xdg-desktop-portal-lxqt-0.2.0.ebuild
 2209261910 ./gui-libs/vte-common/vte-common-0.70.0.ebuild
+2210251840 ./gui-libs/vte-common/vte-common-0.70.1.ebuild
 2209261810 ./gui-libs/vte/vte-0.70.0.ebuild
+2210251840 ./gui-libs/vte/vte-0.70.1.ebuild
 2210130340 ./gui-libs/libpanel/libpanel-1.0.1.ebuild
 2201140910 ./gui-wm/hikari/hikari-2.3.3.ebuild
 2205260910 ./gui-wm/sway/sway-1.7.ebuild
@@ -18471,8 +18470,7 @@
 2210131640 ./kde-misc/kdeconnect/kdeconnect-22.08.2.ebuild
 2207251040 ./kde-misc/kdiff3/kdiff3-1.9.6.ebuild
 2210041040 ./kde-misc/kdirstat/kdirstat-3.4.2.ebuild
-2206291040 ./kde-misc/kio-fuse/kio-fuse-5.0.1.ebuild
-2210041040 ./kde-misc/kio-fuse/kio-fuse-5.0.1_p20220906.ebuild
+2210252210 ./kde-misc/kio-fuse/kio-fuse-5.0.1_p20220906.ebuild
 2208151740 ./kde-misc/kio-gdrive/kio-gdrive-22.04.3-r1.ebuild
 2210131640 ./kde-misc/kio-gdrive/kio-gdrive-22.08.2.ebuild
 2207211610 ./kde-misc/kio-gopher/kio-gopher-0.1.99-r1.ebuild
@@ -18693,6 +18691,7 @@
 2206081040 ./mail-client/clawsker/clawsker-1.3.5.ebuild
 2210012040 ./mail-client/evolution/evolution-3.44.4-r3.ebuild
 2209302010 ./mail-client/evolution/evolution-3.46.0.ebuild
+2210251840 ./mail-client/evolution/evolution-3.46.1.ebuild
 2209160010 ./mail-client/geary/geary-40.0-r2.ebuild
 2210020740 ./mail-client/geary/geary-43.0.ebuild
 2203040410 ./mail-client/hap/hap-3.7-r1.ebuild
@@ -18723,11 +18722,7 @@
 2205140940 ./mail-client/s-nail/s-nail-14.9.24.ebuild
 2208151810 ./mail-client/sylpheed/sylpheed-3.7.0-r5.ebuild
 2210201410 ./mail-client/thunderbird-bin/thunderbird-bin-102.4.0.ebuild
-2209241710 ./mail-client/thunderbird/thunderbird-91.13.1.ebuild
-2210011140 ./mail-client/thunderbird/thunderbird-102.3.1.ebuild
-2210071010 ./mail-client/thunderbird/thunderbird-102.3.2.ebuild
-2210131040 ./mail-client/thunderbird/thunderbird-102.3.3.ebuild
-2210201510 ./mail-client/thunderbird/thunderbird-102.4.0.ebuild
+2210251740 ./mail-client/thunderbird/thunderbird-102.4.0.ebuild
 2205132310 ./mail-filter/MailScanner/MailScanner-4.84.5.2.ebuild
 2210200710 ./mail-filter/afew/afew-3.0.1.ebuild
 2201012339 ./mail-filter/amavisd-milter/amavisd-milter-1.7.0-r1.ebuild
@@ -18766,8 +18761,8 @@
 2010131309 ./mail-filter/milter-regex/milter-regex-2.7.ebuild
 2208040512 ./mail-filter/milter-regex/milter-regex-2.7-r1.ebuild
 2210010610 ./mail-filter/milter-regex/milter-regex-2.7-r2.ebuild
-2107120039 ./mail-filter/mimedefang/mimedefang-2.84-r1.ebuild
 2208040512 ./mail-filter/mimedefang/mimedefang-2.84-r2.ebuild
+2210250910 ./mail-filter/mimedefang/mimedefang-3.1.ebuild
 1911061339 ./mail-filter/normalizemime/normalizemime-1.19.ebuild
 2203230339 ./mail-filter/opendkim/opendkim-2.10.3-r28.ebuild
 2203231339 ./mail-filter/opendkim/opendkim-2.10.3-r29.ebuild
@@ -18841,6 +18836,7 @@
 2206280511 ./mate-base/libmatekbd/libmatekbd-1.26.0.ebuild
 2206280511 ./mate-base/mate-applets-meta/mate-applets-meta-1.24.0.ebuild
 2206280511 ./mate-base/mate-applets/mate-applets-1.24.1.ebuild
+2210241710 ./mate-base/mate-applets/mate-applets-1.26.0.ebuild
 2110291639 ./mate-base/mate-common/mate-common-1.24.2.ebuild
 2206280511 ./mate-base/mate-common/mate-common-1.26.0.ebuild
 2210052210 ./mate-base/mate-control-center/mate-control-center-1.24.2-r1.ebuild
@@ -18859,11 +18855,13 @@
 2108020510 ./mate-extra/caja-admin/caja-admin-0.0.4.ebuild
 2108020510 ./mate-extra/caja-admin/caja-admin-9999.ebuild
 2108020510 ./mate-extra/caja-dropbox/caja-dropbox-1.24.0-r1.ebuild
+2210241910 ./mate-extra/caja-dropbox/caja-dropbox-1.26.0-r1.ebuild
 2206280511 ./mate-extra/caja-extensions/caja-extensions-1.24.1.ebuild
 2210041510 ./mate-extra/caja-extensions/caja-extensions-1.26.0.ebuild
 2108020510 ./mate-extra/caja-hide/caja-hide-0.9.0.ebuild
 2206280511 ./mate-extra/mate-calc/mate-calc-1.24.2.ebuild
 2206011140 ./mate-extra/mate-indicator-applet/mate-indicator-applet-1.24.0-r1.ebuild
+2210241710 ./mate-extra/mate-indicator-applet/mate-indicator-applet-1.26.0.ebuild
 2206280511 ./mate-extra/mate-media/mate-media-1.24.1.ebuild
 2209101440 ./mate-extra/mate-media/mate-media-1.26.0.ebuild
 2206280511 ./mate-extra/mate-netbook/mate-netbook-1.24.0-r1.ebuild
@@ -18880,6 +18878,7 @@
 2203220309 ./mate-extra/mate-user-guide/mate-user-guide-1.26.0.ebuild
 2107010209 ./mate-extra/mate-user-share/mate-user-share-1.24.0-r1.ebuild
 2206280511 ./mate-extra/mate-utils/mate-utils-1.24.0-r3.ebuild
+2210241710 ./mate-extra/caja-actions/caja-actions-1.26.0.ebuild
 2205251140 ./media-fonts/Humor-Sans/Humor-Sans-1.0-r1.ebuild
 2210010240 ./media-fonts/ahem/ahem-1.0.ebuild
 2205251140 ./media-fonts/alee-fonts/alee-fonts-13-r1.ebuild
@@ -19178,13 +19177,15 @@
 2209241840 ./media-gfx/eog-plugins/eog-plugins-42.2.ebuild
 2209190512 ./media-gfx/eog/eog-42.3.ebuild
 2209241840 ./media-gfx/eog/eog-43.0.ebuild
+2210251840 ./media-gfx/eog/eog-43.1.ebuild
 2206280511 ./media-gfx/eom/eom-1.24.2.ebuild
+2210241710 ./media-gfx/eom/eom-1.26.0.ebuild
 2203141939 ./media-gfx/ephoto/ephoto-1.6.0.ebuild
 2210052210 ./media-gfx/evoluspencil/evoluspencil-3.1.0-r2.ebuild
 2203030009 ./media-gfx/exact-image/exact-image-1.0.2-r3.ebuild
 2203112209 ./media-gfx/exact-image/exact-image-1.0.2-r4.ebuild
 2209031140 ./media-gfx/exif/exif-0.6.22-r1.ebuild
-2208191140 ./media-gfx/exiv2/exiv2-0.27.5-r1.ebuild
+2210252210 ./media-gfx/exiv2/exiv2-0.27.5-r1.ebuild
 2203200340 ./media-gfx/farbfeld/farbfeld-9999.ebuild
 2208222040 ./media-gfx/farbfeld/farbfeld-4.ebuild
 2004221809 ./media-gfx/fbgrab/fbgrab-1.3.3.ebuild
@@ -19216,9 +19217,9 @@
 2209281310 ./media-gfx/freecad/freecad-0.20.1.ebuild
 2203010109 ./media-gfx/freepv/freepv-0.3.0-r5.ebuild
 2206281340 ./media-gfx/frogr/frogr-1.5-r1.ebuild
-2210181810 ./media-gfx/geeqie/geeqie-2.0.1-r1.ebuild
 2210201410 ./media-gfx/geeqie/geeqie-1.7.3.ebuild
-2210191540 ./media-gfx/geeqie/geeqie-9999.ebuild
+2210250040 ./media-gfx/geeqie/geeqie-2.0.1-r1.ebuild
+2210250040 ./media-gfx/geeqie/geeqie-9999.ebuild
 2103070239 ./media-gfx/gif2png/gif2png-2.5.14.ebuild
 2112070940 ./media-gfx/gifsicle/gifsicle-1.93.ebuild
 2203132209 ./media-gfx/gimp-arrow-brushes/gimp-arrow-brushes-20190407.ebuild
@@ -19249,6 +19250,7 @@
 2209170310 ./media-gfx/graphite2/graphite2-1.3.14_p20210810-r2.ebuild
 2210090140 ./media-gfx/graphviz/graphviz-5.0.1-r1.ebuild
 2210090140 ./media-gfx/graphviz/graphviz-6.0.1-r2.ebuild
+2210250010 ./media-gfx/graphviz/graphviz-7.0.0.ebuild
 2012231444 ./media-gfx/grub-splashes/grub-splashes-20091109.ebuild
 2203010309 ./media-gfx/gscan2pdf/gscan2pdf-2.12.5.ebuild
 2207150440 ./media-gfx/gscan2pdf/gscan2pdf-2.12.8.ebuild
@@ -19299,8 +19301,7 @@
 1805292338 ./media-gfx/jpegtoavi/jpegtoavi-1.5.ebuild
 2001121309 ./media-gfx/kcoloredit/kcoloredit-2.0.0_p20171121-r1.ebuild
 2209120110 ./media-gfx/kgeotag/kgeotag-1.3.1.ebuild
-2011252009 ./media-gfx/kgraphviewer/kgraphviewer-2.4.3-r1.ebuild
-2210041040 ./media-gfx/kgraphviewer/kgraphviewer-2.4.3-r2.ebuild
+2210252210 ./media-gfx/kgraphviewer/kgraphviewer-2.4.3-r2.ebuild
 2210122240 ./media-gfx/kphotoalbum/kphotoalbum-5.9.1-r1.ebuild
 2210122240 ./media-gfx/krita/krita-5.1.1.ebuild
 2107141739 ./media-gfx/kuickshow/kuickshow-0.10.2.ebuild
@@ -19358,8 +19359,7 @@
 2202181809 ./media-gfx/pencil/pencil-0.6.6-r1.ebuild
 2104161439 ./media-gfx/peps/peps-2.0-r1.ebuild
 2104032339 ./media-gfx/photopc/photopc-3.07.ebuild
-1912091539 ./media-gfx/photoqt/photoqt-1.7.1-r1.ebuild
-2209241040 ./media-gfx/photoqt/photoqt-2.9.1.ebuild
+2210252110 ./media-gfx/photoqt/photoqt-2.9.1.ebuild
 1906251809 ./media-gfx/phototonic/phototonic-2.1.ebuild
 1706300122 ./media-gfx/pixels2pgf/pixels2pgf-0.1.ebuild
 1706300122 ./media-gfx/pixels2pgf/pixels2pgf-9999.ebuild
@@ -19373,7 +19373,7 @@
 2203200340 ./media-gfx/pngrewrite/pngrewrite-1.4.0.ebuild
 1912131839 ./media-gfx/pngtoico/pngtoico-1.0.1-r1.ebuild
 1912131839 ./media-gfx/pngtools/pngtools-0.4-r2.ebuild
-2209300411 ./media-gfx/pngtools/pngtools-0.4_p20220314.ebuild
+2210252110 ./media-gfx/pngtools/pngtools-0.4_p20220314.ebuild
 2205171610 ./media-gfx/potrace/potrace-1.16.ebuild
 2210082240 ./media-gfx/povray/povray-3.7.0.0-r2.ebuild
 2201041339 ./media-gfx/pqiv/pqiv-2.11.ebuild
@@ -19460,7 +19460,7 @@
 2206021840 ./media-gfx/ueberzug/ueberzug-18.1.9-r1.ebuild
 2203141939 ./media-gfx/entice/entice-0_pre20210919-r1.ebuild
 2209100140 ./media-gfx/renderdoc/renderdoc-1.21.ebuild
-2209251211 ./media-gfx/renderdoc/renderdoc-1.22.ebuild
+2210251610 ./media-gfx/renderdoc/renderdoc-1.22.ebuild
 2207221210 ./media-gfx/ttfautohint/ttfautohint-1.8.4-r3.ebuild
 2208151740 ./media-gfx/skanpage/skanpage-22.04.3.ebuild
 2210131640 ./media-gfx/skanpage/skanpage-22.08.2.ebuild
@@ -19534,7 +19534,7 @@
 2209300411 ./media-libs/fidlib/fidlib-0.9.10-r1.ebuild
 2205190840 ./media-libs/flac/flac-1.3.4.ebuild
 2210191210 ./media-libs/flac/flac-1.4.1.ebuild
-2210231040 ./media-libs/flac/flac-1.4.2.ebuild
+2210251540 ./media-libs/flac/flac-1.4.2.ebuild
 2208311210 ./media-libs/flickcurl/flickcurl-1.26.ebuild
 1908061309 ./media-libs/fluidsynth-dssi/fluidsynth-dssi-1.0.0-r1.ebuild
 2208302240 ./media-libs/fontconfig/fontconfig-2.13.93.ebuild
@@ -19597,6 +19597,7 @@
 2209190512 ./media-libs/harfbuzz/harfbuzz-9999.ebuild
 2209302210 ./media-libs/harfbuzz/harfbuzz-5.1.0.ebuild
 2210090010 ./media-libs/harfbuzz/harfbuzz-5.3.0.ebuild
+2210241540 ./media-libs/harfbuzz/harfbuzz-5.3.1.ebuild
 1911150539 ./media-libs/icc-profiles-basiccolor-printing2009/icc-profiles-basiccolor-printing2009-1.2.0.ebuild
 1911150609 ./media-libs/icc-profiles-openicc/icc-profiles-openicc-1.3.1.ebuild
 2011261339 ./media-libs/icclib/icclib-2.14.ebuild
@@ -19663,7 +19664,7 @@
 2205171110 ./media-libs/libcanberra/libcanberra-0.30-r6.ebuild
 2210090240 ./media-libs/libcanberra/libcanberra-0.30-r7.ebuild
 2203281010 ./media-libs/libcdaudio/libcdaudio-0.99.12-r3.ebuild
-2210232310 ./media-libs/libcdaudio/libcdaudio-0.99.12-r4.ebuild
+2210251410 ./media-libs/libcdaudio/libcdaudio-0.99.12-r4.ebuild
 2108140409 ./media-libs/libcddb/libcddb-1.3.2-r1.ebuild
 2208121540 ./media-libs/libcdr/libcdr-0.1.7.ebuild
 2208121540 ./media-libs/libcdr/libcdr-9999.ebuild
@@ -19814,7 +19815,7 @@
 2209261940 ./media-libs/libpulse/libpulse-16.0-r1.ebuild
 2209261940 ./media-libs/libpulse/libpulse-16.1-r1.ebuild
 2109161539 ./media-libs/libqaccessibilityclient/libqaccessibilityclient-0.4.1.ebuild
-2108250339 ./media-libs/libquicktime/libquicktime-1.2.4-r3.ebuild
+2210251540 ./media-libs/libquicktime/libquicktime-1.2.4-r4.ebuild
 2101240709 ./media-libs/libquvi-scripts/libquvi-scripts-0.9.20131130-r100.ebuild
 2101240709 ./media-libs/libquvi/libquvi-0.9.4-r100.ebuild
 2208302240 ./media-libs/libraw/libraw-0.20.2.ebuild
@@ -19844,6 +19845,7 @@
 2208302240 ./media-libs/libtiger/libtiger-0.3.4-r1.ebuild
 2112210710 ./media-libs/libtimidity/libtimidity-0.2.7.ebuild
 2208180610 ./media-libs/libuninameslist/libuninameslist-20211114.ebuild
+2210241510 ./media-libs/libuninameslist/libuninameslist-20221022.ebuild
 2203060110 ./media-libs/libuvc/libuvc-0.0.6-r2.ebuild
 2205190840 ./media-libs/libv4l/libv4l-1.22.1.ebuild
 2208121540 ./media-libs/libvisio/libvisio-0.1.7.ebuild
@@ -19879,10 +19881,11 @@
 2210160610 ./media-libs/mesa/mesa-22.1.7.ebuild
 2210160610 ./media-libs/mesa/mesa-9999.ebuild
 2210201840 ./media-libs/mesa/mesa-22.2.2.ebuild
-2209141940 ./media-libs/mlt/mlt-7.8.0.ebuild
+2210252210 ./media-libs/mlt/mlt-7.8.0.ebuild
 2204280110 ./media-libs/munt-mt32emu/munt-mt32emu-2.6.3.ebuild
 2108271839 ./media-libs/musicbrainz/musicbrainz-5.1.0.ebuild
 2205311340 ./media-libs/mutagen/mutagen-1.45.1.ebuild
+2210260640 ./media-libs/mutagen/mutagen-1.46.0.ebuild
 2209301410 ./media-libs/nas/nas-1.9.5.ebuild
 2208240840 ./media-libs/netpbm/netpbm-10.86.33.ebuild
 2210041040 ./media-libs/netpbm/netpbm-10.86.34.ebuild
@@ -19905,7 +19908,7 @@
 2209281310 ./media-libs/openexr/openexr-3.1.5.ebuild
 2105022239 ./media-libs/openglide/openglide-0.09_rc9_p20191120.ebuild
 2209021410 ./media-libs/openh264/openh264-2.3.0.ebuild
-2209211340 ./media-libs/openh264/openh264-2.3.1-r1.ebuild
+2210251440 ./media-libs/openh264/openh264-2.3.1-r1.ebuild
 2209041610 ./media-libs/openimageio/openimageio-2.3.17.0.ebuild
 2210020940 ./media-libs/openimageio/openimageio-2.3.19.0.ebuild
 2210020540 ./media-libs/openimageio/openimageio-2.3.20.0.ebuild
@@ -20065,9 +20068,9 @@
 2206031410 ./media-libs/amf-headers/amf-headers-1.4.24.ebuild
 2208171940 ./media-libs/amf-headers/amf-headers-1.4.26.ebuild
 2206161940 ./media-libs/libvmaf/libvmaf-2.3.0-r2.ebuild
-2206151740 ./media-libs/libjxl/libjxl-0.7.0_pre20220329.ebuild
-2208101140 ./media-libs/libjxl/libjxl-9999.ebuild
-2210171010 ./media-libs/libjxl/libjxl-0.7.0_pre20220825.ebuild
+2210251940 ./media-libs/libjxl/libjxl-0.7.0.ebuild
+2210252140 ./media-libs/libjxl/libjxl-0.7.0_pre20220825.ebuild
+2210251940 ./media-libs/libjxl/libjxl-9999.ebuild
 2209101210 ./media-libs/sdl_audiolib/sdl_audiolib-0_p20220622-r1.ebuild
 2209101210 ./media-libs/sdl_audiolib/sdl_audiolib-9999.ebuild
 2208171940 ./media-libs/mesa-amber/mesa-amber-21.3.9.ebuild
@@ -20079,6 +20082,7 @@
 2210081610 ./media-libs/flac-compat/flac-compat-1.3.4.ebuild
 2209202340 ./media-libs/iir1/iir1-1.9.3.ebuild
 2209280340 ./media-libs/libshumate/libshumate-1.0.1.ebuild
+2210251840 ./media-libs/libshumate/libshumate-1.0.2.ebuild
 2210160610 ./media-libs/intel-hybrid-codec-driver/intel-hybrid-codec-driver-2.0.0.ebuild
 2210160610 ./media-libs/libva-compat/libva-compat-1.8.3-r2.ebuild
 2210160610 ./media-libs/libva-intel-driver/libva-intel-driver-2.4.1-r3.ebuild
@@ -20609,11 +20613,11 @@
 2004131239 ./media-radio/dxcc/dxcc-20191204.ebuild
 2204271640 ./media-radio/flamp/flamp-2.2.07.ebuild
 2209171540 ./media-radio/fldigi/fldigi-4.1.22.ebuild
-2209171540 ./media-radio/fldigi/fldigi-4.1.23.ebuild
+2210251610 ./media-radio/fldigi/fldigi-4.1.23.ebuild
 2204280210 ./media-radio/flmsg/flmsg-4.0.19-r1.ebuild
 2206281410 ./media-radio/flmsg/flmsg-4.0.20.ebuild
 2209152240 ./media-radio/flrig/flrig-1.4.5.ebuild
-2209152240 ./media-radio/flrig/flrig-1.4.7.ebuild
+2210251610 ./media-radio/flrig/flrig-1.4.7.ebuild
 2106190039 ./media-radio/fsync-mdc1200-decode/fsync-mdc1200-decode-1.0.ebuild
 2106190039 ./media-radio/fsync-mdc1200-decode/fsync-mdc1200-decode-9999.ebuild
 2205311210 ./media-radio/gpredict/gpredict-2.3-r1.ebuild
@@ -20629,6 +20633,7 @@
 2209152240 ./media-radio/tqsl/tqsl-2.6.5.ebuild
 2201300109 ./media-radio/tucnak/tucnak-4.34.ebuild
 2207072310 ./media-radio/tucnak/tucnak-4.36.ebuild
+2210242010 ./media-radio/tucnak/tucnak-4.37.ebuild
 2204151140 ./media-radio/unixcw/unixcw-3.5.1-r1.ebuild
 2208240840 ./media-radio/unixcw/unixcw-3.6.0.ebuild
 2208221840 ./media-radio/wsjtx/wsjtx-2.5.4.ebuild
@@ -20903,7 +20908,7 @@
 2209251540 ./media-sound/patchage/patchage-1.0.8.ebuild
 2108210239 ./media-sound/pavucontrol-qt/pavucontrol-qt-0.17.0.ebuild
 2204151640 ./media-sound/pavucontrol-qt/pavucontrol-qt-1.0.0.ebuild
-2112070009 ./media-sound/pavucontrol/pavucontrol-5.0-r1.ebuild
+2210251110 ./media-sound/pavucontrol/pavucontrol-5.0-r1.ebuild
 2011141839 ./media-sound/pavumeter/pavumeter-0.9.3-r1.ebuild
 1912111539 ./media-sound/peercast/peercast-0.1218-r2.ebuild
 2207261010 ./media-sound/pianobar/pianobar-9999.ebuild
@@ -21706,7 +21711,8 @@
 2110192240 ./net-analyzer/ttcp/ttcp-1.12-r2.ebuild
 2102270409 ./net-analyzer/upnpscan/upnpscan-0.4-r3.ebuild
 2202260339 ./net-analyzer/vnstat/vnstat-2.9.ebuild
-2202251239 ./net-analyzer/vnstat/vnstat-9999.ebuild
+2210241540 ./net-analyzer/vnstat/vnstat-2.10.ebuild
+2210241540 ./net-analyzer/vnstat/vnstat-9999.ebuild
 2209071115 ./net-analyzer/wapiti/wapiti-3.0.5.ebuild
 2209071115 ./net-analyzer/wapiti/wapiti-3.1.2.ebuild
 2209071115 ./net-analyzer/wapiti/wapiti-3.1.3.ebuild
@@ -21812,6 +21818,7 @@
 2103050239 ./net-dns/dnshijacker/dnshijacker-1.3-r2.ebuild
 2208250640 ./net-dns/dnsmasq/dnsmasq-2.85.ebuild
 2208250640 ./net-dns/dnsmasq/dnsmasq-2.86-r1.ebuild
+2210250010 ./net-dns/dnsmasq/dnsmasq-2.87.ebuild
 1903151409 ./net-dns/dnssec-check/dnssec-check-2.2.ebuild
 2201260040 ./net-dns/dnssec-root/dnssec-root-20181220-r1.ebuild
 2109101340 ./net-dns/dnssec-tools/dnssec-tools-2.2.3-r3.ebuild
@@ -21867,7 +21874,7 @@
 2203270340 ./net-dns/unbound/unbound-1.13.2-r1.ebuild
 2206031140 ./net-dns/unbound/unbound-1.15.0.ebuild
 2206201510 ./net-dns/unbound/unbound-1.16.0.ebuild
-2210121740 ./net-dns/unbound/unbound-1.16.3.ebuild
+2210252110 ./net-dns/unbound/unbound-1.16.3.ebuild
 2105010309 ./net-dns/updatedd/updatedd-2.6-r6.ebuild
 2012090709 ./net-dns/valtz/valtz-0.8.ebuild
 2209051640 ./net-dns/smartdns/smartdns-37.2.ebuild
@@ -21880,7 +21887,7 @@
 2210100040 ./net-firewall/conntrack-tools/conntrack-tools-1.4.7.ebuild
 2203121539 ./net-firewall/ebtables/ebtables-2.0.11-r3.ebuild
 2110302039 ./net-firewall/ferm/ferm-2.6.ebuild
-2207150440 ./net-firewall/ferm/ferm-2.7.ebuild
+2210251410 ./net-firewall/ferm/ferm-2.7.ebuild
 2202180610 ./net-firewall/firehol/firehol-3.1.6-r3.ebuild
 2207220210 ./net-firewall/firehol/firehol-3.1.7-r2.ebuild
 2205032140 ./net-firewall/firewalld/firewalld-1.1.1.ebuild
@@ -22145,7 +22152,8 @@
 2104040139 ./net-irc/pisg/pisg-0.73-r1.ebuild
 2207060440 ./net-irc/polari/polari-42.0.ebuild
 2210112310 ./net-irc/polari/polari-43.0.ebuild
-2201170309 ./net-irc/psybnc/psybnc-2.3.2.9-r4.ebuild
+2210241510 ./net-irc/psybnc/psybnc-2.3.2.9-r4.ebuild
+2210241540 ./net-irc/psybnc/psybnc-2.4.3.ebuild
 2209041610 ./net-irc/quassel/quassel-0.14.0-r1.ebuild
 2209041610 ./net-irc/quassel/quassel-9999.ebuild
 2206011740 ./net-irc/quasselgrep/quasselgrep-0_p20200830.ebuild
@@ -22227,16 +22235,15 @@
 2208241510 ./net-libs/ignition-transport/ignition-transport-8.3.0.ebuild
 2107262139 ./net-libs/kdav2/kdav2-0.3.0.ebuild
 2108180339 ./net-libs/kdsoap-ws-discovery-client/kdsoap-ws-discovery-client-0.2_pre20200927.ebuild
-2111290409 ./net-libs/kdsoap/kdsoap-2.0.0.ebuild
-2209152040 ./net-libs/kdsoap/kdsoap-2.1.1.ebuild
+2210252110 ./net-libs/kdsoap/kdsoap-2.1.1.ebuild
 2001162209 ./net-libs/kimap2/kimap2-0.3.0.ebuild
 2204130011 ./net-libs/ldns/ldns-1.7.1-r5.ebuild
 2204130011 ./net-libs/ldns/ldns-1.7.1-r6.ebuild
 2204130011 ./net-libs/ldns/ldns-1.8.0-r1.ebuild
 2204130011 ./net-libs/ldns/ldns-1.8.0-r4.ebuild
 2205130940 ./net-libs/ldns/ldns-1.8.1.ebuild
-2206291040 ./net-libs/libaccounts-glib/libaccounts-glib-1.25-r2.ebuild
 2210041040 ./net-libs/libaccounts-glib/libaccounts-glib-1.26.ebuild
+2210252210 ./net-libs/libaccounts-glib/libaccounts-glib-1.26-r1.ebuild
 2204302241 ./net-libs/libad9361-iio/libad9361-iio-0.2.ebuild
 2206142240 ./net-libs/libad9361-iio/libad9361-iio-9999.ebuild
 2207130940 ./net-libs/libad9361-iio/libad9361-iio-0.2-r1.ebuild
@@ -22294,7 +22301,7 @@
 2202170040 ./net-libs/libisds/libisds-9999.ebuild
 2209041610 ./net-libs/libktorrent/libktorrent-22.04.3.ebuild
 2210131640 ./net-libs/libktorrent/libktorrent-22.08.2.ebuild
-2201070139 ./net-libs/liblockfile/liblockfile-1.17.ebuild
+2210241910 ./net-libs/liblockfile/liblockfile-1.17.ebuild
 2205311240 ./net-libs/libmbim/libmbim-1.26.4.ebuild
 2209141640 ./net-libs/libmediawiki/libmediawiki-5.38.0.ebuild
 2108211209 ./net-libs/libmicrodns/libmicrodns-0.1.2.ebuild
@@ -22370,7 +22377,7 @@
 2007200439 ./net-libs/libsignal-protocol-c/libsignal-protocol-c-2.3.2.ebuild
 2012310512 ./net-libs/libsignal-protocol-c/libsignal-protocol-c-2.3.3.ebuild
 2002112051 ./net-libs/libsignal-protocol-c/libsignal-protocol-c-9999.ebuild
-2208010540 ./net-libs/libsignon-glib/libsignon-glib-2.1-r1.ebuild
+2210252310 ./net-libs/libsignon-glib/libsignon-glib-2.1-r2.ebuild
 2202080110 ./net-libs/libslirp/libslirp-4.6.1.ebuild
 2205191540 ./net-libs/libslirp/libslirp-4.7.0.ebuild
 2109211539 ./net-libs/libsmi/libsmi-0.5.0-r1.ebuild
@@ -22388,10 +22395,9 @@
 2111021440 ./net-libs/libtelnet/libtelnet-0.23-r1.ebuild
 2111021440 ./net-libs/libtelnet/libtelnet-9999.ebuild
 2210221740 ./net-libs/libtirpc/libtirpc-1.3.3.ebuild
-2209041540 ./net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.16.ebuild
-2209041540 ./net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.17.ebuild
 2209041540 ./net-libs/libtorrent-rasterbar/libtorrent-rasterbar-2.0.6.ebuild
 2209160610 ./net-libs/libtorrent-rasterbar/libtorrent-rasterbar-2.0.7.ebuild
+2210241510 ./net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.18.ebuild
 2207021640 ./net-libs/libtorrent/libtorrent-0.13.8-r2.ebuild
 2202080910 ./net-libs/libtrace/libtrace-4.0.18_p1.ebuild
 2207050640 ./net-libs/libtrace/libtrace-4.0.19_p1.ebuild
@@ -22447,7 +22453,7 @@
 2210100210 ./net-libs/phodav/phodav-2.5.ebuild
 2210100210 ./net-libs/phodav/phodav-3.0.ebuild
 2208041010 ./net-libs/pjproject/pjproject-2.12.1-r1.ebuild
-2210130240 ./net-libs/pjproject/pjproject-2.12.1-r2.ebuild
+2210252110 ./net-libs/pjproject/pjproject-2.12.1-r2.ebuild
 2205231640 ./net-libs/quiche/quiche-0.14.0.ebuild
 2210072010 ./net-libs/quiche/quiche-0.15.0.ebuild
 2210111610 ./net-libs/quiche/quiche-0.16.0.ebuild
@@ -22480,9 +22486,9 @@
 2109121440 ./net-libs/telepathy-accounts-signon/telepathy-accounts-signon-2.1.ebuild
 2204101910 ./net-libs/telepathy-farstream/telepathy-farstream-0.6.2-r1.ebuild
 2209071115 ./net-libs/telepathy-glib/telepathy-glib-0.24.2.ebuild
-2109121440 ./net-libs/telepathy-logger-qt/telepathy-logger-qt-17.09.0.ebuild
-2208111410 ./net-libs/telepathy-qt/telepathy-qt-0.9.8-r1.ebuild
-2208111410 ./net-libs/telepathy-qt/telepathy-qt-9999.ebuild
+2210252310 ./net-libs/telepathy-logger-qt/telepathy-logger-qt-17.09.0-r1.ebuild
+2210252310 ./net-libs/telepathy-qt/telepathy-qt-0.9.8-r2.ebuild
+2210252310 ./net-libs/telepathy-qt/telepathy-qt-9999.ebuild
 2202211309 ./net-libs/tox/tox-0.2.13.ebuild
 2206161940 ./net-libs/tox/tox-9999.ebuild
 2207192140 ./net-libs/tox/tox-0.2.18-r1.ebuild
@@ -22500,6 +22506,9 @@
 2209271910 ./net-libs/webkit-gtk/webkit-gtk-2.38.0-r410.ebuild
 2209271910 ./net-libs/webkit-gtk/webkit-gtk-2.38.0.ebuild
 2210071940 ./net-libs/webkit-gtk/webkit-gtk-2.38.0-r500.ebuild
+2210251840 ./net-libs/webkit-gtk/webkit-gtk-2.38.1-r410.ebuild
+2210251840 ./net-libs/webkit-gtk/webkit-gtk-2.38.1-r500.ebuild
+2210251840 ./net-libs/webkit-gtk/webkit-gtk-2.38.1.ebuild
 2209041610 ./net-libs/wvstreams/wvstreams-4.6.1_p14-r2.ebuild
 2209210210 ./net-libs/xdp-tools/xdp-tools-1.2.8.ebuild
 2207301840 ./net-libs/xrootd-ceph/xrootd-ceph-5.4.3.ebuild
@@ -22583,7 +22592,7 @@
 2208082140 ./net-mail/mu/mu-1.8.8.ebuild
 2208201040 ./net-mail/mu/mu-1.8.9.ebuild
 2208270240 ./net-mail/mu/mu-1.8.7.ebuild
-2210201410 ./net-mail/mu/mu-1.8.10.ebuild
+2210251610 ./net-mail/mu/mu-1.8.10.ebuild
 2102191539 ./net-mail/muchsync/muchsync-6.ebuild
 2106190039 ./net-mail/nmzmail/nmzmail-1.1-r1.ebuild
 2202012209 ./net-mail/notmuch/notmuch-0.32.2-r1.ebuild
@@ -22707,7 +22716,7 @@
 2207030610 ./net-misc/curl/curl-7.84.0.ebuild
 2209011740 ./net-misc/curl/curl-7.79.1-r1.ebuild
 2209011740 ./net-misc/curl/curl-7.83.1.ebuild
-2209051940 ./net-misc/curl/curl-7.85.0-r2.ebuild
+2210251410 ./net-misc/curl/curl-7.85.0-r2.ebuild
 2204280640 ./net-misc/dahdi-tools/dahdi-tools-3.1.0-r2.ebuild
 2207150512 ./net-misc/dahdi-tools/dahdi-tools-3.1.0-r4.ebuild
 2103261109 ./net-misc/dahdi/dahdi-3.1.0-r3.ebuild
@@ -22715,7 +22724,7 @@
 1907151840 ./net-misc/datapipe/datapipe-1.0-r2.ebuild
 1910051539 ./net-misc/dcetest/dcetest-2.0.ebuild
 2208231010 ./net-misc/dhcdrop/dhcdrop-0.5-r1.ebuild
-2210142140 ./net-misc/dhcp/dhcp-4.4.3_p1.ebuild
+2210241910 ./net-misc/dhcp/dhcp-4.4.3_p1.ebuild
 2110241239 ./net-misc/dhcpcd-ui/dhcpcd-ui-0.7.8.ebuild
 2201041339 ./net-misc/dhcpcd/dhcpcd-9999.ebuild
 2205260840 ./net-misc/dhcpcd/dhcpcd-9.4.1.ebuild
@@ -22771,6 +22780,7 @@
 2210191240 ./net-misc/getdate/getdate-1.2-r2.ebuild
 2206211710 ./net-misc/gnome-online-miners/gnome-online-miners-3.34.0-r2.ebuild
 2209261640 ./net-misc/gnome-remote-desktop/gnome-remote-desktop-43.0.ebuild
+2210251840 ./net-misc/gnome-remote-desktop/gnome-remote-desktop-43.1.ebuild
 2207071940 ./net-misc/gns3-gui/gns3-gui-2.2.33.1.ebuild
 2210101640 ./net-misc/gns3-gui/gns3-gui-2.2.34.ebuild
 2207071940 ./net-misc/gns3-server/gns3-server-2.2.33.1.ebuild
@@ -23014,12 +23024,10 @@
 1910111911 ./net-misc/redir/redir-3.3.ebuild
 2207251740 ./net-misc/remmina/remmina-1.4.27.ebuild
 2210211610 ./net-misc/rinetd/rinetd-0.62-r3.ebuild
-2206021040 ./net-misc/rsync/rsync-3.2.4-r1.ebuild
 2207060940 ./net-misc/rsync/rsync-3.2.4-r3.ebuild
-2209080210 ./net-misc/rsync/rsync-3.2.5-r1.ebuild
 2209080210 ./net-misc/rsync/rsync-9999.ebuild
 2209100810 ./net-misc/rsync/rsync-3.2.6.ebuild
-2210010040 ./net-misc/rsync/rsync-3.2.7_pre1.ebuild
+2210250910 ./net-misc/rsync/rsync-3.2.7.ebuild
 2209220740 ./net-misc/rwbs/rwbs-0.27-r2.ebuild
 2106302209 ./net-misc/rwhoisd/rwhoisd-1.5.9.6-r2.ebuild
 2207060440 ./net-misc/rygel/rygel-0.40.4.ebuild
@@ -23063,11 +23071,10 @@
 2002230040 ./net-misc/sock/sock-1.1-r1.ebuild
 2108292239 ./net-misc/socket-burst-dampener/socket-burst-dampener-1.3.1.ebuild
 2103310109 ./net-misc/socket/socket-1.5.ebuild
-2210160610 ./net-misc/spice-gtk/spice-gtk-0.39-r2.ebuild
-2210160610 ./net-misc/spice-gtk/spice-gtk-0.40-r1.ebuild
-2210160610 ./net-misc/spice-gtk/spice-gtk-0.40.ebuild
-2210160610 ./net-misc/spice-gtk/spice-gtk-0.41.ebuild
-2210160610 ./net-misc/spice-gtk/spice-gtk-9999.ebuild
+2210260640 ./net-misc/spice-gtk/spice-gtk-0.40-r1.ebuild
+2210260640 ./net-misc/spice-gtk/spice-gtk-0.41-r1.ebuild
+2210260640 ./net-misc/spice-gtk/spice-gtk-0.41.ebuild
+2210260640 ./net-misc/spice-gtk/spice-gtk-9999.ebuild
 2208301210 ./net-misc/spiped/spiped-1.6.2.ebuild
 2201290510 ./net-misc/spread/spread-4.4.1-r1.ebuild
 2201290510 ./net-misc/spread/spread-5.0.1-r1.ebuild
@@ -23150,9 +23157,9 @@
 2206181110 ./net-misc/whois/whois-5.5.13-r1.ebuild
 2210180110 ./net-misc/whois/whois-5.5.14.ebuild
 2210180110 ./net-misc/whois/whois-9999.ebuild
-2202100210 ./net-misc/wol/wol-0.7.1-r3.ebuild
+2210251610 ./net-misc/wol/wol-0.7.1-r3.ebuild
 2011041109 ./net-misc/wput/wput-0.6.2.ebuild
-2209261540 ./net-misc/wput/wput-0.6.2_p20130413_p11.ebuild
+2210252110 ./net-misc/wput/wput-0.6.2_p20130413_p11.ebuild
 2209301410 ./net-misc/x11-ssh-askpass/x11-ssh-askpass-1.2.4.1-r2.ebuild
 2207281110 ./net-misc/x2goclient/x2goclient-4.1.2.2-r1.ebuild
 2109262309 ./net-misc/x2goserver/x2goserver-4.1.0.3-r1.ebuild
@@ -23271,12 +23278,9 @@
 2111221709 ./net-p2p/classified-ads/classified-ads-0.13-r2.ebuild
 2204220940 ./net-p2p/classified-ads/classified-ads-0.14.ebuild
 2207022040 ./net-p2p/classified-ads/classified-ads-0.15.ebuild
-2109252239 ./net-p2p/cpuminer-opt/cpuminer-opt-3.16.4-r1.ebuild
-2109252239 ./net-p2p/cpuminer-opt/cpuminer-opt-3.17.1-r1.ebuild
-2110010439 ./net-p2p/cpuminer-opt/cpuminer-opt-3.18.0.ebuild
-2205311710 ./net-p2p/cpuminer-opt/cpuminer-opt-3.19.8.ebuild
 2205311710 ./net-p2p/cpuminer-opt/cpuminer-opt-9999.ebuild
 2207281910 ./net-p2p/cpuminer-opt/cpuminer-opt-3.20.1.ebuild
+2210241810 ./net-p2p/cpuminer-opt/cpuminer-opt-3.20.3.ebuild
 2104302009 ./net-p2p/ctorrent/ctorrent-3.3.2-r4.ebuild
 2106302209 ./net-p2p/dbhub/dbhub-0.451-r2.ebuild
 2209160610 ./net-p2p/deluge/deluge-9999.ebuild
@@ -23331,9 +23335,9 @@
 2105112239 ./net-p2p/torrentinfo/torrentinfo-1.8.6-r2.ebuild
 2208301210 ./net-p2p/transmission-remote-gtk/transmission-remote-gtk-1.5.1.ebuild
 2208081310 ./net-p2p/transmission/transmission-3.00-r1.ebuild
-2208081310 ./net-p2p/transmission/transmission-3.00-r4.ebuild
 2210080140 ./net-p2p/transmission/transmission-4.0.0_beta1.ebuild
 2210080140 ./net-p2p/transmission/transmission-9999.ebuild
+2210251410 ./net-p2p/transmission/transmission-3.00-r5.ebuild
 2210212310 ./net-p2p/tremc/tremc-0.9.3.ebuild
 1806011708 ./net-p2p/tvrss/tvrss-1.8_beta.ebuild
 1911232009 ./net-p2p/vuze-coreplugins/vuze-coreplugins-5.7.6.0.ebuild
@@ -23433,8 +23437,7 @@
 2203020710 ./net-proxy/sshuttle/sshuttle-1.1.0.ebuild
 2210090240 ./net-proxy/sshuttle/sshuttle-1.1.1.ebuild
 1801022240 ./net-proxy/tayga/tayga-0.9.2-r1.ebuild
-1902031239 ./net-proxy/tayga/tayga-0.9.2-r2.ebuild
-2203030939 ./net-proxy/tayga/tayga-0.9.2-r3.ebuild
+2210251540 ./net-proxy/tayga/tayga-0.9.2-r4.ebuild
 2209271040 ./net-proxy/tinyproxy/tinyproxy-1.11.1_p20220908.ebuild
 2005291109 ./net-proxy/torsocks/torsocks-2.3.0.ebuild
 2207290240 ./net-proxy/torsocks/torsocks-2.4.0.ebuild
@@ -23558,7 +23561,7 @@
 2004041439 ./net-wireless/bluez-hcidump/bluez-hcidump-2.5.ebuild
 2201032209 ./net-wireless/bluez-tools/bluez-tools-0_p20201025.ebuild
 2207091810 ./net-wireless/bluez/bluez-5.64.ebuild
-2210231410 ./net-wireless/bluez/bluez-5.65.ebuild
+2210251610 ./net-wireless/bluez/bluez-5.65.ebuild
 2104271709 ./net-wireless/broadcom-sta/broadcom-sta-6.30.223.271-r6.ebuild
 2105050139 ./net-wireless/bss/bss-0.8-r2.ebuild
 2208111410 ./net-wireless/crackle/crackle-0.1-r1.ebuild
@@ -23774,6 +23777,7 @@
 2008311239 ./ros-meta/geometry2/geometry2-0.7.3.ebuild
 2009032009 ./ros-meta/geometry2/geometry2-0.7.5.ebuild
 2007291539 ./ros-meta/geometry2/geometry2-9999.ebuild
+2210251440 ./ros-meta/geometry2/geometry2-0.7.6.ebuild
 2007291539 ./ros-meta/geometry_tutorials/geometry_tutorials-0.2.3.ebuild
 2007291539 ./ros-meta/geometry_tutorials/geometry_tutorials-9999.ebuild
 2007291539 ./ros-meta/hector_localization/hector_localization-0.3.0.ebuild
@@ -23885,9 +23889,8 @@
 2202140039 ./sci-astronomy/aatm/aatm-0.6.ebuild
 2105292209 ./sci-astronomy/casa-data/casa-data-20170703.ebuild
 2207272340 ./sci-astronomy/cdsclient/cdsclient-3.8.4-r1.ebuild
-2207062240 ./sci-astronomy/celestia/celestia-1.7.0_pre20200316-r100.ebuild
-2207062240 ./sci-astronomy/celestia/celestia-1.7.0_pre20220120.ebuild
-2207062240 ./sci-astronomy/celestia/celestia-9999.ebuild
+2210251610 ./sci-astronomy/celestia/celestia-1.7.0_pre20220120.ebuild
+2210251610 ./sci-astronomy/celestia/celestia-9999.ebuild
 2105311239 ./sci-astronomy/cpl/cpl-7.0-r1.ebuild
 2110211309 ./sci-astronomy/ds9-bin/ds9-bin-7.4.ebuild
 2101312239 ./sci-astronomy/erfa/erfa-1.4.0.ebuild
@@ -24097,8 +24100,8 @@
 2209071310 ./sci-chemistry/avogadro2/avogadro2-1.97.0.ebuild
 2108141339 ./sci-chemistry/bodr/bodr-10.ebuild
 2210082110 ./sci-chemistry/cara-bin/cara-bin-1.8.4-r2.ebuild
-2209181840 ./sci-chemistry/chemex/chemex-2021.4.0_p6-r1.ebuild
 2209181840 ./sci-chemistry/chemex/chemex-2022.0.1-r1.ebuild
+2210251610 ./sci-chemistry/chemex/chemex-2022.1.0.ebuild
 2004051239 ./sci-chemistry/chemical-mime-data/chemical-mime-data-0.1.94-r4.ebuild
 2008291539 ./sci-chemistry/chemtool/chemtool-1.6.14.ebuild
 2009162339 ./sci-chemistry/clashlist/clashlist-3.17-r1.ebuild
@@ -24284,6 +24287,7 @@
 2204130011 ./sci-geosciences/gmt/gmt-6.3.0.ebuild
 2209302010 ./sci-geosciences/gnome-maps/gnome-maps-42.3-r3.ebuild
 2210120610 ./sci-geosciences/gnome-maps/gnome-maps-43.0.ebuild
+2210251840 ./sci-geosciences/gnome-maps/gnome-maps-43.1.ebuild
 2110250239 ./sci-geosciences/gpsbabel/gpsbabel-9999.ebuild
 2202141339 ./sci-geosciences/gpsbabel/gpsbabel-1.7.0-r1.ebuild
 2104192239 ./sci-geosciences/gpscorrelate/gpscorrelate-1.6.1-r2.ebuild
@@ -24402,7 +24406,6 @@
 2202071339 ./sci-libs/bliss/bliss-0.77.ebuild
 2101310343 ./sci-libs/bmrblib/bmrblib-1.0.4.ebuild
 2202042339 ./sci-libs/branca/branca-0.4.2-r1.ebuild
-2105292209 ./sci-libs/brial/brial-1.2.10.ebuild
 2210241040 ./sci-libs/brial/brial-1.2.11.ebuild
 2112011009 ./sci-libs/btf/btf-1.2.6.ebuild
 2011171339 ./sci-libs/buddy/buddy-2.4-r1.ebuild
@@ -24501,7 +24504,6 @@
 2103270609 ./sci-libs/gerris/gerris-20131206-r1.ebuild
 2201111810 ./sci-libs/getdata/getdata-0.11.0.ebuild
 2205150040 ./sci-libs/ginkgo/ginkgo-1.4.0-r3.ebuild
-2111021910 ./sci-libs/givaro/givaro-4.1.1-r2.ebuild
 2210241040 ./sci-libs/givaro/givaro-4.1.1-r3.ebuild
 2206131610 ./sci-libs/gmsh/gmsh-4.10.3.ebuild
 2206131610 ./sci-libs/gmsh/gmsh-4.9.5-r2.ebuild
@@ -24657,9 +24659,9 @@
 2006111539 ./sci-libs/oc/oc-2.0.ebuild
 2207071340 ./sci-libs/octomap/octomap-1.9.8.ebuild
 2206302240 ./sci-libs/ogdi/ogdi-4.1.0-r1.ebuild
-2205161140 ./sci-libs/openblas/openblas-0.3.18.ebuild
-2205161140 ./sci-libs/openblas/openblas-0.3.19.ebuild
-2205161140 ./sci-libs/openblas/openblas-0.3.20.ebuild
+2210241910 ./sci-libs/openblas/openblas-0.3.18.ebuild
+2210241910 ./sci-libs/openblas/openblas-0.3.19.ebuild
+2210241910 ./sci-libs/openblas/openblas-0.3.20.ebuild
 2206141910 ./sci-libs/opencascade/opencascade-7.5.2-r6.ebuild
 2206260240 ./sci-libs/opencascade/opencascade-7.5.3-r8.ebuild
 2209251040 ./sci-libs/opencascade/opencascade-7.6.3.ebuild
@@ -24889,7 +24891,7 @@
 2201241240 ./sci-mathematics/minisat/minisat-2.2.1-r1.ebuild
 2201290310 ./sci-mathematics/msieve/msieve-1.53-r1.ebuild
 2201190139 ./sci-mathematics/nauty/nauty-2.7.3.ebuild
-2208111510 ./sci-mathematics/nauty/nauty-2.7.4.ebuild
+2210251410 ./sci-mathematics/nauty/nauty-2.7.4.ebuild
 2102010039 ./sci-mathematics/nestedsums/nestedsums-1.5.2-r1.ebuild
 2208161110 ./sci-mathematics/normaliz/normaliz-3.9.3.ebuild
 2206182010 ./sci-mathematics/num-utils/num-utils-0.5-r2.ebuild
@@ -24915,14 +24917,13 @@
 2210082210 ./sci-mathematics/pspp/pspp-1.6.0-r1.ebuild
 2210091210 ./sci-mathematics/pspp/pspp-1.6.2-r1.ebuild
 2107172140 ./sci-mathematics/relational/relational-2.5-r2.ebuild
-2206011440 ./sci-mathematics/rkward/rkward-0.7.4.ebuild
 2210221810 ./sci-mathematics/rkward/rkward-0.7.5.ebuild
 1912080309 ./sci-mathematics/rngstreams/rngstreams-1.0.1.ebuild
 2105261009 ./sci-mathematics/rw/rw-0.9.ebuild
 2208261240 ./sci-mathematics/sha1-polyml/sha1-polyml-5.9.ebuild
 2111190309 ./sci-mathematics/singular/singular-4.2.0_p1.ebuild
 2202071339 ./sci-mathematics/singular/singular-4.2.1_p3-r1.ebuild
-2207151210 ./sci-mathematics/singular/singular-4.3.1_p1.ebuild
+2210251440 ./sci-mathematics/singular/singular-4.3.1_p1.ebuild
 2112031039 ./sci-mathematics/slepc/slepc-3.16.0.ebuild
 2205260440 ./sci-mathematics/slepc/slepc-3.17.1.ebuild
 2201161210 ./sci-mathematics/spin/spin-6.5.2-r1.ebuild
@@ -24983,7 +24984,7 @@
 2210060511 ./sci-misc/fitscut/fitscut-1.4.4-r1.ebuild
 2002112051 ./sci-misc/fitsverify/fitsverify-4.18.ebuild
 2203231439 ./sci-misc/flashdot/flashdot-1.1.4-r1.ebuild
-2104031909 ./sci-misc/gt-itm/gt-itm-19961004-r2.ebuild
+2210242240 ./sci-misc/gt-itm/gt-itm-19961004-r3.ebuild
 2103261839 ./sci-misc/h5utils/h5utils-1.13.1.ebuild
 1802192308 ./sci-misc/lttoolbox/lttoolbox-3.3.3.ebuild
 1912110241 ./sci-misc/nco/nco-4.5.1-r2.ebuild
@@ -26134,6 +26135,7 @@
 2207181610 ./sys-apps/mcstrans/mcstrans-3.4.ebuild
 2201181539 ./sys-apps/memtest86+/memtest86+-5.31b-r3.ebuild
 2207181711 ./sys-apps/memtest86+/memtest86+-6.00_beta3.ebuild
+2210251610 ./sys-apps/memtest86+/memtest86+-6.00.ebuild
 2209301610 ./sys-apps/memtest86-bin/memtest86-bin-10.0.ebuild
 2104161339 ./sys-apps/memtest86/memtest86-4.3.7-r2.ebuild
 2205051310 ./sys-apps/memtester/memtester-4.5.1.ebuild
@@ -26164,8 +26166,6 @@
 2207100040 ./sys-apps/onerng/onerng-3.7.ebuild
 2111090809 ./sys-apps/opal-utils/opal-utils-6.8.ebuild
 2201140110 ./sys-apps/opal-utils/opal-utils-7.0.ebuild
-2210101540 ./sys-apps/openrc/openrc-0.44.10-r1.ebuild
-2210101540 ./sys-apps/openrc/openrc-0.45.1-r1.ebuild
 2210101540 ./sys-apps/openrc/openrc-0.45.2-r1.ebuild
 2210101540 ./sys-apps/openrc/openrc-9999.ebuild
 2104060140 ./sys-apps/opentmpfiles/opentmpfiles-0.1.1.ebuild
@@ -26200,8 +26200,8 @@
 2209192040 ./sys-apps/policycoreutils/policycoreutils-3.3.ebuild
 2209192040 ./sys-apps/policycoreutils/policycoreutils-3.4.ebuild
 2209192040 ./sys-apps/policycoreutils/policycoreutils-9999.ebuild
-2210211740 ./sys-apps/portage/portage-3.0.38.1-r1.ebuild
 2210211740 ./sys-apps/portage/portage-9999.ebuild
+2210260340 ./sys-apps/portage/portage-3.0.38.1-r2.ebuild
 2010142339 ./sys-apps/powerpc-utils/powerpc-utils-1.1.3.18-r4.ebuild
 2106050409 ./sys-apps/ppc64-diag/ppc64-diag-2.7.7.ebuild
 2205151410 ./sys-apps/ppc64-diag/ppc64-diag-2.7.8.ebuild
@@ -26284,7 +26284,8 @@
 2210040310 ./sys-apps/systemd/systemd-251.5.ebuild
 2210040310 ./sys-apps/systemd/systemd-9999.ebuild
 2210150040 ./sys-apps/systemd/systemd-251.6.ebuild
-2210192140 ./sys-apps/systemd/systemd-252_rc2.ebuild
+2210250910 ./sys-apps/systemd/systemd-251.7.ebuild
+2210250410 ./sys-apps/systemd/systemd-252_rc3.ebuild
 2201040640 ./sys-apps/sysvinit/sysvinit-2.99-r1.ebuild
 2204291110 ./sys-apps/sysvinit/sysvinit-3.03.ebuild
 2205040710 ./sys-apps/sysvinit/sysvinit-3.01.ebuild
@@ -26352,6 +26353,7 @@
 2209181910 ./sys-apps/systemd-utils/systemd-utils-251.4-r2.ebuild
 2210020610 ./sys-apps/systemd-utils/systemd-utils-251.5.ebuild
 2210150040 ./sys-apps/systemd-utils/systemd-utils-251.6.ebuild
+2210250910 ./sys-apps/systemd-utils/systemd-utils-251.7.ebuild
 2209190512 ./sys-apps/xdg-desktop-portal-gnome/xdg-desktop-portal-gnome-42.3.ebuild
 2209242010 ./sys-apps/xdg-desktop-portal-gnome/xdg-desktop-portal-gnome-43.0.ebuild
 2210182140 ./sys-apps/xdg-desktop-portal-gnome/xdg-desktop-portal-gnome-43.1.ebuild
@@ -26359,6 +26361,7 @@
 2208192240 ./sys-apps/cpu-x/cpu-x-4.3.1.ebuild
 2209291740 ./sys-apps/cpu-x/cpu-x-4.4.0.ebuild
 2210101940 ./sys-apps/cpu-x/cpu-x-4.5.0.ebuild
+2210251610 ./sys-apps/cpu-x/cpu-x-4.5.1.ebuild
 2208252010 ./sys-apps/mount-idmapped/mount-idmapped-0.0_pre20220825.ebuild
 2210071212 ./sys-apps/merge-usr/merge-usr-1.ebuild
 2210220040 ./sys-apps/merge-usr/merge-usr-2.ebuild
@@ -26584,9 +26587,10 @@
 2006061709 ./sys-boot/plymouth-openrc-plugin/plymouth-openrc-plugin-0.1.3.ebuild
 2208062040 ./sys-boot/plymouth/plymouth-9999.ebuild
 2208240240 ./sys-boot/plymouth/plymouth-22.02.122-r1.ebuild
-2011230809 ./sys-boot/raspberrypi-firmware/raspberrypi-firmware-9999.ebuild
 2204061009 ./sys-boot/raspberrypi-firmware/raspberrypi-firmware-1.20220328.ebuild
 2204092309 ./sys-boot/raspberrypi-firmware/raspberrypi-firmware-1.20211118.ebuild
+2210242040 ./sys-boot/raspberrypi-firmware/raspberrypi-firmware-1.20220830.ebuild
+2210242040 ./sys-boot/raspberrypi-firmware/raspberrypi-firmware-9999.ebuild
 2112070940 ./sys-boot/refind/refind-0.13.2.ebuild
 2205181840 ./sys-boot/refind/refind-0.13.3.1.ebuild
 2108170709 ./sys-boot/sgibootcd/sgibootcd-0.13.ebuild
@@ -26650,6 +26654,7 @@
 2208142340 ./sys-cluster/hpx/hpx-1.8.1.ebuild
 2209031240 ./sys-cluster/ipvsadm/ipvsadm-1.31-r1.ebuild
 2209300440 ./sys-cluster/k3s/k3s-1.25.2_p1.ebuild
+2210260340 ./sys-cluster/k3s/k3s-1.25.3_p1.ebuild
 2209060910 ./sys-cluster/k9scli/k9scli-0.25.18-r1.ebuild
 2203040040 ./sys-cluster/keepalived/keepalived-2.2.4.ebuild
 2206121142 ./sys-cluster/keepalived/keepalived-2.2.7.ebuild
@@ -26818,25 +26823,25 @@
 2104060140 ./sys-devel/boost-m4/boost-m4-0.4_p20160328.ebuild
 2204212010 ./sys-devel/clang-common/clang-common-13.0.1.ebuild
 2208022310 ./sys-devel/clang-common/clang-common-14.0.6.ebuild
-2210131810 ./sys-devel/clang-common/clang-common-15.0.3.9999.ebuild
 2210131810 ./sys-devel/clang-common/clang-common-16.0.0.9999.ebuild
 2210162210 ./sys-devel/clang-common/clang-common-16.0.0_pre20221016-r1.ebuild
-2210181810 ./sys-devel/clang-common/clang-common-15.0.3-r2.ebuild
 2210231840 ./sys-devel/clang-common/clang-common-16.0.0_pre20221023-r1.ebuild
+2210251340 ./sys-devel/clang-common/clang-common-15.0.3-r2.ebuild
+2210241640 ./sys-devel/clang-common/clang-common-15.0.4.9999.ebuild
 2204212010 ./sys-devel/clang-runtime/clang-runtime-13.0.1.ebuild
 2208022310 ./sys-devel/clang-runtime/clang-runtime-14.0.6.ebuild
 2209191410 ./sys-devel/clang-runtime/clang-runtime-16.0.0.9999.ebuild
-2210101140 ./sys-devel/clang-runtime/clang-runtime-15.0.3.9999.ebuild
 2210162210 ./sys-devel/clang-runtime/clang-runtime-16.0.0_pre20221016.ebuild
-2210181810 ./sys-devel/clang-runtime/clang-runtime-15.0.3.ebuild
 2210231840 ./sys-devel/clang-runtime/clang-runtime-16.0.0_pre20221023.ebuild
+2210251340 ./sys-devel/clang-runtime/clang-runtime-15.0.3.ebuild
+2210241640 ./sys-devel/clang-runtime/clang-runtime-15.0.4.9999.ebuild
 2206220743 ./sys-devel/clang/clang-13.0.1.ebuild
 2208022310 ./sys-devel/clang/clang-14.0.6-r1.ebuild
-2210130840 ./sys-devel/clang/clang-15.0.3.9999.ebuild
 2210162240 ./sys-devel/clang/clang-16.0.0_pre20221016.ebuild
-2210181810 ./sys-devel/clang/clang-15.0.3.ebuild
 2210240910 ./sys-devel/clang/clang-16.0.0.9999.ebuild
 2210240910 ./sys-devel/clang/clang-16.0.0_pre20221023.ebuild
+2210251340 ./sys-devel/clang/clang-15.0.3.ebuild
+2210241640 ./sys-devel/clang/clang-15.0.4.9999.ebuild
 2204141010 ./sys-devel/cons/cons-2.3.0-r1.ebuild
 2208232140 ./sys-devel/crossdev/crossdev-20220709.ebuild
 2210240710 ./sys-devel/crossdev/crossdev-20220818.ebuild
@@ -26851,6 +26856,7 @@
 2105071940 ./sys-devel/elftoolchain/elftoolchain-0.7.1_p20210319.ebuild
 2204290540 ./sys-devel/flex/flex-2.6.4-r1.ebuild
 2209260740 ./sys-devel/flex/flex-2.6.4-r2.ebuild
+2210251510 ./sys-devel/flex/flex-2.6.4-r3.ebuild
 2111251340 ./sys-devel/gcc-apple/gcc-apple-4.2.1_p5666-r3.ebuild
 2111180839 ./sys-devel/gcc-config/gcc-config-2.4.ebuild
 2204290540 ./sys-devel/gcc-config/gcc-config-2.5-r1.ebuild
@@ -26866,20 +26872,9 @@
 2208220540 ./sys-devel/gcc/gcc-11.3.0.ebuild
 2208220513 ./sys-devel/gcc/gcc-12.2.0.ebuild
 2208220513 ./sys-devel/gcc/gcc-12.3.9999.ebuild
-2209180340 ./sys-devel/gcc/gcc-12.2.1_p20220917.ebuild
-2209190540 ./sys-devel/gcc/gcc-13.0.0_pre20220918.ebuild
-2209230310 ./sys-devel/gcc/gcc-11.3.1_p20220909.ebuild
-2209250710 ./sys-devel/gcc/gcc-10.4.1_p20220922.ebuild
-2209250710 ./sys-devel/gcc/gcc-12.2.1_p20220924.ebuild
-2210061610 ./sys-devel/gcc/gcc-10.4.1_p20220929.ebuild
-2210061610 ./sys-devel/gcc/gcc-11.3.1_p20220930.ebuild
-2210061610 ./sys-devel/gcc/gcc-12.2.1_p20221001.ebuild
 2210111540 ./sys-devel/gcc/gcc-13.0.0_pre20221002.ebuild
 2210140110 ./sys-devel/gcc/gcc-10.4.1_p20221006.ebuild
 2210140110 ./sys-devel/gcc/gcc-11.3.1_p20221007.ebuild
-2210162010 ./sys-devel/gcc/gcc-10.4.1_p20221013.ebuild
-2210162010 ./sys-devel/gcc/gcc-11.3.1_p20221014.ebuild
-2210162010 ./sys-devel/gcc/gcc-12.2.1_p20221015.ebuild
 2210231410 ./sys-devel/gcc/gcc-10.4.1_p20221020.ebuild
 2210231410 ./sys-devel/gcc/gcc-11.3.1_p20221021.ebuild
 2210240010 ./sys-devel/gcc/gcc-12.2.1_p20221008.ebuild
@@ -26904,22 +26899,20 @@
 2104060140 ./sys-devel/libtool/libtool-2.4.6-r6.ebuild
 2203250640 ./sys-devel/libtool/libtool-9999.ebuild
 2206170210 ./sys-devel/libtool/libtool-2.4.7.ebuild
-2208111410 ./sys-devel/lld/lld-13.0.1.ebuild
-2208111410 ./sys-devel/lld/lld-14.0.6.ebuild
-2210162240 ./sys-devel/lld/lld-15.0.3.9999.ebuild
 2210162240 ./sys-devel/lld/lld-16.0.0.9999.ebuild
 2210162240 ./sys-devel/lld/lld-16.0.0_pre20221016.ebuild
 2210181810 ./sys-devel/lld/lld-15.0.3.ebuild
-2210211110 ./sys-devel/lld/lld-13.0.1-r1.ebuild
-2210211110 ./sys-devel/lld/lld-14.0.6-r1.ebuild
 2210231840 ./sys-devel/lld/lld-16.0.0_pre20221023.ebuild
+2210251210 ./sys-devel/lld/lld-13.0.1-r1.ebuild
+2210251210 ./sys-devel/lld/lld-14.0.6-r1.ebuild
+2210241640 ./sys-devel/lld/lld-15.0.4.9999.ebuild
 2204212010 ./sys-devel/llvm-common/llvm-common-13.0.1.ebuild
 2208022310 ./sys-devel/llvm-common/llvm-common-14.0.6.ebuild
 2208052310 ./sys-devel/llvm-common/llvm-common-16.0.0.9999.ebuild
-2210101140 ./sys-devel/llvm-common/llvm-common-15.0.3.9999.ebuild
 2210162210 ./sys-devel/llvm-common/llvm-common-16.0.0_pre20221016.ebuild
-2210181810 ./sys-devel/llvm-common/llvm-common-15.0.3.ebuild
 2210231840 ./sys-devel/llvm-common/llvm-common-16.0.0_pre20221023.ebuild
+2210251340 ./sys-devel/llvm-common/llvm-common-15.0.3.ebuild
+2210241640 ./sys-devel/llvm-common/llvm-common-15.0.4.9999.ebuild
 2109202139 ./sys-devel/llvm-roc/llvm-roc-3.10.0.ebuild
 2109202139 ./sys-devel/llvm-roc/llvm-roc-3.7.0-r1.ebuild
 2109202139 ./sys-devel/llvm-roc/llvm-roc-3.8.0.ebuild
@@ -26936,18 +26929,18 @@
 2210110023 ./sys-devel/llvm/llvm-13.0.1.ebuild
 2210110023 ./sys-devel/llvm/llvm-14.0.6-r2.ebuild
 2210162210 ./sys-devel/llvm/llvm-16.0.0_pre20221016.ebuild
-2210181810 ./sys-devel/llvm/llvm-15.0.3.9999.ebuild
-2210181810 ./sys-devel/llvm/llvm-15.0.3.ebuild
 2210240910 ./sys-devel/llvm/llvm-16.0.0.9999.ebuild
 2210240910 ./sys-devel/llvm/llvm-16.0.0_pre20221023.ebuild
+2210251340 ./sys-devel/llvm/llvm-15.0.3.ebuild
+2210241640 ./sys-devel/llvm/llvm-15.0.4.9999.ebuild
 2207270740 ./sys-devel/llvmgold/llvmgold-13-r2.ebuild
 2208022310 ./sys-devel/llvmgold/llvmgold-14.ebuild
 2208052310 ./sys-devel/llvmgold/llvmgold-16.ebuild
-2209062240 ./sys-devel/llvmgold/llvmgold-15.ebuild
+2210251340 ./sys-devel/llvmgold/llvmgold-15.ebuild
 2204290540 ./sys-devel/m4/m4-1.4.19.ebuild
 2208291840 ./sys-devel/make/make-4.3.ebuild
 2208291840 ./sys-devel/make/make-9999.ebuild
-2210200710 ./sys-devel/make/make-4.3.91.ebuild
+2210241510 ./sys-devel/make/make-4.3.92.ebuild
 2209091310 ./sys-devel/mold/mold-1.4.2.ebuild
 2209301140 ./sys-devel/mold/mold-1.5.1.ebuild
 2209301140 ./sys-devel/mold/mold-9999.ebuild
@@ -26974,8 +26967,8 @@
 2208261040 ./sys-devel/qbe/qbe-9999.ebuild
 2209091810 ./sys-devel/autoconf-dickey/autoconf-dickey-2.52_p20210509.ebuild
 2210131910 ./sys-devel/clang-toolchain-symlinks/clang-toolchain-symlinks-14-r2.ebuild
-2210131910 ./sys-devel/clang-toolchain-symlinks/clang-toolchain-symlinks-15-r2.ebuild
 2210131910 ./sys-devel/clang-toolchain-symlinks/clang-toolchain-symlinks-16-r2.ebuild
+2210251340 ./sys-devel/clang-toolchain-symlinks/clang-toolchain-symlinks-15-r2.ebuild
 2210131910 ./sys-devel/lld-toolchain-symlinks/lld-toolchain-symlinks-14-r1.ebuild
 2210131910 ./sys-devel/lld-toolchain-symlinks/lld-toolchain-symlinks-15-r1.ebuild
 2210131910 ./sys-devel/lld-toolchain-symlinks/lld-toolchain-symlinks-16-r1.ebuild
@@ -26983,8 +26976,8 @@
 2210141640 ./sys-devel/lld-toolchain-symlinks/lld-toolchain-symlinks-15-r2.ebuild
 2210141640 ./sys-devel/lld-toolchain-symlinks/lld-toolchain-symlinks-16-r2.ebuild
 2210131910 ./sys-devel/llvm-toolchain-symlinks/llvm-toolchain-symlinks-14-r1.ebuild
-2210131910 ./sys-devel/llvm-toolchain-symlinks/llvm-toolchain-symlinks-15-r1.ebuild
 2210131910 ./sys-devel/llvm-toolchain-symlinks/llvm-toolchain-symlinks-16-r1.ebuild
+2210251340 ./sys-devel/llvm-toolchain-symlinks/llvm-toolchain-symlinks-15-r1.ebuild
 2201120040 ./sys-fabric/mstflint/mstflint-4.18.0_p1-r1.ebuild
 2206190140 ./sys-fabric/mstflint/mstflint-4.20.0_p1.ebuild
 2106300039 ./sys-fabric/opensm/opensm-3.3.23-r1.ebuild
@@ -27023,8 +27016,8 @@
 2008121039 ./sys-firmware/midisport-firmware/midisport-firmware-1.2-r1.ebuild
 2205192310 ./sys-firmware/nvidia-firmware/nvidia-firmware-340.32-r1.ebuild
 2112061840 ./sys-firmware/raspberrypi-wifi-ucode/raspberrypi-wifi-ucode-20190114.1_p11.ebuild
-2204061009 ./sys-firmware/raspberrypi-wifi-ucode/raspberrypi-wifi-ucode-20210315.3_p5.ebuild
 2204190709 ./sys-firmware/raspberrypi-wifi-ucode/raspberrypi-wifi-ucode-20210315.3_p5-r1.ebuild
+2210242040 ./sys-firmware/raspberrypi-wifi-ucode/raspberrypi-wifi-ucode-20210315.3_p7.ebuild
 2209270640 ./sys-firmware/seabios/seabios-1.14.0-r2.ebuild
 2209270640 ./sys-firmware/seabios/seabios-1.16.0.ebuild
 2205191540 ./sys-firmware/sgabios/sgabios-0.1_pre10.ebuild
@@ -27061,10 +27054,11 @@
 2102162039 ./sys-fs/bindfs/bindfs-1.15.0.ebuild
 2102180539 ./sys-fs/bindfs/bindfs-1.15.1.ebuild
 2206262240 ./sys-fs/bindfs/bindfs-1.16.1.ebuild
-2210132140 ./sys-fs/btrfs-progs/btrfs-progs-5.15.1.ebuild
-2210132140 ./sys-fs/btrfs-progs/btrfs-progs-5.18.1-r1.ebuild
-2210132140 ./sys-fs/btrfs-progs/btrfs-progs-5.19.1.ebuild
-2210132140 ./sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
+2210250910 ./sys-fs/btrfs-progs/btrfs-progs-5.15.1.ebuild
+2210250910 ./sys-fs/btrfs-progs/btrfs-progs-5.18.1-r1.ebuild
+2210250910 ./sys-fs/btrfs-progs/btrfs-progs-5.19.1.ebuild
+2210250910 ./sys-fs/btrfs-progs/btrfs-progs-6.0.ebuild
+2210250910 ./sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
 2002112051 ./sys-fs/btrfsmaintenance/btrfsmaintenance-0.4.2.ebuild
 2201110540 ./sys-fs/btrfsmaintenance/btrfsmaintenance-0.5.ebuild
 2202140039 ./sys-fs/cachefilesd/cachefilesd-0.10.10-r1.ebuild
@@ -27080,7 +27074,7 @@
 2210042340 ./sys-fs/cryptmount/cryptmount-6.0.ebuild
 2210110023 ./sys-fs/cryptmount/cryptmount-6.1.0.ebuild
 2202072340 ./sys-fs/cryptsetup/cryptsetup-2.4.3.ebuild
-2210221810 ./sys-fs/cryptsetup/cryptsetup-2.4.3-r2.ebuild
+2210251440 ./sys-fs/cryptsetup/cryptsetup-2.4.3-r2.ebuild
 2111070309 ./sys-fs/ctmg/ctmg-1.2.ebuild
 2104192239 ./sys-fs/davl/davl-1.2.4-r2.ebuild
 2005032310 ./sys-fs/dd-rescue/dd-rescue-1.99.8-r1.ebuild
@@ -27112,8 +27106,8 @@
 2206020640 ./sys-fs/extundelete/extundelete-0.2.4-r2.ebuild
 2205191140 ./sys-fs/f2fs-tools/f2fs-tools-1.14.0.ebuild
 2207251040 ./sys-fs/f2fs-tools/f2fs-tools-1.15.0.ebuild
-2209010512 ./sys-fs/f2fs-tools/f2fs-tools-1.15.0-r1.ebuild
 2209010512 ./sys-fs/f2fs-tools/f2fs-tools-9999.ebuild
+2210251210 ./sys-fs/f2fs-tools/f2fs-tools-1.15.0-r1.ebuild
 2202012339 ./sys-fs/fatcat/fatcat-1.1.1.ebuild
 2009041109 ./sys-fs/fatresize/fatresize-1.1.0.ebuild
 2204111010 ./sys-fs/fatsort/fatsort-1.6.4.625.ebuild
@@ -27179,6 +27173,7 @@
 2210072210 ./sys-fs/mtd-utils/mtd-utils-2.1.5.ebuild
 2205220940 ./sys-fs/mtools/mtools-4.0.39.ebuild
 2209190540 ./sys-fs/mtools/mtools-4.0.41.ebuild
+2210241540 ./sys-fs/mtools/mtools-4.0.42.ebuild
 2110010139 ./sys-fs/mtpfs/mtpfs-1.1-r6.ebuild
 2205191440 ./sys-fs/multipath-tools/multipath-tools-0.8.9.ebuild
 2207021640 ./sys-fs/multipath-tools/multipath-tools-0.9.0.ebuild
@@ -27229,6 +27224,7 @@
 2208271140 ./sys-fs/xfsdump/xfsdump-3.1.11.ebuild
 2112262240 ./sys-fs/xfsprogs/xfsprogs-5.14.2.ebuild
 2210051510 ./sys-fs/xfsprogs/xfsprogs-5.18.0-r1.ebuild
+2210250910 ./sys-fs/xfsprogs/xfsprogs-5.19.0.ebuild
 2205070810 ./sys-fs/xwmfs/xwmfs-0.91.ebuild
 2210010240 ./sys-fs/yaffs2utils/yaffs2utils-0.2.9.ebuild
 2206081710 ./sys-fs/zerofree/zerofree-1.1.1-r1.ebuild
@@ -27270,12 +27266,16 @@
 2210152340 ./sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.218.ebuild
 2210172240 ./sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.149.ebuild
 2210172240 ./sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.219.ebuild
+2210241640 ./sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.19.17.ebuild
+2210241810 ./sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.0.3.ebuild
 2210152340 ./sys-kernel/gentoo-kernel/gentoo-kernel-5.10.148.ebuild
 2210152340 ./sys-kernel/gentoo-kernel/gentoo-kernel-5.15.74.ebuild
 2210152340 ./sys-kernel/gentoo-kernel/gentoo-kernel-5.19.16.ebuild
 2210152340 ./sys-kernel/gentoo-kernel/gentoo-kernel-5.4.218.ebuild
 2210172240 ./sys-kernel/gentoo-kernel/gentoo-kernel-5.10.149.ebuild
 2210172240 ./sys-kernel/gentoo-kernel/gentoo-kernel-5.4.219.ebuild
+2210241640 ./sys-kernel/gentoo-kernel/gentoo-kernel-5.19.17.ebuild
+2210241810 ./sys-kernel/gentoo-kernel/gentoo-kernel-6.0.3.ebuild
 2209221740 ./sys-kernel/gentoo-sources/gentoo-sources-4.14.286.ebuild
 2209221110 ./sys-kernel/gentoo-sources/gentoo-sources-4.14.294.ebuild
 2209221810 ./sys-kernel/gentoo-sources/gentoo-sources-4.19.250.ebuild
@@ -27286,11 +27286,7 @@
 2209281310 ./sys-kernel/gentoo-sources/gentoo-sources-4.19.260.ebuild
 2209281310 ./sys-kernel/gentoo-sources/gentoo-sources-4.9.330.ebuild
 2210051610 ./sys-kernel/gentoo-sources/gentoo-sources-4.19.261.ebuild
-2210152340 ./sys-kernel/gentoo-sources/gentoo-sources-5.10.148.ebuild
 2210152340 ./sys-kernel/gentoo-sources/gentoo-sources-5.15.74.ebuild
-2210151410 ./sys-kernel/gentoo-sources/gentoo-sources-5.19.16.ebuild
-2210152340 ./sys-kernel/gentoo-sources/gentoo-sources-5.4.218.ebuild
-2210151410 ./sys-kernel/gentoo-sources/gentoo-sources-6.0.2.ebuild
 2210172310 ./sys-kernel/gentoo-sources/gentoo-sources-5.10.149.ebuild
 2210172310 ./sys-kernel/gentoo-sources/gentoo-sources-5.4.219.ebuild
 2210241440 ./sys-kernel/gentoo-sources/gentoo-sources-5.19.17.ebuild
@@ -27362,6 +27358,8 @@
 2210152340 ./sys-kernel/vanilla-kernel/vanilla-kernel-5.4.218.ebuild
 2210172240 ./sys-kernel/vanilla-kernel/vanilla-kernel-5.10.149.ebuild
 2210172240 ./sys-kernel/vanilla-kernel/vanilla-kernel-5.4.219.ebuild
+2210241640 ./sys-kernel/vanilla-kernel/vanilla-kernel-5.19.17.ebuild
+2210241810 ./sys-kernel/vanilla-kernel/vanilla-kernel-6.0.3.ebuild
 2209281310 ./sys-kernel/vanilla-sources/vanilla-sources-4.14.295.ebuild
 2209281310 ./sys-kernel/vanilla-sources/vanilla-sources-4.9.330.ebuild
 2210051510 ./sys-kernel/vanilla-sources/vanilla-sources-4.19.261.ebuild
@@ -27385,19 +27383,19 @@
 2102050539 ./sys-libs/blocksruntime/blocksruntime-0_pre20171027-r1.ebuild
 2209112140 ./sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.1.ebuild
 2209112140 ./sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-14.0.6.ebuild
-2210101140 ./sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-15.0.3.9999.ebuild
 2210111410 ./sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-16.0.0.9999.ebuild
 2210162210 ./sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-16.0.0_pre20221016.ebuild
 2210181810 ./sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-15.0.3.ebuild
 2210231840 ./sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-16.0.0_pre20221023.ebuild
+2210241640 ./sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-15.0.4.9999.ebuild
 2209112140 ./sys-libs/compiler-rt/compiler-rt-13.0.1.ebuild
 2209112140 ./sys-libs/compiler-rt/compiler-rt-14.0.6.ebuild
 2210072010 ./sys-libs/compiler-rt/compiler-rt-16.0.0.9999.ebuild
-2210101140 ./sys-libs/compiler-rt/compiler-rt-15.0.3.9999.ebuild
 2210140740 ./sys-libs/compiler-rt/compiler-rt-14.0.6-r1.ebuild
 2210162210 ./sys-libs/compiler-rt/compiler-rt-16.0.0_pre20221016.ebuild
 2210181810 ./sys-libs/compiler-rt/compiler-rt-15.0.3.ebuild
 2210231840 ./sys-libs/compiler-rt/compiler-rt-16.0.0_pre20221023.ebuild
+2210241640 ./sys-libs/compiler-rt/compiler-rt-15.0.4.9999.ebuild
 2205050610 ./sys-libs/cracklib/cracklib-2.9.7.ebuild
 2209050440 ./sys-libs/cracklib/cracklib-2.9.8.ebuild
 2112131739 ./sys-libs/csu/csu-85-r1.ebuild
@@ -27457,18 +27455,18 @@
 2203301740 ./sys-libs/libchipcard/libchipcard-5.1.5_rc2.ebuild
 2210111910 ./sys-libs/libcxx/libcxx-13.0.1.ebuild
 2210111910 ./sys-libs/libcxx/libcxx-14.0.6.ebuild
-2210162240 ./sys-libs/libcxx/libcxx-15.0.3.9999.ebuild
 2210162240 ./sys-libs/libcxx/libcxx-16.0.0.9999.ebuild
 2210162240 ./sys-libs/libcxx/libcxx-16.0.0_pre20221016.ebuild
-2210181810 ./sys-libs/libcxx/libcxx-15.0.3.ebuild
 2210231840 ./sys-libs/libcxx/libcxx-16.0.0_pre20221023.ebuild
+2210251340 ./sys-libs/libcxx/libcxx-15.0.3.ebuild
+2210241640 ./sys-libs/libcxx/libcxx-15.0.4.9999.ebuild
 2210110023 ./sys-libs/libcxxabi/libcxxabi-13.0.1.ebuild
 2210110023 ./sys-libs/libcxxabi/libcxxabi-14.0.6.ebuild
-2210110023 ./sys-libs/libcxxabi/libcxxabi-15.0.3.9999.ebuild
 2210110023 ./sys-libs/libcxxabi/libcxxabi-16.0.0.9999.ebuild
 2210162210 ./sys-libs/libcxxabi/libcxxabi-16.0.0_pre20221016.ebuild
-2210181810 ./sys-libs/libcxxabi/libcxxabi-15.0.3.ebuild
 2210231840 ./sys-libs/libcxxabi/libcxxabi-16.0.0_pre20221023.ebuild
+2210251340 ./sys-libs/libcxxabi/libcxxabi-15.0.3.ebuild
+2210241640 ./sys-libs/libcxxabi/libcxxabi-15.0.4.9999.ebuild
 2111210639 ./sys-libs/libfaketime/libfaketime-0.9.6-r4.ebuild
 2205191240 ./sys-libs/libfaketime/libfaketime-0.9.9.ebuild
 2208250710 ./sys-libs/libfaketime/libfaketime-0.9.10.ebuild
@@ -27479,11 +27477,11 @@
 2009171909 ./sys-libs/libixp/libixp-0.5_p20110208-r3.ebuild
 2209292310 ./sys-libs/libomp/libomp-13.0.1.ebuild
 2209292310 ./sys-libs/libomp/libomp-14.0.6-r1.ebuild
-2210101140 ./sys-libs/libomp/libomp-15.0.3.9999.ebuild
 2210162240 ./sys-libs/libomp/libomp-16.0.0.9999.ebuild
 2210162240 ./sys-libs/libomp/libomp-16.0.0_pre20221016.ebuild
 2210181810 ./sys-libs/libomp/libomp-15.0.3.ebuild
 2210231840 ./sys-libs/libomp/libomp-16.0.0_pre20221023.ebuild
+2210241640 ./sys-libs/libomp/libomp-15.0.4.9999.ebuild
 2203081540 ./sys-libs/libosinfo/libosinfo-1.10.0.ebuild
 2210100210 ./sys-libs/libosinfo/libosinfo-1.10.0-r1.ebuild
 2205190840 ./sys-libs/libraw1394/libraw1394-2.1.2-r1.ebuild
@@ -27522,11 +27520,11 @@
 2210190640 ./sys-libs/libxcrypt/libxcrypt-4.4.28-r2.ebuild
 2210110023 ./sys-libs/llvm-libunwind/llvm-libunwind-13.0.1-r1.ebuild
 2210110023 ./sys-libs/llvm-libunwind/llvm-libunwind-14.0.6-r1.ebuild
-2210110023 ./sys-libs/llvm-libunwind/llvm-libunwind-15.0.3.9999.ebuild
 2210110023 ./sys-libs/llvm-libunwind/llvm-libunwind-16.0.0.9999.ebuild
 2210162210 ./sys-libs/llvm-libunwind/llvm-libunwind-16.0.0_pre20221016.ebuild
-2210181810 ./sys-libs/llvm-libunwind/llvm-libunwind-15.0.3.ebuild
 2210231840 ./sys-libs/llvm-libunwind/llvm-libunwind-16.0.0_pre20221023.ebuild
+2210251340 ./sys-libs/llvm-libunwind/llvm-libunwind-15.0.3.ebuild
+2210241640 ./sys-libs/llvm-libunwind/llvm-libunwind-15.0.4.9999.ebuild
 2107081310 ./sys-libs/lwp/lwp-2.8.ebuild
 2205081040 ./sys-libs/mtdev/mtdev-1.1.6.ebuild
 2201012339 ./sys-libs/musl-nscd/musl-nscd-1.1.1-r1.ebuild
@@ -27651,8 +27649,8 @@
 2207040310 ./sys-process/criu/criu-3.16.1.ebuild
 2209030340 ./sys-process/criu/criu-3.17-r1.ebuild
 2208280940 ./sys-process/cronbase/cronbase-0.3.7-r8.ebuild
-2209230410 ./sys-process/cronie/cronie-1.6.1-r1.ebuild
-2209250040 ./sys-process/cronie/cronie-1.6.1-r2.ebuild
+2210241910 ./sys-process/cronie/cronie-1.6.1-r1.ebuild
+2210241910 ./sys-process/cronie/cronie-1.6.1-r2.ebuild
 1708311901 ./sys-process/cronutils/cronutils-1.9.ebuild
 2205150610 ./sys-process/ctop/ctop-0.7.7.ebuild
 2208280940 ./sys-process/daemontools-encore/daemontools-encore-1.11.ebuild
@@ -27689,9 +27687,9 @@
 2210010240 ./sys-process/numad/numad-0.5-r3.ebuild
 2210010240 ./sys-process/numad/numad-0.5-r4.ebuild
 2210010240 ./sys-process/numad/numad-9999.ebuild
-2208270240 ./sys-process/parallel/parallel-20220722.ebuild
 2209240640 ./sys-process/parallel/parallel-20220922.ebuild
 2210091210 ./sys-process/parallel/parallel-20220822.ebuild
+2210250910 ./sys-process/parallel/parallel-20221022.ebuild
 2204011010 ./sys-process/pkill-darwin/pkill-darwin-1.0.ebuild
 2003221439 ./sys-process/prll/prll-0.6.4.ebuild
 1908150239 ./sys-process/procenv/procenv-0.51.ebuild
@@ -27736,6 +27734,8 @@
 2210152340 ./virtual/dist-kernel/dist-kernel-5.4.218.ebuild
 2210172240 ./virtual/dist-kernel/dist-kernel-5.10.149.ebuild
 2210172240 ./virtual/dist-kernel/dist-kernel-5.4.219.ebuild
+2210241640 ./virtual/dist-kernel/dist-kernel-5.19.17.ebuild
+2210241810 ./virtual/dist-kernel/dist-kernel-6.0.3.ebuild
 2210070010 ./virtual/dotnet-sdk/dotnet-sdk-3.1-r1.ebuild
 2210070010 ./virtual/dotnet-sdk/dotnet-sdk-5.0-r1.ebuild
 2210070010 ./virtual/dotnet-sdk/dotnet-sdk-6.0-r1.ebuild
@@ -27987,8 +27987,7 @@
 2202191640 ./www-apache/mod_fcgid/mod_fcgid-2.3.9-r2.ebuild
 2208201910 ./www-apache/mod_gnutls/mod_gnutls-0.12.0-r1.ebuild
 2109281739 ./www-apache/mod_h2/mod_h2-9999.ebuild
-2209302010 ./www-apache/mod_h2/mod_h2-2.0.9.ebuild
-2210111710 ./www-apache/mod_h2/mod_h2-2.0.10.ebuild
+2210241810 ./www-apache/mod_h2/mod_h2-2.0.11.ebuild
 2210170640 ./www-apache/mod_jk/mod_jk-1.2.48-r1.ebuild
 2202191640 ./www-apache/mod_limitipconn/mod_limitipconn-0.24-r4.ebuild
 2202191640 ./www-apache/mod_log_rotate/mod_log_rotate-1.02.ebuild
@@ -28000,7 +27999,7 @@
 2107160109 ./www-apache/mod_qos/mod_qos-11.66.ebuild
 2111230109 ./www-apache/mod_qos/mod_qos-11.70.ebuild
 2203141539 ./www-apache/mod_qos/mod_qos-11.71.ebuild
-2205132310 ./www-apache/mod_qos/mod_qos-11.72.ebuild
+2210251410 ./www-apache/mod_qos/mod_qos-11.72.ebuild
 2202191640 ./www-apache/mod_rpaf/mod_rpaf-0.8.4.ebuild
 2112220410 ./www-apache/mod_security/mod_security-2.9.5.ebuild
 2202200340 ./www-apache/mod_security/mod_security-2.9.5-r1.ebuild
@@ -28029,7 +28028,7 @@
 2209141840 ./www-apps/bugzilla/bugzilla-5.0.6-r1.ebuild
 1909230439 ./www-apps/cgisysinfo/cgisysinfo-0.4.1.ebuild
 2105021139 ./www-apps/cgit/cgit-1.2.3-r100.ebuild
-2210201410 ./www-apps/cgit/cgit-1.2.3-r201.ebuild
+2210250210 ./www-apps/cgit/cgit-1.2.3-r201.ebuild
 2202100210 ./www-apps/cgp/cgp-1_p20190510-r2.ebuild
 2209281740 ./www-apps/chromedriver-bin/chromedriver-bin-106.0.5249.61.ebuild
 2201122010 ./www-apps/cvsweb/cvsweb-3.0.6-r2.ebuild
@@ -28171,11 +28170,8 @@
 2209302340 ./www-client/fetch/fetch-1.0-r4.ebuild
 2210191640 ./www-client/firefox-bin/firefox-bin-102.4.0.ebuild
 2210201410 ./www-client/firefox-bin/firefox-bin-106.0.1-r1.ebuild
-2210061440 ./www-client/firefox/firefox-102.3.0.ebuild
-2210052210 ./www-client/firefox/firefox-105.0.2.ebuild
-2210181610 ./www-client/firefox/firefox-106.0.ebuild
-2210191910 ./www-client/firefox/firefox-102.4.0.ebuild
 2210201210 ./www-client/firefox/firefox-106.0.1.ebuild
+2210251440 ./www-client/firefox/firefox-102.4.0.ebuild
 2210071540 ./www-client/google-chrome-beta/google-chrome-beta-107.0.5304.29.ebuild
 2210091510 ./www-client/google-chrome-unstable/google-chrome-unstable-108.0.5343.2.ebuild
 2210121110 ./www-client/google-chrome/google-chrome-106.0.5249.119.ebuild
@@ -28431,15 +28427,16 @@
 2110220439 ./x11-base/xorg-x11/xorg-x11-7.4-r3.ebuild
 2207130310 ./x11-base/xwayland/xwayland-9999.ebuild
 2207211040 ./x11-base/xwayland/xwayland-22.1.3.ebuild
+2210251710 ./x11-base/xwayland/xwayland-22.1.4.ebuild
 2204040610 ./x11-base/xorg-sgml-doctools/xorg-sgml-doctools-1.12.ebuild
 2210190340 ./x11-base/xorg-apps/xorg-apps-1.ebuild
 2210201640 ./x11-base/xorg-fonts/xorg-fonts-2.ebuild
 2210201640 ./x11-drivers/nvidia-drivers/nvidia-drivers-390.154.ebuild
 2210201640 ./x11-drivers/nvidia-drivers/nvidia-drivers-470.141.03.ebuild
 2210201640 ./x11-drivers/nvidia-drivers/nvidia-drivers-510.85.02.ebuild
-2210201640 ./x11-drivers/nvidia-drivers/nvidia-drivers-515.49.19.ebuild
 2210201640 ./x11-drivers/nvidia-drivers/nvidia-drivers-515.65.01.ebuild
 2210201640 ./x11-drivers/nvidia-drivers/nvidia-drivers-520.56.06.ebuild
+2210252310 ./x11-drivers/nvidia-drivers/nvidia-drivers-515.49.24.ebuild
 2205260840 ./x11-drivers/xf86-input-elographics/xf86-input-elographics-1.4.2.ebuild
 2205251910 ./x11-drivers/xf86-input-evdev/xf86-input-evdev-2.10.6.ebuild
 2205251910 ./x11-drivers/xf86-input-joystick/xf86-input-joystick-1.6.3.ebuild
@@ -28491,6 +28488,7 @@
 2205131710 ./x11-libs/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.40.2.ebuild
 2205311240 ./x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.8.ebuild
 2208111940 ./x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.9.ebuild
+2210252340 ./x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.10.ebuild
 2110120139 ./x11-libs/gl2ps/gl2ps-1.4.2.ebuild
 2204101910 ./x11-libs/gnome-pty-helper/gnome-pty-helper-0.40.2-r1.ebuild
 2210082210 ./x11-libs/goffice/goffice-0.10.52-r1.ebuild
@@ -28541,6 +28539,7 @@
 2210180210 ./x11-libs/libXpresent/libXpresent-1.0.1.ebuild
 2205081040 ./x11-libs/libXrandr/libXrandr-1.5.2.ebuild
 2205080640 ./x11-libs/libXrender/libXrender-0.9.10-r2.ebuild
+2210251710 ./x11-libs/libXrender/libXrender-0.9.11.ebuild
 2206280511 ./x11-libs/libXres/libXres-1.2.1.ebuild
 2205080640 ./x11-libs/libXt/libXt-1.2.1.ebuild
 2205100440 ./x11-libs/libXtst/libXtst-1.2.3-r2.ebuild
@@ -28626,6 +28625,7 @@
 2103060139 ./x11-libs/vte/vte-0.28.2-r209.ebuild
 2205311240 ./x11-libs/vte/vte-0.68.0.ebuild
 2209261810 ./x11-libs/vte/vte-0.70.0.ebuild
+2210251840 ./x11-libs/vte/vte-0.70.1.ebuild
 2208231840 ./x11-libs/wxGTK/wxGTK-3.0.4-r3.ebuild
 2210082110 ./x11-libs/wxGTK/wxGTK-3.0.5.1.ebuild
 2012311940 ./x11-libs/xbae/xbae-4.60.4.ebuild
@@ -28821,9 +28821,8 @@
 2207261010 ./x11-misc/qps/qps-2.5.0.ebuild
 2112181839 ./x11-misc/qt5ct/qt5ct-1.5.ebuild
 2203061210 ./x11-misc/qterm/qterm-0.7.3-r1.ebuild
-2006150109 ./x11-misc/qtfm/qtfm-6.2.0.ebuild
-2209262040 ./x11-misc/qtfm/qtfm-6.2.1.ebuild
 2209262040 ./x11-misc/qtfm/qtfm-99999.ebuild
+2210252110 ./x11-misc/qtfm/qtfm-6.2.1.ebuild
 2204241210 ./x11-misc/quitcount/quitcount-3.1.4.ebuild
 2004142339 ./x11-misc/qxkb/qxkb-0.5.1_pre20190821.ebuild
 2110110009 ./x11-misc/read-edid/read-edid-3.0.2-r1.ebuild
@@ -29225,6 +29224,7 @@
 2002101039 ./x11-terms/cool-retro-term/cool-retro-term-1.1.1-r2.ebuild
 2207190310 ./x11-terms/gnome-terminal/gnome-terminal-3.44.1.ebuild
 2210081740 ./x11-terms/gnome-terminal/gnome-terminal-3.46.2.ebuild
+2210251840 ./x11-terms/gnome-terminal/gnome-terminal-3.46.3.ebuild
 2209071115 ./x11-terms/guake/guake-3.8.5-r1.ebuild
 2111031010 ./x11-terms/kitty-terminfo/kitty-terminfo-9999.ebuild
 2210151010 ./x11-terms/kitty-terminfo/kitty-terminfo-0.26.3.ebuild
@@ -29256,8 +29256,7 @@
 2208251610 ./x11-terms/tilda/tilda-1.5.4.ebuild
 2208281010 ./x11-terms/xfce4-terminal/xfce4-terminal-1.0.4.ebuild
 2205100440 ./x11-terms/xterm/xterm-372.ebuild
-2209272110 ./x11-terms/xterm/xterm-373.ebuild
-2210140310 ./x11-terms/xterm/xterm-374.ebuild
+2210241540 ./x11-terms/xterm/xterm-375.ebuild
 2208251610 ./x11-terms/yeahconsole/yeahconsole-0.3.4-r1.ebuild
 2209111110 ./x11-terms/zutty/zutty-0.13.ebuild
 2204120240 ./x11-terms/kitty-shell-integration/kitty-shell-integration-9999.ebuild
@@ -29584,7 +29583,7 @@
 2209200910 ./xfce-extra/xfce4-places-plugin/xfce4-places-plugin-1.8.2.ebuild
 2210091940 ./xfce-extra/xfce4-pulseaudio-plugin/xfce4-pulseaudio-plugin-0.4.5.ebuild
 2208281010 ./xfce-extra/xfce4-screensaver/xfce4-screensaver-4.16.0.ebuild
-2210082240 ./xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.9.11.ebuild
+2210251110 ./xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.9.11.ebuild
 2206191710 ./xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.4.3.ebuild
 2111190939 ./xfce-extra/xfce4-smartbookmark-plugin/xfce4-smartbookmark-plugin-0.5.2.ebuild
 2111190939 ./xfce-extra/xfce4-systemload-plugin/xfce4-systemload-plugin-1.3.1.ebuild
@@ -29663,6 +29662,7 @@
 2205040640 ./app-containers/slirp4netns/slirp4netns-1.2.0.ebuild
 2209111840 ./app-containers/snapd/snapd-2.57.2-r1.ebuild
 2210180540 ./app-containers/snapd/snapd-2.57.4.ebuild
+2210250310 ./app-containers/snapd/snapd-2.57.5.ebuild
 2112201210 ./app-containers/umoci/umoci-0.4.6.ebuild
 2210171740 ./app-containers/cosign/cosign-1.13.0.ebuild
 2210081340 ./app-containers/apptainer/apptainer-1.1.2.ebuild
@@ -29700,6 +29700,7 @@
 2204291439 ./sec-keys/openpgp-keys-oletange/openpgp-keys-oletange-20210423.ebuild
 2204291439 ./sec-keys/openpgp-keys-openzfs/openpgp-keys-openzfs-20210419.ebuild
 2204291439 ./sec-keys/openpgp-keys-python/openpgp-keys-python-20210121.ebuild
+2210251140 ./sec-keys/openpgp-keys-python/openpgp-keys-python-20221025.ebuild
 2207262210 ./sec-keys/openpgp-keys-rust/openpgp-keys-rust-20210504.ebuild
 2204291439 ./sec-keys/openpgp-keys-signify/openpgp-keys-signify-20211219.ebuild
 2204291439 ./sec-keys/openpgp-keys-tcpdump/openpgp-keys-tcpdump-20210416.ebuild
@@ -30831,9 +30832,6 @@
 2210110022 metadata/md5-cache/app-admin/augeas-1.12.0
 2210110022 metadata/md5-cache/app-admin/augeas-1.13.0
 2210110022 metadata/md5-cache/app-admin/authbind-2.1.2
-2210110022 metadata/md5-cache/app-admin/awscli-1.25.81
-2210110022 metadata/md5-cache/app-admin/awscli-1.25.89
-2210110022 metadata/md5-cache/app-admin/awscli-1.25.90
 2210111610 metadata/md5-cache/app-admin/calamares-3.2.60
 2210110022 metadata/md5-cache/app-admin/cdist-6.9.8
 2210110022 metadata/md5-cache/app-admin/cdist-7.0.0
@@ -30943,9 +30941,7 @@
 2210110022 metadata/md5-cache/app-admin/xstow-1.0.2-r1
 2210110022 metadata/md5-cache/app-admin/xstow-1.1.0
 2210110022 metadata/md5-cache/app-admin/xtail-2.1-r1
-2210110022 metadata/md5-cache/app-admin/xtail-2.1_p8
 2210110022 metadata/md5-cache/app-admin/yadm-3.2.1
-2210140840 metadata/md5-cache/app-admin/awscli-1.25.91
 2210132310 metadata/md5-cache/app-admin/conky-1.12.2
 2210132310 metadata/md5-cache/app-admin/conky-1.13.1
 2210132310 metadata/md5-cache/app-admin/lsyncd-2.2.3
@@ -30955,7 +30951,6 @@
 2210150240 metadata/md5-cache/app-admin/ansible-core-2.12.9
 2210150240 metadata/md5-cache/app-admin/ansible-core-2.13.4
 2210150240 metadata/md5-cache/app-admin/ansible-core-2.13.5
-2210151110 metadata/md5-cache/app-admin/awscli-1.25.92
 2210152041 metadata/md5-cache/app-admin/clsync-0.4.5
 2210152041 metadata/md5-cache/app-admin/clsync-9999
 2210152041 metadata/md5-cache/app-admin/hddtemp-0.3_beta15-r29
@@ -31007,18 +31002,13 @@
 2210152041 metadata/md5-cache/app-admin/sysrqd-17-r2
 2210152041 metadata/md5-cache/app-admin/sysstat-12.6.0
 2210152041 metadata/md5-cache/app-admin/system-config-printer-1.5.16-r1
-2210152041 metadata/md5-cache/app-admin/system-config-printer-1.5.18
 2210152041 metadata/md5-cache/app-admin/ulogd-2.0.7-r3
 2210152041 metadata/md5-cache/app-admin/verynice-1.1-r3
-2210181010 metadata/md5-cache/app-admin/awscli-1.25.93
 2210180140 metadata/md5-cache/app-admin/ryzen_smu-0.1.2
 2210180140 metadata/md5-cache/app-admin/ryzen_smu-0.1.2_p20210627
 2210180140 metadata/md5-cache/app-admin/ryzen_smu-0.1.2_p20211205
-2210190710 metadata/md5-cache/app-admin/awscli-1.25.94
 2210191210 metadata/md5-cache/app-admin/exo-1.59.3
-2210220940 metadata/md5-cache/app-admin/Manifest.gz
 2210200110 metadata/md5-cache/app-admin/ansible-lint-6.8.2
-2210210840 metadata/md5-cache/app-admin/awscli-1.25.96
 2210220940 metadata/md5-cache/app-admin/awscli-1.25.97
 2210200941 metadata/md5-cache/app-admin/bitwarden-desktop-bin-2022.6.0-r1
 2210200941 metadata/md5-cache/app-admin/bitwarden-desktop-bin-2022.9.1-r1
@@ -31062,7 +31052,6 @@
 2210200941 metadata/md5-cache/app-admin/passwordsafe-1.14.0-r1
 2210200941 metadata/md5-cache/app-admin/passwordsafe-1.15.0
 2210200941 metadata/md5-cache/app-admin/qtpass-1.3.2-r2
-2210192340 metadata/md5-cache/app-admin/rsyslog-8.2210.0
 2210220210 metadata/md5-cache/app-admin/serf-0.10.0
 2210220210 metadata/md5-cache/app-admin/serf-0.10.1
 2210220210 metadata/md5-cache/app-admin/serf-0.9.8
@@ -31075,6 +31064,14 @@
 2210220210 metadata/md5-cache/app-admin/vault-1.10.7
 2210220210 metadata/md5-cache/app-admin/vault-1.11.4
 2210220210 metadata/md5-cache/app-admin/vault-1.12.0
+2210252340 metadata/md5-cache/app-admin/Manifest.gz
+2210251240 metadata/md5-cache/app-admin/awscli-1.25.89
+2210251140 metadata/md5-cache/app-admin/awscli-1.26.0
+2210252340 metadata/md5-cache/app-admin/awscli-1.26.1
+2210241840 metadata/md5-cache/app-admin/rsyslog-8.2210.0-r1
+2210241510 metadata/md5-cache/app-admin/sudo-1.9.12
+2210252210 metadata/md5-cache/app-admin/system-config-printer-1.5.18
+2210252110 metadata/md5-cache/app-admin/xtail-2.1_p8
 2210110022 metadata/md5-cache/app-antivirus/fangfrisch-1.5.0
 2210152041 metadata/md5-cache/app-antivirus/clamav-0.103.6
 2210152041 metadata/md5-cache/app-antivirus/clamav-0.103.7
@@ -31108,13 +31105,10 @@
 2210110022 metadata/md5-cache/app-arch/atool-0.39.0-r1
 2210110022 metadata/md5-cache/app-arch/bloscpack-0.16.0
 2210110022 metadata/md5-cache/app-arch/brotli-1.0.9-r3
-2210110022 metadata/md5-cache/app-arch/brotli-1.0.9-r5
 2210110022 metadata/md5-cache/app-arch/brotli-9999
 2210110022 metadata/md5-cache/app-arch/bsdsfv-1.18-r3
 2210110022 metadata/md5-cache/app-arch/bzip2-1.0.8-r3
 2210110022 metadata/md5-cache/app-arch/bzip2-9999
-2210110022 metadata/md5-cache/app-arch/bzip3-1.1.4
-2210110022 metadata/md5-cache/app-arch/bzip3-1.1.5
 2210110022 metadata/md5-cache/app-arch/bzip3-1.1.6
 2210110022 metadata/md5-cache/app-arch/cabextract-1.9.1
 2210110022 metadata/md5-cache/app-arch/cabextract-9999
@@ -31216,14 +31210,17 @@
 2210110022 metadata/md5-cache/app-arch/zstd-1.5.2
 2210110022 metadata/md5-cache/app-arch/zstd-1.5.2-r2
 2210110022 metadata/md5-cache/app-arch/zstd-1.5.2-r3
-2210141010 metadata/md5-cache/app-arch/rpm-4.17.1
 2210182240 metadata/md5-cache/app-arch/cpio-2.13-r2
 2210190540 metadata/md5-cache/app-arch/createrepo_c-0.20.1
 2210191340 metadata/md5-cache/app-arch/snappy-1.1.9-r1
-2210221040 metadata/md5-cache/app-arch/Manifest.gz
 2210200710 metadata/md5-cache/app-arch/pixz-1.0.7-r1
 2210200710 metadata/md5-cache/app-arch/pixz-9999
-2210221040 metadata/md5-cache/app-arch/rpm-4.18.0
+2210260210 metadata/md5-cache/app-arch/Manifest.gz
+2210251410 metadata/md5-cache/app-arch/brotli-1.0.9-r5
+2210251410 metadata/md5-cache/app-arch/bzip3-1.1.5
+2210260210 metadata/md5-cache/app-arch/bzip3-1.1.8
+2210241710 metadata/md5-cache/app-arch/engrampa-1.26.0
+2210251610 metadata/md5-cache/app-arch/rpm-4.18.0
 2012311940 metadata/md5-cache/app-backup/ccollect-0.8
 2106300039 metadata/md5-cache/app-backup/cdbkup-1.0-r4
 1712281839 metadata/md5-cache/app-backup/hdup-2.0.14
@@ -31250,7 +31247,6 @@
 2210110022 metadata/md5-cache/app-backup/backintime-9999
 2210110022 metadata/md5-cache/app-backup/borgbackup-1.1.17-r1
 2210110022 metadata/md5-cache/app-backup/borgbackup-1.2.1-r2
-2210110022 metadata/md5-cache/app-backup/borgbackup-1.2.2
 2210110022 metadata/md5-cache/app-backup/borgbackup-9999
 2210110022 metadata/md5-cache/app-backup/borgweb-0.2.0-r2
 2210110022 metadata/md5-cache/app-backup/borgweb-0.3.0
@@ -31280,14 +31276,7 @@
 2210152041 metadata/md5-cache/app-backup/bareos-20.0.6
 2210152041 metadata/md5-cache/app-backup/bareos-21.1.2
 2210152041 metadata/md5-cache/app-backup/borgmatic-1.6.6
-2210152041 metadata/md5-cache/app-backup/borgmatic-1.7.2
 2210152041 metadata/md5-cache/app-backup/btrbk-0.31.2
-2210152041 metadata/md5-cache/app-backup/btrbk-0.31.3
-2210152041 metadata/md5-cache/app-backup/btrbk-0.32.0
-2210152041 metadata/md5-cache/app-backup/btrbk-0.32.1
-2210152041 metadata/md5-cache/app-backup/btrbk-0.32.2
-2210152041 metadata/md5-cache/app-backup/btrbk-0.32.3
-2210152041 metadata/md5-cache/app-backup/btrbk-0.32.4
 2210152041 metadata/md5-cache/app-backup/btrbk-9999
 2210152041 metadata/md5-cache/app-backup/burp-2.4.0
 2210152041 metadata/md5-cache/app-backup/burp-2.5.4
@@ -31295,7 +31284,6 @@
 2210152041 metadata/md5-cache/app-backup/snapper-0.10.2
 2210152041 metadata/md5-cache/app-backup/snapper-0.10.3
 2210152041 metadata/md5-cache/app-backup/tsm-8.1.13.3
-2210241040 metadata/md5-cache/app-backup/Manifest.gz
 2210200941 metadata/md5-cache/app-backup/bacula-11.0.5
 2210200941 metadata/md5-cache/app-backup/bacula-11.0.6-r1
 2210200941 metadata/md5-cache/app-backup/bacula-11.0.6-r2
@@ -31310,6 +31298,10 @@
 2210220210 metadata/md5-cache/app-backup/restic-0.13.1
 2210220210 metadata/md5-cache/app-backup/restic-0.14.0
 2210200941 metadata/md5-cache/app-backup/spideroak-bin-7.5.0-r2
+2210251440 metadata/md5-cache/app-backup/Manifest.gz
+2210250010 metadata/md5-cache/app-backup/borgbackup-1.2.2-r1
+2210251440 metadata/md5-cache/app-backup/borgmatic-1.7.2
+2210241810 metadata/md5-cache/app-backup/btrbk-0.32.5
 2109012139 metadata/md5-cache/app-benchmarks/bonnie++-2.00a
 1907151840 metadata/md5-cache/app-benchmarks/forkbomb-1.4-r1
 2110300109 metadata/md5-cache/app-benchmarks/geekbench-2.4.2-r1
@@ -31567,7 +31559,6 @@
 2210110022 metadata/md5-cache/app-crypt/ssdeep-2.14.1-r1
 2210110022 metadata/md5-cache/app-crypt/ssss-0.5.7-r1
 2210110022 metadata/md5-cache/app-crypt/stan-0.4.1-r1
-2210110022 metadata/md5-cache/app-crypt/swtpm-0.7.3
 2210110022 metadata/md5-cache/app-crypt/tc-play-2.0-r2
 2210110022 metadata/md5-cache/app-crypt/tc-play-3.3
 2210110022 metadata/md5-cache/app-crypt/tpm-tools-1.3.9.1-r1
@@ -31601,7 +31592,6 @@
 2210172240 metadata/md5-cache/app-crypt/easy-rsa-3.0.8
 2210180140 metadata/md5-cache/app-crypt/tpm-emulator-0.7.5-r3
 2210190610 metadata/md5-cache/app-crypt/fcrackzip-1.0
-2210220210 metadata/md5-cache/app-crypt/Manifest.gz
 2210200941 metadata/md5-cache/app-crypt/aescrypt-3.14
 2210220210 metadata/md5-cache/app-crypt/age-1.0.0
 2210220210 metadata/md5-cache/app-crypt/cfssl-1.4.1
@@ -31621,6 +31611,9 @@
 2210200941 metadata/md5-cache/app-crypt/yubikey-manager-qt-1.2.2
 2210200941 metadata/md5-cache/app-crypt/yubikey-manager-qt-1.2.4
 2210200941 metadata/md5-cache/app-crypt/yubioath-desktop-5.1.0-r2
+2210260710 metadata/md5-cache/app-crypt/Manifest.gz
+2210250010 metadata/md5-cache/app-crypt/efitools-1.9.2-r1
+2210260710 metadata/md5-cache/app-crypt/swtpm-0.7.3
 2109291739 metadata/md5-cache/app-dicts/bookview-3.2.1
 2109291739 metadata/md5-cache/app-dicts/dictd-vera-1.24-r1
 2109291739 metadata/md5-cache/app-dicts/eblook-1.6.1
@@ -32443,9 +32436,6 @@
 2210110022 metadata/md5-cache/app-editors/pyvim-3.0.2
 2210110022 metadata/md5-cache/app-editors/pyvim-3.0.3
 2210110022 metadata/md5-cache/app-editors/qemacs-0.4.1_pre20170225
-2210110022 metadata/md5-cache/app-editors/qhexedit2-0.8.6_p20190316
-2210110022 metadata/md5-cache/app-editors/qhexedit2-0.8.6_p20190316-r2
-2210110022 metadata/md5-cache/app-editors/qhexedit2-0.8.9_p20210525
 2210110022 metadata/md5-cache/app-editors/qhexedit2-0.8.9_p20210525-r2
 2210110022 metadata/md5-cache/app-editors/retext-7.2.2
 2210110022 metadata/md5-cache/app-editors/retext-7.2.3
@@ -32479,7 +32469,6 @@
 2210132310 metadata/md5-cache/app-editors/vis-9999
 2210171910 metadata/md5-cache/app-editors/gnome-text-editor-43.1
 2210180010 metadata/md5-cache/app-editors/kile-2.9.93-r1
-2210220210 metadata/md5-cache/app-editors/Manifest.gz
 2210200941 metadata/md5-cache/app-editors/jasspa-microemacs-20091011-r4
 2210200941 metadata/md5-cache/app-editors/jedit-5.4.0-r2
 2210220210 metadata/md5-cache/app-editors/micro-2.0.10
@@ -32511,6 +32500,7 @@
 2210200941 metadata/md5-cache/app-editors/xemacs-21.4.24-r7
 2210200941 metadata/md5-cache/app-editors/xemacs-21.5.34-r10
 2210200941 metadata/md5-cache/app-editors/xemacs-21.5.9999
+2210251910 metadata/md5-cache/app-editors/Manifest.gz
 2208190140 metadata/md5-cache/app-emacs/ace-window-0.10.0
 2208190140 metadata/md5-cache/app-emacs/actionscript-mode-7.2.2_p20180527
 2208190140 metadata/md5-cache/app-emacs/adaptive-wrap-0.7
@@ -33046,7 +33036,6 @@
 2210172310 metadata/md5-cache/app-emacs/transient-0.3.7_p20220918-r1
 2210190640 metadata/md5-cache/app-emacs/all-the-icons-5.0.0-r1
 2210190640 metadata/md5-cache/app-emacs/all-the-icons-5.0.0_p20220325-r1
-2210240610 metadata/md5-cache/app-emacs/Manifest.gz
 2210192340 metadata/md5-cache/app-emacs/buttercup-1.27
 2210240610 metadata/md5-cache/app-emacs/cfrs-1.6.0-r1
 2210192340 metadata/md5-cache/app-emacs/consult-0.20
@@ -33058,6 +33047,9 @@
 2210200640 metadata/md5-cache/app-emacs/treemacs-2.9.5-r2
 2210200640 metadata/md5-cache/app-emacs/treemacs-3.0-r1
 2210192340 metadata/md5-cache/app-emacs/vertico-0.28
+2210250440 metadata/md5-cache/app-emacs/Manifest.gz
+2210241540 metadata/md5-cache/app-emacs/editorconfig-emacs-0.9.0
+2210250440 metadata/md5-cache/app-emacs/systemd-mode-1.6
 1912171039 metadata/md5-cache/app-emulation/bochs-2.6.10
 2110200512 metadata/md5-cache/app-emulation/bochs-2.7
 2110231809 metadata/md5-cache/app-emulation/ganeti-os-noop-0.2
@@ -33181,7 +33173,6 @@
 2210170640 metadata/md5-cache/app-emulation/libvirt-8.8.0
 2210170640 metadata/md5-cache/app-emulation/libvirt-9999
 2210152041 metadata/md5-cache/app-emulation/open-vm-tools-12.1.0
-2210152041 metadata/md5-cache/app-emulation/qemu-guest-agent-6.0.0
 2210180240 metadata/md5-cache/app-emulation/spice-protocol-0.14.4
 2210180240 metadata/md5-cache/app-emulation/spice-protocol-9999
 2210180140 metadata/md5-cache/app-emulation/vendor-reset-0.1.0
@@ -33195,11 +33186,8 @@
 2210180140 metadata/md5-cache/app-emulation/virtualbox-modules-6.1.36
 2210180140 metadata/md5-cache/app-emulation/virtualbox-modules-6.1.38
 2210180140 metadata/md5-cache/app-emulation/virtualbox-modules-6.1.40
-2210191210 metadata/md5-cache/app-emulation/xen-4.15.4_pre1
 2210191240 metadata/md5-cache/app-emulation/xen-4.16.3_pre
-2210191210 metadata/md5-cache/app-emulation/xen-tools-4.15.4_pre1
 2210191240 metadata/md5-cache/app-emulation/xen-tools-4.16.3_pre
-2210231040 metadata/md5-cache/app-emulation/Manifest.gz
 2210230710 metadata/md5-cache/app-emulation/diskimage-builder-3.25.0
 2210231040 metadata/md5-cache/app-emulation/dxvk-1.10.3
 2210231040 metadata/md5-cache/app-emulation/dxvk-9999
@@ -33207,7 +33195,6 @@
 2210200941 metadata/md5-cache/app-emulation/hyperd-0.7.0-r1
 2210200941 metadata/md5-cache/app-emulation/pcem-17-r1
 2210191810 metadata/md5-cache/app-emulation/qemu-9999
-2210191810 metadata/md5-cache/app-emulation/qemu-guest-agent-7.1.0
 2210200941 metadata/md5-cache/app-emulation/ruffle-0_p20221015
 2210200941 metadata/md5-cache/app-emulation/ruffle-9999
 2210200941 metadata/md5-cache/app-emulation/runv-0.7.0
@@ -33229,6 +33216,11 @@
 2210231040 metadata/md5-cache/app-emulation/wine-vanilla-7.19
 2210231040 metadata/md5-cache/app-emulation/wine-vanilla-9999
 2210200941 metadata/md5-cache/app-emulation/xtrs-4.9d-r5
+2210260640 metadata/md5-cache/app-emulation/Manifest.gz
+2210260640 metadata/md5-cache/app-emulation/qemu-guest-agent-6.0.0
+2210260640 metadata/md5-cache/app-emulation/qemu-guest-agent-7.1.0
+2210252110 metadata/md5-cache/app-emulation/xen-4.15.4_pre1
+2210252110 metadata/md5-cache/app-emulation/xen-tools-4.15.4_pre1
 2104060140 metadata/md5-cache/app-eselect/eselect-awk-0.3
 2107211409 metadata/md5-cache/app-eselect/eselect-blas-0.1
 2104060140 metadata/md5-cache/app-eselect/eselect-cblas-0.1
@@ -33682,7 +33674,6 @@
 2210110022 metadata/md5-cache/app-misc/cpipe-3.0.3-r1
 2210110022 metadata/md5-cache/app-misc/crunch-3.6
 2210110022 metadata/md5-cache/app-misc/cstream-3.1.1-r1
-2210110022 metadata/md5-cache/app-misc/cstream-3.2.1
 2210110022 metadata/md5-cache/app-misc/cw-1.0.16-r3
 2210110022 metadata/md5-cache/app-misc/datefudge-1.24
 2210110022 metadata/md5-cache/app-misc/dateutils-9999
@@ -33802,7 +33793,6 @@
 2210110022 metadata/md5-cache/app-misc/media-player-info-24
 2210110022 metadata/md5-cache/app-misc/mepl-0.45-r2
 2210110022 metadata/md5-cache/app-misc/mmv-1.01b_p19
-2210110022 metadata/md5-cache/app-misc/mouseremote-0.90-r3
 2210110022 metadata/md5-cache/app-misc/muttprint-0.73-r5
 2210110022 metadata/md5-cache/app-misc/mvcase-0.1-r3
 2210110022 metadata/md5-cache/app-misc/mx5000tools-0.1.2-r2
@@ -33969,7 +33959,6 @@
 2210190640 metadata/md5-cache/app-misc/cmatrix-2.0-r4
 2210200941 metadata/md5-cache/app-misc/FreeSSM-1.2.5_p20210702
 2210200941 metadata/md5-cache/app-misc/FreeSSM-9999
-2210220210 metadata/md5-cache/app-misc/Manifest.gz
 2210200941 metadata/md5-cache/app-misc/anki-2.1.15-r1
 2210200941 metadata/md5-cache/app-misc/boxes-1.1.2-r3
 2210201410 metadata/md5-cache/app-misc/cw-1.0.16-r5
@@ -34004,6 +33993,10 @@
 2210200941 metadata/md5-cache/app-misc/tdl-1.5.2-r3
 2210220210 metadata/md5-cache/app-misc/wally-cli-2.0.1
 2210200941 metadata/md5-cache/app-misc/xmind-3.7.6_p201801311814
+2210251610 metadata/md5-cache/app-misc/Manifest.gz
+2210251610 metadata/md5-cache/app-misc/cstream-3.2.1-r1
+2210251440 metadata/md5-cache/app-misc/mouseremote-0.90-r4
+2210250910 metadata/md5-cache/app-misc/rlwrap-0.46
 2110242009 metadata/md5-cache/app-mobilephone/anyremote-6.5
 1805222109 metadata/md5-cache/app-mobilephone/scmxx-0.9.0
 2203031839 metadata/md5-cache/app-mobilephone/dfu-util-0.11
@@ -34123,12 +34116,8 @@
 2208101740 metadata/md5-cache/app-portage/cpuid2cpuflags-12
 2208291040 metadata/md5-cache/app-portage/portage-utils-0.94.1
 2208310310 metadata/md5-cache/app-portage/elt-patches-20220831
-2209042110 metadata/md5-cache/app-portage/mgorny-dev-scripts-25
 2209170112 metadata/md5-cache/app-portage/golop-0.2.1
 2209170112 metadata/md5-cache/app-portage/no-distcc-env-9999
-2209201440 metadata/md5-cache/app-portage/mgorny-dev-scripts-26
-2209211140 metadata/md5-cache/app-portage/mgorny-dev-scripts-27
-2209211810 metadata/md5-cache/app-portage/mgorny-dev-scripts-28
 2210010840 metadata/md5-cache/app-portage/g-cpan-0.16.9-r1
 2210010840 metadata/md5-cache/app-portage/g-cpan-0.17.0
 2210010840 metadata/md5-cache/app-portage/g-cpan-0.18.0-r1
@@ -34189,7 +34178,6 @@
 2210110022 metadata/md5-cache/app-portage/overlint-0.5.3-r2
 2210110022 metadata/md5-cache/app-portage/overlint-0.5.3-r3
 2210110022 metadata/md5-cache/app-portage/pkg-testing-tools-0.1.0
-2210110022 metadata/md5-cache/app-portage/portage-utils-0.94.3
 2210110022 metadata/md5-cache/app-portage/portage-utils-9999
 2210110022 metadata/md5-cache/app-portage/portpeek-3.2.2
 2210110022 metadata/md5-cache/app-portage/portpeek-3.2.2-r1
@@ -34209,13 +34197,17 @@
 2210152041 metadata/md5-cache/app-portage/pfl-3.2-r2
 2210180640 metadata/md5-cache/app-portage/layman-2.4.3
 2210180640 metadata/md5-cache/app-portage/layman-9999
-2210222010 metadata/md5-cache/app-portage/Manifest.gz
 2210200941 metadata/md5-cache/app-portage/elogviewer-3.2
 2210200941 metadata/md5-cache/app-portage/golop-9999
 2210222010 metadata/md5-cache/app-portage/nattka-0.4
 2210220210 metadata/md5-cache/app-portage/pgo-0.0.2
 2210220210 metadata/md5-cache/app-portage/pgo-0.0.3
 2210220210 metadata/md5-cache/app-portage/pgo-9999
+2210251610 metadata/md5-cache/app-portage/Manifest.gz
+2210242340 metadata/md5-cache/app-portage/iwdevtools-0.12.0
+2210251010 metadata/md5-cache/app-portage/mgorny-dev-scripts-28
+2210251140 metadata/md5-cache/app-portage/mgorny-dev-scripts-29
+2210251610 metadata/md5-cache/app-portage/portage-utils-0.94.3
 2005131639 metadata/md5-cache/app-shells/bashdb-5.0.1.1.2
 2104212309 metadata/md5-cache/app-shells/bashish-2.2.4
 2012271709 metadata/md5-cache/app-shells/dsh-0.25.10-r1
@@ -34578,7 +34570,6 @@
 2210110022 metadata/md5-cache/app-text/pdfminer-20220506
 2210110022 metadata/md5-cache/app-text/pdfsandwich-0.1.7
 2210111640 metadata/md5-cache/app-text/pdftk-3.3.2-r1
-2210111640 metadata/md5-cache/app-text/pdftk-3.3.3
 2210110022 metadata/md5-cache/app-text/pdftk-9999
 2210110022 metadata/md5-cache/app-text/pelican-4.7.2-r1
 2210110022 metadata/md5-cache/app-text/pelican-4.8.0
@@ -34596,8 +34587,6 @@
 2210110022 metadata/md5-cache/app-text/pytextile-4.0.1
 2210110022 metadata/md5-cache/app-text/q-text-as-data-2.0.10
 2210110022 metadata/md5-cache/app-text/qpdf-10.6.3
-2210110022 metadata/md5-cache/app-text/qpdf-11.0.0
-2210110022 metadata/md5-cache/app-text/qpdf-11.1.0-r2
 2210110022 metadata/md5-cache/app-text/qpdf-11.1.1
 2210110022 metadata/md5-cache/app-text/qpdfview-0.4.18_p1
 2210110022 metadata/md5-cache/app-text/qpdfview-0.4.18_p20211227
@@ -34692,7 +34681,6 @@
 2210180310 metadata/md5-cache/app-text/zathura-pdf-poppler-9999
 2210180310 metadata/md5-cache/app-text/zathura-ps-9999
 2210191340 metadata/md5-cache/app-text/rman-3.2-r1
-2210221810 metadata/md5-cache/app-text/Manifest.gz
 2210201810 metadata/md5-cache/app-text/a2ps-4.14-r7
 2210201810 metadata/md5-cache/app-text/a2ps-4.14-r8
 2210200941 metadata/md5-cache/app-text/ansifilter-2.18
@@ -34748,6 +34736,8 @@
 2210200941 metadata/md5-cache/app-text/xpdf-4.04-r1
 2210200941 metadata/md5-cache/app-text/zotero-bin-6.0.14
 2210200941 metadata/md5-cache/app-text/zotero-bin-6.0.15
+2210251440 metadata/md5-cache/app-text/Manifest.gz
+2210251440 metadata/md5-cache/app-text/pdftk-3.3.3
 2205301610 metadata/md5-cache/app-vim/Vim-Jinja2-Syntax-0.0_pre20210604
 2205301610 metadata/md5-cache/app-vim/ackvim-1.0.9-r1
 2205301610 metadata/md5-cache/app-vim/airline-0.11
@@ -35143,11 +35133,7 @@
 2210110022 metadata/md5-cache/dev-cpp/abseil-cpp-20211102.0-r2
 2210110022 metadata/md5-cache/dev-cpp/aixlog-1.5.0
 2210110022 metadata/md5-cache/dev-cpp/aixlog-9999
-2210110022 metadata/md5-cache/dev-cpp/amqp-cpp-4.3.16
-2210110022 metadata/md5-cache/dev-cpp/amqp-cpp-4.3.17
 2210110022 metadata/md5-cache/dev-cpp/antlr-cpp-4.7.2
-2210110022 metadata/md5-cache/dev-cpp/argparse-2.1-r1
-2210110022 metadata/md5-cache/dev-cpp/argparse-2.6
 2210110022 metadata/md5-cache/dev-cpp/asio-1.22.2
 2210110022 metadata/md5-cache/dev-cpp/atkmm-2.28.2-r1
 2210110022 metadata/md5-cache/dev-cpp/atkmm-2.28.3
@@ -35267,16 +35253,19 @@
 2210110022 metadata/md5-cache/dev-cpp/websocketpp-0.8.2
 2210110022 metadata/md5-cache/dev-cpp/yaml-cpp-0.7.0-r1
 2210110022 metadata/md5-cache/dev-cpp/yaml-cpp-0.7.0-r2
-2210171010 metadata/md5-cache/dev-cpp/highway-1.0.1-r1
 2210172310 metadata/md5-cache/dev-cpp/kokkos-3.7.0
 2210180110 metadata/md5-cache/dev-cpp/notcurses-3.0.8
-2210201540 metadata/md5-cache/dev-cpp/Manifest.gz
 2210200941 metadata/md5-cache/dev-cpp/antlr-cpp-2.7.7-r1
 2210200941 metadata/md5-cache/dev-cpp/gstreamermm-1.10.0-r1
 2210200941 metadata/md5-cache/dev-cpp/gtkmm-2.24.5-r1
 2210201540 metadata/md5-cache/dev-cpp/gulrak-filesystem-1.5.12
 2210200941 metadata/md5-cache/dev-cpp/libxmlpp-3.0.1-r1
 2210200941 metadata/md5-cache/dev-cpp/sourcetrail-2019.3.46-r2
+2210260140 metadata/md5-cache/dev-cpp/Manifest.gz
+2210260140 metadata/md5-cache/dev-cpp/amqp-cpp-4.3.18
+2210260140 metadata/md5-cache/dev-cpp/argparse-2.9
+2210252140 metadata/md5-cache/dev-cpp/highway-1.0.1-r1
+2210251140 metadata/md5-cache/dev-cpp/rapidfuzz-cpp-1.9.0
 2107250309 metadata/md5-cache/dev-db/freetds-1.2.18
 2102252239 metadata/md5-cache/dev-db/lmdb++-0.9.14.0
 2102261639 metadata/md5-cache/dev-db/lmdb++-1.0.0
@@ -35322,7 +35311,6 @@
 2210110022 metadata/md5-cache/dev-db/firebird-3.0.4.33054.0-r2
 2210110022 metadata/md5-cache/dev-db/firebird-3.0.4.33054.0-r3
 2210110022 metadata/md5-cache/dev-db/hsqldb-1.8.1.3-r3
-2210111610 metadata/md5-cache/dev-db/kdb-3.2.0-r2
 2210110022 metadata/md5-cache/dev-db/kyotocabinet-1.2.77
 2210110022 metadata/md5-cache/dev-db/libdbi-0.9.0
 2210110022 metadata/md5-cache/dev-db/libdbi-drivers-0.9.0-r1
@@ -35340,7 +35328,6 @@
 2210110022 metadata/md5-cache/dev-db/mycli-9999
 2210110022 metadata/md5-cache/dev-db/mydumper-0.11.5.2
 2210110022 metadata/md5-cache/dev-db/mydumper-0.12.1
-2210110022 metadata/md5-cache/dev-db/mydumper-0.12.5.3
 2210110022 metadata/md5-cache/dev-db/myodbc-8.0.27-r1
 2210110022 metadata/md5-cache/dev-db/mysql++-3.3.0
 2210110022 metadata/md5-cache/dev-db/mysql-5.7.36-r1
@@ -35367,11 +35354,6 @@
 2210110022 metadata/md5-cache/dev-db/pg_top-4.0.0-r3
 2210110022 metadata/md5-cache/dev-db/pgagent-4.2.1
 2210110022 metadata/md5-cache/dev-db/pgcli-3.3.1-r1
-2210110022 metadata/md5-cache/dev-db/pgpool2-4.2.1-r2
-2210110022 metadata/md5-cache/dev-db/pgpool2-4.2.2-r2
-2210110022 metadata/md5-cache/dev-db/pgpool2-4.2.9
-2210110022 metadata/md5-cache/dev-db/pgpool2-4.3.1
-2210110022 metadata/md5-cache/dev-db/pgpool2-9999
 2210110022 metadata/md5-cache/dev-db/pgrouting-3.1.1
 2210110022 metadata/md5-cache/dev-db/pgrouting-3.1.2
 2210110022 metadata/md5-cache/dev-db/pgrouting-3.1.3
@@ -35433,7 +35415,6 @@
 2210152041 metadata/md5-cache/dev-db/postgresql-9999
 2210152041 metadata/md5-cache/dev-db/redis-6.2.7-r1
 2210152041 metadata/md5-cache/dev-db/redis-7.0.5
-2210230140 metadata/md5-cache/dev-db/Manifest.gz
 2210220210 metadata/md5-cache/dev-db/etcd-3.3.24
 2210220210 metadata/md5-cache/dev-db/etcd-3.4.16
 2210200740 metadata/md5-cache/dev-db/gqlplus-1.16-r2
@@ -35463,6 +35444,11 @@
 2210200941 metadata/md5-cache/dev-db/sqlitestudio-3.2.1-r1
 2210200941 metadata/md5-cache/dev-db/sqlitestudio-3.3.3
 2210200941 metadata/md5-cache/dev-db/tora-3.2-r2
+2210252310 metadata/md5-cache/dev-db/Manifest.gz
+2210252310 metadata/md5-cache/dev-db/kdb-3.2.0-r2
+2210252110 metadata/md5-cache/dev-db/mydumper-0.12.5.3
+2210241610 metadata/md5-cache/dev-db/pgpool2-9999
+2210250310 metadata/md5-cache/dev-db/rqlite-7.9.2
 2209170112 metadata/md5-cache/dev-dotnet/ndesk-dbus-0.6.1a
 2209170112 metadata/md5-cache/dev-dotnet/ndesk-dbus-glib-0.4.1
 2210080210 metadata/md5-cache/dev-dotnet/dotnet-sdk-bin-3.1.422-r1
@@ -35602,8 +35588,6 @@
 2209170112 metadata/md5-cache/dev-games/irrlicht-headers-1.8.4
 2209170112 metadata/md5-cache/dev-games/ps2-packer-0.4.4-r1
 2209212140 metadata/md5-cache/dev-games/irrlicht-mt-headers-1.9.0.8
-2210110022 metadata/md5-cache/dev-games/KXL-1.1.7-r3
-2210110022 metadata/md5-cache/dev-games/KXL-1.1.7_p17
 2210110022 metadata/md5-cache/dev-games/clanlib-2.3.7-r2
 2210110022 metadata/md5-cache/dev-games/clanlib-4.1.0
 2210110022 metadata/md5-cache/dev-games/freecell-solver-6.6.0
@@ -35638,12 +35622,13 @@
 2210132310 metadata/md5-cache/dev-games/cegui-0.8.7-r100
 2210132310 metadata/md5-cache/dev-games/openscenegraph-3.6.5-r112
 2210132310 metadata/md5-cache/dev-games/openscenegraph-openmw-3.6_p20211017-r1
-2210200941 metadata/md5-cache/dev-games/Manifest.gz
 2210200941 metadata/md5-cache/dev-games/aseprite-1.1.9
 2210200941 metadata/md5-cache/dev-games/aseprite-1.2.37
 2210200941 metadata/md5-cache/dev-games/godot-3.5.1
 2210200941 metadata/md5-cache/dev-games/godot-4.0_beta2
 2210200941 metadata/md5-cache/dev-games/godot-4.0_beta3
+2210252110 metadata/md5-cache/dev-games/KXL-1.1.7_p17
+2210252110 metadata/md5-cache/dev-games/Manifest.gz
 2209170112 metadata/md5-cache/dev-go/fuzzy-0.0.3
 2209170112 metadata/md5-cache/dev-go/fuzzy-0.0.5
 2209170112 metadata/md5-cache/dev-go/go-bindata-assetfs-1.0.0_p20180223
@@ -36230,7 +36215,6 @@
 2210111640 metadata/md5-cache/dev-java/commons-lang-3.12.0
 2210111640 metadata/md5-cache/dev-java/commons-math-3.6.1-r2
 2210111640 metadata/md5-cache/dev-java/commons-net-3.8.0
-2210111640 metadata/md5-cache/dev-java/commons-text-1.9
 2210111640 metadata/md5-cache/dev-java/commons-validator-1.7
 2210110022 metadata/md5-cache/dev-java/commons-vfs-2.0-r2
 2210111640 metadata/md5-cache/dev-java/conversant-disruptor-1.2.20
@@ -36299,7 +36283,6 @@
 2210111640 metadata/md5-cache/dev-java/jakarta-regexp-1.4-r3
 2210111640 metadata/md5-cache/dev-java/jakarta-servlet-api-4.0.4
 2210111640 metadata/md5-cache/dev-java/jakarta-xml-soap-api-1.4.2-r1
-2210111640 metadata/md5-cache/dev-java/jakartaee-migration-1.0.4
 2210111640 metadata/md5-cache/dev-java/jal-20031117-r6
 2210111640 metadata/md5-cache/dev-java/janino-3.1.7
 2210111640 metadata/md5-cache/dev-java/jansi-1.13
@@ -36438,7 +36421,6 @@
 2210111640 metadata/md5-cache/dev-java/poi-5.2.2
 2210111640 metadata/md5-cache/dev-java/protobuf-java-3.19.3
 2210111640 metadata/md5-cache/dev-java/protobuf-java-3.20.1
-2210111640 metadata/md5-cache/dev-java/protobuf-java-9999
 2210111640 metadata/md5-cache/dev-java/randomized-runner-2.8.0
 2210111640 metadata/md5-cache/dev-java/reflections-0.9.12-r4
 2210111640 metadata/md5-cache/dev-java/relaxng-datatype-1.0-r3
@@ -36539,11 +36521,9 @@
 2210162010 metadata/md5-cache/dev-java/byte-buddy-1.12.14
 2210190410 metadata/md5-cache/dev-java/jaxws-api-2.3.3
 2210190410 metadata/md5-cache/dev-java/jmock-2.12.0
-2210221240 metadata/md5-cache/dev-java/Manifest.gz
 2210192040 metadata/md5-cache/dev-java/aqute-bnd-annotation-6.3.1
 2210200941 metadata/md5-cache/dev-java/batik-1.14-r1
 2210192040 metadata/md5-cache/dev-java/cdi-api-4.0.1-r2
-2210202240 metadata/md5-cache/dev-java/commons-text-1.10.0
 2210201410 metadata/md5-cache/dev-java/gson-2.9.1
 2210200941 metadata/md5-cache/dev-java/icedtea-3.21.0
 2210210710 metadata/md5-cache/dev-java/icu4j-72.1
@@ -36556,8 +36536,6 @@
 2210201410 metadata/md5-cache/dev-java/jackson-module-jakarta-xmlbind-2.13.4-r1
 2210192040 metadata/md5-cache/dev-java/jakarta-el-api-5.0.1-r1
 2210192040 metadata/md5-cache/dev-java/jakarta-interceptors-2.1.0
-2210210940 metadata/md5-cache/dev-java/jakarta-servlet-api-6.0.0
-2210201410 metadata/md5-cache/dev-java/jakartaee-migration-1.0.3
 2210192040 metadata/md5-cache/dev-java/jaxrs-api-2.1.6
 2210201410 metadata/md5-cache/dev-java/jdbc-postgresql-42.5.0
 2210210840 metadata/md5-cache/dev-java/logback-classic-1.2.11-r1
@@ -36574,6 +36552,14 @@
 2210192040 metadata/md5-cache/dev-java/woodstox-core-6.3.1
 2210201410 metadata/md5-cache/dev-java/xerial-core-2.1
 2210202210 metadata/md5-cache/dev-java/xsdlib-2022.7
+2210260110 metadata/md5-cache/dev-java/Manifest.gz
+2210251610 metadata/md5-cache/dev-java/commons-text-1.10.0
+2210251310 metadata/md5-cache/dev-java/jakarta-servlet-api-6.0.0
+2210251240 metadata/md5-cache/dev-java/jakartaee-migration-1.0.4
+2210260110 metadata/md5-cache/dev-java/protobuf-java-3.19.6
+2210260110 metadata/md5-cache/dev-java/protobuf-java-3.20.3
+2210260110 metadata/md5-cache/dev-java/protobuf-java-3.21.8
+2210260110 metadata/md5-cache/dev-java/protobuf-java-9999
 2101062239 metadata/md5-cache/dev-lang/cll1h-0.6-r1
 2101070439 metadata/md5-cache/dev-lang/coffee-script-2.5.1
 1702282312 metadata/md5-cache/dev-lang/esco-0.512
@@ -36754,10 +36740,7 @@
 2210110022 metadata/md5-cache/dev-lang/yasm-1.3.0-r1
 2210132310 metadata/md5-cache/dev-lang/fennel-1.1.0
 2210132310 metadata/md5-cache/dev-lang/fennel-1.2.0
-2210130110 metadata/md5-cache/dev-lang/python-3.10.8
 2210120840 metadata/md5-cache/dev-lang/python-3.11.0_rc2_p1
-2210130110 metadata/md5-cache/dev-lang/python-3.8.15
-2210130110 metadata/md5-cache/dev-lang/python-3.9.15
 2210152041 metadata/md5-cache/dev-lang/erlang-24.3.4.2
 2210152041 metadata/md5-cache/dev-lang/erlang-25.0.4
 2210161340 metadata/md5-cache/dev-lang/erlang-25.1.1
@@ -36772,7 +36755,6 @@
 2210152041 metadata/md5-cache/dev-lang/php-8.2.0_rc3
 2210152010 metadata/md5-cache/dev-lang/qu-prolog-10.7
 2210191240 metadata/md5-cache/dev-lang/php-8.1.11
-2210240910 metadata/md5-cache/dev-lang/Manifest.gz
 2210220210 metadata/md5-cache/dev-lang/abs-2.6.0
 2210201440 metadata/md5-cache/dev-lang/ammonite-repl-bin-2.5.5
 2210200941 metadata/md5-cache/dev-lang/clipsjni-6.40-r1
@@ -36805,6 +36787,13 @@
 2210200941 metadata/md5-cache/dev-lang/swi-prolog-8.5.12
 2210191510 metadata/md5-cache/dev-lang/zig-0.9.1-r3
 2210210240 metadata/md5-cache/dev-lang/zig-9999
+2210251440 metadata/md5-cache/dev-lang/Manifest.gz
+2210251440 metadata/md5-cache/dev-lang/python-3.10.8
+2210251440 metadata/md5-cache/dev-lang/python-3.11.0
+2210251340 metadata/md5-cache/dev-lang/python-3.12.0_alpha1
+2210251440 metadata/md5-cache/dev-lang/python-3.8.15
+2210251440 metadata/md5-cache/dev-lang/python-3.9.15
+2210251410 metadata/md5-cache/dev-lang/swig-4.1.0
 2105240639 metadata/md5-cache/dev-libs/bemenu-0.6.1
 2011160239 metadata/md5-cache/dev-libs/busybee-0.7.0
 2104040139 metadata/md5-cache/dev-libs/c-capnproto-0.3
@@ -37060,8 +37049,6 @@
 2210110022 metadata/md5-cache/dev-libs/granite-5.2.5-r1
 2210110022 metadata/md5-cache/dev-libs/granite-6.0.0
 2210110022 metadata/md5-cache/dev-libs/granite-6.2.0
-2210110022 metadata/md5-cache/dev-libs/grantlee-5.2.0
-2210110022 metadata/md5-cache/dev-libs/grantlee-5.3.0
 2210110022 metadata/md5-cache/dev-libs/gumbo-0.10.1
 2210110022 metadata/md5-cache/dev-libs/hidapi-0.11.0
 2210110022 metadata/md5-cache/dev-libs/hidapi-0.12.0
@@ -37108,7 +37095,6 @@
 2210111610 metadata/md5-cache/dev-libs/kproperty-3.2.0
 2210111610 metadata/md5-cache/dev-libs/kpublictransport-22.04.3
 2210110022 metadata/md5-cache/dev-libs/kqoauth-0.98-r3
-2210111610 metadata/md5-cache/dev-libs/kreport-3.2.0-r3
 2210111610 metadata/md5-cache/dev-libs/kuserfeedback-1.2.0
 2210111610 metadata/md5-cache/dev-libs/kweathercore-0.6
 2210110022 metadata/md5-cache/dev-libs/leatherman-1.12.7
@@ -37191,7 +37177,6 @@
 2210110022 metadata/md5-cache/dev-libs/libfastjson-0.99.8-r1
 2210110022 metadata/md5-cache/dev-libs/libfastjson-0.99.9-r1
 2210110022 metadata/md5-cache/dev-libs/libffi-3.3-r2
-2210110022 metadata/md5-cache/dev-libs/libffi-3.4.2-r1
 2210110022 metadata/md5-cache/dev-libs/libffi-3.4.2-r2
 2210110022 metadata/md5-cache/dev-libs/libffi-compat-3.2.1-r3
 2210110022 metadata/md5-cache/dev-libs/libffi-compat-3.3-r2
@@ -37234,8 +37219,6 @@
 2210110022 metadata/md5-cache/dev-libs/libgpg-error-1.45
 2210110022 metadata/md5-cache/dev-libs/libgpg-error-1.45-r1
 2210110022 metadata/md5-cache/dev-libs/libgpg-error-1.46-r1
-2210110022 metadata/md5-cache/dev-libs/libgpiod-1.4.1
-2210110022 metadata/md5-cache/dev-libs/libgpiod-1.6.3-r4
 2210110022 metadata/md5-cache/dev-libs/libgrapheme-2.0.1
 2210110022 metadata/md5-cache/dev-libs/libgudev-236
 2210110022 metadata/md5-cache/dev-libs/libgudev-237-r1
@@ -37457,9 +37440,7 @@
 2210110022 metadata/md5-cache/dev-libs/nmeap-0.3-r2
 2210110022 metadata/md5-cache/dev-libs/npth-1.6-r1
 2210110022 metadata/md5-cache/dev-libs/nsgenbind-0.8-r1
-2210110022 metadata/md5-cache/dev-libs/nss-3.68.4
 2210110022 metadata/md5-cache/dev-libs/nss-3.79.1
-2210110022 metadata/md5-cache/dev-libs/nss-pem-1.0.8
 2210110022 metadata/md5-cache/dev-libs/nsync-1.24.0-r1
 2210110022 metadata/md5-cache/dev-libs/nsync-1.25.0
 2210110022 metadata/md5-cache/dev-libs/ntl-11.5.1-r1
@@ -37497,10 +37478,8 @@
 2210110022 metadata/md5-cache/dev-libs/poco-1.12.2
 2210110022 metadata/md5-cache/dev-libs/popt-1.18
 2210110022 metadata/md5-cache/dev-libs/popt-1.19
-2210110022 metadata/md5-cache/dev-libs/ppl-1.2-r4
 2210110022 metadata/md5-cache/dev-libs/protobuf-3.19.3
 2210110022 metadata/md5-cache/dev-libs/protobuf-3.20.1-r1
-2210110022 metadata/md5-cache/dev-libs/protobuf-9999
 2210110022 metadata/md5-cache/dev-libs/protobuf-c-1.4.0-r1
 2210110022 metadata/md5-cache/dev-libs/protobuf-c-1.4.1
 2210110022 metadata/md5-cache/dev-libs/psimd-2020.05.17
@@ -37740,8 +37719,6 @@
 2210132310 metadata/md5-cache/dev-libs/libpeas-1.34.0
 2210130240 metadata/md5-cache/dev-libs/libpqxx-7.7.4
 2210132310 metadata/md5-cache/dev-libs/libprelude-5.2.0-r10
-2210132310 metadata/md5-cache/dev-libs/libucl-0.8.1-r100
-2210132310 metadata/md5-cache/dev-libs/libucl-9999
 2210132310 metadata/md5-cache/dev-libs/modsecurity-3.0.7
 2210141040 metadata/md5-cache/dev-libs/nss-3.84
 2210150610 metadata/md5-cache/dev-libs/libwacom-2.5.0
@@ -37764,18 +37741,15 @@
 2210152041 metadata/md5-cache/dev-libs/libratbag-0.16
 2210152041 metadata/md5-cache/dev-libs/pigpio-79
 2210151710 metadata/md5-cache/dev-libs/yajl-2.1.0-r3
-2210180140 metadata/md5-cache/dev-libs/libgpiod-1.6.3-r1
 2210172010 metadata/md5-cache/dev-libs/libunistring-1.1-r1
 2210172310 metadata/md5-cache/dev-libs/libxls-1.6.2
 2210172310 metadata/md5-cache/dev-libs/libxlsxwriter-1.1.4-r1
 2210181340 metadata/md5-cache/dev-libs/nspr-4.35
-2210191140 metadata/md5-cache/dev-libs/libffi-3.4.3
 2210190512 metadata/md5-cache/dev-libs/libgusb-0.4.2
 2210191340 metadata/md5-cache/dev-libs/libindicator-12.10.1-r301
 2210190440 metadata/md5-cache/dev-libs/libtompoly-0.04-r1
 2210191340 metadata/md5-cache/dev-libs/serd-0.30.16
 2210191340 metadata/md5-cache/dev-libs/sord-0.16.14
-2210241040 metadata/md5-cache/dev-libs/Manifest.gz
 2210202210 metadata/md5-cache/dev-libs/apr-1.7.0-r5
 2210202210 metadata/md5-cache/dev-libs/apr-util-1.6.1-r9
 2210200941 metadata/md5-cache/dev-libs/ferrisloki-3.0.13-r2
@@ -37789,7 +37763,6 @@
 2210191510 metadata/md5-cache/dev-libs/keystone-9999
 2210231840 metadata/md5-cache/dev-libs/libclc-14.0.6
 2210231840 metadata/md5-cache/dev-libs/libclc-15.0.3
-2210231840 metadata/md5-cache/dev-libs/libclc-15.0.3.9999
 2210231840 metadata/md5-cache/dev-libs/libclc-16.0.0.9999
 2210231840 metadata/md5-cache/dev-libs/libclc-16.0.0_pre20221016
 2210231840 metadata/md5-cache/dev-libs/libclc-16.0.0_pre20221023
@@ -37810,13 +37783,31 @@
 2210191510 metadata/md5-cache/dev-libs/opencl-clang-15.0.0
 2210200440 metadata/md5-cache/dev-libs/pmdk-1.12.1
 2210191510 metadata/md5-cache/dev-libs/pocl-3.0
-2210241040 metadata/md5-cache/dev-libs/poco-1.11.2-r1
-2210210310 metadata/md5-cache/dev-libs/ppl-1.2-r5
 2210191510 metadata/md5-cache/dev-libs/rocm-comgr-5.1.3-r1
 2210191510 metadata/md5-cache/dev-libs/rocm-device-libs-5.1.3
 2210191510 metadata/md5-cache/dev-libs/rocr-runtime-5.1.3
-2210210040 metadata/md5-cache/dev-libs/tree-sitter-0.20.7
 2210200941 metadata/md5-cache/dev-libs/xapian-1.2.25-r1
+2210260140 metadata/md5-cache/dev-libs/Manifest.gz
+2210252340 metadata/md5-cache/dev-libs/expat-2.5.0
+2210251840 metadata/md5-cache/dev-libs/glib-2.74.1
+2210252210 metadata/md5-cache/dev-libs/grantlee-5.3.0
+2210252310 metadata/md5-cache/dev-libs/kreport-3.2.0-r3
+2210241640 metadata/md5-cache/dev-libs/libclc-15.0.4.9999
+2210251610 metadata/md5-cache/dev-libs/libcpuid-0.6.1
+2210241510 metadata/md5-cache/dev-libs/libffi-3.4.4
+2210252110 metadata/md5-cache/dev-libs/libgpiod-1.6.3-r4
+2210241910 metadata/md5-cache/dev-libs/libucl-0.8.1-r100
+2210241910 metadata/md5-cache/dev-libs/libucl-9999
+2210242010 metadata/md5-cache/dev-libs/libzia-4.37
+2210260140 metadata/md5-cache/dev-libs/mmtf-cpp-1.1.0
+2210251840 metadata/md5-cache/dev-libs/nss-pem-1.0.8
+2210252210 metadata/md5-cache/dev-libs/poco-1.11.2-r1
+2210251610 metadata/md5-cache/dev-libs/ppl-1.2-r5
+2210260110 metadata/md5-cache/dev-libs/protobuf-21.8
+2210260110 metadata/md5-cache/dev-libs/protobuf-3.19.6
+2210260110 metadata/md5-cache/dev-libs/protobuf-3.20.3
+2210260110 metadata/md5-cache/dev-libs/protobuf-9999
+2210251440 metadata/md5-cache/dev-libs/tree-sitter-0.20.7
 2205150110 metadata/md5-cache/dev-lisp/hyperspec-7.0-r3
 2207250144 metadata/md5-cache/dev-lisp/alexandria-1.4
 2207250144 metadata/md5-cache/dev-lisp/asdf-3.3.5
@@ -38294,7 +38285,6 @@
 2210172210 metadata/md5-cache/dev-ml/alcotest-1.5.0-r1
 2210191410 metadata/md5-cache/dev-ml/ppx_deriving-5.2.1
 2210231240 metadata/md5-cache/dev-ml/ANSITerminal-0.8.5
-2210231940 metadata/md5-cache/dev-ml/Manifest.gz
 2210231940 metadata/md5-cache/dev-ml/atd-2.10.0
 2210200010 metadata/md5-cache/dev-ml/base_bigstring-0.14.0
 2210200010 metadata/md5-cache/dev-ml/base_quickcheck-0.14.0-r1
@@ -38305,7 +38295,6 @@
 2210231840 metadata/md5-cache/dev-ml/llvm-ocaml-13.0.1
 2210231840 metadata/md5-cache/dev-ml/llvm-ocaml-14.0.6
 2210231840 metadata/md5-cache/dev-ml/llvm-ocaml-15.0.3
-2210231840 metadata/md5-cache/dev-ml/llvm-ocaml-15.0.3.9999
 2210231840 metadata/md5-cache/dev-ml/llvm-ocaml-16.0.0.9999
 2210231840 metadata/md5-cache/dev-ml/llvm-ocaml-16.0.0_pre20221016
 2210231840 metadata/md5-cache/dev-ml/llvm-ocaml-16.0.0_pre20221023
@@ -38331,6 +38320,8 @@
 2210200010 metadata/md5-cache/dev-ml/ppx_variants_conv-0.14.1-r2
 2210200010 metadata/md5-cache/dev-ml/ppx_variants_conv-0.14.2-r1
 2210231240 metadata/md5-cache/dev-ml/yojson-2.0.2-r2
+2210241640 metadata/md5-cache/dev-ml/Manifest.gz
+2210241640 metadata/md5-cache/dev-ml/llvm-ocaml-15.0.4.9999
 2210010840 metadata/md5-cache/dev-perl/Acme-Damn-0.80.0-r2
 2210010840 metadata/md5-cache/dev-perl/Algorithm-Annotate-0.100.0-r2
 2210010840 metadata/md5-cache/dev-perl/Algorithm-C3-0.110.0
@@ -40165,8 +40156,10 @@
 2210110022 metadata/md5-cache/dev-perl/perl-headers-0.0.2
 2210121910 metadata/md5-cache/dev-perl/Compress-Raw-Lzma-2.201.0
 2210130240 metadata/md5-cache/dev-perl/Sys-Virt-8.8.0
-2210200941 metadata/md5-cache/dev-perl/Manifest.gz
 2210200941 metadata/md5-cache/dev-perl/Panotools-Script-0.290.0
+2210252340 metadata/md5-cache/dev-perl/GD-2.760.0
+2210260140 metadata/md5-cache/dev-perl/Manifest.gz
+2210260140 metadata/md5-cache/dev-perl/Net-AMQP-RabbitMQ-2.40010
 2012150539 metadata/md5-cache/dev-php/File_Iterator-1.4.2
 2101072209 metadata/md5-cache/dev-php/File_Iterator-2.0.2-r1
 2108131009 metadata/md5-cache/dev-php/PEAR-Archive_Tar-1.4.14
@@ -40701,10 +40694,6 @@
 2210110022 metadata/md5-cache/dev-python/autopage-0.5.1
 2210110022 metadata/md5-cache/dev-python/autopep8-1.6.0
 2210110022 metadata/md5-cache/dev-python/autoprop-4.1.0
-2210110022 metadata/md5-cache/dev-python/aws-sam-translator-1.50.0
-2210110022 metadata/md5-cache/dev-python/aws-sam-translator-1.51.0
-2210110022 metadata/md5-cache/dev-python/aws-sam-translator-1.52.0
-2210112110 metadata/md5-cache/dev-python/aws-sam-translator-1.53.0
 2210110022 metadata/md5-cache/dev-python/awxkit-21.6.0
 2210110022 metadata/md5-cache/dev-python/awxkit-21.7.0
 2210110022 metadata/md5-cache/dev-python/babelfish-0.6.0-r2
@@ -40749,11 +40738,7 @@
 2210110022 metadata/md5-cache/dev-python/boltons-21.0.0-r1
 2210110022 metadata/md5-cache/dev-python/booleanOperations-0.9.0-r1
 2210110022 metadata/md5-cache/dev-python/boto-2.49.0-r4
-2210110022 metadata/md5-cache/dev-python/boto3-1.24.80
-2210110022 metadata/md5-cache/dev-python/boto3-1.24.89
 2210110022 metadata/md5-cache/dev-python/boto3-9999
-2210110022 metadata/md5-cache/dev-python/botocore-1.27.80
-2210110022 metadata/md5-cache/dev-python/botocore-1.27.89
 2210110022 metadata/md5-cache/dev-python/botocore-9999
 2210110022 metadata/md5-cache/dev-python/bottle-0.12.23
 2210110022 metadata/md5-cache/dev-python/bottleneck-1.3.5
@@ -40763,7 +40748,6 @@
 2210110022 metadata/md5-cache/dev-python/braintree-4.16.0
 2210110022 metadata/md5-cache/dev-python/braintree-4.17.0
 2210110022 metadata/md5-cache/dev-python/breathe-4.34.0
-2210110022 metadata/md5-cache/dev-python/brotlicffi-1.0.9.2-r1
 2210110022 metadata/md5-cache/dev-python/brython-3.10.5
 2210110022 metadata/md5-cache/dev-python/brython-3.9.0
 2210110022 metadata/md5-cache/dev-python/bsddb3-6.2.9
@@ -40777,8 +40761,6 @@
 2210110022 metadata/md5-cache/dev-python/calver-2021.7.30
 2210110022 metadata/md5-cache/dev-python/calver-2022.06.26
 2210110022 metadata/md5-cache/dev-python/cangjie-1.3-r1
-2210110022 metadata/md5-cache/dev-python/canonicaljson-1.6.2
-2210110022 metadata/md5-cache/dev-python/canonicaljson-1.6.3
 2210110022 metadata/md5-cache/dev-python/capturer-3.0
 2210110022 metadata/md5-cache/dev-python/carbon-1.1.10
 2210110022 metadata/md5-cache/dev-python/case-1.5.3
@@ -40795,10 +40777,6 @@
 2210110022 metadata/md5-cache/dev-python/certifi-3021.3.16-r2
 2210110022 metadata/md5-cache/dev-python/cffi-1.15.1
 2210110022 metadata/md5-cache/dev-python/cfgv-3.3.1
-2210110022 metadata/md5-cache/dev-python/cfn-lint-0.64.1
-2210110022 metadata/md5-cache/dev-python/cfn-lint-0.65.1
-2210110022 metadata/md5-cache/dev-python/cfn-lint-0.66.0
-2210110022 metadata/md5-cache/dev-python/cfn-lint-0.66.1
 2210110022 metadata/md5-cache/dev-python/cftime-1.6.1
 2210110022 metadata/md5-cache/dev-python/cftime-1.6.2
 2210110022 metadata/md5-cache/dev-python/cgroup-utils-0.8-r1
@@ -40859,8 +40837,6 @@
 2210110022 metadata/md5-cache/dev-python/css-parser-1.0.8
 2210110022 metadata/md5-cache/dev-python/csscompressor-0.9.5-r1
 2210110022 metadata/md5-cache/dev-python/cssselect-1.1.0-r2
-2210110022 metadata/md5-cache/dev-python/cssselect2-0.6.0
-2210110022 metadata/md5-cache/dev-python/cssselect2-0.7.0
 2210110022 metadata/md5-cache/dev-python/cssutils-2.6.0
 2210110022 metadata/md5-cache/dev-python/csvkit-1.0.7
 2210110022 metadata/md5-cache/dev-python/curtsies-0.4.0
@@ -40872,9 +40848,6 @@
 2210110022 metadata/md5-cache/dev-python/cython-0.29.32
 2210110022 metadata/md5-cache/dev-python/cython-test-exception-raiser-1.0.2-r1
 2210110022 metadata/md5-cache/dev-python/daemonize-2.5.0-r1
-2210110022 metadata/md5-cache/dev-python/dask-2022.9.0
-2210110022 metadata/md5-cache/dev-python/dask-2022.9.1
-2210110022 metadata/md5-cache/dev-python/dask-2022.9.2
 2210110022 metadata/md5-cache/dev-python/dbfread-2.0.7
 2210110022 metadata/md5-cache/dev-python/dbfread-2.0.7-r1
 2210110022 metadata/md5-cache/dev-python/dbus-next-0.2.3-r1
@@ -41012,8 +40985,6 @@
 2210110022 metadata/md5-cache/dev-python/flask-api-3.0
 2210110022 metadata/md5-cache/dev-python/flask-assets-0.12
 2210110022 metadata/md5-cache/dev-python/flask-babel-2.0.0
-2210110022 metadata/md5-cache/dev-python/flask-compress-1.12
-2210110022 metadata/md5-cache/dev-python/flask-compress-1.13
 2210110022 metadata/md5-cache/dev-python/flask-cors-3.0.10-r1
 2210110022 metadata/md5-cache/dev-python/flask-debug-0.4.3-r1
 2210110022 metadata/md5-cache/dev-python/flask-gravatar-0.5.0
@@ -41039,9 +41010,6 @@
 2210110022 metadata/md5-cache/dev-python/flufl-lock-7.0-r1
 2210110022 metadata/md5-cache/dev-python/flufl-lock-7.1
 2210110022 metadata/md5-cache/dev-python/flufl-lock-7.1.1
-2210110022 metadata/md5-cache/dev-python/fonttools-4.36.0
-2210110022 metadata/md5-cache/dev-python/fonttools-4.37.2
-2210110022 metadata/md5-cache/dev-python/fonttools-4.37.3
 2210110022 metadata/md5-cache/dev-python/fqdn-1.5.1-r2
 2210110022 metadata/md5-cache/dev-python/freezegun-1.2.2
 2210110022 metadata/md5-cache/dev-python/fritzconnection-1.10.2
@@ -41076,9 +41044,6 @@
 2210110022 metadata/md5-cache/dev-python/google-api-python-client-2.63.0
 2210110022 metadata/md5-cache/dev-python/google-api-python-client-2.64.0
 2210110022 metadata/md5-cache/dev-python/google-apitools-0.5.32-r1
-2210110022 metadata/md5-cache/dev-python/google-auth-2.11.0
-2210110022 metadata/md5-cache/dev-python/google-auth-2.11.1
-2210110022 metadata/md5-cache/dev-python/google-auth-2.12.0
 2210110022 metadata/md5-cache/dev-python/google-auth-httplib2-0.1.0-r1
 2210110022 metadata/md5-cache/dev-python/google-auth-oauthlib-0.5.2
 2210110022 metadata/md5-cache/dev-python/google-auth-oauthlib-0.5.3
@@ -41129,8 +41094,6 @@
 2210110022 metadata/md5-cache/dev-python/huawei-lte-api-1.6.1
 2210110022 metadata/md5-cache/dev-python/huawei-lte-api-1.6.3
 2210110022 metadata/md5-cache/dev-python/humanfriendly-10.0
-2210110022 metadata/md5-cache/dev-python/humanize-4.3.0
-2210110022 metadata/md5-cache/dev-python/humanize-4.4.0
 2210110022 metadata/md5-cache/dev-python/hvac-0.11.2
 2210110022 metadata/md5-cache/dev-python/hvac-1.0.0
 2210110022 metadata/md5-cache/dev-python/hyperframe-5.2.0
@@ -41148,7 +41111,6 @@
 2210110022 metadata/md5-cache/dev-python/imapclient-2.3.1
 2210110022 metadata/md5-cache/dev-python/iminuit-2.16.0
 2210110022 metadata/md5-cache/dev-python/iminuit-2.17.0
-2210110022 metadata/md5-cache/dev-python/immutables-0.18
 2210110022 metadata/md5-cache/dev-python/importlib_metadata-4.12.0
 2210110022 metadata/md5-cache/dev-python/importlib_metadata-4.13.0
 2210110022 metadata/md5-cache/dev-python/importlib_metadata-5.0.0
@@ -41197,9 +41159,6 @@
 2210110022 metadata/md5-cache/dev-python/jaraco-stream-3.0.3-r1
 2210110022 metadata/md5-cache/dev-python/jaraco-text-3.9.1
 2210110022 metadata/md5-cache/dev-python/jarowinkler-1.2.3
-2210110022 metadata/md5-cache/dev-python/jc-1.21.0
-2210110022 metadata/md5-cache/dev-python/jc-1.21.2
-2210110022 metadata/md5-cache/dev-python/jc-1.22.0
 2210110022 metadata/md5-cache/dev-python/jdcal-1.4.1-r1
 2210110022 metadata/md5-cache/dev-python/jedi-0.18.1
 2210110022 metadata/md5-cache/dev-python/jeepney-0.8.0
@@ -41251,9 +41210,6 @@
 2210110022 metadata/md5-cache/dev-python/jupyterlab-lsp-3.10.1
 2210110022 metadata/md5-cache/dev-python/jupyterlab-lsp-3.10.2
 2210110022 metadata/md5-cache/dev-python/jupyterlab_pygments-0.2.2
-2210110022 metadata/md5-cache/dev-python/jwcrypto-1.3.1
-2210110022 metadata/md5-cache/dev-python/jwcrypto-1.4.2
-2210110022 metadata/md5-cache/dev-python/k5test-0.10.1-r1
 2210110022 metadata/md5-cache/dev-python/kafka-python-2.0.2
 2210110022 metadata/md5-cache/dev-python/kaitaistruct-0.10
 2210110022 metadata/md5-cache/dev-python/kaptan-0.5.12-r2
@@ -41263,7 +41219,6 @@
 2210110022 metadata/md5-cache/dev-python/keyring-23.9.1
 2210110022 metadata/md5-cache/dev-python/keyrings-alt-4.2.0
 2210110022 metadata/md5-cache/dev-python/keystoneauth-5.0.0
-2210110022 metadata/md5-cache/dev-python/kgb-7.1.1
 2210110022 metadata/md5-cache/dev-python/kiwisolver-1.4.4
 2210110022 metadata/md5-cache/dev-python/klein-21.8.0
 2210110022 metadata/md5-cache/dev-python/krb5-0.4.0
@@ -41309,15 +41264,12 @@
 2210110022 metadata/md5-cache/dev-python/lz4-4.0.2
 2210110022 metadata/md5-cache/dev-python/m2crypto-0.38.0
 2210110022 metadata/md5-cache/dev-python/makefun-1.15.0
-2210110022 metadata/md5-cache/dev-python/mako-1.2.2
-2210110022 metadata/md5-cache/dev-python/mako-1.2.3
 2210110022 metadata/md5-cache/dev-python/mamba-0.11.2
 2210110022 metadata/md5-cache/dev-python/mando-0.7.1
 2210110022 metadata/md5-cache/dev-python/manuel-1.12.4
 2210110022 metadata/md5-cache/dev-python/mapbox_earcut-1.0.0
 2210110022 metadata/md5-cache/dev-python/markdown-3.3.7
 2210110022 metadata/md5-cache/dev-python/markdown-3.4.1
-2210110022 metadata/md5-cache/dev-python/markdown-it-py-2.1.0-r1
 2210110022 metadata/md5-cache/dev-python/markdown2-2.4.3
 2210110022 metadata/md5-cache/dev-python/markdown2-2.4.5
 2210110022 metadata/md5-cache/dev-python/markups-3.1.3
@@ -41327,10 +41279,6 @@
 2210110022 metadata/md5-cache/dev-python/marshmallow-3.17.0
 2210110022 metadata/md5-cache/dev-python/marshmallow-3.17.1
 2210110022 metadata/md5-cache/dev-python/marshmallow-3.18.0
-2210110022 metadata/md5-cache/dev-python/matplotlib-3.5.1-r2
-2210110022 metadata/md5-cache/dev-python/matplotlib-3.5.2-r3
-2210110022 metadata/md5-cache/dev-python/matplotlib-3.5.3
-2210110022 metadata/md5-cache/dev-python/matplotlib-3.6.0-r1
 2210110310 metadata/md5-cache/dev-python/matplotlib-3.6.1
 2210110022 metadata/md5-cache/dev-python/matplotlib-inline-0.1.6
 2210110022 metadata/md5-cache/dev-python/matrix-common-1.2.1
@@ -41368,12 +41316,8 @@
 2210110022 metadata/md5-cache/dev-python/mkdocs-git-authors-plugin-0.6.4
 2210110022 metadata/md5-cache/dev-python/mkdocs-git-revision-date-localized-plugin-1.1.0
 2210110022 metadata/md5-cache/dev-python/mkdocs-i18n-0.4.4
-2210110022 metadata/md5-cache/dev-python/mkdocs-material-8.4.3
-2210110022 metadata/md5-cache/dev-python/mkdocs-material-8.5.2
 2210110022 metadata/md5-cache/dev-python/mkdocs-material-extensions-1.0.3-r1
 2210110022 metadata/md5-cache/dev-python/mkdocs-minify-plugin-0.5.0-r2
-2210110022 metadata/md5-cache/dev-python/mkdocs-redirects-1.1.0
-2210110022 metadata/md5-cache/dev-python/mkdocs-redirects-1.2.0
 2210110022 metadata/md5-cache/dev-python/mkdocs_pymdownx_material_extras-1.0.7
 2210110022 metadata/md5-cache/dev-python/mkdocs_pymdownx_material_extras-1.1.3
 2210110022 metadata/md5-cache/dev-python/mkdocs_pymdownx_material_extras-2.2.1
@@ -41440,10 +41384,6 @@
 2210110022 metadata/md5-cache/dev-python/ntlm-auth-1.5.0
 2210110022 metadata/md5-cache/dev-python/ntplib-0.4.0
 2210110022 metadata/md5-cache/dev-python/numexpr-2.8.3
-2210110022 metadata/md5-cache/dev-python/numpy-1.21.5
-2210110022 metadata/md5-cache/dev-python/numpy-1.22.4
-2210110022 metadata/md5-cache/dev-python/numpy-1.23.1
-2210110022 metadata/md5-cache/dev-python/numpy-1.23.3
 2210110022 metadata/md5-cache/dev-python/numpydoc-1.4.0
 2210110022 metadata/md5-cache/dev-python/numpydoc-1.5.0
 2210110022 metadata/md5-cache/dev-python/oauth2client-4.1.3-r2
@@ -41479,8 +41419,6 @@
 2210110022 metadata/md5-cache/dev-python/pafy-9999
 2210110022 metadata/md5-cache/dev-python/paho-mqtt-1.6.1
 2210110022 metadata/md5-cache/dev-python/pallets-sphinx-themes-2.0.2
-2210110022 metadata/md5-cache/dev-python/pandas-1.4.4
-2210110022 metadata/md5-cache/dev-python/pandas-1.5.0
 2210110022 metadata/md5-cache/dev-python/pandas-datareader-0.10.0
 2210110022 metadata/md5-cache/dev-python/pandocfilters-1.5.0
 2210110022 metadata/md5-cache/dev-python/parallax-1.0.6
@@ -41515,8 +41453,6 @@
 2210110022 metadata/md5-cache/dev-python/pdfrw-0.4_p1
 2210110022 metadata/md5-cache/dev-python/pdoc3-0.10.0
 2210110022 metadata/md5-cache/dev-python/pecan-1.4.2
-2210110022 metadata/md5-cache/dev-python/peewee-3.15.2
-2210110022 metadata/md5-cache/dev-python/peewee-3.15.3
 2210110022 metadata/md5-cache/dev-python/pefile-2022.5.30
 2210110022 metadata/md5-cache/dev-python/pefile-9999
 2210110022 metadata/md5-cache/dev-python/pelican-minify-0.9-r1
@@ -41577,8 +41513,6 @@
 2210110022 metadata/md5-cache/dev-python/pretty-yaml-21.10.1
 2210110022 metadata/md5-cache/dev-python/prettytable-3.3.0
 2210110022 metadata/md5-cache/dev-python/prettytable-3.4.1
-2210110022 metadata/md5-cache/dev-python/priority-1.3.0
-2210110022 metadata/md5-cache/dev-python/priority-1.3.0-r1
 2210110022 metadata/md5-cache/dev-python/priority-2.0.0-r1
 2210110022 metadata/md5-cache/dev-python/process-tests-2.1.2-r1
 2210110022 metadata/md5-cache/dev-python/progress-1.6-r1
@@ -41589,7 +41523,6 @@
 2210110022 metadata/md5-cache/dev-python/protobuf-python-3.19.3-r2
 2210110022 metadata/md5-cache/dev-python/protobuf-python-3.19.3-r3
 2210110022 metadata/md5-cache/dev-python/protobuf-python-3.20.1
-2210110022 metadata/md5-cache/dev-python/protobuf-python-9999
 2210110022 metadata/md5-cache/dev-python/prov-2.0.0
 2210110022 metadata/md5-cache/dev-python/pslab-python-2.5.0
 2210110022 metadata/md5-cache/dev-python/psutil-5.9.1
@@ -41645,7 +41578,6 @@
 2210110022 metadata/md5-cache/dev-python/pycryptodome-3.15.0
 2210110022 metadata/md5-cache/dev-python/pycson-0.8-r3
 2210110022 metadata/md5-cache/dev-python/pycuda-2021.1
-2210110022 metadata/md5-cache/dev-python/pycups-2.0.1-r1
 2210110022 metadata/md5-cache/dev-python/pycurl-7.45.1
 2210110022 metadata/md5-cache/dev-python/pycurl-requests-0.2.1
 2210110022 metadata/md5-cache/dev-python/pycurl-requests-0.5.0
@@ -41656,7 +41588,6 @@
 2210110022 metadata/md5-cache/dev-python/pydecomp-9999
 2210110022 metadata/md5-cache/dev-python/pydevd-2.8.0-r1
 2210110022 metadata/md5-cache/dev-python/pydevd-2.9.1
-2210110022 metadata/md5-cache/dev-python/pydiffx-1.0.1-r1
 2210110022 metadata/md5-cache/dev-python/pydiffx-1.1
 2210110022 metadata/md5-cache/dev-python/pydot-1.4.2-r3
 2210110022 metadata/md5-cache/dev-python/pydotplus-2.0.2-r1
@@ -41689,7 +41620,6 @@
 2210110022 metadata/md5-cache/dev-python/pyicu-2.9
 2210110022 metadata/md5-cache/dev-python/pyinotify-0.9.6-r1
 2210110022 metadata/md5-cache/dev-python/pyjsparser-2.7.1_p20190421-r1
-2210110022 metadata/md5-cache/dev-python/pykerberos-1.3.1
 2210110022 metadata/md5-cache/dev-python/pykka-3.1.1
 2210110022 metadata/md5-cache/dev-python/pykwalify-1.8.0-r2
 2210110022 metadata/md5-cache/dev-python/pylama-8.4.1
@@ -41739,7 +41669,6 @@
 2210110022 metadata/md5-cache/dev-python/pypng-0.20220715.0
 2210110022 metadata/md5-cache/dev-python/pyprof2calltree-1.4.5-r1
 2210110022 metadata/md5-cache/dev-python/pyproj-3.3.1
-2210110022 metadata/md5-cache/dev-python/pyproj-3.4.0
 2210110022 metadata/md5-cache/dev-python/pyproject-fmt-0.3.5
 2210110022 metadata/md5-cache/dev-python/pyproject-metadata-0.5.0
 2210110022 metadata/md5-cache/dev-python/pyproject2setuppy-22-r1
@@ -41809,7 +41738,6 @@
 2210110022 metadata/md5-cache/dev-python/pytest-helpers-namespace-2021.12.29-r1
 2210110022 metadata/md5-cache/dev-python/pytest-html-3.1.1
 2210110022 metadata/md5-cache/dev-python/pytest-httpbin-1.0.2
-2210110022 metadata/md5-cache/dev-python/pytest-httpserver-1.0.5
 2210110022 metadata/md5-cache/dev-python/pytest-httpx-0.21.0
 2210110022 metadata/md5-cache/dev-python/pytest-lazy-fixture-0.6.3
 2210110022 metadata/md5-cache/dev-python/pytest-localftpserver-1.1.3
@@ -41880,7 +41808,6 @@
 2210110022 metadata/md5-cache/dev-python/python-jose-3.3.0
 2210110022 metadata/md5-cache/dev-python/python-keystoneclient-5.0.1
 2210110022 metadata/md5-cache/dev-python/python-keyutils-0.6
-2210110022 metadata/md5-cache/dev-python/python-ldap-3.4.2
 2210110022 metadata/md5-cache/dev-python/python-ldap-9999
 2210110022 metadata/md5-cache/dev-python/python-lhafile-0.3.0
 2210110022 metadata/md5-cache/dev-python/python-libevdev-0.11
@@ -41901,15 +41828,10 @@
 2210110022 metadata/md5-cache/dev-python/python-mpv-1.0.1
 2210110022 metadata/md5-cache/dev-python/python-musicbrainzngs-0.7.1
 2210110022 metadata/md5-cache/dev-python/python-nbxmpp-2.0.6
-2210110022 metadata/md5-cache/dev-python/python-nbxmpp-3.2.1
-2210110022 metadata/md5-cache/dev-python/python-nbxmpp-3.2.2
-2210110022 metadata/md5-cache/dev-python/python-nbxmpp-3.2.3
-2210110022 metadata/md5-cache/dev-python/python-nbxmpp-3.2.4
 2210110022 metadata/md5-cache/dev-python/python-netlink-0.1
 2210110022 metadata/md5-cache/dev-python/python-neutronclient-8.1.0
 2210110022 metadata/md5-cache/dev-python/python-novaclient-18.1.0
 2210110022 metadata/md5-cache/dev-python/python-openstackclient-6.0.0
-2210110022 metadata/md5-cache/dev-python/python-poppler-qt5-0.75.0
 2210110022 metadata/md5-cache/dev-python/python-poppler-qt5-21.3.0
 2210110022 metadata/md5-cache/dev-python/python-ptrace-0.9.8
 2210110022 metadata/md5-cache/dev-python/python-ptrace-9999
@@ -41927,8 +41849,6 @@
 2210110022 metadata/md5-cache/dev-python/python-utils-3.3.3
 2210110022 metadata/md5-cache/dev-python/python-varlink-30.3.1
 2210110022 metadata/md5-cache/dev-python/python-vlc-3.0.16120
-2210110022 metadata/md5-cache/dev-python/python-xlib-0.31
-2210110022 metadata/md5-cache/dev-python/python-xlib-0.31-r1
 2210110022 metadata/md5-cache/dev-python/python-xmlsec-1.3.12-r1
 2210110022 metadata/md5-cache/dev-python/python-zipstream-1.1.4
 2210110022 metadata/md5-cache/dev-python/python3-lxc-3.0.4
@@ -42000,7 +41920,6 @@
 2210110022 metadata/md5-cache/dev-python/redis-py-4.3.4
 2210110022 metadata/md5-cache/dev-python/reedsolomon-1.5.4-r2
 2210110022 metadata/md5-cache/dev-python/reflink-0.2.1-r3
-2210110022 metadata/md5-cache/dev-python/regex-2022.8.17
 2210110022 metadata/md5-cache/dev-python/rencode-1.0.6-r3
 2210110022 metadata/md5-cache/dev-python/reno-3.5.0
 2210110022 metadata/md5-cache/dev-python/reportlab-3.6.11-r1
@@ -42173,7 +42092,6 @@
 2210110022 metadata/md5-cache/dev-python/sphobjinv-2.2.2
 2210110022 metadata/md5-cache/dev-python/spotipy-2.19.0
 2210110022 metadata/md5-cache/dev-python/spotipy-2.20.0
-2210110022 metadata/md5-cache/dev-python/spur-0.3.22
 2210110022 metadata/md5-cache/dev-python/spyder-5.3.3
 2210110022 metadata/md5-cache/dev-python/spyder-kernels-2.3.3
 2210110022 metadata/md5-cache/dev-python/spyder-line-profiler-0.3.1
@@ -42199,8 +42117,6 @@
 2210110022 metadata/md5-cache/dev-python/statsd-3.3.0
 2210110022 metadata/md5-cache/dev-python/statsmodels-0.13.2
 2210110022 metadata/md5-cache/dev-python/stdio-mgr-1.0.1
-2210110022 metadata/md5-cache/dev-python/stestr-3.2.1
-2210110022 metadata/md5-cache/dev-python/stestr-4.0.1
 2210110022 metadata/md5-cache/dev-python/stevedore-4.0.0
 2210110022 metadata/md5-cache/dev-python/stomp-py-8.0.1
 2210110022 metadata/md5-cache/dev-python/strict-rfc3339-0.7-r2
@@ -42229,8 +42145,6 @@
 2210110022 metadata/md5-cache/dev-python/tekore-4.4.1
 2210110022 metadata/md5-cache/dev-python/tempita-0.5.3-r3
 2210110022 metadata/md5-cache/dev-python/tempora-5.0.2
-2210110022 metadata/md5-cache/dev-python/tenacity-8.0.1-r1
-2210110022 metadata/md5-cache/dev-python/tenacity-8.1.0
 2210110022 metadata/md5-cache/dev-python/terminado-0.15.0
 2210110022 metadata/md5-cache/dev-python/terminado-0.16.0
 2210110022 metadata/md5-cache/dev-python/terminaltables-3.1.10-r1
@@ -42243,8 +42157,6 @@
 2210110022 metadata/md5-cache/dev-python/testtools-2.5.0-r1
 2210110022 metadata/md5-cache/dev-python/text-unidecode-1.3-r1
 2210110022 metadata/md5-cache/dev-python/textX-3.0.0
-2210110022 metadata/md5-cache/dev-python/textdistance-4.4.0
-2210110022 metadata/md5-cache/dev-python/textdistance-4.5.0
 2210110022 metadata/md5-cache/dev-python/texttable-1.6.4-r1
 2210110022 metadata/md5-cache/dev-python/threadpoolctl-3.1.0
 2210110022 metadata/md5-cache/dev-python/three-merge-0.1.1
@@ -42308,8 +42220,6 @@
 2210110022 metadata/md5-cache/dev-python/ubelt-1.2.0
 2210110022 metadata/md5-cache/dev-python/ubelt-1.2.1
 2210110022 metadata/md5-cache/dev-python/ubelt-1.2.2
-2210110022 metadata/md5-cache/dev-python/ujson-5.4.0
-2210110022 metadata/md5-cache/dev-python/ujson-5.5.0
 2210110022 metadata/md5-cache/dev-python/ukkonen-1.0.1-r1
 2210110022 metadata/md5-cache/dev-python/unasync-0.5.0
 2210110022 metadata/md5-cache/dev-python/uncertainties-3.1.6
@@ -42434,7 +42344,6 @@
 2210110022 metadata/md5-cache/dev-python/zope-deprecation-4.4.0-r2
 2210110022 metadata/md5-cache/dev-python/zope-event-4.5.0-r3
 2210110022 metadata/md5-cache/dev-python/zope-exceptions-4.5-r1
-2210110022 metadata/md5-cache/dev-python/zope-hookable-5.1.0
 2210110022 metadata/md5-cache/dev-python/zope-i18nmessageid-5.0.1-r2
 2210110022 metadata/md5-cache/dev-python/zope-interface-5.4.0-r2
 2210110022 metadata/md5-cache/dev-python/zope-interface-5.5.0
@@ -42448,9 +42357,6 @@
 2210132140 metadata/md5-cache/dev-python/PyGithub-1.56
 2210140840 metadata/md5-cache/dev-python/absl-py-1.3.0
 2210130810 metadata/md5-cache/dev-python/aiohttp-3.8.1-r1
-2210130810 metadata/md5-cache/dev-python/aiohttp-3.8.3
-2210140840 metadata/md5-cache/dev-python/boto3-1.24.90
-2210140840 metadata/md5-cache/dev-python/botocore-1.27.90
 2210122240 metadata/md5-cache/dev-python/check-manifest-0.48
 2210132040 metadata/md5-cache/dev-python/cli_helpers-2.3.0
 2210121810 metadata/md5-cache/dev-python/coverage-6.4.4-r1
@@ -42487,7 +42393,6 @@
 2210140810 metadata/md5-cache/dev-python/pyotp-2.7.0
 2210121810 metadata/md5-cache/dev-python/pytest-cov-3.0.0-r2
 2210121810 metadata/md5-cache/dev-python/pytest-cov-4.0.0-r1
-2210140740 metadata/md5-cache/dev-python/pytest-httpserver-1.0.6
 2210140910 metadata/md5-cache/dev-python/pytest-twisted-1.13.4-r1
 2210130010 metadata/md5-cache/dev-python/python-box-6.0.2-r1
 2210121440 metadata/md5-cache/dev-python/python-dbusmock-0.28.6
@@ -42519,7 +42424,6 @@
 2210141510 metadata/md5-cache/dev-python/ipdb-0.13.9-r3
 2210141510 metadata/md5-cache/dev-python/jaraco-test-5.1.0-r1
 2210141940 metadata/md5-cache/dev-python/nuitka-1.1.5
-2210142040 metadata/md5-cache/dev-python/pandas-1.5.0-r1
 2210141840 metadata/md5-cache/dev-python/patsy-0.5.3-r1
 2210141940 metadata/md5-cache/dev-python/phonenumbers-8.12.57
 2210141840 metadata/md5-cache/dev-python/psycopg-2.9.4
@@ -42532,10 +42436,7 @@
 2210170940 metadata/md5-cache/dev-python/Pyro4-4.82-r1
 2210151110 metadata/md5-cache/dev-python/apispec-6.0.0
 2210151740 metadata/md5-cache/dev-python/aws-xray-sdk-python-2.10.0
-2210151110 metadata/md5-cache/dev-python/boto3-1.24.91
-2210151110 metadata/md5-cache/dev-python/botocore-1.27.91
 2210151110 metadata/md5-cache/dev-python/braintree-4.17.1
-2210171510 metadata/md5-cache/dev-python/cfn-lint-0.67.0
 2210151140 metadata/md5-cache/dev-python/cryptography-38.0.1
 2210171510 metadata/md5-cache/dev-python/dask-2022.10.0
 2210151840 metadata/md5-cache/dev-python/docker-py-5.0.3
@@ -42559,14 +42460,11 @@
 2210171510 metadata/md5-cache/dev-python/sarif_om-1.0.4-r1
 2210170940 metadata/md5-cache/dev-python/serpent-1.41
 2210151040 metadata/md5-cache/dev-python/snakeoil-0.10.1
-2210151740 metadata/md5-cache/dev-python/spur-0.3.22-r1
 2210152041 metadata/md5-cache/dev-python/vdirsyncer-0.18.0-r4
 2210170840 metadata/md5-cache/dev-python/versioneer-0.26
 2210170840 metadata/md5-cache/dev-python/vine-5.0.0-r1
 2210181010 metadata/md5-cache/dev-python/Levenshtein-0.20.7
 2210172310 metadata/md5-cache/dev-python/boolean-py-4.0
-2210181010 metadata/md5-cache/dev-python/boto3-1.24.92
-2210181010 metadata/md5-cache/dev-python/botocore-1.27.92
 2210172240 metadata/md5-cache/dev-python/cairocffi-1.4.0
 2210172310 metadata/md5-cache/dev-python/cerberus-1.3.4-r1
 2210181040 metadata/md5-cache/dev-python/ensurepip-pip-22.3
@@ -42578,7 +42476,6 @@
 2210180610 metadata/md5-cache/dev-python/git-review-9999
 2210181010 metadata/md5-cache/dev-python/google-auth-2.13.0
 2210181010 metadata/md5-cache/dev-python/huawei-lte-api-1.6.4
-2210181010 metadata/md5-cache/dev-python/hypothesis-6.56.3
 2210181010 metadata/md5-cache/dev-python/icalendar-5.0.0
 2210172310 metadata/md5-cache/dev-python/license-expression-30.0.0
 2210171540 metadata/md5-cache/dev-python/matrix-common-1.3.0
@@ -42598,9 +42495,6 @@
 2210182210 metadata/md5-cache/dev-python/aiorpcX-0.22.1
 2210191310 metadata/md5-cache/dev-python/astroid-2.12.12
 2210191340 metadata/md5-cache/dev-python/berkeleydb-18.1.5
-2210190710 metadata/md5-cache/dev-python/boto3-1.24.93
-2210190710 metadata/md5-cache/dev-python/botocore-1.27.93
-2210190710 metadata/md5-cache/dev-python/cfn-lint-0.68.0
 2210190710 metadata/md5-cache/dev-python/google-api-python-client-2.65.0
 2210191310 metadata/md5-cache/dev-python/hatchling-1.11.1
 2210182140 metadata/md5-cache/dev-python/more-itertools-9.0.0
@@ -42621,13 +42515,10 @@
 2210191240 metadata/md5-cache/dev-python/uncertainties-3.1.7
 2210190710 metadata/md5-cache/dev-python/weasyprint-57.0
 2210191310 metadata/md5-cache/dev-python/xxhash-3.1.0
-2210241340 metadata/md5-cache/dev-python/Manifest.gz
 2210221910 metadata/md5-cache/dev-python/astroid-2.12.11
 2210221110 metadata/md5-cache/dev-python/boto3-1.24.88
-2210210840 metadata/md5-cache/dev-python/boto3-1.24.95
 2210220940 metadata/md5-cache/dev-python/boto3-1.24.96
 2210221110 metadata/md5-cache/dev-python/botocore-1.27.88
-2210210840 metadata/md5-cache/dev-python/botocore-1.27.95
 2210220940 metadata/md5-cache/dev-python/botocore-1.27.96
 2210221910 metadata/md5-cache/dev-python/cachecontrol-0.12.12
 2210220940 metadata/md5-cache/dev-python/cfn-lint-0.68.1
@@ -42637,7 +42528,6 @@
 2210231840 metadata/md5-cache/dev-python/clang-python-13.0.1
 2210231840 metadata/md5-cache/dev-python/clang-python-14.0.6
 2210231840 metadata/md5-cache/dev-python/clang-python-15.0.3
-2210231840 metadata/md5-cache/dev-python/clang-python-15.0.3.9999
 2210231840 metadata/md5-cache/dev-python/clang-python-16.0.0.9999
 2210231840 metadata/md5-cache/dev-python/clang-python-16.0.0_pre20221016
 2210231840 metadata/md5-cache/dev-python/clang-python-16.0.0_pre20221023
@@ -42645,16 +42535,13 @@
 2210240910 metadata/md5-cache/dev-python/dill-0.3.6
 2210221910 metadata/md5-cache/dev-python/fasteners-0.18
 2210221910 metadata/md5-cache/dev-python/fastjsonschema-2.16.2
-2210231110 metadata/md5-cache/dev-python/fonttools-4.37.4
 2210220940 metadata/md5-cache/dev-python/fonttools-4.38.0
 2210211110 metadata/md5-cache/dev-python/fsspec-2022.10.0
 2210202010 metadata/md5-cache/dev-python/gst-python-1.20.3
 2210221910 metadata/md5-cache/dev-python/hatchling-1.10.0-r1
 2210211740 metadata/md5-cache/dev-python/httpretty-1.1.4-r1
-2210221910 metadata/md5-cache/dev-python/hypothesis-6.56.2
 2210232210 metadata/md5-cache/dev-python/icalendar-5.0.1
 2210221910 metadata/md5-cache/dev-python/idna-3.4
-2210222010 metadata/md5-cache/dev-python/immutables-0.19
 2210210840 metadata/md5-cache/dev-python/inflect-6.0.2
 2210210840 metadata/md5-cache/dev-python/ipykernel-6.16.1
 2210221810 metadata/md5-cache/dev-python/jaraco-collections-3.5.2
@@ -42667,19 +42554,14 @@
 2210211110 metadata/md5-cache/dev-python/jupyterlab_server-2.16.1
 2210232210 metadata/md5-cache/dev-python/kombu-5.3.0_beta2
 2210211740 metadata/md5-cache/dev-python/lesscpy-0.15.1
-2210231110 metadata/md5-cache/dev-python/linkify-it-py-2.0.0
 2210231840 metadata/md5-cache/dev-python/lit-13.0.1
 2210231840 metadata/md5-cache/dev-python/lit-14.0.6
-2210231840 metadata/md5-cache/dev-python/lit-15.0.3
-2210231840 metadata/md5-cache/dev-python/lit-15.0.3.9999
 2210231840 metadata/md5-cache/dev-python/lit-16.0.0.9999
 2210231840 metadata/md5-cache/dev-python/lit-16.0.0_pre20221016
 2210231840 metadata/md5-cache/dev-python/lit-16.0.0_pre20221023
 2210222010 metadata/md5-cache/dev-python/loky-3.3.0
-2210231110 metadata/md5-cache/dev-python/markdown-it-py-2.1.0-r2
 2210210840 metadata/md5-cache/dev-python/markdown2-2.4.6
 2210220940 metadata/md5-cache/dev-python/mediafile-0.10.0
-2210241010 metadata/md5-cache/dev-python/meson-python-0.10.0
 2210221910 metadata/md5-cache/dev-python/minidb-2.0.7
 2210220940 metadata/md5-cache/dev-python/miniupnpc-2.2.4
 2210221410 metadata/md5-cache/dev-python/mkdocs-material-8.5.7
@@ -42706,12 +42588,10 @@
 2210240910 metadata/md5-cache/dev-python/pyicu-2.10
 2210221910 metadata/md5-cache/dev-python/pyjwt-2.5.0
 2210210840 metadata/md5-cache/dev-python/pyjwt-2.6.0
-2210221910 metadata/md5-cache/dev-python/pykerberos-1.3.1-r1
 2210221810 metadata/md5-cache/dev-python/pylibmc-1.6.3
 2210221910 metadata/md5-cache/dev-python/pylint-2.15.4
 2210220940 metadata/md5-cache/dev-python/pylint-2.15.5
 2210230810 metadata/md5-cache/dev-python/pymdown-extensions-9.7
-2210241010 metadata/md5-cache/dev-python/pyproject-metadata-0.6.1
 2210211740 metadata/md5-cache/dev-python/pytest-asyncio-0.20.1
 2210210840 metadata/md5-cache/dev-python/pytest-httpx-0.21.1
 2210221910 metadata/md5-cache/dev-python/pytest-regressions-2.4.1
@@ -42721,22 +42601,18 @@
 2210230810 metadata/md5-cache/dev-python/python-daemon-2.3.2
 2210221910 metadata/md5-cache/dev-python/python-email-validator-1.3.0
 2210211740 metadata/md5-cache/dev-python/python-engineio-4.3.4
-2210231110 metadata/md5-cache/dev-python/python-ldap-3.4.3
 2210231510 metadata/md5-cache/dev-python/python-pam-2.0.2-r2
 2210201410 metadata/md5-cache/dev-python/qtawesome-1.2.0
 2210221910 metadata/md5-cache/dev-python/readthedocs-sphinx-ext-2.1.9
-2210231110 metadata/md5-cache/dev-python/regex-2022.9.13
 2210221810 metadata/md5-cache/dev-python/repoze-lru-0.7-r3
 2210230910 metadata/md5-cache/dev-python/requests-2.28.1-r1
 2210220940 metadata/md5-cache/dev-python/rope-1.4.0
 2210221810 metadata/md5-cache/dev-python/routes-2.5.1-r2
 2210211840 metadata/md5-cache/dev-python/ruamel-yaml-clib-0.2.7
-2210241010 metadata/md5-cache/dev-python/scipy-1.9.2
 2210211110 metadata/md5-cache/dev-python/scipy-1.9.3
 2210211810 metadata/md5-cache/dev-python/sentry-sdk-1.10.1
 2210211740 metadata/md5-cache/dev-python/sentry-sdk-1.9.10
 2210211740 metadata/md5-cache/dev-python/sentry-sdk-1.9.9
-2210222010 metadata/md5-cache/dev-python/setuptools-rust-1.5.2
 2210191510 metadata/md5-cache/dev-python/shiboken2-5.15.5
 2210240910 metadata/md5-cache/dev-python/shiboken2-5.15.6
 2210191510 metadata/md5-cache/dev-python/shiboken6-6.3.2
@@ -42750,17 +42626,118 @@
 2210221910 metadata/md5-cache/dev-python/termcolor-2.0.1
 2210221910 metadata/md5-cache/dev-python/traitlets-5.5.0
 2210221910 metadata/md5-cache/dev-python/translate-toolkit-3.7.3
-2210231110 metadata/md5-cache/dev-python/uc-micro-py-1.0.1
 2210211110 metadata/md5-cache/dev-python/uvicorn-0.19.0
-2210231110 metadata/md5-cache/dev-python/uvloop-0.17.0
 2210211110 metadata/md5-cache/dev-python/watchfiles-0.18.0
 2210241040 metadata/md5-cache/dev-python/wcmatch-8.4.1
 2210210840 metadata/md5-cache/dev-python/wheel-0.38.0
 2210221810 metadata/md5-cache/dev-python/zc-lockfile-2.0-r1
 2210210840 metadata/md5-cache/dev-python/zeroconf-0.39.2
 2210240910 metadata/md5-cache/dev-python/zipp-3.10.0
-2210221910 metadata/md5-cache/dev-python/zope-hookable-5.2
 2210221910 metadata/md5-cache/dev-python/zope-schema-6.2.1
+2210260710 metadata/md5-cache/dev-python/Manifest.gz
+2210251310 metadata/md5-cache/dev-python/aiohttp-3.8.3
+2210251310 metadata/md5-cache/dev-python/aws-sam-translator-1.53.0
+2210251140 metadata/md5-cache/dev-python/boto3-1.25.0
+2210252340 metadata/md5-cache/dev-python/boto3-1.25.1
+2210251140 metadata/md5-cache/dev-python/botocore-1.28.0
+2210252340 metadata/md5-cache/dev-python/botocore-1.28.1
+2210251440 metadata/md5-cache/dev-python/brotlicffi-1.0.9.2-r2
+2210242240 metadata/md5-cache/dev-python/brython-3.11
+2210251240 metadata/md5-cache/dev-python/canonicaljson-1.6.3
+2210251610 metadata/md5-cache/dev-python/cfn-lint-0.67.0
+2210252340 metadata/md5-cache/dev-python/cfn-lint-0.69.0
+2210260610 metadata/md5-cache/dev-python/cfn-lint-0.69.1
+2210241640 metadata/md5-cache/dev-python/clang-python-15.0.4.9999
+2210251140 metadata/md5-cache/dev-python/colorama-0.4.6
+2210251310 metadata/md5-cache/dev-python/cssselect2-0.7.0
+2210251610 metadata/md5-cache/dev-python/dask-2022.9.2
+2210252340 metadata/md5-cache/dev-python/deepmerge-1.1.0
+2210252340 metadata/md5-cache/dev-python/fakeredis-1.10.0
+2210251310 metadata/md5-cache/dev-python/flask-compress-1.13
+2210251140 metadata/md5-cache/dev-python/flask-htmlmin-2.2.1
+2210251610 metadata/md5-cache/dev-python/fonttools-4.37.4
+2210251410 metadata/md5-cache/dev-python/google-auth-2.12.0
+2210251140 metadata/md5-cache/dev-python/google-auth-oauthlib-0.6.0
+2210260610 metadata/md5-cache/dev-python/google-auth-oauthlib-0.7.0
+2210252340 metadata/md5-cache/dev-python/gssapi-1.8.2
+2210252340 metadata/md5-cache/dev-python/hcloud-python-1.18.1
+2210251210 metadata/md5-cache/dev-python/humanize-4.4.0
+2210251140 metadata/md5-cache/dev-python/hypothesis-6.56.2
+2210251140 metadata/md5-cache/dev-python/hypothesis-6.56.3
+2210251140 metadata/md5-cache/dev-python/identify-2.5.7
+2210251410 metadata/md5-cache/dev-python/immutables-0.19
+2210260710 metadata/md5-cache/dev-python/ipykernel-6.16.2
+2210242240 metadata/md5-cache/dev-python/jc-1.22.1
+2210260710 metadata/md5-cache/dev-python/jupyter_client-7.4.4
+2210242240 metadata/md5-cache/dev-python/jupyterlab-3.5.0
+2210251440 metadata/md5-cache/dev-python/jwcrypto-1.4.2
+2210260710 metadata/md5-cache/dev-python/k5test-0.10.1-r2
+2210251610 metadata/md5-cache/dev-python/kgb-7.1.1
+2210260710 metadata/md5-cache/dev-python/krb5-0.4.1
+2210251610 metadata/md5-cache/dev-python/linkify-it-py-2.0.0
+2210251340 metadata/md5-cache/dev-python/lit-15.0.3
+2210241640 metadata/md5-cache/dev-python/lit-15.0.4.9999
+2210242240 metadata/md5-cache/dev-python/mako-1.2.3
+2210251610 metadata/md5-cache/dev-python/markdown-it-py-2.1.0-r2
+2210251110 metadata/md5-cache/dev-python/matplotlib-3.5.3
+2210260640 metadata/md5-cache/dev-python/mediafile-0.10.1
+2210251140 metadata/md5-cache/dev-python/meson-python-0.10.0
+2210251610 metadata/md5-cache/dev-python/mkdocs-material-8.5.2
+2210252340 metadata/md5-cache/dev-python/mkdocs-minify-plugin-0.6.1
+2210251410 metadata/md5-cache/dev-python/mkdocs-redirects-1.2.0
+2210251110 metadata/md5-cache/dev-python/numpy-1.22.4
+2210251110 metadata/md5-cache/dev-python/numpy-1.23.3
+2210251110 metadata/md5-cache/dev-python/pandas-1.5.0
+2210251440 metadata/md5-cache/dev-python/pandas-1.5.0-r1
+2210251240 metadata/md5-cache/dev-python/peewee-3.15.3
+2210251140 metadata/md5-cache/dev-python/priority-1.3.0-r1
+2210260110 metadata/md5-cache/dev-python/protobuf-python-3.19.6
+2210260110 metadata/md5-cache/dev-python/protobuf-python-3.20.3
+2210260210 metadata/md5-cache/dev-python/protobuf-python-4.21.8
+2210260110 metadata/md5-cache/dev-python/protobuf-python-9999
+2210260640 metadata/md5-cache/dev-python/py-cpuinfo-9.0.0
+2210252210 metadata/md5-cache/dev-python/pycups-2.0.1-r1
+2210251610 metadata/md5-cache/dev-python/pydiffx-1.0.1-r1
+2210242240 metadata/md5-cache/dev-python/pyicu-2.10.1
+2210260710 metadata/md5-cache/dev-python/pyicu-2.10.2
+2210251610 metadata/md5-cache/dev-python/pykerberos-1.3.1-r1
+2210252340 metadata/md5-cache/dev-python/pylast-5.1.0
+2210252340 metadata/md5-cache/dev-python/pyproj-3.4.0
+2210251140 metadata/md5-cache/dev-python/pyproject-metadata-0.6.1
+2210260640 metadata/md5-cache/dev-python/pyspnego-0.6.1
+2210250840 metadata/md5-cache/dev-python/pytest-env-0.8.1
+2210251310 metadata/md5-cache/dev-python/pytest-httpserver-1.0.6
+2210260610 metadata/md5-cache/dev-python/pytest-metadata-2.0.3
+2210260710 metadata/md5-cache/dev-python/pytest-qt-4.2.0
+2210252340 metadata/md5-cache/dev-python/pytest-xdist-3.0.2
+2210242240 metadata/md5-cache/dev-python/python-cstruct-3.3
+2210250010 metadata/md5-cache/dev-python/python-docs-3.11.0
+2210251610 metadata/md5-cache/dev-python/python-ldap-3.4.3
+2210251410 metadata/md5-cache/dev-python/python-nbxmpp-3.2.4
+2210251040 metadata/md5-cache/dev-python/python-xlib-0.31-r1
+2210251210 metadata/md5-cache/dev-python/pytoolconfig-1.2.2-r1
+2210251140 metadata/md5-cache/dev-python/qtawesome-1.2.1
+2210251140 metadata/md5-cache/dev-python/rapidfuzz-2.12.0
+2210260710 metadata/md5-cache/dev-python/readthedocs-sphinx-ext-2.2.0
+2210252110 metadata/md5-cache/dev-python/regex-2022.9.13
+2210251140 metadata/md5-cache/dev-python/requests-toolbelt-0.10.1
+2210251140 metadata/md5-cache/dev-python/scipy-1.9.2
+2210251310 metadata/md5-cache/dev-python/setuptools-rust-1.5.2
+2210251310 metadata/md5-cache/dev-python/spur-0.3.22-r1
+2210242310 metadata/md5-cache/dev-python/stestr-4.0.1
+2210251310 metadata/md5-cache/dev-python/tenacity-8.1.0
+2210260710 metadata/md5-cache/dev-python/terminado-0.17.0
+2210251410 metadata/md5-cache/dev-python/textdistance-4.5.0
+2210260640 metadata/md5-cache/dev-python/tox-3.27.0
+2210260640 metadata/md5-cache/dev-python/trimesh-3.15.7
+2210251610 metadata/md5-cache/dev-python/uc-micro-py-1.0.1
+2210251440 metadata/md5-cache/dev-python/ujson-5.5.0
+2210251410 metadata/md5-cache/dev-python/uvloop-0.17.0
+2210260610 metadata/md5-cache/dev-python/versioningit-2.1.0
+2210260710 metadata/md5-cache/dev-python/virtualenv-20.16.6
+2210252040 metadata/md5-cache/dev-python/vpython-7.6.4
+2210260710 metadata/md5-cache/dev-python/websockets-10.4
+2210251410 metadata/md5-cache/dev-python/zope-hookable-5.2
 2210110022 metadata/md5-cache/dev-qt/linguist-tools-5.15.5
 2210110022 metadata/md5-cache/dev-qt/pixeltool-5.15.5
 2210110022 metadata/md5-cache/dev-qt/qdbus-5.15.5
@@ -42844,7 +42821,6 @@
 2210200941 metadata/md5-cache/dev-qt/qdbusviewer-5.15.5
 2210191510 metadata/md5-cache/dev-qt/qt-creator-6.0.0
 2210191510 metadata/md5-cache/dev-qt/qt-creator-9999
-2210110022 metadata/md5-cache/dev-ros/Manifest.gz
 2210110022 metadata/md5-cache/dev-ros/actionlib-1.13.2-r1
 2210110022 metadata/md5-cache/dev-ros/actionlib-9999
 2210110022 metadata/md5-cache/dev-ros/actionlib_msgs-1.13.0
@@ -43137,13 +43113,11 @@
 2210110022 metadata/md5-cache/dev-ros/gazebo_ros_control-2.9.1-r1
 2210110022 metadata/md5-cache/dev-ros/gazebo_ros_control-2.9.2-r1
 2210110022 metadata/md5-cache/dev-ros/gazebo_ros_control-9999
-2210110022 metadata/md5-cache/dev-ros/gencpp-0.6.5
 2210110022 metadata/md5-cache/dev-ros/gencpp-9999
 2210110022 metadata/md5-cache/dev-ros/geneus-3.0.0-r1
 2210110022 metadata/md5-cache/dev-ros/geneus-9999
 2210110022 metadata/md5-cache/dev-ros/genlisp-0.4.18
 2210110022 metadata/md5-cache/dev-ros/genlisp-9999
-2210110022 metadata/md5-cache/dev-ros/genmsg-0.5.16
 2210110022 metadata/md5-cache/dev-ros/genmsg-9999
 2210110022 metadata/md5-cache/dev-ros/gennodejs-2.0.1
 2210110022 metadata/md5-cache/dev-ros/gennodejs-9999
@@ -44043,6 +44017,20 @@
 2210110022 metadata/md5-cache/dev-ros/xmlrpcpp-1.15.8-r1
 2210110022 metadata/md5-cache/dev-ros/xmlrpcpp-1.15.9-r1
 2210110022 metadata/md5-cache/dev-ros/xmlrpcpp-9999
+2210251440 metadata/md5-cache/dev-ros/Manifest.gz
+2210251440 metadata/md5-cache/dev-ros/gencpp-0.7.0
+2210251440 metadata/md5-cache/dev-ros/genmsg-0.6.0
+2210251440 metadata/md5-cache/dev-ros/test_tf2-0.7.6
+2210251440 metadata/md5-cache/dev-ros/tf2-0.7.6
+2210251440 metadata/md5-cache/dev-ros/tf2_bullet-0.7.6
+2210251440 metadata/md5-cache/dev-ros/tf2_eigen-0.7.6
+2210251440 metadata/md5-cache/dev-ros/tf2_geometry_msgs-0.7.6
+2210251440 metadata/md5-cache/dev-ros/tf2_kdl-0.7.6
+2210251440 metadata/md5-cache/dev-ros/tf2_msgs-0.7.6
+2210251440 metadata/md5-cache/dev-ros/tf2_py-0.7.6
+2210251440 metadata/md5-cache/dev-ros/tf2_ros-0.7.6
+2210251440 metadata/md5-cache/dev-ros/tf2_sensor_msgs-0.7.6
+2210251440 metadata/md5-cache/dev-ros/tf2_tools-0.7.6
 2210110022 metadata/md5-cache/dev-ruby/GeoRuby-2.5.2-r1
 2210110022 metadata/md5-cache/dev-ruby/abstract-1.0.0-r4
 2210110022 metadata/md5-cache/dev-ruby/abstract-1.0.0-r5
@@ -45514,8 +45502,6 @@
 1705260009 metadata/md5-cache/dev-util/open-vcdiff-0.8.4-r1
 2008131309 metadata/md5-cache/dev-util/pkgdiff-1.7.2
 1911102139 metadata/md5-cache/dev-util/rej-0.16-r1
-2004060109 metadata/md5-cache/dev-util/sgb-20030623-r1
-2004060109 metadata/md5-cache/dev-util/sgb-20090810
 1812181639 metadata/md5-cache/dev-util/shc-3.9.6
 2007092039 metadata/md5-cache/dev-util/shellcheck-bin-0.7.1
 2104202139 metadata/md5-cache/dev-util/shellcheck-bin-0.7.2
@@ -45885,8 +45871,6 @@
 2210110022 metadata/md5-cache/dev-util/kcov-9999
 2210111610 metadata/md5-cache/dev-util/kdbg-3.0.1-r1
 2210111610 metadata/md5-cache/dev-util/kdevelop-22.04.3
-2210111610 metadata/md5-cache/dev-util/kdevelop-pg-qt-2.2.1
-2210111610 metadata/md5-cache/dev-util/kdevelop-pg-qt-2.2.1_p20220904
 2210111610 metadata/md5-cache/dev-util/kdevelop-php-22.04.3
 2210111610 metadata/md5-cache/dev-util/kdevelop-python-22.04.3
 2210110022 metadata/md5-cache/dev-util/kdstatemachineeditor-1.2.8
@@ -45921,8 +45905,6 @@
 2210110022 metadata/md5-cache/dev-util/mdds-9999
 2210110022 metadata/md5-cache/dev-util/meld-3.20.4
 2210110022 metadata/md5-cache/dev-util/meson-0.62.2
-2210110022 metadata/md5-cache/dev-util/meson-0.63.0
-2210110022 metadata/md5-cache/dev-util/meson-0.63.1
 2210110022 metadata/md5-cache/dev-util/meson-9999
 2210110022 metadata/md5-cache/dev-util/meson-format-array-0
 2210110022 metadata/md5-cache/dev-util/min-cscope-16.1.0-r2
@@ -45977,7 +45959,6 @@
 2210110022 metadata/md5-cache/dev-util/ragel-7.0.4-r2
 2210110022 metadata/md5-cache/dev-util/rbtools-2.0.1
 2210110022 metadata/md5-cache/dev-util/rbtools-3.1
-2210110022 metadata/md5-cache/dev-util/rbtools-3.1.1
 2210110022 metadata/md5-cache/dev-util/rbtools-3.1.2
 2210110022 metadata/md5-cache/dev-util/re2c-2.1.1-r1
 2210110022 metadata/md5-cache/dev-util/re2c-2.2
@@ -46124,7 +46105,6 @@
 2210140310 metadata/md5-cache/dev-util/cproto-4.7t-r1
 2210131940 metadata/md5-cache/dev-util/d-spy-1.4.0
 2210132310 metadata/md5-cache/dev-util/geany-plugins-1.38-r1
-2210132310 metadata/md5-cache/dev-util/geany-plugins-1.38-r2
 2210122310 metadata/md5-cache/dev-util/gpp-2.27
 2210132310 metadata/md5-cache/dev-util/hermes-2.8_p20180315
 2210132310 metadata/md5-cache/dev-util/hermes-2.9
@@ -46187,10 +46167,8 @@
 2210180140 metadata/md5-cache/dev-util/scap-driver-0.29.3
 2210180140 metadata/md5-cache/dev-util/sysdig-kmod-0.27.1
 2210182240 metadata/md5-cache/dev-util/ccache-4.7
-2210191340 metadata/md5-cache/dev-util/dbus-test-runner-19.04.0-r2
 2210191340 metadata/md5-cache/dev-util/glade-3.40.0
 2210190310 metadata/md5-cache/dev-util/tinlink-1.0.0-r2
-2210241040 metadata/md5-cache/dev-util/Manifest.gz
 2210241040 metadata/md5-cache/dev-util/ROPgadget-7.1
 2210191510 metadata/md5-cache/dev-util/Tensile-5.1.3
 2210200941 metadata/md5-cache/dev-util/ald-0.1.7-r2
@@ -46257,7 +46235,6 @@
 2210231840 metadata/md5-cache/dev-util/lldb-13.0.1
 2210231840 metadata/md5-cache/dev-util/lldb-14.0.6
 2210231840 metadata/md5-cache/dev-util/lldb-15.0.3
-2210231840 metadata/md5-cache/dev-util/lldb-15.0.3.9999
 2210231840 metadata/md5-cache/dev-util/lldb-16.0.0.9999
 2210231840 metadata/md5-cache/dev-util/lldb-16.0.0_pre20221016
 2210231840 metadata/md5-cache/dev-util/lldb-16.0.0_pre20221023
@@ -46266,14 +46243,12 @@
 2210220210 metadata/md5-cache/dev-util/mage-1.11.0
 2210220210 metadata/md5-cache/dev-util/mage-1.13.0
 2210221140 metadata/md5-cache/dev-util/maturin-0.13.6
-2210222010 metadata/md5-cache/dev-util/meson-0.63.2-r1
 2210231040 metadata/md5-cache/dev-util/mingw64-runtime-10.0.0-r1
 2210231040 metadata/md5-cache/dev-util/mingw64-runtime-8.0.0-r3
 2210231040 metadata/md5-cache/dev-util/mingw64-runtime-9.0.0-r2
 2210231040 metadata/md5-cache/dev-util/mingw64-toolchain-10.0.0_p1-r1
 2210232310 metadata/md5-cache/dev-util/nvidia-cuda-toolkit-11.8.0-r1
 2210220210 metadata/md5-cache/dev-util/packer-1.7.10
-2210241010 metadata/md5-cache/dev-util/patchelf-0.15.0
 2210191510 metadata/md5-cache/dev-util/perf-5.15-r1
 2210191510 metadata/md5-cache/dev-util/perf-5.17.1
 2210191510 metadata/md5-cache/dev-util/perf-5.18
@@ -46289,7 +46264,6 @@
 2210200941 metadata/md5-cache/dev-util/pycharm-professional-2022.1-r1
 2210200941 metadata/md5-cache/dev-util/qdevicemonitor-1.0.1-r2
 2210200941 metadata/md5-cache/dev-util/qdevicemonitor-9999
-2210200941 metadata/md5-cache/dev-util/seer-1.10
 2210200941 metadata/md5-cache/dev-util/seer-1.11
 2210200941 metadata/md5-cache/dev-util/seer-9999
 2210220210 metadata/md5-cache/dev-util/sh-3.5.1
@@ -46305,7 +46279,6 @@
 2210220210 metadata/md5-cache/dev-util/src-cli-3.43.0
 2210220210 metadata/md5-cache/dev-util/src-cli-4.0.0
 2210220210 metadata/md5-cache/dev-util/stripe-mock-0.141.0
-2210210040 metadata/md5-cache/dev-util/tree-sitter-cli-0.20.7
 2210200941 metadata/md5-cache/dev-util/visual-regexp-3.0-r1
 2210200941 metadata/md5-cache/dev-util/visual-regexp-3.1
 2210200941 metadata/md5-cache/dev-util/visualvm-2.1.2
@@ -46316,6 +46289,24 @@
 2210220210 metadata/md5-cache/dev-util/woke-0.18.1
 2210220210 metadata/md5-cache/dev-util/woke-0.18.2
 2210220210 metadata/md5-cache/dev-util/woke-0.19.0
+2210252210 metadata/md5-cache/dev-util/Manifest.gz
+2210241540 metadata/md5-cache/dev-util/ccache-4.7.1
+2210252210 metadata/md5-cache/dev-util/clazy-1.11-r2
+2210252210 metadata/md5-cache/dev-util/dbus-test-runner-19.04.0-r2
+2210251840 metadata/md5-cache/dev-util/gdbus-codegen-2.74.1
+2210251610 metadata/md5-cache/dev-util/geany-plugins-1.38-r2
+2210251840 metadata/md5-cache/dev-util/glib-utils-2.74.1
+2210252210 metadata/md5-cache/dev-util/kdevelop-pg-qt-2.2.1_p20220904
+2210241640 metadata/md5-cache/dev-util/lldb-15.0.4.9999
+2210251140 metadata/md5-cache/dev-util/meson-0.63.2-r1
+2210251140 metadata/md5-cache/dev-util/meson-0.63.3
+2210251140 metadata/md5-cache/dev-util/patchelf-0.15.0
+2210251610 metadata/md5-cache/dev-util/rbtools-3.1.1
+2210250910 metadata/md5-cache/dev-util/rbtools-4.0
+2210250910 metadata/md5-cache/dev-util/seer-1.12
+2210242240 metadata/md5-cache/dev-util/sgb-20030623-r1
+2210242240 metadata/md5-cache/dev-util/sgb-20090810-r1
+2210251440 metadata/md5-cache/dev-util/tree-sitter-cli-0.20.7
 2101070210 metadata/md5-cache/dev-vcs/colorsvn-0.3.3
 1902111809 metadata/md5-cache/dev-vcs/cvs2cl-2.71-r1
 2103230739 metadata/md5-cache/dev-vcs/cvsutils-0.2.6
@@ -46565,7 +46556,6 @@
 2210110022 metadata/md5-cache/games-arcade/xjump-2.7.5-r2
 2210132310 metadata/md5-cache/games-arcade/epiar-0.5.1-r1
 2210131240 metadata/md5-cache/games-arcade/stardork-0.7-r2
-2210240210 metadata/md5-cache/games-arcade/Manifest.gz
 2210200941 metadata/md5-cache/games-arcade/abe-1.1-r1
 2210200941 metadata/md5-cache/games-arcade/amphetamine-0.8.10-r1
 2210200941 metadata/md5-cache/games-arcade/apricots-0.2.7
@@ -46657,6 +46647,8 @@
 2210200941 metadata/md5-cache/games-arcade/xsfcave-0.5-r1
 2210200941 metadata/md5-cache/games-arcade/xtux-20030306-r1
 2210200941 metadata/md5-cache/games-arcade/yarsrevenge-0.99-r1
+2210241610 metadata/md5-cache/games-arcade/Manifest.gz
+2210241610 metadata/md5-cache/games-arcade/amphetamine-0.8.10-r2
 2104190739 metadata/md5-cache/games-board/gnuchess-book-1.02-r1
 2104041039 metadata/md5-cache/games-board/grhino-0.16.1-r2
 2003311339 metadata/md5-cache/games-board/polyglot-1.4.70b-r3
@@ -46880,7 +46872,6 @@
 2210110022 metadata/md5-cache/games-fps/rott-1.1.2-r1
 2210110022 metadata/md5-cache/games-fps/tenebrae-1.04-r1
 2210110022 metadata/md5-cache/games-fps/ut2003-bonuspack-cm-1-r1
-2210200941 metadata/md5-cache/games-fps/Manifest.gz
 2210200941 metadata/md5-cache/games-fps/alephone-durandal-20220115
 2210200941 metadata/md5-cache/games-fps/alephone-infinity-20220115
 2210200941 metadata/md5-cache/games-fps/alephone-marathon-20220115
@@ -46896,7 +46887,6 @@
 2210200941 metadata/md5-cache/games-fps/nexuiz-2.5.2-r1
 2210200941 metadata/md5-cache/games-fps/prboom-plus-2.6.2
 2210200941 metadata/md5-cache/games-fps/quake2-icculus-0.16.1-r2
-2210200941 metadata/md5-cache/games-fps/qudos-0.40.1
 2210200941 metadata/md5-cache/games-fps/redeclipse-2.0.0-r1
 2210200941 metadata/md5-cache/games-fps/sauerbraten-2020.12.27
 2210200941 metadata/md5-cache/games-fps/serious-sam-tse-1_beta1-r1
@@ -46915,6 +46905,8 @@
 2210200941 metadata/md5-cache/games-fps/xonotic-0.8.5
 2210200941 metadata/md5-cache/games-fps/yamagi-quake2-8.01
 2210200941 metadata/md5-cache/games-fps/yamagi-quake2-8.10
+2210251440 metadata/md5-cache/games-fps/Manifest.gz
+2210251440 metadata/md5-cache/games-fps/qudos-0.40.1-r1
 2210111610 metadata/md5-cache/games-kids/gcompris-1.0
 2210110022 metadata/md5-cache/games-kids/gmult-10.0
 2210200941 metadata/md5-cache/games-kids/Manifest.gz
@@ -47360,7 +47352,6 @@
 2210180140 metadata/md5-cache/games-util/xpadneo-9999
 2210191210 metadata/md5-cache/games-util/lutris-0.5.12_beta1
 2210191210 metadata/md5-cache/games-util/lutris-9999
-2210200941 metadata/md5-cache/games-util/Manifest.gz
 2210200941 metadata/md5-cache/games-util/eureka-1.27b
 2210200941 metadata/md5-cache/games-util/gamepick-0.35-r1
 2210200941 metadata/md5-cache/games-util/glbsp-2.24
@@ -47368,6 +47359,8 @@
 2210200941 metadata/md5-cache/games-util/pyfa-2.43.0
 2210200941 metadata/md5-cache/games-util/pyfa-9999
 2210200941 metadata/md5-cache/games-util/qjoypad-4.3.1
+2210250110 metadata/md5-cache/games-util/Manifest.gz
+2210250110 metadata/md5-cache/games-util/antimicrox-3.3.1
 2108271840 metadata/md5-cache/gnome-base/gnome-light-40.0
 2203131809 metadata/md5-cache/gnome-base/gnome-core-apps-41.3
 2203130309 metadata/md5-cache/gnome-base/gnome-core-libs-41.3
@@ -47526,7 +47519,6 @@
 2210152041 metadata/md5-cache/gnome-extra/gnome-user-share-43.0
 2210172110 metadata/md5-cache/gnome-extra/gnome-shell-frippery-43.0
 2210182140 metadata/md5-cache/gnome-extra/gnome-calendar-43.1
-2210231940 metadata/md5-cache/gnome-extra/Manifest.gz
 2210200941 metadata/md5-cache/gnome-extra/gconf-editor-3.0.1-r1
 2210200941 metadata/md5-cache/gnome-extra/gnome-directory-thumbnailer-0.1.11
 2210231940 metadata/md5-cache/gnome-extra/gnome-firmware-43.0
@@ -47534,6 +47526,11 @@
 2210200941 metadata/md5-cache/gnome-extra/libgda-5.2.9
 2210200941 metadata/md5-cache/gnome-extra/mousetweaks-3.32.0
 2210200941 metadata/md5-cache/gnome-extra/seahorse-nautilus-3.11.92-r1
+2210251840 metadata/md5-cache/gnome-extra/Manifest.gz
+2210251840 metadata/md5-cache/gnome-extra/evolution-data-server-3.46.1
+2210251840 metadata/md5-cache/gnome-extra/evolution-ews-3.46.1
+2210251840 metadata/md5-cache/gnome-extra/gnome-software-43.1
+2210251840 metadata/md5-cache/gnome-extra/gucharmap-15.0.1
 2210110022 metadata/md5-cache/gnustep-apps/aclock-0.4.0-r1
 2210110022 metadata/md5-cache/gnustep-apps/addresses-0.4.8-r1
 2210110022 metadata/md5-cache/gnustep-apps/batmon-0.8-r1
@@ -47706,8 +47703,11 @@
 2210110022 metadata/md5-cache/gui-libs/xdg-desktop-portal-wlr-9999
 2210140710 metadata/md5-cache/gui-libs/gtk-4.8.1-r1
 2210130340 metadata/md5-cache/gui-libs/libpanel-1.0.1
-2210212310 metadata/md5-cache/gui-libs/Manifest.gz
 2210212310 metadata/md5-cache/gui-libs/greetd-0.8.0
+2210252340 metadata/md5-cache/gui-libs/Manifest.gz
+2210252340 metadata/md5-cache/gui-libs/gtk-4.8.2
+2210251840 metadata/md5-cache/gui-libs/vte-0.70.1
+2210251840 metadata/md5-cache/gui-libs/vte-common-0.70.1
 2210110022 metadata/md5-cache/gui-wm/Manifest.gz
 2210110022 metadata/md5-cache/gui-wm/gamescope-3.11.47
 2210110022 metadata/md5-cache/gui-wm/hikari-2.3.3
@@ -48341,8 +48341,6 @@
 2210111610 metadata/md5-cache/kde-misc/kdeconnect-22.04.3
 2210111610 metadata/md5-cache/kde-misc/kdiff3-1.9.6
 2210111610 metadata/md5-cache/kde-misc/kdirstat-3.4.2
-2210111610 metadata/md5-cache/kde-misc/kio-fuse-5.0.1
-2210111610 metadata/md5-cache/kde-misc/kio-fuse-5.0.1_p20220906
 2210111610 metadata/md5-cache/kde-misc/kio-gdrive-22.04.3-r1
 2210111610 metadata/md5-cache/kde-misc/kio-gopher-0.1.99-r1
 2210111610 metadata/md5-cache/kde-misc/kio-locate-0.5.3-r3
@@ -48368,7 +48366,8 @@
 2210131640 metadata/md5-cache/kde-misc/markdownpart-22.08.2
 2210131640 metadata/md5-cache/kde-misc/skanlite-22.08.2
 2210131640 metadata/md5-cache/kde-misc/zanshin-22.08.2
-2210232340 metadata/md5-cache/kde-misc/Manifest.gz
+2210252210 metadata/md5-cache/kde-misc/Manifest.gz
+2210252210 metadata/md5-cache/kde-misc/kio-fuse-5.0.1_p20220906
 2209300710 metadata/md5-cache/kde-plasma/breeze-grub-5.25.5
 2209300710 metadata/md5-cache/kde-plasma/plasma-meta-5.25.5
 2210111610 metadata/md5-cache/kde-plasma/bluedevil-5.25.5
@@ -48583,7 +48582,6 @@
 2210110022 metadata/md5-cache/mail-client/neomutt-99999999
 2210110022 metadata/md5-cache/mail-client/s-nail-14.9.22
 2210110022 metadata/md5-cache/mail-client/s-nail-14.9.24
-2210220210 metadata/md5-cache/mail-client/Manifest.gz
 2210220210 metadata/md5-cache/mail-client/aerc-0.11.0
 2210220210 metadata/md5-cache/mail-client/aerc-0.12.0
 2210220210 metadata/md5-cache/mail-client/aerc-0.12.0-r1
@@ -48595,14 +48593,11 @@
 2210210110 metadata/md5-cache/mail-client/claws-mail-4.1.1
 2210210110 metadata/md5-cache/mail-client/claws-mail-9999
 2210200941 metadata/md5-cache/mail-client/sylpheed-3.7.0-r5
-2210200941 metadata/md5-cache/mail-client/thunderbird-102.3.1
-2210200941 metadata/md5-cache/mail-client/thunderbird-102.3.2
-2210200941 metadata/md5-cache/mail-client/thunderbird-102.3.3
-2210201510 metadata/md5-cache/mail-client/thunderbird-102.4.0
-2210200941 metadata/md5-cache/mail-client/thunderbird-91.13.1
 2210201410 metadata/md5-cache/mail-client/thunderbird-bin-102.4.0
+2210251840 metadata/md5-cache/mail-client/Manifest.gz
+2210251840 metadata/md5-cache/mail-client/evolution-3.46.1
+2210251740 metadata/md5-cache/mail-client/thunderbird-102.4.0
 2111071239 metadata/md5-cache/mail-filter/dkimproxy-1.4.1
-2107120039 metadata/md5-cache/mail-filter/mimedefang-2.84-r1
 2101070439 metadata/md5-cache/mail-filter/sieve-connect-0.90
 2106132109 metadata/md5-cache/mail-filter/spamprobe-1.4d-r2
 2104212209 metadata/md5-cache/mail-filter/zdkimfilter-1.8
@@ -48679,10 +48674,11 @@
 2210152041 metadata/md5-cache/mail-filter/spamassassin-3.4.6-r1
 2210152041 metadata/md5-cache/mail-filter/spampd-2.61
 2210152041 metadata/md5-cache/mail-filter/sqlgrey-1.8.0
-2210200941 metadata/md5-cache/mail-filter/Manifest.gz
 2210200710 metadata/md5-cache/mail-filter/afew-3.0.1
 2210200941 metadata/md5-cache/mail-filter/couriersrs-0.1.2
 2210200941 metadata/md5-cache/mail-filter/procmail-3.22-r15
+2210250910 metadata/md5-cache/mail-filter/Manifest.gz
+2210250910 metadata/md5-cache/mail-filter/mimedefang-3.1
 2209211540 metadata/md5-cache/mail-mta/msmtp-1.8.22
 2210010840 metadata/md5-cache/mail-mta/qpsmtpd-0.95-r1
 2210010840 metadata/md5-cache/mail-mta/qpsmtpd-9999
@@ -48722,7 +48718,6 @@
 2210110022 metadata/md5-cache/mate-base/mate-panel-1.26.0-r1
 2210110022 metadata/md5-cache/mate-base/mate-session-manager-1.26.0
 2210110022 metadata/md5-cache/mate-base/mate-settings-daemon-1.26.0
-2210200941 metadata/md5-cache/mate-base/Manifest.gz
 2210200941 metadata/md5-cache/mate-base/caja-1.24.1-r1
 2210200941 metadata/md5-cache/mate-base/libmatekbd-1.24.1
 2210200941 metadata/md5-cache/mate-base/mate-applets-1.24.1
@@ -48732,6 +48727,8 @@
 2210200941 metadata/md5-cache/mate-base/mate-panel-1.24.2-r1
 2210200941 metadata/md5-cache/mate-base/mate-session-manager-1.24.3-r1
 2210200941 metadata/md5-cache/mate-base/mate-settings-daemon-1.24.2
+2210241710 metadata/md5-cache/mate-base/Manifest.gz
+2210241710 metadata/md5-cache/mate-base/mate-applets-1.26.0
 2210110022 metadata/md5-cache/mate-extra/caja-admin-0.0.4
 2210110022 metadata/md5-cache/mate-extra/caja-admin-9999
 2210110022 metadata/md5-cache/mate-extra/caja-extensions-1.26.0
@@ -48742,7 +48739,6 @@
 2210110022 metadata/md5-cache/mate-extra/mate-screensaver-1.26.1
 2210110022 metadata/md5-cache/mate-extra/mate-system-monitor-1.26.0
 2210110022 metadata/md5-cache/mate-extra/mate-user-guide-1.26.0
-2210200941 metadata/md5-cache/mate-extra/Manifest.gz
 2210200941 metadata/md5-cache/mate-extra/caja-dropbox-1.24.0-r1
 2210200941 metadata/md5-cache/mate-extra/caja-extensions-1.24.1
 2210200941 metadata/md5-cache/mate-extra/mate-calc-1.24.2
@@ -48757,6 +48753,10 @@
 2210200941 metadata/md5-cache/mate-extra/mate-user-guide-1.24.0-r2
 2210200941 metadata/md5-cache/mate-extra/mate-user-share-1.24.0-r1
 2210200941 metadata/md5-cache/mate-extra/mate-utils-1.24.0-r3
+2210241910 metadata/md5-cache/mate-extra/Manifest.gz
+2210241710 metadata/md5-cache/mate-extra/caja-actions-1.26.0
+2210241910 metadata/md5-cache/mate-extra/caja-dropbox-1.26.0-r1
+2210241710 metadata/md5-cache/mate-extra/mate-indicator-applet-1.26.0
 2205251140 metadata/md5-cache/media-fonts/konfont-0.1
 2205251140 metadata/md5-cache/media-fonts/lohit-fonts-2.20150220
 2205251140 metadata/md5-cache/media-fonts/solarize-0_pre20140818
@@ -49099,7 +49099,6 @@
 2210110022 metadata/md5-cache/media-gfx/eog-plugins-42.1
 2210110022 metadata/md5-cache/media-gfx/eog-plugins-42.2
 2210110022 metadata/md5-cache/media-gfx/ephoto-1.6.0
-2210110022 metadata/md5-cache/media-gfx/exiv2-0.27.5-r1
 2210110022 metadata/md5-cache/media-gfx/farbfeld-4
 2210110022 metadata/md5-cache/media-gfx/farbfeld-9999
 2210110022 metadata/md5-cache/media-gfx/fbgrab-1.3
@@ -49167,8 +49166,6 @@
 2210110022 metadata/md5-cache/media-gfx/jpegtoavi-1.5
 2210111610 metadata/md5-cache/media-gfx/kcoloredit-2.0.0_p20171121-r1
 2210111610 metadata/md5-cache/media-gfx/kgeotag-1.3.1
-2210111610 metadata/md5-cache/media-gfx/kgraphviewer-2.4.3-r1
-2210111610 metadata/md5-cache/media-gfx/kgraphviewer-2.4.3-r2
 2210111610 metadata/md5-cache/media-gfx/kuickshow-0.10.2
 2210111610 metadata/md5-cache/media-gfx/kxstitch-2.2.0
 2210110022 metadata/md5-cache/media-gfx/libimagequant-2.15.1
@@ -49211,8 +49208,6 @@
 2210110022 metadata/md5-cache/media-gfx/pencil-0.6.6-r1
 2210110022 metadata/md5-cache/media-gfx/peps-2.0-r1
 2210110022 metadata/md5-cache/media-gfx/photopc-3.07
-2210111610 metadata/md5-cache/media-gfx/photoqt-1.7.1-r1
-2210111610 metadata/md5-cache/media-gfx/photoqt-2.9.1
 2210110022 metadata/md5-cache/media-gfx/phototonic-2.1
 2210110022 metadata/md5-cache/media-gfx/png2ico-2002.12.08
 2210110022 metadata/md5-cache/media-gfx/pngcheck-3.0.2
@@ -49223,7 +49218,6 @@
 2210110022 metadata/md5-cache/media-gfx/pngrewrite-1.4.0
 2210110022 metadata/md5-cache/media-gfx/pngtoico-1.0.1-r1
 2210110022 metadata/md5-cache/media-gfx/pngtools-0.4-r2
-2210110022 metadata/md5-cache/media-gfx/pngtools-0.4_p20220314
 2210110022 metadata/md5-cache/media-gfx/potrace-1.16
 2210110022 metadata/md5-cache/media-gfx/pqiv-2.11
 2210110022 metadata/md5-cache/media-gfx/pqiv-9999
@@ -49235,7 +49229,6 @@
 2210110022 metadata/md5-cache/media-gfx/rawtherapee-5.8
 2210110022 metadata/md5-cache/media-gfx/rawtherapee-5.8-r1
 2210110022 metadata/md5-cache/media-gfx/renderdoc-1.21
-2210110022 metadata/md5-cache/media-gfx/renderdoc-1.22
 2210110022 metadata/md5-cache/media-gfx/sam2p-0.49.4_p20190718-r1
 2210110022 metadata/md5-cache/media-gfx/sane-airscan-0.99.27
 2210110022 metadata/md5-cache/media-gfx/scantailor-advanced-1.0.16-r1
@@ -49294,8 +49287,6 @@
 2210171840 metadata/md5-cache/media-gfx/mcomix-2.0.2-r1
 2210171840 metadata/md5-cache/media-gfx/mcomix-9999
 2210180240 metadata/md5-cache/media-gfx/mypaint-brushes-2.0.2-r1
-2210181810 metadata/md5-cache/media-gfx/geeqie-2.0.1-r1
-2210221810 metadata/md5-cache/media-gfx/Manifest.gz
 2210200941 metadata/md5-cache/media-gfx/cropgui-0.6-r1
 2210200941 metadata/md5-cache/media-gfx/cura-4.13.1-r1
 2210200941 metadata/md5-cache/media-gfx/engauge-10.6
@@ -49305,7 +49296,6 @@
 2210200941 metadata/md5-cache/media-gfx/fbida-2.14-r3
 2210200941 metadata/md5-cache/media-gfx/fbida-9999
 2210201410 metadata/md5-cache/media-gfx/geeqie-1.7.3
-2210191540 metadata/md5-cache/media-gfx/geeqie-9999
 2210200740 metadata/md5-cache/media-gfx/gimp-2.10.32-r1
 2210200740 metadata/md5-cache/media-gfx/gimp-2.99.10-r2
 2210200740 metadata/md5-cache/media-gfx/gimp-2.99.12-r1
@@ -49347,6 +49337,17 @@
 2210200941 metadata/md5-cache/media-gfx/xpaint-3.1.4-r2
 2210200941 metadata/md5-cache/media-gfx/xsane-0.999-r4
 2210200941 metadata/md5-cache/media-gfx/xv-3.10a-r20
+2210252210 metadata/md5-cache/media-gfx/Manifest.gz
+2210251840 metadata/md5-cache/media-gfx/eog-43.1
+2210241710 metadata/md5-cache/media-gfx/eom-1.26.0
+2210252210 metadata/md5-cache/media-gfx/exiv2-0.27.5-r1
+2210250040 metadata/md5-cache/media-gfx/geeqie-2.0.1-r1
+2210250040 metadata/md5-cache/media-gfx/geeqie-9999
+2210250010 metadata/md5-cache/media-gfx/graphviz-7.0.0
+2210252210 metadata/md5-cache/media-gfx/kgraphviewer-2.4.3-r2
+2210252110 metadata/md5-cache/media-gfx/photoqt-2.9.1
+2210252110 metadata/md5-cache/media-gfx/pngtools-0.4_p20220314
+2210251610 metadata/md5-cache/media-gfx/renderdoc-1.22
 1802221208 metadata/md5-cache/media-libs/blib-1.1.7-r2
 2012270139 metadata/md5-cache/media-libs/cimg-2.9.3
 2106251539 metadata/md5-cache/media-libs/elles_icc_profiles-20160501.0932-r1
@@ -49619,8 +49620,6 @@
 2210110022 metadata/md5-cache/media-libs/libjpeg-turbo-2.1.3
 2210110022 metadata/md5-cache/media-libs/libjpeg-turbo-2.1.4
 2210111240 metadata/md5-cache/media-libs/libjsw-1.5.8
-2210110022 metadata/md5-cache/media-libs/libjxl-0.7.0_pre20220329
-2210110022 metadata/md5-cache/media-libs/libjxl-9999
 2210110022 metadata/md5-cache/media-libs/libkate-0.4.1-r4
 2210110022 metadata/md5-cache/media-libs/libkeyfinder-2.2.7
 2210110022 metadata/md5-cache/media-libs/liblastfm-1.1.0_pre20190625
@@ -49687,7 +49686,6 @@
 2210110022 metadata/md5-cache/media-libs/libprojectm-3.1.12
 2210110022 metadata/md5-cache/media-libs/libprojectm-9999
 2210111610 metadata/md5-cache/media-libs/libqaccessibilityclient-0.4.1
-2210110022 metadata/md5-cache/media-libs/libquicktime-1.2.4-r3
 2210110022 metadata/md5-cache/media-libs/libraw-0.20.2
 2210110022 metadata/md5-cache/media-libs/libreplaygain-477-r2
 2210110022 metadata/md5-cache/media-libs/librosprite-0.1.3-r2
@@ -49741,7 +49739,6 @@
 2210110022 metadata/md5-cache/media-libs/lv2-1.18.8-r1
 2210110022 metadata/md5-cache/media-libs/lvtk-1.2.0-r2
 2210110022 metadata/md5-cache/media-libs/mesa-amber-21.3.9
-2210110022 metadata/md5-cache/media-libs/mlt-7.8.0
 2210110022 metadata/md5-cache/media-libs/munt-mt32emu-2.6.3
 2210110022 metadata/md5-cache/media-libs/musicbrainz-5.1.0
 2210110022 metadata/md5-cache/media-libs/mutagen-1.45.1
@@ -49764,7 +49761,6 @@
 2210110022 metadata/md5-cache/media-libs/openexr-3.1.5
 2210110022 metadata/md5-cache/media-libs/openglide-0.09_rc9_p20191120
 2210110022 metadata/md5-cache/media-libs/openh264-2.3.0
-2210110022 metadata/md5-cache/media-libs/openh264-2.3.1-r1
 2210110022 metadata/md5-cache/media-libs/openjpeg-2.5.0-r2
 2210110022 metadata/md5-cache/media-libs/opensubdiv-3.4.4-r3
 2210110022 metadata/md5-cache/media-libs/opus-1.3.1-r3
@@ -49894,7 +49890,6 @@
 2210160610 metadata/md5-cache/media-libs/intel-mediasdk-9999
 2210152041 metadata/md5-cache/media-libs/libcanberra-0.30-r6
 2210152041 metadata/md5-cache/media-libs/libcanberra-0.30-r7
-2210171010 metadata/md5-cache/media-libs/libjxl-0.7.0_pre20220825
 2210152041 metadata/md5-cache/media-libs/libpulse-16.0-r1
 2210152041 metadata/md5-cache/media-libs/libpulse-16.1-r1
 2210161540 metadata/md5-cache/media-libs/libsdl-1.2.15_p20210224
@@ -49932,10 +49927,8 @@
 2210190640 metadata/md5-cache/media-libs/openimageio-2.3.20.0
 2210190640 metadata/md5-cache/media-libs/openimageio-2.4.4.1
 2210191340 metadata/md5-cache/media-libs/sratom-0.6.14
-2210232310 metadata/md5-cache/media-libs/Manifest.gz
 2210200941 metadata/md5-cache/media-libs/allegro-4.4.3.1
 2210200941 metadata/md5-cache/media-libs/dssi-1.1.1-r1
-2210231040 metadata/md5-cache/media-libs/flac-1.4.2
 2210200941 metadata/md5-cache/media-libs/ftgl-2.1.3_rc5
 2210200941 metadata/md5-cache/media-libs/gnonlin-1.4.0-r1
 2210202010 metadata/md5-cache/media-libs/gst-plugins-bad-1.20.3
@@ -49946,7 +49939,6 @@
 2210200941 metadata/md5-cache/media-libs/id3lib-3.8.3-r8
 2210200941 metadata/md5-cache/media-libs/imlib-1.9.15-r5
 2210202240 metadata/md5-cache/media-libs/imlib2-1.7.5
-2210232310 metadata/md5-cache/media-libs/libcdaudio-0.99.12-r4
 2210200941 metadata/md5-cache/media-libs/libeot-0.01
 2210200941 metadata/md5-cache/media-libs/libeot-9999
 2210200941 metadata/md5-cache/media-libs/libffado-2.4.6
@@ -49973,6 +49965,19 @@
 2210200941 metadata/md5-cache/media-libs/tse3-0.3.1-r1
 2210201410 metadata/md5-cache/media-libs/vulkan-layers-1.3.224
 2210201410 metadata/md5-cache/media-libs/vulkan-loader-1.3.224
+2210260640 metadata/md5-cache/media-libs/Manifest.gz
+2210251540 metadata/md5-cache/media-libs/flac-1.4.2
+2210241540 metadata/md5-cache/media-libs/harfbuzz-5.3.1
+2210251410 metadata/md5-cache/media-libs/libcdaudio-0.99.12-r4
+2210251940 metadata/md5-cache/media-libs/libjxl-0.7.0
+2210252140 metadata/md5-cache/media-libs/libjxl-0.7.0_pre20220825
+2210251940 metadata/md5-cache/media-libs/libjxl-9999
+2210251540 metadata/md5-cache/media-libs/libquicktime-1.2.4-r4
+2210251840 metadata/md5-cache/media-libs/libshumate-1.0.2
+2210241510 metadata/md5-cache/media-libs/libuninameslist-20221022
+2210252210 metadata/md5-cache/media-libs/mlt-7.8.0
+2210260640 metadata/md5-cache/media-libs/mutagen-1.46.0
+2210251440 metadata/md5-cache/media-libs/openh264-2.3.1-r1
 2011090239 metadata/md5-cache/media-plugins/gimp-lqr-0.7.2-r1
 2107201909 metadata/md5-cache/media-plugins/hexter-1.1.1
 1911121409 metadata/md5-cache/media-plugins/ladspa-bs2b-0.9.1-r1
@@ -50491,9 +50496,7 @@
 2210110022 metadata/md5-cache/media-radio/cwdaemon-0.10.2
 2210110022 metadata/md5-cache/media-radio/cwdaemon-0.11.0
 2210110022 metadata/md5-cache/media-radio/fldigi-4.1.22
-2210110022 metadata/md5-cache/media-radio/fldigi-4.1.23
 2210110022 metadata/md5-cache/media-radio/flrig-1.4.5
-2210110022 metadata/md5-cache/media-radio/flrig-1.4.7
 2210110022 metadata/md5-cache/media-radio/fsync-mdc1200-decode-1.0
 2210110022 metadata/md5-cache/media-radio/fsync-mdc1200-decode-9999
 2210110022 metadata/md5-cache/media-radio/gpredict-2.3-r1
@@ -50518,9 +50521,12 @@
 2210152041 metadata/md5-cache/media-radio/direwolf-1.5-r1
 2210152041 metadata/md5-cache/media-radio/direwolf-1.6
 2210152041 metadata/md5-cache/media-radio/svxlink-19.09.2
-2210231940 metadata/md5-cache/media-radio/Manifest.gz
 2210200941 metadata/md5-cache/media-radio/grig-0.8.1-r1
 2210231940 metadata/md5-cache/media-radio/tlf-1.4.1-r1
+2210251610 metadata/md5-cache/media-radio/Manifest.gz
+2210251610 metadata/md5-cache/media-radio/fldigi-4.1.23
+2210251610 metadata/md5-cache/media-radio/flrig-1.4.7
+2210242010 metadata/md5-cache/media-radio/tucnak-4.37
 2008082009 metadata/md5-cache/media-sound/cdstatus-0.97.03
 1912100409 metadata/md5-cache/media-sound/cdtool-2.1.8-r1
 2008082009 metadata/md5-cache/media-sound/chordii-4.5.3
@@ -50551,7 +50557,6 @@
 1910180209 metadata/md5-cache/media-sound/vlorb-1.2
 1910180209 metadata/md5-cache/media-sound/wmsound-data-1.0.0
 2112020809 metadata/md5-cache/media-sound/sidplayfp-1.4.4
-2112070009 metadata/md5-cache/media-sound/pavucontrol-5.0-r1
 2201301409 metadata/md5-cache/media-sound/lxmusic-0.4.7-r1
 2201301409 metadata/md5-cache/media-sound/vbrfixc-0.24-r1
 2201301439 metadata/md5-cache/media-sound/streamtranscoder-3.1.11-r1
@@ -50899,7 +50904,6 @@
 2210180210 metadata/md5-cache/media-sound/mpd-0.23.10
 2210190640 metadata/md5-cache/media-sound/denemo-2.5.0-r1
 2210190640 metadata/md5-cache/media-sound/denemo-2.6.0
-2210231040 metadata/md5-cache/media-sound/Manifest.gz
 2210200941 metadata/md5-cache/media-sound/aeolus-0.10.4
 2210200941 metadata/md5-cache/media-sound/alsamixergui-0.9.0.1.2-r4
 2210200941 metadata/md5-cache/media-sound/alsaplayer-0.99.81-r4
@@ -50950,6 +50954,8 @@
 2210200941 metadata/md5-cache/media-sound/timemachine-0.3.4
 2210202210 metadata/md5-cache/media-sound/timidity++-2.15.0-r5
 2210200941 metadata/md5-cache/media-sound/tk707-0.8-r2
+2210251110 metadata/md5-cache/media-sound/Manifest.gz
+2210251110 metadata/md5-cache/media-sound/pavucontrol-5.0-r1
 1806021308 metadata/md5-cache/media-tv/ivtvplayer-0.1.3-r2
 2110221139 metadata/md5-cache/media-tv/shoutcast2vdr-0.0.8-r1
 2012172009 metadata/md5-cache/media-tv/w_scan-20170107
@@ -51597,12 +51603,10 @@
 2210152041 metadata/md5-cache/net-analyzer/suricata-6.0.8
 2210152041 metadata/md5-cache/net-analyzer/telegraf-1.13.3
 2210152041 metadata/md5-cache/net-analyzer/vnstat-2.9
-2210152041 metadata/md5-cache/net-analyzer/vnstat-9999
 2210152041 metadata/md5-cache/net-analyzer/zabbix-4.0.43
 2210152041 metadata/md5-cache/net-analyzer/zabbix-4.0.44
 2210190540 metadata/md5-cache/net-analyzer/authforce-0.9.9-r4
 2210190540 metadata/md5-cache/net-analyzer/bing-1.3.5
-2210231010 metadata/md5-cache/net-analyzer/Manifest.gz
 2210220210 metadata/md5-cache/net-analyzer/chronograf-1.8.5
 2210200941 metadata/md5-cache/net-analyzer/dhcp_probe-1.3.0-r4
 2210200941 metadata/md5-cache/net-analyzer/gspoof-3.2-r3
@@ -51622,6 +51626,9 @@
 2210220210 metadata/md5-cache/net-analyzer/zabbix-6.0.9
 2210220210 metadata/md5-cache/net-analyzer/zabbix-6.2.2
 2210220210 metadata/md5-cache/net-analyzer/zabbix-6.2.3
+2210241540 metadata/md5-cache/net-analyzer/Manifest.gz
+2210241540 metadata/md5-cache/net-analyzer/vnstat-2.10
+2210241540 metadata/md5-cache/net-analyzer/vnstat-9999
 2104161439 metadata/md5-cache/net-dialup/sercd-3.0.0-r2
 2205171510 metadata/md5-cache/net-dialup/ppp-scripts-0
 2209170112 metadata/md5-cache/net-dialup/isdn-firmware-2011.8.29.8.37
@@ -51749,8 +51756,6 @@
 2210152041 metadata/md5-cache/net-dns/unbound-1.13.2-r1
 2210152041 metadata/md5-cache/net-dns/unbound-1.15.0
 2210152041 metadata/md5-cache/net-dns/unbound-1.16.0
-2210152041 metadata/md5-cache/net-dns/unbound-1.16.3
-2210240910 metadata/md5-cache/net-dns/Manifest.gz
 2210220210 metadata/md5-cache/net-dns/coredns-1.10.0
 2210220210 metadata/md5-cache/net-dns/coredns-1.9.3
 2210220210 metadata/md5-cache/net-dns/dnscrypt-proxy-2.1.1
@@ -51761,6 +51766,9 @@
 2210191810 metadata/md5-cache/net-dns/knot-resolver-5.5.3
 2210240910 metadata/md5-cache/net-dns/libidn2-2.3.4
 2210211010 metadata/md5-cache/net-dns/pdns-4.7.0
+2210252110 metadata/md5-cache/net-dns/Manifest.gz
+2210250010 metadata/md5-cache/net-dns/dnsmasq-2.87
+2210252110 metadata/md5-cache/net-dns/unbound-1.16.3
 1902190039 metadata/md5-cache/net-firewall/ipkungfu-0.6.1-r1
 2001260341 metadata/md5-cache/net-firewall/lutelwall-0.99-r1
 2210110022 metadata/md5-cache/net-firewall/arptables-0.0.5-r2
@@ -51778,7 +51786,6 @@
 2210152041 metadata/md5-cache/net-firewall/conntrack-tools-1.4.6-r1
 2210152041 metadata/md5-cache/net-firewall/conntrack-tools-1.4.7
 2210152041 metadata/md5-cache/net-firewall/ferm-2.6
-2210152041 metadata/md5-cache/net-firewall/ferm-2.7
 2210152041 metadata/md5-cache/net-firewall/firehol-3.1.7-r2
 2210152041 metadata/md5-cache/net-firewall/firewalld-1.1.1
 2210152041 metadata/md5-cache/net-firewall/firewalld-1.1.2
@@ -51803,9 +51810,10 @@
 2210180140 metadata/md5-cache/net-firewall/xtables-addons-3.18
 2210180140 metadata/md5-cache/net-firewall/xtables-addons-3.20
 2210180140 metadata/md5-cache/net-firewall/xtables-addons-3.21
-2210200941 metadata/md5-cache/net-firewall/Manifest.gz
 2210200941 metadata/md5-cache/net-firewall/conntrack-tools-1.4.5
 2210200941 metadata/md5-cache/net-firewall/nufw-2.2.22-r4
+2210251410 metadata/md5-cache/net-firewall/Manifest.gz
+2210251410 metadata/md5-cache/net-firewall/ferm-2.7
 2012181339 metadata/md5-cache/net-fs/wdfs-1.4.2-r2
 2209170112 metadata/md5-cache/net-fs/smbnetfs-0.6.3
 2210110022 metadata/md5-cache/net-fs/btfs-2.23
@@ -52029,7 +52037,6 @@
 2210110022 metadata/md5-cache/net-irc/ninja-1.5.9_pre14-r2
 2210110022 metadata/md5-cache/net-irc/polari-42.0
 2210112310 metadata/md5-cache/net-irc/polari-43.0
-2210110022 metadata/md5-cache/net-irc/psybnc-2.3.2.9-r4
 2210110022 metadata/md5-cache/net-irc/quasselgrep-0_p20200830
 2210110022 metadata/md5-cache/net-irc/rbot-0.9.15_p20160325-r3
 2210110022 metadata/md5-cache/net-irc/rhapsody-0.28b
@@ -52057,10 +52064,12 @@
 2210152041 metadata/md5-cache/net-irc/znc-1.8.2-r1
 2210152041 metadata/md5-cache/net-irc/znc-1.8.2-r2
 2210152041 metadata/md5-cache/net-irc/znc-9999
-2210220210 metadata/md5-cache/net-irc/Manifest.gz
 2210220210 metadata/md5-cache/net-irc/ergo-2.10.0
 2210200941 metadata/md5-cache/net-irc/irccloud-desktop-bin-0.16.0-r1
 2210220140 metadata/md5-cache/net-irc/znc-palaver-1.2.2
+2210241540 metadata/md5-cache/net-irc/Manifest.gz
+2210241510 metadata/md5-cache/net-irc/psybnc-2.3.2.9-r4
+2210241540 metadata/md5-cache/net-irc/psybnc-2.4.3
 2103061309 metadata/md5-cache/net-libs/courier-unicode-2.1.2
 2010101039 metadata/md5-cache/net-libs/enet-1.2.2-r1
 2109121739 metadata/md5-cache/net-libs/enet-1.3.17
@@ -52142,8 +52151,6 @@
 2210110022 metadata/md5-cache/net-libs/ignition-msgs-5.9.0
 2210110022 metadata/md5-cache/net-libs/ignition-transport-8.3.0
 2210111610 metadata/md5-cache/net-libs/kdav2-0.3.0
-2210110022 metadata/md5-cache/net-libs/kdsoap-2.0.0
-2210110022 metadata/md5-cache/net-libs/kdsoap-2.1.1
 2210111610 metadata/md5-cache/net-libs/kdsoap-ws-discovery-client-0.2_pre20200927
 2210111610 metadata/md5-cache/net-libs/kimap2-0.3.0
 2210110022 metadata/md5-cache/net-libs/ldns-1.7.1-r5
@@ -52151,7 +52158,6 @@
 2210110022 metadata/md5-cache/net-libs/ldns-1.8.0-r1
 2210110022 metadata/md5-cache/net-libs/ldns-1.8.0-r4
 2210110022 metadata/md5-cache/net-libs/ldns-1.8.1
-2210110022 metadata/md5-cache/net-libs/libaccounts-glib-1.25-r2
 2210110022 metadata/md5-cache/net-libs/libaccounts-glib-1.26
 2210110022 metadata/md5-cache/net-libs/libad9361-iio-0.2
 2210110022 metadata/md5-cache/net-libs/libad9361-iio-0.2-r1
@@ -52203,7 +52209,6 @@
 2210110022 metadata/md5-cache/net-libs/libiscsi-9999
 2210110022 metadata/md5-cache/net-libs/libisds-9999
 2210111610 metadata/md5-cache/net-libs/libktorrent-22.04.3
-2210110022 metadata/md5-cache/net-libs/liblockfile-1.17
 2210110022 metadata/md5-cache/net-libs/libmbim-1.26.4
 2210111610 metadata/md5-cache/net-libs/libmediawiki-5.38.0
 2210110022 metadata/md5-cache/net-libs/libmicrodns-0.1.2
@@ -52263,7 +52268,6 @@
 2210110022 metadata/md5-cache/net-libs/libsignal-protocol-c-2.3.2
 2210110022 metadata/md5-cache/net-libs/libsignal-protocol-c-2.3.3
 2210110022 metadata/md5-cache/net-libs/libsignal-protocol-c-9999
-2210110022 metadata/md5-cache/net-libs/libsignon-glib-2.1-r1
 2210110022 metadata/md5-cache/net-libs/libslirp-4.6.1
 2210110022 metadata/md5-cache/net-libs/libslirp-4.7.0
 2210110022 metadata/md5-cache/net-libs/libsmi-0.5.0-r3
@@ -52276,8 +52280,6 @@
 2210110022 metadata/md5-cache/net-libs/libtelnet-0.23-r1
 2210110022 metadata/md5-cache/net-libs/libtelnet-9999
 2210110022 metadata/md5-cache/net-libs/libtorrent-0.13.8-r2
-2210110022 metadata/md5-cache/net-libs/libtorrent-rasterbar-1.2.16
-2210110022 metadata/md5-cache/net-libs/libtorrent-rasterbar-1.2.17
 2210110022 metadata/md5-cache/net-libs/libtorrent-rasterbar-2.0.6
 2210110022 metadata/md5-cache/net-libs/libtorrent-rasterbar-2.0.7
 2210110022 metadata/md5-cache/net-libs/libtrace-4.0.18_p1
@@ -52347,9 +52349,6 @@
 2210110022 metadata/md5-cache/net-libs/telepathy-accounts-signon-2.1
 2210110022 metadata/md5-cache/net-libs/telepathy-farstream-0.6.2-r1
 2210110022 metadata/md5-cache/net-libs/telepathy-glib-0.24.2
-2210111610 metadata/md5-cache/net-libs/telepathy-logger-qt-17.09.0
-2210110022 metadata/md5-cache/net-libs/telepathy-qt-0.9.8-r1
-2210110022 metadata/md5-cache/net-libs/telepathy-qt-9999
 2210110022 metadata/md5-cache/net-libs/tox_extension_messages-0.0.3
 2210110022 metadata/md5-cache/net-libs/toxext-0.0.3
 2210110022 metadata/md5-cache/net-libs/udns-0.4
@@ -52379,7 +52378,6 @@
 2210120512 metadata/md5-cache/net-libs/libsoup-2.74.3
 2210122040 metadata/md5-cache/net-libs/libsoup-3.2.1
 2210121010 metadata/md5-cache/net-libs/libsrtp-2.4.2
-2210130240 metadata/md5-cache/net-libs/pjproject-2.12.1-r2
 2210161610 metadata/md5-cache/net-libs/accounts-qml-0.7-r2
 2210161510 metadata/md5-cache/net-libs/accounts-qt-1.16
 2210170410 metadata/md5-cache/net-libs/gnutls-3.7.8
@@ -52393,7 +52391,6 @@
 2210152041 metadata/md5-cache/net-libs/tox-9999
 2210181710 metadata/md5-cache/net-libs/ngtcp2-0.10.0
 2210181810 metadata/md5-cache/net-libs/xrootd-5.5.0
-2210221740 metadata/md5-cache/net-libs/Manifest.gz
 2210200941 metadata/md5-cache/net-libs/c-client-2007f-r7
 2210200740 metadata/md5-cache/net-libs/dleyna-0.8.0
 2210201410 metadata/md5-cache/net-libs/grpc-1.43.0
@@ -52409,6 +52406,19 @@
 2210200010 metadata/md5-cache/net-libs/nodejs-16.18.0
 2210201110 metadata/md5-cache/net-libs/nodejs-18.10.0
 2210200010 metadata/md5-cache/net-libs/nodejs-18.11.0
+2210252310 metadata/md5-cache/net-libs/Manifest.gz
+2210252110 metadata/md5-cache/net-libs/kdsoap-2.1.1
+2210252210 metadata/md5-cache/net-libs/libaccounts-glib-1.26-r1
+2210241910 metadata/md5-cache/net-libs/liblockfile-1.17
+2210252310 metadata/md5-cache/net-libs/libsignon-glib-2.1-r2
+2210241510 metadata/md5-cache/net-libs/libtorrent-rasterbar-1.2.18
+2210252110 metadata/md5-cache/net-libs/pjproject-2.12.1-r2
+2210252310 metadata/md5-cache/net-libs/telepathy-logger-qt-17.09.0-r1
+2210252310 metadata/md5-cache/net-libs/telepathy-qt-0.9.8-r2
+2210252310 metadata/md5-cache/net-libs/telepathy-qt-9999
+2210251840 metadata/md5-cache/net-libs/webkit-gtk-2.38.1
+2210251840 metadata/md5-cache/net-libs/webkit-gtk-2.38.1-r410
+2210251840 metadata/md5-cache/net-libs/webkit-gtk-2.38.1-r500
 2104060140 metadata/md5-cache/net-mail/autorespond-2.0.4
 2007210509 metadata/md5-cache/net-mail/autorespond-2.0.5
 2009050439 metadata/md5-cache/net-mail/email-3.1.3-r1
@@ -52525,14 +52535,14 @@
 2210152041 metadata/md5-cache/net-mail/onionrouter-0.6.2
 2210152041 metadata/md5-cache/net-mail/onionrouter-9999
 2210152041 metadata/md5-cache/net-mail/poppassd_ceti-1.8.9
-2210201410 metadata/md5-cache/net-mail/Manifest.gz
 2210200941 metadata/md5-cache/net-mail/gnubiff-2.2.17-r2
-2210201410 metadata/md5-cache/net-mail/mu-1.8.10
 2210200941 metadata/md5-cache/net-mail/notmuch-0.32.2-r1
 2210200941 metadata/md5-cache/net-mail/notmuch-0.34.2
 2210200941 metadata/md5-cache/net-mail/notmuch-0.34.2-r1
 2210200941 metadata/md5-cache/net-mail/notmuch-0.37
 2210200941 metadata/md5-cache/net-mail/vchkuser-0.4-r1
+2210251610 metadata/md5-cache/net-mail/Manifest.gz
+2210251610 metadata/md5-cache/net-mail/mu-1.8.10
 2007201539 metadata/md5-cache/net-misc/asterisk-core-sounds-1.6.1-r1
 2007201539 metadata/md5-cache/net-misc/asterisk-extra-sounds-1.5.2
 2108291210 metadata/md5-cache/net-misc/autossh-1.4g
@@ -52662,7 +52672,6 @@
 2210110022 metadata/md5-cache/net-misc/curl-7.79.1-r1
 2210110022 metadata/md5-cache/net-misc/curl-7.83.1
 2210110022 metadata/md5-cache/net-misc/curl-7.84.0
-2210110022 metadata/md5-cache/net-misc/curl-7.85.0-r2
 2210110022 metadata/md5-cache/net-misc/dahdi-tools-3.1.0-r2
 2210110022 metadata/md5-cache/net-misc/dahdi-tools-3.1.0-r4
 2210110022 metadata/md5-cache/net-misc/datapipe-1.0-r2
@@ -52857,8 +52866,6 @@
 2210110022 metadata/md5-cache/net-misc/wget-1.21.3-r1
 2210110022 metadata/md5-cache/net-misc/wget2-9999
 2210110022 metadata/md5-cache/net-misc/whois-5.5.13-r1
-2210110022 metadata/md5-cache/net-misc/wol-0.7.1-r3
-2210110022 metadata/md5-cache/net-misc/wput-0.6.2_p20130413_p11
 2210110022 metadata/md5-cache/net-misc/x11-ssh-askpass-1.2.4.1-r2
 2210110022 metadata/md5-cache/net-misc/yandex-disk-0.1.5.1039_p1
 2210110022 metadata/md5-cache/net-misc/yandex-disk-0.1.6.1074_p1
@@ -52880,7 +52887,6 @@
 2210152041 metadata/md5-cache/net-misc/chrony-9999
 2210152041 metadata/md5-cache/net-misc/connman-1.42_pre20220828-r1
 2210152041 metadata/md5-cache/net-misc/connman-9999
-2210152041 metadata/md5-cache/net-misc/dhcp-4.4.3_p1
 2210152041 metadata/md5-cache/net-misc/dhcpcd-9.4.1
 2210152041 metadata/md5-cache/net-misc/dhcpcd-9999
 2210152041 metadata/md5-cache/net-misc/dhcpcd-ui-0.7.8
@@ -52963,11 +52969,8 @@
 2210152041 metadata/md5-cache/net-misc/rabbitmq-server-3.9.20
 2210152041 metadata/md5-cache/net-misc/radvd-2.19-r2
 2210152041 metadata/md5-cache/net-misc/radvd-2.19-r4
-2210152041 metadata/md5-cache/net-misc/rsync-3.2.4-r1
 2210152041 metadata/md5-cache/net-misc/rsync-3.2.4-r3
-2210152041 metadata/md5-cache/net-misc/rsync-3.2.5-r1
 2210152041 metadata/md5-cache/net-misc/rsync-3.2.6
-2210152041 metadata/md5-cache/net-misc/rsync-3.2.7_pre1
 2210152041 metadata/md5-cache/net-misc/rsync-9999
 2210152041 metadata/md5-cache/net-misc/rygel-0.40.4
 2210152041 metadata/md5-cache/net-misc/rygel-0.42.0
@@ -53014,7 +53017,6 @@
 2210190640 metadata/md5-cache/net-misc/suite3270-4.2_p5-r1
 2210190940 metadata/md5-cache/net-misc/youtube-dl-2021.12.17-r1
 2210190940 metadata/md5-cache/net-misc/youtube-dl-9999
-2210231910 metadata/md5-cache/net-misc/Manifest.gz
 2210200941 metadata/md5-cache/net-misc/anydesk-6.2.0-r1
 2210200941 metadata/md5-cache/net-misc/arpd-0.2-r1
 2210200941 metadata/md5-cache/net-misc/connman-json-client-1.0_p20150721-r2
@@ -53063,11 +53065,6 @@
 2210220210 metadata/md5-cache/net-misc/rclone-1.59.2
 2210231740 metadata/md5-cache/net-misc/rclone-1.60.0
 2210211610 metadata/md5-cache/net-misc/rinetd-0.62-r3
-2210200941 metadata/md5-cache/net-misc/spice-gtk-0.39-r2
-2210200941 metadata/md5-cache/net-misc/spice-gtk-0.40
-2210200941 metadata/md5-cache/net-misc/spice-gtk-0.40-r1
-2210200941 metadata/md5-cache/net-misc/spice-gtk-0.41
-2210200941 metadata/md5-cache/net-misc/spice-gtk-9999
 2210200941 metadata/md5-cache/net-misc/streamtuner-0.99.99-r5
 2210200941 metadata/md5-cache/net-misc/teamviewer-15.28.6
 2210200941 metadata/md5-cache/net-misc/teamviewer-15.30.3
@@ -53087,6 +53084,17 @@
 2210200941 metadata/md5-cache/net-misc/youtube-viewer-9999
 2210230940 metadata/md5-cache/net-misc/ytfzf-2.5.2
 2210191510 metadata/md5-cache/net-misc/zerotier-1.6.4
+2210260640 metadata/md5-cache/net-misc/Manifest.gz
+2210251410 metadata/md5-cache/net-misc/curl-7.85.0-r2
+2210241910 metadata/md5-cache/net-misc/dhcp-4.4.3_p1
+2210251840 metadata/md5-cache/net-misc/gnome-remote-desktop-43.1
+2210250910 metadata/md5-cache/net-misc/rsync-3.2.7
+2210260640 metadata/md5-cache/net-misc/spice-gtk-0.40-r1
+2210260640 metadata/md5-cache/net-misc/spice-gtk-0.41
+2210260640 metadata/md5-cache/net-misc/spice-gtk-0.41-r1
+2210260640 metadata/md5-cache/net-misc/spice-gtk-9999
+2210251610 metadata/md5-cache/net-misc/wol-0.7.1-r3
+2210252110 metadata/md5-cache/net-misc/wput-0.6.2_p20130413_p11
 1911091712 metadata/md5-cache/net-nds/led-1.111
 2204240440 metadata/md5-cache/net-nds/smbldap-tools-0.9.10-r1
 2209122242 metadata/md5-cache/net-nds/phpldapadmin-1.2.6.3
@@ -53193,10 +53201,6 @@
 2210152041 metadata/md5-cache/net-p2p/bitcoind-0.21.1
 2210152041 metadata/md5-cache/net-p2p/bitcoind-21.2
 2210152041 metadata/md5-cache/net-p2p/bitcoind-22.0
-2210152041 metadata/md5-cache/net-p2p/cpuminer-opt-3.16.4-r1
-2210152041 metadata/md5-cache/net-p2p/cpuminer-opt-3.17.1-r1
-2210152041 metadata/md5-cache/net-p2p/cpuminer-opt-3.18.0
-2210152041 metadata/md5-cache/net-p2p/cpuminer-opt-3.19.8
 2210152041 metadata/md5-cache/net-p2p/cpuminer-opt-3.20.1
 2210152041 metadata/md5-cache/net-p2p/cpuminer-opt-9999
 2210152041 metadata/md5-cache/net-p2p/deluge-2.1.1
@@ -53216,10 +53220,8 @@
 2210152041 metadata/md5-cache/net-p2p/resilio-sync-9999
 2210152041 metadata/md5-cache/net-p2p/rtorrent-0.9.8-r1
 2210152041 metadata/md5-cache/net-p2p/transmission-3.00-r1
-2210152041 metadata/md5-cache/net-p2p/transmission-3.00-r4
 2210152041 metadata/md5-cache/net-p2p/transmission-4.0.0_beta1
 2210152041 metadata/md5-cache/net-p2p/transmission-9999
-2210231740 metadata/md5-cache/net-p2p/Manifest.gz
 2210200941 metadata/md5-cache/net-p2p/bitcoin-qt-0.21.0
 2210200941 metadata/md5-cache/net-p2p/bitcoin-qt-0.21.1
 2210200941 metadata/md5-cache/net-p2p/bitcoin-qt-21.2
@@ -53242,6 +53244,9 @@
 2210220210 metadata/md5-cache/net-p2p/syncthing-1.22.0
 2210212310 metadata/md5-cache/net-p2p/tremc-0.9.3
 2210200941 metadata/md5-cache/net-p2p/vuze-5.7.6.0-r2
+2210251410 metadata/md5-cache/net-p2p/Manifest.gz
+2210241810 metadata/md5-cache/net-p2p/cpuminer-opt-3.20.3
+2210251410 metadata/md5-cache/net-p2p/transmission-3.00-r5
 2010020309 metadata/md5-cache/net-print/apsfilter-7.2.8-r1
 2011290239 metadata/md5-cache/net-print/c2esp-27
 2104060140 metadata/md5-cache/net-print/cups-windows-6.0-r1
@@ -53337,13 +53342,12 @@
 2210152041 metadata/md5-cache/net-proxy/squid-5.7
 2210152041 metadata/md5-cache/net-proxy/tinyproxy-1.11.1_p20220908
 2210152041 metadata/md5-cache/net-proxy/trojan-1.16.0-r2
-2210220210 metadata/md5-cache/net-proxy/Manifest.gz
 2210220210 metadata/md5-cache/net-proxy/haproxy-dataplaneapi-2.5.1
 2210220210 metadata/md5-cache/net-proxy/obfs4proxy-0.0.13-r1
 2210220210 metadata/md5-cache/net-proxy/obfs4proxy-0.0.14
 2210200941 metadata/md5-cache/net-proxy/tayga-0.9.2-r1
-2210200941 metadata/md5-cache/net-proxy/tayga-0.9.2-r2
-2210200941 metadata/md5-cache/net-proxy/tayga-0.9.2-r3
+2210251540 metadata/md5-cache/net-proxy/Manifest.gz
+2210251540 metadata/md5-cache/net-proxy/tayga-0.9.2-r4
 2210110022 metadata/md5-cache/net-voip/captagent-6.3.1-r1
 2210110022 metadata/md5-cache/net-voip/mumble-1.4.274-r1
 2210110022 metadata/md5-cache/net-voip/mumble-9999
@@ -53604,13 +53608,13 @@
 2210152041 metadata/md5-cache/net-wireless/unifi-7.1.68
 2210152041 metadata/md5-cache/net-wireless/unifi-7.2.94
 2210180140 metadata/md5-cache/net-wireless/broadcom-sta-6.30.223.271-r6
-2210231410 metadata/md5-cache/net-wireless/Manifest.gz
-2210231410 metadata/md5-cache/net-wireless/bluez-5.65
 2210202240 metadata/md5-cache/net-wireless/gnuradio-3.10.3.0-r2
 2210221140 metadata/md5-cache/net-wireless/gnuradio-3.10.4.0
 2210200941 metadata/md5-cache/net-wireless/mfoc-0.10.7-r1
 2210200941 metadata/md5-cache/net-wireless/wpa_supplicant-2.10-r1
 2210200941 metadata/md5-cache/net-wireless/wpa_supplicant-9999
+2210251610 metadata/md5-cache/net-wireless/Manifest.gz
+2210251610 metadata/md5-cache/net-wireless/bluez-5.65
 2210010840 metadata/md5-cache/perl-core/CPAN-2.290.0-r1
 2210010840 metadata/md5-cache/perl-core/Compress-Raw-Zlib-2.201.0
 2210010840 metadata/md5-cache/perl-core/Compress-Raw-Zlib-2.202.0
@@ -53629,7 +53633,6 @@
 2102021739 metadata/md5-cache/ros-meta/mavros-1.5.2
 2108061639 metadata/md5-cache/ros-meta/mavros-1.8.0
 2008171609 metadata/md5-cache/ros-meta/mavros-9999
-2210110022 metadata/md5-cache/ros-meta/Manifest.gz
 2210110022 metadata/md5-cache/ros-meta/ament_cmake-0.9.6
 2210110022 metadata/md5-cache/ros-meta/ament_cmake-1.0.0
 2210110022 metadata/md5-cache/ros-meta/ament_cmake-1.0.1
@@ -53789,6 +53792,8 @@
 2210110022 metadata/md5-cache/ros-meta/visualization_tutorials-9999
 2210110022 metadata/md5-cache/ros-meta/viz-1.5.0
 2210110022 metadata/md5-cache/ros-meta/viz-9999
+2210251440 metadata/md5-cache/ros-meta/Manifest.gz
+2210251440 metadata/md5-cache/ros-meta/geometry2-0.7.6
 2105292209 metadata/md5-cache/sci-astronomy/casa-data-20170703
 2105292209 metadata/md5-cache/sci-astronomy/fitsh-0.9.2
 2102150339 metadata/md5-cache/sci-astronomy/idlastro-20161220
@@ -53827,10 +53832,6 @@
 2210110022 metadata/md5-cache/sci-astronomy/wcslib-7.3.1
 2210110022 metadata/md5-cache/sci-astronomy/weightwatcher-1.12
 2210110022 metadata/md5-cache/sci-astronomy/xfitsview-2.2-r2
-2210200941 metadata/md5-cache/sci-astronomy/Manifest.gz
-2210200941 metadata/md5-cache/sci-astronomy/celestia-1.7.0_pre20200316-r100
-2210200941 metadata/md5-cache/sci-astronomy/celestia-1.7.0_pre20220120
-2210200941 metadata/md5-cache/sci-astronomy/celestia-9999
 2210200941 metadata/md5-cache/sci-astronomy/cpl-7.0-r1
 2210200941 metadata/md5-cache/sci-astronomy/ds9-bin-7.4
 2210200941 metadata/md5-cache/sci-astronomy/esomidas-17.02-r1
@@ -53844,6 +53845,9 @@
 2210200941 metadata/md5-cache/sci-astronomy/wcstools-3.9.5
 2210200941 metadata/md5-cache/sci-astronomy/xephem-3.7.7-r1
 2210200941 metadata/md5-cache/sci-astronomy/xephem-4.1.0
+2210251610 metadata/md5-cache/sci-astronomy/Manifest.gz
+2210251610 metadata/md5-cache/sci-astronomy/celestia-1.7.0_pre20220120
+2210251610 metadata/md5-cache/sci-astronomy/celestia-9999
 2011012209 metadata/md5-cache/sci-biology/gmap-2020.10.27
 2010280109 metadata/md5-cache/sci-biology/profphd-1.0.40
 2104051739 metadata/md5-cache/sci-biology/update-blastdb-12.0.0
@@ -54009,7 +54013,6 @@
 2210110022 metadata/md5-cache/sci-chemistry/ParmEd-3.4.3
 2210110022 metadata/md5-cache/sci-chemistry/autodock-4.2.6
 2210110022 metadata/md5-cache/sci-chemistry/autodock_vina-1.1.2-r1
-2210110022 metadata/md5-cache/sci-chemistry/chemex-2021.4.0_p6-r1
 2210110022 metadata/md5-cache/sci-chemistry/chemex-2022.0.1-r1
 2210110022 metadata/md5-cache/sci-chemistry/chemical-mime-data-0.1.94-r4
 2210110022 metadata/md5-cache/sci-chemistry/cluster-1.3.081231-r1
@@ -54068,7 +54071,6 @@
 2210110022 metadata/md5-cache/sci-chemistry/votca-xtp-1.6.4
 2210110022 metadata/md5-cache/sci-chemistry/votca-xtp-2021.2
 2210110022 metadata/md5-cache/sci-chemistry/xyza2pipe-20121001
-2210200941 metadata/md5-cache/sci-chemistry/Manifest.gz
 2210200941 metadata/md5-cache/sci-chemistry/aqua-3.2-r3
 2210200941 metadata/md5-cache/sci-chemistry/avogadro2-1.95.1
 2210200941 metadata/md5-cache/sci-chemistry/avogadro2-1.97.0
@@ -54085,6 +54087,8 @@
 2210200941 metadata/md5-cache/sci-chemistry/tinker-8.2.1
 2210200941 metadata/md5-cache/sci-chemistry/vmd-1.9.4_alpha57
 2210200941 metadata/md5-cache/sci-chemistry/wxmacmolplt-7.5-r1
+2210251610 metadata/md5-cache/sci-chemistry/Manifest.gz
+2210251610 metadata/md5-cache/sci-chemistry/chemex-2022.1.0
 1702282330 metadata/md5-cache/sci-electronics/freehdl-0.0.8
 2003201239 metadata/md5-cache/sci-electronics/geda-suite-20171223-r1
 2108222309 metadata/md5-cache/sci-electronics/irsim-9.7.93
@@ -54276,7 +54280,6 @@
 2210152041 metadata/md5-cache/sci-geosciences/gpsd-3.24
 2210152041 metadata/md5-cache/sci-geosciences/gpsd-9999
 2210152041 metadata/md5-cache/sci-geosciences/owntracks-recorder-0.9.1
-2210211810 metadata/md5-cache/sci-geosciences/Manifest.gz
 2210200941 metadata/md5-cache/sci-geosciences/bt747-2.1.7-r2
 2210200941 metadata/md5-cache/sci-geosciences/gpscorrelate-1.6.1-r2
 2210200941 metadata/md5-cache/sci-geosciences/gpscorrelate-2.0
@@ -54291,6 +54294,8 @@
 2210211810 metadata/md5-cache/sci-geosciences/qgis-3.26.3
 2210211810 metadata/md5-cache/sci-geosciences/qgis-9999
 2210200941 metadata/md5-cache/sci-geosciences/xtide-2.15.5
+2210251840 metadata/md5-cache/sci-geosciences/Manifest.gz
+2210251840 metadata/md5-cache/sci-geosciences/gnome-maps-43.1
 2002230040 metadata/md5-cache/sci-libs/beagle-3.0.3-r1
 2110211309 metadata/md5-cache/sci-libs/clashscore-db-3.17-r1
 2102270639 metadata/md5-cache/sci-libs/coinor-alps-1.5.7
@@ -54310,7 +54315,6 @@
 2102270639 metadata/md5-cache/sci-libs/coinor-smi-0.96.1
 2102281909 metadata/md5-cache/sci-libs/coinor-symphony-5.6.17
 2108141339 metadata/md5-cache/sci-libs/fetk-1.5
-2111021909 metadata/md5-cache/sci-libs/givaro-4.1.1-r2
 2103282139 metadata/md5-cache/sci-libs/h5part-1.6.6
 2102150339 metadata/md5-cache/sci-libs/idlcoyote-20161220
 1702282331 metadata/md5-cache/sci-libs/idlmarkwardt-20160319
@@ -54364,7 +54368,6 @@
 2210110022 metadata/md5-cache/sci-libs/bliss-0.77
 2210110022 metadata/md5-cache/sci-libs/bmrblib-1.0.4
 2210110022 metadata/md5-cache/sci-libs/branca-0.4.2-r1
-2210110022 metadata/md5-cache/sci-libs/brial-1.2.10
 2210110022 metadata/md5-cache/sci-libs/buddy-2.4-r1
 2210110022 metadata/md5-cache/sci-libs/caffe2-1.11.0-r2
 2210110022 metadata/md5-cache/sci-libs/caffe2-1.12.0
@@ -54565,9 +54568,6 @@
 2210110022 metadata/md5-cache/sci-libs/numkit-1.1.2-r1
 2210110022 metadata/md5-cache/sci-libs/octomap-1.9.8
 2210110022 metadata/md5-cache/sci-libs/onnx-1.11.0-r2
-2210110022 metadata/md5-cache/sci-libs/openblas-0.3.18
-2210110022 metadata/md5-cache/sci-libs/openblas-0.3.19
-2210110022 metadata/md5-cache/sci-libs/openblas-0.3.20
 2210110022 metadata/md5-cache/sci-libs/opencascade-7.5.2-r6
 2210110022 metadata/md5-cache/sci-libs/opencascade-7.5.3-r8
 2210110022 metadata/md5-cache/sci-libs/opencascade-7.6.3
@@ -54695,7 +54695,6 @@
 2210161840 metadata/md5-cache/sci-libs/silo-4.11-r1
 2210180140 metadata/md5-cache/sci-libs/linux-gpib-modules-4.3.4-r1
 2210180140 metadata/md5-cache/sci-libs/linux-gpib-modules-4.3.5
-2210241040 metadata/md5-cache/sci-libs/Manifest.gz
 2210200941 metadata/md5-cache/sci-libs/arprec-2.2.19
 2210200941 metadata/md5-cache/sci-libs/atlas-3.10.2
 2210241040 metadata/md5-cache/sci-libs/brial-1.2.11
@@ -54723,6 +54722,10 @@
 2210200941 metadata/md5-cache/sci-libs/spr-3.3.2
 2210191510 metadata/md5-cache/sci-libs/symengine-0.9.0-r3
 2210200941 metadata/md5-cache/sci-libs/xdrfile-1.1.4
+2210241910 metadata/md5-cache/sci-libs/Manifest.gz
+2210241910 metadata/md5-cache/sci-libs/openblas-0.3.18
+2210241910 metadata/md5-cache/sci-libs/openblas-0.3.19
+2210241910 metadata/md5-cache/sci-libs/openblas-0.3.20
 2101061839 metadata/md5-cache/sci-mathematics/flintqs-1.0
 2101061839 metadata/md5-cache/sci-mathematics/lrcalc-1.2
 2101061839 metadata/md5-cache/sci-mathematics/pari-data-20191216
@@ -54747,7 +54750,6 @@
 2208121540 metadata/md5-cache/sci-mathematics/lpsolve-5.5.2.0-r1
 2208151110 metadata/md5-cache/sci-mathematics/eclib-20220621
 2208190140 metadata/md5-cache/sci-mathematics/fricas-1.3.8
-2208190140 metadata/md5-cache/sci-mathematics/singular-4.3.1_p1
 2208190140 metadata/md5-cache/sci-mathematics/twelf-1.7.1-r2
 2209071540 metadata/md5-cache/sci-mathematics/coq-mathcomp-1.14.0-r1
 2209071540 metadata/md5-cache/sci-mathematics/coq-mathcomp-1.15.0
@@ -54814,7 +54816,6 @@
 2210110022 metadata/md5-cache/sci-mathematics/minisat-2.2.1-r1
 2210110022 metadata/md5-cache/sci-mathematics/msieve-1.53-r1
 2210110022 metadata/md5-cache/sci-mathematics/nauty-2.7.3
-2210110022 metadata/md5-cache/sci-mathematics/nauty-2.7.4
 2210110022 metadata/md5-cache/sci-mathematics/nestedsums-1.5.2-r1
 2210110022 metadata/md5-cache/sci-mathematics/normaliz-3.9.3
 2210110022 metadata/md5-cache/sci-mathematics/octave-6.4.0-r3
@@ -54834,7 +54835,6 @@
 2210110022 metadata/md5-cache/sci-mathematics/pspp-1.6.0-r1
 2210110022 metadata/md5-cache/sci-mathematics/pspp-1.6.2-r1
 2210110022 metadata/md5-cache/sci-mathematics/relational-2.5-r2
-2210111610 metadata/md5-cache/sci-mathematics/rkward-0.7.4
 2210110022 metadata/md5-cache/sci-mathematics/sha1-polyml-5.9
 2210110022 metadata/md5-cache/sci-mathematics/singular-4.2.0_p1
 2210110022 metadata/md5-cache/sci-mathematics/singular-4.2.1_p3-r1
@@ -54862,7 +54862,6 @@
 2210152041 metadata/md5-cache/sci-mathematics/gimps-30.8.15
 2210152240 metadata/md5-cache/sci-mathematics/smtinterpol-2.5_p20211018
 2210181610 metadata/md5-cache/sci-mathematics/gimps-30.8.17
-2210231510 metadata/md5-cache/sci-mathematics/Manifest.gz
 2210200941 metadata/md5-cache/sci-mathematics/coq-8.11.2-r1
 2210200941 metadata/md5-cache/sci-mathematics/coq-8.12.0-r2
 2210200941 metadata/md5-cache/sci-mathematics/coq-8.13.0-r1
@@ -54888,18 +54887,19 @@
 2210221810 metadata/md5-cache/sci-mathematics/rkward-0.7.5
 2210200941 metadata/md5-cache/sci-mathematics/spin-6.5.2-r1
 2210200941 metadata/md5-cache/sci-mathematics/yacas-1.7.0-r1
+2210251910 metadata/md5-cache/sci-mathematics/Manifest.gz
+2210251410 metadata/md5-cache/sci-mathematics/nauty-2.7.4
+2210251440 metadata/md5-cache/sci-mathematics/singular-4.3.1_p1
 2104180939 metadata/md5-cache/sci-misc/ViSP-images-3.3.0
 2203231439 metadata/md5-cache/sci-misc/flashdot-1.1.4-r1
 2207071340 metadata/md5-cache/sci-misc/ViSP-images-3.5.0
 2210110022 metadata/md5-cache/sci-misc/apertium-3.2.0
 2210110022 metadata/md5-cache/sci-misc/fitscut-1.4.4-r1
 2210110022 metadata/md5-cache/sci-misc/fitsverify-4.18
-2210110022 metadata/md5-cache/sci-misc/gt-itm-19961004-r2
 2210110022 metadata/md5-cache/sci-misc/h5utils-1.13.1
 2210110022 metadata/md5-cache/sci-misc/oww-0.86.5
 2210110022 metadata/md5-cache/sci-misc/vitables-3.0.2
 2210110022 metadata/md5-cache/sci-misc/vitables-3.0.2-r1
-2210200941 metadata/md5-cache/sci-misc/Manifest.gz
 2210200941 metadata/md5-cache/sci-misc/boinc-7.20.2-r2
 2210200941 metadata/md5-cache/sci-misc/boinc-7.20.2-r3
 2210200941 metadata/md5-cache/sci-misc/boinc-9999
@@ -54911,6 +54911,8 @@
 2210200941 metadata/md5-cache/sci-misc/ncview-2.1.7
 2210200941 metadata/md5-cache/sci-misc/netlogo-bin-6.2.0
 2210200941 metadata/md5-cache/sci-misc/netlogo-bin-6.2.2
+2210242240 metadata/md5-cache/sci-misc/Manifest.gz
+2210242240 metadata/md5-cache/sci-misc/gt-itm-19961004-r3
 2102140209 metadata/md5-cache/sci-physics/siscone-3.0.5
 2205311010 metadata/md5-cache/sci-physics/geant-data-4.11.0.0
 2209170112 metadata/md5-cache/sci-physics/geant-data-4.10.7.1
@@ -56040,8 +56042,6 @@
 2210110022 metadata/md5-cache/sys-apps/netkit-base-0.17-r9
 2210110022 metadata/md5-cache/sys-apps/netplug-1.2.9.2-r3
 2210110022 metadata/md5-cache/sys-apps/onerng-3.7
-2210110022 metadata/md5-cache/sys-apps/openrc-0.44.10-r1
-2210110022 metadata/md5-cache/sys-apps/openrc-0.45.1-r1
 2210110022 metadata/md5-cache/sys-apps/openrc-0.45.2-r1
 2210110022 metadata/md5-cache/sys-apps/openrc-9999
 2210110022 metadata/md5-cache/sys-apps/osinfo-db-tools-1.10.0-r1
@@ -56260,7 +56260,6 @@
 2210190310 metadata/md5-cache/sys-apps/man-pages-6.01
 2210190512 metadata/md5-cache/sys-apps/osinfo-db-20221018
 2210182140 metadata/md5-cache/sys-apps/xdg-desktop-portal-gnome-43.1
-2210220210 metadata/md5-cache/sys-apps/Manifest.gz
 2210192110 metadata/md5-cache/sys-apps/ack-3.6.0
 2210200941 metadata/md5-cache/sys-apps/arrayprobe-2.0-r2
 2210200941 metadata/md5-cache/sys-apps/bar-1.11.1
@@ -56279,16 +56278,21 @@
 2210200941 metadata/md5-cache/sys-apps/pcsc-tools-1.6.0
 2210210840 metadata/md5-cache/sys-apps/pkgcore-0.12.16-r1
 2210210840 metadata/md5-cache/sys-apps/pkgcore-9999
-2210211740 metadata/md5-cache/sys-apps/portage-3.0.38.1-r1
 2210211740 metadata/md5-cache/sys-apps/portage-9999
 2210200941 metadata/md5-cache/sys-apps/qingy-1.0.0-r5
 2210220210 metadata/md5-cache/sys-apps/rootlesskit-0.14.2
-2210192140 metadata/md5-cache/sys-apps/systemd-252_rc2
 2210210040 metadata/md5-cache/sys-apps/texinfo-6.8
 2210210040 metadata/md5-cache/sys-apps/texinfo-6.8.90
 2210200941 metadata/md5-cache/sys-apps/uam-9999
 2210200941 metadata/md5-cache/sys-apps/udevil-0.4.4-r4
 2210200941 metadata/md5-cache/sys-apps/xinetd-2.3.15.4
+2210260640 metadata/md5-cache/sys-apps/Manifest.gz
+2210251610 metadata/md5-cache/sys-apps/cpu-x-4.5.1
+2210251610 metadata/md5-cache/sys-apps/memtest86+-6.00
+2210260340 metadata/md5-cache/sys-apps/portage-3.0.38.1-r2
+2210250910 metadata/md5-cache/sys-apps/systemd-251.7
+2210250410 metadata/md5-cache/sys-apps/systemd-252_rc3
+2210250910 metadata/md5-cache/sys-apps/systemd-utils-251.7
 2110110009 metadata/md5-cache/sys-auth/libyubikey-1.13
 2108271840 metadata/md5-cache/sys-auth/nss-myhostname-0.3-r1
 2011160239 metadata/md5-cache/sys-auth/ykclient-2.15
@@ -56484,7 +56488,6 @@
 2209170112 metadata/md5-cache/sys-boot/cromwell-bin-2.40-r1
 2209170112 metadata/md5-cache/sys-boot/raspberrypi-firmware-1.20211118
 2209170112 metadata/md5-cache/sys-boot/raspberrypi-firmware-1.20220328
-2209170112 metadata/md5-cache/sys-boot/raspberrypi-firmware-9999
 2210110022 metadata/md5-cache/sys-boot/aboot-1.0_pre20040408-r3
 2210110022 metadata/md5-cache/sys-boot/aboot-2.0_pre20210801
 2210110022 metadata/md5-cache/sys-boot/aboot-9999
@@ -56527,9 +56530,11 @@
 2210110022 metadata/md5-cache/sys-boot/yaboot-1.3.17-r4
 2210152041 metadata/md5-cache/sys-boot/plymouth-22.02.122-r1
 2210152041 metadata/md5-cache/sys-boot/plymouth-9999
-2210200941 metadata/md5-cache/sys-boot/Manifest.gz
 2210200941 metadata/md5-cache/sys-boot/unetbootin-700
 2210200941 metadata/md5-cache/sys-boot/unetbootin-702
+2210242040 metadata/md5-cache/sys-boot/Manifest.gz
+2210242040 metadata/md5-cache/sys-boot/raspberrypi-firmware-1.20220830
+2210242040 metadata/md5-cache/sys-boot/raspberrypi-firmware-9999
 2002230040 metadata/md5-cache/sys-cluster/fake-1.1.10
 2103132309 metadata/md5-cache/sys-cluster/libcircle-0.3.0
 1804020008 metadata/md5-cache/sys-cluster/pmix-2.1.1
@@ -56621,7 +56626,6 @@
 2210152041 metadata/md5-cache/sys-cluster/teleport-9999
 2210180140 metadata/md5-cache/sys-cluster/knem-1.1.4
 2210180140 metadata/md5-cache/sys-cluster/knem-9999
-2210222140 metadata/md5-cache/sys-cluster/Manifest.gz
 2210200440 metadata/md5-cache/sys-cluster/ceph-17.2.5
 2210220210 metadata/md5-cache/sys-cluster/cilium-cli-0.12.1
 2210220210 metadata/md5-cache/sys-cluster/gmqtt-0.4.1
@@ -56693,6 +56697,8 @@
 2210220210 metadata/md5-cache/sys-cluster/minikube-1.27.1
 2210220210 metadata/md5-cache/sys-cluster/nomad-1.2.6
 2210220210 metadata/md5-cache/sys-cluster/rocm-k8s-device-plugin-0.3.0
+2210260340 metadata/md5-cache/sys-cluster/Manifest.gz
+2210260340 metadata/md5-cache/sys-cluster/k3s-1.25.3_p1
 2105131939 metadata/md5-cache/sys-devel/autoconf-archive-2021.02.19
 2109100910 metadata/md5-cache/sys-devel/autoconf-archive-2021.02.19-r1
 2104060140 metadata/md5-cache/sys-devel/boost-m4-0.4_p20160328
@@ -56716,7 +56722,6 @@
 2208232140 metadata/md5-cache/sys-devel/crossdev-20220709
 2209032310 metadata/md5-cache/sys-devel/autoconf-archive-2022.09.03
 2209091810 metadata/md5-cache/sys-devel/autoconf-dickey-2.52_p20210509
-2209062240 metadata/md5-cache/sys-devel/llvmgold-15
 2209170112 metadata/md5-cache/sys-devel/binutils-config-5.4
 2209170112 metadata/md5-cache/sys-devel/binutils-config-5.4.1
 2209170112 metadata/md5-cache/sys-devel/binutils-config-9999
@@ -56756,7 +56761,6 @@
 2210110022 metadata/md5-cache/sys-devel/bison-3.8.2
 2210110022 metadata/md5-cache/sys-devel/clang-runtime-13.0.1
 2210110022 metadata/md5-cache/sys-devel/clang-runtime-14.0.6
-2210110022 metadata/md5-cache/sys-devel/clang-runtime-15.0.3.9999
 2210110022 metadata/md5-cache/sys-devel/clang-runtime-16.0.0.9999
 2210110022 metadata/md5-cache/sys-devel/cproc-0_pre20220805
 2210110022 metadata/md5-cache/sys-devel/cproc-9999
@@ -56806,14 +56810,12 @@
 2210110022 metadata/md5-cache/sys-devel/smatch-1.72
 2210110022 metadata/md5-cache/sys-devel/smatch-9999
 2210131910 metadata/md5-cache/sys-devel/clang-toolchain-symlinks-14-r2
-2210131910 metadata/md5-cache/sys-devel/clang-toolchain-symlinks-15-r2
 2210131910 metadata/md5-cache/sys-devel/clang-toolchain-symlinks-16-r2
 2210130310 metadata/md5-cache/sys-devel/gettext-0.21.1
 2210131910 metadata/md5-cache/sys-devel/lld-toolchain-symlinks-14-r1
 2210131910 metadata/md5-cache/sys-devel/lld-toolchain-symlinks-15-r1
 2210131910 metadata/md5-cache/sys-devel/lld-toolchain-symlinks-16-r1
 2210131910 metadata/md5-cache/sys-devel/llvm-toolchain-symlinks-14-r1
-2210131910 metadata/md5-cache/sys-devel/llvm-toolchain-symlinks-15-r1
 2210131910 metadata/md5-cache/sys-devel/llvm-toolchain-symlinks-16-r1
 2210141910 metadata/md5-cache/sys-devel/lld-toolchain-symlinks-14-r2
 2210141640 metadata/md5-cache/sys-devel/lld-toolchain-symlinks-15-r2
@@ -56825,24 +56827,13 @@
 2210152041 metadata/md5-cache/sys-devel/distcc-3.4
 2210152041 metadata/md5-cache/sys-devel/distcc-3.4-r1
 2210170310 metadata/md5-cache/sys-devel/gcc-10.4.0
-2210170310 metadata/md5-cache/sys-devel/gcc-10.4.1_p20220922
-2210170310 metadata/md5-cache/sys-devel/gcc-10.4.1_p20220929
 2210170310 metadata/md5-cache/sys-devel/gcc-10.4.1_p20221006
-2210170310 metadata/md5-cache/sys-devel/gcc-10.4.1_p20221013
 2210170310 metadata/md5-cache/sys-devel/gcc-10.5.9999
 2210170310 metadata/md5-cache/sys-devel/gcc-11.3.0
-2210170310 metadata/md5-cache/sys-devel/gcc-11.3.1_p20220909
-2210170310 metadata/md5-cache/sys-devel/gcc-11.3.1_p20220930
 2210170310 metadata/md5-cache/sys-devel/gcc-11.3.1_p20221007
-2210170310 metadata/md5-cache/sys-devel/gcc-11.3.1_p20221014
 2210170310 metadata/md5-cache/sys-devel/gcc-11.4.9999
 2210170310 metadata/md5-cache/sys-devel/gcc-12.2.0
-2210170310 metadata/md5-cache/sys-devel/gcc-12.2.1_p20220917
-2210170310 metadata/md5-cache/sys-devel/gcc-12.2.1_p20220924
-2210170310 metadata/md5-cache/sys-devel/gcc-12.2.1_p20221001
-2210170310 metadata/md5-cache/sys-devel/gcc-12.2.1_p20221015
 2210170310 metadata/md5-cache/sys-devel/gcc-12.3.9999
-2210170310 metadata/md5-cache/sys-devel/gcc-13.0.0_pre20220918
 2210170310 metadata/md5-cache/sys-devel/gcc-13.0.0_pre20221002
 2210170310 metadata/md5-cache/sys-devel/gcc-13.0.9999
 2210170310 metadata/md5-cache/sys-devel/gcc-8.5.0-r1
@@ -56855,21 +56846,15 @@
 2210170310 metadata/md5-cache/sys-devel/kgcc64-12.2.0
 2210152240 metadata/md5-cache/sys-devel/remake-4.3.1.1.5
 2210180240 metadata/md5-cache/sys-devel/ct-ng-1.24.0-r1
-2210181810 metadata/md5-cache/sys-devel/clang-runtime-15.0.3
-2210240910 metadata/md5-cache/sys-devel/Manifest.gz
 2210200941 metadata/md5-cache/sys-devel/binutils-apple-3.2.6
 2210200941 metadata/md5-cache/sys-devel/binutils-apple-8.2.1-r1
 2210231840 metadata/md5-cache/sys-devel/clang-13.0.1
 2210231840 metadata/md5-cache/sys-devel/clang-14.0.6-r1
-2210231840 metadata/md5-cache/sys-devel/clang-15.0.3
-2210231840 metadata/md5-cache/sys-devel/clang-15.0.3.9999
 2210240910 metadata/md5-cache/sys-devel/clang-16.0.0.9999
 2210231840 metadata/md5-cache/sys-devel/clang-16.0.0_pre20221016
 2210240910 metadata/md5-cache/sys-devel/clang-16.0.0_pre20221023
 2210231840 metadata/md5-cache/sys-devel/clang-common-13.0.1
 2210231840 metadata/md5-cache/sys-devel/clang-common-14.0.6
-2210231840 metadata/md5-cache/sys-devel/clang-common-15.0.3-r2
-2210231840 metadata/md5-cache/sys-devel/clang-common-15.0.3.9999
 2210231840 metadata/md5-cache/sys-devel/clang-common-16.0.0.9999
 2210231840 metadata/md5-cache/sys-devel/clang-common-16.0.0_pre20221016-r1
 2210231840 metadata/md5-cache/sys-devel/clang-common-16.0.0_pre20221023-r1
@@ -56881,35 +56866,44 @@
 2210240010 metadata/md5-cache/sys-devel/gcc-12.2.1_p20221008
 2210231410 metadata/md5-cache/sys-devel/gcc-12.2.1_p20221022
 2210200941 metadata/md5-cache/sys-devel/gdb-apple-1752
-2210231840 metadata/md5-cache/sys-devel/lld-13.0.1
-2210231840 metadata/md5-cache/sys-devel/lld-13.0.1-r1
-2210231840 metadata/md5-cache/sys-devel/lld-14.0.6
-2210231840 metadata/md5-cache/sys-devel/lld-14.0.6-r1
 2210231840 metadata/md5-cache/sys-devel/lld-15.0.3
-2210231840 metadata/md5-cache/sys-devel/lld-15.0.3.9999
 2210231840 metadata/md5-cache/sys-devel/lld-16.0.0.9999
 2210231840 metadata/md5-cache/sys-devel/lld-16.0.0_pre20221016
 2210231840 metadata/md5-cache/sys-devel/lld-16.0.0_pre20221023
 2210231840 metadata/md5-cache/sys-devel/llvm-13.0.1
 2210231840 metadata/md5-cache/sys-devel/llvm-14.0.6-r2
-2210231840 metadata/md5-cache/sys-devel/llvm-15.0.3
-2210231840 metadata/md5-cache/sys-devel/llvm-15.0.3.9999
 2210240910 metadata/md5-cache/sys-devel/llvm-16.0.0.9999
 2210231840 metadata/md5-cache/sys-devel/llvm-16.0.0_pre20221016
 2210240910 metadata/md5-cache/sys-devel/llvm-16.0.0_pre20221023
 2210231840 metadata/md5-cache/sys-devel/llvm-common-13.0.1
 2210231840 metadata/md5-cache/sys-devel/llvm-common-14.0.6
-2210231840 metadata/md5-cache/sys-devel/llvm-common-15.0.3
-2210231840 metadata/md5-cache/sys-devel/llvm-common-15.0.3.9999
 2210231840 metadata/md5-cache/sys-devel/llvm-common-16.0.0.9999
 2210231840 metadata/md5-cache/sys-devel/llvm-common-16.0.0_pre20221016
 2210231840 metadata/md5-cache/sys-devel/llvm-common-16.0.0_pre20221023
-2210200710 metadata/md5-cache/sys-devel/make-4.3.91
 2210221210 metadata/md5-cache/sys-devel/mold-1.6.0
 2210200941 metadata/md5-cache/sys-devel/native-cctools-4
 2210200941 metadata/md5-cache/sys-devel/native-cctools-5
 2210191510 metadata/md5-cache/sys-devel/sparse-0.6.4-r2
 2210191510 metadata/md5-cache/sys-devel/sparse-9999
+2210251510 metadata/md5-cache/sys-devel/Manifest.gz
+2210251340 metadata/md5-cache/sys-devel/clang-15.0.3
+2210241640 metadata/md5-cache/sys-devel/clang-15.0.4.9999
+2210251340 metadata/md5-cache/sys-devel/clang-common-15.0.3-r2
+2210241640 metadata/md5-cache/sys-devel/clang-common-15.0.4.9999
+2210251340 metadata/md5-cache/sys-devel/clang-runtime-15.0.3
+2210241640 metadata/md5-cache/sys-devel/clang-runtime-15.0.4.9999
+2210251340 metadata/md5-cache/sys-devel/clang-toolchain-symlinks-15-r2
+2210251510 metadata/md5-cache/sys-devel/flex-2.6.4-r3
+2210251210 metadata/md5-cache/sys-devel/lld-13.0.1-r1
+2210251210 metadata/md5-cache/sys-devel/lld-14.0.6-r1
+2210241640 metadata/md5-cache/sys-devel/lld-15.0.4.9999
+2210251340 metadata/md5-cache/sys-devel/llvm-15.0.3
+2210241640 metadata/md5-cache/sys-devel/llvm-15.0.4.9999
+2210251340 metadata/md5-cache/sys-devel/llvm-common-15.0.3
+2210241640 metadata/md5-cache/sys-devel/llvm-common-15.0.4.9999
+2210251340 metadata/md5-cache/sys-devel/llvm-toolchain-symlinks-15-r1
+2210251340 metadata/md5-cache/sys-devel/llvmgold-15
+2210241510 metadata/md5-cache/sys-devel/make-4.3.92
 2210110022 metadata/md5-cache/sys-fabric/mstflint-4.18.0_p1-r1
 2210110022 metadata/md5-cache/sys-fabric/mstflint-4.20.0_p1
 2210110022 metadata/md5-cache/sys-fabric/opensm-3.3.23-r1
@@ -56937,7 +56931,6 @@
 2112142339 metadata/md5-cache/sys-firmware/ivtv-firmware-20080701-r2
 2112142339 metadata/md5-cache/sys-firmware/zd1201-firmware-0.14-r1
 2112150009 metadata/md5-cache/sys-firmware/zd1211-firmware-1.5-r1
-2204061009 metadata/md5-cache/sys-firmware/raspberrypi-wifi-ucode-20210315.3_p5
 2204190709 metadata/md5-cache/sys-firmware/raspberrypi-wifi-ucode-20210315.3_p5-r1
 2205160740 metadata/md5-cache/sys-firmware/broadcom-bt-firmware-12.0.1.1105_p3
 2205260840 metadata/md5-cache/sys-firmware/ipw2100-firmware-1.3-r1
@@ -56965,8 +56958,9 @@
 2210110022 metadata/md5-cache/sys-firmware/seabios-1.16.0
 2210110022 metadata/md5-cache/sys-firmware/sgabios-0.1_pre10
 2210110022 metadata/md5-cache/sys-firmware/sigrok-firmware-fx2lafw-9999
-2210200941 metadata/md5-cache/sys-firmware/Manifest.gz
 2210200941 metadata/md5-cache/sys-firmware/midisport-firmware-1.2-r1
+2210242040 metadata/md5-cache/sys-firmware/Manifest.gz
+2210242040 metadata/md5-cache/sys-firmware/raspberrypi-wifi-ucode-20210315.3_p7
 1907071039 metadata/md5-cache/sys-fs/aufs-headers-4.14_p20190603
 1805272138 metadata/md5-cache/sys-fs/autorun-3.17
 2102161539 metadata/md5-cache/sys-fs/avfs-1.1.3
@@ -57049,7 +57043,6 @@
 2210110022 metadata/md5-cache/sys-fs/exfatprogs-9999
 2210110022 metadata/md5-cache/sys-fs/f2fs-tools-1.14.0
 2210110022 metadata/md5-cache/sys-fs/f2fs-tools-1.15.0
-2210110022 metadata/md5-cache/sys-fs/f2fs-tools-1.15.0-r1
 2210110022 metadata/md5-cache/sys-fs/f2fs-tools-9999
 2210110022 metadata/md5-cache/sys-fs/fatcat-1.1.1
 2210110022 metadata/md5-cache/sys-fs/fatsort-1.6.4.625
@@ -57128,10 +57121,6 @@
 2210110022 metadata/md5-cache/sys-fs/xfsdump-3.1.11
 2210110022 metadata/md5-cache/sys-fs/yaffs2utils-0.2.9
 2210110022 metadata/md5-cache/sys-fs/zerofree-1.1.1-r1
-2210132140 metadata/md5-cache/sys-fs/btrfs-progs-5.15.1
-2210132140 metadata/md5-cache/sys-fs/btrfs-progs-5.18.1-r1
-2210132140 metadata/md5-cache/sys-fs/btrfs-progs-5.19.1
-2210132140 metadata/md5-cache/sys-fs/btrfs-progs-9999
 2210140110 metadata/md5-cache/sys-fs/mergerfs-2.33.5
 2210140110 metadata/md5-cache/sys-fs/mergerfs-tools-0_p20210502-r3
 2210152041 metadata/md5-cache/sys-fs/bees-0.6.5-r1
@@ -57160,10 +57149,8 @@
 2210180240 metadata/md5-cache/sys-fs/lsscsi-0.32-r1
 2210180140 metadata/md5-cache/sys-fs/vhba-20211218
 2210191210 metadata/md5-cache/sys-fs/ncdu-1.17
-2210221810 metadata/md5-cache/sys-fs/Manifest.gz
 2210200941 metadata/md5-cache/sys-fs/cachefilesd-0.10.10-r1
 2210200941 metadata/md5-cache/sys-fs/cachefilesd-0.10.9
-2210221810 metadata/md5-cache/sys-fs/cryptsetup-2.4.3-r2
 2210200941 metadata/md5-cache/sys-fs/dd-rescue-1.99.8-r1
 2210200740 metadata/md5-cache/sys-fs/dislocker-0.7.3
 2210200740 metadata/md5-cache/sys-fs/dislocker-9999
@@ -57177,6 +57164,16 @@
 2210191510 metadata/md5-cache/sys-fs/zfs-kmod-2.1.5-r1
 2210191510 metadata/md5-cache/sys-fs/zfs-kmod-2.1.6
 2210191510 metadata/md5-cache/sys-fs/zfs-kmod-9999
+2210251440 metadata/md5-cache/sys-fs/Manifest.gz
+2210250910 metadata/md5-cache/sys-fs/btrfs-progs-5.15.1
+2210250910 metadata/md5-cache/sys-fs/btrfs-progs-5.18.1-r1
+2210250910 metadata/md5-cache/sys-fs/btrfs-progs-5.19.1
+2210250910 metadata/md5-cache/sys-fs/btrfs-progs-6.0
+2210250910 metadata/md5-cache/sys-fs/btrfs-progs-9999
+2210251440 metadata/md5-cache/sys-fs/cryptsetup-2.4.3-r2
+2210251210 metadata/md5-cache/sys-fs/f2fs-tools-1.15.0-r1
+2210241540 metadata/md5-cache/sys-fs/mtools-4.0.42
+2210250910 metadata/md5-cache/sys-fs/xfsprogs-5.19.0
 2204290540 metadata/md5-cache/sys-kernel/installkernel-gentoo-5
 2207300540 metadata/md5-cache/sys-kernel/raspberrypi-image-5.15.32_p20220331
 2207300540 metadata/md5-cache/sys-kernel/raspberrypi-image-9999
@@ -57254,11 +57251,7 @@
 2210152041 metadata/md5-cache/sys-kernel/dracut-056-r2
 2210152041 metadata/md5-cache/sys-kernel/dracut-057-r2
 2210152041 metadata/md5-cache/sys-kernel/dracut-9999
-2210152340 metadata/md5-cache/sys-kernel/gentoo-sources-5.10.148
 2210152340 metadata/md5-cache/sys-kernel/gentoo-sources-5.15.74
-2210151410 metadata/md5-cache/sys-kernel/gentoo-sources-5.19.16
-2210152340 metadata/md5-cache/sys-kernel/gentoo-sources-5.4.218
-2210151410 metadata/md5-cache/sys-kernel/gentoo-sources-6.0.2
 2210170410 metadata/md5-cache/sys-kernel/git-sources-6.1_rc1
 2210170910 metadata/md5-cache/sys-kernel/pf-sources-6.0_p2
 2210151310 metadata/md5-cache/sys-kernel/vanilla-sources-5.15.74
@@ -57273,7 +57266,6 @@
 2210190910 metadata/md5-cache/sys-kernel/kpatch-9999
 2210190840 metadata/md5-cache/sys-kernel/rt-sources-5.10.145_p74
 2210190840 metadata/md5-cache/sys-kernel/rt-sources-5.15.73_p52
-2210241440 metadata/md5-cache/sys-kernel/Manifest.gz
 2210191510 metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.148
 2210191510 metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.149
 2210191510 metadata/md5-cache/sys-kernel/gentoo-kernel-5.15.74
@@ -57301,6 +57293,13 @@
 2210191510 metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.9999
 2210241410 metadata/md5-cache/sys-kernel/vanilla-sources-5.19.17
 2210230110 metadata/md5-cache/sys-kernel/vanilla-sources-6.0.3
+2210241810 metadata/md5-cache/sys-kernel/Manifest.gz
+2210241640 metadata/md5-cache/sys-kernel/gentoo-kernel-5.19.17
+2210241810 metadata/md5-cache/sys-kernel/gentoo-kernel-6.0.3
+2210241640 metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.19.17
+2210241810 metadata/md5-cache/sys-kernel/gentoo-kernel-bin-6.0.3
+2210241640 metadata/md5-cache/sys-kernel/vanilla-kernel-5.19.17
+2210241810 metadata/md5-cache/sys-kernel/vanilla-kernel-6.0.3
 2106100309 metadata/md5-cache/sys-libs/fortify-headers-1.1
 1908101709 metadata/md5-cache/sys-libs/libservicelog-1.1.18
 2107081310 metadata/md5-cache/sys-libs/lwp-2.8
@@ -57463,20 +57462,17 @@
 2210191340 metadata/md5-cache/sys-libs/db-5.3.28-r8
 2210181940 metadata/md5-cache/sys-libs/libapparmor-3.0.4
 2210190640 metadata/md5-cache/sys-libs/libxcrypt-4.4.28-r2
-2210231840 metadata/md5-cache/sys-libs/Manifest.gz
 2210200941 metadata/md5-cache/sys-libs/argp-standalone-1.3-r2
 2210231840 metadata/md5-cache/sys-libs/compiler-rt-13.0.1
 2210231840 metadata/md5-cache/sys-libs/compiler-rt-14.0.6
 2210231840 metadata/md5-cache/sys-libs/compiler-rt-14.0.6-r1
 2210231840 metadata/md5-cache/sys-libs/compiler-rt-15.0.3
-2210231840 metadata/md5-cache/sys-libs/compiler-rt-15.0.3.9999
 2210231840 metadata/md5-cache/sys-libs/compiler-rt-16.0.0.9999
 2210231840 metadata/md5-cache/sys-libs/compiler-rt-16.0.0_pre20221016
 2210231840 metadata/md5-cache/sys-libs/compiler-rt-16.0.0_pre20221023
 2210231840 metadata/md5-cache/sys-libs/compiler-rt-sanitizers-13.0.1
 2210231840 metadata/md5-cache/sys-libs/compiler-rt-sanitizers-14.0.6
 2210231840 metadata/md5-cache/sys-libs/compiler-rt-sanitizers-15.0.3
-2210231840 metadata/md5-cache/sys-libs/compiler-rt-sanitizers-15.0.3.9999
 2210231840 metadata/md5-cache/sys-libs/compiler-rt-sanitizers-16.0.0.9999
 2210231840 metadata/md5-cache/sys-libs/compiler-rt-sanitizers-16.0.0_pre20221016
 2210231840 metadata/md5-cache/sys-libs/compiler-rt-sanitizers-16.0.0_pre20221023
@@ -57487,35 +57483,38 @@
 2210200941 metadata/md5-cache/sys-libs/glibc-2.19-r2
 2210231840 metadata/md5-cache/sys-libs/libcxx-13.0.1
 2210231840 metadata/md5-cache/sys-libs/libcxx-14.0.6
-2210231840 metadata/md5-cache/sys-libs/libcxx-15.0.3
-2210231840 metadata/md5-cache/sys-libs/libcxx-15.0.3.9999
 2210231840 metadata/md5-cache/sys-libs/libcxx-16.0.0.9999
 2210231840 metadata/md5-cache/sys-libs/libcxx-16.0.0_pre20221016
 2210231840 metadata/md5-cache/sys-libs/libcxx-16.0.0_pre20221023
 2210231840 metadata/md5-cache/sys-libs/libcxxabi-13.0.1
 2210231840 metadata/md5-cache/sys-libs/libcxxabi-14.0.6
-2210231840 metadata/md5-cache/sys-libs/libcxxabi-15.0.3
-2210231840 metadata/md5-cache/sys-libs/libcxxabi-15.0.3.9999
 2210231840 metadata/md5-cache/sys-libs/libcxxabi-16.0.0.9999
 2210231840 metadata/md5-cache/sys-libs/libcxxabi-16.0.0_pre20221016
 2210231840 metadata/md5-cache/sys-libs/libcxxabi-16.0.0_pre20221023
 2210231840 metadata/md5-cache/sys-libs/libomp-13.0.1
 2210231840 metadata/md5-cache/sys-libs/libomp-14.0.6-r1
 2210231840 metadata/md5-cache/sys-libs/libomp-15.0.3
-2210231840 metadata/md5-cache/sys-libs/libomp-15.0.3.9999
 2210231840 metadata/md5-cache/sys-libs/libomp-16.0.0.9999
 2210231840 metadata/md5-cache/sys-libs/libomp-16.0.0_pre20221016
 2210231840 metadata/md5-cache/sys-libs/libomp-16.0.0_pre20221023
 2210231840 metadata/md5-cache/sys-libs/llvm-libunwind-13.0.1-r1
 2210231840 metadata/md5-cache/sys-libs/llvm-libunwind-14.0.6-r1
-2210231840 metadata/md5-cache/sys-libs/llvm-libunwind-15.0.3
-2210231840 metadata/md5-cache/sys-libs/llvm-libunwind-15.0.3.9999
 2210231840 metadata/md5-cache/sys-libs/llvm-libunwind-16.0.0.9999
 2210231840 metadata/md5-cache/sys-libs/llvm-libunwind-16.0.0_pre20221016
 2210231840 metadata/md5-cache/sys-libs/llvm-libunwind-16.0.0_pre20221023
 2210200941 metadata/md5-cache/sys-libs/obstack-standalone-1.1
 2210200941 metadata/md5-cache/sys-libs/rpmatch-standalone-1.0
 2210231410 metadata/md5-cache/sys-libs/zlib-1.2.13-r1
+2210251340 metadata/md5-cache/sys-libs/Manifest.gz
+2210241640 metadata/md5-cache/sys-libs/compiler-rt-15.0.4.9999
+2210241640 metadata/md5-cache/sys-libs/compiler-rt-sanitizers-15.0.4.9999
+2210251340 metadata/md5-cache/sys-libs/libcxx-15.0.3
+2210241640 metadata/md5-cache/sys-libs/libcxx-15.0.4.9999
+2210251340 metadata/md5-cache/sys-libs/libcxxabi-15.0.3
+2210241640 metadata/md5-cache/sys-libs/libcxxabi-15.0.4.9999
+2210241640 metadata/md5-cache/sys-libs/libomp-15.0.4.9999
+2210251340 metadata/md5-cache/sys-libs/llvm-libunwind-15.0.3
+2210241640 metadata/md5-cache/sys-libs/llvm-libunwind-15.0.4.9999
 2110201309 metadata/md5-cache/sys-power/acpi-1.7-r1
 2104252209 metadata/md5-cache/sys-power/acpitool-0.5.1-r2
 1901132309 metadata/md5-cache/sys-power/hibernate-script-2.0-r6
@@ -57567,7 +57566,6 @@
 2205191340 metadata/md5-cache/sys-process/time-1.9
 2207181711 metadata/md5-cache/sys-process/bashtop-0.9.25
 2208280940 metadata/md5-cache/sys-process/cronbase-0.3.7-r8
-2208270240 metadata/md5-cache/sys-process/parallel-20220722
 2209101640 metadata/md5-cache/sys-process/time-1.9-r1
 2209240640 metadata/md5-cache/sys-process/parallel-20220922
 2210091210 metadata/md5-cache/sys-process/parallel-20220822
@@ -57629,8 +57627,6 @@
 2210152041 metadata/md5-cache/sys-process/audit-3.0.8
 2210152041 metadata/md5-cache/sys-process/audit-3.0.9
 2210152041 metadata/md5-cache/sys-process/below-0.5.0
-2210152041 metadata/md5-cache/sys-process/cronie-1.6.1-r1
-2210152041 metadata/md5-cache/sys-process/cronie-1.6.1-r2
 2210152041 metadata/md5-cache/sys-process/fcron-3.2.1-r8
 2210152041 metadata/md5-cache/sys-process/fcron-3.3.1
 2210152041 metadata/md5-cache/sys-process/incron-0.5.12_p20171113-r1
@@ -57644,7 +57640,6 @@
 2210152041 metadata/md5-cache/sys-process/systemd-cron-1.5.18
 2210152041 metadata/md5-cache/sys-process/uksmd-0_pre20220705-r1
 2210180140 metadata/md5-cache/sys-process/atop-2.7.1-r1
-2210220210 metadata/md5-cache/sys-process/Manifest.gz
 2210220210 metadata/md5-cache/sys-process/ctop-0.7.7
 2210200941 metadata/md5-cache/sys-process/daemontools-encore-1.11
 2210200941 metadata/md5-cache/sys-process/dcron-4.5-r2
@@ -57652,6 +57647,10 @@
 2210210910 metadata/md5-cache/sys-process/glances-3.2.7-r1
 2210200941 metadata/md5-cache/sys-process/runit-2.1.2-r1
 2210200941 metadata/md5-cache/sys-process/unixtop-3.8_beta1-r3
+2210250910 metadata/md5-cache/sys-process/Manifest.gz
+2210241910 metadata/md5-cache/sys-process/cronie-1.6.1-r1
+2210241910 metadata/md5-cache/sys-process/cronie-1.6.1-r2
+2210250910 metadata/md5-cache/sys-process/parallel-20221022
 2108131839 metadata/md5-cache/virtual/bitcoin-leveldb-0-r2
 2107020209 metadata/md5-cache/virtual/blas-3.8
 2108190539 metadata/md5-cache/virtual/checkpassword-0-r1
@@ -57898,9 +57897,11 @@
 2210172240 metadata/md5-cache/virtual/dist-kernel-5.10.149
 2210172240 metadata/md5-cache/virtual/dist-kernel-5.4.219
 2210191410 metadata/md5-cache/virtual/httpd-php-8.1
-2210202140 metadata/md5-cache/virtual/Manifest.gz
 2210202140 metadata/md5-cache/virtual/rust-1.63.0
 2210202140 metadata/md5-cache/virtual/rust-1.64.0
+2210241810 metadata/md5-cache/virtual/Manifest.gz
+2210241640 metadata/md5-cache/virtual/dist-kernel-5.19.17
+2210241810 metadata/md5-cache/virtual/dist-kernel-6.0.3
 2112220410 metadata/md5-cache/www-apache/modsecurity-crs-3.3.2
 2209170112 metadata/md5-cache/www-apache/mod_auth_kerb-5.4-r5
 2209170112 metadata/md5-cache/www-apache/mod_auth_radius-1.6.0
@@ -57928,14 +57929,11 @@
 2210110022 metadata/md5-cache/www-apache/mod_auth_xradius-0.4.6-r2
 2210110022 metadata/md5-cache/www-apache/mod_backtrace-2.01-r2
 2210110022 metadata/md5-cache/www-apache/mod_gnutls-0.12.0-r1
-2210111710 metadata/md5-cache/www-apache/mod_h2-2.0.10
-2210110022 metadata/md5-cache/www-apache/mod_h2-2.0.9
 2210110022 metadata/md5-cache/www-apache/mod_h2-9999
 2210110022 metadata/md5-cache/www-apache/mod_nss-1.0.18
 2210110022 metadata/md5-cache/www-apache/mod_qos-11.66
 2210110022 metadata/md5-cache/www-apache/mod_qos-11.70
 2210110022 metadata/md5-cache/www-apache/mod_qos-11.71
-2210110022 metadata/md5-cache/www-apache/mod_qos-11.72
 2210110022 metadata/md5-cache/www-apache/mod_wsgi-4.7.1-r1
 2210110022 metadata/md5-cache/www-apache/mod_wsgi-4.9.0
 2210110022 metadata/md5-cache/www-apache/mpm_itk-2.4.7_p4-r2
@@ -57948,10 +57946,12 @@
 2210170640 metadata/md5-cache/www-apache/mod_fastcgi_handler-0.6-r3
 2210170640 metadata/md5-cache/www-apache/mod_jk-1.2.48-r1
 2210170640 metadata/md5-cache/www-apache/mod_musicindex-1.4.1-r3
-2210200941 metadata/md5-cache/www-apache/Manifest.gz
 2210200941 metadata/md5-cache/www-apache/anyterm-1.1.29-r1
 2210200941 metadata/md5-cache/www-apache/mod_maxminddb-1.2.0
 2210200941 metadata/md5-cache/www-apache/passenger-6.0.15
+2210251410 metadata/md5-cache/www-apache/Manifest.gz
+2210241810 metadata/md5-cache/www-apache/mod_h2-2.0.11
+2210251410 metadata/md5-cache/www-apache/mod_qos-11.72
 2108080310 metadata/md5-cache/www-apps/airdcpp-webui-2.11.0
 2108031309 metadata/md5-cache/www-apps/airdcpp-webui-2.11.1
 2110011509 metadata/md5-cache/www-apps/airdcpp-webui-2.11.2
@@ -58079,8 +58079,6 @@
 2210152041 metadata/md5-cache/www-apps/sonarr-3.0.9.1549-r2
 2210171610 metadata/md5-cache/www-apps/prowlarr-0.4.7.2016
 2210180840 metadata/md5-cache/www-apps/wordpress-6.0.3
-2210222310 metadata/md5-cache/www-apps/Manifest.gz
-2210201410 metadata/md5-cache/www-apps/cgit-1.2.3-r201
 2210210110 metadata/md5-cache/www-apps/element-1.11.10
 2210220210 metadata/md5-cache/www-apps/gitea-1.17.3
 2210220210 metadata/md5-cache/www-apps/hugo-0.101.0-r1
@@ -58089,6 +58087,8 @@
 2210220210 metadata/md5-cache/www-apps/miniflux-2.0.38
 2210222310 metadata/md5-cache/www-apps/piwigo-13.1.0
 2210220210 metadata/md5-cache/www-apps/trickster-1.1.5
+2210250210 metadata/md5-cache/www-apps/Manifest.gz
+2210250210 metadata/md5-cache/www-apps/cgit-1.2.3-r201
 2110261939 metadata/md5-cache/www-client/lynx-2.9.0_pre9
 2210040744 metadata/md5-cache/www-client/uget-2.2.1-r1
 2210110022 metadata/md5-cache/www-client/epiphany-42.4-r1
@@ -58125,7 +58125,6 @@
 2210132310 metadata/md5-cache/www-client/luakit-2.3
 2210132310 metadata/md5-cache/www-client/luakit-9999
 2210140310 metadata/md5-cache/www-client/lynx-2.9.0_pre10
-2210221740 metadata/md5-cache/www-client/Manifest.gz
 2210200941 metadata/md5-cache/www-client/chromium-106.0.5249.103
 2210200941 metadata/md5-cache/www-client/chromium-106.0.5249.119
 2210200941 metadata/md5-cache/www-client/chromium-107.0.5304.29
@@ -58135,10 +58134,6 @@
 2210200941 metadata/md5-cache/www-client/dillo-3.0.5-r3
 2210200941 metadata/md5-cache/www-client/dillo-3.1_pre20181005
 2210200941 metadata/md5-cache/www-client/dillo-9999
-2210200941 metadata/md5-cache/www-client/firefox-102.3.0
-2210200941 metadata/md5-cache/www-client/firefox-102.4.0
-2210200941 metadata/md5-cache/www-client/firefox-105.0.2
-2210200941 metadata/md5-cache/www-client/firefox-106.0
 2210201210 metadata/md5-cache/www-client/firefox-106.0.1
 2210200941 metadata/md5-cache/www-client/firefox-bin-102.4.0
 2210201410 metadata/md5-cache/www-client/firefox-bin-106.0.1-r1
@@ -58166,6 +58161,8 @@
 2210200941 metadata/md5-cache/www-client/vivaldi-5.5.2805.38
 2210200941 metadata/md5-cache/www-client/vivaldi-snapshot-5.6.2824.8
 2210221740 metadata/md5-cache/www-client/vivaldi-snapshot-5.6.2829.3
+2210251440 metadata/md5-cache/www-client/Manifest.gz
+2210251440 metadata/md5-cache/www-client/firefox-102.4.0
 2104161439 metadata/md5-cache/www-misc/awstats-7.8-r1
 1910071209 metadata/md5-cache/www-misc/profile-sync-daemon-5.75
 1910090839 metadata/md5-cache/www-misc/profile-sync-daemon-6.35
@@ -58373,8 +58370,9 @@
 2210110022 metadata/md5-cache/x11-base/xwayland-22.1.3
 2210110022 metadata/md5-cache/x11-base/xwayland-9999
 2210190340 metadata/md5-cache/x11-base/xorg-apps-1
-2210201640 metadata/md5-cache/x11-base/Manifest.gz
 2210201640 metadata/md5-cache/x11-base/xorg-fonts-2
+2210251710 metadata/md5-cache/x11-base/Manifest.gz
+2210251710 metadata/md5-cache/x11-base/xwayland-22.1.4
 2207242118 metadata/md5-cache/x11-drivers/xf86-input-mtrack-0.5.0
 2210110022 metadata/md5-cache/x11-drivers/xf86-input-elographics-1.4.2
 2210110022 metadata/md5-cache/x11-drivers/xf86-input-evdev-2.10.6
@@ -58408,13 +58406,13 @@
 2210110022 metadata/md5-cache/x11-drivers/xf86-video-vesa-2.5.0
 2210110022 metadata/md5-cache/x11-drivers/xf86-video-vmware-13.3.0-r1
 2210152041 metadata/md5-cache/x11-drivers/xf86-input-wacom-1.1.0
-2210201640 metadata/md5-cache/x11-drivers/Manifest.gz
 2210201640 metadata/md5-cache/x11-drivers/nvidia-drivers-390.154
 2210201640 metadata/md5-cache/x11-drivers/nvidia-drivers-470.141.03
 2210201640 metadata/md5-cache/x11-drivers/nvidia-drivers-510.85.02
-2210201640 metadata/md5-cache/x11-drivers/nvidia-drivers-515.49.19
 2210201640 metadata/md5-cache/x11-drivers/nvidia-drivers-515.65.01
 2210201640 metadata/md5-cache/x11-drivers/nvidia-drivers-520.56.06
+2210252310 metadata/md5-cache/x11-drivers/Manifest.gz
+2210252310 metadata/md5-cache/x11-drivers/nvidia-drivers-515.49.24
 2102271539 metadata/md5-cache/x11-libs/fox-wrapper-3
 2002101739 metadata/md5-cache/x11-libs/libGLw-8.0.0-r1
 2101061509 metadata/md5-cache/x11-libs/libast-0.7-r2
@@ -58575,7 +58573,6 @@
 2210182140 metadata/md5-cache/x11-libs/libxshmfence-1.3.1
 2210191340 metadata/md5-cache/x11-libs/tslib-1.22
 2210182140 metadata/md5-cache/x11-libs/xcb-util-cursor-0.1.4
-2210211810 metadata/md5-cache/x11-libs/Manifest.gz
 2210200941 metadata/md5-cache/x11-libs/gtkglext-1.2.0-r5
 2210200941 metadata/md5-cache/x11-libs/gtkmathview-0.8.0-r4
 2210200941 metadata/md5-cache/x11-libs/libcryptui-3.12.2-r2
@@ -58587,6 +58584,10 @@
 2210211810 metadata/md5-cache/x11-libs/qwtpolar-1.1.1-r3
 2210200941 metadata/md5-cache/x11-libs/rep-gtk-0.90.8.3
 2210200941 metadata/md5-cache/x11-libs/vte-0.28.2-r209
+2210252340 metadata/md5-cache/x11-libs/Manifest.gz
+2210252340 metadata/md5-cache/x11-libs/gdk-pixbuf-2.42.10
+2210251710 metadata/md5-cache/x11-libs/libXrender-0.9.11
+2210251840 metadata/md5-cache/x11-libs/vte-0.70.1
 1703221038 metadata/md5-cache/x11-misc/3dfm-1.0-r1
 1910111911 metadata/md5-cache/x11-misc/bblaunch-0.0.3
 2002230040 metadata/md5-cache/x11-misc/dxpc-3.9.2-r2
@@ -58781,8 +58782,6 @@
 2210110022 metadata/md5-cache/x11-misc/qps-2.5.0
 2210110022 metadata/md5-cache/x11-misc/qt5ct-1.5
 2210110022 metadata/md5-cache/x11-misc/qterm-0.7.3-r1
-2210110022 metadata/md5-cache/x11-misc/qtfm-6.2.0
-2210110022 metadata/md5-cache/x11-misc/qtfm-6.2.1
 2210110022 metadata/md5-cache/x11-misc/qtfm-99999
 2210110022 metadata/md5-cache/x11-misc/qxkb-0.5.1_pre20190821
 2210110022 metadata/md5-cache/x11-misc/read-edid-3.0.2-r1
@@ -58956,7 +58955,6 @@
 2210190640 metadata/md5-cache/x11-misc/xscreensaver-6.02-r1
 2210190640 metadata/md5-cache/x11-misc/xscreensaver-6.03
 2210190640 metadata/md5-cache/x11-misc/xscreensaver-6.04
-2210231940 metadata/md5-cache/x11-misc/Manifest.gz
 2210201410 metadata/md5-cache/x11-misc/autorandr-1.12.1-r2
 2210201410 metadata/md5-cache/x11-misc/autorandr-9999
 2210200941 metadata/md5-cache/x11-misc/barrier-2.4.0
@@ -58984,6 +58982,8 @@
 2210200941 metadata/md5-cache/x11-misc/xdesktopwaves-1.4
 2210200941 metadata/md5-cache/x11-misc/xnee-3.19-r2
 2210200941 metadata/md5-cache/x11-misc/xowl-9999
+2210252210 metadata/md5-cache/x11-misc/Manifest.gz
+2210252110 metadata/md5-cache/x11-misc/qtfm-6.2.1
 1908180209 metadata/md5-cache/x11-plugins/e16-epplets-0.16
 1905230009 metadata/md5-cache/x11-plugins/gkrellm-plugins-2.0
 2104120442 metadata/md5-cache/x11-plugins/guifications-2.16
@@ -59195,7 +59195,6 @@
 2210171210 metadata/md5-cache/x11-terms/kitty-shell-integration-0.26.4
 2210151010 metadata/md5-cache/x11-terms/kitty-terminfo-0.26.3
 2210171210 metadata/md5-cache/x11-terms/kitty-terminfo-0.26.4
-2210210310 metadata/md5-cache/x11-terms/Manifest.gz
 2210200941 metadata/md5-cache/x11-terms/alacritty-0.10.1
 2210210310 metadata/md5-cache/x11-terms/alacritty-0.11.0
 2210200941 metadata/md5-cache/x11-terms/alacritty-9999
@@ -59210,8 +59209,9 @@
 2210200941 metadata/md5-cache/x11-terms/st-0.9
 2210200941 metadata/md5-cache/x11-terms/st-9999
 2210200941 metadata/md5-cache/x11-terms/xterm-372
-2210200941 metadata/md5-cache/x11-terms/xterm-373
-2210200941 metadata/md5-cache/x11-terms/xterm-374
+2210251840 metadata/md5-cache/x11-terms/Manifest.gz
+2210251840 metadata/md5-cache/x11-terms/gnome-terminal-3.46.3
+2210241540 metadata/md5-cache/x11-terms/xterm-375
 2104262239 metadata/md5-cache/x11-themes/blueglass-xcursors-0.4-r1
 2107020739 metadata/md5-cache/x11-themes/comix-xcursors-0.9.2
 2012311940 metadata/md5-cache/x11-themes/commonbox-styles-0.6
@@ -59540,8 +59540,6 @@
 2210040744 metadata/md5-cache/xfce-extra/xfdashboard-1.0.0
 2210091210 metadata/md5-cache/xfce-extra/xfce4-notifyd-0.6.4
 2210091940 metadata/md5-cache/xfce-extra/xfce4-pulseaudio-plugin-0.4.5
-2210082240 metadata/md5-cache/xfce-extra/xfce4-screenshooter-1.9.11
-2210110022 metadata/md5-cache/xfce-extra/Manifest.gz
 2210110022 metadata/md5-cache/xfce-extra/thunar-vcs-plugin-0.2.0
 2210110022 metadata/md5-cache/xfce-extra/xfce4-alsa-plugin-0.3.0-r1
 2210110022 metadata/md5-cache/xfce-extra/xfce4-battery-plugin-1.1.4
@@ -59549,6 +59547,8 @@
 2210110022 metadata/md5-cache/xfce-extra/xfce4-timer-plugin-1.7.1
 2210110022 metadata/md5-cache/xfce-extra/xfce4-whiskermenu-plugin-2.7.1
 2210110022 metadata/md5-cache/xfce-extra/xfce4-windowck-plugin-0.5.0
+2210251110 metadata/md5-cache/xfce-extra/Manifest.gz
+2210251110 metadata/md5-cache/xfce-extra/xfce4-screenshooter-1.9.11
 2112201210 metadata/md5-cache/app-containers/docker-bench-security-1.3.2
 2112201210 metadata/md5-cache/app-containers/docker-bench-security-1.3.3
 2112201210 metadata/md5-cache/app-containers/s6-overlay-2.1.0.2-r1
@@ -59577,7 +59577,6 @@
 2210152041 metadata/md5-cache/app-containers/docker-registry-2.8.1
 2210152041 metadata/md5-cache/app-containers/lxc-5.0.1
 2210152041 metadata/md5-cache/app-containers/lxc-5.0.1-r1
-2210220210 metadata/md5-cache/app-containers/Manifest.gz
 2210220210 metadata/md5-cache/app-containers/buildah-1.27.1
 2210220210 metadata/md5-cache/app-containers/buildah-1.28.0
 2210220210 metadata/md5-cache/app-containers/cadvisor-0.36.0
@@ -59627,6 +59626,8 @@
 2210220210 metadata/md5-cache/app-containers/syft-0.54.0
 2210220210 metadata/md5-cache/app-containers/syft-0.59.0
 2210220210 metadata/md5-cache/app-containers/umoci-0.4.6
+2210250310 metadata/md5-cache/app-containers/Manifest.gz
+2210250310 metadata/md5-cache/app-containers/snapd-2.57.5
 2204291439 metadata/md5-cache/sec-keys/openpgp-keys-adamspiers-20210426
 2204291439 metadata/md5-cache/sec-keys/openpgp-keys-alexbarton-20210416
 2204291439 metadata/md5-cache/sec-keys/openpgp-keys-antoniodiazdiaz-20220406
@@ -59730,6 +59731,7 @@
 2210110022 metadata/md5-cache/sec-keys/openpgp-keys-gentoo-developers-99999999
 2210170410 metadata/md5-cache/sec-keys/openpgp-keys-gnutls-20221017
 2210161710 metadata/md5-cache/sec-keys/openpgp-keys-knot-resolver-20221016
-2210210840 metadata/md5-cache/sec-keys/Manifest.gz
 2210210840 metadata/md5-cache/sec-keys/openpgp-keys-icu-20221020
-2210241440 metadata/md5-cache/Manifest.gz
+2210251140 metadata/md5-cache/sec-keys/Manifest.gz
+2210251140 metadata/md5-cache/sec-keys/openpgp-keys-python-20221025
+2210260710 metadata/md5-cache/Manifest.gz
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 52685b22e7d8..d8388e4f8601 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Mon, 24 Oct 2022 12:00:01 +0000
+Wed, 26 Oct 2022 05:00:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 895ce073a749..b87735062406 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-5c7f97ac6ae4cc1e3f8fa1218a56eeb8063e38ae 1666611291 2022-10-24T11:34:51+00:00
+684c7da90492fd3ac4f2faeb8e78647f334e0613 1666757037 2022-10-26T04:03:57+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index a6cb83c531bb..c80fdd5cec2a 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1666611601 Mon 24 Oct 2022 11:40:01 AM UTC
+1666759201 Wed 26 Oct 2022 04:40:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index ab52cd2cd0a6..877fc60a9ed4 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Mon, 24 Oct 2022 11:39:39 +0000
+Wed, 26 Oct 2022 04:39:44 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 06ea5a08e735..1a6ecbcce007 100644
Binary files a/net-analyzer/Manifest.gz and b/net-analyzer/Manifest.gz differ
diff --git a/net-analyzer/vnstat/Manifest b/net-analyzer/vnstat/Manifest
index 9e640811acc2..e330322cb1b4 100644
--- a/net-analyzer/vnstat/Manifest
+++ b/net-analyzer/vnstat/Manifest
@@ -4,8 +4,11 @@ AUX vnstatd.confd-r1 569 BLAKE2B 8f30a05a587477d8c76f97542017aece78ef3c69a608e97
 AUX vnstatd.initd-r2 874 BLAKE2B 4ce5936af3a375d30bc8ab1b5ea1ddf1c2b4910394b8a9e67f94998f8af0e9ca2968a65618e3fbd3ead2f2c3a6e8d674b861dc85b0a57c9fcb63a3e6ce93887b SHA512 1d670980c73a40c92029a3b2141e84d428f41d68528daf199fb6659f164bec903eeef437200da4043d2e6fd3f5abf32c7b6e75dc00054417ff4f38ad55b0a535
 AUX vnstatd.systemd 262 BLAKE2B e54c30a1bfa6c7a8bba32fa93c3d2417506c55e9499754419b24179147a5b35f0c51cf61a3f7c4840c88f81d09101c427ba64b41f0922303b8c353caafb883db SHA512 35f9714641d1b3288bed659bd010ef1b8f0316f915622dcf5d3250e1acdd3b438762ae934fab2f6cd350274c7ec0f70a7d8946448bbc6db67be6f91cd86aa47c
 AUX vnstatd.tmpfile 35 BLAKE2B c56373ebe1abe1111f6927839d79094b6ffd11527ce4e21016c31fc227f9564218ca479455b7cf4eb697d18d8389ba65266b91d71c5bf22c83a9337ae1d861d9 SHA512 e13b52e3c4fe8743074ab2704b6a6cbe0c855589fe19e05bba98f0193473437f350dfdc9675689172c54ed83491d9caef0cbb842f6c2533b98366cd78a4f0bac
+DIST vnstat-2.10.tar.gz 304464 BLAKE2B 82fcb54cf00a8122f31dc27f41f830ef68b92452bf7ae22bf2f1be13a1526bd12e8365002edef7766156f2df15472b189b3f219074532cb00a81156775b08997 SHA512 86c761290ec059a3252049b4f2a0a2aecdd7f8c159ee3db904339b1a9b14157a2125b919dd52754a29320ccdb41c89739bca78548b5a44b158b493f48be24a78
+DIST vnstat-2.10.tar.gz.asc 833 BLAKE2B bb3b7ef9d52c7ba4e8fb3ae7c8693e36803374c0ced0a0d6c4c16c8ca554290ab805e6f732ea2d188d78246e34b7a747673cf99725fcb74f65192cba1fbaeac4 SHA512 2b3c0f381bad8ce542cc0fa287a7a9a16f4381a8aecb342dbb5622464131a7c7cdbf01cb12f5b75964d0e2b6792d28e37f4f8e6ca607cb8122462013b0077773
 DIST vnstat-2.9.tar.gz 300796 BLAKE2B 1671fe49f3add0087431b57aaa69d4c6280066a299e6899c00cd5bf6ec21380d1457295f884f683ebfb89959eea08a9d900e898a865e3f6ff2a82ecf354d974a SHA512 883f273c02f6d91478991d95deffba9d90457a1bb0b9dd818c01398365df97ffb72dda88299231d9076756192b05524b6f8820470c9caf6ee6a12e5914a82176
 DIST vnstat-2.9.tar.gz.asc 833 BLAKE2B 4dd17e02e6c0c5232354ea8c4dea1d86ac43015ac66c60dc227b143aa5352e5a1eb0870932662778b2350928b124e2bbc56dfa13cfe7c2fd74538d84c00f9b4c SHA512 bf57974afb028fef7ec311a15bb1dcf275f10b845c5512efe73711b622b5912c4de0ff0553db4152389d2421a468c888191eab8fca08212e164f997ad1e04778
+EBUILD vnstat-2.10.ebuild 1988 BLAKE2B f6a1eec6f4af0fed11eb24ec5ea5d77572b8e58e70a5098d3508c974b776cbe152ee4a80ea36adeb13d86e96fefe3b456aa64df4cbda0d00b0f2a622cf70458d SHA512 c0cdb810fe2560b1713258e7980a478a79ff5231f2d786ca750de972978e19b7cc716c366cdee7a97209e67a988c7ed2dff564b500764dd41f81d4693fdce579
 EBUILD vnstat-2.9.ebuild 1815 BLAKE2B 9be3168b107e6104b5cffba20c184deb102d1d0e0c65fe801c6d00924ff22b53f560b5a746babc84a16818b0c02ceed587036cdcbae0895a1ef79150283491e5 SHA512 ef0dadfb970c72a758faded22a3dde9c229c9e9a69ae4ae39dae6567873add83432ea097f07faab68b5c82a375c0daf32775fb5e882043cdc46cc0d3b237411f
-EBUILD vnstat-9999.ebuild 1823 BLAKE2B b8d0a5fabc933e6be298e19ea314631e24dd4fac256c4c22dc5b164dbf593bf17fd80a8a123b95af77ee68b1f8683e975b48af88a97cf2ce7b86707d91c3a4cf SHA512 d39be391d90d488dd8c26ccc523cd81fe8ba2f9a2c3c01c750b1c2b05ae1e2e4de402e9d52e9f43abd4e3ac3a6d57110b3d02fa45c60aa2f59f6cec68df96d5c
+EBUILD vnstat-9999.ebuild 1988 BLAKE2B f6a1eec6f4af0fed11eb24ec5ea5d77572b8e58e70a5098d3508c974b776cbe152ee4a80ea36adeb13d86e96fefe3b456aa64df4cbda0d00b0f2a622cf70458d SHA512 c0cdb810fe2560b1713258e7980a478a79ff5231f2d786ca750de972978e19b7cc716c366cdee7a97209e67a988c7ed2dff564b500764dd41f81d4693fdce579
 MISC metadata.xml 836 BLAKE2B f87c7da72d6510825ef2a437e02a0b29febae258debbf922885923aac4032eda5f122f29d6f0d0cf4c9876fdba09b030246f851083ae424ec1859073273e0e30 SHA512 21e9f14e00563ea52ebe117d0b80739566d043956c16cc95ad7a67bf9df6360e96ad700d2c739ab20ae2dc2c321432f5c98b67c5cc59853b1fdced8ca70fce01
diff --git a/net-analyzer/vnstat/vnstat-2.10.ebuild b/net-analyzer/vnstat/vnstat-2.10.ebuild
new file mode 100644
index 000000000000..2db2af4d81b3
--- /dev/null
+++ b/net-analyzer/vnstat/vnstat-2.10.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit systemd tmpfiles
+
+DESCRIPTION="Console-based network traffic monitor that keeps statistics of network usage"
+HOMEPAGE="https://humdi.net/vnstat/"
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/vergoh/vnstat"
+	inherit git-r3
+else
+	VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/teemutoivola.asc
+	inherit verify-sig
+
+	SRC_URI="https://humdi.net/vnstat/${P}.tar.gz"
+	SRC_URI+=" https://github.com/vergoh/vnstat/releases/download/v${PV}/${P}.tar.gz"
+	SRC_URI+=" verify-sig? (
+			https://humdi.net/vnstat/${P}.tar.gz.asc
+			https://github.com/vergoh/vnstat/releases/download/v${PV}/${P}.tar.gz.asc
+		)"
+
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-teemutoivola )"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="gd selinux test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	acct-group/vnstat
+	acct-user/vnstat
+	dev-db/sqlite
+	gd? ( media-libs/gd[png] )
+"
+DEPEND="
+	${RDEPEND}
+	test? ( dev-libs/check )
+"
+RDEPEND+=" selinux? ( sec-policy/selinux-vnstatd )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.9-conf.patch
+)
+
+src_compile() {
+	emake \
+		${PN} \
+		${PN}d \
+		$(usex gd ${PN}i '')
+}
+
+src_install() {
+	use gd && dobin vnstati
+	dobin vnstat vnstatd
+
+	exeinto /usr/share/${PN}
+	newexe "${FILESDIR}"/vnstat.cron-r1 vnstat.cron
+
+	insinto /etc
+	doins cfg/vnstat.conf
+	fowners root:vnstat /etc/vnstat.conf
+
+	keepdir /var/lib/vnstat
+	fowners vnstat:vnstat /var/lib/vnstat
+
+	newconfd "${FILESDIR}"/vnstatd.confd-r1 vnstatd
+	newinitd "${FILESDIR}"/vnstatd.initd-r2 vnstatd
+
+	systemd_newunit "${FILESDIR}"/vnstatd.systemd vnstatd.service
+	newtmpfiles "${FILESDIR}"/vnstatd.tmpfile vnstatd.conf
+
+	use gd && doman man/vnstati.1
+
+	doman man/vnstat.1 man/vnstatd.8
+
+	newdoc INSTALL README.setup
+	dodoc CHANGES README UPGRADE FAQ examples/vnstat.cgi
+}
+
+pkg_postinst() {
+	tmpfiles_process vnstatd.conf
+}
diff --git a/net-analyzer/vnstat/vnstat-9999.ebuild b/net-analyzer/vnstat/vnstat-9999.ebuild
index 3ff50568be35..2db2af4d81b3 100644
--- a/net-analyzer/vnstat/vnstat-9999.ebuild
+++ b/net-analyzer/vnstat/vnstat-9999.ebuild
@@ -16,7 +16,11 @@ else
 	inherit verify-sig
 
 	SRC_URI="https://humdi.net/vnstat/${P}.tar.gz"
-	SRC_URI+=" verify-sig? ( https://humdi.net/vnstat/${P}.tar.gz.asc )"
+	SRC_URI+=" https://github.com/vergoh/vnstat/releases/download/v${PV}/${P}.tar.gz"
+	SRC_URI+=" verify-sig? (
+			https://humdi.net/vnstat/${P}.tar.gz.asc
+			https://github.com/vergoh/vnstat/releases/download/v${PV}/${P}.tar.gz.asc
+		)"
 
 	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index a65fc717a137..f0d3ad4ba9d3 100644
Binary files a/net-dns/Manifest.gz and b/net-dns/Manifest.gz differ
diff --git a/net-dns/dnsmasq/Manifest b/net-dns/dnsmasq/Manifest
index 9c7d1d855689..163fd3365e0a 100644
--- a/net-dns/dnsmasq/Manifest
+++ b/net-dns/dnsmasq/Manifest
@@ -5,6 +5,8 @@ AUX dnsmasq.logrotate 176 BLAKE2B 4932be8c2a4ba37e0ed61361cdfae6e6cd498e5292f900
 AUX dnsmasq.service-r1 278 BLAKE2B 3bfe6a01efd5f8338c3bb134a061f8ecbef850293c4a8fce1f7360928a374fe4c429df1f8ec2ffc093752234f9e2ccc717a887fa2557e3efd99ab6bd58f9ac0f SHA512 3571417b23071d9c3cfaf6d00363adb2cb011d04f1ed38631ddecd6eaa2c9ed37e1435a1fd32c40b0de43b0a84dd1ac8691a0a29493b391bafbb843d581bafc1
 DIST dnsmasq-2.85.tar.xz 518316 BLAKE2B b7c081132c65d67b65f797bdbc603930c1509717bc1b5209b12f72fa3f01b4bae2f26a5387f95ef20317cd3d60e097c0b8bef5e019a35013f3ed2acce9fe9e89 SHA512 8beefe76b46f7d561f40d0900ba68b260a199cb62ab5b653746e3a1104c04fb8899b9e7a160a1be4fe8782bfb1607b556e9ffb9c25c4e99653e4bc74fcc03b09
 DIST dnsmasq-2.86.tar.xz 531404 BLAKE2B 27307c70cc90d6e27dbf8e87589b8c72622e93f402c3a431e06facc58a62af46a478d1fdbfb9808a91ff3d2f5da88a8d12de9755009b558d685903e4d2a34de3 SHA512 487eae0afbc8bb3d5282a729ffb0cb2c9bdc7d8e46e2e8aa114cd7c5d82e0fd66f49926e7fa4028577548d6f57e8a865aca17f33963a589874584d608ab2deaf
+DIST dnsmasq-2.87.tar.xz 540528 BLAKE2B 9d348f1746f819ea5da90ac341bd82254ec83acd8193732f99312d5c56073c8f3f374bf89cecec4fe58632c9e9f84e312a5474c561420dfd8537e221ecf68e2f SHA512 965071ff35aed558a661e7f57ff82de170f4ad7fcdd6a4070ce7915c9f5e41450d8d86b2a0c2c30bf52ddc3aaeb22af18bb6da71a1cccb3c409429ef0ef308f3
 EBUILD dnsmasq-2.85.ebuild 4656 BLAKE2B 8dafe90669b9cd371966234f3d076b4c9c67b2fd0d5130132a0cd7994e883438dcad3685619cb72c7e251c34ab2cbfa31add28c60fc3262a992321432da4f574 SHA512 93b2d5567a602d94d1ed4924bc14b934f3bc18cfa285006ae84815e81c589fd8ff22f1586c5621555b64dca0d6d6361893aa5ac5963aa1e665d7b403b7ebc03d
 EBUILD dnsmasq-2.86-r1.ebuild 4797 BLAKE2B c6bc501df8d1c53ea6097c5aee31fc7eb01323a0351a393457e44df151e6236bae3206982ef9830aa0419939da820c114d5c81bf2eaeef37ea2d0e3bb42a60d0 SHA512 c082f6952dcd8f23f0697c12825fe92472f812b0c4648de309c30a4f8854569346a15765476ac6acdf5c32c878a2aca43eeb5b049d527e5e8694758cc7343a27
+EBUILD dnsmasq-2.87.ebuild 4804 BLAKE2B bf4fa9076366569ed6af2d16c908dc79857993f6bccec41f53273f41d627e94af1cc83c53725bf68d760749e2f858cbf7f410fe92d093c15dedddbbeebe93590 SHA512 d1e4f1bf65fe0937e4b15bbe837e1345e9bf486da46a9c2ec287a89830fb2e3845579098173caf138d12c9e15448cec6611c13d4d662a386a0e6ed9cbf9d6dd8
 MISC metadata.xml 1449 BLAKE2B 532b630e5c03652df74dec95bbb6c1c03b0d8a8fbc78ed1b2d40f47fdfbc20ce21172259f630acb5d14eb32b849d1d5b34482ffe77d4b5eee64051e839f17607 SHA512 e58549ceaf7a252f0b8b4c3a678cbc57bca66bf749bffbf8ec5544e79a380af695e3412c8d59d941bd08ed6cb95ab27bc2a13fbc46a4f5368d9e209e3e33bc99
diff --git a/net-dns/dnsmasq/dnsmasq-2.87.ebuild b/net-dns/dnsmasq/dnsmasq-2.87.ebuild
new file mode 100644
index 000000000000..5aa821ad8ac8
--- /dev/null
+++ b/net-dns/dnsmasq/dnsmasq-2.87.ebuild
@@ -0,0 +1,224 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{1..4} luajit )
+
+inherit toolchain-funcs lua-single systemd
+
+DESCRIPTION="Small forwarding DNS server"
+HOMEPAGE="https://thekelleys.org.uk/dnsmasq/doc.html"
+SRC_URI="https://thekelleys.org.uk/dnsmasq/${P}.tar.xz"
+
+LICENSE="|| ( GPL-2 GPL-3 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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"
+
+DM_LINGUAS=(de es fi fr id it no pl pt_BR ro)
+
+BDEPEND="
+	app-arch/xz-utils
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+
+COMMON_DEPEND="
+	acct-group/dnsmasq
+	acct-user/dnsmasq
+	dbus? ( sys-apps/dbus:= )
+	idn? (
+		!libidn2? ( net-dns/libidn:0= )
+		libidn2? ( >=net-dns/libidn2-2.0:= )
+	)
+	lua? ( ${LUA_DEPS} )
+	conntrack? ( net-libs/libnetfilter_conntrack:= )
+	nls? ( sys-devel/gettext )
+"
+
+DEPEND="${COMMON_DEPEND}
+	dnssec? (
+		dev-libs/nettle:=[gmp]
+		static? ( >=dev-libs/nettle-3.4[static-libs(+)] )
+	)
+	nettlehash? (
+		static? ( >=dev-libs/nettle-3.4[static-libs(+)] )
+	)
+"
+
+RDEPEND="${COMMON_DEPEND}
+	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_REQUIRED_USE}
+	)
+	libidn2? ( idn )
+"
+
+use_have() {
+	local no_only
+	if [[ ${1} == '-n' ]]; then
+		no_only=1
+		shift
+	fi
+	local useflag="${1}"
+	shift
+
+	local uword="${1:-${useflag}}"
+	shift
+
+	while [[ ${uword} ]]; do
+		uword="${uword^^}"
+
+		if ! use "${useflag}"; then
+			printf -- " -DNO_%s" "${uword}"
+		elif [[ -z "${no_only}" ]]; then
+			printf -- " -DHAVE_%s" "${uword}"
+		fi
+		uword="${1}"
+		shift
+	done
+}
+
+pkg_setup() {
+	use lua && lua-single_pkg_setup
+}
+
+pkg_pretend() {
+	if use static; then
+		einfo "Only sys-libs/gmp and dev-libs/nettle are statically linked."
+		use dnssec || einfo "Thus, ${P}[!dnssec,static] makes no sense;" \
+			"in this case the static USE flag does nothing."
+	fi
+}
+
+src_prepare() {
+	default
+
+	sed -i -r 's:lua5.[0-9]+:lua:' Makefile || die
+	sed -i "s:%%PREFIX%%:${EPREFIX}/usr:" \
+		dnsmasq.conf.example || die
+}
+
+src_configure() {
+	COPTS=(
+		$(use_have -n auth-dns auth)
+		$(use_have conntrack)
+		$(use_have dbus)
+		$(use libidn2 || use_have idn)
+		$(use_have libidn2)
+		$(use_have -n inotify)
+		$(use_have -n dhcp dhcp dhcp6)
+		$(use_have -n ipv6 ipv6 dhcp6)
+		$(use_have -n id id)
+		$(use_have -n loop)
+		$(use_have lua luascript)
+		$(use_have -n script)
+		$(use_have -n tftp)
+		$(use_have dnssec)
+		$(use_have nettlehash)
+		$(use_have static dnssec_static)
+		$(use_have -n dumpfile)
+	)
+}
+
+src_compile() {
+	emake \
+		PREFIX=/usr \
+		MANDIR=/usr/share/man \
+		CC="$(tc-getCC)" \
+		PKG_CONFIG="$(tc-getPKG_CONFIG)" \
+		CFLAGS="${CFLAGS}" \
+		LDFLAGS="${LDFLAGS}" \
+		COPTS="${COPTS[*]}" \
+		CONFFILE="/etc/${PN}.conf" \
+		all$(use nls && printf -- "-i18n\n")
+
+	use dhcp-tools && emake -C contrib/lease-tools \
+		PREFIX=/usr \
+		MANDIR=/usr/share/man \
+		CC="$(tc-getCC)" \
+		PKG_CONFIG="$(tc-getPKG_CONFIG)" \
+		CFLAGS="${CFLAGS}" \
+		LDFLAGS="${LDFLAGS}" \
+		all
+}
+
+src_install() {
+	local lingua puid
+	emake \
+		PREFIX=/usr \
+		MANDIR=/usr/share/man \
+		COPTS="${COPTS[*]}" \
+		DESTDIR="${ED}" \
+		install$(use nls && printf -- "-i18n\n")
+
+	for lingua in "${DM_LINGUAS[@]}"; do
+		has ${lingua} ${LINGUAS-${lingua}} \
+			|| rm -rf "${ED}"/usr/share/locale/${lingua}
+	done
+	[[ -d "${D}"/usr/share/locale/ ]] && \
+		rmdir --ignore-fail-on-non-empty "${ED}"/usr/share/locale/
+
+	dodoc CHANGELOG CHANGELOG.archive FAQ dnsmasq.conf.example
+	dodoc -r logo
+
+	docinto html/
+	dodoc *.html
+
+	newinitd "${FILESDIR}"/dnsmasq-init-r4 ${PN}
+	newconfd "${FILESDIR}"/dnsmasq.confd-r1 ${PN}
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/dnsmasq.logrotate ${PN}
+
+	insinto /etc
+	newins dnsmasq.conf.example dnsmasq.conf
+
+	insinto /usr/share/dnsmasq
+	doins trust-anchors.conf
+
+	if use dhcp; then
+		keepdir /var/lib/misc
+		newinitd "${FILESDIR}"/dnsmasq-init-dhcp-r3 ${PN}
+	fi
+	if use dbus; then
+		insinto /etc/dbus-1/system.d
+		doins dbus/dnsmasq.conf
+	fi
+
+	if use dhcp-tools; then
+		dosbin contrib/lease-tools/{dhcp_release,dhcp_lease_time}
+		doman contrib/lease-tools/{dhcp_release,dhcp_lease_time}.1
+		if use ipv6; then
+			dosbin contrib/lease-tools/dhcp_release6
+			doman contrib/lease-tools/dhcp_release6.1
+		fi
+	fi
+
+	systemd_newunit "${FILESDIR}"/${PN}.service-r1 ${PN}.service
+}
+
+pkg_preinst() {
+	[[ -f /var/lib/misc/dnsmasq.leases ]] && \
+		cp /var/lib/misc/dnsmasq.leases "${T}"
+}
+
+pkg_postinst() {
+	[[ -f "${T}"/dnsmasq.leases ]] && \
+		cp "${T}"/dnsmasq.leases /var/lib/misc/dnsmasq.leases
+}
diff --git a/net-dns/unbound/Manifest b/net-dns/unbound/Manifest
index 82ccf90e20ab..d612ab04eb71 100644
--- a/net-dns/unbound/Manifest
+++ b/net-dns/unbound/Manifest
@@ -19,5 +19,5 @@ EBUILD unbound-1.13.1-r3.ebuild 6088 BLAKE2B a59345ef64e907346092bff8160a41fe00b
 EBUILD unbound-1.13.2-r1.ebuild 6119 BLAKE2B 9fd3134031787cf87bc4a6f2948a6fce93805a363d7cb828fa4c8731872d4679b02d2fc8de79266cb5fd2e375bd75c36528b77c200443e498db0a1aacac4f923 SHA512 e296ef9d32b32e5872c51664602011b895b98f7809340c77daf12db18f57cae796dc67db2f71e086f54cd595d586cf349435fe5c615993531061b28fdd78b282
 EBUILD unbound-1.15.0.ebuild 6331 BLAKE2B c9f6f4aef0512c998c296c1d7928596a6e43874305499031ab6e9a3e1326bcc9454bf60e1630f1c8ec58fb340be6e43b0bcd79fd3706e99c8d9d25e3703b4236 SHA512 7465635451abf2942aebfe89c9d955776f0f04625e543956a1336da8a5ee8033a15f124cd12bf52f0ac969427c1d7797ef0762862883869102984a0a0146ca1b
 EBUILD unbound-1.16.0.ebuild 6523 BLAKE2B 05fab53bf901e5b078ba50735aec3e20e5b2da6e24c4c54555efb7574428f3fa0565ae7d21c92883eb31b34b047e5f287ee7ec57549b8d84a5bba17fce231bf8 SHA512 339471c5b7dfe2d7261764e3dddd09eb6bc6fc4cd96fe2b0c3acc21239893dd39673d2793b473d2597ebb9a62e727901c04c21d41f810d5ba2e852fc145426f1
-EBUILD unbound-1.16.3.ebuild 6523 BLAKE2B 05fab53bf901e5b078ba50735aec3e20e5b2da6e24c4c54555efb7574428f3fa0565ae7d21c92883eb31b34b047e5f287ee7ec57549b8d84a5bba17fce231bf8 SHA512 339471c5b7dfe2d7261764e3dddd09eb6bc6fc4cd96fe2b0c3acc21239893dd39673d2793b473d2597ebb9a62e727901c04c21d41f810d5ba2e852fc145426f1
+EBUILD unbound-1.16.3.ebuild 6518 BLAKE2B 26d3620bf8f3ed27bb1d45b7492d97fff1ab4a4e0005857b70118265847d480231b4f9d9db1ca47b0db7c594e9ff9ab2fb84f61281471d2fa24ec557d7357f56 SHA512 cc39e632a7cb705d5689e26c7297a0ab5ea6abb2fe5cda928467eae1e6c7611798b653486a0d48d8d3e6e41de291be594f7f1c616f95df22fc2a4a5ef129d72e
 MISC metadata.xml 1475 BLAKE2B d0e34f4ba056c090af979f2686d5dece53a554c7ea7612fee1991ce6838ce161359bd8405d6358c5e184b6721affeee5d6e1bd93095b92765cd38dba928daa5b SHA512 8fba72eba420d4c06fb3a9119c3f324c5679fe268b65fac23878ef15f3c3d784d372874c7d6428d1c7c2eb3a75380ad2e4d5fc1691e7c2d1b426b8cfa381222b
diff --git a/net-dns/unbound/unbound-1.16.3.ebuild b/net-dns/unbound/unbound-1.16.3.ebuild
index 19f4bd7f6852..bacddcc2d858 100644
--- a/net-dns/unbound/unbound-1.16.3.ebuild
+++ b/net-dns/unbound/unbound-1.16.3.ebuild
@@ -15,7 +15,7 @@ VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/unbound.net.asc
 
 LICENSE="BSD GPL-2"
 SLOT="0/8" # ABI version of libunbound.so
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~x86"
 IUSE="debug dnscrypt dnstap +ecdsa ecs gost +http2 python redis selinux static-libs systemd test +tfo threads"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 RESTRICT="!test? ( test )"
diff --git a/net-firewall/Manifest.gz b/net-firewall/Manifest.gz
index f9645945061d..a068f26d5ec7 100644
Binary files a/net-firewall/Manifest.gz and b/net-firewall/Manifest.gz differ
diff --git a/net-firewall/ferm/Manifest b/net-firewall/ferm/Manifest
index 5f1bfea4ee51..0acece8772ba 100644
--- a/net-firewall/ferm/Manifest
+++ b/net-firewall/ferm/Manifest
@@ -1,5 +1,5 @@
 DIST ferm-2.6.tar.xz 76748 BLAKE2B 17c15e9d95c4562d1635715c599ab07fc98d8e9ebfcc332a42953fe279298799f26f7b3679f97e5dc9a82b745f70f54756fe2a9ed5763e91db15f7c0255c179e SHA512 af2bb852630304a86629c2ce3af8f557d17f59c704589ea130d8578f300a606e4fedbd39c88f89646df974947fc27982e3ea21de1187257afc74a6056fdf666c
 DIST ferm-2.7.tar.xz 77320 BLAKE2B 1c7b9e111b86cebc5c0f503e96422d3411b14eb18621268653262926be3e2493b6e66869d607feddbcdb945dada8960f40f166202e3b61a6e93007683fa3a38b SHA512 bbc0e025514c8bf826dd0c13c24cba64b2729380bce5ab8f0e1a72c4f22471edc4fcd2c343cf9af97a2e9bd204ba27feefcfe21d4b0ce53837be042f863c9c24
 EBUILD ferm-2.6.ebuild 799 BLAKE2B 17600d81f97081dc6a7d583a4eee9c9aa409a916ef88f7288b06f5e0aba14c17c878b23fb5f9cab41ab1cddc8fe1d8a0ffc72f9f62dfaed1950c213dadf296cc SHA512 472648307460bbff445e85a56582524242f45809bda082e03a71f6f349fc52c085e017f5cdfb53d3c9e6ab6d55c1c93265bb4138cf99b9a5af6eddc0055b6a70
-EBUILD ferm-2.7.ebuild 802 BLAKE2B e9569c7ee8cec7ea3abf466b03e15ed27b24eeb2e6999efaa0be6d7fc2f160c684d1030d8e29668da1fcf5312d671abf00b89361b636d7913e80900dd15509cb SHA512 8dc6438ed3ac66d39e83ee9dbb520ae6ea8493c2813c12cb5ac910e619042c1ee338371c0899e6ebd3a534cbd33a04061ac2d7f729afdecddfcd5adfaa1c29f7
+EBUILD ferm-2.7.ebuild 801 BLAKE2B 0a90512d4535834dcfe1831ffa1edff686ca3ba57e3e69383f194e1f9f561ff4c43f4ce3e67a5343de5baf855729225fb5348a74e996c95c51d3d72cfff9d00f SHA512 c02088b1389b7ab6015896b03c7fe6eb4a7deff6c8ae04287014fd30076ea70508773c1f2f7c9ceb81a501f2f7832dfc7c9f8c9c16ef00f763f1b41c064c33d4
 MISC metadata.xml 481 BLAKE2B 49c9fe8c9acd561831b5445aaf0722937fbe22d68c61575346b4e517a1b6a1611c0b316d9b5d47199f4de5a41960e5810a2d024efa976da6aaf16fc7287c726f SHA512 aa494cfbba9188df9e41d5cd2af614cd2321703a516ea2978b969b87ebde022ea9f2064721e611d7cff21bc27906db6447bd58e75d28e10ab718656570aa1ade
diff --git a/net-firewall/ferm/ferm-2.7.ebuild b/net-firewall/ferm/ferm-2.7.ebuild
index 13e74b23ec9e..093b73bd06f3 100644
--- a/net-firewall/ferm/ferm-2.7.ebuild
+++ b/net-firewall/ferm/ferm-2.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://ferm.foo-projects.org/download/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 
 # Uses Internet connection while testing.
 RESTRICT="test"
diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz
index d2be815963c1..db71d8735c95 100644
Binary files a/net-irc/Manifest.gz and b/net-irc/Manifest.gz differ
diff --git a/net-irc/psybnc/Manifest b/net-irc/psybnc/Manifest
index a74e59ee8fa4..7a73d0155999 100644
--- a/net-irc/psybnc/Manifest
+++ b/net-irc/psybnc/Manifest
@@ -1,13 +1,16 @@
-AUX compile.diff 3264 BLAKE2B d67880d5a26de0cafa1cd81733b0f8e22ca920989b4acf3aa085cbba592478c8b24e033167bc09d20e5b565772e8de8c65e9c095392dd3abdf12c5aadbc71334 SHA512 7bebf40946a70f93e6ca5fad204e45b1187baafef346d1ef2e549dcdc750ed9853be760a5ec38eee820fdc8e51f2ff798b91b1a5bd5cbeb423c5090ba04fc152
-AUX ldflags-fix.patch 540 BLAKE2B d1f6c0b41212bec79d9f0381c07e738ec02ca9b54700cc89d6b1da3d94b4fe2555da4abc6262a9b4ed641e23f988e0c57aed94006610eef072763a08960a6c96 SHA512 9ade1e441b0b890a8c2284128124c02786868803771d9acdae560811a7dc56d0cab3673250491b6e99e012a6265db1e0e17fbe5f19aa913d6cc9796c61619d9f
 AUX oidentd.conf.psybnc 92 BLAKE2B 3653139da1f045214c609acc0a655bd617b681778339584ea01bc5373fc159cb581dfeb66c5ba8f58b75f20a12e2d5430977576c5d3c0c42b919543c8886eae2 SHA512 1670c597922c557eb4124ec75c41e30135dce47ced3f080051ef1f896b5b24ce8d0833b147fb5ba7b5056cc0c333ecd7a6105bb68f92a72e64f753253a2595ad
+AUX psybnc-2.3.2.9-compile.patch 3264 BLAKE2B d67880d5a26de0cafa1cd81733b0f8e22ca920989b4acf3aa085cbba592478c8b24e033167bc09d20e5b565772e8de8c65e9c095392dd3abdf12c5aadbc71334 SHA512 7bebf40946a70f93e6ca5fad204e45b1187baafef346d1ef2e549dcdc750ed9853be760a5ec38eee820fdc8e51f2ff798b91b1a5bd5cbeb423c5090ba04fc152
+AUX psybnc-2.3.2.9-ldflags-fix.patch 540 BLAKE2B d1f6c0b41212bec79d9f0381c07e738ec02ca9b54700cc89d6b1da3d94b4fe2555da4abc6262a9b4ed641e23f988e0c57aed94006610eef072763a08960a6c96 SHA512 9ade1e441b0b890a8c2284128124c02786868803771d9acdae560811a7dc56d0cab3673250491b6e99e012a6265db1e0e17fbe5f19aa913d6cc9796c61619d9f
 AUX psybnc-2.3.2.9-multinetwork.patch 265 BLAKE2B 3bca2c18d521fe34445433090564e78e7c948048114231a79defac5082e0419062ee24fed6b4a4759090498340d16a31dc6114d19a397a97822660879c9ba326 SHA512 955b2455aad91d0145597096a7dc75de9279f828de94e8156f98f992734b86da5712d08b6d3ff3538359aaa1c1fb6b496b5cbbee44da7dadd444ddf020389821
 AUX psybnc-2.3.2.9-oidentd.patch 236 BLAKE2B 1af1ba8e2ca6edc8fa64040bfb4e195b9486356284bf83a95df9cbc69c5307a3845dc70586978dc2ee0ffd75cc48f9e88e9fb6c709b504a01e7e8906636c5257 SHA512 60e528060582f07e7b81d522bd93d0b69adba4ec56babde704baa820edc420b7a50d4158ce916f3a767a7d705f98fa30ac8229f64e8549eb551a47780ae002f4
 AUX psybnc-2.3.2.9-scripting.patch 248 BLAKE2B b0dec6f5202f6c5a38020c179fdd3cbe932028141c2c95d4a236a1f0140c1feddc60165197ab69ccad6a481f8e84c16dc950644e56bfd9af2c678a80ff9b6898 SHA512 8fbaa82295c53a8b592500c87aab92d46cc0f28d7d89cb8e3957671cc94f785dee52e405196cea8782a192ae942f3b29c892c03cdc2e94d00a2c73b196d4de36
+AUX psybnc-2.4.3-Fix-build-with-Clang-16.patch 4045 BLAKE2B e59d829f759d39993e95bffaec8f38384161ab456280f70e5ccfc26567a883d29da979f5e97759015c571f1c3b065396779a5d9ae3d636179d011e7fb88909ae SHA512 97588a9220100d9da28badb265d41c8d34ec4ec794a86433c30f5397aa05fa18f36845ee49e02ac11dea3a951788f314cd854659966b1b27b5e6aa5e933b2fa5
 AUX psybnc-oidentd.initd 931 BLAKE2B d50dbad91198c457254edf568b7c203ba8f4c1dfdbb9c8a38b12ca5086b74b337f85fe514bd8ed74c0eacad9ba25bc36d1c385d96c03ea41d20ccf5150aac407 SHA512 bc338b243d5cf73da0c662601ea2e5fadbe34a64f57cd0d09be55c773e1e1f807fb0c43d46d225a9461d353762b16cf6010710fbf4f43a9dece5130374952e12
 AUX psybnc.conf 313 BLAKE2B c56022b42942b100479b6c539e9da85178db679b6596fc2b416299c929cdfac35b83cb1181d8ff3eedb4f17b1c711c97e6c73ae1a40e2f09b7c756ad3415025e SHA512 0a5f587e70f9c9a83da820a03e77b6b119c5094fa334397762c4838c0a88bb5574a17d7aded274dab9bb6b041d1758e08e3f0d78df71b382bdc04fc8aabe3317
 AUX psybnc.confd 113 BLAKE2B e4fddc3cb37c5b9defea0d4d6e6c2b26f34bf50fbbe51679b8f0e686b504c2caf980c5a97864fac86a251431126c5a0338bb50a8eba9d3976156cf1eaf1b7681 SHA512 e58704dec299271d9a450eb243d0af1323aca58d555b61fc3aa899324a6bdc9aa82afc0597c190dc07c278f22c7cb448592a271e9ee6e4aa3552518ce6254753
 AUX psybnc.initd 898 BLAKE2B 7be60ef0dda81cb917e23e06e3fec88af952d71c2eef4255c316baf5a218e8bdc2d8d8bc4eb353ab7c19a697e97685441ec2a0c3503e4f22adf0d55c9a895e13 SHA512 2ea77dfd515b81d53d7fe1b38fe3069d7d2081d939fdbb2c6ff97cd859a86ad8a52dd1b40e0b592a9368488759a3fb35741e25c6a5ade3045eb7159acd64bbbd
 DIST psyBNC-2.3.2-9.tar.gz 318676 BLAKE2B 0197aa3bc8c770738a7d4d5a5a79b77f7a0cafeef60ccca1167172b28af05c0cd9836f7e9816c873dafa2e55b0bf9ce54cfbe3958939405f58f7f3874ec7ea64 SHA512 b664f57610e54fadd938b359a0e8052b8fe3dd36bd1ee339f36ee22ae4d36a76e803425c5133f925ac18c01767ffbc8a2f471c014b5b76b05894cfea9fe5416b
-EBUILD psybnc-2.3.2.9-r4.ebuild 4649 BLAKE2B 851a1637104a77a1de206b12f3efbdb89d2884856003a792ca906a7c7441cb81a462afb649f723cb88b698f5f7cbd8ee7de23a0406c9a65e30f570ec93bdf332 SHA512 f4fcc6f4b22fe4539d7e54edc930171e86da1d91eead652296e5c280d4718b8bce456aeadc379efb4697b69978ee6e2b19d5af8b2dd1dad67d4565c88e7725a4
+DIST psyBNC-2.4.3.tar.gz 1108733 BLAKE2B e0f02cab97b503301db0a4c111497e4f99b75d8d2c798b2b5d97997a4c4921d8a7de8dabad79c1291fa4b7efce0d1ed0c7dede1345b155561bb6ce6033b591bb SHA512 02228baef6fa889d5e12bfa715facc2eab3b033c01b1f799a1c6c995ef9eedfacf3ed328c875f52595d64c47124c20e4145288b2636182dea17ec9027d367bb7
+EBUILD psybnc-2.3.2.9-r4.ebuild 4694 BLAKE2B 31e2720550293deb08b875d63fc7fd7eedae29386b106e72580c5aa4c972fd1515f4e6226c6e008c6f630b440dcf03409acbfd7a744f327c7def505dfa03382e SHA512 b9e1617ae16d5a06d15b48c56275d8ba6855316d3940d2874b9e137209402bf7b990c192c5912ba5fb7a06e109b393f341c672c7e61da31a69a8aa7622791d80
+EBUILD psybnc-2.4.3.ebuild 4688 BLAKE2B 69ec35e57f32b129bd4d46bf0f2179ec833ca0bc5b4b3d94ab0dfe199809f2061a9ce679f5425b8d34ef165a169c84ce38b62a37a672c28a326b7f533915a75e SHA512 48f79fbb6b5d7379e117e4eb8d01877f45a061d17bb545585ae65ca66a208ce454e756e13ab25dd2346a1305cd2813de99c7d58fa5f20cfc432282035543c5b4
 MISC metadata.xml 361 BLAKE2B 66e3ce95043d6691e73a6e5efc2637e0f0d0e6638e034fe7687ba67f9e5c40c6e416ae020e1508e9d0f9636c5e833aa364051bacedb15ad3ca9f48cd726854d1 SHA512 75103320e23878d078c05c1a763aa2526ed79a7cf953f3f3c2a272e7d215b5ba95dcc60581186ac73db07a2891abe9ab4e82d906f4e2494e63004ce435a8f9e8
diff --git a/net-irc/psybnc/files/compile.diff b/net-irc/psybnc/files/psybnc-2.3.2.9-compile.patch
similarity index 100%
rename from net-irc/psybnc/files/compile.diff
rename to net-irc/psybnc/files/psybnc-2.3.2.9-compile.patch
diff --git a/net-irc/psybnc/files/ldflags-fix.patch b/net-irc/psybnc/files/psybnc-2.3.2.9-ldflags-fix.patch
similarity index 100%
rename from net-irc/psybnc/files/ldflags-fix.patch
rename to net-irc/psybnc/files/psybnc-2.3.2.9-ldflags-fix.patch
diff --git a/net-irc/psybnc/files/psybnc-2.4.3-Fix-build-with-Clang-16.patch b/net-irc/psybnc/files/psybnc-2.4.3-Fix-build-with-Clang-16.patch
new file mode 100644
index 000000000000..83b9b07d73a0
--- /dev/null
+++ b/net-irc/psybnc/files/psybnc-2.4.3-Fix-build-with-Clang-16.patch
@@ -0,0 +1,212 @@
+From 9ced946bc4f6da7ccb74573af4a9a89400f9cd69 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Sun, 23 Oct 2022 18:21:25 +0100
+Subject: [PATCH] Fix build with Clang 16
+
+Bug: https://bugs.gentoo.org/724916
+Bug: https://bugs.gentoo.org/831310
+Bug: https://bugs.gentoo.org/861464
+Bug: https://bugs.gentoo.org/874105
+--- a/src/p_client.c
++++ b/src/p_client.c
+@@ -213,7 +213,7 @@ int repeatserverinit(int usern)
+ }
+ 
+ /* who is on the bounce ? */
+-int cmdbwho(usern)
++int cmdbwho(int usern)
+ {
+     struct usernodes *th;
+     int userl;
+@@ -508,7 +508,7 @@ int firstwelcome(void)
+ }
+ 
+ /* first user connects */
+-int firstuser(npeer)
++int firstuser(int npeer)
+ {
+     int linkto;
+     pcontext;
+--- a/tools/autoconf.c
++++ b/tools/autoconf.c
+@@ -38,6 +38,7 @@
+ #include <ctype.h>
+ #include <signal.h>
+ #include <errno.h>
++#include <time.h>
+ #include "config.h"
+ #include "src/p_version.h"
+ 
+From 907107edea5f9d74b59a7c24762cfa8413a42f90 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Sun, 23 Oct 2022 18:41:05 +0100
+Subject: [PATCH] Fix build with Clang 16
+
+--- a/src/p_client.c
++++ b/src/p_client.c
+@@ -22,6 +22,8 @@
+ #define P_CLIENT
+ 
+ #include <p_global.h>
++#include <stdio.h>
++#include <stdlib.h>
+ 
+ int cmdaddlink(int usern, int type);
+ int quitclient(int usern);
+--- a/src/p_dcc.c
++++ b/src/p_dcc.c
+@@ -22,6 +22,7 @@
+ #define P_DCC
+ 
+ #include <p_global.h>
++#include <stdlib.h>
+ 
+ #ifdef DCCCHAT
+ 
+--- a/src/p_hash.c
++++ b/src/p_hash.c
+@@ -25,6 +25,11 @@
+ 
+ /* local types */
+ 
++#ifdef IPV6
++int cmddefaultipv6(int usern);
++int cmdpreferipv6(int usern);
++#endif
++
+ struct hasht {
+     int commandmsgnum;
+     int(*handler)(int);
+@@ -174,8 +179,10 @@ struct hasht inboundhash[]={
+     {1252,	printhelp,	1253,	1254	,0,0},
+     {1450,	cmdbdone,	1451,	1452	,0,0},
+     {1460,	cmdsetconnectdelay,	1461,	1462	,0,1},
++#ifdef IPV6
+     {1480,	cmddefaultipv6,		1481,   1482    ,0,1},
+     {1490,	cmdpreferipv6,		1491,   1492    ,0,0},
++#endif
+ #ifdef MYSQL_IPCHECK
+ #ifdef HAVE_MYSQL
+     {2001,	cmdmysqlipcheck,	2002,	2003	,0,1},
+--- a/src/p_inifunc.c
++++ b/src/p_inifunc.c
+@@ -22,6 +22,7 @@
+ #define P_INIFUNC
+ 
+ #include <p_global.h>
++#include <stdlib.h>
+ 
+ /* reset the config cache */
+ 
+--- a/src/p_memory.c
++++ b/src/p_memory.c
+@@ -22,6 +22,7 @@
+ #define P_MEMORY
+ 
+ #include <p_global.h>
++#include <stdlib.h>
+ 
+ FILE *logm=NULL;
+ 
+--- a/src/p_network.c
++++ b/src/p_network.c
+@@ -22,6 +22,7 @@
+ #define P_NETWORK
+ 
+ #include <p_global.h>
++#include <stdlib.h>
+ 
+ int netdefault(int usern, char *netname, char *myparentnick);
+ 
+--- a/src/p_peer.c
++++ b/src/p_peer.c
+@@ -22,6 +22,7 @@
+ #define P_PEER
+ 
+ #include <p_global.h>
++#include <stdlib.h>
+ 
+ /* MySQL for IP check */
+ #ifdef MYSQL_IPCHECK
+--- a/src/p_script.c
++++ b/src/p_script.c
+@@ -22,6 +22,7 @@
+ #define P_SCRIPT
+ 
+ #include <p_global.h>
++#include <stdlib.h>
+ 
+ #ifdef SCRIPTING
+ 
+--- a/src/p_server.c
++++ b/src/p_server.c
+@@ -22,6 +22,8 @@
+ #define P_SERVER
+ 
+ #include <p_global.h>
++#include <stdlib.h>
++
+ void create_oidentd_conf();
+ 
+ sigjmp_buf serveralarmret;
+--- a/src/p_socket.c
++++ b/src/p_socket.c
+@@ -22,6 +22,7 @@
+ #define P_SOCKET
+ 
+ #include <p_global.h>
++#include <stdlib.h>
+ 
+ #define MAX_SENDQ 1000
+ 
+--- a/src/p_string.c
++++ b/src/p_string.c
+@@ -22,6 +22,7 @@
+ #define P_STRING
+ 
+ #include <p_global.h>
++#include <stdlib.h>
+ 
+ char langname[100];
+ 
+--- a/src/p_topology.c
++++ b/src/p_topology.c
+@@ -22,7 +22,7 @@
+ #define P_TOPOLOGY
+ 
+ #include <p_global.h>
+-
++#include <stdlib.h>
+ 
+ #define TP_ROOT		0
+ #define TP_LTO		1
+--- a/src/p_uchannel.c
++++ b/src/p_uchannel.c
+@@ -22,6 +22,7 @@
+ #define P_UCHANNEL
+ 
+ #include <p_global.h>
++#include <stdlib.h>
+ 
+ /* bring the channel modes into the right order, return formulated mode */
+ 
+--- a/src/p_userfile.c
++++ b/src/p_userfile.c
+@@ -22,6 +22,7 @@
+ #define P_USERFILE
+ 
+ #include <p_global.h>
++#include <stdlib.h>
+ 
+ /* loading a specific user */
+ 
+--- a/src/psybnc.c
++++ b/src/psybnc.c
+@@ -34,6 +34,7 @@
+ 
+ #include <p_global.h>
+ #include <p_data.h>
++#include <stdlib.h>
+ 
+ int slice=0;
+ 
diff --git a/net-irc/psybnc/psybnc-2.3.2.9-r4.ebuild b/net-irc/psybnc/psybnc-2.3.2.9-r4.ebuild
index 001c32520db9..684b08d88a1f 100644
--- a/net-irc/psybnc/psybnc-2.3.2.9-r4.ebuild
+++ b/net-irc/psybnc/psybnc-2.3.2.9-r4.ebuild
@@ -11,7 +11,7 @@ PSYBNC_HOME="/var/lib/psybnc"
 DESCRIPTION="A multi-user and multi-server gateway to IRC networks"
 HOMEPAGE="http://www.psybnc.at/index.html"
 SRC_URI="http://www.psybnc.at/download/beta/psyBNC-${MY_PV}.tar.gz"
-S="${WORKDIR}/${PN}"
+S="${WORKDIR}"/${PN}
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -26,6 +26,11 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.3.2.9-compile.patch
+	"${FILESDIR}"/${PN}-2.3.2.9-ldflags-fix.patch
+)
+
 src_unpack() {
 	unpack ${A}
 	cd "${S}" || die
@@ -45,17 +50,14 @@ src_unpack() {
 src_prepare() {
 	default
 
-	eapply "${FILESDIR}/compile.diff"
-	eapply "${FILESDIR}/ldflags-fix.patch"
-
-	# add oidentd
-	use oidentd && eapply "${FILESDIR}/${P}-oidentd.patch"
+	# Add oidentd
+	use oidentd && PATCHES+=( "${FILESDIR}"/${P}-oidentd.patch )
 
-	# add scripting support
-	use scripting && eapply "${FILESDIR}/${P}-scripting.patch"
+	# Add scripting support
+	use scripting && PATCHES+=( "${FILESDIR}"/${P}-scripting.patch )
 
-	# add multinetwork support
-	use multinetwork && eapply "${FILESDIR}/${P}-multinetwork.patch"
+	# Add multinetwork support
+	use multinetwork && PATCHES+=( "${FILESDIR}"/${P}-multinetwork.patch )
 
 	# Prevent stripping the binary
 	sed -i -e "/@strip/ d" tools/autoconf.c || die
@@ -103,10 +105,10 @@ src_install() {
 		insinto /etc
 		doins "${FILESDIR}"/oidentd.conf.psybnc
 		fperms 640 /etc/oidentd.conf.psybnc
-		# install init-script with oidentd-support
+		# Install init-script with oidentd-support
 		newinitd "${FILESDIR}"/psybnc-oidentd.initd psybnc
 	else
-		# install init-script without oidentd-support
+		# Install init-script without oidentd-support
 		newinitd "${FILESDIR}"/psybnc.initd psybnc
 	fi
 
diff --git a/net-irc/psybnc/psybnc-2.4.3.ebuild b/net-irc/psybnc/psybnc-2.4.3.ebuild
new file mode 100644
index 000000000000..e4b61275e275
--- /dev/null
+++ b/net-irc/psybnc/psybnc-2.4.3.ebuild
@@ -0,0 +1,169 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+MY_PV="$(ver_rs 3 -)"
+PSYBNC_HOME="/var/lib/psybnc"
+
+DESCRIPTION="A multi-user and multi-server gateway to IRC networks"
+HOMEPAGE="http://www.psybnc.at/index.html"
+SRC_URI="http://psybnc.org/download/psyBNC-${PV}.tar.gz"
+S="${WORKDIR}"/${PN}
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="ipv6 ssl oidentd scripting multinetwork"
+
+DEPEND="
+	acct-group/psybnc
+	acct-user/psybnc
+	ssl? ( >=dev-libs/openssl-0.9.7d:= )
+	oidentd? ( >=net-misc/oidentd-2.0 )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.4.3-Fix-build-with-Clang-16.patch
+)
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}" || die
+
+	# Useless files
+	rm -f */INFO || die
+
+	# Pretend we already have a certificate, we generate it in pkg_config
+	touch key/psybnc.cert.pem || die
+
+	if [[ -f "${EPREFIX}"/usr/share/psybnc/salt.h ]]; then
+		einfo "Using existing salt.h for password encryption"
+		cp "${EPREFIX}"/usr/share/psybnc/salt.h salt.h || die
+	fi
+}
+
+src_prepare() {
+	default
+
+	# Add oidentd
+	use oidentd && PATCHES+=( "${FILESDIR}"/${P}-oidentd.patch )
+
+	# Add scripting support
+	use scripting && PATCHES+=( "${FILESDIR}"/${P}-scripting.patch )
+
+	# Add multinetwork support
+	use multinetwork && PATCHES+=( "${FILESDIR}"/${P}-multinetwork.patch )
+
+	# Prevent stripping the binary
+	sed -i -e "/@strip/ d" tools/autoconf.c || die
+}
+
+src_compile() {
+	if use ipv6; then
+		rm -f tools/chkipv6.c || die
+	fi
+
+	if use ssl; then
+		rm -f tools/chkssl.c || die
+	fi
+
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	dobin psybnc
+
+	insinto /usr/share/psybnc
+	doins -r help lang salt.h
+	fperms 0600 /usr/share/psybnc/salt.h
+
+	insinto /etc/psybnc
+	doins "${FILESDIR}"/psybnc.conf
+
+	keepdir "${PSYBNC_HOME}"/{log,motd,scripts}
+	dosym ../../../usr/share/psybnc/lang "${PSYBNC_HOME}"/lang
+	dosym ../../../usr/share/psybnc/help "${PSYBNC_HOME}"/help
+
+	fowners psybnc:psybnc "${PSYBNC_HOME}"/{,log,motd,scripts} /etc/psybnc/psybnc.conf
+	fperms 0750 "${PSYBNC_HOME}"/{,log,motd,scripts}
+	fperms 0640 /etc/psybnc/psybnc.conf
+
+	if use ssl; then
+		keepdir /etc/psybnc/ssl
+		dosym ../../../etc/psybnc/ssl "${PSYBNC_HOME}"/key
+	else
+		# Drop SSL listener from psybnc.conf
+		sed -i -e "/^# Default SSL listener$/,+4 d" "${D}"/etc/psybnc/psybnc.conf || die
+	fi
+
+	if use oidentd; then
+		insinto /etc
+		doins "${FILESDIR}"/oidentd.conf.psybnc
+		fperms 640 /etc/oidentd.conf.psybnc
+		# Install init-script with oidentd-support
+		newinitd "${FILESDIR}"/psybnc-oidentd.initd psybnc
+	else
+		# Install init-script without oidentd-support
+		newinitd "${FILESDIR}"/psybnc.initd psybnc
+	fi
+
+	if use scripting ; then
+		dodoc SCRIPTING
+	fi
+
+	newconfd "${FILESDIR}"/psybnc.confd psybnc
+
+	dodoc CHANGES FAQ README TODO
+	docinto example-script
+	dodoc scripts/example/DEFAULT.SCRIPT
+}
+
+pkg_config() {
+	if use ssl; then
+		if [[ -f "${EROOT}"/etc/psybnc/ssl/psybnc.cert.pem || -f "${EROOT}"/etc/psybnc/ssl/psybnc.key.pem ]]; then
+			ewarn "Existing /etc/psybnc/psybnc.cert.pem or /etc/psybnc/psybnc.key.pem found!"
+			ewarn "Remove /etc/psybnc/psybnc.*.pem and run emerge --config =${CATEGORY}/${PF} again."
+			return
+		fi
+
+		einfo "Generating certificate request..."
+		openssl req -new -out "${ROOT}"/etc/psybnc/ssl/psybnc.req.pem \
+			-keyout "${ROOT}"/etc/psybnc/ssl/psybnc.key.pem -nodes || die
+
+		einfo "Generating self-signed certificate..."
+		openssl req -x509 -days 365 -in "${ROOT}"/etc/psybnc/ssl/psybnc.req.pem \
+			-key "${ROOT}"/etc/psybnc/ssl/psybnc.key.pem \
+			-out "${ROOT}"/etc/psybnc/ssl/psybnc.cert.pem || die
+
+		einfo "Setting permissions on files..."
+		chown root:psybnc "${ROOT}"/etc/psybnc/ssl/psybnc.{cert,key,req}.pem || die
+		chmod 0640 "${ROOT}"/etc/psybnc/ssl/psybnc.{cert,key,req}.pem || die
+	fi
+}
+
+pkg_postinst() {
+	if use ssl; then
+		elog
+		elog "Please run \"emerge --config =${CATEGORY}/${PF}\" to create the needed SSL certificates."
+	fi
+
+	if use oidentd; then
+		elog
+		elog "You have enabled oidentd-support. You will need to set"
+		elog "up your ${EROOT}/etc/oident.conf file before running psybnc. An example"
+		elog "for psyBNC can be found under ${EROOT}/etc/oidentd.conf.psybnc"
+	fi
+
+	elog
+	elog "You can connect to psyBNC on port 23998 with user gentoo and password gentoo."
+	elog "Please edit the psyBNC configuration at ${EROOT}/etc/psybnc/psybnc.conf to change this."
+	elog
+	elog "To be able to reuse an existing psybnc.conf, you need to make sure that the"
+	elog "old salt.h is available at ${EROOT}/usr/share/psybnc/salt.h when compiling a new"
+	elog "version of psyBNC. It is needed for password encryption and decryption."
+	elog
+}
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index f5b42198e29c..73b087503efe 100644
Binary files a/net-libs/Manifest.gz and b/net-libs/Manifest.gz differ
diff --git a/net-libs/kdsoap/Manifest b/net-libs/kdsoap/Manifest
index b0b573b1cff7..597ace88f059 100644
--- a/net-libs/kdsoap/Manifest
+++ b/net-libs/kdsoap/Manifest
@@ -1,5 +1,3 @@
-DIST kdsoap-2.0.0.tar.gz 2916527 BLAKE2B 7b9cf71b181b88180fb00cb2f0c2b84b5fd7d997531aa68957a84811959befd9c8909c8892d3b60d47a654916fa5b8841fa7b389a006a8ca6a2cdce98a433cfb SHA512 50305866595048e0ec6cd6dabba9e63a948f1e1263e7f03e9e3bc56f09a843bade944df95b5ff57d4fc3a62896e72f02b0d7b3d5cc2be2823da67001ca459428
 DIST kdsoap-2.1.1.tar.gz 948277 BLAKE2B 6daec26426bb6becc78400877ad221b929f0c30e45755644258eca864617d20b9d1269d8a964d38d40e9f5eb93ae213a95e05deb0a34dd3817261096178815a2 SHA512 12224f664dcae7ceb7395a7c3de48a208ae81c10f6fba4d0db233613472c6b9cdbea6375297c27b58fe7338d7db27a4447844f4e8f40a24ec1b4dd3fa38d20bb
-EBUILD kdsoap-2.0.0.ebuild 965 BLAKE2B 711da17f4859234a1f552d62b8bab9f37f9701d53ecdd1454789ee985b7578d63a93493b809e6aabd250d326a9ec4d91512f3016add0067263767481dfbb53eb SHA512 9c6e12a4c38b12b4b21ab1fa8e11111b04db322296782100904d2d0352cae847d732b761a1afeb8edca7b9fdd3d520f215a055e48be0c3328742dcf2fbe6eb53
-EBUILD kdsoap-2.1.1.ebuild 968 BLAKE2B 8e4f2eb74d0e62c96ddc728ee735e21597ce58690798581cca2784000bee5f714ba2b8c5cf6d35792dd3f8362466608cd8f022ea63bfc47aea928784741dbba6 SHA512 ae9f7f40ab5794d00bd98e6fbc3f9626d6740f78e0f386e6d2cdce1b4c5724c6b043d117a3dba5ae870e5839fc66a00ae79e530f507bc7114e477e35edb70238
+EBUILD kdsoap-2.1.1.ebuild 965 BLAKE2B d309d9903520b7f201b8e0f7fbb3bb65e3dedec83e01a82ebaeeefa2867e9973d13b431436c500f3aec81e81cc0ca7471c35e6172e2949e334faa568c5c4144f SHA512 3cfeac797ccfa36f4aba02412708efae8a957c8ddfd89ca4f64d8a388a310789be78a68d46b3c3e15569e5c9a5a4fd30f4ed33120e721a899aa011ec3f9700a9
 MISC metadata.xml 250 BLAKE2B f3e9395137ebb9adf46cd35c1b6156f82c04cfa94f964f6da24fe71eb560cf51b4f70ebfa10daaa4884400ec22782d819ab794dfd29e7a47559f07208397195d SHA512 78c4ff15eed76ba883b457be95dabd41e928a0e64a42b758b5eab4d8a95afca27d5ea6a7cfe0948de578b169153a05f08aadfce1ddd41a88732212a1e76e565f
diff --git a/net-libs/kdsoap/kdsoap-2.0.0.ebuild b/net-libs/kdsoap/kdsoap-2.0.0.ebuild
deleted file mode 100644
index 951fd52d0a65..000000000000
--- a/net-libs/kdsoap/kdsoap-2.0.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-if [[ ${PV} != *9999* ]]; then
-	SRC_URI="https://github.com/KDAB/KDSoap/releases/download/${P}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-else
-	EGIT_REPO_URI="https://github.com/KDAB/KDSoap.git"
-	EGIT_SUBMODULES=( kdwsdl2cpp/libkode -autogen )
-	inherit git-r3
-fi
-inherit cmake
-
-DESCRIPTION="Qt-based client-side and server-side SOAP component"
-HOMEPAGE="https://www.kdab.com/development-resources/qt-tools/kd-soap/"
-
-LICENSE="GPL-3 AGPL-3"
-SLOT="0/2"
-IUSE=""
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtxml:5
-"
-DEPEND="${RDEPEND}
-	dev-libs/boost
-"
-
-src_prepare() {
-	cmake_src_prepare
-	sed -e "/install.*INSTALL_DOC_DIR/d" -i CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DKDSoap_DOCS=OFF
-		-DKDSoap_EXAMPLES=OFF # no install targets
-		-DKDSoap_STATIC=OFF
-		-DKDSoap_QT6=OFF
-	)
-	cmake_src_configure
-}
diff --git a/net-libs/kdsoap/kdsoap-2.1.1.ebuild b/net-libs/kdsoap/kdsoap-2.1.1.ebuild
index c988db03bf07..fb3783a1ed39 100644
--- a/net-libs/kdsoap/kdsoap-2.1.1.ebuild
+++ b/net-libs/kdsoap/kdsoap-2.1.1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 if [[ ${PV} != *9999* ]]; then
 	SRC_URI="https://github.com/KDAB/KDSoap/releases/download/${P}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 else
 	EGIT_REPO_URI="https://github.com/KDAB/KDSoap.git"
 	EGIT_SUBMODULES=( kdwsdl2cpp/libkode -autogen )
diff --git a/net-libs/libaccounts-glib/Manifest b/net-libs/libaccounts-glib/Manifest
index f65e29d28a8c..a31e39c56d7f 100644
--- a/net-libs/libaccounts-glib/Manifest
+++ b/net-libs/libaccounts-glib/Manifest
@@ -1,7 +1,7 @@
 AUX libaccounts-glib-1.25-assert-failure.patch 743 BLAKE2B 5f0ebe2754f4d0b03bfabfb83e3c7fbb3f54f117a1548275e8f974d43c92aeaadbae6c22d909127aa4a8c47e806a26f19e6ae598f30c5f34e3e2b48b3a7ff8be SHA512 4a483a915fc72efa42c10947cc399f30f2825a8f2bd59d88afec5da9cb29346572ba80c316ca4de4b21132e8ad34e031cdd735cb3ed0767d51780a15ac086fd7
+AUX libaccounts-glib-1.26-fix-incorrect-cleanup-in-ag_account_finalize.patch 1150 BLAKE2B c41449bddae028fb6a444a2d49884c7c53170494ed4fd699b589990a462f67112dc1f3c4359d26b39613456f6e9b5650db97fea39a90e87c007074c791d53b74 SHA512 76f99833910ce5095a3ccb09404ce371e95e40dc4e712a4cc3bdc0046c5a32693ff093956c73dcab9636f35fc83db8c361126ad1623c927cd525f94ffcaf941f
 AUX libaccounts-glib-1.26-project-version.patch 350 BLAKE2B 6a2115cd408e425e94b637e029f22ab9ada2739bcf29b7e20e80dfc89e571666f5ad909f5f89e7476d4456c9b2e4ad67287df1aacff86ffe8817a66360717871 SHA512 7755e629309017f69c4c9daf71b3df578739970c06d0193009d0bddaa659b5cbe3531b75d95e36cfbe957134aa9eee3707e8d6f9a5a23676f538c49fedfce429
-DIST libaccounts-glib-1.25.tar.gz 117337 BLAKE2B 72e6e15b63eea4d5b2a3e994779a4636bee859c6d395c8c9f65120cfee1c25a5708971b438010f668eefee20735b01e9f9f4e1ac4cb55495a06143d20198e422 SHA512 cc8b493d246f99300ee614fed93258378ecdbe9c518a958a59827ee8f74559b1ee3683acfb85f59aa91390275497fb35041da2be47f27f24f96e1efd5d6d2e20
 DIST libaccounts-glib-1.26.tar.gz 117365 BLAKE2B a3c7bf4058372001079c9c153b30f947882521f1f9680a63db2883307e998335a1e646112dc8a51640824f238d871d96da2c18b4ef175c837cebfe056ded2cbb SHA512 c08a11087745ba771e539b61de57693390960ad6b4e8217c159be49d31bd7f8856fffa835e7a230f352049bbf7cec9184ff225e74bbc195964221d3d9d49743b
-EBUILD libaccounts-glib-1.25-r2.ebuild 1377 BLAKE2B 6f92032e8467af5353c292bab1f033c5330f3596d2796027383ee2cd8fb14ae4438b62a15983f6d507948b5ef4a745ee32fa6112d40481a1329f9d14a57d46f5 SHA512 56636736f9e04190e2ffd57f2f442ca4ee1b12c3b6c9e39b5e4af44bc609344aafbc10ce6b7b724520d12050a0ec8275bbae37086c3ac3e83e9e7ec921aca9ab
+EBUILD libaccounts-glib-1.26-r1.ebuild 1490 BLAKE2B b9e7428445952157636322c0f3214aff2ef78157ee90c74dc414079a7cb49cf912fff5e0a8e2afb960f6f349b20e095ca6b6f36f36aca71ec11323b6787eab04 SHA512 5ed067e7b17fdc82cf8fdf3340773efac6af033c8111eff589a46729cccd6f2414d2e6249311bbd3efcc55c41cbd1ab801d862b07133da5acd85db8099981a1a
 EBUILD libaccounts-glib-1.26.ebuild 1418 BLAKE2B 7dc205283363854d36b6ff957b13ee4b2033ae210c257a790afdbde4aab5ec814b24f0333d1d8eaa860e3bd90b81fb5c5bd3a489a70908385984cae68772f3e6 SHA512 613812328f776618447e26cbf9ee7b97238209a7fcfb267cfe7829913a26cb7d22ee086cbf42d28dc8928bab550ac89c85f2008544d59f10254d2ed816441309
 MISC metadata.xml 250 BLAKE2B f3e9395137ebb9adf46cd35c1b6156f82c04cfa94f964f6da24fe71eb560cf51b4f70ebfa10daaa4884400ec22782d819ab794dfd29e7a47559f07208397195d SHA512 78c4ff15eed76ba883b457be95dabd41e928a0e64a42b758b5eab4d8a95afca27d5ea6a7cfe0948de578b169153a05f08aadfce1ddd41a88732212a1e76e565f
diff --git a/net-libs/libaccounts-glib/files/libaccounts-glib-1.26-fix-incorrect-cleanup-in-ag_account_finalize.patch b/net-libs/libaccounts-glib/files/libaccounts-glib-1.26-fix-incorrect-cleanup-in-ag_account_finalize.patch
new file mode 100644
index 000000000000..0a6f1120882a
--- /dev/null
+++ b/net-libs/libaccounts-glib/files/libaccounts-glib-1.26-fix-incorrect-cleanup-in-ag_account_finalize.patch
@@ -0,0 +1,30 @@
+From 270a66d5efe1453a2be4bad10894b947fdd2923e Mon Sep 17 00:00:00 2001
+From: Alberto Mardegan <mardy@users.sourceforge.net>
+Date: Tue, 4 Oct 2022 20:58:27 +0300
+Subject: [PATCH] ag-account: fix incorrect cleanup in ag_account_finalize
+
+The wrong variable was passed to _ag_account_changes_free(); as a matter
+of facts, this code was always a NOP, since prig->services had already
+been nullified before, but it was a memory leak.
+
+Fixes: https://gitlab.com/accounts-sso/libaccounts-glib/-/issues/13
+---
+ libaccounts-glib/ag-account.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libaccounts-glib/ag-account.c b/libaccounts-glib/ag-account.c
+index 8d6995b..7e67ba7 100644
+--- a/libaccounts-glib/ag-account.c
++++ b/libaccounts-glib/ag-account.c
+@@ -994,7 +994,7 @@ ag_account_finalize (GObject *object)
+     if (priv->changes)
+     {
+         DEBUG_INFO ("Finalizing account with uncommitted changes!");
+-        g_clear_pointer (&priv->services, _ag_account_changes_free);
++        g_clear_pointer (&priv->changes, _ag_account_changes_free);
+     }
+ 
+     G_OBJECT_CLASS (ag_account_parent_class)->finalize (object);
+-- 
+GitLab
+
diff --git a/net-libs/libaccounts-glib/libaccounts-glib-1.25-r2.ebuild b/net-libs/libaccounts-glib/libaccounts-glib-1.26-r1.ebuild
similarity index 80%
rename from net-libs/libaccounts-glib/libaccounts-glib-1.25-r2.ebuild
rename to net-libs/libaccounts-glib/libaccounts-glib-1.26-r1.ebuild
index 5d6c6cb80b40..8ba1dce7b289 100644
--- a/net-libs/libaccounts-glib/libaccounts-glib-1.25-r2.ebuild
+++ b/net-libs/libaccounts-glib/libaccounts-glib-1.26-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{7,8,9,10} )
+PYTHON_COMPAT=( python3_{8..11} )
 inherit meson python-r1 vala
 
 DESCRIPTION="Accounts SSO (Single Sign-On) management library for GLib applications"
@@ -13,7 +13,7 @@ S="${WORKDIR}/${PN}-VERSION_${PV}"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
+KEYWORDS="~amd64 ~arm arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="doc"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
@@ -30,17 +30,21 @@ RDEPEND="${PYTHON_DEPS}
 DEPEND="${RDEPEND}"
 BDEPEND="
 	$(vala_depend)
+	dev-libs/check
 	dev-util/gdbus-codegen
 	dev-util/glib-utils
-	dev-libs/check
 	doc? ( dev-util/gtk-doc )
 "
 
-PATCHES=( "${FILESDIR}/${P}-assert-failure.patch" )
+PATCHES=(
+	"${FILESDIR}/${PN}-1.25-assert-failure.patch"
+	"${FILESDIR}/${P}-project-version.patch"
+	"${FILESDIR}/${P}-fix-incorrect-cleanup-in-ag_account_finalize.patch"
+)
 
 src_prepare() {
 	default
-	vala_src_prepare --ignore-use
+	vala_setup --ignore-use
 
 	use doc || sed -e "/^subdir('docs')$/d" -i meson.build || die
 }
diff --git a/net-libs/liblockfile/Manifest b/net-libs/liblockfile/Manifest
index 048a8cc8c861..3c4a79036e3e 100644
--- a/net-libs/liblockfile/Manifest
+++ b/net-libs/liblockfile/Manifest
@@ -1,5 +1,5 @@
 AUX Makefile.Darwin.in 2436 BLAKE2B 63d9ce283549b26921cfd317639da45723ab5129e79dc0df0f4c2fa2489264db1991b6e9b2e76fb04906b85325d171af7dc2bb4f7f880cdb76fcdca76b50cd2f SHA512 e39931c63a20d49f6010dd668132295cfd3e02f39566715448665715ee909de3179c1db496b78261866794cdb21ecb14ccdd505f45aea5d8d0b7b196c344f9a1
 AUX liblockfile-1.16-makefile.patch 2851 BLAKE2B 52f6fcb117e6f49dc5c824766c067303c25d03095efb395e47d716b9bb0eb9a6affc7330d7537220f99afa64bb6ec14061de078f9313609d762bff066542c3ee SHA512 dd9cbf566ac8a933c4cee19a33cbe818904cf7be5aed05f2a17b87312267ac1716631c9fead4663b1979158363ff07218b0a486ee40c029fcd2a23142b59f275
 DIST liblockfile-1.17.tar.gz 69834 BLAKE2B a3c88174d96fb84dc1226102a1678aecec35945b89adb6e143f32674188ff7406f89b05f7219748bf0e9c6207ff3b28b5b800706ffc11b733c294e1e1c232784 SHA512 2169ac2219950d6ec7def6b5cc712cc04d1a185dc9c09b364c8d47b7b3d15c3482a2200b591872da87eb784717b2ba3537fbc39d7075c329cc8ba48039473a83
-EBUILD liblockfile-1.17.ebuild 1337 BLAKE2B 2b2bb9addf79153659f61b5c33106962cf958bf24f0eadfcb9f1626a55fdde065d0b11e4f81123973a8024d315f41a1a0e4a2fbb8d0d518b036c8edc0fb7676b SHA512 1e5e830f39cedd8d79094a9d36629671e89deeeb74f4804cf37e51b488d8ad7b08f9d72c6abc414239fdb4c7622bf4a76f114ebfa33b06171d81bf0832b69538
+EBUILD liblockfile-1.17.ebuild 1338 BLAKE2B 8d87d4156aed04a9761b7d823a03d40ab92b4287fbc75c4d5cf06efb2b9ec0dd669c6a27b6965aad4268140faf19863a9362eb27b334af4c393c1c46b078e1b0 SHA512 79e73e72302bcceb8f945eb8f1a96d961e76a3643d2e8673cff96c696ea6e10c2f77a11c547ae7b0011f314195ebf8ae45c30f4ddf0b4c7d19a52d6cb5110499
 MISC metadata.xml 252 BLAKE2B 41941b57b97ac20b47abd1c6d3ca599461c97bb2b06a4473605a273c68e7964d2365be48afbc54655f1dbaf896f3b91baafc2ea16c298d8f50b6849be2adca38 SHA512 16dfabb38698963e47a19156df2c54d7c01430e30fe7b51d80c94275016f39f3d8e7981473f4fd042f63f4730e567acd7e1e8ba08ce4386f3a35e3fc537aff7c
diff --git a/net-libs/liblockfile/liblockfile-1.17.ebuild b/net-libs/liblockfile/liblockfile-1.17.ebuild
index d2fcc989d6a9..f14423cf3a3f 100644
--- a/net-libs/liblockfile/liblockfile-1.17.ebuild
+++ b/net-libs/liblockfile/liblockfile-1.17.ebuild
@@ -15,7 +15,7 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 s
 IUSE="static-libs"
 
 RDEPEND="acct-group/mail"
-DEPEND="${RDEPEND}"
+BDEPEND="${RDEPEND}"
 
 DOCS=( Changelog README )
 
diff --git a/net-libs/libsignon-glib/Manifest b/net-libs/libsignon-glib/Manifest
index e97e5c082670..817f3f73b85d 100644
--- a/net-libs/libsignon-glib/Manifest
+++ b/net-libs/libsignon-glib/Manifest
@@ -1,3 +1,5 @@
+AUX libsignon-glib-2.1-docs-optional.patch 693 BLAKE2B 7a03207ee21e674b89e5b6203d000b4657e49283ff4ba28515b7a814092aafa8b6ce373a932d7ba8ce8f11b37ec4923cbe223265eb96093a06a4fc699364f8f6 SHA512 280d54782c2390456caabb6a7a590349d0b4ff29d0490fda6c9b8d140b229548f6a4d4bd3553f16c5bf57055f3bc61996161cce99963d317dc21f82efe6eeeb3
+AUX libsignon-glib-2.1-meson-0.61.patch 1027 BLAKE2B 83f70af857671b42287b556931fa8edc7a2253842868e704b7a0b56e1d538d60e3f81909455a0912256102e80eeac2a72f44c535bef0709953e1bced14187354 SHA512 13ef68824ab388ac20873bfbef61182ee71e5793f9ac19c53bd2c7bf539aec78998786134b2552e99d6c8b6eb546a14dc08836cea797626f01ec97084b66251e
 DIST libsignon-glib-2.1.tar.gz 52440 BLAKE2B edc27f5f09c3f6d05f32ff6b560934dc003072940b44932fd90021511510fb56beaec7f25dd051b3c1d12d10942f292cc906a9fc4b74bb7f2daf8b885f15e644 SHA512 45d8e26263a16b98517cda0fff8e46fb1ffcc4bb833a6364454f120eb9819b48ee04bdb338bf5e9f0b0fe344af5940f35ed56f0765ca3605dead5b3755657dcf
-EBUILD libsignon-glib-2.1-r1.ebuild 1996 BLAKE2B 7e4918b0af07a95c45afd7c9f0cb91dd778f226268c9a96bf206d1d45ea998d3af8805a463eaf8bb7f28abd57c71f623ce0ba70079e9155f1a49945b62944f4a SHA512 ea640bb3aa3378052cc5c57e2acc2ea35212da62adf1bf523a36aa5d547325c3244e86f033a8c1df48d3c3d33f7d8be4a57de34a1044e253398d75a0a0867196
+EBUILD libsignon-glib-2.1-r2.ebuild 2055 BLAKE2B 4957dadab3b568e9082bffb22a828f29cf9c823c5e85ef6f47bda6db418e76bd74ccf956220bf45915e47c9812b72150c921a797323cb786eadb605e0f0a9bbd SHA512 e2e10000fa9bfe2874714e94ee09dfe373b02d950e2c37677d14799d1662a34ef23af55a699197d85568f95a4f84d509d79c8887e43a3f06a4bf729e67f0d11e
 MISC metadata.xml 250 BLAKE2B f3e9395137ebb9adf46cd35c1b6156f82c04cfa94f964f6da24fe71eb560cf51b4f70ebfa10daaa4884400ec22782d819ab794dfd29e7a47559f07208397195d SHA512 78c4ff15eed76ba883b457be95dabd41e928a0e64a42b758b5eab4d8a95afca27d5ea6a7cfe0948de578b169153a05f08aadfce1ddd41a88732212a1e76e565f
diff --git a/net-libs/libsignon-glib/files/libsignon-glib-2.1-docs-optional.patch b/net-libs/libsignon-glib/files/libsignon-glib-2.1-docs-optional.patch
new file mode 100644
index 000000000000..b31bd46a825e
--- /dev/null
+++ b/net-libs/libsignon-glib/files/libsignon-glib-2.1-docs-optional.patch
@@ -0,0 +1,28 @@
+From fc1098b3a376a04020c9e733eafda9fa0ac51723 Mon Sep 17 00:00:00 2001
+From: Pino Toscano <toscano.pino@tiscali.it>
+Date: Sat, 2 Jan 2021 14:19:18 +0100
+Subject: [PATCH] build: make documentation really optional
+
+Build of the documentation only if the meson option for it is enabled.
+---
+ meson.build | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 5d0de55..b10f80d 100644
+--- a/meson.build
++++ b/meson.build
+@@ -23,7 +23,9 @@ endif
+ root_dir = include_directories ('.')
+ 
+ subdir('libsignon-glib')
+-subdir('docs')
++if get_option('documentation')
++    subdir('docs')
++endif
+ 
+ if get_option('python')
+     subdir('pygobject')
+-- 
+GitLab
+
diff --git a/net-libs/libsignon-glib/files/libsignon-glib-2.1-meson-0.61.patch b/net-libs/libsignon-glib/files/libsignon-glib-2.1-meson-0.61.patch
new file mode 100644
index 000000000000..66254e398029
--- /dev/null
+++ b/net-libs/libsignon-glib/files/libsignon-glib-2.1-meson-0.61.patch
@@ -0,0 +1,31 @@
+From 4fae9155a19aca601072f361768e0bf8ed556b1e Mon Sep 17 00:00:00 2001
+From: Heiko Becker <heirecka@exherbo.org>
+Date: Tue, 11 Jan 2022 22:05:11 +0100
+Subject: [PATCH] Fix build with meson >= 0.61.0
+
+Otherwise it fails with "docs/reference/meson.build:21:6: ERROR:
+gnome.gtkdoc keyword argument 'expand_content_files' was of type
+array[File] but should have been array[str]".
+---
+ docs/reference/meson.build | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/docs/reference/meson.build b/docs/reference/meson.build
+index 654404b..3927109 100644
+--- a/docs/reference/meson.build
++++ b/docs/reference/meson.build
+@@ -47,9 +47,9 @@ gnome.gtkdoc(
+         'libsignon-glib.types',
+     ],
+     content_files: doc_content_files,
+-    expand_content_files: files(
++    expand_content_files: [
+         'migrating-1to2.xml'
+-    ),
++    ],
+     fixxref_args: [
+         '--extra-dir=@0@'.format(join_paths(glib_docpath, 'glib')),
+         '--extra-dir=@0@'.format(join_paths(glib_docpath, 'gobject')),
+-- 
+GitLab
+
diff --git a/net-libs/libsignon-glib/libsignon-glib-2.1-r1.ebuild b/net-libs/libsignon-glib/libsignon-glib-2.1-r2.ebuild
similarity index 91%
rename from net-libs/libsignon-glib/libsignon-glib-2.1-r1.ebuild
rename to net-libs/libsignon-glib/libsignon-glib-2.1-r2.ebuild
index 1fee6ac93428..7f697f3474bf 100644
--- a/net-libs/libsignon-glib/libsignon-glib-2.1-r1.ebuild
+++ b/net-libs/libsignon-glib/libsignon-glib-2.1-r2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{7,8,9,10} )
+PYTHON_COMPAT=( python3_{8..11} )
 inherit meson python-r1 vala
 
 DESCRIPTION="GLib binding for the D-Bus API provided by signond"
@@ -38,6 +38,11 @@ BDEPEND="$(python_gen_any_dep)
 	test? ( dev-libs/check )
 "
 
+PATCHES=(
+	"${FILESDIR}/${P}-docs-optional.patch"
+	"${FILESDIR}/${P}-meson-0.61.patch"
+)
+
 python_check_deps() { return 0; }
 
 pkg_setup() {
@@ -46,9 +51,7 @@ pkg_setup() {
 
 src_prepare() {
 	default
-	vala_src_prepare
-
-	use doc || sed -e "/^subdir('docs')$/d" -i meson.build || die
+	vala_setup
 
 	cp libsignon-glib/*.xml libsignon-glib/interfaces || die
 }
@@ -57,6 +60,7 @@ src_configure() {
 	myconfigure() {
 		local emesonargs=(
 			-Ddebugging=$(usex debug true false)
+			-Ddocumentation=$(usex doc true false)
 			-Dintrospection=$(usex introspection true false)
 			-Dpython=$(usex python true false)
 			-Dtests=$(usex test true false)
diff --git a/net-libs/libtorrent-rasterbar/Manifest b/net-libs/libtorrent-rasterbar/Manifest
index 149af508b2f2..7b0d68bb07ed 100644
--- a/net-libs/libtorrent-rasterbar/Manifest
+++ b/net-libs/libtorrent-rasterbar/Manifest
@@ -1,9 +1,7 @@
-DIST libtorrent-rasterbar-1.2.16.tar.gz 4163867 BLAKE2B 2cb4c79d83854bf3e5fc1b2ff9a361539b7690d0df3c2c15f2df1c7b9e782df51fbab57920a3bac56dff872c829a49303d66d33cdc10586ccc01dad3e83b149c SHA512 2bad1bf1604f99b85567056f798bfb78cdd663612291536d1145141e61f843aced416f7608911793c948d77802ef5b3088197b914c100a4278c94033eb304d4b
-DIST libtorrent-rasterbar-1.2.17.tar.gz 4167440 BLAKE2B 06e785e7ffa0e4f506b3f56f72bf5de96322ecc1d1ece542998b23412e72a73f230065c980cf2e86582b7d312b8623e22e3cd7b1974b44b287f95054e82c1513 SHA512 d2c702d8d942fb1e49e803f0684336bead40c219bf68764e193c34d335de03f0dcfb94f46d41447a7d95ec7063f314f64da0c385f3d5df310539b231063f6c0f
+DIST libtorrent-rasterbar-1.2.18.tar.gz 4178407 BLAKE2B ccf8d891e4c34d101a8d822149d14b46cebf57dd893c00e2481e55c0cb35f6931b02e4b6f8877140316bb3bf1840a54eb04943aa1fd190d29708ae64a5c93604 SHA512 4ac7ad6357a612bdc537d4dbce40935a43c32295773870e490d1acffab9841b2bb3052e476a91f702b7b5eb2ab3e6282792f53593cdcb06ddbd6f1d5a3097ee7
 DIST libtorrent-rasterbar-2.0.6.tar.gz 4431174 BLAKE2B 4951a102b68a5a7ba9a98d771ca638e8438b2aeaa95f5d7bf616542c7a02d28e184ee1bf5b7a55cd91a068cd2d4e9756c479e4ddb5eabe89d8aa833d70aa7502 SHA512 4a5d710706040ef6193967dbb13998cb0ddebe7e95c3bf8aec0812876027c68c32b001fd3f07cd4ff1b819660a8d46ae8c7077e72caf92572288a51cdec7daea
 DIST libtorrent-rasterbar-2.0.7.tar.gz 4453469 BLAKE2B b04884c55cb96031f6bfcef786ea101d18bb9310ec2e1ed528e27d8f625712855726575beae127f24c007144bb85e1eba293da748ad06794c58ebd9b38ec5aac SHA512 30e558245a261ccf3f23815a037477ae6da1a02da0b7b3aa40383058c5782a341a11ae684f959efc1c9b39e31475ec31451b9ff4b2db3c0bfccc4d42bd6d69c1
-EBUILD libtorrent-rasterbar-1.2.16.ebuild 1718 BLAKE2B 3ee27bbaefd70b2c1259d674c6eaa8480ecb1ec6f838c2aba1700c9ee47311483d9362c12b69b2aae65278c97b3696e49c243dc723b36f295499d94d4dfe81a9 SHA512 7fdb9a991095bb6faabc527075762a892101ad2f28580bbf7f6b2ea73f69e87ad244b3633c244762a324a3daf7593a847fa9d6bb73eac8a3eb9a1754a0c9d4f2
-EBUILD libtorrent-rasterbar-1.2.17.ebuild 1718 BLAKE2B 3ee27bbaefd70b2c1259d674c6eaa8480ecb1ec6f838c2aba1700c9ee47311483d9362c12b69b2aae65278c97b3696e49c243dc723b36f295499d94d4dfe81a9 SHA512 7fdb9a991095bb6faabc527075762a892101ad2f28580bbf7f6b2ea73f69e87ad244b3633c244762a324a3daf7593a847fa9d6bb73eac8a3eb9a1754a0c9d4f2
+EBUILD libtorrent-rasterbar-1.2.18.ebuild 1777 BLAKE2B bbd687549fd012bd8f6a119b08ad2c25962c561463c605943e045fc56b51b2efd3838e3f0a514b3a36f6b3c588bc71a8a81b525058298c7ad29a8c8968b79162 SHA512 7661ecce63b483dee0860b864925b647094703f121f033be60657d8fd622b502181deb13e58a63a9bf8ae43b7edfef40e1ae4b35418b140903730776266392ea
 EBUILD libtorrent-rasterbar-2.0.6.ebuild 1838 BLAKE2B 2500b8573865a8d6870a14d558d88fba63ca5369f172fe2a3d8a66594532b810f734f98545b56cb5f2135acc7a02c9db1e3af3253cd6d67760d4638bd0a040b6 SHA512 6d2e38952ba689adceb87f65bb6dac469cf99d234d85d65d0d33f9fba4c27de2789bd44d487609b8f5cc610852ceb3ef7ab9850335452c0e816c86dbd8e76325
 EBUILD libtorrent-rasterbar-2.0.7.ebuild 1895 BLAKE2B c65c006418b22b17981dc98f39d211d4edf52974cc3de3c622bac8614e132b030a01c24a5455456ad179f40d1c3777effaab3601c06d8d1829d873e2b8082846 SHA512 6f01c8fd38576aa2b3d331224d967338566ea364a95008cac8fde5b855332cf6f7d676dbd80a68e162d75993c0ab6776661ab41f89d6f8c407e4e271abb8c2e4
 MISC metadata.xml 638 BLAKE2B e4ea9381097b54924059f7682aead071561015a3842a6089927840ce24fdac16101cce2c57e01431800c1e471c34117038d10a8b82d70aaed555573a9d4d03d6 SHA512 49f5bd5348f054bec0a2646f96803ab6d2dcf6a0b0f32c9ccfb05a7055012a40703b1e9ddf912827c9197ab1a740fd41b98cd7e993f5f30633686e5b102bdec2
diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.16.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.16.ebuild
deleted file mode 100644
index 584c481282f5..000000000000
--- a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.16.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8,9,10} )
-
-inherit cmake python-single-r1
-
-DESCRIPTION="C++ BitTorrent implementation focusing on efficiency and scalability"
-HOMEPAGE="https://libtorrent.org/ https://github.com/arvidn/libtorrent"
-SRC_URI="https://github.com/arvidn/libtorrent/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/10"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
-IUSE="+dht debug python ssl test"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-libs/boost:=
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			dev-libs/boost[python,${PYTHON_USEDEP}]
-		')
-	)
-	ssl? ( dev-libs/openssl:= )
-"
-RDEPEND="${DEPEND}"
-BDEPEND="python? (
-		$(python_gen_cond_dep '
-			dev-python/setuptools[${PYTHON_USEDEP}]
-		')
-	)"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_SHARED_LIBS=ON
-		-Dbuild_examples=OFF
-		-Ddht=$(usex dht ON OFF)
-		-Dencryption=$(usex ssl ON OFF)
-		-Dlogging=$(usex debug ON OFF)
-		-Dpython-bindings=$(usex python ON OFF)
-		-Dbuild_tests=$(usex test ON OFF)
-	)
-
-	# We need to drop the . from the Python version to satisfy Boost's
-	# FindBoost.cmake module, bug #793038.
-	use python && mycmakeargs+=( -Dboost-python-module-name="${EPYTHON/./}" )
-
-	cmake_src_configure
-}
-
-src_test() {
-	local myctestargs=(
-		# Needs running UPnP server
-		-E "test_upnp"
-	)
-
-	# Checked out Fedora's test workarounds for inspiration
-	# https://src.fedoraproject.org/rpms/rb_libtorrent/blob/rawhide/f/rb_libtorrent.spec#_120
-	LD_LIBRARY_PATH="${BUILD_DIR}:${LD_LIBRARY_PATH}" cmake_src_test
-}
diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.17.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.18.ebuild
similarity index 92%
rename from net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.17.ebuild
rename to net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.18.ebuild
index 584c481282f5..aa314921fbd2 100644
--- a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.17.ebuild
+++ b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.18.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8,9,10} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit cmake python-single-r1
 
@@ -59,11 +59,12 @@ src_configure() {
 
 src_test() {
 	local myctestargs=(
-		# Needs running UPnP server
+		# test_upnp: needs running UPnP server
 		-E "test_upnp"
 	)
 
 	# Checked out Fedora's test workarounds for inspiration
 	# https://src.fedoraproject.org/rpms/rb_libtorrent/blob/rawhide/f/rb_libtorrent.spec#_120
-	LD_LIBRARY_PATH="${BUILD_DIR}:${LD_LIBRARY_PATH}" cmake_src_test
+	# -j1 for https://bugs.gentoo.org/854603#c1
+	LD_LIBRARY_PATH="${BUILD_DIR}:${LD_LIBRARY_PATH}" cmake_src_test -j1
 }
diff --git a/net-libs/pjproject/Manifest b/net-libs/pjproject/Manifest
index f33f5bce205b..65538d8b5bfb 100644
--- a/net-libs/pjproject/Manifest
+++ b/net-libs/pjproject/Manifest
@@ -6,5 +6,5 @@ AUX pjproject-2.12.1-r2-bashism.patch 1658 BLAKE2B 52498d58f953ca6ca04a3fb4f013f
 AUX pjproject-2.12.1-r2-musl.patch 2941 BLAKE2B 58eab3d88a503e36fd1dee26593805e0ec487fc50a41fbc68e6d489895920a15f671ad7d28257d158eda9c2253826fe9e2f9c115b644028191821abdc9aa035d SHA512 26b51b7b5bdd93b40ff267bea1c213f7417acaaab233ffcedaba948c509471210b53eea03c536056afe9298753644b6108d5cf88cf49d8e16e23309967e374ec
 DIST pjproject-2.12.1.tar.gz 9660659 BLAKE2B d893f22d995c9570e4003f80adf15144cf39e09d5843a88e3a616a529a91164ec7b012ea66ede8d55bfe4ec0dc4eca7d230f07fc66f06dfafaea9d5ff72910fa SHA512 9087456024b8886e56660cebc45c7093b3b91cd6b08a3926fa2c0de452989ac84ceb4e27413c0311bde95f271341ee44d9681f81f83602a4e16151f1831d773b
 EBUILD pjproject-2.12.1-r1.ebuild 3775 BLAKE2B 9a868494def81d6a7c0bfd16ab31b606db66d79a945b08a76370fd45ca21e745f72bba6c5316ab0cc7dbfc6c060e76949fc188fbe5371171644388262fc0aa95 SHA512 ba406e659cfcf2dffd04c2bda54d37d4409561040c9349edb6ac8c990304d1e5fa59bf7c4864f2e8d04b0e2252525450c59177c3bcfbf52c44b2977e6d675146
-EBUILD pjproject-2.12.1-r2.ebuild 4020 BLAKE2B 31edf5fb08daeed7cf6aea17be6eb82b0d65d398ffeb92e1e9c8df11b4ef2f337ec3d71f5135ea6f121553866fe60ae00f7f7173c631d131db9900b6c5221cec SHA512 021cf3fa946fc62f598dacbb52a9d3f39b0644817c189809bc0ae1c6b45f52087d7d293cdfa009d67e14dd9b8389810b0075b85e2df71d42005990b404aec971
+EBUILD pjproject-2.12.1-r2.ebuild 4019 BLAKE2B a8be77f4abdfd13085bd544693a2a9a1bf5b763e755b6abf333180188f259a7a9c914c6b395941e9c042a3e0cf850e62c53092323eaf89389471c0e92a2d22dd SHA512 ecef78a8438c403f66cc9a2c178d03b345c85e206560244b2db4e6c1d1a7ed3a63ec8cc02c7f88a2ec6e19be217c6fd08c05b41fe6c304587b87c767e54da6c4
 MISC metadata.xml 1459 BLAKE2B e35f9c8621ea7c1c2670d90f69c341b53b20501ece6fcb41fefdec9f328a6c2b88f2f9d2fd2a77938b802fc74c36f2e3387cad3be7c9126767f28d32b42d19ed SHA512 498a94fb2bf3692b60c644e9d3e341761b20e8a4e0215e1c14c4444a199f9abb085f3421e143e7b944bac54a4f774c0b47af76c6fae5fc2cda4da13d1781a9b0
diff --git a/net-libs/pjproject/pjproject-2.12.1-r2.ebuild b/net-libs/pjproject/pjproject-2.12.1-r2.ebuild
index 846b53806406..b990527753f7 100644
--- a/net-libs/pjproject/pjproject-2.12.1-r2.ebuild
+++ b/net-libs/pjproject/pjproject-2.12.1-r2.ebuild
@@ -8,7 +8,7 @@ inherit autotools flag-o-matic toolchain-funcs
 DESCRIPTION="Open source SIP, Media, and NAT Traversal Library"
 HOMEPAGE="https://www.pjsip.org/"
 SRC_URI="https://github.com/pjsip/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 
 LICENSE="GPL-2"
 SLOT="0/${PV}"
diff --git a/net-libs/telepathy-logger-qt/Manifest b/net-libs/telepathy-logger-qt/Manifest
index 14be84bb14dc..caea140b8373 100644
--- a/net-libs/telepathy-logger-qt/Manifest
+++ b/net-libs/telepathy-logger-qt/Manifest
@@ -1,3 +1,3 @@
 DIST telepathy-logger-qt-17.09.0.tar.xz 93480 BLAKE2B f516ff58b64a59ba3b51c0daf0c871fd0e03b7860fa94f2139175cccb3e5ff4f108b09db22366bdc2e4031556ab06712d1d935b8db7b1ed9b08803f047c943c3 SHA512 1524673a7dcba0d65c57e49d6e0dafd1b826b6444faaabc1dc482b29f6515374a1beb09a9bbfb115097e10fc18722ffe0187dc1bff9be06dc56a95ef32d805e3
-EBUILD telepathy-logger-qt-17.09.0.ebuild 739 BLAKE2B 5e8c856131f5203e02a9e80bc65b7375c7a80f689189406b9a74df417d2023917e3a54068ab3260afe65562164fd041f8900d8f3a644fc346bc760f3dfe0b211 SHA512 176f022809fb471c170a4d120c7cd9983419acb80157914cde84b123183ac60c3ce376a891f9b747d7721ea51ea083278ab13fe2a2888d785bbea854db78d99c
+EBUILD telepathy-logger-qt-17.09.0-r1.ebuild 707 BLAKE2B 6f43a06ce922fb4b7fa324ce522c243497e8cacef76bd48fc4fe78fddf934a4382bcb37b58f4f89c6d080ec07e7b340112178bd5f76c6b3a1e40fd79eec04f1d SHA512 a002187a973cff3b2fceb53fad0aeffa18ff5059eb804943ae21103d0cb9b511141db2859608715f1cefaa87ced4c81a641e91436e52e41a31cc48abee3aafb0
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/net-libs/telepathy-logger-qt/telepathy-logger-qt-17.09.0.ebuild b/net-libs/telepathy-logger-qt/telepathy-logger-qt-17.09.0-r1.ebuild
similarity index 79%
rename from net-libs/telepathy-logger-qt/telepathy-logger-qt-17.09.0.ebuild
rename to net-libs/telepathy-logger-qt/telepathy-logger-qt-17.09.0-r1.ebuild
index ef9772b444ab..aee54c207b95 100644
--- a/net-libs/telepathy-logger-qt/telepathy-logger-qt-17.09.0.ebuild
+++ b/net-libs/telepathy-logger-qt/telepathy-logger-qt-17.09.0-r1.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{7..10} )
-QTMIN=5.12.3
+PYTHON_COMPAT=( python3_{8..11} )
 inherit ecm kde.org python-any-r1
 
 DESCRIPTION="Qt bindings for the Telepathy logger"
@@ -19,15 +18,15 @@ LICENSE="LGPL-2.1"
 SLOT="5"
 IUSE=""
 
-BDEPEND="${PYTHON_DEPS}"
 DEPEND="
 	dev-libs/dbus-glib
 	dev-libs/glib:2
 	dev-libs/libxml2
-	>=dev-qt/qtdbus-${QTMIN}:5
+	dev-qt/qtdbus:5
 	net-im/telepathy-logger
 	net-libs/telepathy-glib
-	net-libs/telepathy-qt[qt5(+)]
+	net-libs/telepathy-qt
 	sys-apps/dbus
 "
 RDEPEND="${DEPEND}"
+BDEPEND="${PYTHON_DEPS}"
diff --git a/net-libs/telepathy-qt/Manifest b/net-libs/telepathy-qt/Manifest
index 22f2edfb9a42..7a5ff7255386 100644
--- a/net-libs/telepathy-qt/Manifest
+++ b/net-libs/telepathy-qt/Manifest
@@ -1,4 +1,5 @@
+AUX telepathy-qt-0.9.8-fix-tests-finding-glib-2.patch 874 BLAKE2B a9d18d8dd7c79b0f14462dbb072f0eecbbd4351341856d52daade09e73b0c977ec5bcad0cb99c2d1113f696499ac538ed76c6ab0b1d95528852e00262fa092d8 SHA512 96e056ca2dfffdd287ae060dacff8d6645cc25df78c9ecd264aba321aa4187be8264129e72f96ac041198e6e4bf4505399db829f760dcab3c85be5adb9b976f9
 DIST telepathy-qt-0.9.8.tar.gz 6448686 BLAKE2B 7554b812c35a09aabc0ff92fea43f633b5c2f87784c8e7b387545b31c1c92eb02f9e416930c635202fe0205c4e26c1fd63c3b4a668cf0ceeb602d8a777891cd9 SHA512 fad662c02417c8e4e239d438ea3549226e589442aea8418c8922a6b78ff88422a36c1cc0d2e3591240fac115390a7fbdb1b4deea98187051cc811175b60b9e8b
-EBUILD telepathy-qt-0.9.8-r1.ebuild 1573 BLAKE2B 6902a26da268b730cfc4df71e95fb64eb967d48beaab175289f330011f70da740ac00429f8e87ce0d908f8e26132fc98c49f12718b4c3e360e647ae47c8b5330 SHA512 5d7c8da155b8dd4f38831e2ed8ae2c8600bce3f8b51cb57c19f5a6733257c9ff7e4d2dfc43af3bc49a545ba16c89b6d0cbba889e3c867c623941f1f4eec0af23
-EBUILD telepathy-qt-9999.ebuild 1702 BLAKE2B c06acb0e6b487ab578d3fe56b3a3cf30a5bbd336e89744c3a067a4568e4306124f4102ac721a6a365d6514fec954d6f6032f7895a58487c2d3fcdd8d4d984d2e SHA512 8f7cb36796235a46cab3df2071cd1e4118a0ae212e99508350b279d72d786e8517042847ddc35aae513ab254acd790cbe8b1a462e63a15c2de9dd2ae50f9ee52
+EBUILD telepathy-qt-0.9.8-r2.ebuild 1634 BLAKE2B 05c9cc0ddfe10ac0488f21d007874bcc5142a7b15f702aba8bb13523f69cf5682ed6e3136402af4a5aae03710630c510393cea8578844db82b4a61f520c623da SHA512 582048df8842aaa377cecd544f9ae29ec25d4fe5af01e4ef4a4f4a621904ff5ad00e96c87d8ec09559fd170a0d9488f0adbed12fd2720a4a89a004742e2ee15f
+EBUILD telepathy-qt-9999.ebuild 1735 BLAKE2B f87958375eabd19d1d3739803e5bee2139e472e89d375faa4a72c571edccded428c9da173d32995c1cbe2542ffaf417b6cacdbcb5b102e305ae02a10de03ba41 SHA512 07f1ee350d005a99810859fdfacc79cf3a9977199bddf0c6195b4a2613e83e7ab63ff760b2bb09f69720b38111ce5f190081537befcfff9f5b82524ecde75916
 MISC metadata.xml 722 BLAKE2B d17eb48d784f9128e24be8dbc68237870291a2b758b0d3009b6aaf0fec4396421f10a332ffac927b4e83dbb3a95bfa9376fe1831d633a38dc3cf1ee8e7f44733 SHA512 ec1dff533720d3f77cfc194332740fb200db1e2d024d2ea64ef13e831911f7ca700b7588bf263be2a24e3b606c2dfa580220b9feda064c2551ebd81a33c9ae5c
diff --git a/net-libs/telepathy-qt/files/telepathy-qt-0.9.8-fix-tests-finding-glib-2.patch b/net-libs/telepathy-qt/files/telepathy-qt-0.9.8-fix-tests-finding-glib-2.patch
new file mode 100644
index 000000000000..0ac61c48a87a
--- /dev/null
+++ b/net-libs/telepathy-qt/files/telepathy-qt-0.9.8-fix-tests-finding-glib-2.patch
@@ -0,0 +1,23 @@
+From 188dece432d090809c5ad88a91cd573c5af61c09 Mon Sep 17 00:00:00 2001
+From: Albert Astals Cid <aacid@kde.org>
+Date: Mon, 6 Jun 2022 09:44:53 +0200
+Subject: [PATCH] Fix build with newer glib
+
+gunixconnection.h is now at /usr/include/glib-2.0/gio/gunixconnection.h
+---
+ cmake/modules/FindGIOUnix.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cmake/modules/FindGIOUnix.cmake b/cmake/modules/FindGIOUnix.cmake
+index 263c093e..7f5513b3 100644
+--- a/cmake/modules/FindGIOUnix.cmake
++++ b/cmake/modules/FindGIOUnix.cmake
+@@ -21,7 +21,7 @@ pkg_check_modules(PC_LibGIOUnix gio-unix-2.0)
+ find_path(GIOUNIX_MAIN_INCLUDE_DIR
+           NAMES gio/gunixconnection.h
+           HINTS ${PC_LibGIOUnix_INCLUDEDIR}
+-          PATH_SUFFIXES gio-unix-2.0)
++          PATH_SUFFIXES gio-unix-2.0 glib-2.0)
+ 
+ set(GIOUNIX_INCLUDE_DIR "${GIOUNIX_MAIN_INCLUDE_DIR}")
+ 
diff --git a/net-libs/telepathy-qt/telepathy-qt-0.9.8-r1.ebuild b/net-libs/telepathy-qt/telepathy-qt-0.9.8-r2.ebuild
similarity index 93%
rename from net-libs/telepathy-qt/telepathy-qt-0.9.8-r1.ebuild
rename to net-libs/telepathy-qt/telepathy-qt-0.9.8-r2.ebuild
index af50e027063c..89e203b7332d 100644
--- a/net-libs/telepathy-qt/telepathy-qt-0.9.8-r1.ebuild
+++ b/net-libs/telepathy-qt/telepathy-qt-0.9.8-r2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{8,9,10} )
+PYTHON_COMPAT=( python3_{8..11} )
 PYTHON_REQ_USE="xml(+)"
 inherit python-any-r1 cmake virtualx
 
@@ -17,7 +17,6 @@ KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 IUSE="debug farstream test"
 
 REQUIRED_USE="test? ( farstream )"
-
 RESTRICT="!test? ( test )"
 
 RDEPEND="
@@ -47,6 +46,8 @@ BDEPEND="${PYTHON_DEPS}
 	)
 "
 
+PATCHES=( "${FILESDIR}/${P}-fix-tests-finding-glib-2.patch" )
+
 python_check_deps() {
 	use test || return 0
 	python_has_version "dev-python/dbus-python[${PYTHON_USEDEP}]"
diff --git a/net-libs/telepathy-qt/telepathy-qt-9999.ebuild b/net-libs/telepathy-qt/telepathy-qt-9999.ebuild
index 806f66f84703..e61c8d77eecc 100644
--- a/net-libs/telepathy-qt/telepathy-qt-9999.ebuild
+++ b/net-libs/telepathy-qt/telepathy-qt-9999.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{8,9,10} )
+PYTHON_COMPAT=( python3_{8..11} )
 PYTHON_REQ_USE="xml(+)"
 
 if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI=( "https://gitlab.freedesktop.org/telepathy/${PN}" )
+	EGIT_REPO_URI=( "https://github.com/TelepathyIM/${PN}" )
 	inherit git-r3
 else
 	SRC_URI="https://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz"
@@ -16,25 +16,15 @@ fi
 inherit python-any-r1 cmake virtualx
 
 DESCRIPTION="Qt bindings for the Telepathy D-Bus protocol"
-HOMEPAGE="https://telepathy.freedesktop.org/"
+HOMEPAGE="https://telepathy.freedesktop.org/ https://github.com/TelepathyIM/telepathy-qt/"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
 IUSE="debug farstream test"
 
 REQUIRED_USE="test? ( farstream )"
-
 RESTRICT="!test? ( test )"
 
-BDEPEND="${PYTHON_DEPS}
-	virtual/pkgconfig
-	test? (
-		dev-libs/glib:2
-		$(python_gen_any_dep '
-			dev-python/dbus-python[${PYTHON_USEDEP}]
-		')
-	)
-"
 RDEPEND="
 	dev-qt/qtcore:5
 	dev-qt/qtdbus:5
@@ -52,6 +42,15 @@ DEPEND="${RDEPEND}
 		dev-qt/qttest:5
 	)
 "
+BDEPEND="${PYTHON_DEPS}
+	virtual/pkgconfig
+	test? (
+		dev-libs/glib:2
+		$(python_gen_any_dep '
+			dev-python/dbus-python[${PYTHON_USEDEP}]
+		')
+	)
+"
 
 python_check_deps() {
 	use test || return 0
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index bb2819b45ab5..e4264ca77e26 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,9 +1,13 @@
 DIST webkitgtk-2.36.7.tar.xz 26594424 BLAKE2B 1f7450e47bffa3875aa4448925a013ec90bdaa6c813aa181d14c9a5636c58140ce55d5b5288a65cfbe9e363cd9d00f62de74665182ab9f856baa4b2ffcec6dba SHA512 e27975cf55b6be4cde2b34ed03fc717e6550dc495b444c781b3af0b32f7d580451de27ed41d74c6ff734b876118f22847096131168b0c8325031be84c1972888
 DIST webkitgtk-2.36.8.tar.xz 26610100 BLAKE2B d3862fdf18b6095c32af517b7bd175797375fff8a9d68f04d773375c0c3cea284c23466f25e3e53811ef622974f58211b4b11cb32a47ff08951cdd65b085b815 SHA512 50576f13ea84c0634d174ccf0b70d0eb28752589b2b9ce7a82ffeee1b4b6c849a802f7ae83a3c5a74d0da2b7e3321876ead33e819d8006b8153376074cb57036
 DIST webkitgtk-2.38.0.tar.xz 32997240 BLAKE2B 6612d2192b8865af625af297c88caf02e329d51e9c166b931b8bc6061f36fb1f1f2b06407adad0aa7bf5beaafe707c1d9a64d437e2ed99ed8ff1865c09f8e0dc SHA512 8380d11eedec3c4eedf3a0f5591fd279ee42b28a38aaa13d7eb88f8a004cbe8aac7dc8f19409440e5c1272ad1555a781f1242bca6c89beed2dc5fd2de5f3d525
+DIST webkitgtk-2.38.1.tar.xz 33006384 BLAKE2B 404ff4e52331f9fe929922a23bed8ab5a70cb2a6523ae23c390415bfbd3c88797f91f95b74c9c8301f462bff708c85dc7155d6b37d2c3a66d4794ca184e1ca7c SHA512 d81e85a5a43c33a63f88964907053888bb971c8fa1fe7fc90f71461c440458a21e09730c558be2b5efe42e02eb1c3d789a2571dc6d795f9c6d95fd499683a9e2
 EBUILD webkit-gtk-2.36.7.ebuild 7425 BLAKE2B 1f261d15a60f1d07895652c369cdf572cea2bdd19236abd2a2de2b31b1f8994a644d85185368a07a708c7c4e956f4547b12ae14a8befd5b1c33fd02ebfb1b9fa SHA512 459a52070c6c83950dd278c3325bc83d184314ec4e613ccf3f34fc9cd4ce7d45d854a892452e9f620da37937050c470e21614daac03189cf082cfb07f50d92a6
 EBUILD webkit-gtk-2.36.8.ebuild 7431 BLAKE2B dae5715e2d558348b040967a2aec6bb48da85da9a308322c8c7c56a511a0e9a95dc5e7fc4e58ffb175d5a239da017da4a0de8fc905c7997689d87ad85a1e8e75 SHA512 7681c899912ed9e2c4d2418d8363f7f17d76c04905dc71acd1f51709fb10766b6765d4f306d22eb6f5cf00166c72151d41b6154052203edf67d58a5e47b58efc
 EBUILD webkit-gtk-2.38.0-r410.ebuild 7759 BLAKE2B d410fc8f19be0435fe429d70943345fb45f3f0cddf851d79498f6f3dce2cebe15e7ede05aa064f85bf07a2173875d1d85e2b1412fee7e4f0eb5af77f1fd53fc9 SHA512 779f2f9c4073cc294d7e3b907a843b3c9452c83140da0e6519eab4f69aab0b81106a6151df2ba066a21c396444b53e0cea6f984f5997374a888aaaaf4ed24b95
 EBUILD webkit-gtk-2.38.0-r500.ebuild 7637 BLAKE2B 60d17bec45a04003cd20682d89534267ba7620703478411c6b42d86a5f3bcbf2a12f2971f3fce9b33677a81ff21c9654c55e37cadda64bcce168f9d2dd745d0f SHA512 fe2ba86ac2cbfefeb84093045aa5dff3b29e8c7fa70929ad744098fa4d62292267e58cb65d2400858305c5d8ff884e29c172b99a4d9d86192e7216338558d1be
 EBUILD webkit-gtk-2.38.0.ebuild 7485 BLAKE2B a748a1089fe164a8a827e262040ba316d856777d6607dea2f6c2a21ebcf62859bc7ff4318e044bcb58998a572bdc974e5414b1f773e8f73b27a1e1d974598a0e SHA512 753ebb1f3942dc3b574960369f985de8a6c781d505c21ace58cc29ab4be7f9bb5d1dfd29b2870c2734f04cef4f8f04e06e7cbdfcf03de15c912355485c952055
+EBUILD webkit-gtk-2.38.1-r410.ebuild 7808 BLAKE2B e7f002be09d32397ad11090bb0b2b8ef75fec74a2502cb9f426e9e4ab47f25de54914225edd53cc056e8dab32b70c74885f635bb8921582726963f83ef04f1b4 SHA512 cea61f06a256c54eeeb023da302b42a0487d41d0740ba8dc3970b14434367a0237d8db27d9db141b1b8ebdd881d5064145b7c17c61bb8f85c849e25da5f820ad
+EBUILD webkit-gtk-2.38.1-r500.ebuild 7687 BLAKE2B fd64d39a1168369187cf12db3a4f37d8ccb278aa5786111216d92b656a55313c8172acfc434edf912962ac612e6126f37078eb02e45b6b6d4576abe8f7446e57 SHA512 9779819e48b1f5837ddc6e25108645fd56f48203e0327d52611a826559665f32bb7796eee8986dc2275d328e63183d12e45471c0c822f26e89e0a68681be7cfd
+EBUILD webkit-gtk-2.38.1.ebuild 7534 BLAKE2B d600cc109f42ff2d6bc1f39233db47fff1b699da865f96a7143c89d62100ee9829da1a9349c734dbc92e97a225404bbe9c8cdcc5295d92c46e34db5214b6564d SHA512 56c0a953ec79956fed0cfe68042eaa66ef2fea96ac5f65c51123e0383cc283c42d00dac1c5a452e01899d91951e1e7af958a99b2ef85331fa0ebaf97d8528a51
 MISC metadata.xml 645 BLAKE2B 137e8c47f28aaac930c8eff8a3d7d4802c45171a1b8326dd4e1f4a7a334eff9e88b2c71927228cf5dbb9da7fba0ca580a9b5a32ea2156d7a94532bff67166bf4 SHA512 0c350ebb211aad61f4032888ad0e347f4e7ffca1145debfee3e2c9cdc93b42e05cfb2e6f6a4fee05b739b5550b0f28ed6fb6c311ac2d5fc6cd201c9ac26e61d1
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.38.1-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.38.1-r410.ebuild
new file mode 100644
index 000000000000..0992b464692b
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.38.1-r410.ebuild
@@ -0,0 +1,259 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_REQ_USE="xml(+)"
+PYTHON_COMPAT=( python3_{8..11} )
+USE_RUBY="ruby27 ruby30 ruby31"
+
+inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="https://www.webkitgtk.org"
+SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2+ BSD"
+SLOT="4.1/0" # soname version of libwebkit2gtk-4.1
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+IUSE="aqua avif +egl examples gamepad gles2-only gnome-keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd test wayland X"
+
+# gstreamer with opengl/gles2 needs egl
+REQUIRED_USE="
+	gles2-only? ( egl )
+	gstreamer? ( egl )
+	wayland? ( egl )
+	|| ( aqua wayland X )
+"
+
+# Tests fail to link for inexplicable reasons
+# https://bugs.webkit.org/show_bug.cgi?id=148210
+RESTRICT="test"
+
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
+# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
+# TODO: gst-plugins-base[X] is only needed when build configuration ends up with GLX set, but that's a bit automagic too to fix
+# Softblocking webkit-gtk-2.38:4 as we going to use webkit-2.38:4.1's WebKitDriver binary
+RDEPEND="
+	>=x11-libs/cairo-1.16.0[X?]
+	>=media-libs/fontconfig-2.13.0:1.0
+	>=media-libs/freetype-2.9.0:2
+	>=dev-libs/libgcrypt-1.7.0:0=
+	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
+	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
+	>=dev-libs/icu-61.2:=
+	media-libs/libjpeg-turbo:0=
+	>=net-libs/libsoup-3.0.8:3.0[introspection?]
+	>=dev-libs/libxml2-2.8.0:2
+	>=media-libs/libpng-1.4:0=
+	dev-db/sqlite:3
+	sys-libs/zlib:0
+	|| ( >=app-accessibility/at-spi2-core-2.46.0:2 >=dev-libs/atk-2.16.0 )
+	media-libs/libwebp:=
+
+	>=dev-libs/glib-2.67.1:2
+	>=dev-libs/libxslt-1.1.7
+	media-libs/woff2
+	gnome-keyring? ( app-crypt/libsecret )
+	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
+	dev-libs/libtasn1:=
+	spell? ( >=app-text/enchant-0.22:2 )
+	gstreamer? (
+		>=media-libs/gstreamer-1.20:1.0
+		>=media-libs/gst-plugins-base-1.20:1.0[egl?,X?]
+		gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
+		!gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] )
+		>=media-plugins/gst-plugins-opus-1.20:1.0
+		>=media-libs/gst-plugins-bad-1.20:1.0
+	)
+
+	X? (
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXrender
+		x11-libs/libXt
+	)
+
+	dev-libs/hyphen
+	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
+	avif? ( >=media-libs/libavif-0.9.0:= )
+	lcms? ( media-libs/lcms:2 )
+
+	egl? ( media-libs/mesa[egl(+)] )
+	gles2-only? ( media-libs/mesa[gles2] )
+	!gles2-only? ( virtual/opengl )
+	wayland? (
+		dev-libs/wayland
+		>=dev-libs/wayland-protocols-1.12
+		>=gui-libs/libwpe-1.5.0:1.0
+		>=gui-libs/wpebackend-fdo-1.7.0:1.0
+	)
+
+	seccomp? (
+		>=sys-apps/bubblewrap-0.3.1
+		sys-libs/libseccomp
+		sys-apps/xdg-dbus-proxy
+	)
+
+	systemd? ( sys-apps/systemd:= )
+	gamepad? ( >=dev-libs/libmanette-0.2.4 )
+	!<net-libs/webkit-gtk-2.38:4
+"
+DEPEND="${RDEPEND}"
+# Need real bison, not yacc
+BDEPEND="
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=app-accessibility/at-spi2-core-2.5.3
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=dev-util/gperf-3.0.1
+	>=sys-devel/bison-2.4.3
+	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	>=dev-lang/perl-5.10
+	virtual/perl-Data-Dumper
+	virtual/perl-Carp
+	virtual/perl-JSON-PP
+"
+#	test? (
+#		dev-python/pygobject:3[python_targets_python2_7]
+#		x11-themes/hicolor-icon-theme
+#	)
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++17 ; then
+			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
+		fi
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
+	fi
+
+	# Ruby situation is a bit complicated. See bug 513888
+	local rubyimpl
+	local ruby_interpreter=""
+	for rubyimpl in ${USE_RUBY}; do
+		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
+			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
+		fi
+	done
+	# This will rarely occur. Only a couple of corner cases could lead us to
+	# that failure. See bug 513888
+	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+
+	local mycmakeargs=(
+		${ruby_interpreter}
+		$(cmake_use_find_package gles2-only OpenGLES2)
+		$(cmake_use_find_package egl EGL)
+		$(cmake_use_find_package !gles2-only OpenGL)
+		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
+		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
+		-DPORT=GTK
+		# Source/cmake/WebKitFeatures.cmake
+		-DENABLE_API_TESTS=$(usex test)
+		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
+		-DENABLE_GAMEPAD=$(usex gamepad)
+		-DENABLE_MINIBROWSER=$(usex examples)
+		-DENABLE_PDFJS=$(usex pdf)
+		-DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service)
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DUSE_GSTREAMER_WEBRTC=$(usex gstreamer)
+		-DUSE_GSTREAMER_TRANSCODER=$(usex gstreamer)
+		-DENABLE_WEBGL=ON
+		# Supported only under ANGLE
+		-DENABLE_WEBGL2=OFF
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		# Source/cmake/OptionsGTK.cmake
+		-DENABLE_GLES2=$(usex gles2-only)
+		-DENABLE_DOCUMENTATION=OFF
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DENABLE_JOURNALD_LOG=$(usex systemd)
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DUSE_AVIF=$(usex avif)
+		-DUSE_GTK4=OFF
+		-DENABLE_WEBDRIVER=ON
+		-DUSE_JPEGXL=OFF
+		-DUSE_LCMS=$(usex lcms)
+		-DUSE_LIBHYPHEN=ON
+		-DUSE_LIBSECRET=$(usex gnome-keyring)
+		-DUSE_OPENGL_OR_ES=ON
+		-DUSE_OPENJPEG=$(usex jpeg2k)
+		-DUSE_SOUP2=OFF
+		-DUSE_WOFF2=ON
+		-DUSE_WPE_RENDERER=$(usex wayland) # WPE renderer is used to implement accelerated compositing under wayland
+	)
+
+	# https://bugs.gentoo.org/761238
+	append-cppflags -DNDEBUG
+
+	WK_USE_CCACHE=NO cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	insinto /usr/share/gtk-doc/html
+	# This will install API docs specific to webkit2gtk-4.1
+	doins -r "${S}"/Documentation/{jsc-glib,webkit2gtk,webkit2gtk-web-extension}-${SLOT%/*}
+}
+
+pkg_postinst() {
+	optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
+}
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.38.1-r500.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.38.1-r500.ebuild
new file mode 100644
index 000000000000..6b8fac2e5658
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.38.1-r500.ebuild
@@ -0,0 +1,253 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_REQ_USE="xml(+)"
+PYTHON_COMPAT=( python3_{8..11} )
+USE_RUBY="ruby27 ruby30 ruby31"
+
+inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="https://www.webkitgtk.org"
+SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2+ BSD"
+SLOT="5/0" # soname version of libwebkit2gtk-5.0
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+IUSE="aqua avif +egl examples gamepad gles2-only gnome-keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd test wayland X"
+
+# gstreamer with opengl/gles2 needs egl
+REQUIRED_USE="
+	gles2-only? ( egl )
+	gstreamer? ( egl )
+	wayland? ( egl )
+	|| ( aqua wayland X )
+"
+
+# Tests fail to link for inexplicable reasons
+# https://bugs.webkit.org/show_bug.cgi?id=148210
+RESTRICT="test"
+
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
+# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
+# TODO: gst-plugins-base[X] is only needed when build configuration ends up with GLX set, but that's a bit automagic too to fix
+# Softblocking webkit-gtk-2.38:4 as we going to use webkit-2.38:4.1's WebKitDriver binary
+RDEPEND="
+	>=x11-libs/cairo-1.16.0[X?]
+	>=media-libs/fontconfig-2.13.0:1.0
+	>=media-libs/freetype-2.9.0:2
+	>=dev-libs/libgcrypt-1.7.0:0=
+	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
+	gui-libs/gtk:4
+	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
+	>=dev-libs/icu-61.2:=
+	media-libs/libjpeg-turbo:0=
+	>=net-libs/libsoup-3.0.8:3.0[introspection?]
+	>=dev-libs/libxml2-2.8.0:2
+	>=media-libs/libpng-1.4:0=
+	dev-db/sqlite:3
+	sys-libs/zlib:0
+	|| ( >=app-accessibility/at-spi2-core-2.46.0:2 >=dev-libs/atk-2.16.0 )
+
+	media-libs/libwebp:=
+
+	>=dev-libs/glib-2.67.1:2
+	>=dev-libs/libxslt-1.1.7
+	media-libs/woff2
+	gnome-keyring? ( app-crypt/libsecret )
+	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
+	dev-libs/libtasn1:=
+	spell? ( >=app-text/enchant-0.22:2 )
+	gstreamer? (
+		>=media-libs/gstreamer-1.20:1.0
+		>=media-libs/gst-plugins-base-1.20:1.0[egl?,X?]
+		gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
+		!gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] )
+		>=media-plugins/gst-plugins-opus-1.20:1.0
+		>=media-libs/gst-plugins-bad-1.20:1.0
+	)
+
+	X? (
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXrender
+		x11-libs/libXt
+	)
+
+	dev-libs/hyphen
+	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
+	avif? ( >=media-libs/libavif-0.9.0:= )
+	lcms? ( media-libs/lcms:2 )
+
+	egl? ( media-libs/mesa[egl(+)] )
+	gles2-only? ( media-libs/mesa[gles2] )
+	!gles2-only? ( virtual/opengl )
+	wayland? (
+		dev-libs/wayland
+		>=dev-libs/wayland-protocols-1.12
+		>=gui-libs/libwpe-1.5.0:1.0
+		>=gui-libs/wpebackend-fdo-1.7.0:1.0
+	)
+
+	seccomp? (
+		>=sys-apps/bubblewrap-0.3.1
+		sys-libs/libseccomp
+		sys-apps/xdg-dbus-proxy
+	)
+
+	systemd? ( sys-apps/systemd:= )
+	gamepad? ( >=dev-libs/libmanette-0.2.4 )
+	!<net-libs/webkit-gtk-2.38:4
+"
+DEPEND="${RDEPEND}"
+# Need real bison, not yacc
+BDEPEND="
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=app-accessibility/at-spi2-core-2.5.3
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=dev-util/gperf-3.0.1
+	>=sys-devel/bison-2.4.3
+	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	>=dev-lang/perl-5.10
+	virtual/perl-Data-Dumper
+	virtual/perl-Carp
+	virtual/perl-JSON-PP
+"
+#	test? (
+#		dev-python/pygobject:3[python_targets_python2_7]
+#		x11-themes/hicolor-icon-theme
+#	)
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++17 ; then
+			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
+		fi
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
+	fi
+
+	# Ruby situation is a bit complicated. See bug 513888
+	local rubyimpl
+	local ruby_interpreter=""
+	for rubyimpl in ${USE_RUBY}; do
+		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
+			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
+		fi
+	done
+	# This will rarely occur. Only a couple of corner cases could lead us to
+	# that failure. See bug 513888
+	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+
+	local mycmakeargs=(
+		${ruby_interpreter}
+		$(cmake_use_find_package gles2-only OpenGLES2)
+		$(cmake_use_find_package egl EGL)
+		$(cmake_use_find_package !gles2-only OpenGL)
+		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
+		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
+		-DPORT=GTK
+		# Source/cmake/WebKitFeatures.cmake
+		-DENABLE_API_TESTS=$(usex test)
+		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
+		-DENABLE_GAMEPAD=$(usex gamepad)
+		-DENABLE_MINIBROWSER=$(usex examples)
+		-DENABLE_PDFJS=$(usex pdf)
+		-DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service)
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DUSE_GSTREAMER_WEBRTC=$(usex gstreamer)
+		-DUSE_GSTREAMER_TRANSCODER=$(usex gstreamer)
+		-DENABLE_WEBGL=ON
+		# Supported only under ANGLE
+		-DENABLE_WEBGL2=OFF
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		# Source/cmake/OptionsGTK.cmake
+		-DENABLE_GLES2=$(usex gles2-only)
+		-DENABLE_DOCUMENTATION=OFF
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DENABLE_JOURNALD_LOG=$(usex systemd)
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DUSE_AVIF=$(usex avif)
+		-DUSE_GTK4=ON # wbkit2gtk-5.0
+		-DENABLE_WEBDRIVER=OFF # Disable WebDriver for webkit2gtk-5.0 and use the webkit2gtk-4.1
+		-DUSE_JPEGXL=OFF
+		-DUSE_LCMS=$(usex lcms)
+		-DUSE_LIBHYPHEN=ON
+		-DUSE_LIBSECRET=$(usex gnome-keyring)
+		-DUSE_OPENGL_OR_ES=ON
+		-DUSE_OPENJPEG=$(usex jpeg2k)
+		-DUSE_SOUP2=OFF
+		-DUSE_WOFF2=ON
+		-DUSE_WPE_RENDERER=$(usex wayland) # WPE renderer is used to implement accelerated compositing under wayland
+	)
+
+	# https://bugs.gentoo.org/761238
+	append-cppflags -DNDEBUG
+
+	WK_USE_CCACHE=NO cmake_src_configure
+}
+
+pkg_postinst() {
+	optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
+}
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.38.1.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.38.1.ebuild
new file mode 100644
index 000000000000..ed868176aaa5
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.38.1.ebuild
@@ -0,0 +1,249 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_REQ_USE="xml(+)"
+PYTHON_COMPAT=( python3_{8..11} )
+USE_RUBY="ruby27 ruby30 ruby31"
+
+inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="https://www.webkitgtk.org"
+SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2+ BSD"
+SLOT="4/37" # soname version of libwebkit2gtk-4.0
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+IUSE="aqua avif +egl examples gamepad gles2-only gnome-keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd test wayland X"
+
+# gstreamer with opengl/gles2 needs egl
+REQUIRED_USE="
+	gles2-only? ( egl )
+	gstreamer? ( egl )
+	wayland? ( egl )
+	|| ( aqua wayland X )
+"
+
+# Tests fail to link for inexplicable reasons
+# https://bugs.webkit.org/show_bug.cgi?id=148210
+RESTRICT="test"
+
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
+# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
+# TODO: gst-plugins-base[X] is only needed when build configuration ends up with GLX set, but that's a bit automagic too to fix
+RDEPEND="
+	>=x11-libs/cairo-1.16.0[X?]
+	>=media-libs/fontconfig-2.13.0:1.0
+	>=media-libs/freetype-2.9.0:2
+	>=dev-libs/libgcrypt-1.7.0:0=
+	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
+	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
+	>=dev-libs/icu-61.2:=
+	media-libs/libjpeg-turbo:0=
+	>=net-libs/libsoup-2.54:2.4[introspection?]
+	>=dev-libs/libxml2-2.8.0:2
+	>=media-libs/libpng-1.4:0=
+	dev-db/sqlite:3
+	sys-libs/zlib:0
+	|| ( >=app-accessibility/at-spi2-core-2.46.0:2 >=dev-libs/atk-2.16.0 )
+	media-libs/libwebp:=
+
+	>=dev-libs/glib-2.67.1:2
+	>=dev-libs/libxslt-1.1.7
+	media-libs/woff2
+	gnome-keyring? ( app-crypt/libsecret )
+	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
+	dev-libs/libtasn1:=
+	spell? ( >=app-text/enchant-0.22:2 )
+	gstreamer? (
+		>=media-libs/gstreamer-1.20:1.0
+		>=media-libs/gst-plugins-base-1.20:1.0[egl?,X?]
+		gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
+		!gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] )
+		>=media-plugins/gst-plugins-opus-1.20:1.0
+		>=media-libs/gst-plugins-bad-1.20:1.0
+	)
+
+	X? (
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXrender
+		x11-libs/libXt
+	)
+
+	dev-libs/hyphen
+	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
+	avif? ( >=media-libs/libavif-0.9.0:= )
+	lcms? ( media-libs/lcms:2 )
+
+	egl? ( media-libs/mesa[egl(+)] )
+	gles2-only? ( media-libs/mesa[gles2] )
+	!gles2-only? ( virtual/opengl )
+	wayland? (
+		dev-libs/wayland
+		>=dev-libs/wayland-protocols-1.12
+		>=gui-libs/libwpe-1.5.0:1.0
+		>=gui-libs/wpebackend-fdo-1.7.0:1.0
+	)
+
+	seccomp? (
+		>=sys-apps/bubblewrap-0.3.1
+		sys-libs/libseccomp
+		sys-apps/xdg-dbus-proxy
+	)
+
+	systemd? ( sys-apps/systemd:= )
+	gamepad? ( >=dev-libs/libmanette-0.2.4 )
+"
+DEPEND="${RDEPEND}"
+# Need real bison, not yacc
+BDEPEND="
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=app-accessibility/at-spi2-core-2.5.3
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=dev-util/gperf-3.0.1
+	>=sys-devel/bison-2.4.3
+	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	>=dev-lang/perl-5.10
+	virtual/perl-Data-Dumper
+	virtual/perl-Carp
+	virtual/perl-JSON-PP
+"
+#	test? (
+#		dev-python/pygobject:3[python_targets_python2_7]
+#		x11-themes/hicolor-icon-theme
+#	)
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++17 ; then
+			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
+		fi
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
+	fi
+
+	# Ruby situation is a bit complicated. See bug 513888
+	local rubyimpl
+	local ruby_interpreter=""
+	for rubyimpl in ${USE_RUBY}; do
+		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
+			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
+		fi
+	done
+	# This will rarely occur. Only a couple of corner cases could lead us to
+	# that failure. See bug 513888
+	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+
+	local mycmakeargs=(
+		${ruby_interpreter}
+		$(cmake_use_find_package gles2-only OpenGLES2)
+		$(cmake_use_find_package egl EGL)
+		$(cmake_use_find_package !gles2-only OpenGL)
+		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
+		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
+		-DPORT=GTK
+		# Source/cmake/WebKitFeatures.cmake
+		-DENABLE_API_TESTS=$(usex test)
+		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
+		-DENABLE_GAMEPAD=$(usex gamepad)
+		-DENABLE_MINIBROWSER=$(usex examples)
+		-DENABLE_PDFJS=$(usex pdf)
+		-DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service)
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DUSE_GSTREAMER_WEBRTC=$(usex gstreamer)
+		-DUSE_GSTREAMER_TRANSCODER=$(usex gstreamer)
+		-DENABLE_WEBGL=ON
+		# Supported only under ANGLE
+		-DENABLE_WEBGL2=OFF
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		# Source/cmake/OptionsGTK.cmake
+		-DENABLE_GLES2=$(usex gles2-only)
+		-DENABLE_DOCUMENTATION=OFF
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DENABLE_JOURNALD_LOG=$(usex systemd)
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DUSE_AVIF=$(usex avif)
+		-DUSE_GTK4=OFF
+		-DENABLE_WEBDRIVER=OFF # Disable WebDriver for webkit2gtk-4.0 and use the webkit2gtk-4.1
+		-DUSE_JPEGXL=OFF
+		-DUSE_LCMS=$(usex lcms)
+		-DUSE_LIBHYPHEN=ON
+		-DUSE_LIBSECRET=$(usex gnome-keyring)
+		-DUSE_OPENGL_OR_ES=ON
+		-DUSE_OPENJPEG=$(usex jpeg2k)
+		-DUSE_SOUP2=ON
+		-DUSE_WOFF2=ON
+		-DUSE_WPE_RENDERER=$(usex wayland) # WPE renderer is used to implement accelerated compositing under wayland
+	)
+
+	# https://bugs.gentoo.org/761238
+	append-cppflags -DNDEBUG
+
+	WK_USE_CCACHE=NO cmake_src_configure
+}
+
+pkg_postinst() {
+	optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
+}
diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index e39a734a03ea..ed944ffb6437 100644
Binary files a/net-mail/Manifest.gz and b/net-mail/Manifest.gz differ
diff --git a/net-mail/mu/Manifest b/net-mail/mu/Manifest
index 0a881707a2c7..633334b4a0ee 100644
--- a/net-mail/mu/Manifest
+++ b/net-mail/mu/Manifest
@@ -3,7 +3,7 @@ DIST mu-1.8.10.tar.xz 541408 BLAKE2B e1533d5fb83df2913a6041526adc1efa15d7eca2933
 DIST mu-1.8.7.tar.xz 539664 BLAKE2B 2f0081f350c0d6da4b7920c0380a02aab42eda12062011bd03a46ceb925c179089b794b501df53b4fc84daa38e6e977a3510801685aa7c91c1c0be58c9c78929 SHA512 04c2027acec80c7569f055c8324f947862721aa36b093dba07ac80b9051229a51225e5371af7cd48fae71c9d5148bd3dc2081f591b9f733bccb5650b4853df67
 DIST mu-1.8.8.tar.xz 540092 BLAKE2B 3cd3d5f41aaf145dee66fc6d5e71256a650b16d0ee99da253d7ffc87df2e36b5fef6d19dd8831002d040c5d6ed13a53e9df69d18d7c002a05a64fb22fe32f5f5 SHA512 deb48ef7d12d76575f14e5313e9c94a40a04dc916943fa45d4281aa637b6549cbcee3cc0879b9daab51e0409cdfdc619acae12bf2ff3edaeb84fb77c3bee8982
 DIST mu-1.8.9.tar.xz 541308 BLAKE2B 418458f5e04d15cce9aa0ea650e06377c5eb2a3f08e47610ce8ac63b68f5e7914b3d70ec4e07c5b89399aaad8a6e340dd6943980e6de94b02ff299358d99d07f SHA512 534bf2c0889d436601638afa7f214492b927f1a3aa4f36509ac607132dcc17f2181e7b1d2113fdf00989bf5eb71cf7ad9b19411393fe1edbb8de162b7f7636bf
-EBUILD mu-1.8.10.ebuild 2107 BLAKE2B dc73892acf868957b6f3e115ee549e351bf478b0311d6bf13684edfe38f70ce8fcd089afd3417c7e2fbbec42d0a19dad6015d1b190ea99301ed2513111cd60b9 SHA512 d64018469203e69073e3b17588c03d468d29099aabfe7ee19aab3c8ef4c1b6b1f0bc4f26cab82738857e350d9a0d17148dce39394c83b6d12b3097bdff622c4d
+EBUILD mu-1.8.10.ebuild 2106 BLAKE2B 7da6a51b1de0124d20aede38a1826eb75a91e92518518393cc0cfa8320f3c26f4a0f5fbe2e8e229eea38f58eb11b6dd09733965043bfd0bed3fee38ad250efbe SHA512 21f779ba0ca3b2f48724fc27c60cc243a501fb0d36a189246750f4d6c9913f7062fbabd8f206019d20417f0bd2913ba0789582a216f8db257bc304b3458806c0
 EBUILD mu-1.8.7.ebuild 2106 BLAKE2B 7da6a51b1de0124d20aede38a1826eb75a91e92518518393cc0cfa8320f3c26f4a0f5fbe2e8e229eea38f58eb11b6dd09733965043bfd0bed3fee38ad250efbe SHA512 21f779ba0ca3b2f48724fc27c60cc243a501fb0d36a189246750f4d6c9913f7062fbabd8f206019d20417f0bd2913ba0789582a216f8db257bc304b3458806c0
 EBUILD mu-1.8.8.ebuild 2110 BLAKE2B 2b8f8b9b743c791c4f478d9b845898424f124b1db1cbab5fa8a1f06c5084882772d7df0037aefca9a0c96e0ad85ca5a9b8aa1736a6d35b2b3fb8def46fdd8ef1 SHA512 b23ab25334362138678db0133ee7251159513f2753dcb22f119f074e63ef2d7060d4ed2f5cbf0ed04555b78327c9af30dd6458fd6e9d65ab4c5e7ab362b78e17
 EBUILD mu-1.8.9.ebuild 2110 BLAKE2B 2b8f8b9b743c791c4f478d9b845898424f124b1db1cbab5fa8a1f06c5084882772d7df0037aefca9a0c96e0ad85ca5a9b8aa1736a6d35b2b3fb8def46fdd8ef1 SHA512 b23ab25334362138678db0133ee7251159513f2753dcb22f119f074e63ef2d7060d4ed2f5cbf0ed04555b78327c9af30dd6458fd6e9d65ab4c5e7ab362b78e17
diff --git a/net-mail/mu/mu-1.8.10.ebuild b/net-mail/mu/mu-1.8.10.ebuild
index 57080672e76f..62b981bf5db6 100644
--- a/net-mail/mu/mu-1.8.10.ebuild
+++ b/net-mail/mu/mu-1.8.10.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 ca174ab9cf2e..97264d9f6200 100644
Binary files a/net-misc/Manifest.gz and b/net-misc/Manifest.gz differ
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index 90c5cb8d99b8..95ffc732c3a2 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -13,5 +13,5 @@ DIST curl-7.85.0.tar.xz.asc 488 BLAKE2B 8fb84955ee458af7f2cecef4b48c5375db2e8179
 EBUILD curl-7.79.1-r1.ebuild 8166 BLAKE2B 69d521028d1ff2d37b270539c8ad37a8033923d60ad057a347b843587a035c0afb829361fb605ef4186243657bef6a94156e493321161c62d16ecc2b4a73d0f0 SHA512 05ef78d4080f609ff1a5deb191d1d7d09ddfe58c617cd8688c231c4e71268784ebc9c2eee1a5a023488868d23b15db7b04718e6e7a3b4dbe17ac9880eeaa1eb9
 EBUILD curl-7.83.1.ebuild 8274 BLAKE2B b9f06416a4b68a17616c90d91be3a629020110aaa7c3d9caac79937c3606982f0c28d4fe8a798311cdf623e62455d4c6aa8708faff46bb1805ed2a514bf014d9 SHA512 77992858391e805764c4b5b9eccff0e87465def7eeb105151e5a5754270d29e5e815d4239f90c6543dcad90dccac46cae843194e278ea8335aa1669a8deff4c8
 EBUILD curl-7.84.0.ebuild 8365 BLAKE2B 60758e9c23ab94612542434e0adb6602602128e455aff50c8f9da2cbdb58e27fa396bfd0011a3c461ac519e6faa25712ec80351bad3b45a7faf758aefdcbade6 SHA512 9d53b069da866f1acf875ee8615a11c8e0d5f8a88011f85ab7c8ec6e301de0d693df09d265670f0ae758aac5b923bd02a79ee0beffe5bc1454830ac876d1a652
-EBUILD curl-7.85.0-r2.ebuild 8211 BLAKE2B 297096f6db4fe9832341f928fbb8c6d3fc6e896bb370ce573d220d9be7dd4a1e0c79b3bc5f6571625944907b14746d735c66072f95805c63c6eb43b2a11d58c0 SHA512 7166dd224ad811f770e9774274e21a5b0ce58403645b9a5dd69f0fa998585eb639b592e1ed81672582d69e6c8adc95ead7467f9c7a926f8ffd8582e5bdc3aa7c
+EBUILD curl-7.85.0-r2.ebuild 8206 BLAKE2B 90fbe5112b57174dffa7dc424716fdc65aeae7578f79c72bdef66f2a4ff3130510b8bcaf03512011093ec8d11c6c55a1850193e8ee24af00b435175f0cd7d8a2 SHA512 2100186083268bd5a1b95d30d039711c943cdc8b5a9a7d9c525d19626ccc0f3b3644342f2a7436a0f9d93c1740ba2e451cf96455af912c083ee894b79ff67f34
 MISC metadata.xml 2099 BLAKE2B fd6994bf9bf8dcfe79a8677cbf2449a8638cdbfbca8bd21bd0a84ab65ab31bc4e001cd595df95b3884c20626160fa7b4310614d856891e3fb699c43a4d142dd5 SHA512 3905bca0ea55e6756f68535d9e5de11e8c7ae37768a4e236e5a75087c45803b077c1c84ecc74e54899fb7a6309b88819e3c668e73a3f4b903e48ca9123853f8c
diff --git a/net-misc/curl/curl-7.85.0-r2.ebuild b/net-misc/curl/curl-7.85.0-r2.ebuild
index 76793e314e73..aff8555dc93f 100644
--- a/net-misc/curl/curl-7.85.0-r2.ebuild
+++ b/net-misc/curl/curl-7.85.0-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://curl.haxx.se/download/${P}.tar.xz
 
 LICENSE="curl"
 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="+adns alt-svc brotli +ftp gnutls gopher hsts +http2 idn +imap ipv6 kerberos ldap mbedtls nss +openssl +pop3 +progress-meter rtmp samba +smtp ssh ssl sslv3 static-libs test telnet +tftp zstd"
 IUSE+=" curl_ssl_gnutls curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl"
 IUSE+=" nghttp3 quiche"
diff --git a/net-misc/dhcp/Manifest b/net-misc/dhcp/Manifest
index 8bfa36c32dae..e82b1d4a00d6 100644
--- a/net-misc/dhcp/Manifest
+++ b/net-misc/dhcp/Manifest
@@ -22,5 +22,5 @@ AUX dhcrelay6.conf 325 BLAKE2B be916f3f73eab9813f6b548be254277659f267610efb3ecd5
 AUX dhcrelay6.service 237 BLAKE2B 2b32d453de82873f18ce905c5c336e974d4d5263415b51860f28d93bbf449056809471da1965f6ed5e79449bfe39dba65516fb113eb140771b81e866211e01b4 SHA512 11d17aebef403fce1f3b0514f1c7206cb6520f1712c603b016c11275a83e102b969cc371dbe5a3a9c430a392dedf0c7af33692a49197092c467ea764dfaede9d
 AUX dhcrelay6.service.conf 220 BLAKE2B 936c3f0b4e6cfb4e8160dbf01c12d8ceafe62d6c9153dd26c4a0e6df687ca284554fa1d2b304af2f2dbdaac9a3cfafafc362befe8864d386f304588fa4c61092 SHA512 2ac54a5ebdf009854700e6f6b70662b36787b71a5b917fc61be35d31762508ede0e81b3874965b91de655a088914dbe43927911d8df1a16c262cb68389c168a9
 DIST dhcp-4.4.3-P1.tar.gz 10081055 BLAKE2B 6cc16f7472efb1e1f6b7a83cafd9a81a16f10af7361da079c48a5eff0d9e310f475dcc82e984c20936c64867183402d00d26e5366e75bf7463ec2aea4a6f68a4 SHA512 d14dc44d1c015780ae19769816cb01015959927a1ad7a3e84b89e0463253aaf46451af88e3260347196373906d5b438c7c616fee45ec3f128aa82af6702b7154
-EBUILD dhcp-4.4.3_p1.ebuild 8529 BLAKE2B 5b330f0333889d89456c097851cc57890b1bfb4bff4ca9e44be543a7276c5275522e0fd244252dc67e28c117787a8bd7ae7fa13526deb9b3fab6442f6e867f65 SHA512 0791828092b3cfcda94ed53a6641e27a70db0fed9ac16e411e6e31c4694f7de06d60e42fa8ff18ea5dbca37dae30efc13ec4b2c7cadd100630fd294d8a5601d7
+EBUILD dhcp-4.4.3_p1.ebuild 8555 BLAKE2B 75ae57beb9925b5fda24703bb35f19c1e367afeb27111a45e92dbe0f1e9e8392b6d7766fde16aef70dab05aba1a55eb9c9104ace5ea77e2d1735fcb64a67f6b2 SHA512 aca5321a4fc53e652ad3789d774c931c0bf221c267d77d58fa3f169ba913fe4677f0a8a97402740c2d82423dbfa58f70476289919db25c51aa520ececa46a9ae
 MISC metadata.xml 477 BLAKE2B 0e786da79e394f5dcc0812f19f81fa11327f2a173e5debb9b67929aab6100695908a2a1d990a9c25547f58b9ec7495483cd9a73e1e28da09ffcf08e77b9deaf6 SHA512 18add50afc3ff6b795a94f8fd00f13c666682beb60cea990b5a7c0d3e19a104b21d3eb29c7b8438e4386129b90b275821174eb5b7f98f4523026b6e5d714007d
diff --git a/net-misc/dhcp/dhcp-4.4.3_p1.ebuild b/net-misc/dhcp/dhcp-4.4.3_p1.ebuild
index e425d52ea36c..70e7c8c97bd7 100644
--- a/net-misc/dhcp/dhcp-4.4.3_p1.ebuild
+++ b/net-misc/dhcp/dhcp-4.4.3_p1.ebuild
@@ -21,9 +21,11 @@ SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="+client ipv6 ldap selinux +server ssl vim-syntax"
 
-DEPEND="
+BDEPEND="
 	acct-group/dhcp
-	acct-user/dhcp
+	acct-user/dhcp"
+
+DEPEND="
 	client? (
 		kernel_linux? (
 			ipv6? ( sys-apps/iproute2 )
@@ -34,7 +36,9 @@ DEPEND="
 		net-nds/openldap:=
 		ssl? ( dev-libs/openssl:= )
 	)"
-RDEPEND="${DEPEND}
+RDEPEND="
+	${BDEPEND}
+	${DEPEND}
 	selinux? ( sec-policy/selinux-dhcp )
 	vim-syntax? ( app-vim/dhcpd-syntax )"
 
diff --git a/net-misc/gnome-remote-desktop/Manifest b/net-misc/gnome-remote-desktop/Manifest
index 7e1ec8e6abd7..1c789cf39bda 100644
--- a/net-misc/gnome-remote-desktop/Manifest
+++ b/net-misc/gnome-remote-desktop/Manifest
@@ -1,3 +1,5 @@
 DIST gnome-remote-desktop-43.0.tar.xz 195212 BLAKE2B ccfb43075ce6e36de4bcf3f92265e6596b78831393e3d6b079ef71ae729a9d48fdf177673b4b7e67db8c92a0d397461c60727780f18ff78c671eac6a01229ab4 SHA512 d774d85ef15b02f6c668806e8d7b036c3063decbec81a8cf253aaa01e13a49d802f4338e677744867e2e1ab3dc02ed30c8d8edbca2a9c428b783d5a4cdd8d110
+DIST gnome-remote-desktop-43.1.tar.xz 195740 BLAKE2B b73f0e72f72c45169deb1018dd19cbac779effc2bafc53b8db21cb72c48f5871ef64e3a085509aa859550b4fb54713506e2b6410e211eba7ee8850649af7c39f SHA512 5e0164092da0fdb4877c8a1b40f1df609315390468522efaaad8f30f5c8e29111b021c1a7f3b8ce25627dfbe7937a4876d6673a816d81fdc191d30d4553a0596
 EBUILD gnome-remote-desktop-43.0.ebuild 1362 BLAKE2B 8e0b92def7905f3e36e56664eb7c192de4acfaa8da21af45ad3dec7b563c52715baddae6cb68a0ce2405a484b347e286d7f7f4b8ec9bbc3bebd2c3af4d9008a5 SHA512 6d21560f9d01cbfef4d36c3d361c2803df0812b5a1c0c522b02dd4085e3b642270a9c4827bd57389e1cb9fa0fb8b9f17015a882996184a110b7eff0a9e3b310f
+EBUILD gnome-remote-desktop-43.1.ebuild 1368 BLAKE2B b579aab040bebf357e960ba6f65813026023a63dc5023f4079dc5b7b3fe38d71fe7c1dd549ea541d90bb5f23c017e89900c56987eefbaf96e5868e152efefd33 SHA512 68ec11a3b414a8847900f9900af4beeacd9a6e45b0958afda0e4fa5351a539ba2caede34e0a6bb9649d56d4a113bd1e20e7fc55cabf8da2e0240d65d70846651
 MISC metadata.xml 377 BLAKE2B c80586f2728c8cb251627cbccf05a537496b97f46557b7c9030ed133332e9cef58ca45bc3c892f9a372b3e6014a9cbf76ec09fa7a9a5fed75dc47d145544b066 SHA512 8a3bb117450d2922322c1ea09c3388758909041eceda4e97738b5c67e27be037447cc2d33b7fecf37f0faec51d617d160977bf688f651e860cb7f5ce30c11083
diff --git a/net-misc/gnome-remote-desktop/gnome-remote-desktop-43.1.ebuild b/net-misc/gnome-remote-desktop/gnome-remote-desktop-43.1.ebuild
new file mode 100644
index 000000000000..90f943fab5e7
--- /dev/null
+++ b/net-misc/gnome-remote-desktop/gnome-remote-desktop-43.1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome.org gnome2-utils meson systemd xdg
+
+DESCRIPTION="Remote desktop daemon for GNOME using pipewire"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-remote-desktop"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="aac doc +rdp systemd +vnc"
+REQUIRED_USE="|| ( rdp vnc ) aac? ( rdp )"
+RESTRICT="test" # Tests run xvfb-run directly
+
+DEPEND="
+	x11-libs/cairo
+	x11-libs/libdrm
+	>=media-libs/libepoxy-1.4
+	>=dev-libs/glib-2.68:2
+	x11-libs/libnotify
+	app-crypt/libsecret
+	>=media-video/pipewire-0.3.49:=
+	app-crypt/tpm2-tss:=
+	rdp? (
+		>=media-libs/nv-codec-headers-11.1.5.0
+		>=net-misc/freerdp-2.8.0:=[server]
+		>=sys-fs/fuse-3.9.1:3
+		>=x11-libs/libxkbcommon-1.0.0
+
+		aac? (
+			media-libs/fdk-aac:=
+		)
+	)
+	vnc? (
+		net-libs/libvncserver
+	)
+"
+RDEPEND="${DEPEND}
+	x11-wm/mutter[screencast]
+"
+BDEPEND="
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	virtual/pkgconfig
+	doc? (
+		app-text/asciidoc
+	)
+"
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use doc man)
+		$(meson_use aac fdk_aac)
+		$(meson_use rdp)
+		$(meson_use vnc)
+		$(meson_use systemd)
+		-Dsystemd_user_unit_dir="$(systemd_get_userunitdir)"
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/net-misc/rsync/Manifest b/net-misc/rsync/Manifest
index d21dee7f315d..0c1d170e0be6 100644
--- a/net-misc/rsync/Manifest
+++ b/net-misc/rsync/Manifest
@@ -8,16 +8,12 @@ AUX rsyncd.logrotate 104 BLAKE2B 8e031a851e527815d26816985b8438dd439614cf8753d51
 AUX rsyncd.xinetd-3.0.9-r1 194 BLAKE2B 8e3edf4831e020451ba1886e2e8ae86e576016aabcaaf8e84c48adb15ba6a2e8d8c58098af2757011ea4f84fbfd758029d905fb8f5ed21bcc5ac34c3baae2a9c SHA512 fc053fc4748950343e866cc95284d037156a953454e4294d775f01f059e96e805582688bf1de5c965836889192ce4a663ec740e6ec2265406e509c5c6d6c3215
 DIST rsync-3.2.4.tar.gz 1114853 BLAKE2B a67fcb9619874f1c5346a876138e59f4bf508a90736f830fb2b4eaf180ab11f15a0a7db9b3b28c3b990b77c2b0973d8e668bf509e4134f464159ed3172f53d80 SHA512 96318e2754fbddf84d16df671c721e577766969dfa415925c4dc1be2e4e60a51246623747a8aec0c6e9c0824e6aa7335235ccd07f3d6fd901f8cf28e2d6e91b6
 DIST rsync-3.2.4.tar.gz.asc 195 BLAKE2B 9bc2fbd59e5396a91de82f27a461367ad2a129820e2d1926c3b1e26dacf93c676a7231f186c341b6dec9c764a9619b504bc9b5f95925982e78de4607eddf6c65 SHA512 7e1bbebc777d5710345fdec1efd4c2ef1079d6c0ec90272a1a4a51a59ae3cb619b9d1c0ae2f337ecdd06827bb3536b969b6f21f9108f8d21114713aa1750012b
-DIST rsync-3.2.5.tar.gz 1129957 BLAKE2B a0d1c4a2dbebe37bad4f6e2e5e4fae41c53529d96e0ca5a429d29d1dee8c63c8ee1b7dc686b732a88049c547271260e8361ac798673970d5327d08dda01ce811 SHA512 6d115acb5bae546cd2b5df2c11390f8609107b7a45aa649158d8daa0c9290ab5f15640fdd4000b21d1ab39f7385b85d77cd8fe4628fa13b2adeea6fcd53d057a
-DIST rsync-3.2.5.tar.gz.asc 195 BLAKE2B 9ca9034afc39299c2178190412b188f561d274d8e38d58a988487f2db14a8135840acf3413096d26f080358b69779fa3b48e292670ba6b23ae4eb0c05f9df614 SHA512 b384f48b2fd459a51715c8ab2a14e540c5fa7f7f12453282db770893d6121b1b3c9809e667ccacaf910fd90548abeb700a2c717d76fbea22fe3d6a22aa6b2c44
 DIST rsync-3.2.6.tar.gz 1138593 BLAKE2B fa0c4aa9cdffbc9ffd4f81e8c3cdc1fda7080f80c1923084c6d705e6872caaba31c13de4603c9462f312dbbdae76520c27d3f4f40b327f1e66c7127b1d05ea73 SHA512 d141d04732c91e055708e8d1f14b976f9483208a93076bb66dc75cbf87d54f2dcbffc11423f0c9c005d2d4e20cb9c147a7672f7a9c0b987f4e2c39b4c3645cfe
 DIST rsync-3.2.6.tar.gz.asc 195 BLAKE2B 945c60ca67aa4234bc9d5b38c9228125f3040bccecf60c08892286c1b4fa32878d92bfc78ee664d4f6453ccaaf6d394dbe203f0a8be149e557fabede1c111b07 SHA512 1316b358dfa87ad7c35b2b5d11e0be111a182041150cf9c9ae30f73e0af1430a59136250dc853f784e9e80d0ee20cc46e9a34b07cc7c7a48040db168a8c8941b
-DIST rsync-3.2.7pre1.tar.gz 1146970 BLAKE2B a41ef2acdff2b4e6703beb47b6ac90ec40d56bb53492b0a7aba268ebaf4e6bc19a7bde8fbac1ae35ed9062f2d37dd9a5ef0dd17ce8f78a0dab9f184959fd2ce5 SHA512 98eac7e0734e7dc8874fa51265419b40431b9bdc1861a16f8ccec6aa2b42df86532fb7585c19f2c814ad2e71ebf420414120cef434c6712279e453b14fd853f9
-DIST rsync-3.2.7pre1.tar.gz.asc 195 BLAKE2B bb497c19f53e7b465771425c4ee20582b46ea8af652232a58602d8e007fa4a10a237303e46ef22e78432606e95462161930de200b064ab1d2addcadc9dceae50 SHA512 6fb46e8b3a510dd7602003d6ced6d8cda57e5e2c8df4e1f2036c169e51fe21b460b6e6a42fc1c9c8fdc31c37d9992c287d64f529e019d629f35b4a43ab1eb1d8
-EBUILD rsync-3.2.4-r1.ebuild 4489 BLAKE2B d13cc511cb1c48c11dfce0df382a0e3baf107ffeddc6d8204debf64c2a15aa97f970a0e4a59b33f71d3e98ad42913ece4ffe576e653a985d9e3391b61419896b SHA512 bdb098101abe7ef32e23b8658f56718cfb00ca3acf273bf590a21edd80e1e54bdeee6169e4a55af4d6e9c94d00233f9e3dbbe970e48bc9d21da5a9479863df73
+DIST rsync-3.2.7.tar.gz 1149787 BLAKE2B 1b910b321e8d6b49af9f26bef813509f0da12dedd6857897de136d3617c68d38368ce05de13b9b0ef35a5452dca141ebdcdfb6af8456151d0ca0ad546452b504 SHA512 c2afba11a352fd88133f9e96e19d6df80eb864450c83eced13a7faa23df947bccf2ef093f2101df6ee30abff4cbbd39ac802e9aa5f726e42c9caff274fad8377
+DIST rsync-3.2.7.tar.gz.asc 195 BLAKE2B d2bca9276d9a0c96a9156a8da60e391f58eceb2e1ffaa51b7e7ffd592feaba3ce54772bd563a251e3b30efb0ad07fc96da01158a77dd77c6534eac5d80b46e53 SHA512 bad9f48e033966566c6abf8cd485d35c0d9cf130eafb0c5fff9bcb928882283bbcdd2375e7c2880cf71cf81496ba6b743b61adca3d4678421c32915a2464acc3
 EBUILD rsync-3.2.4-r3.ebuild 4766 BLAKE2B 2c5a0c4bd2f5f600cec463fe3d5a41cd4f9908ec5ead8e19a52a29108ad25be43cb6da3eb3f04fb0aafb9efb0bcc33e66d6b6f3450ce59a922d21db533d5f87d SHA512 482dee5328c886e9103a4d0a7d05e7bb258f12093f2dd530eef427714dd7f80ffbff821c4104783c066a7178efbe46da7d86101d74fb094c46f32ee411db22d2
-EBUILD rsync-3.2.5-r1.ebuild 4569 BLAKE2B 39e55ad37ad47876ae60b763004fa46dc03141833c3e7b4e24d2ef9fe76276c638f9e45c07f5dc4c2ba9f38d3bfa1657e3e17e1ea388d3606fef32bc5f99c76d SHA512 8a204dec65919da949bb9f341beb4a2b671c8ba3f80bbe775df01faef170682542f8bbb9c3f08b4649ddcd4be82f5cd81e77b64d768ccc0abcdbfdb31377662f
 EBUILD rsync-3.2.6.ebuild 4515 BLAKE2B 89f5ad14e0dd506830dae96014566274a70b09b8d66215174dbe15c609075e2cdb179f83b20acde4170bd0c9b2707fa1e9b81a5bd6792d7913f60c5ece06532e SHA512 ebf536d851b3da99859f080e322147ac3438e90b06ea01148698bd22b4269ba4ccd84fc8b7217188010ab8e20ce3f92ff86a245de4aa7013ba500a93b620faf8
-EBUILD rsync-3.2.7_pre1.ebuild 4515 BLAKE2B 89f5ad14e0dd506830dae96014566274a70b09b8d66215174dbe15c609075e2cdb179f83b20acde4170bd0c9b2707fa1e9b81a5bd6792d7913f60c5ece06532e SHA512 ebf536d851b3da99859f080e322147ac3438e90b06ea01148698bd22b4269ba4ccd84fc8b7217188010ab8e20ce3f92ff86a245de4aa7013ba500a93b620faf8
+EBUILD rsync-3.2.7.ebuild 4515 BLAKE2B 89f5ad14e0dd506830dae96014566274a70b09b8d66215174dbe15c609075e2cdb179f83b20acde4170bd0c9b2707fa1e9b81a5bd6792d7913f60c5ece06532e SHA512 ebf536d851b3da99859f080e322147ac3438e90b06ea01148698bd22b4269ba4ccd84fc8b7217188010ab8e20ce3f92ff86a245de4aa7013ba500a93b620faf8
 EBUILD rsync-9999.ebuild 4515 BLAKE2B 89f5ad14e0dd506830dae96014566274a70b09b8d66215174dbe15c609075e2cdb179f83b20acde4170bd0c9b2707fa1e9b81a5bd6792d7913f60c5ece06532e SHA512 ebf536d851b3da99859f080e322147ac3438e90b06ea01148698bd22b4269ba4ccd84fc8b7217188010ab8e20ce3f92ff86a245de4aa7013ba500a93b620faf8
 MISC metadata.xml 782 BLAKE2B 678fe6284d94d9a24535c21cc203b41ce0aaade030189fd3284e40976057ae5358e8ab8fbbacc2582ee9b0ac62e07ef090edb0eeeab915ed7aa126b282c7c382 SHA512 5febc4501ca953544c1ee6d138ab2abd97f72f7aa09ae3eb889740754cf77e0c89f5ea9c4adde5c5da65b243f3b06641e1c3e637fc6b503261a0665f5a853033
diff --git a/net-misc/rsync/rsync-3.2.4-r1.ebuild b/net-misc/rsync/rsync-3.2.4-r1.ebuild
deleted file mode 100644
index d569ca909ecd..000000000000
--- a/net-misc/rsync/rsync-3.2.4-r1.ebuild
+++ /dev/null
@@ -1,164 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8,9,10} )
-inherit flag-o-matic prefix python-single-r1 systemd
-
-DESCRIPTION="File transfer program to keep remote files into sync"
-HOMEPAGE="https://rsync.samba.org/"
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/WayneD/rsync.git"
-	inherit autotools git-r3
-
-	REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-else
-	VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/waynedavison.asc
-	inherit verify-sig
-
-	if [[ ${PV} == *_pre* ]] ; then
-		SRC_DIR="src-previews"
-	else
-		SRC_DIR="src"
-		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
-
-	SRC_URI="https://rsync.samba.org/ftp/rsync/${SRC_DIR}/${P/_/}.tar.gz
-		verify-sig? ( https://rsync.samba.org/ftp/rsync/${SRC_DIR}/${P/_/}.tar.gz.asc )"
-	S="${WORKDIR}"/${P/_/}
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="acl examples iconv ipv6 lz4 ssl stunnel system-zlib xattr xxhash zstd"
-REQUIRED_USE+=" examples? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="acl? ( virtual/acl )
-	examples? (
-		${PYTHON_DEPS}
-		dev-lang/perl
-	)
-	lz4? ( app-arch/lz4 )
-	ssl? ( dev-libs/openssl:0= )
-	system-zlib? ( sys-libs/zlib )
-	xattr? ( kernel_linux? ( sys-apps/attr ) )
-	xxhash? ( dev-libs/xxhash )
-	zstd? ( >=app-arch/zstd-1.4 )
-	>=dev-libs/popt-1.5
-	iconv? ( virtual/libiconv )"
-DEPEND="${RDEPEND}"
-BDEPEND="examples? ( ${PYTHON_DEPS} )"
-
-if [[ ${PV} == *9999 ]] ; then
-	BDEPEND+=" ${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			dev-python/commonmark[${PYTHON_USEDEP}]
-		')"
-else
-	BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-waynedavison )"
-fi
-
-pkg_setup() {
-	# - USE=examples needs Python itself at runtime, but nothing else
-	# - 9999 needs commonmark at build time
-	if [[ ${PV} == *9999 ]] || use examples ; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	default
-
-	if [[ ${PV} == *9999 ]] ; then
-		eaclocal -I m4
-		eautoconf -o configure.sh
-		eautoheader && touch config.h.in
-	fi
-}
-
-src_configure() {
-	# Force enable IPv6 on musl - upstream bug:
-	# https://bugzilla.samba.org/show_bug.cgi?id=10715
-	use elibc_musl && use ipv6 && append-cppflags -DINET6
-
-	local myeconfargs=(
-		--with-rsyncd-conf="${EPREFIX}"/etc/rsyncd.conf
-		--without-included-popt
-		$(use_enable acl acl-support)
-		$(use_enable iconv)
-		$(use_enable ipv6)
-		$(use_enable lz4)
-		$(use_enable ssl openssl)
-		$(use_with !system-zlib included-zlib)
-		$(use_enable xattr xattr-support)
-		$(use_enable xxhash)
-		$(use_enable zstd)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	newconfd "${FILESDIR}"/rsyncd.conf.d rsyncd
-	newinitd "${FILESDIR}"/rsyncd.init.d-r1 rsyncd
-
-	dodoc NEWS.md README.md TODO tech_report.tex
-
-	insinto /etc
-	newins "${FILESDIR}"/rsyncd.conf-3.0.9-r1 rsyncd.conf
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/rsyncd.logrotate rsyncd
-
-	insinto /etc/xinetd.d
-	newins "${FILESDIR}"/rsyncd.xinetd-3.0.9-r1 rsyncd
-
-	# Install stunnel helpers
-	if use stunnel ; then
-		emake DESTDIR="${D}" install-ssl-daemon
-	fi
-
-	# Install the useful contrib scripts
-	if use examples ; then
-		python_fix_shebang support/
-
-		exeinto /usr/share/rsync
-		doexe support/*
-
-		rm -f "${ED}"/usr/share/rsync/{Makefile*,*.c}
-	fi
-
-	eprefixify "${ED}"/etc/{,xinetd.d}/rsyncd*
-
-	systemd_newunit packaging/systemd/rsync.service rsyncd.service
-}
-
-pkg_postinst() {
-	if grep -Eqis '^[[:space:]]use chroot[[:space:]]*=[[:space:]]*(no|0|false)' \
-		"${EROOT}"/etc/rsyncd.conf "${EROOT}"/etc/rsync/rsyncd.conf ; then
-		ewarn "You have disabled chroot support in your rsyncd.conf.  This"
-		ewarn "is a security risk which you should fix.  Please check your"
-		ewarn "/etc/rsyncd.conf file and fix the setting 'use chroot'."
-	fi
-
-	if use stunnel ; then
-		einfo "Please install \">=net-misc/stunnel-4\" in order to use stunnel feature."
-		einfo
-		einfo "You maybe have to update the certificates configured in"
-		einfo "${EROOT}/etc/stunnel/rsync.conf"
-	fi
-
-	if use system-zlib ; then
-		ewarn "Using system-zlib is incompatible with <rsync-3.1.1 when"
-		ewarn "using the --compress option."
-		ewarn
-		ewarn "When syncing with >=rsync-3.1.1 built with bundled zlib,"
-		ewarn "and the --compress option, add --new-compress (-zz)."
-		ewarn
-		ewarn "For syncing the portage tree, add:"
-		ewarn "PORTAGE_RSYNC_EXTRA_OPTS=\"--new-compress\" to make.conf"
-	fi
-}
diff --git a/net-misc/rsync/rsync-3.2.5-r1.ebuild b/net-misc/rsync/rsync-3.2.5-r1.ebuild
deleted file mode 100644
index 6e6e4bd34c3e..000000000000
--- a/net-misc/rsync/rsync-3.2.5-r1.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Uncomment when introducing a patch which touches configure
-RSYNC_NEEDS_AUTOCONF=1
-PYTHON_COMPAT=( python3_{8..10} )
-inherit prefix python-single-r1 systemd
-
-DESCRIPTION="File transfer program to keep remote files into sync"
-HOMEPAGE="https://rsync.samba.org/"
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/WayneD/rsync.git"
-	inherit autotools git-r3
-
-	REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-else
-	VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/waynedavison.asc
-	inherit verify-sig
-
-	if [[ -n ${RSYNC_NEEDS_AUTOCONF} ]] ; then
-		inherit autotools
-	fi
-
-	if [[ ${PV} == *_pre* ]] ; then
-		SRC_DIR="src-previews"
-	else
-		SRC_DIR="src"
-		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
-
-	SRC_URI="https://rsync.samba.org/ftp/rsync/${SRC_DIR}/${P/_/}.tar.gz
-		verify-sig? ( https://rsync.samba.org/ftp/rsync/${SRC_DIR}/${P/_/}.tar.gz.asc )"
-	S="${WORKDIR}"/${P/_/}
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="acl examples iconv lz4 ssl stunnel system-zlib xattr xxhash zstd"
-REQUIRED_USE+=" examples? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	>=dev-libs/popt-1.5
-	acl? ( virtual/acl )
-	examples? (
-		${PYTHON_DEPS}
-		dev-lang/perl
-	)
-	lz4? ( app-arch/lz4:= )
-	ssl? ( dev-libs/openssl:= )
-	system-zlib? ( sys-libs/zlib )
-	xattr? ( kernel_linux? ( sys-apps/attr ) )
-	xxhash? ( >=dev-libs/xxhash-0.8 )
-	zstd? ( >=app-arch/zstd-1.4:= )
-	iconv? ( virtual/libiconv )"
-DEPEND="${RDEPEND}"
-BDEPEND="examples? ( ${PYTHON_DEPS} )"
-
-if [[ ${PV} == *9999 ]] ; then
-	BDEPEND+=" ${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			dev-python/commonmark[${PYTHON_USEDEP}]
-		')"
-else
-	BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-waynedavison )"
-fi
-
-PATCHES=(
-	"${FILESDIR}"/${P}-pedantic-errors.patch
-)
-
-pkg_setup() {
-	# - USE=examples needs Python itself at runtime, but nothing else
-	# - 9999 needs commonmark at build time
-	if [[ ${PV} == *9999 ]] || use examples ; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	default
-
-	if [[ ${PV} == *9999 || -n ${RSYNC_NEEDS_AUTOCONF} ]] ; then
-		eaclocal -I m4
-		eautoconf -o configure.sh
-		eautoheader && touch config.h.in
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		--with-rsyncd-conf="${EPREFIX}"/etc/rsyncd.conf
-		--without-included-popt
-		--enable-ipv6
-		$(use_enable acl acl-support)
-		$(use_enable iconv)
-		$(use_enable lz4)
-		$(use_enable ssl openssl)
-		$(use_with !system-zlib included-zlib)
-		$(use_enable xattr xattr-support)
-		$(use_enable xxhash)
-		$(use_enable zstd)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	newconfd "${FILESDIR}"/rsyncd.conf.d rsyncd
-	newinitd "${FILESDIR}"/rsyncd.init.d-r1 rsyncd
-
-	dodoc NEWS.md README.md TODO tech_report.tex
-
-	insinto /etc
-	newins "${FILESDIR}"/rsyncd.conf-3.0.9-r1 rsyncd.conf
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/rsyncd.logrotate rsyncd
-
-	insinto /etc/xinetd.d
-	newins "${FILESDIR}"/rsyncd.xinetd-3.0.9-r1 rsyncd
-
-	# Install stunnel helpers
-	if use stunnel ; then
-		emake DESTDIR="${D}" install-ssl-daemon
-	fi
-
-	# Install the useful contrib scripts
-	if use examples ; then
-		python_fix_shebang support/
-
-		exeinto /usr/share/rsync
-		doexe support/*
-
-		rm -f "${ED}"/usr/share/rsync/{Makefile*,*.c}
-	fi
-
-	eprefixify "${ED}"/etc/{,xinetd.d}/rsyncd*
-
-	systemd_newunit packaging/systemd/rsync.service rsyncd.service
-}
-
-pkg_postinst() {
-	if grep -Eqis '^[[:space:]]use chroot[[:space:]]*=[[:space:]]*(no|0|false)' \
-		"${EROOT}"/etc/rsyncd.conf "${EROOT}"/etc/rsync/rsyncd.conf ; then
-		ewarn "You have disabled chroot support in your rsyncd.conf.  This"
-		ewarn "is a security risk which you should fix.  Please check your"
-		ewarn "/etc/rsyncd.conf file and fix the setting 'use chroot'."
-	fi
-
-	if use stunnel ; then
-		einfo "Please install \">=net-misc/stunnel-4\" in order to use stunnel feature."
-		einfo
-		einfo "You maybe have to update the certificates configured in"
-		einfo "${EROOT}/etc/stunnel/rsync.conf"
-	fi
-
-	if use system-zlib ; then
-		ewarn "Using system-zlib is incompatible with <rsync-3.1.1 when"
-		ewarn "using the --compress option."
-		ewarn
-		ewarn "When syncing with >=rsync-3.1.1 built with bundled zlib,"
-		ewarn "and the --compress option, add --new-compress (-zz)."
-		ewarn
-		ewarn "For syncing the portage tree, add:"
-		ewarn "PORTAGE_RSYNC_EXTRA_OPTS=\"--new-compress\" to make.conf"
-	fi
-}
diff --git a/net-misc/rsync/rsync-3.2.7_pre1.ebuild b/net-misc/rsync/rsync-3.2.7.ebuild
similarity index 100%
rename from net-misc/rsync/rsync-3.2.7_pre1.ebuild
rename to net-misc/rsync/rsync-3.2.7.ebuild
diff --git a/net-misc/spice-gtk/Manifest b/net-misc/spice-gtk/Manifest
index 6e562912d42b..bfcb11809a80 100644
--- a/net-misc/spice-gtk/Manifest
+++ b/net-misc/spice-gtk/Manifest
@@ -1,12 +1,10 @@
 AUX README.gentoo 527 BLAKE2B 5f02dbe14485894513b67bfb8b6f6159321e081f82f24c76a4b05f1463f8a6e332fffb2510b791a04fb9ad99ce7caba761b313fe2252c8d44893faa6ccef0d29 SHA512 2f8a79f6eea330ac9a6927c6cce29f9232c3c0650436f3f4c459d324bd5054a4ad82786d926e5e4c7384e74cb84d1fbb387c25b0b4c27fdb9514d526cbe02f9b
 AUX spice-gtk-0.39-fix-finding-pyparsing.patch 634 BLAKE2B 232f39c0762c23553952e3f84018622b01f51ea2e1967b83f1016cf9e096e798d914e044598dcf6c41359dc95116152409918d7be800fe686dbdaa2d711ce30b SHA512 54140731f5005d2ccbd41358f499be6dfcdf909606c894c3707f686ba80898595484f2509857608c54d60908dbbb1ef4309ae0673f47d1594eb7b543db39fb45
-DIST spice-gtk-0.39.tar.xz 845528 BLAKE2B c886c4c9f0e51d7f2bf6dbfe574f1a2bcab249f863cb7da1f009410572cdaa7a35ef98fc370a7e74f7e490ad3bfe8ffa832601f8bb0b0894b90ec1de76495ce9 SHA512 ff0f3ca6b10a2c415f2fa8d61464c5710aaa2a46c2c83909f146fa45f01151e756d9c3d79cb162dd3d0c1279b6ef55a67fc5c1266af2cb5b46ac1eaa0254c8d2
 DIST spice-gtk-0.40-meson-0.63.patch.xz 5932 BLAKE2B 5188e46236024575543125226404a24490faf37e9b764e8b8e2935620c6a908f6ca93f35c2a414306bb3c6646c0e47b2fd12ced83a7829ad8c118a1188b44ed8 SHA512 7b4ea4cf48b1e95bbc81c7eaa54b135333a8dba8167959e8baa7b50398d6542f2ac3d98fdb493995abb47b2a6bfb2ac75c393dda795cf69b7335ca6e3b1ddb70
 DIST spice-gtk-0.40.tar.xz 848688 BLAKE2B 1046361ca40037bca826759bd7dc86f522640d39c08b1579f8e25bc2a2510665034445f7421d4de0485df9ef868e19779000c643035842f18e16555e3a1936b3 SHA512 b6db8b56c5c36158d97b3f7690d18883c4d6076e4ed1de1763fc704f9a2397b60d6170b70882d7d0a977b32be334756b7a27d66849f53e4d3b82abb8a54a0892
 DIST spice-gtk-0.41.tar.xz 827320 BLAKE2B bed8e62647ca9fde8a3b534a3d9720dee829f222442edb589e6ff569ce9a49f16e3c99bad4798a22e8a551d0d89875043c2335e2b08a80901483ace6a1948d6d SHA512 bfd97c98c8bdbc29da0f26c38dfcf75d9f17e5358d4c7fa9c36e4974d0df3ce92409ca568dfc790d43f581d00b94090d9e60154e83220a719d678b596c87fcef
-EBUILD spice-gtk-0.39-r2.ebuild 3213 BLAKE2B 155bad33f1cfa843b6acbd8328e0f8101f7d516a2435dec74c7acbd98ecebb056b60f7ac35f28d33d60164c80edb5ae81ffbeb7e6deeb04580ac2cbb8fde76a3 SHA512 59820f150ab9d75098384e4d5976f36eaf9b44226b94aae744906f2aa3b7adaa95712569bf9fa44b4b6416b4462fc7b284e9929b9e6a17f7b065e566f96c9b2a
-EBUILD spice-gtk-0.40-r1.ebuild 3889 BLAKE2B c278a4fc4f5cec6cac7cde39fd2992c0a4e7709ed39aec71c340174051566e42b837506b6c21b4087e982e0895633f6015794350d5f97de85443748d50569214 SHA512 e2d9f9a9fdf924c8ff8c6341252a9c8ff1fb4b76411d648789a3b3b72f3a4a42e29a13c6ca7701dc528c233c961bc82689c8ca4a27e4f3b89b9e7209e4b8d52e
-EBUILD spice-gtk-0.40.ebuild 3749 BLAKE2B f18256fcf9b954d226082071b1e2796fa1b9ae654c083c8fb53cffcd0a6b9cb5912e1dc4565ff0377f63d04a0afa8b597a5c1fb0059e1b0ba30c78b8d75155fe SHA512 624d84b204657f24ba367c093fc5954a09d24d7b44b1970277dddd180d26a65f9f8d970c762d11a2d3faaa04e01be2b572f6c8e4cdbd5fed834f490d237c1c92
-EBUILD spice-gtk-0.41.ebuild 3747 BLAKE2B 43ee85c0d88ce6dd0bbbb3b0398e6578ad185362f8f59fef7aeddd09bfbdb2c70508096acfa1248e653962e0169e1bed68e24db5ba26f904ddd1fb8d149999af SHA512 549bdfe856a0703a6856b91ad7bc829b6609c8bd2de59f359988f1cfdae2bd2dfae84a3860bcc732262e85a4913a08a606aba7b3877eea40748cc1d243320579
-EBUILD spice-gtk-9999.ebuild 3747 BLAKE2B 43ee85c0d88ce6dd0bbbb3b0398e6578ad185362f8f59fef7aeddd09bfbdb2c70508096acfa1248e653962e0169e1bed68e24db5ba26f904ddd1fb8d149999af SHA512 549bdfe856a0703a6856b91ad7bc829b6609c8bd2de59f359988f1cfdae2bd2dfae84a3860bcc732262e85a4913a08a606aba7b3877eea40748cc1d243320579
+EBUILD spice-gtk-0.40-r1.ebuild 3889 BLAKE2B 7c07c418da5ba8843fa99bc4db763d76b018f40f08a9fca5b44c43735339ec450a32fa40986c2eebf321ed1a4df573c0abb80e121b3e6ef013e342d609cc89cd SHA512 021636c851a432aea5cc199c7e51c902f4c5f56cb07e8f5e2536e0c9f060a67abf888cd16d9764e0e41380cf35f6fa66b4af3e6c74a3fac5ad4c05cec3bb5495
+EBUILD spice-gtk-0.41-r1.ebuild 3737 BLAKE2B 5240c3bd92556bc95249c8eb12457344a98134da51cd7b0999526740545f160e2098238efd043f4f12d18c5a655322a9a188e9eaf48f6061542a5cac4680a45a SHA512 cd612eb2ad03f5661b7192dbc532377c95b6bcfec7c2f534c9b1fb2ebb748461303d81ab364e0c551ca0da94082a36c8abe9e847c61dbb642a1f62cfa2b8eec0
+EBUILD spice-gtk-0.41.ebuild 3747 BLAKE2B 54c2ca68c943b04e01e9221764fe309f19e55e371239c482c9bb96929d92756e604497ec675053a8257c059fda2e5785515289b97a74de6e67a0e40b259d54a3 SHA512 5c0815c208988b5b2865eaba03b78b10dde9615d7c4f6e30c372cd795fab77154916193cbfbff3d2bc2ed77f8f5f7557e77a843a743ab0c3d324a37573d4e52f
+EBUILD spice-gtk-9999.ebuild 3737 BLAKE2B 5240c3bd92556bc95249c8eb12457344a98134da51cd7b0999526740545f160e2098238efd043f4f12d18c5a655322a9a188e9eaf48f6061542a5cac4680a45a SHA512 cd612eb2ad03f5661b7192dbc532377c95b6bcfec7c2f534c9b1fb2ebb748461303d81ab364e0c551ca0da94082a36c8abe9e847c61dbb642a1f62cfa2b8eec0
 MISC metadata.xml 786 BLAKE2B 92848ffe7209398af8bb17b6ec7017474aac7abfd9b2d1babdf9724c909ab364c53d23115d46c7cfc316ac2014c56d89a80590924e5fa31302b9a9016783e30d SHA512 1de921c89ecdeeaf601d8a362f025ed636a4125152a5042e51ca7c54c1b0dbe479566ad9528913c24209ac4c22c94c7b8a927bf6e352ea8223c65408af3a7dfa
diff --git a/net-misc/spice-gtk/spice-gtk-0.39-r2.ebuild b/net-misc/spice-gtk/spice-gtk-0.39-r2.ebuild
deleted file mode 100644
index f8eb8b05b3c8..000000000000
--- a/net-misc/spice-gtk/spice-gtk-0.39-r2.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-VALA_MIN_API_VERSION="0.14"
-VALA_USE_DEPEND="vapigen"
-
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit desktop meson python-any-r1 readme.gentoo-r1 vala xdg-utils
-
-DESCRIPTION="Set of GObject and Gtk objects for connecting to Spice servers and a client GUI"
-HOMEPAGE="https://www.spice-space.org https://cgit.freedesktop.org/spice/spice-gtk/"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-SRC_URI="https://www.spice-space.org/download/gtk/${P}.tar.xz"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="+gtk3 +introspection lz4 mjpeg policykit sasl smartcard usbredir vala wayland webdav"
-
-# TODO:
-# * check if sys-freebsd/freebsd-lib (from virtual/acl) provides acl/libacl.h
-# * use external pnp.ids as soon as that means not pulling in gnome-desktop
-RDEPEND="
-	>=dev-libs/glib-2.46:2
-	dev-libs/json-glib:0=
-	media-libs/gst-plugins-base:1.0
-	media-libs/gst-plugins-good:1.0
-	media-libs/gstreamer:1.0[introspection?]
-	media-libs/opus
-	sys-libs/zlib
-	virtual/jpeg:0=
-	>=x11-libs/cairo-1.2
-	>=x11-libs/pixman-0.17.7
-	gtk3? ( x11-libs/gtk+:3[introspection?] )
-	introspection? ( dev-libs/gobject-introspection )
-	dev-libs/openssl:0=
-	lz4? ( app-arch/lz4 )
-	sasl? ( dev-libs/cyrus-sasl )
-	smartcard? ( app-emulation/qemu[smartcard] )
-	usbredir? (
-		sys-apps/hwdata
-		>=sys-apps/usbredir-0.4.2
-		virtual/libusb:1
-		policykit? (
-			sys-apps/acl
-			>=sys-auth/polkit-0.110-r1
-		)
-	)
-	webdav? (
-		net-libs/phodav:2.0
-		>=net-libs/libsoup-2.49.91:2.4 )
-"
-# TODO: spice-gtk has an automagic dependency on media-libs/libva without a
-# configure knob. The package is relatively lightweight so we just depend
-# on it unconditionally for now. It would be cleaner to transform this into
-# a USE="vaapi" conditional and patch the buildsystem...
-RDEPEND="${RDEPEND}
-	amd64? ( media-libs/libva:= )
-	arm64? ( media-libs/libva:= )
-	x86? ( media-libs/libva:= )
-"
-DEPEND="${RDEPEND}
-	>=app-emulation/spice-protocol-0.14.3
-	dev-perl/Text-CSV
-	dev-util/glib-utils
-	>=dev-util/gtk-doc-am-1.14
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-"
-
-BDEPEND="
-	$(python_gen_any_dep '
-		dev-python/six[${PYTHON_USEDEP}]
-		dev-python/pyparsing[${PYTHON_USEDEP}]
-	')
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.39-fix-finding-pyparsing.patch
-)
-
-python_check_deps() {
-	has_version -b "dev-python/six[${PYTHON_USEDEP}]" &&
-	has_version -b "dev-python/pyparsing[${PYTHON_USEDEP}]"
-}
-
-src_prepare() {
-	default
-	use vala && vala_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_feature gtk3 gtk)
-		$(meson_feature introspection)
-		$(meson_use mjpeg builtin-mjpeg)
-		$(meson_feature policykit polkit)
-		$(meson_feature lz4)
-		$(meson_feature sasl)
-		$(meson_feature smartcard)
-		$(meson_feature usbredir)
-		$(meson_feature vala vapi)
-		$(meson_feature webdav)
-		$(meson_feature wayland wayland-protocols)
-	)
-
-	if use usbredir; then
-		emesonargs+=(
-			-Dusb-acl-helper-dir=/usr/libexec
-			-Dusb-ids-path="${EPREFIX}/usr/share/hwdata/usb.ids"
-		)
-	fi
-
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	make_desktop_entry spicy Spicy "utilities-terminal" "Network;RemoteAccess;"
-	readme.gentoo_create_doc
-}
diff --git a/net-misc/spice-gtk/spice-gtk-0.40-r1.ebuild b/net-misc/spice-gtk/spice-gtk-0.40-r1.ebuild
index 401650d5a194..d2a5fe9ddbd3 100644
--- a/net-misc/spice-gtk/spice-gtk-0.40-r1.ebuild
+++ b/net-misc/spice-gtk/spice-gtk-0.40-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 VALA_MIN_API_VERSION="0.14"
 VALA_USE_DEPEND="vapigen"
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit desktop meson optfeature python-any-r1 readme.gentoo-r1 vala xdg
 
diff --git a/net-misc/spice-gtk/spice-gtk-0.40.ebuild b/net-misc/spice-gtk/spice-gtk-0.41-r1.ebuild
similarity index 97%
rename from net-misc/spice-gtk/spice-gtk-0.40.ebuild
rename to net-misc/spice-gtk/spice-gtk-0.41-r1.ebuild
index 64c8831eb5b2..1485ff5c48c7 100644
--- a/net-misc/spice-gtk/spice-gtk-0.40.ebuild
+++ b/net-misc/spice-gtk/spice-gtk-0.41-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 VALA_MIN_API_VERSION="0.14"
 VALA_USE_DEPEND="vapigen"
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit desktop meson optfeature python-any-r1 readme.gentoo-r1 vala xdg
 
@@ -52,15 +52,15 @@ RDEPEND="
 	usbredir? (
 		sys-apps/hwdata
 		>=sys-apps/usbredir-0.4.2
+		virtual/acl
 		virtual/libusb:1
 		policykit? (
-			sys-apps/acl
 			>=sys-auth/polkit-0.110-r1
 		)
 	)
 	webdav? (
-		net-libs/phodav:2.0
-		>=net-libs/libsoup-2.49.91:2.4
+		net-libs/phodav:3.0
+		net-libs/libsoup:3.0
 	)
 "
 # TODO: spice-gtk has an automagic dependency on media-libs/libva without a
diff --git a/net-misc/spice-gtk/spice-gtk-0.41.ebuild b/net-misc/spice-gtk/spice-gtk-0.41.ebuild
index 6c26a62e1c95..1e45179576e7 100644
--- a/net-misc/spice-gtk/spice-gtk-0.41.ebuild
+++ b/net-misc/spice-gtk/spice-gtk-0.41.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 VALA_MIN_API_VERSION="0.14"
 VALA_USE_DEPEND="vapigen"
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit desktop meson optfeature python-any-r1 readme.gentoo-r1 vala xdg
 
diff --git a/net-misc/spice-gtk/spice-gtk-9999.ebuild b/net-misc/spice-gtk/spice-gtk-9999.ebuild
index 6c26a62e1c95..1485ff5c48c7 100644
--- a/net-misc/spice-gtk/spice-gtk-9999.ebuild
+++ b/net-misc/spice-gtk/spice-gtk-9999.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 VALA_MIN_API_VERSION="0.14"
 VALA_USE_DEPEND="vapigen"
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit desktop meson optfeature python-any-r1 readme.gentoo-r1 vala xdg
 
@@ -59,8 +59,8 @@ RDEPEND="
 		)
 	)
 	webdav? (
-		net-libs/phodav:2.0
-		>=net-libs/libsoup-2.49.91:2.4
+		net-libs/phodav:3.0
+		net-libs/libsoup:3.0
 	)
 "
 # TODO: spice-gtk has an automagic dependency on media-libs/libva without a
diff --git a/net-misc/wol/Manifest b/net-misc/wol/Manifest
index 1de80c37aacc..3f113257ef57 100644
--- a/net-misc/wol/Manifest
+++ b/net-misc/wol/Manifest
@@ -1,4 +1,6 @@
+AUX wol-0.7.1-Fix-config.h-test-consumption.patch 1194 BLAKE2B 469cf423fb9accb234fbc238fe7ac611d5d2a256798ec9d5a7e3ec17d21c7445e0bf0ac99f592d3a39b0fac129b1ae968949ef4d332f3e518e043de3df1031b3 SHA512 65575cb1caf69bd9ecda87e7b8a0719b12627b0fd75a999187573dd6ee5c8ce5aa8fc51fcfd77d917c7af184a66da1258410fc6530848cab415e734ff45a0c09
+AUX wol-0.7.1-Fix-malloc-detection.patch 1030 BLAKE2B 904df8bd0fc83c97192833e9443941e708d642877cb1fe4c79bb3bb6dea8e738057084290f360a1eebaf6b94f9d4c85fb02c1a41a076ad35f9d2d338b990f2ba SHA512 86ecca84b7897e1a9cbf78432a93ed463e9d73e857fccfe62fe39a4cf2f804a96452a19a2da8d093fa7fe9facec7d1e50434462834c93d2ff02b8514124c9ef6
 AUX wol-0.7.1-musl.patch 1123 BLAKE2B ff9efe257a32f3ce484ee978bee7d8b8d706d28934f83c00e7c5edaab1e04186b8d31db6a2e90bab9be7406c9caeb298fcef377d3f59a31c77b7fe9276a0f8de SHA512 670a860f02d82dd9fae8216d47629fc81f9acfa6bfdd9e38125b0e84604d14998539cb7d9c0cce15e49a52e8b38336c6475d3a5b0ec0763746b1bccd4f2f64cb
 DIST wol-0.7.1.tar.gz 445648 BLAKE2B 80e34ee5a588f7caec92c17d3455abec8227789c30dcde46ecbb75d2f5d7f2a852f6a8c11dea54c036e63db73e28f6d2aaa32bbf7b5708f23c9005f163a17f5f SHA512 233cbd038633c4b04a22710c04a8349d7706c6b4ff0554b6899ee3309349502a318f6fb05a4ad4c80cd373c362b2ad8818cb52a432d768f569e80f05658615a3
-EBUILD wol-0.7.1-r3.ebuild 605 BLAKE2B a745251d60a5b7b932aa74f379e16101197c3e4891161ca77f83256dd646a4c107b800262b8f8f6faa70a435fc7541ee9146b0b99a7420bcbe08c5a347a50e6e SHA512 7dce445920605d46ad2f97cb69a9022cd7a5a686c665bb4d8c2bf038b6d58b77796243b349cd6de03258d2c63ca1c1eee69334a13774aa3805177dd893747fd5
+EBUILD wol-0.7.1-r3.ebuild 776 BLAKE2B 93d7bf19e485eb6fff2c0a58bab5b0f66e749f74335c85be425f80d7d9f3d68f76c61274f4730c12d9bc8704e1f540e673c05a9e2dd523a6c39d8ae90f7f5ce1 SHA512 e8205dccde3842a263b227b0d750a016a8d09ba51c99026f80ed24f59f7ac66cc4cfed08c539942a3e86a8b035127728affb880c2f950ee38b61898b9f401f56
 MISC metadata.xml 617 BLAKE2B bafbe2d18eaafd5934c3d5f341076bd442700e774068cf8f143310a16b689d3140ee72fa600fc7bdcb638c5972199c96cf5534a8612565ab02192bf06507d422 SHA512 e402abeecb6242c052247d9385e3ebfd8fd8c6cf4f70b95bf244edcd32cd9b2efd0a24be8ece1353f56d51e81acc902148c68043d1ab100cc78a471c6b663dfd
diff --git a/net-misc/wol/files/wol-0.7.1-Fix-config.h-test-consumption.patch b/net-misc/wol/files/wol-0.7.1-Fix-config.h-test-consumption.patch
new file mode 100644
index 000000000000..897517a97f44
--- /dev/null
+++ b/net-misc/wol/files/wol-0.7.1-Fix-config.h-test-consumption.patch
@@ -0,0 +1,35 @@
+From 1c16d04a3fc03a5f4c0cd54ff6f207de1062e9bd Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Tue, 25 Oct 2022 13:54:04 +0100
+Subject: [PATCH] Fix config.h test consumption
+
+Bug: https://bugs.gentoo.org/874420
+--- a/lib/ether.h
++++ b/lib/ether.h
+@@ -35,7 +35,7 @@
+ 
+ #include "magic.h"
+ 
+-#if !HAVE_STRUCT_ETHER_ADDR_ETHER_ADDR_OCTET && !HAVE_STRUCT_ETHER_ADDR_OCTET
++#if !defined(HAVE_STRUCT_ETHER_ADDR_ETHER_ADDR_OCTET) && !defined(HAVE_STRUCT_ETHER_ADDR_OCTET)
+ 
+ struct
+ ether_addr
+@@ -45,7 +45,7 @@ ether_addr
+ 
+ #define ETHER_ADDR_OCTET ether_addr_octet
+ 
+-#else /* HAVE_STRUCT_ETHER_ADDR_ETHER_ADDR_OCTET || HAVE_STRUCT_ETHER_ADDR_OCTET */
++#else /* defined(HAVE_STRUCT_ETHER_ADDR_ETHER_ADDR_OCTET) || defined(HAVE_STRUCT_ETHER_ADDR_OCTET) */
+ 
+ #if HAVE_STRUCT_ETHER_ADDR_OCTET
+ #define ETHER_ADDR_OCTET octet
+@@ -55,7 +55,7 @@ ether_addr
+ #define ETHER_ADDR_OCTET ether_addr_octet
+ #endif /* HAVE_STRUCT_ETHER_ADDR_ETHER_ADDR_OCTET */
+ 
+-#endif /* !HAVE_STRUCT_ETHER_ADDR_ETHER_ADDR_OCTET && !HAVE_STRUCT_ETHER_ADDR_OCTET */
++#endif /* !defined(HAVE_STRUCT_ETHER_ADDR_ETHER_ADDR_OCTET) && !defined(HAVE_STRUCT_ETHER_ADDR_OCTET) */
+ 
+ 
+ #if !defined(HAVE_ETHER_HOSTTON)
diff --git a/net-misc/wol/files/wol-0.7.1-Fix-malloc-detection.patch b/net-misc/wol/files/wol-0.7.1-Fix-malloc-detection.patch
new file mode 100644
index 000000000000..6f783e9cfaed
--- /dev/null
+++ b/net-misc/wol/files/wol-0.7.1-Fix-malloc-detection.patch
@@ -0,0 +1,39 @@
+https://bugs.gentoo.org/874420
+
+From bcf98fe9a674a3784ad1a4f8eecc3b31a7b209a9 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Tue, 25 Oct 2022 14:00:23 +0100
+Subject: [PATCH] Fix malloc detection
+
+--- a/m4/getline.m4
++++ b/m4/getline.m4
+@@ -18,6 +18,7 @@ AC_DEFUN([AM_FUNC_GETLINE],
+ #    include <stdio.h>
+ #    include <sys/types.h>
+ #    include <string.h>
++#    include <stdlib.h>
+     int main ()
+     { /* Based on a test program from Karl Heuer.  */
+       char *line = NULL;
+--- a/m4/malloc.m4
++++ b/m4/malloc.m4
+@@ -14,6 +14,7 @@ AC_DEFUN([jm_FUNC_MALLOC],
+ 
+  AC_CACHE_CHECK([for working malloc], jm_cv_func_working_malloc,
+   [AC_TRY_RUN([
++    #include <stdlib.h>
+     char *malloc ();
+     int
+     main ()
+--- a/m4/realloc.m4
++++ b/m4/realloc.m4
+@@ -14,7 +14,8 @@ AC_DEFUN([jm_FUNC_REALLOC],
+ 
+  AC_CACHE_CHECK([for working realloc], jm_cv_func_working_realloc,
+   [AC_TRY_RUN([
+-    char *realloc ();
++    #include <stdlib.h>
++    void *realloc(void *ptr, size_t size);
+     int
+     main ()
+     {
diff --git a/net-misc/wol/wol-0.7.1-r3.ebuild b/net-misc/wol/wol-0.7.1-r3.ebuild
index 4b4ba0165cd9..3bcd9963ecdb 100644
--- a/net-misc/wol/wol-0.7.1-r3.ebuild
+++ b/net-misc/wol/wol-0.7.1-r3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit toolchain-funcs
+inherit autotools toolchain-funcs
 
 DESCRIPTION="Implements Wake On LAN (Magic Paket) functionality in a small program"
 HOMEPAGE="http://ahh.sourceforge.net/wol/"
@@ -14,7 +14,18 @@ SLOT="0"
 KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
 IUSE="nls"
 
-PATCHES=( "${FILESDIR}/${P}-musl.patch" )
+PATCHES=(
+	"${FILESDIR}/${P}-musl.patch"
+	"${FILESDIR}/${P}-Fix-config.h-test-consumption.patch"
+	"${FILESDIR}/${P}-Fix-malloc-detection.patch"
+)
+
+src_prepare() {
+	default
+
+	# bug #874420
+	eautoreconf
+}
 
 src_configure() {
 	local myeconfargs=(
diff --git a/net-misc/wput/Manifest b/net-misc/wput/Manifest
index 63c43ac51083..ad6781562c8d 100644
--- a/net-misc/wput/Manifest
+++ b/net-misc/wput/Manifest
@@ -8,5 +8,5 @@ DIST wput-0.6.2.tgz 368510 BLAKE2B bf59720e220d837354aff7d90bf06dcf54df4adf10c53
 DIST wput_0.6.2+git20130413-11.debian.tar.xz 15976 BLAKE2B 4f1facab61d22544855ce49875357c8d67d6eab013cf73cb8507a334c07b1f9e9391e342347eeafdb26b62a4156d4a0a4e2967198662ad66ef8ebb35ed2c9bf8 SHA512 d80e727edee34bd0f9b40b14c0ed1bfd2ec456542445fd38c487f06d47ca210d785e911a71d455d335b9e3940a5cfc19cc7202d93501b0b0f4f3a1e6f6a5fc0a
 DIST wput_0.6.2+git20130413.orig.tar.bz2 257503 BLAKE2B a5386f5de3e8df23d814b3a7ebba1725bcb75f0a61bd26ea402053bd11d717ae5bdd1c1bc9e43d4f4a61f55a91d9222fffe62988b869b68c206c46bfd89cf28b SHA512 f8bb23f60ae008ecd18ec7f891fc17fe8d2b3550d7788c591067e48af00c934f2c3b2e5d07234fc25bcf6cb94464710ff0309151e9ad6dd734f5a30c3fdab06f
 EBUILD wput-0.6.2.ebuild 839 BLAKE2B 117175f94dbde239cfaa0917a02194437e147f5b623204b124bd5e58b51b8dd02539aeb23e4b54bd38e9e3abf6157077bec49b8f477ec13ed7aa943966effcd2 SHA512 b230a872dd44ffc0da8af27fbbfacfe5a946bba1ae60c9acbeaec2f5d6a31233c08d6cf807114da3fe6cd12359615baa703b04f60e5eb389c5385193a02a9514
-EBUILD wput-0.6.2_p20130413_p11.ebuild 1376 BLAKE2B b7392d14e0b234fb4083439c9c44ace049a00dcc180086c3a34d8ca047902d9147c0a70fe25d54cc27f0b462712b77e36e48dd57ae983cbc60715f849e91b910 SHA512 07a448c2a790a97e0be199ad5fddd749e8b8ee0a518d07321f2c54e943099e0a869d2355455ad3b21b7245f959d8ad9c0deebe08f23338c11e95857c0b35d816
+EBUILD wput-0.6.2_p20130413_p11.ebuild 1374 BLAKE2B 12c070e12b9844266d37e04c1d57b8d8c6a7a754f0e49155aa31cf3a348a5638dcce940e9f1a144d35159fab8b71ed8e07d452bbf5787adf9719471bad182ad2 SHA512 5a8b292d8c827378c4ee40bd83540e509efdcc097a855fc497a8524cb14e1f1da28b00cc3cd12c0502bbe65383e837f1d623102311d6bb621125fd0d36cf0cbb
 MISC metadata.xml 240 BLAKE2B cc04007e3c26bf6c24277f885ef462ee5ee707f8e9d71d897736c9e82cd8ca5f1429139335c3f11c77006d8e087d5e5cf33adcc6737ce0c83811814dbc78847d SHA512 135b84e7440cd922b51279e0b3f661c881c49437ba05e185b9f003dbb2b7a5160e9dd0599d2af40ae3149f057d4f8e18a36092ed0d490219199fc0df344042e3
diff --git a/net-misc/wput/wput-0.6.2_p20130413_p11.ebuild b/net-misc/wput/wput-0.6.2_p20130413_p11.ebuild
index 5934fa45be29..eeff9d20599b 100644
--- a/net-misc/wput/wput-0.6.2_p20130413_p11.ebuild
+++ b/net-misc/wput/wput-0.6.2_p20130413_p11.ebuild
@@ -19,7 +19,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~ppc ~sparc x86"
 IUSE="debug ssl"
 
 RDEPEND="ssl? ( net-libs/gnutls:= )"
diff --git a/net-nntp/Manifest.gz b/net-nntp/Manifest.gz
index 5854480ace37..38d393735359 100644
Binary files a/net-nntp/Manifest.gz and b/net-nntp/Manifest.gz differ
diff --git a/net-nntp/slrn/Manifest b/net-nntp/slrn/Manifest
index e0e33c7e958e..f8ca49ced2da 100644
--- a/net-nntp/slrn/Manifest
+++ b/net-nntp/slrn/Manifest
@@ -1,4 +1,4 @@
 AUX slrn-1.0.2-make.patch 1044 BLAKE2B 4c2100b402e57383ccca4dd26a25bdea05ae065f978c1a96ea53881b859e5fd7a28a1d6c54ef59fcc21238c456a19ad953f8c1e78d2d7c573779e4d78291f3a6 SHA512 14859999f7739121027a7ddd6b0f157534a3e64a5c63b2354c4962c0391b9fbc5b4f80bc4260909561b534d79abcb3bdcca6f737eb52029f9c48cb0aae5f6473
 DIST slrn-1.0.3a.tar.bz2 997138 BLAKE2B a349783edae24e0269ab1b8ddc328e578340e40e72285bbf070237b3724f475450f08bbc655d3b212684b8fffc495129008bde71a481fb3d2f4326bf396e5981 SHA512 11cef2dfe41f441af15acc22fb675cf607e932f0dd6d4a998e51ecda05c9a50d7abf10a3e693ffc857ad77e09634f460404e4d5b289169e7bbffdaf5d6d565a3
 EBUILD slrn-1.0.3-r1.ebuild 853 BLAKE2B a112171c3e2c345a0a4f55b77cbd150fdd5a3257b5ac9f016b317d9127511178c0d4678a4cf87f7085b7397cb9aef36de856cab87315cd791843b1ee9af86225 SHA512 d0f74bb8800a1a480e5b14d2082c528068961498d2d84405dca1ab05600e56bbd5c1f4847b75c51c96f037128234597faad7020d25d91c1b8f8c9c3a9b36d9cc
-MISC metadata.xml 690 BLAKE2B e4e03f385e1e0c32b8f425921d265ebae817d4aa060b84217c6d35534fc68f8f4cbedaf1cbee6b020e31accbbd5e56136cdcc50d71607da4a55352cbd671a90e SHA512 197ac59bab9d705491ebf1f1d8455f250bff2a7c588cb83f7c5af1f906ee837024e3f601648eed735b0b4279a8cf21e3206c4173a603d960563d3a575c3ab22a
+MISC metadata.xml 742 BLAKE2B e24c8c18090671d4a610eb176567e9a71883de24bf9ea2e5302b3b4e782830681d6c074f2b9e483e953c8aff85f77e50c47917a1144536afb0336d6097e9c0ff SHA512 5886dd6a63f9d71cfb028dfa063198bf40c665a764de7b8eeee15aa283598fb9c178e7fda780da2dd32535dad3ed6369382b609252185d02ee8dad7b68d56440
diff --git a/net-nntp/slrn/metadata.xml b/net-nntp/slrn/metadata.xml
index a9ae22b8412d..36224d8aa4c5 100644
--- a/net-nntp/slrn/metadata.xml
+++ b/net-nntp/slrn/metadata.xml
@@ -17,5 +17,6 @@
 	</use>
 	<upstream>
 		<remote-id type="sourceforge">slrn</remote-id>
+		<remote-id type="github">jedsoft/slrn</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz
index 0f20823aae9b..86c834ffb23b 100644
Binary files a/net-p2p/Manifest.gz and b/net-p2p/Manifest.gz differ
diff --git a/net-p2p/cpuminer-opt/Manifest b/net-p2p/cpuminer-opt/Manifest
index ead5f81aa531..174d98e3c7e9 100644
--- a/net-p2p/cpuminer-opt/Manifest
+++ b/net-p2p/cpuminer-opt/Manifest
@@ -1,13 +1,7 @@
 AUX cpuminer-opt.service 690 BLAKE2B f95dff31fb5ff12da8b8ae282bba4c0fd15b5c0aa7e0f2b87f94a901a8e15ea5c81e6704fe5e81681383a3d82c41516174c4cae3a6dc59c9d2af618197f32189 SHA512 d175754246d61d08d615af52c3499d67e4d8c6a5166f07ea4fd646f3000ca7afed99f9b436785c50141a86b5faf017be4b2d1d5d2f9e3921a6171e4223be9b4c
-DIST cpuminer-opt-3.16.4.tar.gz 1830534 BLAKE2B c9fa07c36b634b0d1250b847baa4a971aad0b249aaf7792b4a69c42c5c98cc6b3e4fe20c95fdab9884520decc6e9d7071158a641863f1c0d2443dd096e372f2b SHA512 7459a9c6ad7afd85fdb8f7ff62c9deae2a2fc8341e3cf39da0f72e81bff8829e094bb830fb614fbce9665bbb259d764eb64b6d2a44ac45ecdd9ee870190d6539
-DIST cpuminer-opt-3.17.1.tar.gz 1840571 BLAKE2B db07547ec79df92f644e903485fb51abfddeafe2ecaffd18c0438cf292d51c6167eafaf7aa2b89cb6b7698d4358a4ef970459bff7b063cfd6d3a95ad878126eb SHA512 463d755bbb3146ef94292ae64a8a2397485e28b55d4b510881dd91461e3bcc2786a323cf575dd070481236b150c35af2898b5ab2b0db90c34f528821988af74c
-DIST cpuminer-opt-3.18.0.tar.gz 1869910 BLAKE2B 23e090cb9c077fc69f6eee64a522676c078de268e512c588a7d93e1bd3e3904a9e5dbc937a58c21b031f685175b2f2164df04a4f7f22f8129d5183d1b990ec2f SHA512 9144a39b7470682835b57b5ff34810933af5712b4bb2e83a2b5241aeeb13747884f5f48e22e9a71512831b56d345ee5f0e6fd226a8a30d5d10243b4a99f1476c
-DIST cpuminer-opt-3.19.8.tar.gz 1873570 BLAKE2B 9b20f47d5155ec3362172af93fab6a81b6a066c67a4c9c91ef95e9f4eddb5a325b62504414ae7b15d0088cbbda34e89741911ddd610ed727451d530d47ae141a SHA512 f8d172e906e379ddb635e64b0a626660a75aba2c1f74df014494ac934c7156664cdd2bef8963cd0433d20bca015228982b657b33be5c17bc3bd672867114a5eb
 DIST cpuminer-opt-3.20.1.tar.gz 1857399 BLAKE2B db41052f1020069b26839d12b5ac64c0dba352cb752faee1be86edfc2d21958d4ddc726d2c91c2fd1b9b5d5f08336592fd31e1a92fc37424f0d9137c082d8322 SHA512 98412c233749c87bb9629087c87350b559209f59e3ee7921b764dc0bb631b3a018368f33b4cde84d16725d67ac460f49d0aab0e838597e55f1ba47f8032cb4da
-EBUILD cpuminer-opt-3.16.4-r1.ebuild 971 BLAKE2B 88f563eda244f85ce1974b8d393709d4f8ced749d11546d041c1b2485bfa84e2fb8f85b031e8a498402ee39b64522f50d9ff0b035d6963fd1e88e7335d300dac SHA512 ee51e03d978f455cd4adda150d2e6010719ef071c9a3b4588f2ee35a5b3a9128a9d01967d8bb436b20ccd65dd47072783b571eed674ebed855bce5f18e4b2abb
-EBUILD cpuminer-opt-3.17.1-r1.ebuild 971 BLAKE2B 88f563eda244f85ce1974b8d393709d4f8ced749d11546d041c1b2485bfa84e2fb8f85b031e8a498402ee39b64522f50d9ff0b035d6963fd1e88e7335d300dac SHA512 ee51e03d978f455cd4adda150d2e6010719ef071c9a3b4588f2ee35a5b3a9128a9d01967d8bb436b20ccd65dd47072783b571eed674ebed855bce5f18e4b2abb
-EBUILD cpuminer-opt-3.18.0.ebuild 971 BLAKE2B 88f563eda244f85ce1974b8d393709d4f8ced749d11546d041c1b2485bfa84e2fb8f85b031e8a498402ee39b64522f50d9ff0b035d6963fd1e88e7335d300dac SHA512 ee51e03d978f455cd4adda150d2e6010719ef071c9a3b4588f2ee35a5b3a9128a9d01967d8bb436b20ccd65dd47072783b571eed674ebed855bce5f18e4b2abb
-EBUILD cpuminer-opt-3.19.8.ebuild 971 BLAKE2B 1489c0bd50737bab2171d5fb098beec1242e095903d81110e1a0d31166102cfba248ca57c3878bbf1e0e27a312e1c90b62825fb427aeab061d51a5243318af64 SHA512 fcafdc10f9f582252ee68a1eee22965a67d56e93fb756330d7a0f023a076b6e5e56ff9b08f87835d13eda7772f63c99a20e9b95f2cb58b5be89dc160dc08f54e
+DIST cpuminer-opt-3.20.3.tar.gz 1789988 BLAKE2B 97e6a4d6a12250cc50e678d0f3bf8dc154c30727d3a1b7ec4a4557a5af1e9bbf5c3d13f6f558aa9cd159c60f4482a3301f13cc1d8f86ef4f1c116d2eb8c8d52e SHA512 d14d148acd6e8e5a1247a64997ec6339f162f4343a2609c0188d4ee7c767e7a265af1555141ac657e43f73262391bf23f9ee26ec98c95ca837c42cd020e55d95
 EBUILD cpuminer-opt-3.20.1.ebuild 971 BLAKE2B 1489c0bd50737bab2171d5fb098beec1242e095903d81110e1a0d31166102cfba248ca57c3878bbf1e0e27a312e1c90b62825fb427aeab061d51a5243318af64 SHA512 fcafdc10f9f582252ee68a1eee22965a67d56e93fb756330d7a0f023a076b6e5e56ff9b08f87835d13eda7772f63c99a20e9b95f2cb58b5be89dc160dc08f54e
+EBUILD cpuminer-opt-3.20.3.ebuild 971 BLAKE2B 1489c0bd50737bab2171d5fb098beec1242e095903d81110e1a0d31166102cfba248ca57c3878bbf1e0e27a312e1c90b62825fb427aeab061d51a5243318af64 SHA512 fcafdc10f9f582252ee68a1eee22965a67d56e93fb756330d7a0f023a076b6e5e56ff9b08f87835d13eda7772f63c99a20e9b95f2cb58b5be89dc160dc08f54e
 EBUILD cpuminer-opt-9999.ebuild 971 BLAKE2B 1489c0bd50737bab2171d5fb098beec1242e095903d81110e1a0d31166102cfba248ca57c3878bbf1e0e27a312e1c90b62825fb427aeab061d51a5243318af64 SHA512 fcafdc10f9f582252ee68a1eee22965a67d56e93fb756330d7a0f023a076b6e5e56ff9b08f87835d13eda7772f63c99a20e9b95f2cb58b5be89dc160dc08f54e
 MISC metadata.xml 334 BLAKE2B f5b55d2366d5e2bc0fa04e0bbfd20fb8fb21993a352641b1f63b0d33075c97611fee985b6296cb1338a8b8b613f6835efcf8621cb8ca89d6598bd4a493673bb8 SHA512 a7b29760fbd65f440341fe862a157676a66caea1ac0d51b324e3cb79297a1293de9464ff1a460b9ee0b9399f3e637bf4ec8eb6022db957db792fe13282585ffa
diff --git a/net-p2p/cpuminer-opt/cpuminer-opt-3.16.4-r1.ebuild b/net-p2p/cpuminer-opt/cpuminer-opt-3.16.4-r1.ebuild
deleted file mode 100644
index 1cd33b0d51cc..000000000000
--- a/net-p2p/cpuminer-opt/cpuminer-opt-3.16.4-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic systemd
-
-DESCRIPTION="Optimized multi algo CPU miner"
-HOMEPAGE="https://github.com/JayDDee/cpuminer-opt"
-IUSE="cpu_flags_x86_sse2 curl"
-LICENSE="GPL-2"
-SLOT="0"
-REQUIRED_USE="cpu_flags_x86_sse2"
-DEPEND="
-	dev-libs/gmp:=
-	dev-libs/jansson:=
-	>=net-misc/curl-7.15[ssl]
-	dev-libs/openssl:0=
-"
-RDEPEND="${DEPEND}"
-if [[ ${PV} == "9999" ]] ; then
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/JayDDee/${PN}.git"
-	inherit git-r3
-else
-	KEYWORDS="~amd64"
-	SRC_URI="https://github.com/JayDDee/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	append-ldflags -Wl,-z,noexecstack
-	econf --with-crypto --with-curl
-}
-
-src_install() {
-	default
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	insinto "/etc/${PN}"
-	doins cpuminer-conf.json
-}
-
-src_test() {
-	./cpuminer --cputest || die
-}
diff --git a/net-p2p/cpuminer-opt/cpuminer-opt-3.17.1-r1.ebuild b/net-p2p/cpuminer-opt/cpuminer-opt-3.17.1-r1.ebuild
deleted file mode 100644
index 1cd33b0d51cc..000000000000
--- a/net-p2p/cpuminer-opt/cpuminer-opt-3.17.1-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic systemd
-
-DESCRIPTION="Optimized multi algo CPU miner"
-HOMEPAGE="https://github.com/JayDDee/cpuminer-opt"
-IUSE="cpu_flags_x86_sse2 curl"
-LICENSE="GPL-2"
-SLOT="0"
-REQUIRED_USE="cpu_flags_x86_sse2"
-DEPEND="
-	dev-libs/gmp:=
-	dev-libs/jansson:=
-	>=net-misc/curl-7.15[ssl]
-	dev-libs/openssl:0=
-"
-RDEPEND="${DEPEND}"
-if [[ ${PV} == "9999" ]] ; then
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/JayDDee/${PN}.git"
-	inherit git-r3
-else
-	KEYWORDS="~amd64"
-	SRC_URI="https://github.com/JayDDee/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	append-ldflags -Wl,-z,noexecstack
-	econf --with-crypto --with-curl
-}
-
-src_install() {
-	default
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	insinto "/etc/${PN}"
-	doins cpuminer-conf.json
-}
-
-src_test() {
-	./cpuminer --cputest || die
-}
diff --git a/net-p2p/cpuminer-opt/cpuminer-opt-3.18.0.ebuild b/net-p2p/cpuminer-opt/cpuminer-opt-3.18.0.ebuild
deleted file mode 100644
index 1cd33b0d51cc..000000000000
--- a/net-p2p/cpuminer-opt/cpuminer-opt-3.18.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic systemd
-
-DESCRIPTION="Optimized multi algo CPU miner"
-HOMEPAGE="https://github.com/JayDDee/cpuminer-opt"
-IUSE="cpu_flags_x86_sse2 curl"
-LICENSE="GPL-2"
-SLOT="0"
-REQUIRED_USE="cpu_flags_x86_sse2"
-DEPEND="
-	dev-libs/gmp:=
-	dev-libs/jansson:=
-	>=net-misc/curl-7.15[ssl]
-	dev-libs/openssl:0=
-"
-RDEPEND="${DEPEND}"
-if [[ ${PV} == "9999" ]] ; then
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/JayDDee/${PN}.git"
-	inherit git-r3
-else
-	KEYWORDS="~amd64"
-	SRC_URI="https://github.com/JayDDee/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	append-ldflags -Wl,-z,noexecstack
-	econf --with-crypto --with-curl
-}
-
-src_install() {
-	default
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	insinto "/etc/${PN}"
-	doins cpuminer-conf.json
-}
-
-src_test() {
-	./cpuminer --cputest || die
-}
diff --git a/net-p2p/cpuminer-opt/cpuminer-opt-3.19.8.ebuild b/net-p2p/cpuminer-opt/cpuminer-opt-3.20.3.ebuild
similarity index 100%
rename from net-p2p/cpuminer-opt/cpuminer-opt-3.19.8.ebuild
rename to net-p2p/cpuminer-opt/cpuminer-opt-3.20.3.ebuild
diff --git a/net-p2p/transmission/Manifest b/net-p2p/transmission/Manifest
index eb7f930d4ae6..32a10db7c75f 100644
--- a/net-p2p/transmission/Manifest
+++ b/net-p2p/transmission/Manifest
@@ -1,5 +1,6 @@
 AUX 60-transmission.conf 56 BLAKE2B 4c2aadb19b4c85ce8ecec4f190f83da81a8b9e27f02cb20b785251122b5a495d1b3b7425378c4e17d3cda3c1c5b92c4297140dcfc3d4973dfbd1ac8e713245ca SHA512 9f79cfb00fa92e6d9054aad615f0ca7a1ad9d57b750e40b8942b7987a4a93d97b1f1ba9774a64f2b16e7c49fe7ae5fb4978d7aca3c481431ff333d508ed36410
 AUX cmake-unused-command-line.patch 875 BLAKE2B 3f86d8cd5977504e89d09948120a09a152be54a5f705c3a0e44b35bb26610750f526e5dcff2f781215a66be3b3a1fba0be797187972adcbfacf41c5835d00341 SHA512 58278a26998f560f52b76bbc76bf4c2981464e2f5c8e13672c288b9eedd0944228ee104abb99422154ba23646135baabb8400344122ad13b1333156af73fea8f
+AUX transmission-3.00-horizontal-progress-bars.patch 1391 BLAKE2B 95e01e439a6cfc460dd13ee6c13c4e2cef25a2a22d1ec001271a31871bbe30580998c15ba10597762fefa07b06004e60037ac56a4acf1a376bfcdd40a9681940 SHA512 ae8a1befde3727dd2976ed0364a52bb5b1911b800603cf403222c4d61b608729aa603576eebe7624657f0f6540d4f4750e407c5cdd7fdcb82a2eac6fe80d527e
 AUX transmission-3.00-openssl-3.patch 1136 BLAKE2B a9e2aa976145c8b08d05d464216695e6b0bd4f072f3d514e46840a0d5694ce870c6824a8c3ff3fb0f6178b3d7a54f3b0602518bed9980c18cf4c5abf1ca9b760 SHA512 aa184955ef483668690ffd3788a27bfdecd3968e331dbb8997b1fbfc6acda604bd7087ed49a63607128c61273e8177e8cc6d73d2b9aad88e5b8977ebbadb459b
 AUX transmission-daemon.confd.4 735 BLAKE2B bc4c06dcf4a12282d36d446537ae8d3a461a9bb84f93b54f7d13be1c430209647bae89054b60f5d8dd434049140f74c1cb4ad04064d03b37ad88a851c28c07fa SHA512 47e78c85857eefb9be6c25d1e789cfb2a276d5816ba911ba1511e764469b2d9998edafe44247aff784113ca28926748bc5fb2b879280b780fd69ffb1e4e40736
 AUX transmission-daemon.initd.10 1707 BLAKE2B 57857fa0b628f0c49ebaf13544b366bf9db39c70f31556a21262556ad89657a7f13c84e19f882839e4bc10f2b8afef96aa51f833478e38f215499244ca8b388b SHA512 30d9fe7d06ca3c92ff436e9bbe84729a5b343b52965f8d1d3d43f14f5fa25881dbc9676c5d3d916cff552aad5872ed41c2930e9ce3a5f7c958dbeec0d1ab1ac4
@@ -7,7 +8,7 @@ AUX transmission-daemon.service.conf 69 BLAKE2B 6e38a28f54366850ae794896f2954c3a
 DIST transmission-3.00.tar.xz 3995080 BLAKE2B fb1be44aa630e6a1cf15511ab4ab40156edb16f9410b83058c53548f466fb9502c23157756a29e921e4468db1ebac7832b755cfcf98451c663c64401559f5498 SHA512 c8fb96086ba4b18f04d6181a29f6e2af85864840c533f3470a202dfa686e9431caeccd25f12c975a9a8f9b7802ca0bd73c4edc1ca06bdbada682326cad188a76
 DIST transmission-4.0.0-beta.1+r98cf7d9b3c.tar.xz 9481044 BLAKE2B 99d287645f4c28a9f021c0923712ca2b0246be53c26b2654a50e00dc7b3db51b7de304280f6ae2d57c879d96ebe811163af3c38a29e64764712d926fa5c3fb0f SHA512 1bd4265e708070577a5624ee33ab8b0a71baa6d12d121974be6c104078289892f35cab6ddb22070c749d8c1333996ad83eb6f08adf96ea492d96104cab550d60
 EBUILD transmission-3.00-r1.ebuild 3115 BLAKE2B 127e0f735cf5790d6a836ad732c3e8e414211d8d299ce90f244011ad8dc4e96bd1a5e69f735b0442cc7192415016fab5c7e81bb5cc37bf6c388c03a54b8c5d89 SHA512 3a867649911e8937c120f890c7a69dd01ef56e3e718212e5d5514308683e514049f4afe975e76340c78a1c389df076822ce02e1f2b36e6ec42fe4753ad8acfda
-EBUILD transmission-3.00-r4.ebuild 3139 BLAKE2B a2218ecab72fe5ebf921cad901d4f3b50f5ab6ae6f938ef52a6e699c6a8f553bc42aa75b9c65186b0e2c5b4c43e7fe07351cf178fd26f9014d32f26bedd4e955 SHA512 c9696e4b0c8056b1ce53bec345d93caae0503ba21671451165f3b57072cc7350719381523de0058e1404bfe8abe947d2bd754302b1101dc32bd212d38370d984
+EBUILD transmission-3.00-r5.ebuild 3200 BLAKE2B 02c6c6cb69cc5ada8c52a67f5d9128707eb84fd9ac91a218430b3a30cc9ff775c328d0b26c561c6696ba0f6e649d0cdcd04f87c23040547742c9e4e48743df93 SHA512 c3ae60e20c1e35b91e9538446620a65603cf2d42682f8215178f549a0cecae8fafd626ccd7db77e6472a638430c723e082f80ce55bcf3c9d3aa736c396d929d7
 EBUILD transmission-4.0.0_beta1.ebuild 3471 BLAKE2B a5628a172b969f68f69f265599b72e7dc296c2d29040b890c48be19f39ba58fa1206e09d89b93879c5f93bb9ec3524a8ac80659757c9eb278d57cf27fe2634dc SHA512 f67bb14c4bed820bb809f385984d0838865f08617902272c1ac0d6b1ff064b20e7efb244a2a74dedfc1e01ec33592d9d3a146149ae4f45766cb3ab9907dddf66
 EBUILD transmission-9999.ebuild 3471 BLAKE2B a5628a172b969f68f69f265599b72e7dc296c2d29040b890c48be19f39ba58fa1206e09d89b93879c5f93bb9ec3524a8ac80659757c9eb278d57cf27fe2634dc SHA512 f67bb14c4bed820bb809f385984d0838865f08617902272c1ac0d6b1ff064b20e7efb244a2a74dedfc1e01ec33592d9d3a146149ae4f45766cb3ab9907dddf66
 MISC metadata.xml 564 BLAKE2B 708f42109f5c57d776242ad935684b78a7f6cc72c439e2bb76d2fb29fb770f5054c6765df0665244c650bc930eeb312957f4749967a9b2771b8a6d032767d3b0 SHA512 22f2e75b57b24f1367cdcfe28600cfa09dab9d741ff1ab84a25052dc455272b9d9d6d62d297bdbd23e9955d41cabb540f0348c0554c465371e81175525be1ddb
diff --git a/net-p2p/transmission/files/transmission-3.00-horizontal-progress-bars.patch b/net-p2p/transmission/files/transmission-3.00-horizontal-progress-bars.patch
new file mode 100644
index 000000000000..63d8ca2fe274
--- /dev/null
+++ b/net-p2p/transmission/files/transmission-3.00-horizontal-progress-bars.patch
@@ -0,0 +1,36 @@
+https://bugs.gentoo.org/878099
+https://github.com/transmission/transmission/issues/3150
+
+--- a/qt/FileTreeDelegate.cc
++++ a/qt/FileTreeDelegate.cc
+@@ -49,7 +49,7 @@
+     if (column == FileTreeModel::COL_PROGRESS)
+     {
+         QStyleOptionProgressBar p;
+-        p.state = option.state | QStyle::State_Small;
++        p.state = option.state | QStyle::State_Horizontal | QStyle::State_Small;
+         p.direction = qApp->layoutDirection();
+         p.rect = option.rect;
+         p.rect.setSize(QSize(option.rect.width() - 4, option.rect.height() - 8));
+--- a/qt/TorrentDelegate.cc
++++ a/qt/TorrentDelegate.cc
+@@ -545,7 +545,7 @@
+         progressBarState = QStyle::State_None;
+     }
+ 
+-    progressBarState |= QStyle::State_Small;
++    progressBarState |= QStyle::State_Horizontal | QStyle::State_Small;
+ 
+     QIcon::Mode const emblemIm = isItemSelected ? QIcon::Selected : QIcon::Normal;
+     QIcon const emblemIcon = tor.hasError() ? getWarningEmblem() : QIcon();
+--- a/qt/TorrentDelegateMin.cc
++++ a/qt/TorrentDelegateMin.cc
+@@ -218,7 +218,7 @@
+         progressBarState = QStyle::State_None;
+     }
+ 
+-    progressBarState |= QStyle::State_Small;
++    progressBarState |= QStyle::State_Horizontal | QStyle::State_Small;
+ 
+     QIcon::Mode const emblemIm = isItemSelected ? QIcon::Selected : QIcon::Normal;
+     QIcon const emblemIcon = tor.hasError() ? getWarningEmblem() : QIcon();
diff --git a/net-p2p/transmission/transmission-3.00-r4.ebuild b/net-p2p/transmission/transmission-3.00-r5.ebuild
similarity index 96%
rename from net-p2p/transmission/transmission-3.00-r4.ebuild
rename to net-p2p/transmission/transmission-3.00-r5.ebuild
index 2b31213bed1f..c3299d58362c 100644
--- a/net-p2p/transmission/transmission-3.00-r4.ebuild
+++ b/net-p2p/transmission/transmission-3.00-r5.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/transmission/transmission"
 else
 	SRC_URI="https://dev.gentoo.org/~floppym/dist/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 ~riscv ~x86"
 fi
 
 DESCRIPTION="A fast, easy, and free BitTorrent client"
@@ -68,6 +68,7 @@ RDEPEND="${COMMON_DEPEND}
 PATCHES=(
 	"${FILESDIR}"/cmake-unused-command-line.patch
 	"${FILESDIR}"/transmission-3.00-openssl-3.patch
+	"${FILESDIR}"/transmission-3.00-horizontal-progress-bars.patch
 )
 
 src_configure() {
diff --git a/net-proxy/Manifest.gz b/net-proxy/Manifest.gz
index c651c0f4b488..f25b8fa8309e 100644
Binary files a/net-proxy/Manifest.gz and b/net-proxy/Manifest.gz differ
diff --git a/net-proxy/tayga/Manifest b/net-proxy/tayga/Manifest
index 2db2518abe7d..254ba5008ba4 100644
--- a/net-proxy/tayga/Manifest
+++ b/net-proxy/tayga/Manifest
@@ -1,3 +1,4 @@
+AUX tayga-0.9.2-Fix-implicit-function-declaration.patch 358 BLAKE2B cbb28422faa6286decad00ac7c658372d8fc12aefde3697205657cf54659747e04e45255d88ff44deaf6da282ab338520b73dd94b9492ca5d6e09c431b62da4d SHA512 a368a3eb08efd0c0e53c73c994f2f405c8cf274a1aeaa87836fdcb57f2fcb9362de7bf8b27513283110561f10e751d0779bb19c6990e21ecc2cb1f516a39d178
 AUX tayga-0.9.2-manpage-RFC.patch 1865 BLAKE2B 337cbafecb8895af9093d5ab059710bec9e9021ccd776820430dd6536d038fc423ce8fb85ac7379b67ed10522f78c3231433848cd4f6150d0478df04bce89360 SHA512 0d5653621821cd373d49989115ee0e5076f83f14aae04e4fa6ab7b64799f09bc1892920abe7ef649e9ac315cbc1a1604b7eec37eebdd9dd87635a428e35b9cf0
 AUX tayga-0.9.2-release-reserved-addr.patch 286 BLAKE2B ad7d3099a396a7c49ccf2864051b4c30402df2063103acb4ace8159bef579a09b6bccccbabcc95e08d7f944b387719fa5ea5d91078640fab3da6a0562b9e2e3a SHA512 80ea05d6724da3feaf14d7d394e2ee2a2591bd77a72dc1e3689c5a46f3b91b78de87bfd1a5c74c18427fc993bf4664204cce7a6895e42449d698cfc03f1ae0c8
 AUX tayga-0.9.2-static-EAM.patch 3050 BLAKE2B 23b802862d17f77db42edcf1eae5127801d30def863ddee1ac7324823d48c1d67fa0061a1330d9e9dd330489dc92044ffb1172b91a5d97b3054848246d9f77d5 SHA512 e47a7d7a88e6aefb58f13df491fecff8e705c7e129d1fcb39a0f2f25ce8fc3acd4e6be6505dc8fecaadad7626fb98932cb539c8576bf6faf14d9d51933c52394
@@ -5,6 +6,5 @@ AUX tayga.confd 62 BLAKE2B 6f3c58c02f222eac5dcdeff6bc14f2cbb09108ebec9bc982dd973
 AUX tayga.initd 497 BLAKE2B bb5822727a9df4afa383f89fafd21685e11b21494a6818c90f2b562cbfebe84bccf1379e6f0b7be98cd7538f92bbfed3843fb06f96ddaff5ccb0fd1226726db0 SHA512 ccba3ddf583312b89b3325e4a59c08d717d37dc358afcf6b030b6d6f4c6947d5197731569bc86324c5c4da40c2c81cf45b363564b429d2c1b5d46fb149c027bb
 DIST tayga-0.9.2.tar.bz2 86022 BLAKE2B 9658960e0a8a4a419851a50f131a7dfb0790d0d188ad95ed5078033bd3a19180964a072dc177616b3451bc23dfa2b998058d73cc6aacfbb4b59c0b9173764440 SHA512 a7a81cccb7c3e32f00f142b1bac598b732dd748772b307561239d695418ada5302182d487e51d1cf95ed736c0180c01db2f33409d0b9343d6587b76cbb3bc573
 EBUILD tayga-0.9.2-r1.ebuild 484 BLAKE2B 2987bf7006a153dde6e5db99d4c2e871b504b4eafa3a39faec03623d6f3b42e94c7de837406baa40491ece824f91da95fa59b4f947145fb3d1e6b05ea5189d0d SHA512 65cbdda9b3f612e25456711c9d0614778b64cddc3264ef9dcf2c314fe57cf73439071296e7fd5e184ac95c0c8e3db7299f3447e73b078ca460700e619a5505cb
-EBUILD tayga-0.9.2-r2.ebuild 618 BLAKE2B 13c8fb4c43e2959a86057e95ef46317019e5efd5aa6ea33d237f776f30087d93b107d09901f14565a03ad6d1824a687d8e236bf6ef081b109252e3ee8c2a5ecf SHA512 a19ba144f2042b3f76b6e012f698552ef2633d181eaf4fc37100816dc69c92eb394acbd89d5b33f9908889260a4b93275ab8f2fcf06029464030662c08bc32cb
-EBUILD tayga-0.9.2-r3.ebuild 744 BLAKE2B c6e583fc4112c31fa524bdcab45592b50d6c7d9363a8c57478fc2e058767e0086884a35c598d15cb8696d8bf80c0443ed883808e6f2410b0112bd33a79eda434 SHA512 3ca58f27458da93480a532a45c7e3903be83ec5556fd1b52fce8a479b15d18c1f1a91fb1f525f2c903146cfc44c38102aacbeeee6a152301ea7381935fb5bef7
+EBUILD tayga-0.9.2-r4.ebuild 770 BLAKE2B e6182dc580a0cf124e0d66b271ae5484f710bcb31a3a991af116ce0311f23272f4e7e95959373648f0ae70742340ea22a4b313b28e8a10784da84c760c0de1d5 SHA512 456472e176aa17ecfebaa8f2638856e444da33a36cbc8487a1e9cd48b2874cec22c8cb4cdbb7991342d2d7be9c3348d65b943e0a06e16cecdd38b27bfb971528
 MISC metadata.xml 237 BLAKE2B 9d188e82a4bfcea6aebaa716165a99de6540e52501d648a88c86c1a97060d0cf8b1b00d1d50d150736ee24c6739f5527786df95ba03db96a890801e773c4d3b1 SHA512 58054d35e2320b13a8c08b6d652542186827238019972c1736304b7d11e8fe8db562a243a0e0912aee51ed485c64004e89e25978f90974077d6aa74ceabd2f48
diff --git a/net-proxy/tayga/files/tayga-0.9.2-Fix-implicit-function-declaration.patch b/net-proxy/tayga/files/tayga-0.9.2-Fix-implicit-function-declaration.patch
new file mode 100644
index 000000000000..581aecc0a53f
--- /dev/null
+++ b/net-proxy/tayga/files/tayga-0.9.2-Fix-implicit-function-declaration.patch
@@ -0,0 +1,16 @@
+From 64b2c3859304c595e7099dd157596951ec21562b Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Tue, 25 Oct 2022 12:54:31 +0100
+Subject: [PATCH] Fix implicit function declaration
+
+Bug: https://bugs.gentoo.org/871678
+--- a/nat64.c
++++ b/nat64.c
+@@ -16,6 +16,7 @@
+  */
+ 
+ #include <tayga.h>
++#include <sys/uio.h>
+ 
+ extern struct config *gcfg;
+ 
diff --git a/net-proxy/tayga/tayga-0.9.2-r2.ebuild b/net-proxy/tayga/tayga-0.9.2-r2.ebuild
deleted file mode 100644
index 46844c56a9c1..000000000000
--- a/net-proxy/tayga/tayga-0.9.2-r2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit autotools
-
-DESCRIPTION="out-of-kernel stateless NAT64 implementation based on TUN"
-HOMEPAGE="http://www.litech.org/tayga/"
-SRC_URI="http://www.litech.org/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-static-EAM.patch
-	"${FILESDIR}"/${P}-manpage-RFC.patch
-	"${FILESDIR}"/${P}-release-reserved-addr.patch
-)
-
-src_prepare() {
-	default
-	sed -e '/^CFLAGS/d' \
-		-i configure.ac || die "sed failed"
-	eautoreconf
-}
diff --git a/net-proxy/tayga/tayga-0.9.2-r3.ebuild b/net-proxy/tayga/tayga-0.9.2-r4.ebuild
similarity index 82%
rename from net-proxy/tayga/tayga-0.9.2-r3.ebuild
rename to net-proxy/tayga/tayga-0.9.2-r4.ebuild
index d8b3c48363fc..00f3a03f825b 100644
--- a/net-proxy/tayga/tayga-0.9.2-r3.ebuild
+++ b/net-proxy/tayga/tayga-0.9.2-r4.ebuild
@@ -1,26 +1,23 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=8
 
 inherit autotools
 
-DESCRIPTION="out-of-kernel stateless NAT64 implementation based on TUN"
+DESCRIPTION="Out-of-kernel stateless NAT64 implementation based on TUN"
 HOMEPAGE="http://www.litech.org/tayga/"
 SRC_URI="http://www.litech.org/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~riscv"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-static-EAM.patch
 	"${FILESDIR}"/${P}-manpage-RFC.patch
 	"${FILESDIR}"/${P}-release-reserved-addr.patch
+	"${FILESDIR}"/${PN}-0.9.2-Fix-implicit-function-declaration.patch
 )
 
 src_prepare() {
diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index 9556561d30b4..196d3e346be5 100644
Binary files a/net-wireless/Manifest.gz and b/net-wireless/Manifest.gz differ
diff --git a/net-wireless/bluez/Manifest b/net-wireless/bluez/Manifest
index ca412793c892..95b9636ae700 100644
--- a/net-wireless/bluez/Manifest
+++ b/net-wireless/bluez/Manifest
@@ -9,5 +9,5 @@ DIST bluez-5.64.tar.xz 2175148 BLAKE2B 828c620330d1993d5c5c2a865f2d27a29425e3583
 DIST bluez-5.65.tar.xz 2208100 BLAKE2B 9d2937e2e14d8d8945183c6436921d9d16a6d3bcb5dbe3e2493554fbc4972bb4c006aabc793c9fb8eae47a7e9f29ae9fdf47551dfc0a238e86f5a76ce7436ae2 SHA512 c20c09a1a75053c77d73b3ce15ac7fd321eb6df5ca1646d57c6848b87c0c9957908bc17dd928da4ef2aacfc8667877cbc7511c1ba43db839bfa9bf1fb8269907
 DIST power-state-adapter-property.patch 22488 BLAKE2B a46173c0ebe4f4822c67c2f8f2f3e67dab261753f64204f1a61665c3bba1d7a10e0f8511b38ce273d986490ffd262a737bee82694909683df7386b2015301607 SHA512 b039a578454681f291dc3b04079c8d0151b13a84b4b013e290aa3c28aba1538cef2d9e9aadfe88a0dbfb8e4cea1c251cb5043f4175fb32d53526f7b82de0451a
 EBUILD bluez-5.64.ebuild 9384 BLAKE2B 9763e7477924ed3255d85e1f4961e40018b6680b55d6a1eec4afa9c5e35c4e193c67cdb489147d860934d42cbd3da7bd3134eb9f80e85e703d7406b2c637adc1 SHA512 2f40e7a0b95c163c57b579b31b973ee3da519cd3ad4945bd76de674feb070f17cdf134e1b69db00f42ff2a2090deaa5bc78c22679263903f0eaec40b51f2236c
-EBUILD bluez-5.65.ebuild 9522 BLAKE2B 64f05b694d3229ed1e2ff60bcc9eb0def0cf8a586b4a95d09f8b30b832b513c686eb0c561da9e796dced032c8d22d6295125743abb10fff7f693a263c4eefdf8 SHA512 981567ccb294a6d14cec775d9e1c0c9b4d0403898a6bcebb67780523c306a3e4e00ccf626bde781840139566169a12994d0327ff931a56ef2580cb748fdee7ac
+EBUILD bluez-5.65.ebuild 9520 BLAKE2B 862e1bf54afc972051101f803d2431286bd94754f65ba1639c000ea7f306e9a83f4f44629820d51c90b1206a6d07acb635005241bfb64a674077616a60ee1903 SHA512 c0b36296a8d3a9b5f1b3eb2164aba5e4c47fabe2ffd7659c5037c5c09c756160e270cbf4229de7f1e25b44d8ca06ca6f3584ee4d909903d9ddea3b09ffcd7a9b
 MISC metadata.xml 1099 BLAKE2B 75b6db1d43b75f9b22ce5fb6ec640e2e06b2f2575ff75441318a2076b8486ed7d81a62714540c61ab3a35198113538546b9aa71d05ef4cd7106c8a7f09c13029 SHA512 6e4a7bba7102b4850a938ba0f6feec9cd12488d4b440b19982751c2a742b33a565933fae3967080c060e5b5eb51d90268abc87a2c0a2efb7f4c773020c29462a
diff --git a/net-wireless/bluez/bluez-5.65.ebuild b/net-wireless/bluez/bluez-5.65.ebuild
index c36ba78b8168..3fb265934dc4 100644
--- a/net-wireless/bluez/bluez-5.65.ebuild
+++ b/net-wireless/bluez/bluez-5.65.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.kernel.org/pub/linux/bluetooth/${P}.tar.xz
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0/3"
-KEYWORDS="~amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv x86"
 IUSE="btpclient cups doc debug deprecated extra-tools experimental +mesh midi +obex +readline selinux systemd test test-programs +udev"
 
 # Since this release all remaining extra-tools need readline support, but this could
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 2fe9e5bda4cc..3bcff96a6d0b 100644
Binary files a/profiles/Manifest.gz and b/profiles/Manifest.gz differ
diff --git a/profiles/arch/loong/use.mask b/profiles/arch/loong/use.mask
index 31e5b7399e51..dd969fc65f6f 100644
--- a/profiles/arch/loong/use.mask
+++ b/profiles/arch/loong/use.mask
@@ -12,7 +12,6 @@
 
 # Things without support yet
 java
-llvm
 luajittex
 lua_single_target_luajit
 lua_targets_luajit
diff --git a/profiles/arch/powerpc/package.use.mask b/profiles/arch/powerpc/package.use.mask
index 1b54d7bbf6c9..40a6d3d30675 100644
--- a/profiles/arch/powerpc/package.use.mask
+++ b/profiles/arch/powerpc/package.use.mask
@@ -97,10 +97,6 @@ media-video/obs-studio nvenc
 # No deps keyworded
 dev-python/pbr test
 
-# Benda Xu <heroxbd@gentoo.org> (2020-04-27)
-# tests optionally depend on dev-python/hypothesis
-dev-python/numpy test
-
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2020-04-19)
 # Unsupported on ppc/ppc64
 www-client/chromium widevine
diff --git a/profiles/arch/riscv/use.mask b/profiles/arch/riscv/use.mask
index 1c5098544e47..1e2e75e0af00 100644
--- a/profiles/arch/riscv/use.mask
+++ b/profiles/arch/riscv/use.mask
@@ -59,7 +59,6 @@ video_cards_nv
 video_cards_omap
 video_cards_qxl
 video_cards_r128
-video_cards_radeonsi
 video_cards_siliconmotion
 video_cards_tegra
 video_cards_vc4
diff --git a/profiles/default/linux/mips/17.0/musl/package.mask b/profiles/default/linux/mips/17.0/musl/package.mask
deleted file mode 100644
index ee0e90a0fba8..000000000000
--- a/profiles/default/linux/mips/17.0/musl/package.mask
+++ /dev/null
@@ -1,4 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
->sys-apps/kbd-1.15.5-r99
diff --git a/profiles/package.mask b/profiles/package.mask
index 760063881022..c1b36a960c13 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -33,6 +33,22 @@
 
 #--- END OF EXAMPLES ---
 
+# Sam James <sam@gentoo.org> (2022-10-25)
+# Fails to build with Clang 16 but also modern linux-headers. No activity upstream.
+# Removal on 2022-10-25. bug #874420.
+net-misc/wol
+
+# Sam James <sam@gentoo.org> (2022-10-24)
+# Non-free licence which prohibits any patching. Fails to build with Clang 16.
+# Removal on 2022-10-24.
+dev-util/sgb
+sci-misc/gt-itm
+
+# Sam James <sam@gentoo.org> (2022-10-24)
+# Fails to build with Clang 16 (code quality issues), no upstream activity
+# in 7 years. Removal on 2022-11-23. bug #874486, bug #791604.
+games-fps/qudos
+
 # David Seifert <soap@gentoo.org> (2022-10-23)
 # Dead package, upstream gone, GTK+2, fails to build with Clang 16 and
 # tests fail. Removal on 2022-11-22. Bug #741200, #875686.
@@ -122,11 +138,6 @@ net-libs/gnet
 # Removal on 2022-11-14
 games-mud/gnome-mud
 
-# Sam James <sam@gentoo.org> (2022-10-13)
-# Depends on vulnerable version of Rust. See bug #877005.
-# Will be unmasked once dependency is updated.
-<www-client/seamonkey-2.53.14-r1
-
 # Joshua Kinard <kumba@gentoo.org> (2022-10-13)
 # Difficult-to-resolve build issues on modern toolchains,
 # not publicly maintained, developer contact is difficult,
@@ -570,6 +581,7 @@ net-libs/webkit-gtk:4.1
 net-libs/webkit-gtk:5
 >=net-misc/gupnp-tools-0.12
 >=net-misc/rygel-0.42
+>=net-misc/spice-gtk-0.41-r1
 sci-geosciences/geocode-glib:2
 >=sci-geosciences/gnome-maps-43
 >=sys-apps/osinfo-db-tools-1.10.0-r1
diff --git a/profiles/updates/2Q-2020 b/profiles/updates/2Q-2020
index 9d1b5acb3f8e..099ce0c43e52 100644
--- a/profiles/updates/2Q-2020
+++ b/profiles/updates/2Q-2020
@@ -2,7 +2,6 @@ move dev-libs/yaml-cpp dev-cpp/yaml-cpp
 move dev-python/rnc2rng app-text/rnc2rng
 move games-puzzle/world-of-goo games-puzzle/world-of-goo-hb
 slotmove =dev-ruby/shoulda-matchers-4.3.0* 3 4
-move kde-misc/gmailfeed kde-misc/ultimate-gmail-feed
 move dev-vcs/cli dev-util/github-cli
 move mail-filter/pypolicyd-spf mail-filter/spf-engine
 move dev-python/mimeparse dev-python/python-mimeparse
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index db67505e514a..80560d000495 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -3851,6 +3851,7 @@ mate-base/mate:help - Install gnome-extra/yelp to handle in application help men
 mate-base/mate:notification - Force notification daemon to default to MATE's notification daemon. Enabled by default. Disable if it causes conflicts with other installed desktop environments.
 mate-base/mate:themes - Install MATE Desktop's themes; if you use other themes, you can disable this to spare some space and time.
 mate-base/mate-applets:cpupower - Enable support for cpu frequency manipulation using sys-power/cpupower
+mate-base/mate-applets:netlink - Use dev-libs/libnl
 mate-base/mate-applets-meta:appindicator - Pull in mate-extra/mate-indicator-applet for AppIndicator applet
 mate-base/mate-applets-meta:sensors - Pull in mate-extra/mate-sensors-applet for hw sensors applet
 mate-base/mate-control-center:accountsservice - Add support for AccountsService
@@ -4248,7 +4249,6 @@ media-libs/libheif:go - Enable building dev-lang/go code/examples
 media-libs/libheif:rav1e - Use media-video/rav1e for AVIF encoding
 media-libs/libheif:x265 - Use media-libs/x265 for HEIF encoding
 media-libs/libjxl:gdk-pixbuf - Build a gdk-pixbuf loader
-media-libs/libjxl:gimp210 - Enable plugin for GIMP 2.10.x series
 media-libs/liblastfm:fingerprint - Build the lastfm-fingerprint library
 media-libs/libmp4v2:utils - Install command-line utilities
 media-libs/libmypaint:gegl - Add support for media-libs/gegl
diff --git a/ros-meta/Manifest.gz b/ros-meta/Manifest.gz
index 2f89ecadcab3..b632c86ce8be 100644
Binary files a/ros-meta/Manifest.gz and b/ros-meta/Manifest.gz differ
diff --git a/ros-meta/geometry2/Manifest b/ros-meta/geometry2/Manifest
index 7e1648490893..ed24ce0f2706 100644
--- a/ros-meta/geometry2/Manifest
+++ b/ros-meta/geometry2/Manifest
@@ -1,8 +1,10 @@
 DIST geometry2-0.7.2.tar.gz 174319 BLAKE2B 0f319055cf0a4c8a425c31abc981ee1aee3c77b9dae8e0ddae6a0c4bdf09c31373b8005cb05177374ae5a2139c0f49a4cfdd5b966f8e991827ca2c6e471dcdd2 SHA512 8c2ad4e67d4d7509c3d9a7ef781d454eeb570fbc29d201ece7d2613258b7bed2ba00398655901e2b5856b59acad94422dbb6ae1f0bd545b3a41353204c31d00b
 DIST geometry2-0.7.3.tar.gz 175974 BLAKE2B a0edbeea6db30f07d5cf6ddd4d0a8a1ce0221c8b0ad01929aa6a73a7a49e2e5bd08dfd01cef6cd964ea93b6e8f5aa1dd6ec395e8e4bbafa1117eb3436cae9c10 SHA512 20d207218000905a17411ee9c662778b3022481e84b903ca616cdfc439b2af55c7182988dc843103edc471d564e988fa311be916d0810ec86228585500ed532e
 DIST geometry2-0.7.5.tar.gz 176126 BLAKE2B 56f2062ca86b3573e9df59df4c400fd5eee35c7e30abb1f0d94b1e117a224fcb1272eaf9de14dc257d8c8438a414fd8d121d314e560e6712ca4db0da190075d5 SHA512 b3413282d2ad0aae54b0093607eee106cdd7ed23f4e5fbb1728ed4f848ee081257b9217696301e9f7860369dc98679d8abff12213ff3a69b39b061f02f5da8c9
+DIST geometry2-0.7.6.tar.gz 176927 BLAKE2B c18a8be79a17194e339188b938d51d69deb70ac4bbc3038349d5fd4ac4a63c4d812bf6dc1f4ce6bcf64545e0abaa88e7eede008f3f6c5590cc860148f8dd8e39 SHA512 dec7c618da9eec07b202b1d67b367c8e71451a05b4ffa15d1e86651857054e7e43682ef7a95580853ee9767f17229b623fd73a495a184e4e9e3fdf024be2d440
 EBUILD geometry2-0.7.2.ebuild 550 BLAKE2B 2c8a6083db829fc809c5526904576bc479dc5fb4b9ad96f2bb2129fd776a0a28883f20109a55c85f8bac2b23a067f1331ea1b83f7b030380578c7f2fd4bbba5c SHA512 089531a01c7cf1fe28f58a8caf5b7fa7b982e22dd869547860b9902029a484af933a8c04044e7aae43122c35a1ca92ba052e4e9154f44b8d86c610847e1aaf3e
 EBUILD geometry2-0.7.3.ebuild 550 BLAKE2B 2c8a6083db829fc809c5526904576bc479dc5fb4b9ad96f2bb2129fd776a0a28883f20109a55c85f8bac2b23a067f1331ea1b83f7b030380578c7f2fd4bbba5c SHA512 089531a01c7cf1fe28f58a8caf5b7fa7b982e22dd869547860b9902029a484af933a8c04044e7aae43122c35a1ca92ba052e4e9154f44b8d86c610847e1aaf3e
 EBUILD geometry2-0.7.5.ebuild 550 BLAKE2B 2c8a6083db829fc809c5526904576bc479dc5fb4b9ad96f2bb2129fd776a0a28883f20109a55c85f8bac2b23a067f1331ea1b83f7b030380578c7f2fd4bbba5c SHA512 089531a01c7cf1fe28f58a8caf5b7fa7b982e22dd869547860b9902029a484af933a8c04044e7aae43122c35a1ca92ba052e4e9154f44b8d86c610847e1aaf3e
+EBUILD geometry2-0.7.6.ebuild 550 BLAKE2B 1e5f035ff51d2cc6fce9e7b5f3a66cd7685813805b370e31b2edace3f8e986f50db923d2b2b9dcb8b39f0153dabbda3f4c1223a240d8695b3eaf1eb8ed188564 SHA512 0d0911c5dbeabc1982dccbf058781297d5f5e2548d7d1fd7a0a3fec1663fa036d245675d3a4bead13e9962f797b08f75b7ffa4b6c19b4401fb398db46def588f
 EBUILD geometry2-9999.ebuild 550 BLAKE2B 2c8a6083db829fc809c5526904576bc479dc5fb4b9ad96f2bb2129fd776a0a28883f20109a55c85f8bac2b23a067f1331ea1b83f7b030380578c7f2fd4bbba5c SHA512 089531a01c7cf1fe28f58a8caf5b7fa7b982e22dd869547860b9902029a484af933a8c04044e7aae43122c35a1ca92ba052e4e9154f44b8d86c610847e1aaf3e
 MISC metadata.xml 328 BLAKE2B 5d01fb15d8c37e69075781dd7bef78b9869406d861b88cbbf91590293271ddc1ae9a34b5337a04784eecd84ee0bafd6510bc898f01b5544b1c62cb84d17bc2bc SHA512 cbd2de98ae5d8e11f22b1a35f28e4731210cfe819422d4ca22ac925532c453396b37b37b4be59369133558d9ce35158ce3a2c0c826626ab784bbc3ee66d76019
diff --git a/ros-meta/geometry2/geometry2-0.7.6.ebuild b/ros-meta/geometry2/geometry2-0.7.6.ebuild
new file mode 100644
index 000000000000..0348b3dbbcfe
--- /dev/null
+++ b/ros-meta/geometry2/geometry2-0.7.6.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros/geometry2"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="The second generation Transform Library in ros"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/test_tf2
+	dev-ros/tf2
+	dev-ros/tf2_bullet
+	dev-ros/tf2_eigen
+	dev-ros/tf2_geometry_msgs
+	dev-ros/tf2_kdl
+	dev-ros/tf2_msgs
+	dev-ros/tf2_py
+	dev-ros/tf2_ros
+	dev-ros/tf2_sensor_msgs
+	dev-ros/tf2_tools
+"
+DEPEND="${RDEPEND}"
diff --git a/sci-astronomy/Manifest.gz b/sci-astronomy/Manifest.gz
index 0b0840c8fb25..d3cb47604cd1 100644
Binary files a/sci-astronomy/Manifest.gz and b/sci-astronomy/Manifest.gz differ
diff --git a/sci-astronomy/celestia/Manifest b/sci-astronomy/celestia/Manifest
index 32f8a477edac..4b268cd6c4ae 100644
--- a/sci-astronomy/celestia/Manifest
+++ b/sci-astronomy/celestia/Manifest
@@ -1,10 +1,8 @@
 AUX celestia-1.5.0-desktop.patch 1371 BLAKE2B f4964ea5794b6fa7eff49cb4d9879226e83739dfe877f055f1cbff25562f324e30af3ef4ee68897324504b06a6a6c84c2cee4caf78914792a4c89e54ed580b14 SHA512 937d3a733ec679ed4fb7644b2ae0bf780972dce7ac7d6e30dfbd7cad3e90354460a3e1c3df268514048e53979d22b1bdee70dd340f8c9977e7a0749c65a24bf7
 AUX celestia-1.6.99-cfg.patch 781 BLAKE2B 04ff4f7c5159eee81479ed588d302fa6a97475955af733e013fcafb2b37975fb1f2215afe61a715b5ec7716dbd75b5915dd4a5031255adb8fde5f6e64d9b71a5 SHA512 50cce63a701da85b52bee5db5b34eed77118c7c847612b4bc7ae82c80b198c718b4adbf0f21cc82e4afbafe20f53dda191285095d6ee5e796ce7f6c94388b832
 AUX celestia-1.7.0-cmake_lua_version.patch 287 BLAKE2B 29a555fd2443ba4c20508566a909cdcfe47b3e2ca8fea68d9fdc5427cfcdbd332c3179f3ea090c076d20cd36ec694b7cbef3008f87407ba4af7c6ea311853e24 SHA512 f1ae5eb360399d817c90b2ab058452f55f8fdc293568bd9b919cc2d71586da9146db2131abfd54c2c7dc9cb6230728e8435f7663b7125d8caaebe241aa8a7e72
-DIST celestia-1.7.0_pre20200316.tar.gz 69459012 BLAKE2B 8e718e8a4aa064b9be0bd5f0f1c034f3ffec42671c6eae503216f5ea2787e8c5da3315e3cb39e94e2a0eab5f067e189fe70dc9d04bff4127e9e39fba3a7117ae SHA512 db4213e1d76699ff01390f12e3763596dfd2641389743c27221b4e7934be9daca7a884dd389135894d225e8613830468ebede5664543e27e44e21e19d22d1e7f
 DIST celestia-1.7.0_pre20220120-data.tar.gz 310327016 BLAKE2B 507a8d5fd1307fc711b9604e00a1596bc971dbb2c936554ffd1f0e842bec6dc6d2233c04911dcd5a6e1405d9e5806c87ec22ba4f26f0e3d770bd1b6735777b0b SHA512 6443127b42586e4ad16b25fa39193a165065682cd8163b241bdcbbe755c2104e4c29b291898076437c4387cd72cdb3bd347a010738505f39ccb658300aff836d
 DIST celestia-1.7.0_pre20220120.tar.gz 5157089 BLAKE2B 5ce0413a58b2f4ca9ac9c585bfe1da9aaf0a0405d7e910b3f639d3b3a0532110dd5d28a0aec1c245a4bcebd549847023c2d84e8c29892e228dd87392bebd9ae3 SHA512 175e2280b334c4a2b6be9fa05a06abf8daa9e890cd03c11d359d26b7f0175b1662e3bf0d8abea04ad2f541780ac8b3898e47bc2bdc9e90e408e4607e2ae3fb29
-EBUILD celestia-1.7.0_pre20200316-r100.ebuild 2940 BLAKE2B ac74dcd32d79aff696dab44424d5318ae089965705375da24b7476e31df4ca22479c62f40671ae0251b6c9de5cedbddae5c671716a7692f0a08c82d2bcd5b89d SHA512 bc18d39ad3a03b5492ae8cd05b64a9212d7689ab8ee4f5d06a801e408183631b800e62b5797b20b63adf7e760128542fd32d26aaa285fa7f7b540d8a233a6356
-EBUILD celestia-1.7.0_pre20220120.ebuild 3351 BLAKE2B bb2a1c9e6f57653a55acc4630a7e5481a65868f11610642a91cbb74728a2ab5190cc3d6ba2f2f0c2bad582df11dbeab46cdeb5bd9546591349acce6b5c2995b7 SHA512 8c9c957c3af4bbd5b74baf3f4b2ac50a478616512bc5ee8b84ce0a84f763b23e94e136af918096057c79766a0c0baf043d00bb63b524021e1a9c3ad78a5acfa0
-EBUILD celestia-9999.ebuild 2714 BLAKE2B 495fd02b3fc52f71f9ef7962be17d11a815ed931800a0f80eac20a8200229d337da56a1fc326d759409eac09c0f886df467688ab7d79be363c598586151c8135 SHA512 463b18f6717fd4061b1a7b61d7839114f991567f68abd6a1bdca92845a16db76c520e77d2e501b38e2e746afc22ab7c6e35104da85b17fb34aa017305d0ddd62
+EBUILD celestia-1.7.0_pre20220120.ebuild 3351 BLAKE2B ebfd3b46999cc64972fae4c72ca80f4a92c82930a315dd36dfcef2eeea3113c8a7f6b0db423c45e9ea63f99343aba814795045a5b129799744f58e2d04a536f6 SHA512 89422b749430bf3d1549d7c48338992b468e09026a521e06bb99c051fad632f49236eebf4da3c479d85e9c00e9f5ef6e6301261095b9dad66f05a263ef9bddc5
+EBUILD celestia-9999.ebuild 2727 BLAKE2B a1debba61a2944f190954c4f1c2674d6843b7536d9d4839374f33e8b19478840303daa53cc428efd0bddcc6aa904049b3f04c80168cc3c7ac1483066f0882b98 SHA512 ad0c713ab2bb2b60449be19daac43429b48eeeffa4a0dbc4b4f23086919abebd04aa3c2a10f7551b0c654495f52a397c57e61ae4ede611d139ce575717f5ad17
 MISC metadata.xml 961 BLAKE2B 9882411b0f8e648bbdbb4b6c3c2ea16827e74c0659d753e745e9fb3539d70964e5eca8e979aeacddeaf429b5e8139e45752c5ab223d5ea2873db954bfc8267fe SHA512 b8ba090ef14e6ec7e5db2e01a690be91611b72366169ae4a815977bcf7db89e09b153faf2adaa71441be0025cff298a0d935c3f56a934aeb21cd44f39dbbcf9b
diff --git a/sci-astronomy/celestia/celestia-1.7.0_pre20200316-r100.ebuild b/sci-astronomy/celestia/celestia-1.7.0_pre20200316-r100.ebuild
deleted file mode 100644
index e408eb4d09d4..000000000000
--- a/sci-astronomy/celestia/celestia-1.7.0_pre20200316-r100.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..3} luajit )
-
-inherit desktop flag-o-matic lua-single xdg cmake
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/CelestiaProject/Celestia.git"
-	inherit git-r3
-else
-	if [[ ${PV} == *_p* ]] ; then
-		COMMIT_ID="df508a0c597a3d96c1c039fa4a973e294021cfba"
-		SRC_URI="https://github.com/${PN^}Project/${PN^}/archive/${COMMIT_ID}.tar.gz -> ${P}.tar.gz"
-		S="${WORKDIR}/${PN^}-${COMMIT_ID}"
-		KEYWORDS="~amd64 ~x86"
-	else
-		SRC_URI="https://github.com/${PN^}Project/${PN^}/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz"
-	fi
-fi
-
-DESCRIPTION="OpenGL 3D space simulator"
-HOMEPAGE="https://celestia.space"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="glut lua nls +qt5 theora"
-REQUIRED_USE="|| ( glut qt5 )
-	lua? ( ${LUA_REQUIRED_USE} )"
-
-BDEPEND="
-	dev-cpp/eigen
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-DEPEND="
-	<dev-libs/libfmt-9.0.0:=
-	media-libs/glew:0=
-	media-libs/libpng:0=
-	sys-libs/zlib:=
-	virtual/glu
-	virtual/jpeg:0
-	virtual/opengl
-	glut? ( media-libs/freeglut )
-	lua? ( ${LUA_DEPS} )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-	)
-	theora? (
-		media-libs/libogg
-		media-libs/libtheora
-	)
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	# make better desktop files
-	"${FILESDIR}"/${PN}-1.5.0-desktop.patch
-	# add a ~/.celestia for extra directories
-	"${FILESDIR}"/${PN}-1.6.99-cfg.patch
-	# allow forcing CMake to look for a specific Lua version instead of the newest branch installed
-	"${FILESDIR}"/${PN}-1.7.0-cmake_lua_version.patch
-)
-
-src_prepare() {
-	cmake_src_prepare
-
-	### This version of Celestia has a bug in the font rendering and
-	### requires -fsigned-char. We should be able to force this flag
-	### on all architectures. See bug #316573.
-	append-flags "-fsigned-char"
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_CELX="$(usex lua)"
-		-DENABLE_NLS="$(usex nls)"
-		-DENABLE_GLUT="$(usex glut)"
-		-DENABLE_GTK=OFF
-		-DENABLE_QT="$(usex qt5)"
-		-DENABLE_WIN=OFF
-		-DENABLE_THEORA="$(usex theora)"
-	)
-	# Upstream always looks for LuaJIT first unless stopped, and we only need
-	# the version specification when linking against PUC Lua
-	if use lua && ! use lua_single_target_luajit; then
-		mycmakeargs+=(
-			-DCMAKE_DISABLE_FIND_PACKAGE_LuaJIT=ON
-			-DLUA_VERSION=$(lua_get_version)
-		)
-	fi
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	local size
-	for size in 16 22 32 48 ; do
-		newicon -s ${size} "${S}"/src/celestia/kde/data/hi${size}-app-${PN}.png ${PN}.png
-	done
-	newicon -s 128 "${S}"/src/celestia/gtk/data/${PN}-logo.png ${PN}.png
-	doicon -s scalable "${S}"/src/celestia/gtk/data/${PN}.svg
-
-	use glut && domenu ${PN}.desktop
-	if use qt5 ; then
-		sed \
-			-e "/^Name/s@\$@ (qt5 interface)@" \
-			-e "/^Exec/s@${PN}@${PN}-qt@" \
-			${PN}.desktop > "${T}"/${PN}-qt5.desktop || die
-		domenu "${T}"/${PN}-qt5.desktop
-	fi
-	dodoc AUTHORS README TRANSLATORS *.txt
-}
diff --git a/sci-astronomy/celestia/celestia-1.7.0_pre20220120.ebuild b/sci-astronomy/celestia/celestia-1.7.0_pre20220120.ebuild
index 6cfe729cc6f0..6d1d3bd2676b 100644
--- a/sci-astronomy/celestia/celestia-1.7.0_pre20220120.ebuild
+++ b/sci-astronomy/celestia/celestia-1.7.0_pre20220120.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 CMAKE_IN_SOURCE_BUILD="yes"
 LUA_COMPAT=( lua5-{1..3} luajit )
 
-inherit desktop flag-o-matic lua-single xdg cmake
+inherit desktop lua-single xdg cmake
 
 if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/CelestiaProject/Celestia.git"
@@ -43,10 +43,10 @@ DEPEND="
 	<dev-libs/libfmt-9.0.0:=
 	media-libs/glew:0=
 	media-libs/libepoxy
+	media-libs/libjpeg-turbo:0=
 	media-libs/libpng:0=
 	sys-libs/zlib:=
 	virtual/glu
-	virtual/jpeg:0
 	virtual/opengl
 	ffmpeg? ( media-video/ffmpeg:0 )
 	glut? ( media-libs/freeglut )
diff --git a/sci-astronomy/celestia/celestia-9999.ebuild b/sci-astronomy/celestia/celestia-9999.ebuild
index ef64f392d7d6..00f32e5f7b4b 100644
--- a/sci-astronomy/celestia/celestia-9999.ebuild
+++ b/sci-astronomy/celestia/celestia-9999.ebuild
@@ -44,10 +44,10 @@ DEPEND="
 	media-libs/glew:0=
 	media-libs/libepoxy
 	media-libs/libglvnd
+	media-libs/libjpeg-turbo:0=
 	media-libs/libpng:0=
 	sys-libs/zlib:=
 	virtual/glu
-	virtual/jpeg:0
 	virtual/opengl
 	ffmpeg? ( media-video/ffmpeg )
 	glut? ( media-libs/freeglut )
diff --git a/sci-chemistry/Manifest.gz b/sci-chemistry/Manifest.gz
index 6f18551a72a5..116b39e597e5 100644
Binary files a/sci-chemistry/Manifest.gz and b/sci-chemistry/Manifest.gz differ
diff --git a/sci-chemistry/chemex/Manifest b/sci-chemistry/chemex/Manifest
index 68ab0b96d591..cd898c1cfcba 100644
--- a/sci-chemistry/chemex/Manifest
+++ b/sci-chemistry/chemex/Manifest
@@ -1,5 +1,5 @@
-DIST chemex-2021.4.0_p6.tar.gz 2395324 BLAKE2B adb08fdebe816b66359c8a567d7f7a4600715015e6f9b86b568cb8e3cd5e66b040895c09688a956cedd398a7c56a6d3a73d77f647a2f4e83280a91879a6184d0 SHA512 7d20ae73a2cf52f9d21b875cd661cefc14ce36ff603402e5dacad3e21bcb0bdb28f8f111414691b99f93196a971215d0beec3fff07535d3d781b4e7bb6782c52
 DIST chemex-2022.0.1.tar.gz 2840066 BLAKE2B 05e3cd048a996b85e9a88297180bdd6e0b972619f5ac734d10a5744e7ab28fa2080bf6d6b53b69d04192ca420a24014f7eded0668ec716218ca4cc4877875ec9 SHA512 c2b49d83d618e69e43737b9d8b6a16de4fc46b481b2c65aaa4110bf425cd71bd5347240e7336855ec294ea126dd036262535645fca93ae352616f1a71b11e698
-EBUILD chemex-2021.4.0_p6-r1.ebuild 1142 BLAKE2B 6811e7f75ba8604ac23af16b2b3d82f10f9136fcef5fbed001ecda53c50ba462add05a5284217a82c4c51309bffccdf9feda9229dbdb0f8e1d466d41be02c242 SHA512 2306a47cec2f17f0f1c7fa3ca98b4d5a0c3733284a5b7004e7b5a6584b14210659006825dd9bebb151091ab3b40622b707d453ae0252e8852460ecf857ee8e33
+DIST chemex-2022.1.0.tar.gz 2836330 BLAKE2B 69c0e23a5195fca210e2c7c8c2f31196e23e416a8be47856589491586ae7de05ccd10982ec3d752015fc8a571dd6f0e63f52715452fc9388b38999532a5fdf12 SHA512 00d7f07b0c6d301d88ff2a1bebeb82fe9dc51c7deddf3db371f73b62d1156c5d369ffedb474bead618abde8334fab9e6e9ceb481f6b4bdac5eceeb7bee899b2a
 EBUILD chemex-2022.0.1-r1.ebuild 1249 BLAKE2B 832d5323349b107606813e7eceae349ee1b9d591613de21f14887b67102b043c2155b3d1e758d66855d4547057e71bce2f887042e66f732d6677cec44ad998f3 SHA512 a9b1dd5c3c10ca9a221541c7426d08ebcba84421a634c8a71776bbf1e7c5b5bda281fb6890ae64104fe677c1723de881a54aedd3b98d667bea975796318d9908
+EBUILD chemex-2022.1.0.ebuild 1250 BLAKE2B 53960f44ba4feef7e0a8751af07a656415fcd79fe970f3133665be1782dcda5443b9a2e359e54fb8013a6c486e52930aef468581a0401f131396d586ef0d1a31 SHA512 e906f232143ce47ec129fea844bf1909cdeffb583d55503de5a71c5899a0cf63ffafe49f5a70de7a98ab55f3251fbf546fdfea1610f6ced1034595c52e5a8666
 MISC metadata.xml 217 BLAKE2B f8189b02494f180dac078dcd5c275d3c795f20f360f8b172c66065a2d937e396b24b8631bba4cd8567d60285ce89fc77b9539f2233bf33899c820613c48c33ba SHA512 f0c9e5b3d281fecd21b1e23a6f44c94c1c0b3220de46a177d35932111b7f1ab4399061c42833ac1ee9bd0324b139fc8db66e0d2890224d607bd3be38ae469be9
diff --git a/sci-chemistry/chemex/chemex-2021.4.0_p6-r1.ebuild b/sci-chemistry/chemex/chemex-2022.1.0.ebuild
similarity index 58%
rename from sci-chemistry/chemex/chemex-2021.4.0_p6-r1.ebuild
rename to sci-chemistry/chemex/chemex-2022.1.0.ebuild
index 3b5a05f349d5..a67b5eb6bbe8 100644
--- a/sci-chemistry/chemex/chemex-2021.4.0_p6-r1.ebuild
+++ b/sci-chemistry/chemex/chemex-2022.1.0.ebuild
@@ -5,13 +5,13 @@ EAPI=8
 
 DISTUTILS_SINGLE_IMPL="yes"
 DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{9..10} )
 
 inherit distutils-r1
 
 DESCRIPTION="Program to fit chemical exchange induced shift and relaxation data"
 HOMEPAGE="https://github.com/gbouvignies/chemex"
-SRC_URI="https://github.com/gbouvignies/chemex/archive/${PV/_p/-dev}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/gbouvignies/ChemEx/archive/refs/tags/v${PV/_p/-dev}.tar.gz -> ${P}.tar.gz"
 S="${WORKDIR}/ChemEx-${PV/_p/-dev}"
 
 SLOT="0"
@@ -26,13 +26,15 @@ RESTRICT="test"
 RDEPEND="
 	$(python_gen_cond_dep '
 		>=dev-python/asteval-0.9.25[${PYTHON_USEDEP}]
-		>=dev-python/jsonschema-4.1.0[${PYTHON_USEDEP}]
+		>=dev-python/cachetools-5.2.0[${PYTHON_USEDEP}]
 		>=dev-python/lmfit-1.0.3[${PYTHON_USEDEP}]
-		>=dev-python/matplotlib-3.4.3[${PYTHON_USEDEP}]
-		>=dev-python/numpy-1.21.2[${PYTHON_USEDEP}]
-		>=dev-python/scipy-1.7.0[${PYTHON_USEDEP}]
-		>=dev-python/tomlkit-0.7.2[${PYTHON_USEDEP}]
-		>=dev-python/tqdm-4.61.1[${PYTHON_USEDEP}]
+		>=dev-python/matplotlib-3.6.1[${PYTHON_USEDEP}]
+		>=dev-python/numpy-1.23.4[${PYTHON_USEDEP}]
+		>=dev-python/pydantic-1.10.2[${PYTHON_USEDEP}]
+		>=dev-python/rapidfuzz-2.11.0[${PYTHON_USEDEP}]
+		>=dev-python/rich-12.6.0[${PYTHON_USEDEP}]
+		>=dev-python/scipy-1.9.3[${PYTHON_USEDEP}]
+		>=dev-python/tomli-2.0.1[${PYTHON_USEDEP}]
 	')
 "
 DEPEND="${RDEPEND}"
diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index 7e59f2115025..3771beb3c598 100644
Binary files a/sci-geosciences/Manifest.gz and b/sci-geosciences/Manifest.gz differ
diff --git a/sci-geosciences/gnome-maps/Manifest b/sci-geosciences/gnome-maps/Manifest
index d164fb00e371..f63273d4260f 100644
--- a/sci-geosciences/gnome-maps/Manifest
+++ b/sci-geosciences/gnome-maps/Manifest
@@ -1,5 +1,7 @@
 DIST gnome-maps-42.3.tar.xz 2317328 BLAKE2B 365eb5cb8f7b20e2069338249418f5fad1abd47a1ab7ecda2d671dc97dfa45fb9f5687ae01fd605613c7ecf6eb9048aef6ab121cac0f455a42df9156581c87e2 SHA512 e52509603914de8f345a874f931beb68d11f718827b956a48464fe804c42559d977eacb0bbd5d4346b6329ab3f9169ac9afa8ef681f040c5b6a82b440b9786cb
 DIST gnome-maps-43.0.tar.xz 2330656 BLAKE2B 117a3558e29abe6a1bd29cf347b20a9e33f2b1cabd5310f28e387685e0bde96d1ce371c88616914f298e25ffbbc72b4d29e4fa721994b184e88289c6d0236ea0 SHA512 70966d6a092a67eb6a3a62627666376a71767d9296e00489a5aff281793425d9edd5e978deaf47bbd7d6b0ce37b53cf724b73487e101554c7984456661e193fc
+DIST gnome-maps-43.1.tar.xz 2329212 BLAKE2B 6597597dcf5b056a33670f502c3ab0b9658b6cac5e72896f5363034649ddf01fe9ae2a275dbd1a298b0dd1850b8a9c625fff02a15c998fd0e296f794aedf7b0e SHA512 f4eafdf6b81a23567d526ae51842e391c7b3e585967abb2b6a38ab1a361de77a69ebbf01939f3a328990fe3f623f4bd40a720f776c27af07acb27b2222b75a12
 EBUILD gnome-maps-42.3-r3.ebuild 1571 BLAKE2B d89dd8060f01ab68fc9c33d84d1a4c320389f8a06621379bbc41dfcfbdfaedd018fbcd18c8de9204e08a8a732e5913f236ecce1050923fffca5bc69b1364983e SHA512 f2d232245df8b3cd350c448a2312e17eda7a509652124cf6b6aed4ebf9b4834a2478bfdcfc200060e5b0370e89b0ac7fb9c8cbf42b9688007937c65d56f59e5f
 EBUILD gnome-maps-43.0.ebuild 1214 BLAKE2B dae6bf86bb7024b419cc575409378b28ef9b445f70237413e679d7ca0ef69a9e526590be6df9225f5720bcc69bf2da95f3b19401b365c9d047459eaca4acbe33 SHA512 d5cfd0d485e26d399ee291e5e9cdf8214bfd396268631e26c367be3ad5a052aba6bc7c36e725054e78c0bcd653467ea4b8db2d8fb54466712dce273f690d6205
+EBUILD gnome-maps-43.1.ebuild 1214 BLAKE2B dae6bf86bb7024b419cc575409378b28ef9b445f70237413e679d7ca0ef69a9e526590be6df9225f5720bcc69bf2da95f3b19401b365c9d047459eaca4acbe33 SHA512 d5cfd0d485e26d399ee291e5e9cdf8214bfd396268631e26c367be3ad5a052aba6bc7c36e725054e78c0bcd653467ea4b8db2d8fb54466712dce273f690d6205
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/sci-geosciences/gnome-maps/gnome-maps-43.1.ebuild b/sci-geosciences/gnome-maps/gnome-maps-43.1.ebuild
new file mode 100644
index 000000000000..60b7b5097144
--- /dev/null
+++ b/sci-geosciences/gnome-maps/gnome-maps-43.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome.org gnome2-utils meson xdg
+
+DESCRIPTION="A map application for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Maps"
+
+LICENSE="GPL-2+ LGPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+# Pure introspection dependencies found by grepping imports in ${S}
+RDEPEND="
+	>=dev-libs/glib-2.66.0:2
+	>=dev-libs/gjs-1.69.2
+	>=dev-libs/gobject-introspection-0.10.1:=
+	gui-libs/gtk:4[introspection]
+	>=app-misc/geoclue-0.12.99:2.0[introspection]
+	>=gui-libs/libadwaita-1.0:1[introspection]
+	>=dev-libs/libgweather-4.2.0:4=[introspection]
+	>=sci-geosciences/geocode-glib-3.15.2:2[introspection]
+	>=media-libs/libshumate-1.0:1.0=[introspection]
+	dev-libs/libxml2:2
+	>=net-libs/rest-0.9.1:1.0[introspection]
+
+	app-crypt/libsecret[introspection]
+	media-libs/graphene[introspection]
+	net-libs/libsoup:3.0[introspection]
+	x11-libs/pango[introspection]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 0e86f5c0502e..82c6154fc7ca 100644
Binary files a/sci-libs/Manifest.gz and b/sci-libs/Manifest.gz differ
diff --git a/sci-libs/brial/Manifest b/sci-libs/brial/Manifest
index 2be8d736de39..3c0f9ae66721 100644
--- a/sci-libs/brial/Manifest
+++ b/sci-libs/brial/Manifest
@@ -1,5 +1,3 @@
-DIST brial-1.2.10.tar.bz2 1229830 BLAKE2B a1cfe4fcd19824d04388bbab1130a9d07e5920fb05ea1686424f1e0193c6f5d29300bba66bdf7ac59665cbceed3f6ff84fbb5a95311858196a0fbdecda5a2cc7 SHA512 163d9f3703271f412d20ec165d713280d9b46c50b66eed0b15385c6d94569e0ea5d7e84c3b6715d51197e97be4062325551402c844f70235a4aa1cebc5e9d3a1
 DIST brial-1.2.11.tar.bz2 1260892 BLAKE2B 910f4ffd728235c8b18deb0d36c76778ce2c392644b7eaba06a9c00a832b4ccb0c2cd69f4d9ab9770e060b54491bd6b613e4e1324a32f57d7c32f200fb0a900d SHA512 00532b6361c709fce44940bfd22563046cfcbc06d41282a01a26f9bcb25fa86df1406685d7ba4b1ebbb08cd7fa8b9811c81eccf78e72ea96960ef7a059c2e926
-EBUILD brial-1.2.10.ebuild 957 BLAKE2B b37370aef6a8cadcdb0d5ed34b5640bc53eac4a90c1757f3de168c05622ca580b211fd935b0da9237456d4b78365498b85e0a1497a0feb7b124558d73504f09b SHA512 c536b54927457c463cddec863ea3e96753ed11d7fc40e5010b0416810185b3d0b2acf69f4e56e0bcb43cfcc10ade93a11e74dc932eecc28c8132a0c8e982a84c
 EBUILD brial-1.2.11.ebuild 910 BLAKE2B 450ef8351b4ed6686d58ea3f336fc80a5aacceb0e26a96f211738e57c575be32b428d000f7b4a0b0f97d62d0655f9eacd777600af07cdca8ea618e218cb2e29a SHA512 a183e49c9564809b96535ebf82ecb5e725a75ef3149f4e8504860a06aa6fabc76c655a11fb765a65576cd4ce4988597d4562aabda37e76a3c265b6c353343140
 MISC metadata.xml 1077 BLAKE2B 516f3390d40d27d4d1934be2eea344e888112ae8912985134bc288fe4d9414f49100874ddf94f7b0d517e60b7a37801464a6f64108df0465a015e6e9f3c3702e SHA512 284c49e862464bf2d825598a9ef6aa6dbf40c6f42f02f1dcb53f7d3baf8c728771dec129a63fcadb711c40ff623e5c4036cfdc54afc4dbaf07c73b75329aefe0
diff --git a/sci-libs/brial/brial-1.2.10.ebuild b/sci-libs/brial/brial-1.2.10.ebuild
deleted file mode 100644
index 704853e303aa..000000000000
--- a/sci-libs/brial/brial-1.2.10.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="A C++ library for polynomials over boolean rings"
-HOMEPAGE="https://github.com/BRiAl/BRiAl"
-SRC_URI="https://github.com/BRiAl/BRiAl/releases/download/${PV}/${P}.tar.bz2"
-
-# The top-level license is GPL2+, but cudd/LICENSE is BSD.
-LICENSE="BSD GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="png static-libs"
-
-BDEPEND="virtual/pkgconfig"
-DEPEND="dev-libs/boost
-	sci-libs/m4ri[png=]"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	tc-export PKG_CONFIG
-
-	# with-boost-libdir added to deal with some rather quirky setups
-	# see https://github.com/cschwan/sage-on-gentoo/issues/551
-	econf \
-		--with-boost="${EPREFIX}"/usr \
-		--with-boost-libdir="${EPREFIX}"/usr/$(get_libdir) \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/sci-libs/givaro/Manifest b/sci-libs/givaro/Manifest
index 6194784b6562..830c4009195e 100644
--- a/sci-libs/givaro/Manifest
+++ b/sci-libs/givaro/Manifest
@@ -1,6 +1,5 @@
 AUX givaro-4.1.1-fix-pc-libdir.patch 549 BLAKE2B f564256b81f1e2ef42bca171fce581e603887905dcf7fe8c881e59aae82d062767efdb096598f92bca09e9127c98fe023e9c034b5b38ef4ca575da9e877ca334 SHA512 927b1a15c834ba2c1cab37e1fdac1ab1c347cba7aba98be652e2ed4468d2a0627cc7f4820561655d1a223c02f8eaba7cc2911acb9998fc853dc20590fb1c74ef
 AUX givaro-4.1.1-gcc-10.patch 1035 BLAKE2B 460371ff8e628e1945a29d9c6d2b718c7d98b07b023540bc49a439cd941a19191db44536a1514495014084a85028debfb4e714d6d9efd9ae7c7c12687d5f8400 SHA512 3e154b3cf6c11a106f78778eeaaf0c2cfe81e25d18f623b5b071b306f1221c8513f27f87ab3e3684a8b3f18138dfbb516c33691dbb854072a35a0be21ac0bc48
 DIST givaro-4.1.1.tar.gz 1008358 BLAKE2B 246fd1a263174f58d96dd66fa79e6113368b6c318c33d68858a339bd9cb778dfda84636c683ee9d02f2ac72ccff8ac22d395b92741448a8ed2ce08c041ac8ba9 SHA512 7ad15ac24f55ad65c9c5d0d48ff4388d0494e75dc7b66d1e139195cd086ff2371259bdb5df940fead1db2fd378bb76289f2327a8d6f41575d99d424a74cf644c
-EBUILD givaro-4.1.1-r2.ebuild 1850 BLAKE2B 43eb2f568b4169ca1ad1240ef6410fc56773c7790ccf310219b18bb9cc922e3d08617b19748c3e9d3a6cb1bab09e3ba929896a2b7a1b97f06e5236e2082d772f SHA512 03f79aa8a454c4fe1c62901cd7dfd204f813ab8feea3dd98d41c4a341e78bf374a1a8195c5ae29afae0ad2fc04eb81890c862a96d797a988d5f2a04598e53508
 EBUILD givaro-4.1.1-r3.ebuild 1899 BLAKE2B c42080f053e1b18a25de706f235d03ad149036df6c9c49f60978b78abfffd7f6744c761a189500fa7ab4603a89ff92ada55302d65dfde934c20ce58b2954cb35 SHA512 125bc7f4d684242f3f26d7851aa1b849727e1f43fec44edbfa173e14997b14fc45f25da320579665ac05e8cff885c5b81f856487e30fa0fd5d725e622a704181
 MISC metadata.xml 769 BLAKE2B b407b31de2f554fdf554b2d77c2dd0b1bbf39f36b29fdf565f50362153798c60bcfecf0411247eec556ff6ddc92af0c49e11a9b242b5e3e7b7dcc1066527d08c SHA512 063ccc3fcd55f3d7033fd23efe5095d83784d0e60cca2e1092e534fe06d0e69d5d340a0a25547bddc2962d2906c14a2c996852e2c198124ed007ecdfde4fff2e
diff --git a/sci-libs/givaro/givaro-4.1.1-r2.ebuild b/sci-libs/givaro/givaro-4.1.1-r2.ebuild
deleted file mode 100644
index 06e829557472..000000000000
--- a/sci-libs/givaro/givaro-4.1.1-r2.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
-
-DESCRIPTION="C++ library for arithmetic and algebraic computations"
-HOMEPAGE="https://casys.gricad-pages.univ-grenoble-alpes.fr/givaro/"
-SRC_URI="https://github.com/linbox-team/givaro/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="CeCILL-B"
-SLOT="0/9"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="cpu_flags_x86_fma3 cpu_flags_x86_fma4 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 doc static-libs test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	doc? (
-		app-doc/doxygen[dot]
-		dev-texlive/texlive-bibtexextra
-		dev-texlive/texlive-fontsextra
-		dev-texlive/texlive-fontutils
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexextra
-	)
-"
-DEPEND="dev-libs/gmp:0[cxx(+)]"
-RDEPEND="${DEPEND}"
-
-DOCS=( AUTHORS ChangeLog README.md )
-
-PATCHES=( "${FILESDIR}/givaro-4.1.1-gcc-10.patch" )
-
-src_configure() {
-	# Passing "--disable-doc" also accidentally enables building
-	# the documentation, so we can't just $(use_enable doc) here.
-	# https://github.com/linbox-team/givaro/issues/148
-	econf \
-		$(usex doc --enable-doc "" "" "") \
-		--with-docdir="/usr/share/doc/${PF}/html" \
-		$(use_enable static-libs static) \
-		$(use_enable cpu_flags_x86_fma3 fma) \
-		$(use_enable cpu_flags_x86_fma4 fma4) \
-		$(use_enable cpu_flags_x86_sse sse) \
-		$(use_enable cpu_flags_x86_sse2 sse2) \
-		$(use_enable cpu_flags_x86_sse3 sse3) \
-		$(use_enable cpu_flags_x86_ssse3 ssse3) \
-		$(use_enable cpu_flags_x86_sse4_1 sse41) \
-		$(use_enable cpu_flags_x86_sse4_2 sse42) \
-		$(use_enable cpu_flags_x86_avx avx) \
-		$(use_enable cpu_flags_x86_avx2 avx2)
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/sci-libs/openblas/Manifest b/sci-libs/openblas/Manifest
index 333d1056cb60..45e7c8a90ed0 100644
--- a/sci-libs/openblas/Manifest
+++ b/sci-libs/openblas/Manifest
@@ -4,7 +4,7 @@ AUX openblas-0.3.20-fix-riscv.patch 3786 BLAKE2B 5ba65c1f44aa8cd8f1b88458dfe16ef
 DIST openblas-0.3.18.tar.gz 12619822 BLAKE2B 38a5e7b861eb0063a4494c1cfb6f7f5723741437ecdd5cb1fb42645eb73bceb472b3a8c11eec3d0ba4f676981ac89de4ff1ee0d7ea42d1e234746f34ce8fb6b8 SHA512 df9a14026a61bdc5285636bfd7a52dce244d24fcf4a0c870ef4e58b8b50e412849828ca5aeac2a2435f635e78e60559762e8bae22ea7bc5dff2e865a96d81152
 DIST openblas-0.3.19.tar.gz 12706050 BLAKE2B c29aa27faaf18e3330087f8d2ebed733f53878266d6865239dfbb1624a113f3cabc988bbfcc18a0aa5d971697bc68bb267795ef24e2d8e0e8d50f802cb817b57 SHA512 1fcbcfefb7744894b0b0c83c6071b342086ca311dc67f5c2745812d61dcc9d31ef7dd5e1215dfb2731ae7197d497dbdf8f8b26a432eb07d41a7db0983eb86a33
 DIST openblas-0.3.20.tar.gz 12742441 BLAKE2B 9ae808e2a7da39e28dbe26c7feb5da3c70275f3b48bd68455c22e3b16fc1f2d10b9d84c9593acff2c837fc1514f21f2bbc0e87708075c5fe13514d0d47cf0b5a SHA512 0742d40b74b11b781021280fd627fa5798e6856b49f2ba1111a5927aac1a7823bcb8162187555f4cf3a4dd7eadf5b1f2a4685c0b5e189847b2869166d1bc7391
-EBUILD openblas-0.3.18.ebuild 5779 BLAKE2B 851a9cb092537a519d15db945762b876d698bbf4bee13cccc1a4fd33daaf22713f36b22c0308340f8355bc0f765661554e1aff4184fbffc0045847972e1ad41d SHA512 0b3cebbd102011506335d5b76becadb5bae701442e3cf3aa13670f775a113c16c998e12d9088ebcff01798e4386fe4c21384d173bf86c29ebc949bc7df5d7f0f
-EBUILD openblas-0.3.19.ebuild 5779 BLAKE2B 851a9cb092537a519d15db945762b876d698bbf4bee13cccc1a4fd33daaf22713f36b22c0308340f8355bc0f765661554e1aff4184fbffc0045847972e1ad41d SHA512 0b3cebbd102011506335d5b76becadb5bae701442e3cf3aa13670f775a113c16c998e12d9088ebcff01798e4386fe4c21384d173bf86c29ebc949bc7df5d7f0f
-EBUILD openblas-0.3.20.ebuild 5882 BLAKE2B 84a0e9f32f6a529ca73a3385914de515ee6cad9def3d54013f08aeb13a6900c4918e0e383fbe6f5e7979370a643287daf405b2fb94101327219d955a5072af62 SHA512 75298d119f27a89c64fbace665917d54838bb27f7bea5aa6e51713b59c1be872f1c970045890cf6a1dbfdc273488264aa1d2b864d227d1031c8f0a81d207fc4b
+EBUILD openblas-0.3.18.ebuild 5778 BLAKE2B 20eacb6dfeb8114f77c9c63ee7962a4180bc029e8b950c4049b2d4d12cc81d666fd42ae13565cc9c1d9841510672308b8142ddcf898b795422c417e415ee3a9d SHA512 6155bff0b7bed8bff2db6eb3fc7d41be2eb1ae5638954825d6dea963a714067547bbd8459bbc438bad7c730e5607688bf8fc14fb6154c6a5065e87ea2012964e
+EBUILD openblas-0.3.19.ebuild 5778 BLAKE2B 20eacb6dfeb8114f77c9c63ee7962a4180bc029e8b950c4049b2d4d12cc81d666fd42ae13565cc9c1d9841510672308b8142ddcf898b795422c417e415ee3a9d SHA512 6155bff0b7bed8bff2db6eb3fc7d41be2eb1ae5638954825d6dea963a714067547bbd8459bbc438bad7c730e5607688bf8fc14fb6154c6a5065e87ea2012964e
+EBUILD openblas-0.3.20.ebuild 5881 BLAKE2B 2ea307644937c15bc745e218af6b8f3b0471c994379ef6c369977abc3097730df3167abded5c7bc48075f0043bd08f8984bddf8bb0ced2cfe9e0f8774e89bf08 SHA512 9471ed4cf44ef4ce988f9280e84e3cb30937cb0cf7fe0b02e21433b48dd9dd589a93f862b70aee56103e31a9520fb9184940a5c4a42f6d71393ba4bd7130ad33
 MISC metadata.xml 1561 BLAKE2B 5ba7ec66dd8ba7ca8bc29bc0193b48b6a82b4949bb79bab461400040667aa66aac3cfd2ad9c7323798048fd43d18ac96a562d53b68f3f7ae8bf8505ac7a04691 SHA512 05272eb56480ff82b240d0f430df3df03981e24b971dbd37c13d464f4f4b334bac19b54915446a09326a334aa76249bb79a4fa389d26150365f21389992f9a48
diff --git a/sci-libs/openblas/openblas-0.3.18.ebuild b/sci-libs/openblas/openblas-0.3.18.ebuild
index ec15a244d0b8..31488ab8cb0d 100644
--- a/sci-libs/openblas/openblas-0.3.18.ebuild
+++ b/sci-libs/openblas/openblas-0.3.18.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit flag-o-matic fortran-2 toolchain-funcs
 
 DESCRIPTION="Optimized BLAS library based on GotoBLAS2"
-HOMEPAGE="http://xianyi.github.com/OpenBLAS/"
+HOMEPAGE="http://xianyi.github.io/OpenBLAS/"
 SRC_URI="https://github.com/xianyi/OpenBLAS/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 S="${WORKDIR}"/OpenBLAS-${PV}
 
diff --git a/sci-libs/openblas/openblas-0.3.19.ebuild b/sci-libs/openblas/openblas-0.3.19.ebuild
index ec15a244d0b8..31488ab8cb0d 100644
--- a/sci-libs/openblas/openblas-0.3.19.ebuild
+++ b/sci-libs/openblas/openblas-0.3.19.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit flag-o-matic fortran-2 toolchain-funcs
 
 DESCRIPTION="Optimized BLAS library based on GotoBLAS2"
-HOMEPAGE="http://xianyi.github.com/OpenBLAS/"
+HOMEPAGE="http://xianyi.github.io/OpenBLAS/"
 SRC_URI="https://github.com/xianyi/OpenBLAS/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 S="${WORKDIR}"/OpenBLAS-${PV}
 
diff --git a/sci-libs/openblas/openblas-0.3.20.ebuild b/sci-libs/openblas/openblas-0.3.20.ebuild
index 01fd54d252c4..9752701c1849 100644
--- a/sci-libs/openblas/openblas-0.3.20.ebuild
+++ b/sci-libs/openblas/openblas-0.3.20.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit flag-o-matic fortran-2 toolchain-funcs
 
 DESCRIPTION="Optimized BLAS library based on GotoBLAS2"
-HOMEPAGE="http://xianyi.github.com/OpenBLAS/"
+HOMEPAGE="http://xianyi.github.io/OpenBLAS/"
 SRC_URI="https://github.com/xianyi/OpenBLAS/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 S="${WORKDIR}"/OpenBLAS-${PV}
 
diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index b605dc4f7f9d..4a2c79ecdead 100644
Binary files a/sci-mathematics/Manifest.gz and b/sci-mathematics/Manifest.gz differ
diff --git a/sci-mathematics/nauty/Manifest b/sci-mathematics/nauty/Manifest
index 466f408cd2f9..ccb293d67572 100644
--- a/sci-mathematics/nauty/Manifest
+++ b/sci-mathematics/nauty/Manifest
@@ -4,5 +4,5 @@ DIST nauty27r4.tar.gz 1731562 BLAKE2B 104481e5af3333b60574a7185848832ad08b0cfeb8
 DIST nauty_2.7r3+ds-1.debian.tar.xz 45520 BLAKE2B 5078ab84d1fcdbddc0f7442ebed57fb63551701295615b99f2833c300168dd7f71205fa3cc2e9ea977f52e389b67883b68e7d5d39e1698c6040913e4571fa4f9 SHA512 8618c78a7c6f1d579cb20048fcf55fb45b69d8d1cebd7f2c9aee664768ab78f0ab1930863c8475a153c9ac9f4692cf6e43f96d01c4a219eae1f23bb61cb50407
 DIST nauty_2.7r4+ds-1.debian.tar.xz 45712 BLAKE2B e4a7a1d2b70b5fa969f708bbd56b47aaf422c268be23ffa7ceb3f9cc21ff8d27270556adadd43fe60309e7840e1541a586b1d9d42d90ba6207801e170b747922 SHA512 7384e7637a875c35f6da94707576aa26a94f981a750eb80991a837fa9ae245680f11ca57cf24a9efe1164dcd386c9888270688c1b3de30d1a81b67bb7c670dd9
 EBUILD nauty-2.7.3.ebuild 1961 BLAKE2B af67f6907cc1ccf3bae706626e1d682c33b55aa0f0b85773968cf07f6d2ee5d7a3692d948f7aaf4ebfb30827c177f63db6fe2e7d0fe99165c720b555f4259645 SHA512 93691377b8e67eca41e8d80c2902f91c8182714eff9f3c4cae2e4afd03d379b71c0f710785671a35569105b6294abb8d4fcb9e57ab6c82ba06814955dd01dc66
-EBUILD nauty-2.7.4.ebuild 2320 BLAKE2B 015c98f4c476ccdb866cab3f8e651b5f1422c4c87cd62d4d0b96741e5820237b89caf744428b4191fdf29ba33a1fb2570d96fad3b684f0a3cb00e4cd663eb86f SHA512 df91230fd04016d66e3cc8cbd3236a3718fbfcf5946612068c49f5509b156d42dee0d71d708e763abdf30f9aa8169f89b53ad492b0b2229093b8439f5b9c87fa
+EBUILD nauty-2.7.4.ebuild 2319 BLAKE2B 54bbd896ec97e601f82fd2ced1ccc832b51c03fa5cd023aa0f2c2e785334d58b27a257d9d3e97c06e5b02b8c1ae09e43b184842c4cec5b82bc36ed518d83fc99 SHA512 9f3a9685a046b14f51671a192b70d17b7725a3124905be094e3a20eb1f2ec23f9fe7a742c7ca68217a638a984834c3d159b40562e62e8b6b3f0c5d48e56830c0
 MISC metadata.xml 554 BLAKE2B a6fbface4e867c9299680da9d2fefce4194771220489b4d9a81d295bbf1a8048fe1bf23e3c3225501a18b23af8a7daea3533f8a7c250afc7f9a4bbbf60fc8efd SHA512 c7b67c8516b9bad6cd9f60a54b3b3a4974a72e81071f53cd6562a5bea2e2b8ae990119e4391615dd3b2e30282bf70924c4f2f4b5ccd3dcf1cb7399e7de189387
diff --git a/sci-mathematics/nauty/nauty-2.7.4.ebuild b/sci-mathematics/nauty/nauty-2.7.4.ebuild
index d6f312ce894b..0666c53100dc 100644
--- a/sci-mathematics/nauty/nauty-2.7.4.ebuild
+++ b/sci-mathematics/nauty/nauty-2.7.4.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://pallini.di.uniroma1.it/${PN}${MY_PV}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~riscv ~x86"
 IUSE="examples"
 
 BDEPEND="sys-apps/help2man"
diff --git a/sci-mathematics/rkward/Manifest b/sci-mathematics/rkward/Manifest
index a9f79d86b44b..a7047373b108 100644
--- a/sci-mathematics/rkward/Manifest
+++ b/sci-mathematics/rkward/Manifest
@@ -1,5 +1,3 @@
-DIST rkward-0.7.4.tar.gz 5677112 BLAKE2B 5105103e95285c77d53eeffe3cb98e5945d4be29066c5726cd76307c70176cd44eb878d0459257de2f0efb756ecc880343226ce7060bc0866f65f8a3f7f3ea96 SHA512 64a5a42e7b36af410738bdaf19c9bb2e0f7f99816a49dd37be1a1748d925665728ba9feb1977e62f2e710e0e63bc6085c1e957ad0f1feaba58baf22efa4f708b
 DIST rkward-0.7.5.tar.gz 7682442 BLAKE2B b3c79dbc51585c646e88549d82b0a68a3246219b069d641f71beb25f2ac855d0c7a0e44e1cdba3da112ee94479584768ebd45fc37afb83fbd95de51bcc3f5a31 SHA512 247ee50fbebb9b74a1c03d6ef99dded18a1b3cf18286a6d2afcaa8ff7472cc3cb735db0a876926625aff4674906956f7a0c001a46d0dfd328a93e8c7af9f6c6b
-EBUILD rkward-0.7.4.ebuild 1419 BLAKE2B 91ab4906138bf57dc3f5f8ad3b204a0b7d8d837c31fee423eafbd172bcd6e6fd973b5f9a2cde04d2d328b9027c8c84442c6e8420270098c631fb86707754c038 SHA512 3db305b798696092589bc22db0ac48a537f6a58bf05a605f926b248f90552a42b8188319f51bba9eb126626959747d00d65b40f0fb181225f1e9e9aeedd59cc5
 EBUILD rkward-0.7.5.ebuild 1426 BLAKE2B 4ce375e80b91d8bf271c114451c8a421d3657ff1180a9cc003c9a44a8dfe64092b82ddc0b6a181c018f1e788b3160a43e72860e585de43d958a0abc594c96fd5 SHA512 cd51a835310e434205043e343b4f1ebbcc7ce7023d3b80a74e7690f56fbe18f92af52b897dd5cac033431619f782d262c67a6dfbe58ba502925721100cb2431f
 MISC metadata.xml 448 BLAKE2B c43701b135281f800da40813b11df123d5088bfa0beb3e0700ba354e991ec18aac267dc0a0f3d206bdd06eef5d50f78378a107f05d1f01d17b0d409e632066de SHA512 b9b3c376714fc5c81008caed25794d262d2d60cafbd3fcdccfeccdf9666b16dbb09f1d06025526c8304c640e150492b685df95f200002e8ef41aed609b0893a8
diff --git a/sci-mathematics/rkward/rkward-0.7.4.ebuild b/sci-mathematics/rkward/rkward-0.7.4.ebuild
deleted file mode 100644
index 6a89832e92f6..000000000000
--- a/sci-mathematics/rkward/rkward-0.7.4.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-inherit ecm kde.org optfeature
-
-DESCRIPTION="IDE for the R-project"
-HOMEPAGE="https://rkward.kde.org/"
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="GPL-2+ LGPL-2"
-SLOT="5"
-IUSE=""
-
-DEPEND="
-	dev-lang/R
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtwebengine:5[widgets]
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	kde-frameworks/karchive:5
-	kde-frameworks/kcompletion:5
-	kde-frameworks/kconfig:5
-	kde-frameworks/kconfigwidgets:5
-	kde-frameworks/kcoreaddons:5
-	kde-frameworks/kcrash:5
-	kde-frameworks/ki18n:5
-	kde-frameworks/kio:5
-	kde-frameworks/kjobwidgets:5
-	kde-frameworks/knotifications:5
-	kde-frameworks/kparts:5
-	kde-frameworks/kservice:5
-	kde-frameworks/ktexteditor:5
-	kde-frameworks/kwidgetsaddons:5
-	kde-frameworks/kwindowsystem:5
-	kde-frameworks/kxmlgui:5
-"
-RDEPEND="${DEPEND}"
-BDEPEND="sys-devel/gettext"
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		optfeature "kate plugins support" "kde-apps/kate:${SLOT}"
-		optfeature "prendering (or previewing) R markdown (.Rmd) files" "app-text/pandoc"
-		optfeature "managing citations while writing articles" "app-text/kbibtex"
-	fi
-	ecm_pkg_postinst
-}
diff --git a/sci-mathematics/singular/Manifest b/sci-mathematics/singular/Manifest
index c5fb01f0a629..27c494999847 100644
--- a/sci-mathematics/singular/Manifest
+++ b/sci-mathematics/singular/Manifest
@@ -8,5 +8,5 @@ DIST singular-4.2.1p3.tar.gz 15042102 BLAKE2B 9958c1c432f8a3516387cfe7b258d2e22e
 DIST singular-4.3.1p1.tar.gz 15090370 BLAKE2B d4e40378b3892b98b1f78c3928c8a40484336ea25ea4dcd4b3a1e5f651281d2cdb06d92c9cc64427ce76e91c5bf4eaa1c3b643df174a24c188823ae808817ad9 SHA512 d27d8e042ea085e49aed6a0697056c36e78e62ea0b9d17751cdf4c556cf4f6efce3b34b411c77aef97c6d90675bea11c97651eb7009634cb8a9b630ec820a06e
 EBUILD singular-4.2.0_p1.ebuild 2259 BLAKE2B 2237245fe2550f398a20a14ae599bcc668288aa6312925cee725e2571dc53f8f62f88bdff0cdf8cd303c72baaf2861a2c560ce54978da720e93cbe459769b7d1 SHA512 2a6b8e478f32ff9e3df96e0188cd137b16d9be1a8c18c9f5367a81b96dc8b0cc01d34771246001eee9e8ec9832f8832539e921879ec56fe8a51ebb42c0d29389
 EBUILD singular-4.2.1_p3-r1.ebuild 2628 BLAKE2B 5ff968e3c06d722d2f1c0c872ea4c541e9e5e90bda4e8af8e54ba38aba21464ed8f7cfea727883de0ed34831f12c780ed45dd2a038856a19d142200d0073688e SHA512 8d0e74684f138c08288ac642ad0450a364c5b0deb6f805680289408d54fee563cadd32a81297a48e8148679b537903190e8abba069a60e38e06cb8bc10b6ee75
-EBUILD singular-4.3.1_p1.ebuild 2296 BLAKE2B 4c1cacc1976fa42355106d381764b0ce6bb7ac78d0c540b83b634036456af4c8dc7404fc73bf0187c39a8c3eeeb94f451590afd687fd512e3aba3056a5b35ead SHA512 9e944311c909a6cfeee4a5efc97714b2c5f9c3c3ec2104435685cde4bdaa527ffcf3ea7db9cbacea59fe7c4afe6023c1059261b29143be97391111b213704acf
+EBUILD singular-4.3.1_p1.ebuild 2295 BLAKE2B 399f910678833dd16cc93039c18733c46f98e05cf95c0e2a1165d4669b75558dedfebf57703cec0f518c029d84a5e1c9a2f029dc5f9c125b4ac4924fa3c61221 SHA512 c9a986a5ac4063c574f9fbe6ef4ca3e38a1840bf2bd2e1c4b77e0ad85676d1c2eb3d586125af818dce7ab665c635908da9ffc1a7e4fbaa034498556cd4df17dc
 MISC metadata.xml 782 BLAKE2B 7f10704c78b5a55cff9d07ffc3456a57aba4001ffd337dfbbb712e32608446ab9ae8039d14143939ad41710dcc6d4725992db2c80bcd1678397e563fefa929b4 SHA512 3c4904a4a8f63ff073745409caf9a9a68aa5d46861b8e8d77a538716a7a6a099d87137d604e52a3b8ce4ab81b7333f95389cd888ccbabe52017b6e8b1e4a77d0
diff --git a/sci-mathematics/singular/singular-4.3.1_p1.ebuild b/sci-mathematics/singular/singular-4.3.1_p1.ebuild
index fb5b4a7f3ed2..6adf2820277d 100644
--- a/sci-mathematics/singular/singular-4.3.1_p1.ebuild
+++ b/sci-mathematics/singular/singular-4.3.1_p1.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${PN}-${MY_DIR2}"
 
 LICENSE="BSD GPL-2 GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~riscv ~x86 ~x86-linux"
+KEYWORDS="amd64 ~ppc ~riscv ~x86 ~x86-linux"
 IUSE="emacs examples polymake +readline static-libs"
 
 RDEPEND="
diff --git a/sci-misc/Manifest.gz b/sci-misc/Manifest.gz
index 915b714c288e..a93c129ee6b5 100644
Binary files a/sci-misc/Manifest.gz and b/sci-misc/Manifest.gz differ
diff --git a/sci-misc/gt-itm/Manifest b/sci-misc/gt-itm/Manifest
index 4c256aa734d3..b14c07897d02 100644
--- a/sci-misc/gt-itm/Manifest
+++ b/sci-misc/gt-itm/Manifest
@@ -1,5 +1,8 @@
-AUX gt-itm-implicits.patch 2731 BLAKE2B b8aaea5e6016d9c3e6badc3a5f02f83188830bbe79501183dbfea9453d3af51479d46e83a7053eb86241a203c3a808f8e9a0d78cb350c01eb9d6c6483be4bc91 SHA512 64dc41be9d914e1df68780576300c54aa8091862b37ae44b5530312b8eaafbda76d97021f62544bce7c57e447959eea5a83c72074a714b4894bf4fddc79b5fe7
+AUX gt-itm-19961004-Fix-build-with-Clang-16.patch 7513 BLAKE2B 9b4be914570a254041be29b123c5d9300eec49d4cf374f3206d310af373b6344f7eb26cee593f4cdc92b2c611ccd7edb0fdd1eb14acb4f60b2b9e9c2985d58e9 SHA512 37f8d381a0a0df4f55d13e4670d01c461883966ab1b2398b5232fc409e3e199515749731e13d70b1f67dbd60cf218bc129cadb388176a7b045ec34c28c21d695
+AUX gt-itm-19961004-Fix-musl-build.patch 1980 BLAKE2B 9ffa9c0f0153bd085a4d79512b4be4348571c4e8251e8e04e686d7d9b32e86e1160786922d53ae1fff3bf32daf1637e3b7512b7c2f6855f35258355d93e5e6aa SHA512 6b9f15bf1d475f60c8fb163a9f4bd6f5f0ec285e26f1ecaec55a8564aea0058b3a33115f8bb237faa72412d17702f3c9f7e98338cb96fa789cdbbb1dde9d89c6
+AUX gt-itm-19961004-gentoo.patch 4963 BLAKE2B 868fe349939591b7632ee1162a98d40bf1aa98e759f56660a8b685a8ff05b94a0ab7c368145ad1f8fdb003fc367dba3b9feec28b1ec8280aa2f40281d0f87cc1 SHA512 da4ee372c6337169539a63d3d6d3975c7847af44dcf6f57fee2e6e5c71c541f7239146b8f27a044168c83cf5b0f8d84e8efa94afadcdf9c1674fc2ca964ce4c3
+AUX gt-itm-implicits.patch 2687 BLAKE2B 8c86224a94152919c18d6743dd8049c6b8261f816459e3fd218fbd268bfb5245031737f2741880639c4d714c2cd606d32160bc8836a12153742d8583bbfb6dc6 SHA512 4a47a552efadb6dfaf1d5f7030c51c8cb94793cd8cd0fc0e80bb79c71ab60db501e06cb01247b1ec35c61af66199671f2a5e65d501a78c0bcc3eb7acc5de6dca
 DIST gt-itm-19961004.tar.gz 623345 BLAKE2B e9cf712d6a4411cbb66faf9bbd803bb3753ebbbd05174c02581c9b606e02f1c7132b0b96f483e3f273a28aebd64a8ede046de7397ddb9606efccad59ba137524 SHA512 e775ac475d40fc753a27fb619f262d701818190fa3be90d587f95e215610918b56b9d67783d4e7e2f55d0064e5b2d2ce911042353b29bce1e4dbcf407ff9fabc
 DIST sgb2ns-19961004.tar.gz 50635 BLAKE2B b669d9def20c7e149de33072467183190f85b7fb30662cad83c53c1d9317532a1bd95174498eebd13b98eccf2ac693159793a40b667cdc97a6f15fbd027e0975 SHA512 77ec6fdad61f43bf078851852aa03dfea02df235a78853e477dacc8e2b94c0d8bda9772fc00d18fdaeabc419b2780c016b7a64a1a06ac0be2c8c2aa6608c06cf
-EBUILD gt-itm-19961004-r2.ebuild 2122 BLAKE2B b61ca4dfe47cdf2aea1f16ff6f1dba4a675df22fac8dd8c64591416353df63b97a77c244045949b4108930ff29d0c24ee33ff9559eda2307293f430c9abb9689 SHA512 ff636d79efa007527027e5edae75610ce26e436f3ac1a0bb0c2df03a8c5770bd5ef70e1036d0c8f8a10e457dee89eaf9e5e5d83874baa08ea2c3af86daae4bdd
+EBUILD gt-itm-19961004-r3.ebuild 1586 BLAKE2B 2f142c67389bfe0d82ee882b6e402a8449b16c71452cd1ad60d2e9253e46d530a009070855bd647693f37f882c4908ac514f7ee80011410e2747d26f414d2129 SHA512 b855b16c1ca7c7290dff67403bfd93d4c2913db31a25cd6f439ecb35871bf6c84044cb36cf431dea6c889c7691d7071da410866092383de41a64a4d41b7902ce
 MISC metadata.xml 250 BLAKE2B 53ce4a2ec047c91819ecc665bad106707e80e4fbd9bd20cca22843c536beea3d124922de22b9c7986e39d232fb8b1f4752d4c8ee09933fe16383b475db861126 SHA512 667b310c205f016e11407f3e3fb0ad6fb1e530651b32da15e034523b0138e5fdf93b29d64311146bfdfa5bc5108f75e238136641f366e1e0b01e995ddae36aa5
diff --git a/sci-misc/gt-itm/files/gt-itm-19961004-Fix-build-with-Clang-16.patch b/sci-misc/gt-itm/files/gt-itm-19961004-Fix-build-with-Clang-16.patch
new file mode 100644
index 000000000000..e13a035e1950
--- /dev/null
+++ b/sci-misc/gt-itm/files/gt-itm-19961004-Fix-build-with-Clang-16.patch
@@ -0,0 +1,326 @@
+From 960d73fb2149340e39acc23741ede9dee52b8778 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Mon, 24 Oct 2022 18:47:48 +0100
+Subject: [PATCH 1/2] Fix build with Clang 16
+
+Bug: https://bugs.gentoo.org/741582
+--- a/gt-itm/src/dfs.c
++++ b/gt-itm/src/dfs.c
+@@ -23,7 +23,7 @@ int dfs(Graph *G,int n,u_char *vis);
+ 
+ /* check connectivity of graph g                        */
+ /* uses depth-first search.                             */
+-isconnected(Graph *G)
++int isconnected(Graph *G)
+ {
+ u_char *vis;
+ Vertex *vp;
+--- a/gt-itm/src/edriver.c
++++ b/gt-itm/src/edriver.c
+@@ -51,9 +51,7 @@
+     		   } \
+ 		 }\
+ 
+-main(argc,argv)
+-    int argc;
+-    char *argv[];
++int main(int argc, char **argv)
+ {
+     int i; 
+     int min, max, sum, bins, *ddist; 
+@@ -63,14 +61,14 @@ main(argc,argv)
+     char outfile[MAXF];
+     char *dstr = "-nd";
+     int plen, idx;
+-    FILE *ddf, *evf, *pdf, *fp, *fopen();
++    FILE *ddf, *evf, *pdf, *fp;
+     int prdist = 1;
+     enum Field f0, f1;
+     int first = 1;
+ 
+     if (argc == 1) {
+ 	printf("Usage: edriver <filestem> [-nd] [-<f0><f1>]*\n\n");
+-	return;
++	return 1;
+     }
+     /* determine whether to print distributions */
+     /* determine where in argv the field pairs begin */
+--- a/gt-itm/src/eval.c
++++ b/gt-itm/src/eval.c
+@@ -201,10 +201,7 @@ int bicomp(Graph *g,int verbose)
+ }
+ 
+ 
+-void twofield_sptree(g,u,f0,f1)
+-Graph*g;
+-Vertex*u;
+-enum Field f0,f1;
++void twofield_sptree(Graph *g, Vertex *u, enum Field f0, enum Field f1)
+ {
+ 	Vertex *v, *t;
+ 	Arc *r;
+--- a/gt-itm/src/geog.c
++++ b/gt-itm/src/geog.c
+@@ -33,7 +33,7 @@
+ static char geogId[]="$Id: geog.c,v 1.1 1996/10/04 13:36:46 calvert Exp $";
+ 
+ long fdiam(Graph *g);
+-void die(s);
++void die(char* errstr);
+ 
+ double
+ distance(Vertex *u, Vertex *v)
+@@ -75,7 +75,7 @@ printparms(char *buf,geo_parms *pp)
+ void
+ randomize(long* a, long size, long mean, int iters)
+ {
+-register i,indx;
++int i,indx;
+ 
+    for (i=0; i<size; i++)       /* initialize */
+         a[i] = mean;
+@@ -149,11 +149,11 @@ geo(long seed, geo_parms *pp)
+ {
+ double p,d,L,radius,r;
+ u_char *occ;
+-register int scale;
++int scale;
+ unsigned nbytes, index, x, y;
+ u_long units,pertrange;
+ int mallocd;
+-register i,j;
++int i,j;
+ Graph *G;
+ Vertex *up,*vp;
+ char namestr[128];
+@@ -319,7 +319,7 @@ int
+ edge_level(Vertex *u, Vertex *v, int nlev)
+ {
+ char ss[MAXNAMELEN], tt[MAXNAMELEN];
+-register char *s=ss, *t=tt, *b, *c;
++char *s=ss, *t=tt, *b, *c;
+ 
+ nlev -= 1;
+ 
+@@ -359,7 +359,7 @@ geo_hier(long seed,
+ Graph *newG, *tG, *GG, *srcG, *dstG;
+ long *numv;		/* array of sizes of lower-level graphs */
+ geo_parms *curparms, workparms[MAXLEVEL];
+-register i,k,indx;
++int i,k,indx;
+ long dst;
+ int temp,total,lowsize,otherend,blen,level;
+ long maxP[MAXLEVEL], maxDiam[MAXLEVEL], wt[MAXLEVEL];
+@@ -614,7 +614,7 @@ char vnamestr[MAXNAMELEN];
+  */
+   {
+     char buf[ID_FIELD_SIZE+1];
+-    register char *cp;
++    char *cp;
+     int len, nextlen, left;
+ 
+     strcpy(tG->util_types,GEO_UTIL);	/* same for all geo graphs,	*/
+--- a/gt-itm/src/itm.c
++++ b/gt-itm/src/itm.c
+@@ -56,7 +56,7 @@
+ char *delim = " \t\n", *nonestr = "<none>";
+ static char  errstr[256];
+ 
+-void die(s);
++void die(char* errstr);
+ 
+ char *
+ get_geoparms(FILE * f, geo_parms * pp)
+@@ -298,7 +298,7 @@ geo_parms	parmsbuf[MAXLEVEL];	/* make sure MAXLEVEL >= 3 */
+     return NULL;
+ }
+ 
+-main(int argc, char **argv)
++int main(int argc, char **argv)
+ {
+     FILE           *infile;
+     char	   *rv;
+@@ -306,7 +306,7 @@ main(int argc, char **argv)
+ 
+     if (argc == 1) {
+ 	printf("itm <spec-file0> <spec-file1> ....\n\n");
+-	return;
++	return 1;
+     }
+     while (--argc) {
+ 
+--- a/gt-itm/src/sgb2alt.c
++++ b/gt-itm/src/sgb2alt.c
+@@ -24,7 +24,7 @@
+ #include "gb_save.h"
+ #include "geog.h"
+ 
+-main(argc,argv)
++int main(argc,argv)
+     int argc;
+     char *argv[];
+ {
+@@ -36,14 +36,14 @@ main(argc,argv)
+ 
+     if (argc != 3) {
+ 	    printf("sgb2old <sgfile> <altfile>\n\n");
+-	    return;
++	    return 1;
+     }
+     fout = fopen(argv[2],"w");
+ 
+     g = restore_graph(argv[1]);
+ 		if (g == NULL) {
+       printf("%s does not contain a correct SGB graph\n",argv[1]);
+-			return;
++			return 1;
+ 		}
+ 			
+     fprintf(fout,"GRAPH (#nodes #edges id uu vv ww xx yy zz):\n");
+--- a/gt-itm/src/ts.c
++++ b/gt-itm/src/ts.c
+@@ -76,7 +76,7 @@ int stubs_OK(Vertex *snp0,Vertex *snp1);
+ long
+ fdiam(Graph *g)
+ {
+-register i,j,k;
++int i,j,k;
+ long **dist, **ldist;
+ int changed,mallocd;
+ long diam, ldiam, newdist = 0, otherend;
+@@ -174,7 +174,7 @@ Arc *a;
+ } /* fdiam */
+ 
+ void
+-die(s)
++die(char* s)
+ {
+ fprintf(stderr,"Fatal error %s\n",s);
+ exit(1);
+@@ -187,7 +187,7 @@ exit(1);
+ void
+ copyedges(Graph *fromG, Graph *toG, long base)
+ {
+-register i, indx;
++int i, indx;
+ Vertex *np, *vp, *basep;
+ Arc *ap;
+ 
+@@ -245,7 +245,7 @@ long i,j,k;
+ long indx, diam, totalnodes, base, dom;
+ char dnodename[ID_FIELD_SIZE], snodename[ID_FIELD_SIZE];
+ int dnamelen, numtries=0;
+-register Vertex *v,*dnp, *snp,	/* domain node and stub node pointers	*/
++Vertex *v,*dnp, *snp,	/* domain node and stub node pointers	*/
+        *ddnp, *fp, *tp, *tmp;
+ 
+ Arc *a;
+--- a/gt-itm/src/sgb2alt.c
++++ b/gt-itm/src/sgb2alt.c
+@@ -32,7 +32,7 @@ int main(argc,argv)
+     Vertex *v;
+     Arc *a;
+     Graph *g;
+-    FILE *fopen(), *fout;
++    FILE *fout;
+ 
+     if (argc != 3) {
+ 	    printf("sgb2old <sgfile> <altfile>\n\n");
+--- a/sgb2ns/sgb2comns.c
++++ b/sgb2ns/sgb2comns.c
+@@ -80,9 +80,7 @@ void print_flat_nodes(FILE *fout, Graph *g);
+ void print_edges(FILE *fout, Graph *g);
+ void print_hdr(FILE *fout, Graph *g);
+ 
+-main(argc,argv)
+-    int argc;
+-    char *argv[];
++int main(int argc, char *argv[])
+ {
+ 	
+ 	int hier_flag=0;
+@@ -102,7 +100,7 @@ main(argc,argv)
+ 	g = restore_graph(argv[1]);
+ 	if (g == NULL) {
+ 		printf("%s does not contain a correct SGB graph\n",argv[1]);
+-		return;
++		return 1;
+ 	}
+ 	
+ 	if (hier_flag) 
+--- a/sgb2ns/sgb2hierns.c
++++ b/sgb2ns/sgb2hierns.c
+@@ -47,9 +47,7 @@
+ #define HUGE   655536
+ 
+ 
+-main(argc,argv)
+-    int argc;
+-    char *argv[];
++int main(int argc, char *argv[])
+ {
+ 
+     int i, 
+@@ -89,7 +87,7 @@ main(argc,argv)
+ 	    /* for the purpose of scenario generator, need to return a list of transits
+ 	       & stubs and num of nodes in each - hence the optional third arg topofile */
+ 	    printf("sgb2hierns <sgfile> <outfile> ?<topofile>?\n\n");
+-	    return;
++	    return 1;
+     }
+   
+     fout = fopen(argv[2],"w");
+@@ -101,7 +99,7 @@ main(argc,argv)
+     g = restore_graph(argv[1]);
+     if (g == NULL) {
+ 	    printf("%s does not contain a correct SGB graph\n",argv[1]);
+-	    return;
++	    return 1;
+     }
+ 
+     fprintf(fout,"# Generated by sgb2hier-ns,sgb2hier-ns generated from sgb2ns\n");
+--- a/sgb2ns/sgb2ns.c
++++ b/sgb2ns/sgb2ns.c
+@@ -41,27 +41,25 @@
+ #include "gb_save.h"
+ #include "geog.h"
+ 
+-main(argc,argv)
+-     int argc;
+-     char *argv[];
++int main(int argc,char *argv[])
+ {
+ 	int i, j, nlink;
+ 	Vertex *v;
+ 	Arc *a;
+ 	Graph *g;
+-	FILE *fopen(), *fout;
++	FILE *fout;
+ 	char m[420];
+ 
+ 	if (argc != 3) {
+ 		printf("sgb2ns <sgfile> <nsfile>\n\n");
+-		return;
++		return 1;
+ 	}
+ 	fout = fopen(argv[2],"w");
+ 
+ 	g = restore_graph(argv[1]);
+ 	if (g == NULL) {
+ 		printf("%s does not contain a correct SGB graph\n",argv[1]);
+-		return;
++		return 1;
+ 	}
+ 			
+ 	fprintf(fout, "# Generated by sgb2ns, created by Polly Huang\n");
+--- a/sgb2ns/ts2ns.c
++++ b/sgb2ns/ts2ns.c
+@@ -55,7 +55,7 @@ main(argc,argv)
+ 	Vertex *v;
+ 	Arc *a;
+ 	Graph *g;
+-	FILE *fopen(), *fout;
++	FILE *fout;
+ 	char m[420], name[40];
+ 	int transits[HUGE]; 
+ 	int p,q, total_transits;
diff --git a/sci-misc/gt-itm/files/gt-itm-19961004-Fix-musl-build.patch b/sci-misc/gt-itm/files/gt-itm-19961004-Fix-musl-build.patch
new file mode 100644
index 000000000000..3826661bd9f1
--- /dev/null
+++ b/sci-misc/gt-itm/files/gt-itm-19961004-Fix-musl-build.patch
@@ -0,0 +1,69 @@
+From 15670744cc6a182cf0d2a4ed16748255ac1ff5c8 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Mon, 24 Oct 2022 18:48:48 +0100
+Subject: [PATCH 2/2] Fix musl build
+
+Bug: https://bugs.gentoo.org/832835
+--- a/gt-itm/src/dfs.c
++++ b/gt-itm/src/dfs.c
+@@ -19,22 +19,22 @@ static char dfsID[]="$Id: dfs.c,v 1.1 1996/10/04 13:36:32 calvert Exp $";
+ 
+ #define NBBY 8
+ 
+-int dfs(Graph *G,int n,u_char *vis);
++int dfs(Graph *G,int n,unsigned char *vis);
+ 
+ /* check connectivity of graph g                        */
+ /* uses depth-first search.                             */
+ int isconnected(Graph *G)
+ {
+-u_char *vis;
++unsigned char *vis;
+ Vertex *vp;
+ int i,nbytes;
+ 
+     nbytes = (G->n/NBBY)+ (G->n%NBBY?1:0);
+ 
+     if (nbytes < STACKMAX) {	/* for small amounts we use stack frame */
+-        vis = (u_char *) alloca(nbytes);
++        vis = (unsigned char *) alloca(nbytes);
+     } else {
+-        vis = (u_char *) malloc(nbytes);
++        vis = (unsigned char *) malloc(nbytes);
+     }
+ 
+     for (i=0; i<nbytes; i++) vis[i]=0;
+@@ -54,7 +54,7 @@ int i,nbytes;
+ /* trivial depth-first search. */
+ /* Returns number of newly-visited nodes in subtree rooted at node n. */
+ int
+-dfs(Graph *G,int n,u_char *vis)
++dfs(Graph *G,int n,unsigned char *vis)
+ {
+ int nvis, i, nextn;
+ Vertex *vp;
+--- a/gt-itm/src/geog.c
++++ b/gt-itm/src/geog.c
+@@ -148,7 +148,7 @@ Graph *
+ geo(long seed, geo_parms *pp)
+ {
+ double p,d,L,radius,r;
+-u_char *occ;
++unsigned char *occ;
+ int scale;
+ unsigned nbytes, index, x, y;
+ u_long units,pertrange;
+@@ -189,10 +189,10 @@ char namestr[128];
+     nbytes = ((scale*scale)%NBBY ? (scale*scale/NBBY)+1 : (scale*scale)/NBBY);
+ 
+     if (nbytes < STACKMAX) {	/* small amount - just do it in the stack */
+-        occ = (u_char *) alloca(nbytes);
++        occ = (unsigned char *) alloca(nbytes);
+         mallocd = 0;
+     } else {
+-        occ = (u_char *) malloc(nbytes);
++        occ = (unsigned char *) malloc(nbytes);
+         mallocd = 1;
+     }
+ 
+
diff --git a/sci-misc/gt-itm/files/gt-itm-19961004-gentoo.patch b/sci-misc/gt-itm/files/gt-itm-19961004-gentoo.patch
new file mode 100644
index 000000000000..12b8579ece95
--- /dev/null
+++ b/sci-misc/gt-itm/files/gt-itm-19961004-gentoo.patch
@@ -0,0 +1,201 @@
+--- a/gt-itm/sample-graphs/rand/r10/Runconvert
++++ b/gt-itm/sample-graphs/rand/r10/Runconvert
+@@ -1,5 +1,5 @@
+ #!/bin/csh
+ 
+ foreach i (0 1 2)
+-   ../../../bin/sgb2alt r10-$i.gb r10-$i.alt 
++   sgb2alt r10-$i.gb r10-$i.alt 
+ end
+--- a/gt-itm/sample-graphs/rand/r10/Runeval
++++ b/gt-itm/sample-graphs/rand/r10/Runeval
+@@ -1,5 +1,5 @@
+ #!/bin/csh
+ 
+ foreach i (0 1 2)
+-   ../../../bin/edriver r10-$i -nd -hh -ll -hl
++   edriver r10-$i -nd -hh -ll -hl
+ end
+--- a/gt-itm/sample-graphs/rand/r100/Runconvert
++++ b/gt-itm/sample-graphs/rand/r100/Runconvert
+@@ -1,5 +1,5 @@
+ #!/bin/csh
+ 
+ foreach i (0 1 2 3 4 5 6 7 8 9)
+-   ../../../bin/sgb2alt r100-$i.gb r100-$i.alt 
++   sgb2alt r100-$i.gb r100-$i.alt 
+ end
+--- a/gt-itm/sample-graphs/rand/r100/Runeval
++++ b/gt-itm/sample-graphs/rand/r100/Runeval
+@@ -1,5 +1,5 @@
+ #!/bin/csh
+ 
+ foreach i (0 1 2 3 4 5 6 7 8 9)
+-   ../../../bin/edriver r100-$i -nd -hh -ll -hl
++   edriver r100-$i -nd -hh -ll -hl
+ end
+--- a/gt-itm/sample-graphs/ts/ts100/Runconvert
++++ b/gt-itm/sample-graphs/ts/ts100/Runconvert
+@@ -1,5 +1,5 @@
+ #!/bin/csh
+ 
+ foreach i (0 1 2 3 4 5 6 7 8 9)
+-   ../../bin/sgb2alt ts100-$i.gb ts100-$i.alt 
++   sgb2alt ts100-$i.gb ts100-$i.alt 
+ end
+--- a/gt-itm/sample-graphs/ts/ts100/Runeval
++++ b/gt-itm/sample-graphs/ts/ts100/Runeval
+@@ -1,5 +1,5 @@
+ #!/bin/csh
+ 
+ foreach i (0 1 2 3 4 5 6 7 8 9)
+-   ../../../bin/edriver ts100-$i -nd -hh -ll -hl
++   edriver ts100-$i -nd -hh -ll -hl
+ end
+--- a/gt-itm/sample-graphs/ts/ts600/Runconvert
++++ b/gt-itm/sample-graphs/ts/ts600/Runconvert
+@@ -1,5 +1,5 @@
+ #!/bin/csh
+ 
+ foreach i (0 1 2 3 4 5 6 7 8 9)
+-   ../../bin/sgb2alt ts600-$i.gb ts600-$i.alt 
++   sgb2alt ts600-$i.gb ts600-$i.alt 
+ end
+--- a/gt-itm/sample-graphs/ts/ts600/Runeval
++++ b/gt-itm/sample-graphs/ts/ts600/Runeval
+@@ -1,5 +1,5 @@
+ #!/bin/csh
+ 
+ foreach i (0 1 2 3 4 5 6 7 8 9)
+-   ../../../bin/edriver ts600-$i -nd -hh -ll -hl
++   edriver ts600-$i -nd -hh -ll -hl
+ end
+--- a/gt-itm/src/Makefile
++++ b/gt-itm/src/Makefile
+@@ -9,10 +9,10 @@
+ # 
+ # For Solaris: uncomment the next two lines
+ #SYS = -DSYSV
+-#LIBS = -lm -lgb5
++#LIBS = -lm -lgb
+ 
+ # For SunOS: uncomment the next line
+-LIBS = -lm -lgb4
++LIBS = -lm -lgb
+  
+ 
+ IDIR = ../include
+@@ -35,29 +35,22 @@ EH = $(IDIR)/gb_graph.h $(IDIR)/gb_save.h $(IDIR)/gb_dijk.h \
+ all:	itm sgb2alt edriver
+ 
+ itm:	$(GO)
+-	$(CC) $(CFLAGS) -o $(BDIR)/itm $(GO) $(LIBS)
++	$(CC) $(LDFLAGS) $(CFLAGS) -o $(BDIR)/itm $(GO) $(LIBS)
+ 
+-itm.o:	$(GH)
+ 
+-geog.o:	$(GH)
+ 
+-ts.o: $(GH)	
+ 
+-dfs.o: $(GH)
+ 
+ 
+ sgb2alt: $(CO)
+-	$(CC) $(CFLAGS) -o $(BDIR)/sgb2alt $(CO) $(LIBS) 
++	$(CC) $(LDFLAGS) $(CFLAGS) -o $(BDIR)/sgb2alt $(CO) $(LIBS) 
+ 
+-sgb2alt.o: $(CH)
+ 
+ 
+ edriver: $(EO)
+-	$(CC) $(CFLAGS) -o $(BDIR)/edriver $(EO) $(LIBS)
++	$(CC) $(LDFLAGS) $(CFLAGS) -o $(BDIR)/edriver $(EO) $(LIBS)
+ 
+-edriver.o: $(EH)
+ 
+-eval.o: $(IDIR)/gb_graph.h $(IDIR)/gb_dijk.h $(IDIR)/eval.h
+ 
+ 	
+ clean:  
+--- a/gt-itm/src/eval.c
++++ b/gt-itm/src/eval.c
+@@ -159,7 +159,7 @@ int bicomp(Graph *g,int verbose)
+ 			if (u == &dummy) {
+ 			    if (verbose) {
+ 			    if (artic_pt)
+-				printf(" and %d (this ends a connected 
++				printf(" and %d (this ends a connected \
+ 				component of the graph)\n", idx(g, artic_pt));
+ 			    else
+ 				printf("Isolated vertex %d\n", idx(g, v));
+--- a/gt-itm/src/geog.c
++++ b/gt-itm/src/geog.c
+@@ -6,7 +6,7 @@
+  */
+ 
+ #include <stdio.h>
+-#include <sys/types.h>		/* for NBBY */
++#include <sys/param.h>		/* for NBBY */
+ #include <alloca.h>
+ #include <assert.h>
+ #include <string.h>		/* for strchr() */
+--- a/sgb2ns/Makefile
++++ b/sgb2ns/Makefile
+@@ -8,11 +8,10 @@
+ #       uncomment the two Solaris lines below, and comment the SunOS line.
+ # 
+ # For Solaris: uncomment the next two lines
+-SYS = -DSYSV
+-LIBS = -lm -lgb5
++LIBS = -lm -lgb
+ 
+ # For SunOS: uncomment the next line
+-#LIBS = -lm -lgb4
++#LIBS = -lm -lgb
+ 
+ GT_ITM = ../gt-itm
+ IDIR = $(GT_ITM)/include
+@@ -33,16 +32,16 @@ CH = $(IDIR)/geog.h $(IDIR)/gb_graph.h $(IDIR)/gb_save.h
+ all:	sgb2comns sgb2hierns sgb2ns ts2ns
+ 
+ sgb2ns: $(CN)
+-	$(CC) $(CFLAGS) -o $(BDIR)/sgb2ns $(CN) $(LIBS) 
++	$(CC) $(LDFLAGS) $(CFLAGS) -o $(BDIR)/sgb2ns $(CN) $(LIBS) 
+ 
+ ts2ns: $(CN)
+-	$(CC) $(CFLAGS) -o $(BDIR)/ts2ns $(CN) $(LIBS)
++	$(CC) $(LDFLAGS) $(CFLAGS) -o $(BDIR)/ts2ns $(CN) $(LIBS)
+ 
+ sgb2hierns: $(HN)
+-	$(CC) $(CFLAGS) -o $(BDIR)/sgb2hierns $(HN) $(LIBS)
++	$(CC) $(LDFLAGS) $(CFLAGS) -o $(BDIR)/sgb2hierns $(HN) $(LIBS)
+ 
+ sgb2comns: $(COM)
+-	$(CC) $(CFLAGS) -o $(BDIR)/sgb2comns $(COM) $(LIBS)
++	$(CC) $(LDFLAGS) $(CFLAGS) -o $(BDIR)/sgb2comns $(COM) $(LIBS)
+ 
+ sgb2ns.o: $(CH)
+ sgb2hierns.o: $(CH)
+--- a/sgb2ns/sgb2comns.c
++++ b/sgb2ns/sgb2comns.c
+@@ -49,6 +49,7 @@
+  */
+ 
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <strings.h>
+ #include <string.h>
+ #include "gb_graph.h"
+--- a/sgb2ns/sgb2hierns.c
++++ b/sgb2ns/sgb2hierns.c
+@@ -34,7 +34,8 @@
+  */
+ 
+ #include <stdio.h>
+-#include <strings.h>
++#include <stdlib.h>
++#include <string.h>
+ #include "gb_graph.h"
+ #include "gb_save.h"
+ #include "geog.h"
diff --git a/sci-misc/gt-itm/files/gt-itm-implicits.patch b/sci-misc/gt-itm/files/gt-itm-implicits.patch
index 7618354469ff..70da0f568c65 100644
--- a/sci-misc/gt-itm/files/gt-itm-implicits.patch
+++ b/sci-misc/gt-itm/files/gt-itm-implicits.patch
@@ -1,5 +1,5 @@
---- gt-itm/src/geog.c
-+++ gt-itm/src/geog.c
+--- a/gt-itm/src/geog.c
++++ b/gt-itm/src/geog.c
 @@ -6,6 +6,7 @@
   */
  
@@ -18,8 +18,8 @@
  double
  distance(Vertex *u, Vertex *v)
  {
---- gt-itm/src/ts.c
-+++ gt-itm/src/ts.c
+--- a/gt-itm/src/ts.c
++++ b/gt-itm/src/ts.c
 @@ -8,6 +8,7 @@
   */
  
@@ -39,8 +39,8 @@
  /* fast diameter computation using Floyd-Warshall
   * Returns the HOP diameter of the graph, i.e. each edge given UNIT wt.
   * Leaves the LENGTH diameter of the graph in g->Gldiam.
---- gt-itm/include/geog.h
-+++ gt-itm/include/geog.h
+--- a/gt-itm/include/geog.h
++++ b/gt-itm/include/geog.h
 @@ -74,3 +74,8 @@
           geo_parms* toppp,      /* params for transit connectivity */
           geo_parms* transpp,    /*   "     "  transit domains   */
@@ -50,8 +50,8 @@
 +long idist(Vertex *u, Vertex *v);
 +int printparms(char *buf,geo_parms *pp);
 +int isconnected(Graph *G);
---- gt-itm/src/edriver.c
-+++ gt-itm/src/edriver.c
+--- a/gt-itm/src/edriver.c
++++ b/gt-itm/src/edriver.c
 @@ -35,6 +35,8 @@
   */
  
@@ -61,8 +61,8 @@
  #include "gb_graph.h"
  #include "gb_save.h"
  #include "gb_dijk.h"
---- gt-itm/include/eval.h
-+++ gt-itm/include/eval.h
+--- a/gt-itm/include/eval.h
++++ b/gt-itm/include/eval.h
 @@ -8,4 +8,7 @@
  enum Field {Len, A, B, Hops};
  
@@ -72,8 +72,8 @@
 +void dopaths(Graph *g, enum Field f0, enum Field f1, int *rmin, int *rmax, float *ravg);
 +void dodepthdist(Graph *g, int** ddist);
 +int bicomp(Graph *g,int verbose);
---- gt-itm/src/dfs.c
-+++ gt-itm/src/dfs.c
+--- a/gt-itm/src/dfs.c
++++ b/gt-itm/src/dfs.c
 @@ -6,6 +6,7 @@
   */
  
@@ -91,8 +91,8 @@
  /* check connectivity of graph g                        */
  /* uses depth-first search.                             */
  isconnected(Graph *G)
---- gt-itm/src/itm.c.orig	2010-10-12 17:11:25.748461793 +0200
-+++ gt-itm/src/itm.c	2010-10-12 17:13:09.237165705 +0200
+--- a/gt-itm/src/itm.c.orig
++++ b/gt-itm/src/itm.c
 @@ -42,6 +42,7 @@
  #include <stdlib.h>		/* for calloc(),atoi(),etc. */
  #include <string.h>		/* for strtok() */
diff --git a/sci-misc/gt-itm/gt-itm-19961004-r2.ebuild b/sci-misc/gt-itm/gt-itm-19961004-r3.ebuild
similarity index 55%
rename from sci-misc/gt-itm/gt-itm-19961004-r2.ebuild
rename to sci-misc/gt-itm/gt-itm-19961004-r3.ebuild
index 295139f5bfc9..fb3284587034 100644
--- a/sci-misc/gt-itm/gt-itm-19961004-r2.ebuild
+++ b/sci-misc/gt-itm/gt-itm-19961004-r3.ebuild
@@ -1,15 +1,17 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
-inherit toolchain-funcs
+inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="Routines to generate / analyze graphs using models for internetwork topology"
 HOMEPAGE="http://www.cc.gatech.edu/fac/Ellen.Zegura/graphs.html
 		http://www.isi.edu/nsnam/ns/ns-topogen.html#gt-itm"
 SRC_URI="http://www.cc.gatech.edu/fac/Ellen.Zegura/gt-itm/gt-itm.tar.gz -> ${P}.tar.gz
 		http://www.isi.edu/nsnam/dist/sgb2ns.tar.gz -> sgb2ns-${PV}.tar.gz"
+S="${WORKDIR}/${PN}"
+S2="${WORKDIR}/sgb2ns"
 
 LICENSE="all-rights-reserved sgb2ns"
 SLOT="0"
@@ -20,10 +22,13 @@ IUSE="doc"
 DEPEND="dev-util/sgb"
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}/${PN}"
-S2="${WORKDIR}/sgb2ns"
+PATCHES=(
+	"${FILESDIR}"/${PN}-19961004-gentoo.patch
+	"${FILESDIR}"/${PN}-implicits.patch
+	"${FILESDIR}"/${PN}-19961004-Fix-build-with-Clang-16.patch
+	"${FILESDIR}"/${PN}-19961004-Fix-musl-build.patch
+)
 
-PATCHES=( "${FILESDIR}"/${PN}-implicits.patch )
 DOCS=( README docs/. )
 
 src_unpack() {
@@ -35,32 +40,16 @@ src_unpack() {
 }
 
 src_prepare() {
-	sed -ri -e '/^[[:alnum:]]+\.o:/d' \
-		-e 's|LIBS = -lm -lgb.*|LIBS = -lm -lgb|' \
-		-e 's/\$\(CC\)/& \$\(LDFLAGS\)/g' \
-		src/Makefile || die
-	sed -ri -e '/^SYS = -DSYSV/d' \
-		-e 's|LIBS = -lm -lgb.*|LIBS = -lm -lgb|' \
-		-e 's/\$\(CC\)/& \$\(LDFLAGS\)/g' \
-		"${S2}"/Makefile  || die
-
 	rm -f lib/* || die
 
-	while IFS="" read -d $'\0' -r file; do
-		sed -i -re 's|(\.\./)+bin/||g' "$file" || die
-	done < <(find sample-graphs/ -perm /a+x -type f -name 'Run*' -print0)
-
-	sed -i -e 's|sys/types.h|sys/param.h|' src/geog.c || die
-	sed -i -e '162 s/connected $/connected \\/' src/eval.c || die
-
-	# fix implicit function declarations
-	sed -i -e '/stdio.h/ a\#include <stdlib.h>' \
-		"${S2}/sgb2comns.c" "${S2}/sgb2hierns.c" || die
-	sed -i -e "s/<strings.h>/<string.h>/g" "${S2}/sgb2hierns.c" || die
+	cd "${WORKDIR}" || die
 	default
+	cd "${S}" || die
 }
 
 src_compile() {
+	append-cflags -std=gnu89
+
 	emake -C src CFLAGS="${CFLAGS} -I../include" LDFLAGS="${LDFLAGS}" \
 		CC="$(tc-getCC)"
 
@@ -70,11 +59,13 @@ src_compile() {
 
 src_install() {
 	dobin bin/*
+
 	einstalldocs
 	newdoc "${S2}"/README README.sgb2ns
+
 	if use doc; then
 		dodoc -r sample-graphs
 		dodoc "${S2}"/*.{tcl,gb}
-		docompress -x "/usr/share/doc/${PF}/sample-graphs"
+		docompress -x /usr/share/doc/${PF}/sample-graphs
 	fi
 }
diff --git a/sec-keys/Manifest.gz b/sec-keys/Manifest.gz
index c1c1fa361742..5ea69351d374 100644
Binary files a/sec-keys/Manifest.gz and b/sec-keys/Manifest.gz differ
diff --git a/sec-keys/openpgp-keys-python/Manifest b/sec-keys/openpgp-keys-python/Manifest
index 7a5ba73dd382..c44b60457ae6 100644
--- a/sec-keys/openpgp-keys-python/Manifest
+++ b/sec-keys/openpgp-keys-python/Manifest
@@ -1,7 +1,10 @@
 DIST 0d96df4d4110e5c43fbfb17f2d347ea6aa65421d.asc 9704 BLAKE2B 2639ab1b08b725d87048c963b9680e8fe0d84a3e56a57b519c3071b354b6826068f71a450484caa7b521b98bade8fb6ee85ffa65d1fb12f61df893607c97c82f SHA512 8bc92419736b0b0a363c4f28f37b083083e84b9e34113ad65b8696c44e8d45717a53569ee5b17cda38e6a5c51b15cc3d674cee3425959074e872351cf38e6ffb
+DIST Yhg1s.gpg 8638 BLAKE2B b7975f67e6254008efc917432872daeedbf71246990af83054dd35bf2dc18845ac68041fd4d8e6ca02bb4c537f199b06f9daad16701691749cccfc3e144dab94 SHA512 9fc8e9464447db1fd4d12aeae2fe0a578cc5151579968d0218aa08599d68e756f8e5401eb3b7a255ac747717de3e080d8a68fdcf8d8695d6bd2ebc1e02f13c2c
 DIST a035c8c19219ba821ecea86b64e628f8d684696d.asc 6884 BLAKE2B 3cb0826e3ccce466f7ccef5f6a2dcfa8a2c98cbb3b7bb067da220f57e0003197ef7b5efdd75f033e5818f701bcad7ca2eade0bd2ff1b8892a2a80e94e2fc5e44 SHA512 b54c02ae19f90e6a50b1b46e470ea8e0c07d5d7d2509ddc8303008837db37b275f4b951fa532c2d5c30f18951d160748e0e10406df16d66e09e3ec39a2f3d61c
 DIST c01e1cad5ea2c4f0b8e3571504c367c218add4ff.asc 11972 BLAKE2B 56a943a1a6f0ed45d7d891f22092d15ac13f0e31adf430f47e970e9f2a1d93223362c35e72e8e5107acab5fec345134980e4826a8a4cf50362faba3bfa340e8c SHA512 6d1bf0ae7bafb34aa7080bed468fcec09d9b279beeedcc91be6180e52026f1543e27f3fec159fafc38ab433af23c928bfd2fcae7571bd099170cdef9fefe0605
 DIST c9b104b3dd3aa72d7ccb1066fb9921286f5e1540.asc 3403 BLAKE2B 8be2e6de6dbd4150a9167ef12eff278107103e4962b6de409959c5cf03cf506ed64c0e1d735856db6e94b812390383f126de8b1fc440f34294adb4b1cbfa994c SHA512 d32322792fb4d1dc0c548ae7158c1c4e368d9c0fa62898f0b5f03b8d57a9497fbf8c5b2c0175027ea5f09afac36886fbb3cf89900c3d3e8f49de70a17228b6ce
+DIST e3ff2839c048b25c084debe9b26995e310250568-r1.asc 75979 BLAKE2B b9b02af8e03791335f2e3bdd783c2875aaf2f574dd79dc8556fa4af8df43a95feadd3abb97272709be819d4f164eb676783faa311eae1b4199ab2808ae1a67fe SHA512 469d51fe41a6487b854beab8a04b5f11ac5488ee23c3f30b0c20f38fd6f8bb63e456d1681eac9a5bd54a2202a4cdfe77c97498feb3129ef0556effb417855532
 DIST e3ff2839c048b25c084debe9b26995e310250568.asc 65279 BLAKE2B e689213feeef4bc210906feb6cb07eb9478fe8e4856d43a2bb899b0ae24a50b87a478c5ca8df9326cfb848d6502d4d5b8359b29335ff201300dc054253471958 SHA512 4935edb7fe0bd5072f12bc68b31bfb171f0b0dea65786ae3ff3aaa5101694990b67bc0198f84111cf694bdda5900966fd8d6faa32bc8441d3bd8c71a2fbc561a
 EBUILD openpgp-keys-python-20210121.ebuild 1214 BLAKE2B 070cd5eaf513623eba41b6db65c624f1da3e4a14a367fd97a11ef4b1e59f6f00d5a421fbb07df323307732fbb5923946cd98726c9218f10d46b395c5731692e9 SHA512 5d5223c58589818508705833f4b6bb14503076df00b85fd99fdedaf966759907c664f4c30c246aa9ebb1a8ea99a42f968858284834c2b76c1e79016319d35f09
+EBUILD openpgp-keys-python-20221025.ebuild 1247 BLAKE2B 944294ce43cd7f4fbbf35723cab7f29673a4f6724b76dbfa66c0433f4f690216b839b29443150ae6e580784adfefeff8110c2ca6fab79f65285a3a7e0ea2653c SHA512 7c9591f48e32836881485661caf256b341eb92f2d420865865617d6160a1335c8fbd6533a0af34afd5fbcedf9651cac3e669dcfdfbfab0a3dc246dfa28c3dd5c
 MISC metadata.xml 243 BLAKE2B 3c6936b8f9745e6fb81fda204eada4f73210288cdb19a90b1cf913ed01d6ee9155d4a69bc5dcaf8c69a21123339626610d7b57729981a9d10800b85501baa120 SHA512 50af947c4f1de2f27e6bd29010dda35e92d2e0477bfafcd4d44ab218d2a47788324aabad58b603ef5c30e69b382084e7dc3cecc581cc0ffbbdd71ed566772a44
diff --git a/sec-keys/openpgp-keys-python/openpgp-keys-python-20221025.ebuild b/sec-keys/openpgp-keys-python/openpgp-keys-python-20221025.ebuild
new file mode 100644
index 000000000000..8f7620aa3e20
--- /dev/null
+++ b/sec-keys/openpgp-keys-python/openpgp-keys-python-20221025.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="OpenPGP keys used to sign CPython releases"
+HOMEPAGE="https://www.python.org/downloads/"
+SRC_URI="
+	https://keybase.io/pablogsal/pgp_keys.asc?fingerprint=a035c8c19219ba821ecea86b64e628f8d684696d
+		-> a035c8c19219ba821ecea86b64e628f8d684696d.asc
+	https://keybase.io/ambv/pgp_keys.asc?fingerprint=e3ff2839c048b25c084debe9b26995e310250568
+		-> e3ff2839c048b25c084debe9b26995e310250568-r1.asc
+	https://keybase.io/nad/pgp_keys.asc?fingerprint=0d96df4d4110e5c43fbfb17f2d347ea6aa65421d
+		-> 0d96df4d4110e5c43fbfb17f2d347ea6aa65421d.asc
+	https://keybase.io/nad/pgp_keys.asc?fingerprint=c9b104b3dd3aa72d7ccb1066fb9921286f5e1540
+		-> c9b104b3dd3aa72d7ccb1066fb9921286f5e1540.asc
+	https://keybase.io/bp/pgp_keys.asc?fingerprint=c01e1cad5ea2c4f0b8e3571504c367c218add4ff
+		-> c01e1cad5ea2c4f0b8e3571504c367c218add4ff.asc
+	https://github.com/Yhg1s.gpg
+"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+
+S=${WORKDIR}
+
+src_install() {
+	local files=( ${A} )
+	insinto /usr/share/openpgp-keys
+	newins - python.org.asc < <(cat "${files[@]/#/${DISTDIR}/}")
+}
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index b553152cea09..f49bd4842399 100644
Binary files a/sys-apps/Manifest.gz and b/sys-apps/Manifest.gz differ
diff --git a/sys-apps/cpu-x/Manifest b/sys-apps/cpu-x/Manifest
index edac80f7772a..b4adf6986d9b 100644
--- a/sys-apps/cpu-x/Manifest
+++ b/sys-apps/cpu-x/Manifest
@@ -1,7 +1,9 @@
 DIST cpu-x-4.3.1.tar.gz 1846968 BLAKE2B bcf13a302ad108f76d3c170993385178e7b44123af6b6f3192960f69d8ee493719a408ef4e95ee82e4cbf3f151fe4dcb91a9fc9d4e53c1170c95a9ed2ad3417b SHA512 43e7bc4b82a15545e4c2f69f598a94706ef2c5f5594ff50763f71722d1b98e6dd56e907a4f35917500debf11522c5908dbebf51f515fe5a51af7282254210bc1
 DIST cpu-x-4.4.0.tar.gz 1873126 BLAKE2B f914152098effbebe6cae5cd6a2f9ae408b996c4dba7675f1eb991de107bfe7259d8615e647829155963fe93ea585b37486081450ac41e93939bf909f145e20c SHA512 57c960f6c3007455f4d36ccc6d500b18195b305b3d3bdbbdc4b6804f9c1219460c31f854f38d18a49b1c4c0b870970cfcfe6abae4e5c0cdc83e452c5614c13fb
 DIST cpu-x-4.5.0.tar.gz 1924637 BLAKE2B b35d56fa5c3f5873423b8cd8f0d04ab5e7d658b71c13e09539e5072eb4e449efdac553156d9fe207c9e4b40e2c196b82e305755def7b76a9406fd229481c639d SHA512 f3e11b10ef034206baa24edf78e02795c14a5f7013e11e15c81e1f6d23b67e354df8658f700359ea7f17d1ff855805da2620f3e3acf6f7ee928cc119783211ef
+DIST cpu-x-4.5.1.tar.gz 1916681 BLAKE2B cf0e14050a884cbd763fb5bfe56a93db4c3e4bf0322f55304d6fe09d5b38210ee4139641654aee205761d3327f1b498d0dc88640c6432c4a9b0c62193c0671da SHA512 25b2d51ae093c5cb607aa77e05be0f62df3dc1d2022d96a2cfe935fedcbe2f5f85d9da16e1df05377a7e02280365c165ee93a2c22d1e4364d008bd669a69b2ec
 EBUILD cpu-x-4.3.1.ebuild 1591 BLAKE2B c5c5ca7cabe763e00cbb3706a451106d3f152ef858f1165dace36e3fcf0dc97084ccea67059609de697d0c750e4eb0e81285f5e89a21aa26dfe1a20dc67a2a0d SHA512 fe5d85e92c3fab5f492f8c0a6898a9bb1c60e85a0fe7d9215faa452858b6840c02cef9e0deb199037deef05c570a6c94264038ef813007df7d3027f5fe780585
 EBUILD cpu-x-4.4.0.ebuild 1618 BLAKE2B 262163db92161350823a03d18ae9bc75d7a85749dacd0bd1f8cc549d085b8438b76909ab95dc33080a3adc02a326975c10d91356c03af92cca8269ccb5f70492 SHA512 cbf380227da50517af30d617347efd831952936c1aa2fbc0591631601268caef271fa9e643f7d302d1f35adb7d8a7d7054dcb694d0033c1b8e06a7844f761ac3
 EBUILD cpu-x-4.5.0.ebuild 1618 BLAKE2B 193f22540a1bd0720898e161ab43c3ec6c0fc6cff19f6e4788a6cf237cb739ba08a640a70ff46225d7d2357383abb99dca7d2012602af26e31e2399e5bef45c9 SHA512 45b72f7f519ace797780b5a807cd1a828eaf5e06537d9e4cacc87f9ecd00c9950cecc7ba97f1835fe59bd77051d93f9bc7a97a9a4ca82da22371c65bfffb59c1
+EBUILD cpu-x-4.5.1.ebuild 1618 BLAKE2B 193f22540a1bd0720898e161ab43c3ec6c0fc6cff19f6e4788a6cf237cb739ba08a640a70ff46225d7d2357383abb99dca7d2012602af26e31e2399e5bef45c9 SHA512 45b72f7f519ace797780b5a807cd1a828eaf5e06537d9e4cacc87f9ecd00c9950cecc7ba97f1835fe59bd77051d93f9bc7a97a9a4ca82da22371c65bfffb59c1
 MISC metadata.xml 2370 BLAKE2B edf7d35e28a2c5b60f8b6d6d7d616146c72fb937f07fe16e8d89f5e0522a4a8dfdbe838dcc1b9e57dea30f267e6e7e51b200a11f60b67ca528eb7851ad1b0a28 SHA512 026acb991c7a80c6ba84fe24b14ec7686ba9d389c94e9f6d2e25ff8c9cb8cd36fe795b571ccb02a0ae1335604d5074bf43373fbaa8388f9e6a446c326385f4a7
diff --git a/sys-apps/cpu-x/cpu-x-4.5.1.ebuild b/sys-apps/cpu-x/cpu-x-4.5.1.ebuild
new file mode 100644
index 000000000000..8ab527ec59d4
--- /dev/null
+++ b/sys-apps/cpu-x/cpu-x-4.5.1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN="CPU-X"
+
+inherit cmake gnome2-utils xdg
+
+DESCRIPTION="A Free software that gathers information on CPU, motherboard and more"
+HOMEPAGE="https://x0rg.github.io/CPU-X/"
+SRC_URI="https://github.com/X0rg/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+IUSE="+cpu force-libstatgrab +gpu +gui +ncurses +nls opencl +pci test"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	dev-libs/glib:2
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/pango
+	force-libstatgrab? ( sys-libs/libstatgrab )
+	!force-libstatgrab? ( sys-process/procps:= )
+	gui? ( >=x11-libs/gtk+-3.12:3 )
+	cpu? ( >=dev-libs/libcpuid-0.6.0:= )
+	gpu? ( >=media-libs/glfw-3.3
+		media-libs/libglvnd )
+	pci? ( sys-apps/pciutils )
+	ncurses? ( sys-libs/ncurses:=[tinfo] )
+	opencl? ( virtual/opencl )
+"
+
+DEPEND="
+	test? (
+		sys-apps/mawk
+		sys-apps/nawk
+	)
+
+	${COMMON_DEPEND}
+"
+
+BDEPEND="
+	dev-lang/nasm
+	nls? ( sys-devel/gettext )
+"
+
+RDEPEND="${COMMON_DEPEND}"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DFORCE_LIBSTATGRAB=$(usex force-libstatgrab)
+		-DWITH_GETTEXT=$(usex nls)
+		-DWITH_GTK=$(usex gui)
+		-DWITH_LIBCPUID=$(usex cpu)
+		-DWITH_LIBGLFW=$(usex gpu)
+		-DWITH_LIBPCI=$(usex pci)
+		-DWITH_LIBSTATGRAB=OFF
+		-DWITH_NCURSES=$(usex ncurses)
+		-DWITH_OPENCL=$(usex opencl)
+	)
+	use gui && mycmakeargs+=( -DGSETTINGS_COMPILE=OFF )
+
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/sys-apps/memtest86+/Manifest b/sys-apps/memtest86+/Manifest
index c6174424c800..c56862904d6b 100644
--- a/sys-apps/memtest86+/Manifest
+++ b/sys-apps/memtest86+/Manifest
@@ -10,7 +10,9 @@ AUX memtest86+-5.31b-no-clean.patch 570 BLAKE2B 99fcdc691c44b4c116878713e48ec505
 AUX memtest86+-5.31b-objcopy.patch 610 BLAKE2B a7a68cefbca249a2db578fa2d1eac2095ebe35f4fba67b6b44b1a85360fdac86a154585b6776ac95ac2963c773ccfcf4e8d828b2c1736bab2741f483626b61a6 SHA512 ad55e5448e70db93a19801cb6dd7cddfd4bf52d9d11582ba00335e59906cb8ee9165b828e59a1ecd1b0ddb2a52aff7165803d69c2ad3984a18ff07f069d36ea1
 AUX memtest86+-5.31b-test-random-cflags.patch 636 BLAKE2B ab14809232dfdb0475fa8d54daca34ad53a6eee0f7ce2592acfc60a60bf0c8f08adacc82ed67ae8e7ae7faa995d9b6efa0d0ea3cf0df33f5cda1a606a7e0d987 SHA512 98965cfe1ec90f5dee115da406609cd85651e09b9914232b717a3b8755b4c10b05f58ed08c8a470b2bd772f1ef4d93faf63516f902a0b48b9c33974eba4733a1
 DIST memtest86+-5.31b.tar.gz 227779 BLAKE2B 14aced912bb84115278a3aff7650a3571918b823335aaf7d09880ef10374c320f64878765d93d2ee5a75e2b33ef6c9c4886a9a168955bd77c668f06f5c86a6ca SHA512 ad5891fd0c430ce7a5d0cde2d10dee20b66ad8060d47c3e70e038461d9cde3a78dfc13442b5b09da7c662741945a670353c72dbc08fd5ee8bae82256001a9541
+DIST memtest86+-6.00.tar.gz 224187 BLAKE2B bba26dab7165239fe95dc7f174e5f876f47421008ca6201bc57549598f512df56a6a0ca71f8c2c26c01188d243b58ab6ddd525cf01f0dece0cdb61a6acf38685 SHA512 7538afb9e894fbb0f57d40e6d05016beb157648a67dc2d081754e5c03f17a7a5f6adb0c3385c524c0f66d5c90c87a0d7267994d0b1c2b30a3ccac4f99fc6e4af
 DIST memtest86+-6.00_beta3.tar.gz 221103 BLAKE2B 37910d96d3c2eefe7c17495fb8aae5e81f8751eae50f6523c1235090225901f09da4373cd3ca00a6b2b736f90ba197bb0974000c3aa65b596683863c7952a3b6 SHA512 d3208d0b191d63ec01747d499d03f04f2a95128fd49f141be8a11ec53f2fe8a1a42247a80890a33bb83179134876d3e0fc882d77cb36c1cb86bc2a643632eb25
 EBUILD memtest86+-5.31b-r3.ebuild 2858 BLAKE2B 47a6e5a68e77f6425b7761d5cc18378a13bc6f6b3febb2624277fa3bf24374e69265ab0c97a3854abbfa5acd96f984b2d1392acb29fb3cda37357370d57067c8 SHA512 8c8846addd0db5093b384c36a74eea8e853e66b174c7f9930d9a61abc71c41cdaf5e1967b01eaad77af68a4f81b7687517e0b23e26f26cd11ae104da0c49e881
+EBUILD memtest86+-6.00.ebuild 1730 BLAKE2B f3f7efb95a02123ce0af742f0a8f6a214e2e8d80d2338cdf4d59e16923fe5982ca41e13b3108d35d8bc559862655d8bf58501582813802d35c8899b715119a70 SHA512 f34ff95cba1c9ecc773511d7fb8480a1d9e4f368b49b22c5904fb90f5c095a6bd9369ea766fc72e851cb4d57761680f943d991f5793e9170278b23d0660c04d2
 EBUILD memtest86+-6.00_beta3.ebuild 1730 BLAKE2B f3f7efb95a02123ce0af742f0a8f6a214e2e8d80d2338cdf4d59e16923fe5982ca41e13b3108d35d8bc559862655d8bf58501582813802d35c8899b715119a70 SHA512 f34ff95cba1c9ecc773511d7fb8480a1d9e4f368b49b22c5904fb90f5c095a6bd9369ea766fc72e851cb4d57761680f943d991f5793e9170278b23d0660c04d2
-MISC metadata.xml 944 BLAKE2B fd7d12b3e27ea5dfa0ebf56502faf2bf43222f9a070fc718c7e983a03afb2cde239f71d5a45947548435005dc72faeff4d8b850f38a64f57f7def5f098896ac6 SHA512 e64965365707ad5c830fb07f4ed2a2c54dcf7703b5b898d24c87ea7c082312ac30277abb77af643c9a7c021c56578de0d8b9b2f12cb01017b68ddf61885a13d4
+MISC metadata.xml 1033 BLAKE2B 1de0b3113db89962f9566a73eb6aae90d5faf62502910020292a72baaf2a068f03866db231e9b927ea484b20606b726c417f8a8882ba0eae0e82352f8b76a1ed SHA512 6f45ad3578993ffb1e6ec76075b2d3047a9a69f8893e30dbe6a7fe6345d25b3a448495a3374c369c948e1d01d7fbde1e667507d8aeb5273513a0898d1715942e
diff --git a/sys-apps/memtest86+/memtest86+-6.00.ebuild b/sys-apps/memtest86+/memtest86+-6.00.ebuild
new file mode 100644
index 000000000000..eb5778e25fdf
--- /dev/null
+++ b/sys-apps/memtest86+/memtest86+-6.00.ebuild
@@ -0,0 +1,78 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit mount-boot toolchain-funcs
+
+MY_PV=${PV/_/-}
+
+DESCRIPTION="Memory tester based on PCMemTest"
+HOMEPAGE="https://www.memtest.org/"
+SRC_URI="https://github.com/memtest86plus/memtest86plus/archive/refs/tags/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="bios32 bios64 +boot efi32 efi64 iso32 iso64"
+
+ISODEPS="
+	dev-libs/libisoburn
+	sys-fs/dosfstools
+	sys-fs/mtools
+"
+BDEPEND="
+	iso32? ( ${ISODEPS} )
+	iso64? ( ${ISODEPS} )
+"
+
+S=${WORKDIR}/memtest86plus-${MY_PV}
+
+src_prepare() {
+	sed -i \
+		-e 's#/sbin/mkdosfs#mkfs.vfat#' \
+		-e 's/^AS = as/AS +=/' \
+		-e '/^CC/d' \
+		-e 's/objcopy/$(OBJCOPY)/' \
+		-e 's/shell size/shell $(SIZE)/' \
+		build{32,64}/Makefile || die
+	default
+}
+
+src_compile() {
+	tc-export OBJCOPY
+	export SIZE=$(tc-getPROG SIZE size)
+	pushd build32
+		use bios32 && emake memtest.bin
+		use efi32 && emake memtest.efi
+		use iso32 && emake iso
+	popd
+
+	pushd build64
+		use bios64 && emake memtest.bin
+		use efi64 && emake memtest.efi
+		use iso64 && emake iso
+	popd
+}
+
+install_memtest_images() {
+	use bios32 && newins build32/memtest.bin memtest32.bios
+	use bios64 && newins build64/memtest.bin memtest64.bios
+	use efi32 && newins build32/memtest.efi memtest.efi32
+	use efi64 && newins build64/memtest.efi memtest.efi64
+}
+
+src_install() {
+	default
+	if use boot; then
+		exeinto /etc/grub.d/
+		newexe "${FILESDIR}"/39_memtest86+-r2 39_memtest86+
+		insinto /boot/memtest86plus
+		install_memtest_images
+	fi
+
+	insinto /usr/share/${PN}
+	install_memtest_images
+	use iso32 && newins build32/memtest.iso memtest32.iso
+	use iso64 && newins build64/memtest.iso memtest64.iso
+}
diff --git a/sys-apps/memtest86+/metadata.xml b/sys-apps/memtest86+/metadata.xml
index dd0c79050ba4..814c43bc7044 100644
--- a/sys-apps/memtest86+/metadata.xml
+++ b/sys-apps/memtest86+/metadata.xml
@@ -17,4 +17,7 @@
 	<flag name="iso64">Compile a 64bit ISO image</flag>
 	<flag name="serial">Compile with serial console support</flag>
 </use>
+<upstream>
+	<remote-id type="github">memtest86plus/memtest86plus</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/sys-apps/most/Manifest b/sys-apps/most/Manifest
index 6faa5940ca5b..b534edfcaac3 100644
--- a/sys-apps/most/Manifest
+++ b/sys-apps/most/Manifest
@@ -2,4 +2,4 @@ AUX most-5.0.0a-donot-hardcode-path.patch 969 BLAKE2B 1089149fc01a3081760f422b73
 AUX most-5.1.0-fix-parallel-build.patch 761 BLAKE2B b2aeb5019305138ee0ac816c07595afcf95c07f7d3f477ace41931fcb85706909813056f9291d5002e2e583fdd3baec34f09b153a9d736e0009d3d7f6f4cf524 SHA512 492ebbc35c4a94514c252541a644c45b4904ad402fa0c45da03f9acb529dfdf46576429b67352cfde9defd76b772aa12ecd449f461b3f995a4d00f9ed63692c5
 DIST most-5.1.0.tar.gz 162172 BLAKE2B a3c0f3d85e7c4f4a014c174efb0d3d22b0fc2758e403ddccc74308399eeec616800e16db33554f0ca53fba674efba9dd93d51ed0c3f887b2c24fd3dd2335387c SHA512 cbc090283bbaafb8ffee9d6d1abc7b49cd58d54b742cf8dc86274351dee6398d1f24841bd1631ac40f861ad9e23569646133d3297317d9d514a7a38dd74533d2
 EBUILD most-5.1.0.ebuild 917 BLAKE2B 14508a5b03c06d1fa4f94eb5b25710dfd6ebab34de570b360fc9cc3150fd1309d1d5ba39913ae1fce96af420fa416db6cda271ebcf2c29863a27555d7bd57c50 SHA512 87941a9e5a52f001519074a5e22146e453a253736bf0cf22939d4f6e6876df77e898951e8ed0ea22535bf98ad8e8c1dde4265027f99b22568831208a168cea6e
-MISC metadata.xml 272 BLAKE2B a253052dbe7dfd2dea2cdc3692698a5a94d0e2414979a348d56448cee6329b7fe29a1f252146f9ff04c1ea3b270996631395ecea454ac901eb726dc0b4dd9f29 SHA512 247c1006dd352c3cc7ee07dee2f283394767bdc0f72f0438a6cc845ac53549c05b3741c64ffedb992f003759e67f24aaa7121561db97d1b095c11269115746dc
+MISC metadata.xml 353 BLAKE2B 20b4dc12fbe79c13693505e5b0861b89c10f7e89fe0e616550f5e74fb19049b3a7037fc05695ad6c0f29638251d53a9adab2a50c0216da6d77a1b45b1eace811 SHA512 a91058c3bbe915315fe012250d3c9f7be38d7f9a19980cc2df2ccfb102c82ab2eeb8931b47d7350363149a6302dd3d75128d9cf48237f55fbc866155440614e9
diff --git a/sys-apps/most/metadata.xml b/sys-apps/most/metadata.xml
index df1ea8d84522..cf737a0a8f1a 100644
--- a/sys-apps/most/metadata.xml
+++ b/sys-apps/most/metadata.xml
@@ -5,4 +5,7 @@
     <email>shell-tools@gentoo.org</email>
     <name>Gentoo Shell Tools Project</name>
   </maintainer>
+  <upstream>
+    <remote-id type="github">jedsoft/most</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest
index 1c8214df5508..a705a20ca552 100644
--- a/sys-apps/openrc/Manifest
+++ b/sys-apps/openrc/Manifest
@@ -1,10 +1,6 @@
 AUX openrc.logrotate 43 BLAKE2B 0587cd211767937fd6273e6b159271490443a94d80a54b5a20ef625a1959e77dbf38cd1756838337fb39a061c4ee19a39cccd2f5867fab9f04fb916a74029aaa SHA512 12bb6354e808fbf47bbab963de55ee7901738b4a912659982c57ef2777fff9a670e867fcb8ec316a76b151032c92dc89a950d7d1d835ef53f753a8f3b41d2cec
 AUX start-stop-daemon.pam 63 BLAKE2B df39a1a12fe09dbbc0746eac67035d9e6d4a63323f6c937ef3888c70787354128e415b3c1c8bccccec0c987b3e789711cd1ddaba55e9b53a7f67b332c4ca9d5b SHA512 85cf440611b8f87f51bf24bdd9fa03639a75b950f00096d81b8826c21ae85ff9784b8c56b8ddb482e70f08bce933d4561b30750346d51fb2cef3be34acc065cb
-DIST openrc-0.44.10.tar.gz 254298 BLAKE2B 3cfecc27b560b8bb60d2104ab3dcf176b98677b65b829fa403ad2eb0e2e8bb0d586d374c336328a07c2f35e3abcb3f897cf5df142540a60fc09883aabd0ac79d SHA512 0e41f5268c6b8c325a6773511ca58c38ba52a1987aa47165794df8a99359bd1bfcb99d30e0d129b9242a2661663234f6f85c92c55c891dbb6c5b8a11d93edea4
-DIST openrc-0.45.1.tar.gz 246503 BLAKE2B 28ed668b1da7bc3d22de1f7b22b6d10ecd1c789eb5c017803754fa8f6197ee4a7b179728064fa31d4b9dd0d15e3332c4bb839bd56ac5abb39b5b772b53394e8a SHA512 340661c6f8fc60dd7fbbe4a84aaeb0a9a7337577e6d98698c34db3c160890780376587ca6f803563fec53e852593265a28c307fa38a5f71a3e48c62cd63611a1
 DIST openrc-0.45.2.tar.gz 246515 BLAKE2B bb7d52b183612eb8924a2d0f9ec63eea88253d8d83964d6341a4715a6cdc372b3fd99ad0f972f4f539da9d741548777dabf4ced86fd20be741a89a69ffe2ff01 SHA512 ca2958772240f6e5037e39db1ee62a81091a2efa654da967f68e03a721868c6c0a41d32a2bddf55c8eadbc9bf5837b710cc2e4564844a7fbc0e585366da4fdf9
-EBUILD openrc-0.44.10-r1.ebuild 4750 BLAKE2B 72d71899b503eda5b0673c336d6ba77f6cd89022c7a255533177ad2a1e077e02936cfc0fdf5b741b78d09d351169eb76dfbdce9a6ff30756a8d13dd56254c48a SHA512 988ffcecb76c32f48837ca088986277fed3ae389532c2fc3b945ade57dc0cf15829d46c907459bc8e3b515f45df0fe4e0b5077419bdccbc49cf7f9d1b6caeb38
-EBUILD openrc-0.45.1-r1.ebuild 4553 BLAKE2B f806b0547ff994c52c342715043d2f0c7fff2a6dfe61151e58c0bb46a40afae03ce3d5c0e45220b89c89f70018981d97390a181603a134447169d1ade94aea3b SHA512 5215b2129a086deefc099f802329189faf219feab85897ced9b47d4c31405e64ca85d98ca9a1218ddb671204e5678c60a02c9551c7a8ff57d5c4681a4ec7a973
 EBUILD openrc-0.45.2-r1.ebuild 4545 BLAKE2B 5a65659d046e2db4e79d66baad7731bfe49e9c96d208f6e3279b68f4e644b62a839438fc47afd5d46485044ddad027571d1bc74a01db88e046a42b1fdd004cd7 SHA512 7b3b7ddae45ca7dddacc1831abee689364b71d35a74a6e466a6c44fdce62dcedc7d4be4b960bbbd3f90e51bd4685bd7e423788a812b9caf26a470d283b5eb9b0
 EBUILD openrc-9999.ebuild 4553 BLAKE2B f806b0547ff994c52c342715043d2f0c7fff2a6dfe61151e58c0bb46a40afae03ce3d5c0e45220b89c89f70018981d97390a181603a134447169d1ade94aea3b SHA512 5215b2129a086deefc099f802329189faf219feab85897ced9b47d4c31405e64ca85d98ca9a1218ddb671204e5678c60a02c9551c7a8ff57d5c4681a4ec7a973
 MISC metadata.xml 707 BLAKE2B 713b69a4e4d6a61051c9f6dfda46da3afa62c590c62b4f371f3949140eaecfa665a977091ac858bff99380dfc3758038ee6a96b0c8b88c142e2e751b20318fba SHA512 5260e1aec8973d42bf059b1f20b3a5f95b98608efeac614d46b20d774a3453c25348cea4a45d745abe829ad016dbc524080c482c1666032e969e08fefe1efc37
diff --git a/sys-apps/openrc/openrc-0.44.10-r1.ebuild b/sys-apps/openrc/openrc-0.44.10-r1.ebuild
deleted file mode 100644
index 0b4f7fad7c7f..000000000000
--- a/sys-apps/openrc/openrc-0.44.10-r1.ebuild
+++ /dev/null
@@ -1,174 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic meson pam toolchain-funcs
-
-DESCRIPTION="OpenRC manages the services, startup and shutdown of a host"
-HOMEPAGE="https://github.com/openrc/openrc/"
-
-if [[ ${PV} =~ ^9{4,}$ ]]; then
-	EGIT_REPO_URI="https://github.com/OpenRC/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/OpenRC/openrc/archive/${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-fi
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="audit bash debug ncurses pam newnet +netifrc selinux sysv-utils unicode"
-
-COMMON_DEPEND="
-	ncurses? ( sys-libs/ncurses:0= )
-	pam? ( sys-libs/pam )
-	audit? ( sys-process/audit )
-	sys-process/psmisc
-	!<sys-process/procps-3.3.9-r2
-	selinux? (
-		sys-apps/policycoreutils
-		>=sys-libs/libselinux-2.6
-	)
-	!<sys-apps/baselayout-2.1-r1
-	!<sys-fs/udev-init-scripts-27"
-DEPEND="${COMMON_DEPEND}
-	virtual/os-headers
-	ncurses? ( virtual/pkgconfig )"
-RDEPEND="${COMMON_DEPEND}
-	bash? ( app-shells/bash )
-	!prefix? (
-		sysv-utils? (
-			!sys-apps/systemd[sysv-utils(-)]
-			!sys-apps/sysvinit
-		)
-		!sysv-utils? (
-			|| (
-				>=sys-apps/sysvinit-2.86-r6[selinux?]
-				sys-apps/s6-linux-init[sysv-utils(-)]
-			)
-		)
-		virtual/tmpfiles
-	)
-	selinux? (
-		>=sec-policy/selinux-base-policy-2.20170204-r4
-		>=sec-policy/selinux-openrc-2.20170204-r4
-	)
-	!<app-shells/gentoo-bashcomp-20180302
-	!<app-shells/gentoo-zsh-completions-20180228
-"
-
-PDEPEND="netifrc? ( net-misc/netifrc )"
-
-src_configure() {
-	local emesonargs=(
-	$(meson_feature audit)
-	"-Dbranding=\"Gentoo Linux\""
-		$(meson_use newnet)
-		-Dos=Linux
-		$(meson_use pam)
-		$(meson_feature selinux)
-		-Drootprefix="${EPREFIX}"
-		-Dshell=$(usex bash /bin/bash /bin/sh)
-		$(meson_use sysv-utils sysvinit)
-		-Dtermcap=$(usev ncurses)
-	)
-	# export DEBUG=$(usev debug)
-	meson_src_configure
-}
-
-# set_config <file> <option name> <yes value> <no value> test
-# a value of "#" will just comment out the option
-set_config() {
-	local file="${ED}/$1" var=$2 val com
-	eval "${@:5}" && val=$3 || val=$4
-	[[ ${val} == "#" ]] && com="#" && val='\2'
-	sed -i -r -e "/^#?${var}=/{s:=([\"'])?([^ ]*)\1?:=\1${val}\1:;s:^#?:${com}:}" "${file}"
-}
-
-set_config_yes_no() {
-	set_config "$1" "$2" YES NO "${@:3}"
-}
-
-src_install() {
-	meson_install
-
-	keepdir /lib/rc/tmp
-
-	# Setup unicode defaults for silly unicode users
-	set_config_yes_no /etc/rc.conf unicode use unicode
-
-	# Cater to the norm
-	set_config_yes_no /etc/conf.d/keymaps windowkeys '(' use x86 '||' use amd64 ')'
-
-	# On HPPA, do not run consolefont by default (bug #222889)
-	if use hppa; then
-		rm -f "${ED}"/etc/runlevels/boot/consolefont
-	fi
-
-	# Support for logfile rotation
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/openrc.logrotate openrc
-
-	if use pam; then
-		# install gentoo pam.d files
-		newpamd "${FILESDIR}"/start-stop-daemon.pam start-stop-daemon
-		newpamd "${FILESDIR}"/start-stop-daemon.pam supervise-daemon
-	fi
-
-	# install documentation
-	dodoc ChangeLog *.md
-}
-
-pkg_preinst() {
-	# avoid default thrashing in conf.d files when possible #295406
-	if [[ -e "${EROOT}"/etc/conf.d/hostname ]] ; then
-		(
-		unset hostname HOSTNAME
-		source "${EROOT}"/etc/conf.d/hostname
-		: ${hostname:=${HOSTNAME}}
-		[[ -n ${hostname} ]] && set_config /etc/conf.d/hostname hostname "${hostname}"
-		)
-	fi
-
-	# set default interactive shell to sulogin if it exists
-	set_config /etc/rc.conf rc_shell /sbin/sulogin "#" test -e /sbin/sulogin
-	return 0
-}
-
-pkg_postinst() {
-	if use hppa; then
-		elog "Setting the console font does not work on all HPPA consoles."
-		elog "You can still enable it by running:"
-		elog "# rc-update add consolefont boot"
-	fi
-
-	if ! use newnet && ! use netifrc; then
-		ewarn "You have emerged OpenRc without network support. This"
-		ewarn "means you need to SET UP a network manager such as"
-		ewarn "	net-misc/netifrc, net-misc/dhcpcd, net-misc/connman,"
-		ewarn " net-misc/NetworkManager, or net-vpn/badvpn."
-		ewarn "Or, you have the option of emerging openrc with the newnet"
-		ewarn "use flag and configuring /etc/conf.d/network and"
-		ewarn "/etc/conf.d/staticroute if you only use static interfaces."
-		ewarn
-	fi
-
-	if use newnet && [ ! -e "${EROOT}"/etc/runlevels/boot/network ]; then
-		ewarn "Please add the network service to your boot runlevel"
-		ewarn "as soon as possible. Not doing so could leave you with a system"
-		ewarn "without networking."
-		ewarn
-	fi
-
-	# added to handle downgrading from 0.45 (2022-06-08)
-	for v in ${REPLACING_VERSIONS}; do
-		[[ -x $(type rc-update) ]] || continue
-		if ver_test $v -gt 0.44.10; then
-			if rc-update show boot | grep -q seedrng; then
-				rc-update del seedrng boot
-				rc-update add urandom boot
-		fi
-		fi
-	done
-}
diff --git a/sys-apps/openrc/openrc-0.45.1-r1.ebuild b/sys-apps/openrc/openrc-0.45.1-r1.ebuild
deleted file mode 100644
index ade72444e317..000000000000
--- a/sys-apps/openrc/openrc-0.45.1-r1.ebuild
+++ /dev/null
@@ -1,169 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit meson pam
-
-DESCRIPTION="OpenRC manages the services, startup and shutdown of a host"
-HOMEPAGE="https://github.com/openrc/openrc/"
-
-if [[ ${PV} =~ ^9{4,}$ ]]; then
-	EGIT_REPO_URI="https://github.com/OpenRC/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/OpenRC/openrc/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-fi
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="audit bash debug ncurses pam newnet +netifrc selinux sysv-utils unicode"
-
-COMMON_DEPEND="
-	ncurses? ( sys-libs/ncurses:0= )
-	pam? ( sys-libs/pam )
-	audit? ( sys-process/audit )
-	sys-process/psmisc
-	selinux? (
-		sys-apps/policycoreutils
-		>=sys-libs/libselinux-2.6
-	)"
-DEPEND="${COMMON_DEPEND}
-	virtual/os-headers
-	ncurses? ( virtual/pkgconfig )"
-RDEPEND="${COMMON_DEPEND}
-	bash? ( app-shells/bash )
-	!prefix? (
-		sysv-utils? (
-			!sys-apps/systemd[sysv-utils(-)]
-			!sys-apps/sysvinit
-		)
-		!sysv-utils? (
-			|| (
-				>=sys-apps/sysvinit-2.86-r6[selinux?]
-				sys-apps/s6-linux-init[sysv-utils(-)]
-			)
-		)
-		virtual/tmpfiles
-	)
-	selinux? (
-		>=sec-policy/selinux-base-policy-2.20170204-r4
-		>=sec-policy/selinux-openrc-2.20170204-r4
-	)
-"
-
-PDEPEND="netifrc? ( net-misc/netifrc )"
-
-src_configure() {
-	local emesonargs=(
-	$(meson_feature audit)
-	"-Dbranding=\"Gentoo Linux\""
-		$(meson_use newnet)
-		-Dos=Linux
-		$(meson_use pam)
-		$(meson_feature selinux)
-		-Drootprefix="${EPREFIX}"
-		-Dshell=$(usex bash /bin/bash /bin/sh)
-		$(meson_use sysv-utils sysvinit)
-		-Dtermcap=$(usev ncurses)
-	)
-	# export DEBUG=$(usev debug)
-	meson_src_configure
-}
-
-# set_config <file> <option name> <yes value> <no value> test
-# a value of "#" will just comment out the option
-set_config() {
-	local file="${ED}/$1" var=$2 val com
-	eval "${@:5}" && val=$3 || val=$4
-	[[ ${val} == "#" ]] && com="#" && val='\2'
-	sed -i -r -e "/^#?${var}=/{s:=([\"'])?([^ ]*)\1?:=\1${val}\1:;s:^#?:${com}:}" "${file}"
-}
-
-set_config_yes_no() {
-	set_config "$1" "$2" YES NO "${@:3}"
-}
-
-src_install() {
-	meson_install
-
-	keepdir /lib/rc/tmp
-
-	# Setup unicode defaults for silly unicode users
-	set_config_yes_no /etc/rc.conf unicode use unicode
-
-	# Cater to the norm
-	set_config_yes_no /etc/conf.d/keymaps windowkeys '(' use x86 '||' use amd64 ')'
-
-	# On HPPA, do not run consolefont by default (bug #222889)
-	if use hppa; then
-		rm -f "${ED}"/etc/runlevels/boot/consolefont
-	fi
-
-	# Support for logfile rotation
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/openrc.logrotate openrc
-
-	if use pam; then
-		# install gentoo pam.d files
-		newpamd "${FILESDIR}"/start-stop-daemon.pam start-stop-daemon
-		newpamd "${FILESDIR}"/start-stop-daemon.pam supervise-daemon
-	fi
-
-	# install documentation
-	dodoc *.md
-}
-
-pkg_preinst() {
-	# avoid default thrashing in conf.d files when possible #295406
-	if [[ -e "${EROOT}"/etc/conf.d/hostname ]] ; then
-		(
-		unset hostname HOSTNAME
-		source "${EROOT}"/etc/conf.d/hostname
-		: ${hostname:=${HOSTNAME}}
-		[[ -n ${hostname} ]] && set_config /etc/conf.d/hostname hostname "${hostname}"
-		)
-	fi
-
-	# set default interactive shell to sulogin if it exists
-	set_config /etc/rc.conf rc_shell /sbin/sulogin "#" test -e /sbin/sulogin
-	return 0
-}
-
-pkg_postinst() {
-	if use hppa; then
-		elog "Setting the console font does not work on all HPPA consoles."
-		elog "You can still enable it by running:"
-		elog "# rc-update add consolefont boot"
-	fi
-
-	if ! use newnet && ! use netifrc; then
-		ewarn "You have emerged OpenRc without network support. This"
-		ewarn "means you need to SET UP a network manager such as"
-		ewarn "	net-misc/netifrc, net-misc/dhcpcd, net-misc/connman,"
-		ewarn " net-misc/NetworkManager, or net-vpn/badvpn."
-		ewarn "Or, you have the option of emerging openrc with the newnet"
-		ewarn "use flag and configuring /etc/conf.d/network and"
-		ewarn "/etc/conf.d/staticroute if you only use static interfaces."
-		ewarn
-	fi
-
-	if use newnet && [ ! -e "${EROOT}"/etc/runlevels/boot/network ]; then
-		ewarn "Please add the network service to your boot runlevel"
-		ewarn "as soon as possible. Not doing so could leave you with a system"
-		ewarn "without networking."
-		ewarn
-	fi
-
-	# added for 0.45 to handle seedrng/urandom switching (2022-06-07)
-	for v in ${REPLACING_VERSIONS}; do
-		[[ -x $(type rc-update) ]] || continue
-		if ver_test $v -lt 0.45; then
-			if rc-update show boot | grep -q urandom; then
-				rc-update del urandom boot
-				rc-update add seedrng boot
-		fi
-		fi
-	done
-}
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index ab877f9c4c0d..e048b5c1709d 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,7 +1,7 @@
 AUX README.RESCUE 134 BLAKE2B 2cd153e0077388f29e11779670086c50fb1a470b9bb76969a747313021bb85c37b20327ab2feb9b2cc715849245875e7d8a5ae6ceee84b4a33d532996cb793bd SHA512 0df49e479e551648519ea4db0986584463eed498f77b133bd0e517389e71f4ff4069f1a5017c39f349bae62baa2ac32d968048c396261a9045ff00a0e5aa8bf4
 AUX portage-ccache.conf 60 BLAKE2B b45ac69ba4bf6b221191ab9618aa484948ad8765ae906402e83df4b72fd10e006621523fe5b6d59219318a978e368649047784bb85771cd189b2542a2e19f941 SHA512 36427e57046118ecf982fc3b1a80a3543b5682e3eef7df5dfc8a50b261a5da56f997dd75f63c5194049aceea204c37aee638a3bc383b9f7a0eff8ac9c35f3b1c
-AUX portage-tmpdir.conf 40 BLAKE2B fb03a5dcce146168c991d81d9e0988b3085c8fdc7fae00c20988a58d9b7a0583a15f42747533b29e84fac312d19265e0bcc27088ba50dbf48336522843518f01 SHA512 722aa68625a5fa4f9e60d10b69ec42fa7b6c51aac10b247420bfce69d2cfff50ffa6d0ecd359af6adf409c4681854852421b868ddcbd6f9fd6d9be9b23989a44
+AUX portage-tmpdir.conf 76 BLAKE2B 79f35df57dbdcd461d94d558212261df7df54253d5205b40a0a0640ce2a7ae553a84d7aa8d8c11a776cac44b7573b842951ec11f8ab393145edb1786d6837e79 SHA512 4810d8ae1f8291d34b756897972841d30d5f50b48597a430cb8ddb102dab07a7f0d78c3901b6fdd6763180e92b5ae90a3cb88ae5a5c1cae845b23b49d03a87fd
 DIST portage-3.0.38.1.tar.bz2 1116216 BLAKE2B d1cb4cc1924673d07ea7174ad0a84b3af977dd28ca659695d3e4014e4aa83b054acba82a160e7c0a8d3d4fbc3514bea619c3d720e450cb4890818e4b1bc1e43a SHA512 1375565e936276fd6cfd2a4f6f782b91e234e973d6a998f2276a076dd165272bcf12067fd01e77b238f194eac69edf967bbe3ac62edc3701fe9375c693622ab9
-EBUILD portage-3.0.38.1-r1.ebuild 8779 BLAKE2B a8ddc97040cf50ead0242077badd51673e8ddf2e4daf8169858d71985e34eb03e79a2aac8ecb08130e3cb313365c37e1a48f3025c176a06f764ab80405ef6de9 SHA512 1aa325bfb8d92f97400750fba1675507a3a39bfe20bafabb1c9c46f1e27e5328cfa8d1e54af8891754025b50824099c0ef011347de6896df893b8b92dc679321
+EBUILD portage-3.0.38.1-r2.ebuild 8779 BLAKE2B a8ddc97040cf50ead0242077badd51673e8ddf2e4daf8169858d71985e34eb03e79a2aac8ecb08130e3cb313365c37e1a48f3025c176a06f764ab80405ef6de9 SHA512 1aa325bfb8d92f97400750fba1675507a3a39bfe20bafabb1c9c46f1e27e5328cfa8d1e54af8891754025b50824099c0ef011347de6896df893b8b92dc679321
 EBUILD portage-9999.ebuild 8027 BLAKE2B dcca51396bb7f1b4239ef6ac4b9ef5b0dab1f5066311d64e452582c277e93cead914ab454a4ff8eb0673ad031a92a4994f15fa6a5219e611eb07b9d84af2a277 SHA512 ddbb34220d7f62756eace84ebd6b41382218a66ae992748ac99e76128016423342a0c5cfb972513805d204180ba69276434060a29649fd035d7aee1817f70574
 MISC metadata.xml 1487 BLAKE2B 5b9833e8bfc2c38e4db95f2368a65d85623aa8dd166e4e09bed4cbe3a7e59d47da69a9dff1e6615fd64f349cc05f57217ee61ebfd23e3e13622a7573ea135659 SHA512 b22f8c1f3a4dce636d0f823f1303f60d32fd570b484e93a64dfbdcbe145534b3472ae94c1ac992a478c9e2930fbc8a5311e0080b4722f9b5dc29dff59ddaa7c8
diff --git a/sys-apps/portage/files/portage-tmpdir.conf b/sys-apps/portage/files/portage-tmpdir.conf
index 63a9bcf07097..4f6e20ccb521 100644
--- a/sys-apps/portage/files/portage-tmpdir.conf
+++ b/sys-apps/portage/files/portage-tmpdir.conf
@@ -1 +1,2 @@
 d /var/tmp/portage 0775 portage portage
+d /tmp/portage 0775 portage portage
diff --git a/sys-apps/portage/portage-3.0.38.1-r1.ebuild b/sys-apps/portage/portage-3.0.38.1-r2.ebuild
similarity index 100%
rename from sys-apps/portage/portage-3.0.38.1-r1.ebuild
rename to sys-apps/portage/portage-3.0.38.1-r2.ebuild
diff --git a/sys-apps/systemd-utils/Manifest b/sys-apps/systemd-utils/Manifest
index 4ee1f7bd29c8..8a1456c9a8c3 100644
--- a/sys-apps/systemd-utils/Manifest
+++ b/sys-apps/systemd-utils/Manifest
@@ -7,7 +7,9 @@ DIST systemd-musl-patches-251.2.tar.gz 28512 BLAKE2B 4ac6a5220dab8409962a3954af2
 DIST systemd-stable-251.4.tar.gz 11440203 BLAKE2B 58a0ee4adcc9d35b15b9cc98b3da81d1103b61a6c0bee722468a5113cd7d6de1d40c46ef964ba9ecc4746e81b516ae4b2f1d046874d62db066735c652592612e SHA512 7bbfadd80b88a4c3510a5e4e3572e4eab71dafbf6289da038e552988e09ee8da16da3c9bb8a4fbbde6c6236e0e3c352b0a33f9ee0b84f10241f3499383387738
 DIST systemd-stable-251.5.tar.gz 11444428 BLAKE2B 96df35dae789b11ead1960e1139046972a29c41f74ca800e0fafd84e6a8c238f8d4a30e2991ee94e07e866bc0c3137774ee116f276ac1203cca85254ccf91913 SHA512 2c645a694d45a2670920115529c5f34001153dafe26e5c4e65f8d1a37922a351569d056fc002f1af72dfc173988f93e11893460f64b497e3d5fc339083dcb2fa
 DIST systemd-stable-251.6.tar.gz 11448383 BLAKE2B 987ea88ea23662fd4119e3c796cc2e5f428fcce6cf0b033a5f8da7974c0026d41851f517e489354bbc22973b33c3932ac7280c56527f03a1fcbce3092148b638 SHA512 2da41ac7e939a893ada3ce682a6fe7dd326e8e0132221589da3d2b1d994e1a879118e0c6025f03351dac6567d754223a5f5401d64a5ca9256ab95512800370f8
+DIST systemd-stable-251.7.tar.gz 11448429 BLAKE2B 959ac7944d778c8e6d7a3c67ea6adc89e5e7ac1cc3b163e2af2a582211b91316da5ffba37b854978b7b2a5b3f9aae3651701a23e4391da6676e078747df1a37b SHA512 a4c06b2d25c47af58abb1e1dc85737b2fb0eb394f09d2bb7c6b7b716cb4b1383a145885bbc8e5ffcdc26611fd44d362fba2152c4dd0ead6a03a93965b82bb9a4
 EBUILD systemd-utils-251.4-r2.ebuild 12095 BLAKE2B 21014fadfa7a5ea04e2cabde58ff7a5c404c28feb224680309c49f3f056b2b0af92688d245f17f42896e71bd1e59879ed070c691dfadaaa29e90580a3a216038 SHA512 f3bb8010c6162fc601b95eebc297ae8f3f5256bd6a20c70423aec1c90854744c773f63affe3f610c3b28ab795f5579cfb45ec57f70cb5eb6121c4347a7f45e95
 EBUILD systemd-utils-251.5.ebuild 12004 BLAKE2B 813622adb081673984af0142e4fcec51259441bcc31d2cd2985cd93c31ab6790a82081469525b6e3a05e9fe17f9cc581f717903aefa267aeb5167edebf714521 SHA512 3cfc14f2d5d0570dc6be9d4ad1ad9ebcc17c59970e5840a02a84bda6d80f35b33facddd46554a1857ecc38fc6e69875681e292d57a2dc32205e4e2f88a377c54
 EBUILD systemd-utils-251.6.ebuild 12053 BLAKE2B 885efc6eacdee2839c1098a7a450eee58b7cd28eb4c1c09c58cf090c9ba6c6c9a887ffee96cde1131a8f5d3ac701bb02c0ed47581d7a4da75189237774a1c729 SHA512 c25c6088674b560130e7b113e376077c44e5eb622ab62e5c8211dd7c9d84efd97df82fd94d169bbbbf46f180203d042dad8d39b34773b33fb5294ad92ef934f9
+EBUILD systemd-utils-251.7.ebuild 12053 BLAKE2B 885efc6eacdee2839c1098a7a450eee58b7cd28eb4c1c09c58cf090c9ba6c6c9a887ffee96cde1131a8f5d3ac701bb02c0ed47581d7a4da75189237774a1c729 SHA512 c25c6088674b560130e7b113e376077c44e5eb622ab62e5c8211dd7c9d84efd97df82fd94d169bbbbf46f180203d042dad8d39b34773b33fb5294ad92ef934f9
 MISC metadata.xml 713 BLAKE2B 1dcb5d9949600c9a8c8ac0c005ffa03b2ca91293a932fa96092a24c094e9fb29f2cf063af041432c12daec4aa4e60d11ea77ed0a423e188095f995c68e75b91a SHA512 46d167a6d898abfc56130e373d232c18fb3ef8865755379fa7678c049515458e7354b7a8cab3bf3faa7326932cccceb0b0745b4695ab9bea492bc2344abf9da4
diff --git a/sys-apps/systemd-utils/systemd-utils-251.7.ebuild b/sys-apps/systemd-utils/systemd-utils-251.7.ebuild
new file mode 100644
index 000000000000..a59e868762b9
--- /dev/null
+++ b/sys-apps/systemd-utils/systemd-utils-251.7.ebuild
@@ -0,0 +1,525 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..11} )
+
+QA_PKGCONFIG_VERSION=$(ver_cut 1)
+
+inherit bash-completion-r1 flag-o-matic meson-multilib python-any-r1 toolchain-funcs udev usr-ldscript
+
+DESCRIPTION="Utilities split out from systemd for OpenRC users"
+HOMEPAGE="https://systemd.io/"
+
+if [[ ${PV} == *.* ]]; then
+	MY_P="systemd-stable-${PV}"
+	S="${WORKDIR}/${MY_P}"
+	SRC_URI="https://github.com/systemd/systemd-stable/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+else
+	MY_P="systemd-${PV}"
+	S="${WORKDIR}/${MY_P}"
+	SRC_URI="https://github.com/systemd/systemd/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+fi
+
+MUSL_PATCHSET="systemd-musl-patches-251.2"
+SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.tar.gz )"
+
+LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="+acl boot +kmod selinux split-usr sysusers +tmpfiles test +udev"
+REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	elibc_musl? ( >=sys-libs/musl-1.2.3 )
+	selinux? ( sys-libs/libselinux:0= )
+	tmpfiles? (
+		acl? ( sys-apps/acl:0= )
+	)
+	udev? (
+		>=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
+		sys-libs/libcap:0=[${MULTILIB_USEDEP}]
+		virtual/libcrypt:=[${MULTILIB_USEDEP}]
+		acl? ( sys-apps/acl:0= )
+		kmod? ( >=sys-apps/kmod-15:0= )
+	)
+	!udev? (
+		>=sys-apps/util-linux-2.30:0=
+		sys-libs/libcap:0=
+		virtual/libcrypt:=
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	>=sys-kernel/linux-headers-3.11
+	boot? ( >=sys-boot/gnu-efi-3.0.2 )
+"
+RDEPEND="${COMMON_DEPEND}
+	boot? ( !<sys-boot/systemd-boot-250 )
+	tmpfiles? ( !<sys-apps/systemd-tmpfiles-250 )
+	udev? (
+		acct-group/audio
+		acct-group/cdrom
+		acct-group/dialout
+		acct-group/disk
+		acct-group/input
+		acct-group/kmem
+		acct-group/kvm
+		acct-group/lp
+		acct-group/render
+		acct-group/sgx
+		acct-group/tape
+		acct-group/tty
+		acct-group/video
+		!sys-apps/gentoo-systemd-integration
+		!sys-apps/hwids[udev]
+		!<sys-fs/udev-250
+		!sys-fs/eudev
+	)
+	!sys-apps/systemd
+"
+PDEPEND="
+	udev? ( >=sys-fs/udev-init-scripts-34 )
+"
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]')
+	app-text/docbook-xml-dtd:4.2
+	app-text/docbook-xml-dtd:4.5
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	dev-util/gperf
+	>=sys-apps/coreutils-8.16
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+TMPFILES_OPTIONAL=1
+UDEV_OPTIONAL=1
+
+python_check_deps() {
+	python_has_version "dev-python/jinja[${PYTHON_USEDEP}]"
+}
+
+QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
+QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
+
+src_prepare() {
+	local PATCHES=(
+		# Breaks Clang. Revert the commit for now and force off F_S=3.
+		"${FILESDIR}/251-revert-fortify-source-3-fix.patch"
+		"${FILESDIR}/251-gpt-auto-no-cryptsetup.patch"
+	)
+
+	if use elibc_musl; then
+		PATCHES+=( "${WORKDIR}/${MUSL_PATCHSET}" )
+		# Applied upstream in 251.3
+		rm "${WORKDIR}/${MUSL_PATCHSET}/0001-Add-sys-file.h-for-LOCK_.patch" || die
+	fi
+	default
+
+	# Remove install_rpath; we link statically
+	local rpath_pattern="install_rpath : rootlibexecdir,"
+	grep -q -e "${rpath_pattern}" meson.build || die
+	sed -i -e "/${rpath_pattern}/d" meson.build || die
+}
+
+src_configure() {
+	# Broken with FORTIFY_SOURCE=3 without a patch. And the patch
+	# wasn't backported to 250.x, but it turns out to break Clang
+	# anyway:  bug #841770.
+	#
+	# Our toolchain sets F_S=2 by default w/ >= -O2, so we need
+	# to unset F_S first, then explicitly set 2, to negate any default
+	# and anything set by the user if they're choosing 3 (or if they've
+	# modified GCC to set 3).
+	#
+	if is-flagq '-O[23]' || is-flagq '-Ofast' ; then
+		# We can't unconditionally do this b/c we fortify needs
+		# some level of optimisation.
+		filter-flags -D_FORTIFY_SOURCE=3
+		append-cppflags -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2
+	fi
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		$(meson_use split-usr)
+		$(meson_use split-usr split-bin)
+		-Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
+		-Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
+		-Dsysvinit-path=
+		$(meson_native_use_bool boot efi)
+		$(meson_native_use_bool boot gnu-efi)
+		$(meson_native_use_bool boot kernel-install)
+		$(meson_native_use_bool selinux)
+		$(meson_native_use_bool sysusers)
+		$(meson_use test tests)
+		$(meson_native_use_bool tmpfiles)
+		$(meson_use udev hwdb)
+
+		-Defi-libdir="${ESYSROOT}/usr/$(get_libdir)"
+
+		# Link staticly with libsystemd-shared
+		-Dlink-boot-shared=false
+		-Dlink-udev-shared=false
+
+		# systemd-tmpfiles has a separate "systemd-tmpfiles.standalone" target
+		-Dstandalone-binaries=true
+
+		# Disable all optional features
+		-Dadm-group=false
+		-Danalyze=false
+		-Dapparmor=false
+		-Daudit=false
+		-Dbacklight=false
+		-Dbinfmt=false
+		-Dbzip2=false
+		-Dcoredump=false
+		-Ddbus=false
+		-Delfutils=false
+		-Denvironment-d=false
+		-Dfdisk=false
+		-Dgcrypt=false
+		-Dglib=false
+		-Dgshadow=false
+		-Dgnutls=false
+		-Dhibernate=false
+		-Dhostnamed=false
+		-Didn=false
+		-Dima=false
+		-Dinitrd=false
+		-Dfirstboot=false
+		-Dldconfig=false
+		-Dlibcryptsetup=false
+		-Dlibcurl=false
+		-Dlibfido2=false
+		-Dlibidn=false
+		-Dlibidn2=false
+		-Dlibiptc=false
+		-Dlocaled=false
+		-Dlogind=false
+		-Dlz4=false
+		-Dmachined=false
+		-Dmicrohttpd=false
+		-Dnetworkd=false
+		-Dnscd=false
+		-Dnss-myhostname=false
+		-Dnss-resolve=false
+		-Dnss-systemd=false
+		-Doomd=false
+		-Dopenssl=false
+		-Dp11kit=false
+		-Dpam=false
+		-Dpcre2=false
+		-Dpolkit=false
+		-Dportabled=false
+		-Dpstore=false
+		-Dpwquality=false
+		-Drandomseed=false
+		-Dresolve=false
+		-Drfkill=false
+		-Dseccomp=false
+		-Dsmack=false
+		-Dsysext=false
+		-Dtimedated=false
+		-Dtimesyncd=false
+		-Dtpm=false
+		-Dqrencode=false
+		-Dquotacheck=false
+		-Duserdb=false
+		-Dutmp=false
+		-Dvconsole=false
+		-Dwheel-group=false
+		-Dxdg-autostart=false
+		-Dxkbcommon=false
+		-Dxz=false
+		-Dzlib=false
+		-Dzstd=false
+	)
+
+	if use tmpfiles || use udev; then
+		emesonargs+=( $(meson_native_use_bool acl) )
+	else
+		emesonargs+=( -Dacl=false )
+	fi
+
+	if use udev; then
+		emesonargs+=( $(meson_native_use_bool kmod) )
+	else
+		emesonargs+=( -Dkmod=false )
+	fi
+
+	if use elibc_musl; then
+		# Avoid redefinition of struct ethhdr.
+		append-cppflags -D__UAPI_DEF_ETHHDR=0
+	fi
+
+	if multilib_is_native_abi || use udev; then
+		meson_src_configure
+	fi
+}
+
+efi_arch() {
+	case "$(tc-arch)" in
+		amd64) echo x64 ;;
+		arm)   echo arm ;;
+		arm64) echo aa64 ;;
+		x86)   echo x86 ;;
+	esac
+}
+
+multilib_src_compile() {
+	local targets=()
+	if multilib_is_native_abi; then
+		if use boot; then
+			targets+=(
+				bootctl
+				kernel-install
+				man/bootctl.1
+				man/kernel-install.8
+				src/boot/efi/linux$(efi_arch).{efi,elf}.stub
+				src/boot/efi/systemd-boot$(efi_arch).efi
+			)
+		fi
+		if use sysusers; then
+			targets+=(
+				systemd-sysusers.standalone
+				man/sysusers.d.5
+				man/systemd-sysusers.8
+			)
+			if use test; then
+				targets+=(
+					systemd-runtest.env
+				)
+			fi
+		fi
+		if use tmpfiles; then
+			targets+=(
+				systemd-tmpfiles.standalone
+				man/tmpfiles.d.5
+				man/systemd-tmpfiles.8
+			)
+			if use test; then
+				targets+=( test-tmpfiles )
+			fi
+		fi
+		if use udev; then
+			targets+=(
+				udevadm
+				systemd-hwdb
+				src/udev/ata_id
+				src/udev/cdrom_id
+				src/udev/fido_id
+				src/udev/mtd_probe
+				src/udev/scsi_id
+				src/udev/udev.pc
+				src/udev/v4l_id
+				man/udev.conf.5
+				man/systemd.link.5
+				man/hwdb.7
+				man/udev.7
+				man/systemd-hwdb.8
+				man/systemd-udevd.service.8
+				man/udevadm.8
+				hwdb.d/60-autosuspend-chromiumos.hwdb
+				rules.d/50-udev-default.rules
+				rules.d/64-btrfs.rules
+			)
+			if use test; then
+				targets+=(
+					# Used by udev-test.pl
+					systemd-detect-virt
+					test/sys
+					test-udev
+
+					test-fido-id-desc
+					test-udev-builtin
+					test-udev-event
+					test-udev-netlink
+					test-udev-node
+					test-udev-util
+				)
+			fi
+		fi
+	fi
+	if use udev; then
+		targets+=(
+			udev:shared_library
+			src/libudev/libudev.pc
+		)
+		if use test; then
+			targets+=(
+				test-libudev
+				test-libudev-sym
+				test-udev-device-thread
+			)
+		fi
+	fi
+	if multilib_is_native_abi || use udev; then
+		meson_src_compile "${targets[@]}"
+	fi
+}
+
+multilib_src_test() {
+	local tests=()
+	if multilib_is_native_abi; then
+		if use sysusers; then
+			tests+=(
+				test-sysusers.standalone
+			)
+		fi
+		if use tmpfiles; then
+			tests+=(
+				test-systemd-tmpfiles.standalone
+				test-tmpfiles
+			)
+		fi
+		if use udev; then
+			tests+=(
+				rule-syntax-check
+				test-fido-id-desc
+				test-udev-builtin
+				test-udev-event
+				test-udev-netlink
+				test-udev-node
+				test-udev-util
+			)
+			if [[ -w /dev ]]; then
+				tests+=( udev-test )
+			else
+				ewarn "Skipping udev-test (needs write access to /dev)"
+			fi
+		fi
+	fi
+	if use udev; then
+		tests+=(
+			test-libudev
+			test-libudev-sym
+			test-udev-device-thread
+		)
+	fi
+	if [[ ${#tests[@]} -ne 0 ]]; then
+		meson_src_test "${tests[@]}"
+	fi
+}
+
+src_install() {
+	local rootprefix="$(usex split-usr '' /usr)"
+	meson-multilib_src_install
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		if use boot; then
+			into /usr
+			dobin bootctl kernel-install
+			doman man/{bootctl.1,kernel-install.8}
+			insinto usr/lib/systemd/boot/efi
+			doins src/boot/efi/{linux$(efi_arch).{efi,elf}.stub,systemd-boot$(efi_arch).efi}
+		fi
+		if use sysusers; then
+			into "${rootprefix:-/}"
+			newbin systemd-sysusers{.standalone,}
+			doman man/{systemd-sysusers.8,sysusers.d.5}
+		fi
+		if use tmpfiles; then
+			into "${rootprefix:-/}"
+			newbin systemd-tmpfiles{.standalone,}
+			doman man/{systemd-tmpfiles.8,tmpfiles.d.5}
+		fi
+		if use udev; then
+			into "${rootprefix:-/}"
+			dobin udevadm systemd-hwdb
+			dosym ../../bin/udevadm "${rootprefix}"/lib/systemd/systemd-udevd
+
+			exeinto "${rootprefix}"/lib/udev
+			doexe src/udev/{ata_id,cdrom_id,fido_id,mtd_probe,scsi_id,v4l_id}
+
+			insinto "${rootprefix}"/lib/udev/rules.d
+			doins rules.d/*.rules
+
+			insinto "${rootprefix}"/lib/udev/hwdb.d
+			doins hwdb.d/*.hwdb
+
+			insinto /usr/share/pkgconfig
+			doins src/udev/udev.pc
+
+			doman man/{udev.conf.5,systemd.link.5,hwdb.7,systemd-hwdb.8,udev.7,udevadm.8}
+			newman man/systemd-udevd.service.8 systemd-udevd.8
+		fi
+	fi
+	if use udev; then
+		meson_install --no-rebuild --tags libudev
+		gen_usr_ldscript -a udev
+		insinto "/usr/$(get_libdir)/pkgconfig"
+		doins src/libudev/libudev.pc
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	if use boot; then
+		into /usr
+		exeinto usr/lib/kernel/install.d
+		doexe src/kernel-install/*.install
+		dobashcomp shell-completion/bash/bootctl
+		insinto /usr/share/zsh/site-functions
+		doins shell-completion/zsh/{_bootctl,_kernel-install}
+	fi
+	if use tmpfiles; then
+		doinitd "${FILESDIR}"/systemd-tmpfiles-setup
+		doinitd "${FILESDIR}"/systemd-tmpfiles-setup-dev
+		insinto /usr/share/zsh/site-functions
+		doins shell-completion/zsh/_systemd-tmpfiles
+	fi
+	if use udev; then
+		doheader src/libudev/libudev.h
+
+		insinto /etc/udev
+		doins src/udev/udev.conf
+		keepdir /etc/udev/{hwdb.d,rules.d}
+
+		insinto "${rootprefix}"/lib/systemd/network
+		doins network/99-default.link
+
+		# Remove to avoid conflict with elogind
+		# https://bugs.gentoo.org/856433
+		rm rules.d/70-power-switch.rules || die
+		insinto /lib/udev/rules.d
+		doins rules.d/*.rules
+		doins "${FILESDIR}"/40-gentoo.rules
+
+		insinto /lib/udev/hwdb.d
+		doins hwdb.d/*.hwdb
+
+		dobashcomp shell-completion/bash/udevadm
+
+		insinto /usr/share/zsh/site-functions
+		doins shell-completion/zsh/_udevadm
+	fi
+}
+
+add_service() {
+	local initd=$1
+	local runlevel=$2
+
+	ebegin "Adding '${initd}' service to the '${runlevel}' runlevel"
+	mkdir -p "${EROOT}/etc/runlevels/${runlevel}" &&
+	ln -snf "${EPREFIX}/etc/init.d/${initd}" "${EROOT}/etc/runlevels/${runlevel}/${initd}"
+	eend $?
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		add_service systemd-tmpfiles-setup-dev sysinit
+		add_service systemd-tmpfiles-setup boot
+	fi
+	if use udev; then
+		ebegin "Updating hwdb"
+		systemd-hwdb --root="${ROOT}" update
+		eend $?
+		udev_reload
+	fi
+}
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index 1801b2547f90..b6564df1555c 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -5,13 +5,15 @@ AUX gentoo-journald-audit.patch 1485 BLAKE2B 9cba28ce907330bbc1eafcf04a837987ed6
 AUX gentoo-systemctl-disable-sysv-sync-r1.patch 821 BLAKE2B f5ef796725e023bb1ed83b34a3e4d45bb008de9a134892a5321b37b56809c7a44530d18e33c7877177e8b64b2d89dfc2de844bed433db6d5e57831d20fbfb456 SHA512 8d697dbd305f6b95a4ddc47cf9d99a0e954f54e161bd59164917b62a78ff5c23fa2d5be2614569c0a2297595dae59e1ee71bb04da72cbe0c0807e1abd7da974d
 AUX nsswitch.conf 734 BLAKE2B 5f5a7821a84f6c8aa31fe9a68c29a1a0f24be578d427a623f14a9ef795e7da481f226efe5511d92932b5edf5638fa719808a0c3a0b8fd340799dd6bcb703a0a1 SHA512 dcbd51dacaaebdff32edb3840cc7b9b47b6521009b8786690e3673a2e78bc60bfd8e591b1048c5d452117c6659b9917ae2864462f5057cc39b704b0130522e60
 AUX systemd-user.pam 122 BLAKE2B cccc07cab47dfc0481438e503c34fa1a0b2c6b1f8ab282197719a523421d2a526f19230bb459e0347cbeb2046e35a407c78178a3fb5b79619e987cbc4ac7d5e4 SHA512 c5437677ff00fbb45798fe594e8d61b1c2bfc2d103105d7bd82e476240452477ac263700800f5d0ba91ddc895eb85f4517d5cb15c80611ec1680a686d47cd781
-DIST systemd-252-rc2.tar.gz 11736313 BLAKE2B 58efe76846b034ec61136fe01f535b40aabc993ffee687d4a22a20d93a3952fd15e4ac46591934a441f4e74cffec29145f441d97a69a5c456e7a3caee92602cc SHA512 f67703dcd03b300cddc2e8bfbeb843ef66ba0b0c548973797a920c1bed9e3a14a740e08936f7d906141da714bccbae0d4fcb47a7ce13e69c8a2f17d7928e218c
+DIST systemd-252-rc3.tar.gz 11754095 BLAKE2B a1eb08336e47c7c68b31b48a69cb71bd4ebb96912af6a05731979dd64ed6eb9eea729fa2d240d5f2abe7b306b0778bee7ab82e0ffd075f04566f983c557b41f2 SHA512 3968f1df6eab12bb3fe9575e1bd9c87f7e1f45d22c404f250a0dc3e0da801cb089a5e4a1ebc9ef0e3b38c47d55db895eca3da419e757bc1e7f825d154e9b5468
 DIST systemd-stable-251.4.tar.gz 11440203 BLAKE2B 58a0ee4adcc9d35b15b9cc98b3da81d1103b61a6c0bee722468a5113cd7d6de1d40c46ef964ba9ecc4746e81b516ae4b2f1d046874d62db066735c652592612e SHA512 7bbfadd80b88a4c3510a5e4e3572e4eab71dafbf6289da038e552988e09ee8da16da3c9bb8a4fbbde6c6236e0e3c352b0a33f9ee0b84f10241f3499383387738
 DIST systemd-stable-251.5.tar.gz 11444428 BLAKE2B 96df35dae789b11ead1960e1139046972a29c41f74ca800e0fafd84e6a8c238f8d4a30e2991ee94e07e866bc0c3137774ee116f276ac1203cca85254ccf91913 SHA512 2c645a694d45a2670920115529c5f34001153dafe26e5c4e65f8d1a37922a351569d056fc002f1af72dfc173988f93e11893460f64b497e3d5fc339083dcb2fa
 DIST systemd-stable-251.6.tar.gz 11448383 BLAKE2B 987ea88ea23662fd4119e3c796cc2e5f428fcce6cf0b033a5f8da7974c0026d41851f517e489354bbc22973b33c3932ac7280c56527f03a1fcbce3092148b638 SHA512 2da41ac7e939a893ada3ce682a6fe7dd326e8e0132221589da3d2b1d994e1a879118e0c6025f03351dac6567d754223a5f5401d64a5ca9256ab95512800370f8
+DIST systemd-stable-251.7.tar.gz 11448429 BLAKE2B 959ac7944d778c8e6d7a3c67ea6adc89e5e7ac1cc3b163e2af2a582211b91316da5ffba37b854978b7b2a5b3f9aae3651701a23e4391da6676e078747df1a37b SHA512 a4c06b2d25c47af58abb1e1dc85737b2fb0eb394f09d2bb7c6b7b716cb4b1383a145885bbc8e5ffcdc26611fd44d362fba2152c4dd0ead6a03a93965b82bb9a4
 EBUILD systemd-251.4.ebuild 15500 BLAKE2B c8ea106e1dbbf830fba008ed6f70486e36a62947cf390f436b2c45856a8f3fc74d819f67983dde5fa49b854cf91e3c76e4ccb7d99af9c9753cc7a0183d8bb0d3 SHA512 f97e89cbc1fad054b265878f0f55b7bbfccdecc1f907743d4373cb7a9783805ea1e5536ad5fe759da4e3b6954146c9b456ce4147fa86f41c61187b11333ee8ec
 EBUILD systemd-251.5.ebuild 15508 BLAKE2B dd89dde571cfd27fad856e2802c8b837d96b567f07fcae62af911f9dc6ebf6752ef7a287a7f1d695695a8f84cd43638a156101fcd53488fd25bdf43d65cb8560 SHA512 1c4b6a2dd35171dea0363d1331bfa67967fdb9bc8025cf4b3fea7b20af60748373473a3efed0710a8c86762ba53fb3bdcd0df62bb1e70a55a43a1ab722171ecd
 EBUILD systemd-251.6.ebuild 15557 BLAKE2B 124b3527e460ec93d8a1f5a5fea3f435aa8db9a6b25b729ef46480b451a89aa77800d7a6062b7ba94d817152951f6f22c58d68708e2fd0fafbf73841b23bb9a0 SHA512 09f4318b267ef45fcd92d4ce3f25d5c6e665f0d1662cb339796c60e38c48ab780977d93f816f80c8e7512f6cb2c9802e68914375b351a08d14d96d2ff30365e5
-EBUILD systemd-252_rc2.ebuild 15373 BLAKE2B 05086c1624ee74cc5942c0a3d861d8aaca5415ff3e28d9abdf7f405d50499789f8e61aa19308313715b77c55419be5e4735930921e9cd7fe0f3b175affe71213 SHA512 0e7cf6a4a5639554cc3c9d58bb61e03461a44a6e0eedfa36fcf586124b3705ecfb785bde6df136b560e12253963ab05aaae6439a7228284bcbbb64cb5fb5310f
+EBUILD systemd-251.7.ebuild 15557 BLAKE2B 124b3527e460ec93d8a1f5a5fea3f435aa8db9a6b25b729ef46480b451a89aa77800d7a6062b7ba94d817152951f6f22c58d68708e2fd0fafbf73841b23bb9a0 SHA512 09f4318b267ef45fcd92d4ce3f25d5c6e665f0d1662cb339796c60e38c48ab780977d93f816f80c8e7512f6cb2c9802e68914375b351a08d14d96d2ff30365e5
+EBUILD systemd-252_rc3.ebuild 15373 BLAKE2B 05086c1624ee74cc5942c0a3d861d8aaca5415ff3e28d9abdf7f405d50499789f8e61aa19308313715b77c55419be5e4735930921e9cd7fe0f3b175affe71213 SHA512 0e7cf6a4a5639554cc3c9d58bb61e03461a44a6e0eedfa36fcf586124b3705ecfb785bde6df136b560e12253963ab05aaae6439a7228284bcbbb64cb5fb5310f
 EBUILD systemd-9999.ebuild 15372 BLAKE2B f480ab02dd6910b271805ef126bfefd478b9c94487dd4d2134edebd5a15e780ecb9104ae16a0f50dd921f642cb78389ffb486cc9ea76ea3d4db863a0db12d63f SHA512 ee3c87a63e7295e02679364f7337985eaf073026e57672b6352bb65979224791e491222b4309ca66ecc4df6c1b312acb4b706419299800fa8c94e179c235f5c6
 MISC metadata.xml 2545 BLAKE2B fc424b7f9e471860cba69b6f11ea2094c70f125cd55c42ea77e4549a399680c4444119c79424c266828a284b0214001421f760477b1341844dddd2d474d70c33 SHA512 f0b8c4614e3c88d123916bb3399d6025ab30ff839849b136a29e1960bf0c50699b3f09b5307f40b77cc8c5566c20b11de2364a08311adceb15507df3e4bb0565
diff --git a/sys-apps/systemd/systemd-251.7.ebuild b/sys-apps/systemd/systemd-251.7.ebuild
new file mode 100644
index 000000000000..de8a975e58e1
--- /dev/null
+++ b/sys-apps/systemd/systemd-251.7.ebuild
@@ -0,0 +1,530 @@
+# Copyright 2011-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8..11} )
+
+# Avoid QA warnings
+TMPFILES_OPTIONAL=1
+UDEV_OPTIONAL=1
+
+QA_PKGCONFIG_VERSION=$(ver_cut 1)
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/systemd/systemd.git"
+	inherit git-r3
+else
+	if [[ ${PV} == *.* ]]; then
+		MY_PN=systemd-stable
+	else
+		MY_PN=systemd
+	fi
+	MY_PV=${PV/_/-}
+	MY_P=${MY_PN}-${MY_PV}
+	S=${WORKDIR}/${MY_P}
+	SRC_URI="https://github.com/systemd/${MY_PN}/archive/v${MY_PV}/${MY_P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+inherit bash-completion-r1 flag-o-matic linux-info meson-multilib pam python-any-r1 systemd toolchain-funcs udev usr-ldscript
+
+DESCRIPTION="System and service manager for Linux"
+HOMEPAGE="http://systemd.io/"
+
+LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
+SLOT="0/2"
+IUSE="
+	acl apparmor audit build cgroup-hybrid cryptsetup curl +dns-over-tls elfutils
+	fido2 +gcrypt gnuefi gnutls homed http idn importd iptables +kmod
+	+lz4 lzma +openssl pam pcre pkcs11 policykit pwquality qrcode
+	+resolvconf +seccomp selinux split-usr +sysv-utils test tpm vanilla xkb +zstd
+"
+REQUIRED_USE="
+	dns-over-tls? ( || ( gnutls openssl ) )
+	homed? ( cryptsetup pam openssl )
+	importd? ( curl lzma || ( gcrypt openssl ) )
+	pwquality? ( homed )
+"
+RESTRICT="!test? ( test )"
+
+MINKV="4.15"
+
+COMMON_DEPEND="
+	>=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
+	sys-libs/libcap:0=[${MULTILIB_USEDEP}]
+	virtual/libcrypt:=[${MULTILIB_USEDEP}]
+	acl? ( sys-apps/acl:0= )
+	apparmor? ( sys-libs/libapparmor:0= )
+	audit? ( >=sys-process/audit-2:0= )
+	cryptsetup? ( >=sys-fs/cryptsetup-2.0.1:0= )
+	curl? ( net-misc/curl:0= )
+	elfutils? ( >=dev-libs/elfutils-0.158:0= )
+	fido2? ( dev-libs/libfido2:0= )
+	gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[${MULTILIB_USEDEP}] )
+	gnutls? ( >=net-libs/gnutls-3.6.0:0= )
+	http? ( >=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)] )
+	idn? ( net-dns/libidn2:= )
+	importd? (
+		app-arch/bzip2:0=
+		sys-libs/zlib:0=
+	)
+	kmod? ( >=sys-apps/kmod-15:0= )
+	lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] )
+	lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[${MULTILIB_USEDEP}] )
+	iptables? ( net-firewall/iptables:0= )
+	openssl? ( >=dev-libs/openssl-1.1.0:0= )
+	pam? ( sys-libs/pam:=[${MULTILIB_USEDEP}] )
+	pkcs11? ( app-crypt/p11-kit:0= )
+	pcre? ( dev-libs/libpcre2 )
+	pwquality? ( dev-libs/libpwquality:0= )
+	qrcode? ( media-gfx/qrencode:0= )
+	seccomp? ( >=sys-libs/libseccomp-2.3.3:0= )
+	selinux? ( sys-libs/libselinux:0= )
+	tpm? ( app-crypt/tpm2-tss:0= )
+	xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= )
+	zstd? ( >=app-arch/zstd-1.4.0:0=[${MULTILIB_USEDEP}] )
+"
+
+# Newer linux-headers needed by ia64, bug #480218
+DEPEND="${COMMON_DEPEND}
+	>=sys-kernel/linux-headers-${MINKV}
+	gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
+"
+
+# baselayout-2.2 has /run
+RDEPEND="${COMMON_DEPEND}
+	>=acct-group/adm-0-r1
+	>=acct-group/wheel-0-r1
+	>=acct-group/kmem-0-r1
+	>=acct-group/tty-0-r1
+	>=acct-group/utmp-0-r1
+	>=acct-group/audio-0-r1
+	>=acct-group/cdrom-0-r1
+	>=acct-group/dialout-0-r1
+	>=acct-group/disk-0-r1
+	>=acct-group/input-0-r1
+	>=acct-group/kvm-0-r1
+	>=acct-group/lp-0-r1
+	>=acct-group/render-0-r1
+	acct-group/sgx
+	>=acct-group/tape-0-r1
+	acct-group/users
+	>=acct-group/video-0-r1
+	>=acct-group/systemd-journal-0-r1
+	>=acct-user/root-0-r1
+	acct-user/nobody
+	>=acct-user/systemd-journal-remote-0-r1
+	>=acct-user/systemd-coredump-0-r1
+	>=acct-user/systemd-network-0-r1
+	acct-user/systemd-oom
+	>=acct-user/systemd-resolve-0-r1
+	>=acct-user/systemd-timesync-0-r1
+	>=sys-apps/baselayout-2.2
+	selinux? (
+		sec-policy/selinux-base-policy[systemd]
+		sec-policy/selinux-ntp
+	)
+	sysv-utils? (
+		!sys-apps/openrc[sysv-utils(-)]
+		!sys-apps/sysvinit
+	)
+	!sysv-utils? ( sys-apps/sysvinit )
+	resolvconf? ( !net-dns/openresolv )
+	!build? ( || (
+		sys-apps/util-linux[kill(-)]
+		sys-process/procps[kill(+)]
+		sys-apps/coreutils[kill(-)]
+	) )
+	!sys-apps/hwids[udev]
+	!sys-auth/nss-myhostname
+	!sys-fs/eudev
+	!sys-fs/udev
+"
+
+# sys-apps/dbus: the daemon only (+ build-time lib dep for tests)
+PDEPEND=">=sys-apps/dbus-1.9.8[systemd]
+	>=sys-fs/udev-init-scripts-34
+	policykit? ( sys-auth/polkit )
+	!vanilla? ( sys-apps/gentoo-systemd-integration )"
+
+BDEPEND="
+	app-arch/xz-utils:0
+	dev-util/gperf
+	>=dev-util/meson-0.46
+	>=sys-apps/coreutils-8.16
+	sys-devel/gettext
+	virtual/pkgconfig
+	test? (
+		app-text/tree
+		dev-lang/perl
+		sys-apps/dbus
+	)
+	app-text/docbook-xml-dtd:4.2
+	app-text/docbook-xml-dtd:4.5
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt:0
+	$(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]')
+	$(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
+"
+
+python_check_deps() {
+	python_has_version "dev-python/jinja[${PYTHON_USEDEP}]" &&
+	python_has_version "dev-python/lxml[${PYTHON_USEDEP}]"
+}
+
+QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
+QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != buildonly ]]; then
+		if use test && has pid-sandbox ${FEATURES}; then
+			ewarn "Tests are known to fail with PID sandboxing enabled."
+			ewarn "See https://bugs.gentoo.org/674458."
+		fi
+
+		local CONFIG_CHECK=" ~BINFMT_MISC ~BLK_DEV_BSG ~CGROUPS
+			~CGROUP_BPF ~DEVTMPFS ~EPOLL ~FANOTIFY ~FHANDLE
+			~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SIGNALFD ~SYSFS
+			~TIMERFD ~TMPFS_XATTR ~UNIX ~USER_NS
+			~CRYPTO_HMAC ~CRYPTO_SHA256 ~CRYPTO_USER_API_HASH
+			~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED
+			~!SYSFS_DEPRECATED_V2"
+
+		use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"
+		use seccomp && CONFIG_CHECK+=" ~SECCOMP ~SECCOMP_FILTER"
+
+		if kernel_is -ge 5 10 20; then
+			CONFIG_CHECK+=" ~KCMP"
+		else
+			CONFIG_CHECK+=" ~CHECKPOINT_RESTORE"
+		fi
+
+		if kernel_is -ge 4 18; then
+			CONFIG_CHECK+=" ~AUTOFS_FS"
+		else
+			CONFIG_CHECK+=" ~AUTOFS4_FS"
+		fi
+
+		if linux_config_exists; then
+			local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH)
+			if [[ -n ${uevent_helper_path} ]] && [[ ${uevent_helper_path} != '""' ]]; then
+				ewarn "It's recommended to set an empty value to the following kernel config option:"
+				ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}"
+			fi
+			if linux_chkconfig_present X86; then
+				CONFIG_CHECK+=" ~DMIID"
+			fi
+		fi
+
+		if kernel_is -lt ${MINKV//./ }; then
+			ewarn "Kernel version at least ${MINKV} required"
+		fi
+
+		check_extra_config
+	fi
+}
+
+pkg_setup() {
+	:
+}
+
+src_unpack() {
+	default
+	[[ ${PV} != 9999 ]] || git-r3_src_unpack
+}
+
+src_prepare() {
+	local PATCHES=(
+		# Breaks Clang. Revert the commit for now and force off F_S=3.
+		# bug #841770.
+		"${FILESDIR}/251-revert-fortify-source-3-fix.patch"
+		"${FILESDIR}/251-gpt-auto-no-cryptsetup.patch"
+	)
+
+	if ! use vanilla; then
+		PATCHES+=(
+			"${FILESDIR}/gentoo-generator-path-r2.patch"
+			"${FILESDIR}/gentoo-systemctl-disable-sysv-sync-r1.patch"
+			"${FILESDIR}/gentoo-journald-audit.patch"
+		)
+	fi
+
+	# Fails with split-usr.
+	sed -i -e '2i exit 77' test/test-rpm-macros.sh || die
+
+	default
+}
+
+src_configure() {
+	# Prevent conflicts with i686 cross toolchain, bug 559726
+	tc-export AR CC NM OBJCOPY RANLIB
+
+	# Broken with FORTIFY_SOURCE=3 without a patch. We have to revert
+	# the upstream patch for it because it breaks Clang: bug #841770.
+	#
+	# Our toolchain sets F_S=2 by default w/ >= -O2, so we need
+	# to unset F_S first, then explicitly set 2, to negate any default
+	# and anything set by the user if they're choosing 3 (or if they've
+	# modified GCC to set 3).
+	#
+	if is-flagq '-O[23]' || is-flagq '-Ofast' ; then
+		# We can't unconditionally do this b/c we fortify needs
+		# some level of optimisation.
+		filter-flags -D_FORTIFY_SOURCE=3
+		append-cppflags -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2
+	fi
+
+	python_setup
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--localstatedir="${EPREFIX}/var"
+		-Dsupport-url="https://gentoo.org/support/"
+		-Dpamlibdir="$(getpam_mod_dir)"
+		# avoid bash-completion dep
+		-Dbashcompletiondir="$(get_bashcompdir)"
+		$(meson_use split-usr)
+		$(meson_use split-usr split-bin)
+		-Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
+		-Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
+		# Avoid infinite exec recursion, bug 642724
+		-Dtelinit-path="${EPREFIX}/lib/sysvinit/telinit"
+		# no deps
+		-Dima=true
+		-Ddefault-hierarchy=$(usex cgroup-hybrid hybrid unified)
+		# Optional components/dependencies
+		$(meson_native_use_bool acl)
+		$(meson_native_use_bool apparmor)
+		$(meson_native_use_bool audit)
+		$(meson_native_use_bool cryptsetup libcryptsetup)
+		$(meson_native_use_bool curl libcurl)
+		$(meson_native_use_bool dns-over-tls dns-over-tls)
+		$(meson_native_use_bool elfutils)
+		$(meson_native_use_bool fido2 libfido2)
+		$(meson_use gcrypt)
+		$(meson_native_use_bool gnuefi gnu-efi)
+		$(meson_native_use_bool gnutls)
+		-Defi-includedir="${ESYSROOT}/usr/include/efi"
+		-Defi-libdir="${ESYSROOT}/usr/$(get_libdir)"
+		$(meson_native_use_bool homed)
+		$(meson_native_use_bool http microhttpd)
+		$(meson_native_use_bool idn)
+		$(meson_native_use_bool importd)
+		$(meson_native_use_bool importd bzip2)
+		$(meson_native_use_bool importd zlib)
+		$(meson_native_use_bool kmod)
+		$(meson_use lz4)
+		$(meson_use lzma xz)
+		$(meson_use zstd)
+		$(meson_native_use_bool iptables libiptc)
+		$(meson_native_use_bool openssl)
+		$(meson_use pam)
+		$(meson_native_use_bool pkcs11 p11kit)
+		$(meson_native_use_bool pcre pcre2)
+		$(meson_native_use_bool policykit polkit)
+		$(meson_native_use_bool pwquality)
+		$(meson_native_use_bool qrcode qrencode)
+		$(meson_native_use_bool seccomp)
+		$(meson_native_use_bool selinux)
+		$(meson_native_use_bool tpm tpm2)
+		$(meson_native_use_bool test dbus)
+		$(meson_native_use_bool xkb xkbcommon)
+		-Dntp-servers="0.gentoo.pool.ntp.org 1.gentoo.pool.ntp.org 2.gentoo.pool.ntp.org 3.gentoo.pool.ntp.org"
+		# Breaks screen, tmux, etc.
+		-Ddefault-kill-user-processes=false
+		-Dcreate-log-dirs=false
+
+		# multilib options
+		$(meson_native_true backlight)
+		$(meson_native_true binfmt)
+		$(meson_native_true coredump)
+		$(meson_native_true environment-d)
+		$(meson_native_true firstboot)
+		$(meson_native_true hibernate)
+		$(meson_native_true hostnamed)
+		$(meson_native_true ldconfig)
+		$(meson_native_true localed)
+		$(meson_native_true man)
+		$(meson_native_true networkd)
+		$(meson_native_true quotacheck)
+		$(meson_native_true randomseed)
+		$(meson_native_true rfkill)
+		$(meson_native_true sysusers)
+		$(meson_native_true timedated)
+		$(meson_native_true timesyncd)
+		$(meson_native_true tmpfiles)
+		$(meson_native_true vconsole)
+	)
+
+	meson_src_configure "${myconf[@]}"
+}
+
+multilib_src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS XDG_RUNTIME_DIR
+	meson_src_test
+}
+
+multilib_src_install_all() {
+	local rootprefix=$(usex split-usr '' /usr)
+	local sbin=$(usex split-usr sbin bin)
+
+	# meson doesn't know about docdir
+	mv "${ED}"/usr/share/doc/{systemd,${PF}} || die
+
+	einstalldocs
+	dodoc "${FILESDIR}"/nsswitch.conf
+
+	if ! use resolvconf; then
+		rm -f "${ED}${rootprefix}/${sbin}"/resolvconf || die
+	fi
+
+	rm "${ED}"/etc/init.d/README || die
+	rm "${ED}${rootprefix}"/lib/systemd/system-generators/systemd-sysv-generator || die
+
+	if ! use sysv-utils; then
+		rm "${ED}${rootprefix}/${sbin}"/{halt,init,poweroff,reboot,runlevel,shutdown,telinit} || die
+		rm "${ED}"/usr/share/man/man1/init.1 || die
+		rm "${ED}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 || die
+	fi
+
+	if ! use resolvconf && ! use sysv-utils && use split-usr; then
+		rmdir "${ED}${rootprefix}"/sbin || die
+	fi
+
+	# https://bugs.gentoo.org/761763
+	rm -r "${ED}"/usr/lib/sysusers.d || die
+
+	# Preserve empty dirs in /etc & /var, bug #437008
+	keepdir /etc/{binfmt.d,modules-load.d,tmpfiles.d}
+	keepdir /etc/kernel/install.d
+	keepdir /etc/systemd/{network,system,user}
+	keepdir /etc/udev/rules.d
+
+	keepdir /etc/udev/hwdb.d
+
+	keepdir "${rootprefix}"/lib/systemd/{system-sleep,system-shutdown}
+	keepdir /usr/lib/{binfmt.d,modules-load.d}
+	keepdir /usr/lib/systemd/user-generators
+	keepdir /var/lib/systemd
+	keepdir /var/log/journal
+
+	# Symlink /etc/sysctl.conf for easy migration.
+	dosym ../../../etc/sysctl.conf /usr/lib/sysctl.d/99-sysctl.conf
+
+	if use pam; then
+		newpamd "${FILESDIR}"/systemd-user.pam systemd-user
+	fi
+
+	if use split-usr; then
+		# Avoid breaking boot/reboot
+		dosym ../../../lib/systemd/systemd /usr/lib/systemd/systemd
+		dosym ../../../lib/systemd/systemd-shutdown /usr/lib/systemd/systemd-shutdown
+	fi
+
+	gen_usr_ldscript -a systemd udev
+}
+
+migrate_locale() {
+	local envd_locale_def="${EROOT}/etc/env.d/02locale"
+	local envd_locale=( "${EROOT}"/etc/env.d/??locale )
+	local locale_conf="${EROOT}/etc/locale.conf"
+
+	if [[ ! -L ${locale_conf} && ! -e ${locale_conf} ]]; then
+		# If locale.conf does not exist...
+		if [[ -e ${envd_locale} ]]; then
+			# ...either copy env.d/??locale if there's one
+			ebegin "Moving ${envd_locale} to ${locale_conf}"
+			mv "${envd_locale}" "${locale_conf}"
+			eend ${?} || FAIL=1
+		else
+			# ...or create a dummy default
+			ebegin "Creating ${locale_conf}"
+			cat > "${locale_conf}" <<-EOF
+				# This file has been created by the sys-apps/systemd ebuild.
+				# See locale.conf(5) and localectl(1).
+
+				# LANG=${LANG}
+			EOF
+			eend ${?} || FAIL=1
+		fi
+	fi
+
+	if [[ ! -L ${envd_locale} ]]; then
+		# now, if env.d/??locale is not a symlink (to locale.conf)...
+		if [[ -e ${envd_locale} ]]; then
+			# ...warn the user that he has duplicate locale settings
+			ewarn
+			ewarn "To ensure consistent behavior, you should replace ${envd_locale}"
+			ewarn "with a symlink to ${locale_conf}. Please migrate your settings"
+			ewarn "and create the symlink with the following command:"
+			ewarn "ln -s -n -f ../locale.conf ${envd_locale}"
+			ewarn
+		else
+			# ...or just create the symlink if there's nothing here
+			ebegin "Creating ${envd_locale_def} -> ../locale.conf symlink"
+			ln -n -s ../locale.conf "${envd_locale_def}"
+			eend ${?} || FAIL=1
+		fi
+	fi
+}
+
+pkg_preinst() {
+	if ! use split-usr; then
+		local dir
+		for dir in bin sbin lib; do
+			if [[ ! ${EROOT}/${dir} -ef ${EROOT}/usr/${dir} ]]; then
+				eerror "\"${EROOT}/${dir}\" and \"${EROOT}/usr/${dir}\" are not merged."
+				eerror "One of them should be a symbolic link to the other one."
+				FAIL=1
+			fi
+		done
+		if [[ ${FAIL} ]]; then
+			eerror "Migration to system layout with merged directories must be performed before"
+			eerror "rebuilding ${CATEGORY}/${PN} with USE=\"-split-usr\" to avoid run-time breakage."
+			die "System layout with split directories still used"
+		fi
+	fi
+}
+
+pkg_postinst() {
+	systemd_update_catalog
+
+	# Keep this here in case the database format changes so it gets updated
+	# when required.
+	systemd-hwdb --root="${ROOT}" update
+
+	udev_reload || FAIL=1
+
+	# Bug 465468, make sure locales are respected, and ensure consistency
+	# between OpenRC & systemd
+	migrate_locale
+
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		if type systemctl &>/dev/null; then
+			systemctl --root="${ROOT:-/}" enable getty@.service remote-fs.target || FAIL=1
+		fi
+		elog "To enable a useful set of services, run the following:"
+		elog "  systemctl preset-all --preset-mode=enable-only"
+	fi
+
+	if [[ -L ${EROOT}/var/lib/systemd/timesync ]]; then
+		rm "${EROOT}/var/lib/systemd/timesync"
+	fi
+
+	if [[ ${FAIL} ]]; then
+		eerror "One of the postinst commands failed. Please check the postinst output"
+		eerror "for errors. You may need to clean up your system and/or try installing"
+		eerror "systemd again."
+		eerror
+	fi
+}
+
+pkg_prerm() {
+	# If removing systemd completely, remove the catalog database.
+	if [[ ! ${REPLACED_BY_VERSION} ]]; then
+		rm -f -v "${EROOT}"/var/lib/systemd/catalog/database
+	fi
+}
diff --git a/sys-apps/systemd/systemd-252_rc2.ebuild b/sys-apps/systemd/systemd-252_rc3.ebuild
similarity index 100%
rename from sys-apps/systemd/systemd-252_rc2.ebuild
rename to sys-apps/systemd/systemd-252_rc3.ebuild
diff --git a/sys-apps/texinfo/Manifest b/sys-apps/texinfo/Manifest
index 4ed2cbbf1118..e673b59e381e 100644
--- a/sys-apps/texinfo/Manifest
+++ b/sys-apps/texinfo/Manifest
@@ -3,4 +3,4 @@ DIST texinfo-6.8.90.tar.xz 6324912 BLAKE2B 106dfa2c415cfd40c54befa3b431f5b07eb55
 DIST texinfo-6.8.tar.xz 4961528 BLAKE2B 0256dac5ba9c7f171c970644907b763f7a88fd9995111244df0458591aed1a0fe94c76045dde69f9138d65d6f780aae6869bbbc013f58e04ae7c62456b222bbb SHA512 0ff9290b14e4d83e32b889cfa24e6d065f98b2a764daf6b92c6c895fddbb35258398da6257c113220d5a4d886f7b54b09c4b117ca5eacfee6797f9bffde0f909
 EBUILD texinfo-6.8.90.ebuild 1765 BLAKE2B e3f5a92d0a214945414813167e2e35848cefb8f6359e71c01e75bf2e0a0663073aa0b847ba2afd31fee544dcf0adfcb19467ace9b066834d5888d5f0fa8a6c07 SHA512 94bd17b16fe0aee5f511750dcdeb937813f9fac837585edb63eab2ac2505eb265311ce4366b487f1254693449d20e89be35881f3c1b12d7ffbca109030a31683
 EBUILD texinfo-6.8.ebuild 1717 BLAKE2B 0ce639bd82dac4bcc580415852c093773954c2f33a811133fcb4ee8361e30935b40ba2796bfe807f848bbebe3acf5985fb549f11dfc6d90dbcb397ab0fc959ea SHA512 017f861563fe14381776c7fb62b79b8a99059e63d0f752a4b8dc71559ba57c6c56307ef751bea42b01c1afd3ebfface75c108be260f920f1a1fc6e3ffd72c40f
-MISC metadata.xml 540 BLAKE2B 64b068c14cc3ce828768e85d21c46e25d8930f66287329bd6ec41893bb26b352a0384155688768aa472cf7c58113e02b79e88d99c98233c3f80b393a0d518443 SHA512 32c337ea240d5ec20130fbb17a9622e3736d8c4b577b6bdebebbe3344675cf9faf3140471ff9fe4c5862b75858017b5e9fd8fc34a1c1f53fe8babc106aa83af3
+MISC metadata.xml 588 BLAKE2B 4e5549f1b07df4c081d2cc03691f0f8ba13c0f8f86807a7e5e87ea618080895a2714f169e9a1294226e71207ed88586a027092a328ab618f417ae3a74ac2586b SHA512 343c287a2c0c7f7bcbd5a40373c0aebe718d46042947abcb8364fed0aeb6dd7e585e9d226ef5bfb0084074d085510e802faf3a3c08b1489ed35556b6c14d1015
diff --git a/sys-apps/texinfo/metadata.xml b/sys-apps/texinfo/metadata.xml
index fd41c89eb373..17375d23a84f 100644
--- a/sys-apps/texinfo/metadata.xml
+++ b/sys-apps/texinfo/metadata.xml
@@ -14,5 +14,6 @@
 </use>
 <upstream>
 	<remote-id type="cpe">cpe:/a:gnu:texinfo</remote-id>
+	<remote-id type="savannah">texinfo</remote-id>
 </upstream>
 </pkgmetadata>
diff --git a/sys-boot/Manifest.gz b/sys-boot/Manifest.gz
index 090faa035451..406d4139b355 100644
Binary files a/sys-boot/Manifest.gz and b/sys-boot/Manifest.gz differ
diff --git a/sys-boot/raspberrypi-firmware/Manifest b/sys-boot/raspberrypi-firmware/Manifest
index d28cb4a18352..3f90010671e6 100644
--- a/sys-boot/raspberrypi-firmware/Manifest
+++ b/sys-boot/raspberrypi-firmware/Manifest
@@ -3,7 +3,9 @@ AUX raspberrypi-firmware-1.20201022-cmdline.txt 108 BLAKE2B b7830fdaf1ffb64cb07a
 AUX raspberrypi-firmware-1.20201022-config.txt 1784 BLAKE2B 7f37f02c486e6db2767b108e5926dc056f558ef32ae8ac3debea2fe7a210b159a2e4721846be8719520667c9bb86dc5d15c7c815f90dfe2686748f4d474fac61 SHA512 0909fae9bf731417f732486f7823f92a142824f5cab490b1736a16e7f569c9ecd805828c533c238dd3c5d75efcd2679e0d3697d988388000e1475a966fa66f12
 DIST raspberrypi-firmware-1.20211118.tar.gz 193544570 BLAKE2B db6c7c2e247f668b02210fb181305c3244f3d8a30f923656bf15cf418cb26822844df5b39af62b483e9e49405e13a60e57d6826aa0f3c3698920e8fc568656e2 SHA512 54881fc31ca0c9de8d8ca41ad6418e9d149975fbadbc0409f4136d4a31e70d743d55a16d4c0942305077d463c952edaa48be56d22d015983ab672dcaf5f134e2
 DIST raspberrypi-firmware-1.20220328.tar.gz 195699471 BLAKE2B e39ae746b46eb4f63aa2043df9fb60ce23b966d172e2c2c311942425e62896fb8ef171689c420bf2545065514a331e46c3bfb4d028eab8eea251357ee4c947f3 SHA512 b9e8676a94dce4621af25b8ba563a2dbd93f6fad61f5c5fb8b57b0ff5262151ff61598ce56a5f952f99f6e37f7c9ebf801a51849ee45ee328a168ca88e2522f3
+DIST raspberrypi-firmware-1.20220830.tar.gz 184738723 BLAKE2B 3675488a4ad9e3e8570eecfb56af2fd77d35dcc0da1cb14892a18e2b8471011411f0ec063c76fe51a72170df4d2f78acec11c0473272d6ba5248785c339fa3bd SHA512 9f5682254bf2596556b8759dd7b6ab1292ba6a28bf582f100682a1f14a03b43ac6ece654392e7a17f27db3940e8073b9e8645bd66aba8504a820fc29a3a1c500
 EBUILD raspberrypi-firmware-1.20211118.ebuild 1889 BLAKE2B c381485a3cf3bf5812190158c90726a82a9b35edee84358b7feed0c1255b0ab61088a4255c734ea7fa0d56f8e21a45f8e74a37398b52b6ea0c97b7987dad99e9 SHA512 63fefccade1dcb9a109953b33c65b45b70b8d76caa673f35049480c3cfa32590466e851ea1e5653b8574d45f4293eacb2b7baa2bfeb0b6e63e020e11503d4dbe
 EBUILD raspberrypi-firmware-1.20220328.ebuild 1891 BLAKE2B ca43f4e2533f2938e1cac56e303ee91ae643b5d76cc2654846ff4d59fc4f1f57690d0effa252c98646f53d6a2c9dc6c43ef2bffeb335438616d4deb0c3f41f84 SHA512 c4cfff21db5ec5d502fd3883a13c82be2c9af1fc08163ce1ce9bd2c903894977526f8ff55bba7ce73876c8328d015e7cf46120117246aa1887af2f5aa9679634
-EBUILD raspberrypi-firmware-9999.ebuild 1892 BLAKE2B 7d3b73f730a94a75f61652eb350c12c7d3cd328cd26b03bf3cf4300df1c4fe9bd7c7d8fed90523645d6d692665a0b35d4db9ea50fa423d50c38115ed76bb7401 SHA512 7f88844eba41233565f6ac795dd2f9f390c94b7e153bb2893e4bc24eaeb28c7984523b44212f1c349a93b21aa51c984b21f102425eb9fff757f11e5753ca950a
-MISC metadata.xml 505 BLAKE2B 79f9a89cea4ce9658dfc203b6dbcd5251973f747c25996457a0556fed4d21c9482aef195759453ad1e7f5631308b5e2b089a55ff7cd617f168b604bf9c3620fe SHA512 9e2432add5a42ae97e2dc4e09a638786256ca76d22b93c2073c929a79ee216784b9ae284d268025883f00b6ddb1d682a9a1cd20bfe579feee7e8dface013eba4
+EBUILD raspberrypi-firmware-1.20220830.ebuild 1891 BLAKE2B ca43f4e2533f2938e1cac56e303ee91ae643b5d76cc2654846ff4d59fc4f1f57690d0effa252c98646f53d6a2c9dc6c43ef2bffeb335438616d4deb0c3f41f84 SHA512 c4cfff21db5ec5d502fd3883a13c82be2c9af1fc08163ce1ce9bd2c903894977526f8ff55bba7ce73876c8328d015e7cf46120117246aa1887af2f5aa9679634
+EBUILD raspberrypi-firmware-9999.ebuild 1891 BLAKE2B ca43f4e2533f2938e1cac56e303ee91ae643b5d76cc2654846ff4d59fc4f1f57690d0effa252c98646f53d6a2c9dc6c43ef2bffeb335438616d4deb0c3f41f84 SHA512 c4cfff21db5ec5d502fd3883a13c82be2c9af1fc08163ce1ce9bd2c903894977526f8ff55bba7ce73876c8328d015e7cf46120117246aa1887af2f5aa9679634
+MISC metadata.xml 682 BLAKE2B 27e6782667f13403b8f513d7f9c4532d6ba62a56d2132b9271c1ff10edda3063670e00c0e11bf504ef61d32c7cdfe0b45076dec30f59228eeb88ac80ff4ce597 SHA512 fa0a6cf32c873ab59e81517a1bc4bfa8333295a9ebe4f518150825006c12c22d4ba38dab093f1d075a1377f0c438a2a36b0c9dbb4296ead8413cbe8b946757cf
diff --git a/sys-boot/raspberrypi-firmware/metadata.xml b/sys-boot/raspberrypi-firmware/metadata.xml
index 8dc8059c3a3d..5a079f400051 100644
--- a/sys-boot/raspberrypi-firmware/metadata.xml
+++ b/sys-boot/raspberrypi-firmware/metadata.xml
@@ -12,5 +12,7 @@
 	<upstream>
 		<bugs-to>https://github.com/raspberrypi/firmware/issues</bugs-to>
 		<remote-id type="github">raspberrypi/firmware</remote-id>
+		<remote-id type="cpe">cpe:/o:raspberrypi:raspberry_pi_4_model_b_firmware</remote-id>
+		<remote-id type="cpe">cpe:/o:raspberrypi:raspberry_pi_3_model_b%2b_firmware</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/sys-boot/raspberrypi-firmware/raspberrypi-firmware-1.20220830.ebuild b/sys-boot/raspberrypi-firmware/raspberrypi-firmware-1.20220830.ebuild
new file mode 100644
index 000000000000..595de0624e7e
--- /dev/null
+++ b/sys-boot/raspberrypi-firmware/raspberrypi-firmware-1.20220830.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit mount-boot readme.gentoo-r1
+
+if [[ "${PV}" == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/raspberrypi/firmware"
+	EGIT_CLONE_TYPE="shallow"
+else
+	SRC_URI="https://github.com/raspberrypi/firmware/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="-* ~arm ~arm64"
+	S="${WORKDIR}/firmware-${PV}"
+fi
+
+DESCRIPTION="Raspberry Pi (all versions) bootloader and GPU firmware"
+HOMEPAGE="https://github.com/raspberrypi/firmware"
+
+LICENSE="GPL-2 raspberrypi-videocore-bin"
+SLOT="0"
+RESTRICT="binchecks strip"
+
+DOC_CONTENTS="Please configure your ram setup by editing /boot/config.txt"
+
+src_prepare() {
+	default
+
+	cp "${FILESDIR}"/${PN}-1.20201022-config.txt "${WORKDIR}" || die
+
+	if use arm64; then
+		# Force selection of the 64-bit kernel8.img to match our userland
+		echo "arm_64bit=1" >> "${WORKDIR}"/${PN}-1.20201022-config.txt || die
+	fi
+}
+
+src_install() {
+	insinto /boot
+	cd boot || die
+	doins bootcode.bin fixup*.dat start*elf
+	newins "${WORKDIR}"/${PN}-1.20201022-config.txt config.txt
+	newins "${FILESDIR}"/${PN}-1.20201022-cmdline.txt cmdline.txt
+	newenvd "${FILESDIR}"/${PN}-0_p20130711-envd 90${PN}
+	readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
+		local msg=""
+
+		if [[ -e "${ED}"/boot/cmdline.txt ]] && [[ -e /boot/cmdline.txt ]] ; then
+			msg+="/boot/cmdline.txt "
+		fi
+
+		if [[ -e "${ED}"/boot/config.txt ]] && [[ -e /boot/config.txt ]] ; then
+			msg+="/boot/config.txt "
+		fi
+
+		if [[ -n "${msg}" ]] ; then
+			msg="This package installs following files: ${msg}."
+			msg="${msg} Please remove (backup) your copies during install"
+			msg="${msg} and merge settings afterwards."
+			msg="${msg} Further updates will be CONFIG_PROTECTed."
+			die "${msg}"
+		fi
+	fi
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/sys-boot/raspberrypi-firmware/raspberrypi-firmware-9999.ebuild b/sys-boot/raspberrypi-firmware/raspberrypi-firmware-9999.ebuild
index 7fe926ad7820..595de0624e7e 100644
--- a/sys-boot/raspberrypi-firmware/raspberrypi-firmware-9999.ebuild
+++ b/sys-boot/raspberrypi-firmware/raspberrypi-firmware-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit mount-boot readme.gentoo-r1
 
@@ -59,7 +59,7 @@ pkg_preinst() {
 
 		if [[ -n "${msg}" ]] ; then
 			msg="This package installs following files: ${msg}."
-			msg="${msg} Please remove (backup) your copies durning install"
+			msg="${msg} Please remove (backup) your copies during install"
 			msg="${msg} and merge settings afterwards."
 			msg="${msg} Further updates will be CONFIG_PROTECTed."
 			die "${msg}"
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index 2a37e6eabbfa..6f1f7d0f1d66 100644
Binary files a/sys-cluster/Manifest.gz and b/sys-cluster/Manifest.gz differ
diff --git a/sys-cluster/k3s/Manifest b/sys-cluster/k3s/Manifest
index 39e0d7436bc0..568eb44f779e 100644
--- a/sys-cluster/k3s/Manifest
+++ b/sys-cluster/k3s/Manifest
@@ -3,10 +3,13 @@ AUX k3s.initd 976 BLAKE2B 155d1598f307b613b0aab30098105551860048ae17f783920976c7
 AUX k3s.logrotated 37 BLAKE2B 8e106b2ae826d1724adb3cf6970cb46b53247ce77a8206ce9ffdaea372ee36f164f38ae8044afe814f9a3aa24d1f3c8d8d75452949ffaee0644948a6ae92fb52 SHA512 f0732ad9d003df155ab9f919909db8c62024c546412f77b3fc6c1a94faf150c532de61e73421a880b7be55edaa4367e01084f59b6f99211a3dcaac1a38f28d68
 AUX k3s.service 597 BLAKE2B 067ea095d2ad948a59e6fcc6ecc569d3f8fa4e802e381e5ccc48988c70c5e8e9e4335afc7cf5a2e830d22bd89cabffbc6fb9161da73599be75b305eb28bea14a SHA512 9741575f844da8ed96e230c443ec6662bff22be8602b420eb74fc6a72d09f36a5fddb8426894e63b7a8c2918a36fc717a38dfbcf003b56f47c13c06c4fc96825
 DIST k3s-1.25.2_p1-vendor.tar.gz 31890900 BLAKE2B 9a60ed25d4df0f8e2c90fe06de5b68656ce177dc5480a91272ecddbb75686ba86e61d600088a0fabeed37c1c28ec3d1ad46c514b8a248b1d0770f686da567a7a SHA512 c31098710c30b81cffbf1fd86084637c2563124e3415b8a83d428ced5e2bf81eb023de9b05a6990a2b8c236f1dab538a8f7fae6ef3105c266c40dd89c426c93a
+DIST k3s-1.25.3_p1-vendor.tar.gz 31914962 BLAKE2B 6c392ec4988f5c875dfe892f9f032c90936a032f4dcaefca6da304c5495c079969b9bdc8f42f888ac0d922e81b965a3b074e3e5a18a960701ca6ec96e39cdc7e SHA512 6610d5660c403ef2ec04c2d35f796e8cb7cc4f3fcf65d209c9ff5e986da14f4d8c594f60eb9e02cc873d210f69af82a41681731e2586945f6bc44bd3cc364ff8
 DIST k3s-cni-plugins-1.1.1.tar.gz 3122345 BLAKE2B 270283ffb746ca97ad147b368143c56bd9641b7ebcb1b2b61f80ffea3336b240b28c9b9496bd2f6eb6d7e5382da4979c26e37eca30ac19fd362ed822ba94f300 SHA512 53dcd363231325553a5c9e804fc9005471fe5c05c87aae0340214c146eba66a3761d73976ba0145d86a663a2b0a1941e6cc5823b6d05e002a9ef18e41e10ac3c
 DIST k3s-containerd-1.6.8-k3s1.tar.gz 10344676 BLAKE2B 18b236d61c710234fc6feefb4b08e36950c02a3a74d92a7bae5286ddf2916d29f636d1c9fb4307ccb6c6f1c7a77441096b0db9c892d5745f32815f4016af7b54 SHA512 b85c5e73c9f6c66c229888d93b3796c3fa4b362ee2ee4f7fb37f760ff241223820c0bec4995e73e9c3d20b81a8fc3676e7b0ed170239c8cb43194aae2701a6b5
 DIST k3s-root-amd64-0.11.0.tar 11878400 BLAKE2B 6227ba08e305f062ed814a6b997313415c08e469b05f0501c86f7df25e8a3c9ecb43675613337f6d038faa5153aae98eb44cad9bc170967e0a216ba5ec27559e SHA512 d181117230ad941b40173c3b7dc3d2bb0f3d44a28e9715d85c752193c6058bb6be4a4b8f061df73fed690629a7b2b330185b38bb90ce7fcc9c808096516cb0a3
 DIST k3s-runc-v1.1.4.tar.gz 2334639 BLAKE2B bc7eb7de29e8ebb9ce146bc77bf6cfc116f4af3e28c0344059183cf0c8082c629ccb235531c368cce99915991b25df0b50b7cbb98b9c6a7d141ba6cc15958651 SHA512 c8e79ad839964680d29ab56a4de255f91192741951673025da6889c544a232d4d392db2da8005d8e22999a37bfbc9c9fe7f6043b165bc4edc2f2a29261d8a3d6
 DIST traefik-10.19.3.tgz 25287 BLAKE2B c43a5e066d78e066bc4449ad1d7a3796c99c5f029244dac5494a452592424a9be057b6a3d8eddd174d8daab2b322c4f54e39eae53fba67e97e1ebdb92ce2fd65 SHA512 6df4b186c4caad09abf47469757c1d26d3b593531704af53eb262208f1efa27b5b09b178c6dd6721e78362877e6ba3b2c8c3bfbc91fe152ce090b53ac283acf9
+DIST traefik-12.0.0.tgz 36268 BLAKE2B 9332e30d593c2c73cf06be8d7813807f6880e40d7f1c78f314b77e2fd2342e91f232f5288d2946eff586fc58c27fa182da30a50f37b91046d37a4aad6d3bc452 SHA512 5cd661ab609fc17c1fb52460c3d1e6ff3ee294f6dc8365b68e8a35a3e4b321b7ca75037eda2869ab72ca14836ba1c72b76d3cd92021dba56dd163b2678448dfc
 EBUILD k3s-1.25.2_p1.ebuild 4065 BLAKE2B b84b43937e5211584bfcdba1c7881904831956e9be40892d4957e5d69cadf499b2457f1ee88138ae7cf5ba68e2a1749c8119328228ceb3bafca59921bb816125 SHA512 5c1602435fbcbd60edd69759811d5d192d2c34122a3c448c5864a14ea658fabf070886e5aec16837b1991debd8598c0a1cf2935a9886c9943c33e12ff9312518
+EBUILD k3s-1.25.3_p1.ebuild 4064 BLAKE2B b69f5b849c04841bcdb44c85e8beb94b3a747a7c0a4093e36d9fd3a1ce4fec79eab523bd9b8e41863408a0a8bbcf5f500e51b41462896c401fd61c473e543391 SHA512 3364faff5571638e171388cfe7bedd7759d8db6b951f7408fdaa80c0af11b83efa1d9f10428c24ae163cddd6ea3001e2a995fa75e069dbfc4b74500d475f37ff
 MISC metadata.xml 515 BLAKE2B dc5e9d23a7b4d84ec392036cd87975b9117133b3a68eb1a69a38637dfca36f4e721be42dbd1ee0dd73585602800ef49d4255ff736be7cdc97e7f2d07b59af99b SHA512 8ee732afdfd59151faa18dbc68075d0c528113b8ea3f9939d0a83fbf7f06deefe2dee27079b7317ee98ea165e81cf4514f1d305564e21b3e1fc4760d2350fd46
diff --git a/sys-cluster/k3s/k3s-1.25.3_p1.ebuild b/sys-cluster/k3s/k3s-1.25.3_p1.ebuild
new file mode 100644
index 000000000000..edd90a3d1c4e
--- /dev/null
+++ b/sys-cluster/k3s/k3s-1.25.3_p1.ebuild
@@ -0,0 +1,102 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module linux-info systemd
+
+DESCRIPTION="Lightweight Kubernetes"
+HOMEPAGE="https://k3s.io"
+K3S_CONTAINERD_VERSION=1.6.8-k3s1
+K3S_RUNC_VERSION=v1.1.4
+K3S_ROOT_VERSION=0.11.0
+K3S_TRAEFIK_VERSION=12.0.0
+K3S_TRAEFIK_PACKAGE_VERSION=00
+K3S_CNIPLUGINS_VERSION=1.1.1
+CONFIG_CHECK="~BRIDGE_NETFILTER ~CFS_BANDWIDTH ~CGROUP_DEVICE ~CGROUP_PERF ~CGROUP_PIDS ~IP_VS ~MEMCG ~NETFILTER_XT_MATCH_COMMENT ~OVERLAY_FS ~VLAN_8021Q ~VXLAN"
+
+MY_PV=${PV%_p*}+k3s${PV#*_p}
+SRC_URI="https://github.com/zmedico/k3s/archive/refs/tags/v${MY_PV}-vendor.tar.gz -> ${P}-vendor.tar.gz
+	${EGO_SUM_SRC_URI}
+	https://github.com/k3s-io/containerd/archive/refs/tags/v${K3S_CONTAINERD_VERSION}.tar.gz -> k3s-containerd-${K3S_CONTAINERD_VERSION}.tar.gz
+	https://github.com/opencontainers/runc/archive/refs/tags/${K3S_RUNC_VERSION}.tar.gz -> k3s-runc-${K3S_RUNC_VERSION}.tar.gz
+	https://helm.traefik.io/traefik/traefik-${K3S_TRAEFIK_VERSION}.tgz
+	https://github.com/rancher/plugins/archive/refs/tags/v${K3S_CNIPLUGINS_VERSION}-k3s1.tar.gz -> k3s-cni-plugins-${K3S_CNIPLUGINS_VERSION}.tar.gz
+	amd64? ( https://github.com/rancher/k3s-root/releases/download/v${K3S_ROOT_VERSION}/k3s-root-amd64.tar -> k3s-root-amd64-${K3S_ROOT_VERSION}.tar )"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+kubectl-symlink rootless"
+REQUIRED_USE="|| ( amd64 )"
+DEPEND="
+	app-misc/yq
+	net-firewall/conntrack-tools
+	sys-fs/btrfs-progs
+	rootless? ( app-containers/slirp4netns )
+"
+RDEPEND="kubectl-symlink? ( !sys-cluster/kubectl )"
+RESTRICT+=" test"
+
+S=${WORKDIR}/${PN}-${MY_PV/+/-}-vendor
+
+src_unpack() {
+	unpack ${P}-vendor.tar.gz
+	cd "${S}" || die
+	mkdir -p bin/aux build/static/charts cache etc || die
+	cp "${DISTDIR}/traefik-${K3S_TRAEFIK_VERSION}.tgz" build/static/charts/traefik-${K3S_TRAEFIK_VERSION}${K3S_TRAEFIK_PACKAGE_VERSION}.tgz || die
+	cp "${DISTDIR}/k3s-cni-plugins-${K3S_CNIPLUGINS_VERSION}.tar.gz" cache/ || die
+}
+
+src_prepare() {
+	local filename pattern replacement
+	default
+
+	local CONTAINERD_DIR=build/src/github.com/containerd/containerd
+	mkdir -p "${CONTAINERD_DIR}" || die
+	tar -x --strip-components=1 -f "${DISTDIR}/k3s-containerd-${K3S_CONTAINERD_VERSION}.tar.gz" -C "${CONTAINERD_DIR}" || die
+	if has_version -b ">=dev-lang/go-1.18"; then
+		# https://bugs.gentoo.org/835601
+		sed -i -e "/github.com\/containerd\/containerd => .\/.empty-mod/d" "${CONTAINERD_DIR}"/{go.mod,vendor/modules.txt} || die
+	fi
+
+	local RUNC_DIR=build/src/github.com/opencontainers/runc
+	mkdir -p "${RUNC_DIR}" || die
+	tar -x --strip-components=1 -f "${DISTDIR}/k3s-runc-${K3S_RUNC_VERSION}.tar.gz" -C "${RUNC_DIR}" || die
+
+	# Disable download for files fetched via SRC_URI.
+	sed -e 's:^[[:space:]]*curl:#\0:' \
+		-e 's:^[[:space:]]*git:#\0:' \
+		-e 's:^rm -rf \${CHARTS_DIR}:#\0:' \
+		-e 's:^rm -rf \${RUNC_DIR}:#\0:' \
+		-e 's:^rm -rf \${CONTAINERD_DIR}:#\0:' \
+		-e 's:yq e :yq -r :' \
+		-e "s:^setup_tmp\$:TMP_DIR=${S}/build/static/charts:" \
+		-i scripts/download || die
+	sed -e '/scripts\/build-upload/d' -i scripts/package-cli || die
+	pattern='git clone -b $VERSION_CNIPLUGINS https://github.com/rancher/plugins.git $WORKDIR'
+	filename=scripts/build
+	grep -qF "${pattern}" "${filename}" || \
+		die "failed to locate plugins clone command"
+	sed -e "s|${pattern}|mkdir -p \"\$WORKDIR\" \\&\\& tar -xzf \"${S}/cache/k3s-cni-plugins-${K3S_CNIPLUGINS_VERSION}.tar.gz\" --strip-components=1 -C \"\$WORKDIR\"|" \
+		-e 's|rm -rf $TMPDIR||' \
+		-i "${filename}" || die
+	sed -e 's:/usr/local/bin:/usr/bin:g' -i k3s.service || die
+}
+
+src_compile() {
+	mkdir -p build/data || die
+	"${BASH}" -ex ./scripts/download || die
+	./scripts/build || die
+	./scripts/package-cli || die
+}
+
+src_install() {
+	dobin "dist/artifacts/${PN}"
+	use kubectl-symlink && dosym k3s /usr/bin/kubectl
+	systemd_dounit "${FILESDIR}/${PN}.service"
+	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+	dodoc README.md
+}
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index 7128de23f746..2bcc32827a0e 100644
Binary files a/sys-devel/Manifest.gz and b/sys-devel/Manifest.gz differ
diff --git a/sys-devel/clang-common/Manifest b/sys-devel/clang-common/Manifest
index 16eb315f9b7d..4be1c4957c76 100644
--- a/sys-devel/clang-common/Manifest
+++ b/sys-devel/clang-common/Manifest
@@ -7,8 +7,8 @@ DIST llvm-project-b34ea582774c057d9bf5591174d683fd3d8aa02b.tar.gz 169735900 BLAK
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
 EBUILD clang-common-13.0.1.ebuild 593 BLAKE2B f7d78facc226d949240f31d10bb01f6a2bbe3c806d7f7c22a78d715d29de74723bedccdeefd029d309b090afe63821e10a1bd27662ff156640820fbca1896bab SHA512 48e5c5f3d4716c15018aa246cf61fbf898c4c459b1f04710da155084a8cf5b8a6df7697c300d297ac48ee1a8a8cff9bc9b4fca712455032f78cb26e9f77ef955
 EBUILD clang-common-14.0.6.ebuild 541 BLAKE2B 87b158e874cf600e23591a8095e0edb4d30d4482600ef8fe38984e9ba9559e6e2226107cd482f355d950392a6a452e1a8ae79d297d5afc3951a7f1c8f6227b5f SHA512 1bd0481468c278f131ec9f87243927b60a59752f4229450559bf8016e9599155a52593810fcdc1cf0aecd4aa1529e8df300d95123a53de18eb326152caafbbef
-EBUILD clang-common-15.0.3-r2.ebuild 3583 BLAKE2B 15f7af306a44cc2e4ad1081d074af52525bd0042cbbb56cb34a2d6a3c501422a619145981843922c96cd99d5f6c380c3ed7c2829fbe466738e65823fb2cc44b6 SHA512 ff1c5fd4aa7944fa3a4d1d7ec433b62e8ac238d7e16834c087654bdc31caf4f5e1319402a8bc5999cbe1e08065b97e003d6d4976168359f0737b54e1542e25c5
-EBUILD clang-common-15.0.3.9999.ebuild 3499 BLAKE2B e646b6cc44fdd8543ff74724a2e8fb02276fd9c591ae2334cf28abbd022c044be82d9fbe6385553f7b175ac8fb57f876e36ae79bdd304a87a3bd8ce5fe97f44a SHA512 0f98a23302a878350e8df9a0d181f3b2ed9df0c29666171c48fbb37204b93e236a79649759c8dc3eb72b7bc965bc3c890716d5d3b3814415528556273ccc6450
+EBUILD clang-common-15.0.3-r2.ebuild 3582 BLAKE2B b40af0942fdac6ca4510b577c85df18c85a15d0f0927b5d83681462559f32f212e328d70f4ce0a68707eb953d010231afea6334c1da68b8c5b1334bf076ecb9d SHA512 3d5d22788808f7b4fb3d08e2b91f971835f08966f1203ca3d4847a6edefaaac7da23a319a146167697d8ce358d97517681ffa45817d7210ac06d46f6d51db5e8
+EBUILD clang-common-15.0.4.9999.ebuild 3499 BLAKE2B e646b6cc44fdd8543ff74724a2e8fb02276fd9c591ae2334cf28abbd022c044be82d9fbe6385553f7b175ac8fb57f876e36ae79bdd304a87a3bd8ce5fe97f44a SHA512 0f98a23302a878350e8df9a0d181f3b2ed9df0c29666171c48fbb37204b93e236a79649759c8dc3eb72b7bc965bc3c890716d5d3b3814415528556273ccc6450
 EBUILD clang-common-16.0.0.9999.ebuild 3432 BLAKE2B 92679a03e3a45df587198ce70dfaebbc674c47229b14040c93353dd4c384636df7ff6591138c8aedf00fcee0f75edef3fc9f3257058f1d8fcdcade0c2be8c244 SHA512 e33fd7582bbe2d3ad4ed3405a92db98d7365d040df39f7e32d2f75b093e346ec88230813c607983398f9c310bc0925b61d9b438905e8177665db123e1b7d064c
 EBUILD clang-common-16.0.0_pre20221016-r1.ebuild 3432 BLAKE2B 92679a03e3a45df587198ce70dfaebbc674c47229b14040c93353dd4c384636df7ff6591138c8aedf00fcee0f75edef3fc9f3257058f1d8fcdcade0c2be8c244 SHA512 e33fd7582bbe2d3ad4ed3405a92db98d7365d040df39f7e32d2f75b093e346ec88230813c607983398f9c310bc0925b61d9b438905e8177665db123e1b7d064c
 EBUILD clang-common-16.0.0_pre20221023-r1.ebuild 3432 BLAKE2B 92679a03e3a45df587198ce70dfaebbc674c47229b14040c93353dd4c384636df7ff6591138c8aedf00fcee0f75edef3fc9f3257058f1d8fcdcade0c2be8c244 SHA512 e33fd7582bbe2d3ad4ed3405a92db98d7365d040df39f7e32d2f75b093e346ec88230813c607983398f9c310bc0925b61d9b438905e8177665db123e1b7d064c
diff --git a/sys-devel/clang-common/clang-common-15.0.3-r2.ebuild b/sys-devel/clang-common/clang-common-15.0.3-r2.ebuild
index 819076f87723..3b0e0815f078 100644
--- a/sys-devel/clang-common/clang-common-15.0.3-r2.ebuild
+++ b/sys-devel/clang-common/clang-common-15.0.3-r2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
 IUSE="
 	default-compiler-rt default-libcxx default-lld llvm-libunwind
 	stricter
diff --git a/sys-devel/clang-common/clang-common-15.0.3.9999.ebuild b/sys-devel/clang-common/clang-common-15.0.4.9999.ebuild
similarity index 100%
rename from sys-devel/clang-common/clang-common-15.0.3.9999.ebuild
rename to sys-devel/clang-common/clang-common-15.0.4.9999.ebuild
diff --git a/sys-devel/clang-runtime/Manifest b/sys-devel/clang-runtime/Manifest
index 3beaa449a9d4..a32eb0d88b13 100644
--- a/sys-devel/clang-runtime/Manifest
+++ b/sys-devel/clang-runtime/Manifest
@@ -1,7 +1,7 @@
 EBUILD clang-runtime-13.0.1.ebuild 704 BLAKE2B a75c3997e7f744e1c50f7672bcd3564229fb1b55b8e2a5dac7ca38e8d390d61b76df6dec7134356ddf6487b63adb613ec7484240681f6c5cec9d7fe41912c353 SHA512 a1d245b587ec92bdca8b557d7e821d5f217bb1866a4804539305068d946c42355b1e84e3491d238b549c24822ad60aa872f761ef4418895b13d68f7574fef9f8
 EBUILD clang-runtime-14.0.6.ebuild 760 BLAKE2B 0f6cfb8536569ffe2a09305e71056309690ad1c8e92543e64025bd5e009eac35018ec22b2c0f80c12f3a527cc7e0bfe4ec1bfcb2dd9dea54106abf46b13e5592 SHA512 580efee12fe0e53447f5644fad248ebded8ae6cd8cb5871cb38bb3148091886b6fb9a57ac712d3158d5c3fc38c043b0bfbf62fc550a609752a42c23e605b0ded
-EBUILD clang-runtime-15.0.3.9999.ebuild 700 BLAKE2B fc3ea6d50378cd569aa9a2a30cae69dfe59524f7c9edf5a4f6e39d5d07568224625ad286e857d7d852aef95903cfe9804f54e83aa093269ca2287f57fba2ebb2 SHA512 0b88353d5a7fda68a034017bac76c37ef36d8477b52f4446e81ff01861d50f1140933b54058ad3a3bfa5cade8d8ad2c86cfe5c580b682a9bb03f2e471d3e99ed
-EBUILD clang-runtime-15.0.3.ebuild 766 BLAKE2B db9c38e5d06c9e20d002696b879f61cf79cfe43059224f4a30d9e472a0ecd4a9298d03767e82ac29abcfba283754cb06c1b460e759763dcad130446323af4ff8 SHA512 475cd0538899a4d2a0132f79efbe7fd928a41e7e11798a35b5ba10b3bfcb9bff01b471af5a611f40d3981d2b9d9902fa1bc223199429685de475c38396ffa53e
+EBUILD clang-runtime-15.0.3.ebuild 765 BLAKE2B 2761c21c85fdf90d5d56088b496717b0e17fc5fe405a47d3cef2fb81f6af09dbe01944ca1adff3387c354cd2512cdfe2e994ea626cfddcf4698f136e2ec8c9ef SHA512 fb66d2faeec472633699e6913600fd9a372fa4eccf05d1d46390c58710ceb1ad45f34d16e8223b1842d6708149848c49eafe4dfe553b42d364ee8559c570233a
+EBUILD clang-runtime-15.0.4.9999.ebuild 700 BLAKE2B fc3ea6d50378cd569aa9a2a30cae69dfe59524f7c9edf5a4f6e39d5d07568224625ad286e857d7d852aef95903cfe9804f54e83aa093269ca2287f57fba2ebb2 SHA512 0b88353d5a7fda68a034017bac76c37ef36d8477b52f4446e81ff01861d50f1140933b54058ad3a3bfa5cade8d8ad2c86cfe5c580b682a9bb03f2e471d3e99ed
 EBUILD clang-runtime-16.0.0.9999.ebuild 1374 BLAKE2B 9699c87947cae5b33b56d8d2edfc7eb1128f3f9355986f74874e4e8b481fb513e8a52523c8b97cf56db364dff311f7d07afa0acb04d37ba30be2918f24226a81 SHA512 cc6a00e72f472b8d1144dc61ec773b41268ed69fa56330e59185775d6fa242a3b884bc8cd539a80375deb22d42bbf53a30d0bf074e0afb706089e20a23c513f0
 EBUILD clang-runtime-16.0.0_pre20221016.ebuild 1374 BLAKE2B 9699c87947cae5b33b56d8d2edfc7eb1128f3f9355986f74874e4e8b481fb513e8a52523c8b97cf56db364dff311f7d07afa0acb04d37ba30be2918f24226a81 SHA512 cc6a00e72f472b8d1144dc61ec773b41268ed69fa56330e59185775d6fa242a3b884bc8cd539a80375deb22d42bbf53a30d0bf074e0afb706089e20a23c513f0
 EBUILD clang-runtime-16.0.0_pre20221023.ebuild 1374 BLAKE2B 9699c87947cae5b33b56d8d2edfc7eb1128f3f9355986f74874e4e8b481fb513e8a52523c8b97cf56db364dff311f7d07afa0acb04d37ba30be2918f24226a81 SHA512 cc6a00e72f472b8d1144dc61ec773b41268ed69fa56330e59185775d6fa242a3b884bc8cd539a80375deb22d42bbf53a30d0bf074e0afb706089e20a23c513f0
diff --git a/sys-devel/clang-runtime/clang-runtime-15.0.3.ebuild b/sys-devel/clang-runtime/clang-runtime-15.0.3.ebuild
index f0ec98510540..1b2d7daba521 100644
--- a/sys-devel/clang-runtime/clang-runtime-15.0.3.ebuild
+++ b/sys-devel/clang-runtime/clang-runtime-15.0.3.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://clang.llvm.org/"
 
 LICENSE="metapackage"
 SLOT="$(ver_cut 1-3)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
 IUSE="+compiler-rt libcxx openmp +sanitize"
 REQUIRED_USE="sanitize? ( compiler-rt )"
 
diff --git a/sys-devel/clang-runtime/clang-runtime-15.0.3.9999.ebuild b/sys-devel/clang-runtime/clang-runtime-15.0.4.9999.ebuild
similarity index 100%
rename from sys-devel/clang-runtime/clang-runtime-15.0.3.9999.ebuild
rename to sys-devel/clang-runtime/clang-runtime-15.0.4.9999.ebuild
diff --git a/sys-devel/clang-toolchain-symlinks/Manifest b/sys-devel/clang-toolchain-symlinks/Manifest
index 4f4e856dad4b..3f47acaf373b 100644
--- a/sys-devel/clang-toolchain-symlinks/Manifest
+++ b/sys-devel/clang-toolchain-symlinks/Manifest
@@ -1,4 +1,4 @@
 EBUILD clang-toolchain-symlinks-14-r2.ebuild 1154 BLAKE2B 1da81bdc43afd21ad3f45e3ede1decf1f2eb0aa0dd5a451b28b06a74837cb1354e785784d723a770b7fd3e4dfaeb3b7d095d8579ea07cc798c33d65f9fd6fb9f SHA512 f02f2c7c21def93692503fceae45f8aa6abd608ad99b3be0a63a85f80b54899b201457ee56666161c87d0039bc512eef2bbf6f819807f236e52ac2d88f4bbe54
-EBUILD clang-toolchain-symlinks-15-r2.ebuild 1154 BLAKE2B 1da81bdc43afd21ad3f45e3ede1decf1f2eb0aa0dd5a451b28b06a74837cb1354e785784d723a770b7fd3e4dfaeb3b7d095d8579ea07cc798c33d65f9fd6fb9f SHA512 f02f2c7c21def93692503fceae45f8aa6abd608ad99b3be0a63a85f80b54899b201457ee56666161c87d0039bc512eef2bbf6f819807f236e52ac2d88f4bbe54
+EBUILD clang-toolchain-symlinks-15-r2.ebuild 1153 BLAKE2B f67c2005592edb7f5f931138bbb54524d0af1d0f9fdbb962b37b10551f021cebe6625e67d8d4d697ac114a04ffc3f0aa11fb0b1aaea1e43d859bbc0742c50dfc SHA512 7e923b1cb4a9746977ec941d545c5bf8727f076858a898e67b324e86c3552fd0b539fca5b14f7142c66696990c1874c591dbe1c9569b5fa5297e0c2c2e1f5c2a
 EBUILD clang-toolchain-symlinks-16-r2.ebuild 1099 BLAKE2B 427a21d153852b4964b2ac1707513765f64501fd20102c64aa14eb6514ec33804fef15caeea234fe205d313f8fc9a4757e8c3bb0c092e2cee19a371a15afe407 SHA512 4df541a68c2c40496ad02c30e5cf8fbe442421cf2d5ffc5c43bfc0ba709c64cab307591522d432eb26f977bbcf14ddf6ecede867697b979a283e8ff64e720b30
 MISC metadata.xml 904 BLAKE2B d2c8a31355b0f3bea6c5b4c72d198f40bf14b6908f5a3f765b48fffb2ba3e4f09a8bb37c87ea4e7d9b4e1de0a3ad2c80bdca6feb45538c973119f27ba6329ad8 SHA512 846548593c071d6905b56984c6924086d5f03929c813be986c89c57a6924d1976975b29769ee60a2796287753aa3453608794af8d36cf48b76c55920778c27d4
diff --git a/sys-devel/clang-toolchain-symlinks/clang-toolchain-symlinks-15-r2.ebuild b/sys-devel/clang-toolchain-symlinks/clang-toolchain-symlinks-15-r2.ebuild
index e8399381397f..2b8b1302ae87 100644
--- a/sys-devel/clang-toolchain-symlinks/clang-toolchain-symlinks-15-r2.ebuild
+++ b/sys-devel/clang-toolchain-symlinks/clang-toolchain-symlinks-15-r2.ebuild
@@ -12,7 +12,7 @@ S=${WORKDIR}
 
 LICENSE="public-domain"
 SLOT="${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv sparc ~x86 ~amd64-linux ~x64-macos"
 IUSE="gcc-symlinks multilib-symlinks +native-symlinks"
 
 # Blocker for bug #872416
diff --git a/sys-devel/clang/Manifest b/sys-devel/clang/Manifest
index a138e505c1a0..e1899d48947b 100644
--- a/sys-devel/clang/Manifest
+++ b/sys-devel/clang/Manifest
@@ -16,8 +16,8 @@ DIST llvm-project-b34ea582774c057d9bf5591174d683fd3d8aa02b.tar.gz 169735900 BLAK
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
 EBUILD clang-13.0.1.ebuild 11294 BLAKE2B 33760cbd488068389efed5c011b15288021d1f93a371d5114301a5f86e815b3a1e9ae21ed6304d90916778f2312db17339d85b6d76e5e8255614706ddc3a7cf6 SHA512 b49773a02c15c4e869682664bd5703d7e08f60be9558fdbd78da19be5d5a1158093729260106cffe4cd8a6295ba740e42cc43d07da00ed8ead14dc45899ce80a
 EBUILD clang-14.0.6-r1.ebuild 11719 BLAKE2B 743e26b68f15e8b4aa7acfe4f7abd095fe42a3ba6dafdff278d0bfe06f57679490e0940a1029f97d5cc3f6d4ac8b44ea63283bbad1052623ee0048fdbbeb54e0 SHA512 ec6da9dcbed9f078307e8265362a5b39dac9d97d8aadbba16395ee7ddb442d34d1d2a1e9e880da41dbdb51fcf3c741c33ac469e5f6ffa4d091adb4d1743fa12b
-EBUILD clang-15.0.3.9999.ebuild 11753 BLAKE2B ee5d7c5223f01c58267128213a5298c323ce83b4d4d864df69fd7452d8d5d481a441114734f5e315de3ddab390338d1bc0e3b1eb221a0b92f7bc2e25dde0ccc8 SHA512 ad6948948729c0ccbd44ae0a334731e48cfb5bd499883805628d44db8281ab06fbc8a5cffd9ee41ab6142039db5d107647a41e5c241d0d1f6f0dd09841e4f2b4
-EBUILD clang-15.0.3.ebuild 11824 BLAKE2B b4f8aa8452393d6c9e49655ae69c19f2ed83297562fb75f172dc4113216c0480a985d6a6c34644f8f84185802ab8706821435315755528c8cee4bdc12cd7094d SHA512 d5fab69868f017380d4062a05833329172e2db7489aea1a77ddf3d34d579a8a4b7bb16804a77eb25237be855894121b172eaa1afda1773dd60fee8890e244cb0
+EBUILD clang-15.0.3.ebuild 11823 BLAKE2B e1f2a9bc9f0d0784553a3e096814b8a14ee459044881013577aa26fdf42ff5a48850124b3e795074fbbd86807af6c23337c3211d5fe04c92c966f8215a57455e SHA512 a1d08b0f416cf8c547df73c3510df5f00b8cfdaa5b4f65abad91953474f7aeb92277ce01923fda863ac095ae1a4fc94d4603bcb3dbc5766985d0b8d4749109e6
+EBUILD clang-15.0.4.9999.ebuild 11753 BLAKE2B ee5d7c5223f01c58267128213a5298c323ce83b4d4d864df69fd7452d8d5d481a441114734f5e315de3ddab390338d1bc0e3b1eb221a0b92f7bc2e25dde0ccc8 SHA512 ad6948948729c0ccbd44ae0a334731e48cfb5bd499883805628d44db8281ab06fbc8a5cffd9ee41ab6142039db5d107647a41e5c241d0d1f6f0dd09841e4f2b4
 EBUILD clang-16.0.0.9999.ebuild 11570 BLAKE2B 0e6673a31b169a6523749a2fa53b8704c6d7cf7d221d1c3a28266fcf38ae576e61dcdb5bac59e35b1b07d529539ee5aa288571d893c7dca928f3b98bcefd7da0 SHA512 34447f8df00c8ded20d603845d602c5aa0336bc42133bdf54b79bb56982ffc8920a4aee4e9368c9b9922b5d4298049ad31e2b56a5359b2a00e6caf7660d58f81
 EBUILD clang-16.0.0_pre20221016.ebuild 11624 BLAKE2B e312140a5d44e3ca13eee40c89c52f764492336ab91ef75d53af8029ea5eacd60ac5a7dcb62417dbfc551ace8a03e6f34efb2484d4bb0aea7e88653ddbb2212d SHA512 80c577f21c9c7b30fd2dd110e22544d50cdfde623a79474fa87c25e962408fb5b61b0ecb9c74a81143505b0a4163328b8508ddbe728553e80476de1ba0295fa3
 EBUILD clang-16.0.0_pre20221023.ebuild 11568 BLAKE2B c422d84f4f08994c4a80a4a1336136a1148cd4e18d91394c00b35d4af61a2f6621fd72fea16697b1f66d1b999ed7a003603ea6c42649c03ab5a74311c486e792 SHA512 4bc10a373e88870a5f9b5939abeda43286e982650e7e0efe82cd41315a542dc7667d45941d4c6ddfbada4f5eb576aa5a49540e6eaf7fdcbeb669fbc7d9c43377
diff --git a/sys-devel/clang/clang-15.0.3.ebuild b/sys-devel/clang/clang-15.0.3.ebuild
index 45ec3a2786f8..a06bec819064 100644
--- a/sys-devel/clang/clang-15.0.3.ebuild
+++ b/sys-devel/clang/clang-15.0.3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT"
 SLOT="${LLVM_MAJOR}/${LLVM_SOABI}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv sparc ~x86 ~amd64-linux ~x64-macos"
 IUSE="debug doc +extra +pie +static-analyzer test xml"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
diff --git a/sys-devel/clang/clang-15.0.3.9999.ebuild b/sys-devel/clang/clang-15.0.4.9999.ebuild
similarity index 100%
rename from sys-devel/clang/clang-15.0.3.9999.ebuild
rename to sys-devel/clang/clang-15.0.4.9999.ebuild
diff --git a/sys-devel/flex/Manifest b/sys-devel/flex/Manifest
index ed41cf8ff7ed..0c527e387c4f 100644
--- a/sys-devel/flex/Manifest
+++ b/sys-devel/flex/Manifest
@@ -1,6 +1,8 @@
 AUX flex-2.6.4-fix-build-with-glibc2.6+.patch 20281 BLAKE2B 859e15a65473a74635db3759f3607fd6a96ffa0949a1b532bd31ad589391d9fee9f14b04c741b3e50224f5e31ce987398344009d8cdb20dadfa15383b6f03067 SHA512 e9a03bf18a6fbc3546d96213cb483d46fa0b18609e03b37c4e5ac5427935d2694bd86ee73cf5c28ffd6bd7cec018f203e82e7c685e9426a7ba2e6d60d2a44135
+AUX flex-2.6.4-implicit-func-decl.patch 1911 BLAKE2B bb4fea60d5b4650d734d761294e2dc91c71d8f9b90c920ac95aeb6c84ee8e08a80e8092ea337aa31f3de183f6da27fde8b43d679d8e19297bc0d225e9bb975d0 SHA512 4d4466e1c8dd9608a9fc0fb0ad37997bc3646f7cbccf7b2d209af302266cbe3f6dc3ed72ead660b4223833bde645343301a698db49544606568d18af5c32d0b1
 AUX flex-2.6.4-libobjdir.patch 770 BLAKE2B 0771af247117123e3efed3e2a0c8a71573c81dc1e8d2e364a887aa49d3bf3a5198042396d1df1e2c0ae196df098241eba0e2b35e953f9a5be3d43d2408a97536 SHA512 76e3a3e19fe9c9b6b3e0fcfea98feb0eaf03fdc683e3695045b3246b57538a52842b455a9aebed87548d2b8ee3e7d34dca5ff355f06648911866b3b621b40f86
 DIST flex-2.6.4.tar.gz 1419096 BLAKE2B c003d4f764f7f4d41e33af7ee28c2af272a9f0aee6ba7c2494ba96722d8d0b18f7a3f745217e9a2cecb43b6863328267a810280670c04464156b3eb3d7ee9d62 SHA512 e9785f3d620a204b7d20222888917dc065c2036cae28667065bf7862dfa1b25235095a12fd04efdbd09bfd17d3452e6b9ef953a8c1137862ff671c97132a082e
 EBUILD flex-2.6.4-r1.ebuild 2022 BLAKE2B 82ba69679aa66e9e66a3e36c037e01902394f9f99e2e057477e3c3f30f5c55a9c0a6c52c69d3a6d6df118f0cbac0c95500e04d17ec01481baf64c7997287d588 SHA512 e25615e3b8f985e07d0c0c6175467484ba09c817e411eb0cb2d30da6ecb036a316745270def159c9e294af506115adcf1c7e0ceb1aa267f2fa280d1ffc1d7d09
 EBUILD flex-2.6.4-r2.ebuild 2326 BLAKE2B 39ec3e1f7392d4705f36a513c6161ddbe147a311d8eecd08e66f1f7ba7cea20dc16b98acc3a280560f66e74766945fc2d47e3ef8d44c1eaac73e0e0c889968b1 SHA512 ed939eea185f0cbc27c2128c3b248494ef66b19f2b6106dce04ab9019a8d9b9d01b40233b44399ba231663938718c76f4ba7eab8b4c8cbedec91180453684126
+EBUILD flex-2.6.4-r3.ebuild 2379 BLAKE2B 4ec76a4aaa73d5bb4145f515d65dd9a86d867ad8fe7b1904fa1916dc6aec42f491a9a2c8a0d896e371dd8b6c5a818b10a148ff3887ec27785324b24936f3dedb SHA512 eef7a159af9235d934cfc8b705b8e35e3a56f379c40957178a77ac9ad5fa0ac00bf5d3cd772520cd11db82e4806f7c13884bae0b7fe0ad9c3ded1392822d1c8b
 MISC metadata.xml 444 BLAKE2B 28bd0cd35c6ab4386dffdf221e6b43927e47971bea62a0f0395e3cd6725567114675055dc1267ce5ffbd42fe4731a806b4e5666ea6b83ad4bcf4d35b5529ce85 SHA512 53f91d714d7f4401f7d986d743c08a817d794147f9b277d829a4e8065ce91ce00123cd5b42957af60ef9051568a214b7ce791aa8a4baf82a5179859971357d56
diff --git a/sys-devel/flex/files/flex-2.6.4-implicit-func-decl.patch b/sys-devel/flex/files/flex-2.6.4-implicit-func-decl.patch
new file mode 100644
index 000000000000..1900ae0529b9
--- /dev/null
+++ b/sys-devel/flex/files/flex-2.6.4-implicit-func-decl.patch
@@ -0,0 +1,50 @@
+https://github.com/westes/flex/commit/4b5111d9772b5c160340ca96f08d30d7f6db5cda
+https://github.com/westes/flex/issues/436
+https://bugs.gentoo.org/705800
+https://developers.redhat.com/blog/2019/04/22/implicit-function-declarations-flexs-use-of-reallocarray
+
+From 4b5111d9772b5c160340ca96f08d30d7f6db5cda Mon Sep 17 00:00:00 2001
+From: Explorer09 <explorer09@gmail.com>
+Date: Mon, 4 Sep 2017 08:28:53 +0800
+Subject: [PATCH] scanner: Include flexdef.h at %top block of scan.l
+
+config.h may define macros that alter the API of the standard library
+funtions, and so it should be included before any other standard
+header, even before the skeleton's standard header inclusion.
+
+For example: config.h may #define _GNU_SOURCE that would expose the
+reallocarray() prototype from <stdlib.h> on glibc 2.26+ systems. If we
+include <stdlib.h> before config.h, reallocarray() would not be
+available for use in lex file since the second include doesn't help
+due to header guard.
+
+For now our config.h might `#define malloc rpl_malloc` -- this
+substitution must work before including stdlib.h, or else the compiler
+will complain about missing prototypes, and may result in incorrect
+code in scan.l (gcc warning: return makes pointer from integer without
+a cast [-Wint-conversion]).
+
+Fixes #247.
+--- a/src/scan.l
++++ b/src/scan.l
+@@ -1,5 +1,11 @@
+ /* scan.l - scanner for flex input -*-C-*- */
+ 
++%top{
++/* flexdef.h includes config.h, which may contain macros that alter the API */
++/* of libc functions. Must include first before any libc header. */
++#include "flexdef.h"
++}
++
+ %{
+ /*  Copyright (c) 1990 The Regents of the University of California. */
+ /*  All rights reserved. */
+@@ -32,7 +38,6 @@
+ /*  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR */
+ /*  PURPOSE. */
+ 
+-#include "flexdef.h"
+ #include "parse.h"
+ extern bool tablesverify, tablesext;
+ extern int trlcontxt; /* Set in  parse.y for each rule. */
+
diff --git a/sys-devel/flex/flex-2.6.4-r3.ebuild b/sys-devel/flex/flex-2.6.4-r3.ebuild
new file mode 100644
index 000000000000..1f1ebfe61893
--- /dev/null
+++ b/sys-devel/flex/flex-2.6.4-r3.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic libtool multilib-minimal toolchain-funcs
+
+DESCRIPTION="The Fast Lexical Analyzer"
+HOMEPAGE="https://github.com/westes/flex"
+SRC_URI="https://github.com/westes/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="FLEX"
+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"
+IUSE="nls static test"
+RESTRICT="!test? ( test )"
+
+# We want bison explicitly and not yacc in general, bug #381273
+RDEPEND="sys-devel/m4"
+BDEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )
+	test? ( sys-devel/bison )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.6.4-libobjdir.patch
+	"${FILESDIR}"/${PN}-2.6.4-fix-build-with-glibc2.6+.patch
+	"${FILESDIR}"/${P}-implicit-func-decl.patch
+)
+
+src_prepare() {
+	default
+
+	# Disable running in the tests/ subdir as it has a bunch of built sources
+	# that cannot be made conditional (automake limitation). bug #568842
+	if ! use test ; then
+		sed -i \
+			-e '/^SUBDIRS =/,/^$/{/tests/d}' \
+			Makefile.in || die
+	fi
+
+	# Prefix always needs this
+	elibtoolize
+}
+
+src_configure() {
+	use static && append-ldflags -static
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	if tc-is-cross-compiler ; then
+		# Similar to workaround for procps:
+		# - bug #705800
+		# - https://sourceforge.net/p/psmisc/bugs/71/
+		# - https://lists.gnu.org/archive/html/autoconf/2011-04/msg00019.html
+		export ac_cv_func_malloc_0_nonnull=yes \
+			ac_cv_func_realloc_0_nonnull=yes
+	fi
+
+	# Do not install shared libs, #503522
+	ECONF_SOURCE="${S}" econf \
+		CC_FOR_BUILD="$(tc-getBUILD_CC)" \
+		--disable-shared \
+		$(use_enable nls)
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi; then
+		default
+	else
+		emake -C src -f Makefile -f - lib <<< 'lib: $(lib_LTLIBRARIES)'
+	fi
+}
+
+multilib_src_test() {
+	multilib_is_native_abi && emake check
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		default
+	else
+		emake -C src DESTDIR="${D}" install-libLTLIBRARIES install-includeHEADERS
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	dodoc ONEWS
+	find "${ED}" -name '*.la' -type f -delete || die
+	rm "${ED}"/usr/share/doc/${PF}/COPYING || die
+
+	dosym flex /usr/bin/lex
+}
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index 6048c37ca0af..e61978ed4c6b 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -1,35 +1,24 @@
 AUX gcc-configure-LANG.patch 2052 BLAKE2B 28c36f4992e41305ee421dade5eaaac34e3bdc523665b03f360f2bc01e8f69e9dc48052edb80dece63ab561e80325b4f125502482eb16f7324f1c03670021550 SHA512 a694c7ac2f45cc657097ff5b0cf1356ac88a9c06035c9ba15167e9d444844d0d8a478eb1b9b62195dd063774f79697b9148b9cdb6c261640b472c291061b2129
 AUX gcc-configure-texinfo.patch 341 BLAKE2B d2ea3b2ea08f5d3a498ba27d0fb95e325097e2104e55caa28b66515cb48662649140d90b639369aedc54b2b1178fa4b49cda442f5f504e09d88a2efa45a5057c SHA512 e8d34c5077409df5495cf0c5fbf5e77f841c5698108fa6a5fde33eb28202c685603bdefd8368918e55f30c4b995e895d71d64c715c1ec2b017e09eb2c54c09ff
-DIST gcc-10-20220922.tar.xz 71765508 BLAKE2B f5cc860ea6a22374e74a4d0f473b1041488e63127b53de80f5e4adc7ecb4b2956358f2b474eec64c03a26b06a79ac2568d0fea0e95d3b16d970986fd8896a6dc SHA512 f493ebc8e960c861a85f2a2cf9ec07399b4e20a2e2ae9451c7b4997dbd30b1174eb4c850fab9ed92460012be571ca08153c44ff71ca57ab1c340e47115ef28a7
-DIST gcc-10-20220929.tar.xz 71808912 BLAKE2B 5e1091e3ecc6f05df663f77a358c2147e01de07c33ee5312f045df519df3c7ef9a4424a7a8857e7f0cb8b2d7f0c81d01c3aa666fb8f97d5a05536f26bddc85dc SHA512 267283ccb4edfc695e2770753513656c071a58d571509d8c752b1f80b0e8a30730933c1b0ee8d6cbf7d2faef9987aea41c387fea7f59996b73ea9d124cfe7b77
 DIST gcc-10-20221006.tar.xz 71755692 BLAKE2B 0099821e5fcd5e1a069369a72f105607cb7f20fbef3d627a598d8c7a6439491e050533d6577b4f7953aabb52daf926ffc8eb9cecd8853833a14c90bd878e1ad9 SHA512 3fc1dceff31ec8a84babe31d88a312d9d3d30450ff0c42730b9a9fe45c0fc9509216fb95cd84df7477faebe2b9b7d8f7e269c9e76cecc05417dc6192e3b96c67
-DIST gcc-10-20221013.tar.xz 71758872 BLAKE2B f3bf7e72f29012fc360be09fc578048d5f1dd241803343dc3e2ec595ea326df4abfb577234d0f0854392a15c9ec4575e9dd58a6721e5115e0c10262aa422204d SHA512 c2c9d5fc6680a21b39377936b3bb400b7db3e3dfeef1a9ac685088cacf6892ecd5ee052197902831b422f624ba0bf8cb426af6b55e9de6b5f0279d6b1791d628
 DIST gcc-10-20221020.tar.xz 71763540 BLAKE2B df8c6c45be25afdf0a0892e26867e863bbf838d7ec8e3d063db9fad32a3ce367e4e42ed9f85b16ca553784510a6938c24c38bc0a9e03f60ea822001fccbf7d9c SHA512 73fdb6e8d833125cfd46dd1efbbb237711c7b04cf8b70674b21e88f1a8819ea695ec7ce652976802e6f76bf84da3e5ff69600ba657a083dd0a8794eea4fe8248
 DIST gcc-10.4.0-musl-patches-1.tar.xz 3808 BLAKE2B 804d1fcc451dcd03be71240dd498ec2d179869571d44012967c48dccf5a478dd8c55000a964a80fdd5584d739a777dee1c83241cffce514ef002df2572854a67 SHA512 83e4a9c0f7062baf0c606a2bcc56a818494991403d7577dea65f04bbc25bdb786a5889b80d45d80e7f4be07c1aef786802cbfcfafd1a17ec255a2d4e93a77570
 DIST gcc-10.4.0-patches-5.tar.xz 17056 BLAKE2B f336d69a8ad105b8c4a84e8248a5b8a88175d3f1d67d32c6bee1780d252d86947059bd624992e6292610e86c9012f4d901a1a54df0d184dd023d404a0707700e SHA512 aa8fb42f20587f8519e7b06037da4d8f7d386b63e228b239a0445a51df4e401940fcd81482381d966622054aef3e0db06d1def5c74ac3d3dcc9c75c3b966c758
 DIST gcc-10.4.0.tar.xz 75018092 BLAKE2B ec1169025d3896b70ab80a4b8ce5040763a95529fc7e120c6bc3a3eb1db5cf938ebde347c1e595a8ff7d4081e79ded6252702d7a1a09648449b7a0783188e434 SHA512 440c08ca746da450d9a1b35e8fd2305cb27e7e6987cd9d0f7d375f3b1fc9e4b0bd7acb3cd7bf795e72fcbead59cdef5b6c152862f5d35cd9fbfe6902101ce648
 DIST gcc-10.5.0-musl-patches-1.tar.xz 3816 BLAKE2B 5995f934a40665d877342853fde8b414eed8770c72e6b11b295b7e7b3c9d38d7407dff63b5751f4449f6fa842c02e87f156cc868e7436a8313f7c8514242d255 SHA512 b93cc54cd7b78fdc487df7c449b03bbfd10094e45f3f8eef20cd69f27a68a14817fe662a2ec119b384eea2dad0491b70f838d010457e386700030b76457afad6
 DIST gcc-10.5.0-patches-0.tar.xz 16188 BLAKE2B 3fe3163c4960ff02eb792b2d00b9b20e1c2b44ad2d2e79661ffa0a5795b1bb631bce83c506f485765a7b971e6d391ebc1803c327f0d8d06e457610f5d6074c90 SHA512 fde1fec92df535416221827d48daf7d498f675da5697bc15bb4e17ccfedf6e6705dd28f57a3c9ebc8065b49328246fa5aa1fd90bd88bc27fe2b7b3e924f0df15
-DIST gcc-11-20220909.tar.xz 75778496 BLAKE2B 6905614b33c1fa74caf409e4a6e87d0d38464e3f965ba92bba4167608af1143e69540b023626578437bcc4d631f94fc60e72e09b32c586be5c1dd6d29774b275 SHA512 22afab5e99cf787aac0eac2b4e5b7f663dd2a9fa82f4d13c08fca8b79007f5937cdbd8c5d49ae31d4b3267def09c9030c5c1dad4bd28c8d28050c4273810cc5d
-DIST gcc-11-20220930.tar.xz 75795296 BLAKE2B 4c83160b961f77efa138f011cd7cef59553e87c272f7ba46fd821832e90cb11336aab1b81039abc9ad4e642232c72ef6bd82061dedf39f97634e834a4d34e307 SHA512 f64a28ceb8a157ba569868d9ed392e242f4ef328d0427163b090ff0a4a3dd69abce8f6fc92c9dc8fa00683d77f3a35a1052a74a64778c533c60a8e6e784a2f27
 DIST gcc-11-20221007.tar.xz 75790520 BLAKE2B de52f7fc5c7f5f82d9cbaeaa13b216e149a4aac8162188c628007c17ddb40aa838d19f2ca18216e8bfe5df2d21438f10c8e87298b53cbde4359f72c9cff87589 SHA512 b785236a00647041c9ea4552e5ea82a09e23a801b029773ba77bfc03675c530369ad0b5fc279330f3d8dd4b9b40aeaa9de84a39b6397f73984b7e2fdf8f0bad2
-DIST gcc-11-20221014.tar.xz 75801968 BLAKE2B 788ba84da31aa209e96039b0d1336dd15c2d69497f458d5943656f375cad36293df603e563a96a238d2d0315f9c823f2ec42aa74e140d48dfa7ce571169d5575 SHA512 67755db033c32d8719e653c6742f5fb7b4e235f0d134bb49de5522f2f8caec6e4df4bbdf47f2fb4b877af041940ede68f54c34951d63d69d76ef9f8888ddd251
 DIST gcc-11-20221021.tar.xz 75798884 BLAKE2B 86475cbeb12b134a1123695375f3074ad84555b8c74e4159b400453f8b17ffc868b3497c7a8ad505617c85f519350d644ee7b5454263aec8da1a44ebd3972884 SHA512 322a957eb588008f19e35d7f5ed95a7fc8bbd5d49c7e4a97433d57be007202dfcb7fee0dcbc6fe26f372878c262634242d864c5276a3ef8975c9aeae766b5016
 DIST gcc-11.3.0-musl-patches-1.tar.xz 3856 BLAKE2B f511f8b4c0696771d906beee9645b5d009ea4b673602baa1ca562d6f23c5b0caf2012aae93578671624617c4286e3937d79a7383d6a03bb438c5b774a06fe8e6 SHA512 cd375ff2affb213475acaabf02989b1f05d719d972970ea0304d20a816986807390893d1401826f3b497787642f35d90a244195f8e466db41e8d768366057334
 DIST gcc-11.3.0-patches-7.tar.xz 15184 BLAKE2B 426f00feaa982a35d2c459e7a2c2e9d29b4b467ac3625ebd72bb31077c75bbf0c028137df03921c52ddc97a14d92c49777bd3f27b47a7b47d8a05e2d106b6bdb SHA512 bec8bf26b3e50633a5a2e0bb75ffeaba86becb704c14365ff3342e8d651ab75bb3ceec7808d88a25989b8c7182398184b95b6d1267aaef9aa828f687e4895e9d
 DIST gcc-11.3.0.tar.xz 81141364 BLAKE2B 7e562d25446ca4ab9fe8cdb714866f66aba3744d78bf84f31bfb097c1a981e4c7f990cb1e6bcfec5ae6671836a4984e2b70eb8fed81dcef5e244f88da8623469 SHA512 f0be5ad705c73b84477128a69c047f57dd47002f375eb60e1e842e08cf2009a509e92152bca345823926d550b7395ae6d4de7db51d1ee371c2dc37313881fca7
 DIST gcc-11.4.0-musl-patches-0.tar.xz 3844 BLAKE2B f3f1be6718e3cf08e553a1a2319a85e13368279849f6f3ab89ad7abe505316afacf5084846c0cb133bdcb5c918244644242c194e6ce55455a26e67b3983d73ef SHA512 a81db52d21de364137461dcff7e1af696df4a02fa26452f90439ae4af14ccbffe68eb4ee93ae56257490ab8aa36b4bff37c4e1f2cf4dd4624b3a6fb4cb50b7ac
 DIST gcc-11.4.0-patches-2.tar.xz 14224 BLAKE2B d3030c19a7bd8bd082fd39b35c3e80883ae541ab28232513ba60095fe81f5fe1fbdc54829a1556b2d278328033f6eb8a81e9ee268a6020b554388a60842b02e6 SHA512 60aa19f00fb29b7c8a68c73de274e24559dc896f551d47153ea511b202941caa950c0aff62ad28d057a8ed16f2aec2c06e681e7286d65ab3610b6948d7bb840a
-DIST gcc-12-20220917.tar.xz 79137544 BLAKE2B ddd538b339e57fce4d8ef47e18077a27b35994bb571b5ac8670fc2f833751f87557a05c3f82fc41e3c0c3ac47ac231d8392353835295874cfb24e02aa72a8662 SHA512 15071044595fcf22deca3fd4569309f7fa01e2e8d54b1c518c480ff134f1222a652b0137be98e03b495648eed3c21992d906e9c9d12f265a6467581adc2dc1ee
-DIST gcc-12-20220924.tar.xz 79135908 BLAKE2B 41cbc1d232bfb07a2a84b6fe4bc692f21378661197447c39ef9f4d56015410c8416e3a01da98dff7329fc3392331dc5b6e404fa09a0df1e35598b9bfb41cb814 SHA512 ba4d9e73d108088da26fbefe18d9b245b76771ffe752c2b4b31bdf38a2d0b638fbc115c377526c27311d4d7ffd4e0d236a5af5016bd364ccaa11a4989d1401e8
-DIST gcc-12-20221001.tar.xz 79132788 BLAKE2B e3ab41f7f31a202380063679f9b233c02ac3ea860a1ef43df943e8ad50c261a72a846486a5f1386a125c379948316eeb4f7cec75998bec7e463b12453d7df0eb SHA512 c838aa1f1ab2df3d0d5e738674b4b5e1dc08118ea7d2c21999e186d3af52e82939acf4c2d752cc7a4b49e710263bdfe8b1020669cf80d9a477a3be283d40f359
 DIST gcc-12-20221008.tar.xz 79145884 BLAKE2B ff3d684d887e282c79fe95952a449ed5770d4bd74077553baf31c34dbd77177e680b19ac741c04aab26ac2c9bb2b89924f51f63e2f22b440decf2c65274a7640 SHA512 a35a6207e7f4375abca3ae57376c98b082846a88e83522c322d713e759367ceb2b3ad68488bed6f1645e47a106b0bbb2efbca6cb14b077672289acb4373e616f
-DIST gcc-12-20221015.tar.xz 79164000 BLAKE2B 5d8677d297aaa0a295b964c6aac884e2fd58d7ce18890640cdde8a7b56184e7636e2d7f83567e207b36f199a73ba75a95c60e134c0b2106b90ed6b7dfd5bcd59 SHA512 6a76d79a95d2826a80c3fbddc0617776964ca8fe65f09ee5706ebc1d92277f695b70d18d165d1964559e8ceb51cebabb7ea4ef464ce0d9d1bb49600c1a429428
 DIST gcc-12-20221022.tar.xz 79163768 BLAKE2B 998b6681f72f965aaf0a9feeb871f91bfec7308e99acb7995c725878584be8bc2f9c69c5fb2904eb1e9002eff8adf67e90e86ea015bf0e6b04c2cba83b06cd60 SHA512 6b8a11b605ec75d6623d6072ad57d59865168da97ab0385506c8e5092bcc14473fbdd35177e79746efbaaffa44e45b93c4adad11c08f34e6d1935e74d3c1c75d
 DIST gcc-12.2.0-musl-patches-1.tar.xz 3844 BLAKE2B 004432806696f7d0a32366270ac45695e858abee73a255e44dc6e0a225339e4cad40aab0d51dfe9a55d5aa4b4001f5726064bb2eea3212a0874b2d27e229abd7 SHA512 c354edcd641a9dfaf902a0ff4c44c75065d0cf1c36bbf6c3c35c2e23bff22b8f70bcf4458a5a0ef86371e9f2fafca8a54ca822e35820ff442c9458a2819c3606
 DIST gcc-12.2.0-patches-1.tar.xz 12864 BLAKE2B a5ae0a85dfc1b6f0bd968f0d5262ebed14ec9cdb3249e3a4c571578c54eda0e53708ee7fe8e03e506366c7f3cf7926eced9b390d9dee948c1249298c0fabd9fb SHA512 f3d793b89a2a0385d596162fb0c653d4acdf21ae418cb792c1786a01fde0391bd0719715dbf07d53636f127168f5cd99108a1dc11cf6cea889b7d82385bcc258
 DIST gcc-12.2.0.tar.xz 84645292 BLAKE2B 715574af9ad678f9dc8cfd19c866bf910c7edfd479e7e9681337feaa9b54e5d304ddb85483816b8d89754d502405823ae2eff0d1e444538763f40be8e428d8da SHA512 e9e857bd81bf7a370307d6848c81b2f5403db8c7b5207f54bce3f3faac3bde63445684092c2bc1a2427cddb6f7746496d9fbbef05fbbd77f2810b2998f1f9173
-DIST gcc-13-20220918.tar.xz 79822640 BLAKE2B 6c35953290e001352aac3a649de7a6dc696bcad85e5b2905bbb6863fd280ce78cfb5663a95e64a1006c869be0e7892adea85e2b1c9f799c3412f634b23f069d0 SHA512 e1b661a483d71f3f8d0dc66bbc2ce6a00bf3b3bb3142b27b07c01d46c10717ad7a95b79d44fa78e3821614032a5ab9194ff444ff280dd3304d4b030373436b6b
 DIST gcc-13-20221002.tar.xz 79899100 BLAKE2B e7bde088c380dacd08489541ead97a877a3b7cf514bb8c2e61144a5a953ff1da26342f8d52021983438a06f483f9cd6ac0ea966611801d4e57d3723ea13a09d4 SHA512 b47325dd065b579c71b0c2c57282c8d244894c4edd51a39e8ff97898e0a8dc80e920a9ada5ce13204f98c90c61e9015a4ecdae1c04a8417e20d1df93019f147a
 DIST gcc-13.0.0-patches-1.tar.xz 11064 BLAKE2B 82a7ad193dac00475931840bcee82ef7a51718a74af224b03a41f8349e34c2a64a3eb29985b4e2bffde958c58782242eccaedaa54d950e8d51d8bb6f45868e0e SHA512 e04b510f529dd3187a08ae9cb9a894a3d3d30af81f13c43cc082fda7d26c44a3bf19d36ec02024b2ade8b8c193e9730246abeadee603c41b5873c5b785709921
 DIST gcc-8.5.0-patches-2.tar.bz2 16921 BLAKE2B 619a47f74edf05fa01c9de59d0ff7abb027a01cf0bdec91ac41046166192f4eae561684136c4a6a5e077f64754bb5b0710905129f31b0def21d88f92e6bba7fb SHA512 b6095d4570895e2c4dd58fed5756194aea27391b813e5e2de42b2749cb318c4bea2087eb0ff92c70e7f98ae4482c49d476db57be83d7beb19fd462aa61714ab2
@@ -37,28 +26,17 @@ DIST gcc-8.5.0.tar.xz 63841008 BLAKE2B aa81a1a730fd7371360f6abed6ba78b5843fd18c5
 DIST gcc-9.5.0-patches-1.tar.xz 13772 BLAKE2B 2e2e84a28a729cd271a23716ff3fe08b7209b72254af279f04dd15dbd39482fb7d905dc9293dc326536e14bca9a53397bd7e1c4b617ed8cbe42bcf617fcce3fb SHA512 50e292e665bfae18bf71c0714074025b4f7cb87042862071815874f7c5b241acac3b8f60d85b8970b11978103c2e7616c02d789f6c3b091d7b736b65c535b743
 DIST gcc-9.5.0.tar.xz 72462752 BLAKE2B 69e39314ee6bb46e3be491ba9c3cbc4914cb716f732c6d3f2b14d9382750b40c4f14b5d3051225b81f936ef8297b0ba8cb5439512e961dae5815d3bee2b0bfdb SHA512 cdd144ce4f747e051480410afc8506c90a57cb45da89071ddae377b1453bca3014422455ade9fe4563ebe51f4b6348cbc0c61905a9b8801cd597d51ad0ec62b3
 EBUILD gcc-10.4.0.ebuild 1445 BLAKE2B 05518ec2cdf0180f4db63dcab413097ca777381b496d6b7b7cebc0bf2b04395d14b74daa398ea2e2d916df4f6034357cfc740939e0fb346bbea71a8a09603fbb SHA512 8fd4642dd974006efe35f6d45ebfda66fe5dac0d4e2371804ede5d94e6e820b95cedac08c11de766c0c711bef7c55900cdaeaffe889691f7acd7470c32e7e3b4
-EBUILD gcc-10.4.1_p20220922.ebuild 1456 BLAKE2B 2c0db71c8f80d84ce17f694623942b59ae34a318f740b77fc84d82aff72f481300750ef318bef57eb46748d22a045e038d8982cf6a389cb3bd46aa4a0b33cc4b SHA512 e1f329b81fc4fc54f8fdbf2ceb7b45e1e582cddd82ebbd2be272c7ced8a3e7be8fae01b989697624b238e4f3a881d48143ab6e300eb320d80253f269e4d36ba7
-EBUILD gcc-10.4.1_p20220929.ebuild 1456 BLAKE2B 2c0db71c8f80d84ce17f694623942b59ae34a318f740b77fc84d82aff72f481300750ef318bef57eb46748d22a045e038d8982cf6a389cb3bd46aa4a0b33cc4b SHA512 e1f329b81fc4fc54f8fdbf2ceb7b45e1e582cddd82ebbd2be272c7ced8a3e7be8fae01b989697624b238e4f3a881d48143ab6e300eb320d80253f269e4d36ba7
 EBUILD gcc-10.4.1_p20221006.ebuild 1453 BLAKE2B 638b9b95bff53ae5e2a001d4b5c7ad44fcc8cf8830142c444e4d24e99c3402b486ee741d41027924fcd5b33c8182ac8cba4ddb8ccdbb3fcf295de5aa40a748b8 SHA512 5beacfa72aa919baa740a9916626a6e77935a4019bbf275fb1c40a639a9fb9dafd51dcfc86a39df3508886b290ae60c20293f538c21856e41b987396f669c458
-EBUILD gcc-10.4.1_p20221013.ebuild 1456 BLAKE2B 2c0db71c8f80d84ce17f694623942b59ae34a318f740b77fc84d82aff72f481300750ef318bef57eb46748d22a045e038d8982cf6a389cb3bd46aa4a0b33cc4b SHA512 e1f329b81fc4fc54f8fdbf2ceb7b45e1e582cddd82ebbd2be272c7ced8a3e7be8fae01b989697624b238e4f3a881d48143ab6e300eb320d80253f269e4d36ba7
 EBUILD gcc-10.4.1_p20221020.ebuild 1456 BLAKE2B 2c0db71c8f80d84ce17f694623942b59ae34a318f740b77fc84d82aff72f481300750ef318bef57eb46748d22a045e038d8982cf6a389cb3bd46aa4a0b33cc4b SHA512 e1f329b81fc4fc54f8fdbf2ceb7b45e1e582cddd82ebbd2be272c7ced8a3e7be8fae01b989697624b238e4f3a881d48143ab6e300eb320d80253f269e4d36ba7
 EBUILD gcc-10.5.9999.ebuild 1108 BLAKE2B 2db612df53fbaec59c707acb56bac804a4ee797d156ea3dfca6396d27268385f1d5177c44bd58a926c981ab1c0c7b7adf5e4ea060a65a9e84e7f8ed1713701b0 SHA512 5193d1f4359ef8963645d25150731ab1929801eae16e94ddef3fb0169ed365d2ac43765a2d4848966508144e121b8b24feccbe66f59ee9363764d5a3db79f946
 EBUILD gcc-11.3.0.ebuild 659 BLAKE2B 310352b879c732515ce63983db79b32bf7c8c200a650627a14b5284fceea9a7e7f3e545044a8c00ccc44cd760b18123542bd233242cb3ebc48ef422439c8e430 SHA512 44c89a7782e5e37c5ef61c50d5aa6d07c09f19bada293ed657d7062837a5a9be9483fda0b1845ee794f42031ea098a1b88d439f7be202f4276f77748ff45815e
-EBUILD gcc-11.3.1_p20220909.ebuild 1294 BLAKE2B b7ebe383beab66923f219509ca9afd6f4d77d4796041acee361644bcd874a86a6bb3c72a5418e669062af7b946646cea92ce8010546e26d09ceb9894e4f67d0a SHA512 13fc00a6381cdfdb5646ce8b405458d2d966fb5daef28ccadade709e1be4375698ab36dd9d97a0c25a8a257b1227076ec8112fdb3716699adc6fcace42240649
-EBUILD gcc-11.3.1_p20220930.ebuild 1297 BLAKE2B 866b91db54ce086190346a069776243f505aad03fe19d2beb80d1979000f70727d6288b6527f1789bf2fbeec3a033314ab53457eb1b076bb5986e6f648138d80 SHA512 bfc2320d5e28787e64e81efe9fb6c040e06c5f5891ccf330bdf62cbdee7c44922dfec05945c916884605835af4f664f7567e4367698736c87631e3e6182fa375
 EBUILD gcc-11.3.1_p20221007.ebuild 1294 BLAKE2B b7ebe383beab66923f219509ca9afd6f4d77d4796041acee361644bcd874a86a6bb3c72a5418e669062af7b946646cea92ce8010546e26d09ceb9894e4f67d0a SHA512 13fc00a6381cdfdb5646ce8b405458d2d966fb5daef28ccadade709e1be4375698ab36dd9d97a0c25a8a257b1227076ec8112fdb3716699adc6fcace42240649
-EBUILD gcc-11.3.1_p20221014.ebuild 1297 BLAKE2B 866b91db54ce086190346a069776243f505aad03fe19d2beb80d1979000f70727d6288b6527f1789bf2fbeec3a033314ab53457eb1b076bb5986e6f648138d80 SHA512 bfc2320d5e28787e64e81efe9fb6c040e06c5f5891ccf330bdf62cbdee7c44922dfec05945c916884605835af4f664f7567e4367698736c87631e3e6182fa375
 EBUILD gcc-11.3.1_p20221021.ebuild 1297 BLAKE2B 866b91db54ce086190346a069776243f505aad03fe19d2beb80d1979000f70727d6288b6527f1789bf2fbeec3a033314ab53457eb1b076bb5986e6f648138d80 SHA512 bfc2320d5e28787e64e81efe9fb6c040e06c5f5891ccf330bdf62cbdee7c44922dfec05945c916884605835af4f664f7567e4367698736c87631e3e6182fa375
 EBUILD gcc-11.4.9999.ebuild 1267 BLAKE2B 09a26812068945e11164d0a4f8f5cc10dc261a20a647fd4102decc83eecbbe8fcc7f38093609314fa1f26c46164e8248aede741880f7cff64dd5a94836765fa2 SHA512 4ecf698cd6e96dc08683a0e9b69936cdd9085c300d330fb9830cee0e38783e0a1fc8409db39159f9b247f28fc5d7d7572ad3e975f3951f1cb8537f49886bdcde
 EBUILD gcc-12.2.0.ebuild 1434 BLAKE2B a02496eb0178f8f3e38487b233eea12467e9e799763eb447cd545ea5afd48460bc8fc64bd68c84fca38f2d4cdb7487a65b34f4ceedf335393964ec770c0a69de SHA512 62d1a2dfac584c8abe548ff03c960a9e545e34ee1bd61977413af1b31ce98e281b5b90a33be2c666f418a272658f5188e9355bacc51dd0cc7ff456bcc47f2edd
-EBUILD gcc-12.2.1_p20220917.ebuild 1437 BLAKE2B c0f35f820ac6b8361761cd90944b7a860c6bff7994497fb96e6be2178f9c888b8927bd3a908af0f0521c06d98d3c84e46c988d70e6a7e454835a978cd0b4b34b SHA512 48ee0cee1a29d0b41f78dd73ce0ebedb5eae4befe60f456f5a80128e878e61f1e6c173110b21ff3de9770f5e05c144f72bacb273532cf6ce62ee221f5281db8a
-EBUILD gcc-12.2.1_p20220924.ebuild 1437 BLAKE2B c0f35f820ac6b8361761cd90944b7a860c6bff7994497fb96e6be2178f9c888b8927bd3a908af0f0521c06d98d3c84e46c988d70e6a7e454835a978cd0b4b34b SHA512 48ee0cee1a29d0b41f78dd73ce0ebedb5eae4befe60f456f5a80128e878e61f1e6c173110b21ff3de9770f5e05c144f72bacb273532cf6ce62ee221f5281db8a
-EBUILD gcc-12.2.1_p20221001.ebuild 1437 BLAKE2B c0f35f820ac6b8361761cd90944b7a860c6bff7994497fb96e6be2178f9c888b8927bd3a908af0f0521c06d98d3c84e46c988d70e6a7e454835a978cd0b4b34b SHA512 48ee0cee1a29d0b41f78dd73ce0ebedb5eae4befe60f456f5a80128e878e61f1e6c173110b21ff3de9770f5e05c144f72bacb273532cf6ce62ee221f5281db8a
 EBUILD gcc-12.2.1_p20221008.ebuild 1421 BLAKE2B ac34f19e52c2debca52725ffd9a219fabeb326dd32614bc5b9da9d19960138860a6e51f6b343e0184e56a9b115fda306eb0785b1a38a31b9082741b16e52791b SHA512 e2b05d0ea98c0b75c7a69792f558e848e907a836a7f9869ef984c1df932bfd23a08f987ad2d54707038379cf0932b18231d11d64d9166d0ee164be148c6def66
-EBUILD gcc-12.2.1_p20221015.ebuild 1437 BLAKE2B c0f35f820ac6b8361761cd90944b7a860c6bff7994497fb96e6be2178f9c888b8927bd3a908af0f0521c06d98d3c84e46c988d70e6a7e454835a978cd0b4b34b SHA512 48ee0cee1a29d0b41f78dd73ce0ebedb5eae4befe60f456f5a80128e878e61f1e6c173110b21ff3de9770f5e05c144f72bacb273532cf6ce62ee221f5281db8a
 EBUILD gcc-12.2.1_p20221022.ebuild 1437 BLAKE2B c0f35f820ac6b8361761cd90944b7a860c6bff7994497fb96e6be2178f9c888b8927bd3a908af0f0521c06d98d3c84e46c988d70e6a7e454835a978cd0b4b34b SHA512 48ee0cee1a29d0b41f78dd73ce0ebedb5eae4befe60f456f5a80128e878e61f1e6c173110b21ff3de9770f5e05c144f72bacb273532cf6ce62ee221f5281db8a
 EBUILD gcc-12.3.9999.ebuild 1545 BLAKE2B 78fdc4a7b20d22bba137cba00e49d2249c5616bf1c4cf619162da1d98c750fb3da71fbb1cd4e136624cc4e0a112547e6c4c29992aa58ab12507917c7d728831a SHA512 f3562696a79035e64b8e79cee720fe24c7041bf922d79e5cff1ae864a533997995465d0871bfc4f87f6d5a66e7f8ac02c490792554a0628ae30d96a061ef9279
-EBUILD gcc-13.0.0_pre20220918.ebuild 1288 BLAKE2B a2281da17b96d44850dccf6a6420d66cf163a8f53ea755f1414911fcffd71b504273f3010b6a6c3cb796bf763d8da5b8fa64efb7e107b3e5a8bb1ab767704d05 SHA512 8108432caffabab640a472344adf5660a005436790d31f287f1e72109dd69b5831ea0f3e956a822439862da6a24b78daa7c4253fe51ce9b47457de3b83d80b5d
 EBUILD gcc-13.0.0_pre20221002.ebuild 1282 BLAKE2B 03e7f5b4c1434905797713910db534e33e9ccd97e7b931a3980222412b48d3daeae62f259a6f4445fccb4fcb510f92ef39c30e0c91930ec333f0af544b38ab84 SHA512 6cc09fc3d0736469630089056c8c79ec3a4751311201f832826be7c6782598b8efa110b23c45fd187006a5911eb7c0d132d478ccbd1c5817ebc123d10c807aa3
 EBUILD gcc-13.0.9999.ebuild 1252 BLAKE2B dbc0cdcbb6bae2177185c41fa014a0c98e05a8101f33e12975e2af951e25539117b9279573770b5d17261032b0c51d80864140417a13b152aa34739c28c0f0c3 SHA512 96e940c83f9e58b7b929c5293ca44582c266d3e10615f6aded5cd0b11cb1d46306382fea04227040a7d7cbfdc0f042e3b1c89a0e617193bbfadea50a4732e9a2
 EBUILD gcc-8.5.0-r1.ebuild 473 BLAKE2B 40d3b651d0aed62ceb1df973f1f7e2b6ce419df22da63e49d335fcd0bf7b349d1e7be40dc16e80fe143222d48ac6139d35bf47558d83c30aab4b25dba6fcf6cb SHA512 b88761a3495a1eab0de5321c9230c77cd621ae545d3be49a13273cfcd8e94cc21dbb062bfdebb64dc5bfe1ddd600ee8fb60df6fd7709a7be90915b7e99a8db29
diff --git a/sys-devel/gcc/gcc-10.4.1_p20220922.ebuild b/sys-devel/gcc/gcc-10.4.1_p20220922.ebuild
deleted file mode 100644
index bb603378916c..000000000000
--- a/sys-devel/gcc/gcc-10.4.1_p20220922.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-TOOLCHAIN_PATCH_SUFFIX="xz"
-TOOLCHAIN_PATCH_DEV="sam"
-#TOOLCHAIN_GCC_RC=1
-PATCH_GCC_VER="10.5.0"
-PATCH_VER="0"
-MUSL_VER="1"
-MUSL_GCC_VER="10.5.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 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-#fi
-
-RDEPEND=""
-BDEPEND="${CATEGORY}/binutils"
-
-src_prepare() {
-	local p upstreamed_patches=(
-		# add them here
-	)
-	for p in "${upstreamed_patches[@]}"; do
-		rm -v "${WORKDIR}/patch/${p}" || die
-	done
-
-	if has_version '>=sys-libs/glibc-2.32-r1'; then
-		rm -v "${WORKDIR}/patch/23_all_disable-riscv32-ABIs.patch" || die
-	fi
-
-	toolchain_src_prepare
-}
diff --git a/sys-devel/gcc/gcc-10.4.1_p20220929.ebuild b/sys-devel/gcc/gcc-10.4.1_p20220929.ebuild
deleted file mode 100644
index bb603378916c..000000000000
--- a/sys-devel/gcc/gcc-10.4.1_p20220929.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-TOOLCHAIN_PATCH_SUFFIX="xz"
-TOOLCHAIN_PATCH_DEV="sam"
-#TOOLCHAIN_GCC_RC=1
-PATCH_GCC_VER="10.5.0"
-PATCH_VER="0"
-MUSL_VER="1"
-MUSL_GCC_VER="10.5.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 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-#fi
-
-RDEPEND=""
-BDEPEND="${CATEGORY}/binutils"
-
-src_prepare() {
-	local p upstreamed_patches=(
-		# add them here
-	)
-	for p in "${upstreamed_patches[@]}"; do
-		rm -v "${WORKDIR}/patch/${p}" || die
-	done
-
-	if has_version '>=sys-libs/glibc-2.32-r1'; then
-		rm -v "${WORKDIR}/patch/23_all_disable-riscv32-ABIs.patch" || die
-	fi
-
-	toolchain_src_prepare
-}
diff --git a/sys-devel/gcc/gcc-10.4.1_p20221013.ebuild b/sys-devel/gcc/gcc-10.4.1_p20221013.ebuild
deleted file mode 100644
index bb603378916c..000000000000
--- a/sys-devel/gcc/gcc-10.4.1_p20221013.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-TOOLCHAIN_PATCH_SUFFIX="xz"
-TOOLCHAIN_PATCH_DEV="sam"
-#TOOLCHAIN_GCC_RC=1
-PATCH_GCC_VER="10.5.0"
-PATCH_VER="0"
-MUSL_VER="1"
-MUSL_GCC_VER="10.5.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 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-#fi
-
-RDEPEND=""
-BDEPEND="${CATEGORY}/binutils"
-
-src_prepare() {
-	local p upstreamed_patches=(
-		# add them here
-	)
-	for p in "${upstreamed_patches[@]}"; do
-		rm -v "${WORKDIR}/patch/${p}" || die
-	done
-
-	if has_version '>=sys-libs/glibc-2.32-r1'; then
-		rm -v "${WORKDIR}/patch/23_all_disable-riscv32-ABIs.patch" || die
-	fi
-
-	toolchain_src_prepare
-}
diff --git a/sys-devel/gcc/gcc-11.3.1_p20220909.ebuild b/sys-devel/gcc/gcc-11.3.1_p20220909.ebuild
deleted file mode 100644
index e821929d61b4..000000000000
--- a/sys-devel/gcc/gcc-11.3.1_p20220909.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-TOOLCHAIN_PATCH_SUFFIX="xz"
-TOOLCHAIN_PATCH_DEV="sam"
-PATCH_VER="2"
-PATCH_GCC_VER="11.4.0"
-MUSL_VER="0"
-MUSL_GCC_VER="11.4.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))
-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 ~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() {
-	local p upstreamed_patches=(
-		# add them here
-	)
-	for p in "${upstreamed_patches[@]}"; do
-		rm -v "${WORKDIR}/patch/${p}" || die
-	done
-
-	toolchain_src_prepare
-
-	eapply_user
-}
diff --git a/sys-devel/gcc/gcc-11.3.1_p20220930.ebuild b/sys-devel/gcc/gcc-11.3.1_p20220930.ebuild
deleted file mode 100644
index 4c05022129f0..000000000000
--- a/sys-devel/gcc/gcc-11.3.1_p20220930.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-TOOLCHAIN_PATCH_SUFFIX="xz"
-TOOLCHAIN_PATCH_DEV="sam"
-PATCH_VER="2"
-PATCH_GCC_VER="11.4.0"
-MUSL_VER="0"
-MUSL_GCC_VER="11.4.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))
-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 ~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() {
-	local p upstreamed_patches=(
-		# add them here
-	)
-	for p in "${upstreamed_patches[@]}"; do
-		rm -v "${WORKDIR}/patch/${p}" || die
-	done
-
-	toolchain_src_prepare
-
-	eapply_user
-}
diff --git a/sys-devel/gcc/gcc-11.3.1_p20221014.ebuild b/sys-devel/gcc/gcc-11.3.1_p20221014.ebuild
deleted file mode 100644
index 4c05022129f0..000000000000
--- a/sys-devel/gcc/gcc-11.3.1_p20221014.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-TOOLCHAIN_PATCH_SUFFIX="xz"
-TOOLCHAIN_PATCH_DEV="sam"
-PATCH_VER="2"
-PATCH_GCC_VER="11.4.0"
-MUSL_VER="0"
-MUSL_GCC_VER="11.4.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))
-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 ~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() {
-	local p upstreamed_patches=(
-		# add them here
-	)
-	for p in "${upstreamed_patches[@]}"; do
-		rm -v "${WORKDIR}/patch/${p}" || die
-	done
-
-	toolchain_src_prepare
-
-	eapply_user
-}
diff --git a/sys-devel/gcc/gcc-12.2.1_p20220917.ebuild b/sys-devel/gcc/gcc-12.2.1_p20220917.ebuild
deleted file mode 100644
index 97d104a8472d..000000000000
--- a/sys-devel/gcc/gcc-12.2.1_p20220917.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-TOOLCHAIN_PATCH_DEV="sam"
-PATCH_VER="1"
-PATCH_GCC_VER="12.2.0"
-MUSL_VER="1"
-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/gcc/gcc-12.2.1_p20220924.ebuild b/sys-devel/gcc/gcc-12.2.1_p20220924.ebuild
deleted file mode 100644
index 97d104a8472d..000000000000
--- a/sys-devel/gcc/gcc-12.2.1_p20220924.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-TOOLCHAIN_PATCH_DEV="sam"
-PATCH_VER="1"
-PATCH_GCC_VER="12.2.0"
-MUSL_VER="1"
-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/gcc/gcc-12.2.1_p20221001.ebuild b/sys-devel/gcc/gcc-12.2.1_p20221001.ebuild
deleted file mode 100644
index 97d104a8472d..000000000000
--- a/sys-devel/gcc/gcc-12.2.1_p20221001.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-TOOLCHAIN_PATCH_DEV="sam"
-PATCH_VER="1"
-PATCH_GCC_VER="12.2.0"
-MUSL_VER="1"
-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/gcc/gcc-12.2.1_p20221015.ebuild b/sys-devel/gcc/gcc-12.2.1_p20221015.ebuild
deleted file mode 100644
index 97d104a8472d..000000000000
--- a/sys-devel/gcc/gcc-12.2.1_p20221015.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-TOOLCHAIN_PATCH_DEV="sam"
-PATCH_VER="1"
-PATCH_GCC_VER="12.2.0"
-MUSL_VER="1"
-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/gcc/gcc-13.0.0_pre20220918.ebuild b/sys-devel/gcc/gcc-13.0.0_pre20220918.ebuild
deleted file mode 100644
index 641ab05e8153..000000000000
--- a/sys-devel/gcc/gcc-13.0.0_pre20220918.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-TOOLCHAIN_PATCH_DEV="xen0n"
-PATCH_VER="1"
-PATCH_GCC_VER="13.0.0"
-MUSL_GCC_VER="13.0.0"
-
-if [[ $(ver_cut 3) == 9999 ]] ; then
-	MY_PV_2=$(ver_cut 2)
-	MY_PV_3=$(($(ver_cut 3) - 9998))
-	if [[ ${MY_PV_2} == 0 ]] ; then
-		MY_PV_2=0
-		MY_PV_3=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}.${MY_PV_3}
-fi
-
-inherit toolchain
-# Needs to be after inherit (for now?), bug #830908
-EGIT_BRANCH=master
-
-# 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"
-	KEYWORDS="~loong"
-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[cet(-)?]"
-
-src_prepare() {
-	local p upstreamed_patches=(
-		# add them here
-	)
-	for p in "${upstreamed_patches[@]}"; do
-		rm -v "${WORKDIR}/patch/${p}" || die
-	done
-
-	toolchain_src_prepare
-
-	eapply_user
-}
diff --git a/sys-devel/lld/Manifest b/sys-devel/lld/Manifest
index 5a87209a721f..1454dbe0d967 100644
--- a/sys-devel/lld/Manifest
+++ b/sys-devel/lld/Manifest
@@ -5,12 +5,10 @@ DIST llvm-project-15.0.3.src.tar.xz 112069972 BLAKE2B 3d29bab890467ba87fedcc4e76
 DIST llvm-project-15.0.3.src.tar.xz.sig 438 BLAKE2B e7e0614e144eb878f694c12e97cf42ff8476e47cb55e8f259eb2ec52e303463ad753771271512e89baf0137c1382b11cfa028c85324174ebcd054a124000f537 SHA512 41229bebdb0c2df9a5e3a4d6f02d39fac7dc91f21895a659523beab4fa3ef99ff06eff5e4386221369b6e2b6f8fe974d67b7d8496d5911ce484d09ae0db8b916
 DIST llvm-project-b34ea582774c057d9bf5591174d683fd3d8aa02b.tar.gz 169735900 BLAKE2B d3a82a07f855b038071fc8eb3f41a88b4c220a577219985ecddeb9a535ea8b159dbad575699997d90a49db74c074b5f4354ad707e91d6934daaa7319e0d8ee9b SHA512 3f5525c7d893bdac701cff4cf82dafc31608920d788d9b7401654f320b2432528cf4ae8ef013182807b3dc0c5b758c71f1efeedb672dd47fdb8aa6f434dfb583
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
-EBUILD lld-13.0.1-r1.ebuild 2005 BLAKE2B 9c81c04ce921d69e2fd5c4d01b44fec7f843b5b5ad0e229c384a5a34dcce269d940e2f6c501e9a991b5d415fd2ab617b9c2a634d1b3152a28a60ce26f4f9d39e SHA512 f8423e1c69046ad020148df1aba7d52302c9110c413c3be6d8800b0bcf9f6d06ebb070dbbcd0b73d615506dd89ce4312c873d05a9198f0fda4161350a086f420
-EBUILD lld-13.0.1.ebuild 1882 BLAKE2B 1a5207649cc769c725f4825ebb6c070eb2b43ffa53ce4c3a04297e5c8e11e9f8cc2df88de51dccefc48a7ad045caadf95b22e747b3760c2d0961f6adba6ff422 SHA512 9f098fda60de3570cd04200babd163d940606a96ff5f7a6f3e8bf31ce054dd50636f47cc25c945cc46e5b4c7646763f58d2799b4940dbee412bad76f73de8dee
-EBUILD lld-14.0.6-r1.ebuild 2011 BLAKE2B 1aed42e968db040a57ef3abcb2adf01756fe8970d0876f33a512345e3a5abb9aeaa3bb7019bfb6634b26913c25783422434cbbda4a0de97e8188e8d2e0752452 SHA512 9571adf2643374cd39709eaaf9b04f05cfcd19ecf038ad919a77fa95caad690f08842e2a541a82250f05140465b3a63f1b8fa3c93ebed4f96c7e634564c81d7d
-EBUILD lld-14.0.6.ebuild 1894 BLAKE2B 8f5922031c9b64b0cf246800fd26b1802bdcc1fd84aae911106bd0c5a6d9482ff7c92571b7cc7f988e0b8b0b679eb94fa6c62685d69fdf9cc2b697ae29252e09 SHA512 4959af6727591bbd411861f4717ffd523b9a026c33c4de3b035230b1b5dc1067d9fa5c539455ea16fd7a294c95b9019be1e85638448afb0d900dedbb4284a30a
-EBUILD lld-15.0.3.9999.ebuild 2057 BLAKE2B e41e0265a761f3ca21d7cbb32987b7f083f73979ab1ebdc4b76e98cc2415d2062783e46cc53b0cb6c21f2471df57f6f6209715d26e5baee01f20431a31c17b04 SHA512 8a4bab6ea39ff8bf25762658e6b1bf2df6523659049240390e9517c30a716b83823948b42b7aad22979e0a60b7dea2d6a5309938fb1810d07bc1566a2d903698
+EBUILD lld-13.0.1-r1.ebuild 2003 BLAKE2B bc67645d251f5c2883a32cd57ebcedefdf4fe8853c709139cc9ca11299e5f28d8b000eba622521cb5aba19ffe36189cf682e921386d2731538b05308f7c67257 SHA512 d933299ffeecdaea55e37a085c181322fc9d1d0f2e69e2c5f064b6db43c11bc152203908444b66423adbd299eeb13a1f6a0863b7ea359734fe919efd96bec639
+EBUILD lld-14.0.6-r1.ebuild 2009 BLAKE2B ba5b56979e55cdcc340294289ad31bcd1f331e4f93a4e76c185eb4a662abeaae0b54af59fd39d9a93d06410d20b0dc5c2600dcfd8d35260b152b2ceb7a3b56a9 SHA512 b3973f16c1973763e523c065016bce46e743c76bfa257d623af86b9231b0732e1b67b695fe6d9deb2ed6534cd8eb37de9de46ab46d3789aa2634bc54e7197657
 EBUILD lld-15.0.3.ebuild 2099 BLAKE2B 5938071d1cd45bf62a0258851a844dac9d402d07902c25de92954f65ab281481a1112cac50be27d1a5ab0f335b73aeed0f095d299d49e67bfd6fe3aac0fa1cf1 SHA512 a1d7cff5d06714f488b741d09bb21d6e10dded8635d85792791cd23eb560e3b4ae7e59eb525f521b560c8eeae1a5845401d94a326fc52fb0f177d29abb9476b8
+EBUILD lld-15.0.4.9999.ebuild 2057 BLAKE2B e41e0265a761f3ca21d7cbb32987b7f083f73979ab1ebdc4b76e98cc2415d2062783e46cc53b0cb6c21f2471df57f6f6209715d26e5baee01f20431a31c17b04 SHA512 8a4bab6ea39ff8bf25762658e6b1bf2df6523659049240390e9517c30a716b83823948b42b7aad22979e0a60b7dea2d6a5309938fb1810d07bc1566a2d903698
 EBUILD lld-16.0.0.9999.ebuild 2032 BLAKE2B 8c359c0d76e5ccb3ea0848a0d3c9ab9a9627f152cf982ad7efa67b1666693ed3c27494afaaace50650c94f0647461ec0d9aad1ae56b3e7205e1ddf065c7de224 SHA512 c2862c28c5b5f7ff31eb62d7e36fe7a2e9c413a6ece80cec8aa3e98c1cfb3c8fcf6f366bbf922775a2b232a89d9cb1a3daedb45dbd7d77a4e2e994b01aa34755
 EBUILD lld-16.0.0_pre20221016.ebuild 2032 BLAKE2B 8c359c0d76e5ccb3ea0848a0d3c9ab9a9627f152cf982ad7efa67b1666693ed3c27494afaaace50650c94f0647461ec0d9aad1ae56b3e7205e1ddf065c7de224 SHA512 c2862c28c5b5f7ff31eb62d7e36fe7a2e9c413a6ece80cec8aa3e98c1cfb3c8fcf6f366bbf922775a2b232a89d9cb1a3daedb45dbd7d77a4e2e994b01aa34755
 EBUILD lld-16.0.0_pre20221023.ebuild 2032 BLAKE2B 8c359c0d76e5ccb3ea0848a0d3c9ab9a9627f152cf982ad7efa67b1666693ed3c27494afaaace50650c94f0647461ec0d9aad1ae56b3e7205e1ddf065c7de224 SHA512 c2862c28c5b5f7ff31eb62d7e36fe7a2e9c413a6ece80cec8aa3e98c1cfb3c8fcf6f366bbf922775a2b232a89d9cb1a3daedb45dbd7d77a4e2e994b01aa34755
diff --git a/sys-devel/lld/lld-13.0.1-r1.ebuild b/sys-devel/lld/lld-13.0.1-r1.ebuild
index 03c2a11c9cb1..202cb56a22be 100644
--- a/sys-devel/lld/lld-13.0.1-r1.ebuild
+++ b/sys-devel/lld/lld-13.0.1-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="${LLVM_MAJOR}/${LLVM_SOABI}"
-KEYWORDS="~amd64 arm arm64 ~ppc ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86"
 IUSE="debug test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-devel/lld/lld-13.0.1.ebuild b/sys-devel/lld/lld-13.0.1.ebuild
deleted file mode 100644
index 261c2c5ddab8..000000000000
--- a/sys-devel/lld/lld-13.0.1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit cmake flag-o-matic llvm llvm.org python-any-r1
-
-DESCRIPTION="The LLVM linker (link editor)"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86"
-IUSE="debug test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="~sys-devel/llvm-${PV}"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	test? (
-		>=dev-util/cmake-3.16
-		$(python_gen_any_dep "~dev-python/lit-${PV}[\${PYTHON_USEDEP}]")
-	)"
-
-LLVM_COMPONENTS=( lld libunwind/include/mach-o )
-LLVM_TEST_COMPONENTS=( llvm/utils/{lit,unittest} )
-llvm.org_set_globals
-
-python_check_deps() {
-	python_has_version "~dev-python/lit-${PV}[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	LLVM_MAX_SLOT=${PV%%.*} 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=(
-		-DBUILD_SHARED_LIBS=ON
-		-DLLVM_INCLUDE_TESTS=$(usex test)
-		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
-	)
-	use test && mycmakeargs+=(
-		-DLLVM_BUILD_TESTS=ON
-		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-		-DLLVM_LIT_ARGS="$(get_lit_flags)"
-		-DPython3_EXECUTABLE="${PYTHON}"
-	)
-	cmake_src_configure
-}
-
-src_test() {
-	local -x LIT_PRESERVES_TMP=1
-	cmake_build check-lld
-}
diff --git a/sys-devel/lld/lld-14.0.6-r1.ebuild b/sys-devel/lld/lld-14.0.6-r1.ebuild
index 9f806d7daa7c..39dce69bcda3 100644
--- a/sys-devel/lld/lld-14.0.6-r1.ebuild
+++ b/sys-devel/lld/lld-14.0.6-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="${LLVM_MAJOR}/${LLVM_SOABI}"
-KEYWORDS="~amd64 arm arm64 ~ppc ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86"
 IUSE="debug test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-devel/lld/lld-14.0.6.ebuild b/sys-devel/lld/lld-14.0.6.ebuild
deleted file mode 100644
index cc28bfce5593..000000000000
--- a/sys-devel/lld/lld-14.0.6.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit cmake flag-o-matic llvm llvm.org python-any-r1
-
-DESCRIPTION="The LLVM linker (link editor)"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86"
-IUSE="debug test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	~sys-devel/llvm-${PV}
-"
-RDEPEND="
-	${DEPEND}
-"
-BDEPEND="
-	test? (
-		>=dev-util/cmake-3.16
-		$(python_gen_any_dep "~dev-python/lit-${PV}[\${PYTHON_USEDEP}]")
-	)
-"
-
-LLVM_COMPONENTS=( lld cmake libunwind/include/mach-o )
-LLVM_TEST_COMPONENTS=( llvm/utils/{lit,unittest} )
-llvm.org_set_globals
-
-python_check_deps() {
-	python_has_version "~dev-python/lit-${PV}[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	LLVM_MAX_SLOT=${PV%%.*} 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=(
-		-DBUILD_SHARED_LIBS=ON
-		-DLLVM_INCLUDE_TESTS=$(usex test)
-		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
-	)
-	use test && mycmakeargs+=(
-		-DLLVM_BUILD_TESTS=ON
-		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-		-DLLVM_LIT_ARGS="$(get_lit_flags)"
-		-DPython3_EXECUTABLE="${PYTHON}"
-	)
-	cmake_src_configure
-}
-
-src_test() {
-	local -x LIT_PRESERVES_TMP=1
-	cmake_build check-lld
-}
diff --git a/sys-devel/lld/lld-15.0.3.9999.ebuild b/sys-devel/lld/lld-15.0.4.9999.ebuild
similarity index 100%
rename from sys-devel/lld/lld-15.0.3.9999.ebuild
rename to sys-devel/lld/lld-15.0.4.9999.ebuild
diff --git a/sys-devel/llvm-common/Manifest b/sys-devel/llvm-common/Manifest
index ff6fc663bfa8..c3adb19a72e2 100644
--- a/sys-devel/llvm-common/Manifest
+++ b/sys-devel/llvm-common/Manifest
@@ -7,8 +7,8 @@ DIST llvm-project-b34ea582774c057d9bf5591174d683fd3d8aa02b.tar.gz 169735900 BLAK
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
 EBUILD llvm-common-13.0.1.ebuild 608 BLAKE2B 1dfa0b25955f1f044b9980fb80f9d38eb9732a15f9bc1b352a0e75b809ad6d43db16fde3718c569b9152bfbbe2b0f71b7f9ff5306d5ae4b57a380ba003c98c86 SHA512 0702b3222f9733532ddd115f37268713ec2ebbb187b6a02e3423c1e966e594373e38c3c6f6f8eda549afae52922a3decb3126850ca0861cc3d4c8e7c0bdc5921
 EBUILD llvm-common-14.0.6.ebuild 602 BLAKE2B ef26d6ac2606e9a316ddcce442da1762f578ade0346ba2a947fdace5e2020e8841c63d173e42506d23abf6efc062a2edfac0be98a3eefe1f7a29c88702e9f1d5 SHA512 789dad6fdcf9a930ddc1046e7e98ebc1e05b2dd3713bb1ec5b8a5711690d779691c91d1000d9776720b21ed241d2f12c0ae9a8dba0e6a17d0ddf563cdfbe657f
-EBUILD llvm-common-15.0.3.9999.ebuild 524 BLAKE2B 1864e7c6a8578fe3ad74718368deca408757c501726fd3a2941087756f50bbf9ed83a6a635ef264150c86b577f373b5d391df4cbc6ff3e3e6a561bcc41b2c5f1 SHA512 feab4cb373d2384ce018d26b480024060b89c6a5475e7e7d475124b9a20a2c55470d98799067c437540b6ec6e7471f712534005ec426f76a247b8767edff6164
-EBUILD llvm-common-15.0.3.ebuild 608 BLAKE2B 020a3c91ad189fe674f9b5c24b22365b087b4875114dd8928d38f4ed0bbfaf4fcfab2a07f2154c70d9ad137ed41daf6eca5adbdb31802fb40218893898629fa5 SHA512 5fab7e184f76587ab37f878d8c6a103740c43e29c4b6c533da6856e8656ac49e297c885477f0b0e37efa49cf1f232f39a4084741405bb71acb8e6745c0edda33
+EBUILD llvm-common-15.0.3.ebuild 607 BLAKE2B 10e14518f42c69f14072fc2e74f9c2c1c517b9289dcbaebe071bd79ab7f46077437d9b19737d74aa8404b186a9cce9f4186db24d6ba0c98a6a3e84e585c62f29 SHA512 69ede976930b316e7869f65bae2103d8190473ece157d3552c135ef4132c8ba6b4116fd2406e3e00cbf0627169dfdccd5cf4371d00456b7629ba28f3eaadd94b
+EBUILD llvm-common-15.0.4.9999.ebuild 524 BLAKE2B 1864e7c6a8578fe3ad74718368deca408757c501726fd3a2941087756f50bbf9ed83a6a635ef264150c86b577f373b5d391df4cbc6ff3e3e6a561bcc41b2c5f1 SHA512 feab4cb373d2384ce018d26b480024060b89c6a5475e7e7d475124b9a20a2c55470d98799067c437540b6ec6e7471f712534005ec426f76a247b8767edff6164
 EBUILD llvm-common-16.0.0.9999.ebuild 524 BLAKE2B 1864e7c6a8578fe3ad74718368deca408757c501726fd3a2941087756f50bbf9ed83a6a635ef264150c86b577f373b5d391df4cbc6ff3e3e6a561bcc41b2c5f1 SHA512 feab4cb373d2384ce018d26b480024060b89c6a5475e7e7d475124b9a20a2c55470d98799067c437540b6ec6e7471f712534005ec426f76a247b8767edff6164
 EBUILD llvm-common-16.0.0_pre20221016.ebuild 524 BLAKE2B 1864e7c6a8578fe3ad74718368deca408757c501726fd3a2941087756f50bbf9ed83a6a635ef264150c86b577f373b5d391df4cbc6ff3e3e6a561bcc41b2c5f1 SHA512 feab4cb373d2384ce018d26b480024060b89c6a5475e7e7d475124b9a20a2c55470d98799067c437540b6ec6e7471f712534005ec426f76a247b8767edff6164
 EBUILD llvm-common-16.0.0_pre20221023.ebuild 524 BLAKE2B 1864e7c6a8578fe3ad74718368deca408757c501726fd3a2941087756f50bbf9ed83a6a635ef264150c86b577f373b5d391df4cbc6ff3e3e6a561bcc41b2c5f1 SHA512 feab4cb373d2384ce018d26b480024060b89c6a5475e7e7d475124b9a20a2c55470d98799067c437540b6ec6e7471f712534005ec426f76a247b8767edff6164
diff --git a/sys-devel/llvm-common/llvm-common-15.0.3.ebuild b/sys-devel/llvm-common/llvm-common-15.0.3.ebuild
index 104c8747bbee..5b1af0bf7ccc 100644
--- a/sys-devel/llvm-common/llvm-common-15.0.3.ebuild
+++ b/sys-devel/llvm-common/llvm-common-15.0.3.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
 
 RDEPEND="
 	!sys-devel/llvm:0
diff --git a/sys-devel/llvm-common/llvm-common-15.0.3.9999.ebuild b/sys-devel/llvm-common/llvm-common-15.0.4.9999.ebuild
similarity index 100%
rename from sys-devel/llvm-common/llvm-common-15.0.3.9999.ebuild
rename to sys-devel/llvm-common/llvm-common-15.0.4.9999.ebuild
diff --git a/sys-devel/llvm-toolchain-symlinks/Manifest b/sys-devel/llvm-toolchain-symlinks/Manifest
index adb58933044a..7a7a397af08f 100644
--- a/sys-devel/llvm-toolchain-symlinks/Manifest
+++ b/sys-devel/llvm-toolchain-symlinks/Manifest
@@ -1,4 +1,4 @@
 EBUILD llvm-toolchain-symlinks-14-r1.ebuild 1050 BLAKE2B 2e1e3a23812823c1a747a2b09d006f874b3a192c92b1ed275988bd84740df5ed68283f638fa36232d780eec817c26163d4d76335ad1dc2e0c5780b96dddd88bd SHA512 f54178846a398792a753174cd6b067f63b22bef13dba49485b14cc7f909a1da2a8d9bb2657a0b485ccfb5a3830388a855d52e8dea7a62e766a3bd65bb6602923
-EBUILD llvm-toolchain-symlinks-15-r1.ebuild 1050 BLAKE2B 2e1e3a23812823c1a747a2b09d006f874b3a192c92b1ed275988bd84740df5ed68283f638fa36232d780eec817c26163d4d76335ad1dc2e0c5780b96dddd88bd SHA512 f54178846a398792a753174cd6b067f63b22bef13dba49485b14cc7f909a1da2a8d9bb2657a0b485ccfb5a3830388a855d52e8dea7a62e766a3bd65bb6602923
+EBUILD llvm-toolchain-symlinks-15-r1.ebuild 1049 BLAKE2B 8f9693ab83ea30f1c5a10e6f95f5bed10ef0ddec3e6958f3f9b189431d93a6b061ddcf343129f9b74bf4d1c25772553924579ca99d0808d56ddd5b2c0e7cc967 SHA512 e384e4c78290fb02dc48f97296c7d57cffa21b551c0f046c8a22ecff6fc88fdc3c9aada2488d97e5bcf24574387723e94baf62380fd6a9ba4be12430d16e190a
 EBUILD llvm-toolchain-symlinks-16-r1.ebuild 984 BLAKE2B 2e75f61e728d2143dd9b3199cab0147f4b81a1762fcefffeae9c7ce812492eed1002e516c2ea0ff17aa4af2d389ea5b58c6d04033e1c6b070aa85c5827816b3a SHA512 8f65d67b9fdffed53ea16787229ea5b3c81e771bf7231739e3723d7b20d16ff4d5445a191e851cba006f5698cb362d8928825c591fd39d7e634cf14d679d2216
 MISC metadata.xml 815 BLAKE2B 963f1b8425495144d04659d2d8cdabab910f15f9861634bf436a82ccb70b27682b44c47415ca6884956097e92294457d09b5c44e7a2f108c93abb79df8884aa7 SHA512 940a6c63c4c13a1c78c041c02df9bd3d2ac0f19eb552fcfb8134784386a2197956b1dd4950c760ca6ac9e8fb154eb550d59fc6ab1aea9c9236e7e005882d556a
diff --git a/sys-devel/llvm-toolchain-symlinks/llvm-toolchain-symlinks-15-r1.ebuild b/sys-devel/llvm-toolchain-symlinks/llvm-toolchain-symlinks-15-r1.ebuild
index 8d59c568c625..6ee57eebb98f 100644
--- a/sys-devel/llvm-toolchain-symlinks/llvm-toolchain-symlinks-15-r1.ebuild
+++ b/sys-devel/llvm-toolchain-symlinks/llvm-toolchain-symlinks-15-r1.ebuild
@@ -12,7 +12,7 @@ S=${WORKDIR}
 
 LICENSE="public-domain"
 SLOT="${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
 IUSE="multilib-symlinks +native-symlinks"
 
 RDEPEND="
diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest
index dc431cb9e841..765fbd2ee1cc 100644
--- a/sys-devel/llvm/Manifest
+++ b/sys-devel/llvm/Manifest
@@ -15,8 +15,8 @@ DIST llvm-project-b34ea582774c057d9bf5591174d683fd3d8aa02b.tar.gz 169735900 BLAK
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
 EBUILD llvm-13.0.1.ebuild 12007 BLAKE2B f235f91c07fe75bfa0afffc6d750c10f77b7817353ee84d99a0fa706f6fb7fb30dd74bf2966ca4aaff162faad8c3c9ed9ee6446bdcd0878195de61a15ab23355 SHA512 b1cf7e90b038de6c1d9165e849e7bd422d4665fb23c477aa514bdde3c0cb92e9eb9dd76968e37d4e885bfd792f441ba7e95c1a41baea2f8f7993aadb38439717
 EBUILD llvm-14.0.6-r2.ebuild 12381 BLAKE2B 736afa7fbf7321ce4370e892075e716e6efb23981b4e9d235d60784c7548c6b62590527753e2752f80b4a4eafc04096fbd6ec5b8efbba88de08f322262361eda SHA512 1c800cea06768c48fe7c0944e4b4c9227f11ffbf9605ca52e487646385eeeaab5acca8aaba0e66b21b2939505533f562fe40ac5b23533adf0e42898e163a9620
-EBUILD llvm-15.0.3.9999.ebuild 12457 BLAKE2B 52496ac8ef1cb0d61f1f7c6dc5b3db0a0778d841ad67c983c140b0c7858125bd34bdbab31fd1862e5b6c6eca4554764dd1dd2422268ef485c6ee8ecf8fcf3c57 SHA512 0e4e356633dc5d9660e0d440f74ef709ebf88919cec1cb2f317c3744000e8db25e0036be3404a01dd8817ff8e77c64f95c38a27c8cd8e9445e7f037a0a8a5f7b
-EBUILD llvm-15.0.3.ebuild 12543 BLAKE2B 9dfa279e68956c4374ed3f7da1b0b025681adb074a79319b2b3df6b2ee273b7c29ba96a4f9262e8ed506e8edbbc1f7254359b519dac6111a819ea69bc278bd34 SHA512 7210feff1719c0c16c87239ab5ce4bb08f0e862d3e5bc67695f823c067c4cee625ed15250335e747e8d2de8eb3619334e701b856d591e53274f5b1c5c077809d
+EBUILD llvm-15.0.3.ebuild 12542 BLAKE2B f72e8a93e3667503533f1d511568a31d20f6d73c5445c9f98e21c6520d3cd172074a6deb71db0de86df5ae4c86e8ba3bfc4eb3f466511548c0816d2fb20eca71 SHA512 096c6fa3079e5b6fe6b79f4e3e6953065548b15109e7d4c87d572c07d8464a68525ea648af4c24530ae7142fe4373612e3010492b1ad168ff8de20db0a0b1bde
+EBUILD llvm-15.0.4.9999.ebuild 12457 BLAKE2B 52496ac8ef1cb0d61f1f7c6dc5b3db0a0778d841ad67c983c140b0c7858125bd34bdbab31fd1862e5b6c6eca4554764dd1dd2422268ef485c6ee8ecf8fcf3c57 SHA512 0e4e356633dc5d9660e0d440f74ef709ebf88919cec1cb2f317c3744000e8db25e0036be3404a01dd8817ff8e77c64f95c38a27c8cd8e9445e7f037a0a8a5f7b
 EBUILD llvm-16.0.0.9999.ebuild 12559 BLAKE2B aa93af6653978a2a0d668e7127e21291e2f1ebeaae5a559186df394184f24ddc26f61911c67cc70ce33d01702fcdf2511e57968d545c993952fa21c2ab351a17 SHA512 22616fc733364c39188d17ebd5ce12d5a340fc5245e4d0901a93ba925288f588e00fd63f0cc3902082b48e248e48b98338d2820bfaf81f7dbef530a1e434a304
 EBUILD llvm-16.0.0_pre20221016.ebuild 12532 BLAKE2B fcc2fbe2f7b96e579d99ca52eb6c59ce2bc6fa652e2bf3fecfd88aaaafef9290ced05b5134aac327ceef0af9fb07b643a28405bc1aabf302fdb65c71544f40b8 SHA512 ec2991754334a2c33a08160d35ea099d2bc38f2ee9b2498f06d4864402cead296646aea33ed1240a32f452f360016dfcc066d12f3056753ff7e894cdf083d930
 EBUILD llvm-16.0.0_pre20221023.ebuild 12557 BLAKE2B e3f1c5db24d86f1ffb4f04503b62e2906bb5302d0b04a16eea751210e282853aa7dbe2a07ca1ae8345562c872cd78dde6f3831c24447ea8b0ff67eadc8df8628 SHA512 cd3f6916249429ca2b13d92a1f522b0260914c9e1025f343dfccb72fd20d07291d3aacff287b83093b39ccc9ae9931f392853a10016e6f85b4f5c2568c6a7efb
diff --git a/sys-devel/llvm/llvm-15.0.3.ebuild b/sys-devel/llvm/llvm-15.0.3.ebuild
index 7e1b4d4609af..078cb9b1052a 100644
--- a/sys-devel/llvm/llvm-15.0.3.ebuild
+++ b/sys-devel/llvm/llvm-15.0.3.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc"
 SLOT="${LLVM_MAJOR}/${LLVM_SOABI}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
 IUSE="
 	+binutils-plugin debug doc exegesis libedit +libffi ncurses test xar
 	xml z3 zstd
diff --git a/sys-devel/llvm/llvm-15.0.3.9999.ebuild b/sys-devel/llvm/llvm-15.0.4.9999.ebuild
similarity index 100%
rename from sys-devel/llvm/llvm-15.0.3.9999.ebuild
rename to sys-devel/llvm/llvm-15.0.4.9999.ebuild
diff --git a/sys-devel/llvmgold/Manifest b/sys-devel/llvmgold/Manifest
index 02c8175929eb..1e8631246ede 100644
--- a/sys-devel/llvmgold/Manifest
+++ b/sys-devel/llvmgold/Manifest
@@ -1,5 +1,5 @@
 EBUILD llvmgold-13-r2.ebuild 591 BLAKE2B 28b122d41982961594bd1f70e9a666ace7e51e7d986007fea010e6920d6ed41571dcf345761cce2e0ff5baa6e6cc2c26da6770b56d467318371f039f5065588d SHA512 4af8bb97486371e74b915964125dc06542234b1d5cc3db4567ffe5ab1a6e6d29ac39bafa23b69aa3cb0fad97ed8b658fdba04cf137b65b9660e5079f4742fd4e
 EBUILD llvmgold-14.ebuild 576 BLAKE2B c9493f322fa0e387411df160c28078a514510e684f01c415a035c93868dd5a16ae718f10af0debe2e1a4112ea0864890a81a89ebf3fefc55ffdc89adc743524f SHA512 7cdb73379b9f6db22abde1f01043e28b8bfd797f3123f77d31ab3166e2c8d72747aad0963e8f6a41a0a01a19ea29eb468d869b5dbc7a35eb016a4a89c57715c3
-EBUILD llvmgold-15.ebuild 582 BLAKE2B 9c0a5ee57e6c5a89e20a26a07e60665ea01f75c575d82fbe653cc4827d25006a3b85f6d28caa36fa351ecbbb6c8f8b73480a42f5123dc4bdb423797202d631f2 SHA512 3f91919405f840caab4fc317db9ebfb9b1449bf460f4b2b323dd3fc6a382e163859109ea4b600d6624ce08c32d55b07cbb9178f271753e575c96854f760de7ca
+EBUILD llvmgold-15.ebuild 581 BLAKE2B 23e23fb83bcec63016e97f21a6faf48636855c5b205f3c5156ef8eaa8248f52a8002a46b64e0e6720a720f50fcd6fbc04bebe68f80bc1c38b6fa1b735f56c684 SHA512 4c494d7a8f71eca22ee8693b9c4bb2a627eacb6f8367222fc99187d47b63cc2a2d61f98cd325359bab5dc214465f2b0526157084c33c635ef28c155906143fb6
 EBUILD llvmgold-16.ebuild 538 BLAKE2B 6b52842f7dfb1ea578c1878c49360c64eea77d4495a90a10bd9591fe47678f32b9accbed043d47a4f299e98b887cc329d6b74604011d931a6f9d2b810c24536e SHA512 8b7946b887064695a0d1a0df26dcdaca69f3c748fdc46ff3f82d0284785e82aeb467c610ba6b14bdce5c09ae9ab603d17f4e8cfe36e204e206a7d5d3e8e1e6d1
 MISC metadata.xml 299 BLAKE2B 2feead2cd1b35b3a43335ddd7711f8181b52bc63ee7166608914260c67528add5251349063afbef4f8cf0ec09b2cd4c3ffdd90f2c14ed60bb69ebc03888f6333 SHA512 cd745c54ab18d25bdaff18582105072574103a36cfe7c175ef740f266d00e9fc6f44c332904d23b911c939cf5bdf52973b388923099d8dd5dfef3c283b5cb685
diff --git a/sys-devel/llvmgold/llvmgold-15.ebuild b/sys-devel/llvmgold/llvmgold-15.ebuild
index 317a4594a1d4..df53c6a44040 100644
--- a/sys-devel/llvmgold/llvmgold-15.ebuild
+++ b/sys-devel/llvmgold/llvmgold-15.ebuild
@@ -9,7 +9,7 @@ S=${WORKDIR}
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv sparc ~x86 ~amd64-linux"
 
 RDEPEND="
 	sys-devel/llvm:${PV}[binutils-plugin]
diff --git a/sys-devel/make/Manifest b/sys-devel/make/Manifest
index d0a7bfbfe31b..f37d98d4888a 100644
--- a/sys-devel/make/Manifest
+++ b/sys-devel/make/Manifest
@@ -1,10 +1,10 @@
 AUX make-3.82-darwin-library_search-dylib.patch 394 BLAKE2B abd83733bc3036e412a57e0ced927511f45b9308f77d759ab299a5fc7fd76e81346cb4b908513ab20bc4aa931d436dbd4b3cd8cd0f5b05f94816569830589ce8 SHA512 32728cda66093f813e2731e120d71befa71e97e57a908503f60f79fd400e9fe0766f72d0c2ed065def1ea3a36a03b67d189dbff474728f41622489f1c3a515cb
 AUX make-4.2-default-cxx.patch 212 BLAKE2B 16ab647e54b27b2be8fe3b8abc37940690e828a1f68a21856377dec4b282ef489246f5de7c2b364654327166fb9b3f2a0dae755dc15db786c607c6d7f1fd76d1 SHA512 9b9be230f8c74ee438851d1c10409ebd188f818d04e99b799a353fc26c2da78d2e298b907287ceece7b6e64f9ac0908ae65e33c35634b9338b246225b63cb409
-DIST make-4.3.91.tar.gz 2280069 BLAKE2B de3e850d6f60a208f2870aee9f7b88a49b4fb9c29d932abb00c1a7613a7be151ab871cca4a556dfe66eaefd408c8007da712f36b5f3a9b80479f024c983f47f4 SHA512 3b16641e6b8bb8d1324572ae3e42860a35cd1b3ee2fd32b96340737acc42d43a4959b92e40ea2a591b387430a7e9b1391da78ff6301d1db358380c578312a61a
-DIST make-4.3.91.tar.gz.sig 566 BLAKE2B 7d010114186c06b91324e200f7a1036d2b8a49c219d194b5c03067b77549aab282625442c37ac74a25b0c15d16972742a4976028f50f85352716615ccac0cf1f SHA512 a6edb9cb4daceb2938bdf0afce2967b97fc8565dcdee208b522ab46f237b5fa73d1b627c9dd676fbddc384b45ce55ba3a5eb9d4139eb4ed8a6016762bbcea6da
+DIST make-4.3.92.tar.gz 2296745 BLAKE2B 6b13a7982297180b9cd737fc9dde42498da5f0277227f4a2cdea9770b59eb37ae95d02e6debbd6e07dc722509d23f0f233d760fdeb2bcd6e5e3c3f28114c597f SHA512 c92efb99c3c406eac211635012af22c44575d9290ab20185fee1c3f208313cef920e86ca15fcb21b4f99e638e55a59c357ade2bd5595cfe0ff85aa64413a6d90
+DIST make-4.3.92.tar.gz.sig 566 BLAKE2B a434d7290ebf03f2ce70f59990961a245dcb1461b1fd1b3efdeaeaf6311ab902a4f98c22b12425fe1948ba3ab4f6c6e47dca6ed29ced7694a10af991a51599e2 SHA512 164b95b778b212951d31c05171def036cb65bd43788ac1deea283856771505a072add34d0fffc3cc7211a3242afe07cd29f168b4614556094c1bf505b860f54d
 DIST make-4.3.tar.gz 2317073 BLAKE2B 5a82ce1f30eb034366ac3b87d2ec6698aae17d7b1a611941cf42136b2453b34236ab55382eab0a593c43cee8b036ba4a054f966c41ba766fdbd2862942be5dff SHA512 9a1185cc468368f4ec06478b1cfa343bf90b5cd7c92c0536567db0315b0ee909af53ecce3d44cfd93dd137dbca1ed13af5713e8663590c4fdd21ea635d78496b
 DIST make-4.3.tar.gz.sig 566 BLAKE2B 75bf71602e60f97ec8efa81676329047746d960257ef310b89a059144c00628b6a1ddf7a16a2ac2c3e935b8591475f5043a7c7546668ab39abbc4717c75a6528 SHA512 bf13e2943593b153457c8111179e8ae11cef2d9185a986106a1e70946a260bd930505a5e10002c5a60888e11affc07713c367b8680fd511ad87b2e124d303a99
-EBUILD make-4.3.91.ebuild 1937 BLAKE2B e63f3a30b3032769736d408691c594cc08b40c0cd06fc0f548ebf62dcca4e67f793a6fa42c89ec40f329af2551fbb2928eb6c21ca1e704c802f4b0ff86318173 SHA512 158e77869d70fc1e0c00d4f1df036bf66a85273900c19c67626701986e9eb36e0a8c1899cd22c7af091eaccfe6a334f20f03e47ec6fafb3225f5740999f1d790
+EBUILD make-4.3.92.ebuild 1937 BLAKE2B e63f3a30b3032769736d408691c594cc08b40c0cd06fc0f548ebf62dcca4e67f793a6fa42c89ec40f329af2551fbb2928eb6c21ca1e704c802f4b0ff86318173 SHA512 158e77869d70fc1e0c00d4f1df036bf66a85273900c19c67626701986e9eb36e0a8c1899cd22c7af091eaccfe6a334f20f03e47ec6fafb3225f5740999f1d790
 EBUILD make-4.3.ebuild 1931 BLAKE2B 84d538027ac0a84300ccce7f1b446407796a10a9314e016850b092f7e2d5d62dfcf96cc68d013f6b12d682cc3bf94ba4a97a7b0a6247314fee10d864e8ebf6b6 SHA512 2f764ad5b425038139fec36c56a194284ed34c0f2991d0d4c94cc81ea111ef6662646c3ba96968c2d13debbcdede5a0000abe091ff970b67c13cc49958d113e8
 EBUILD make-9999.ebuild 1939 BLAKE2B 7c6349508d3a303c15cea60503d8dd343931f43c5f93af2f3e12b838bca498c612ed89e2a4400b041106901087b6d069fa3e50af7095b02255fcf959f9b1759d SHA512 96b3f9d9057c82351c3dd554390860dc3cb8d77f2cbc2b89c0f0dcdaec1607088766d6de79a9b63a7a2312dc1573394253798b9238933c9b13f19638cc54dc1c
 MISC metadata.xml 335 BLAKE2B 5b17214450a474af84b5015059fed4edc919e53bfd407cedf0816746d95a3258aa90fb851a7d013f1ef10b61d689ead735f8ed35b109e12b45e7a4efab22abe3 SHA512 72ff31b31e5d9bf55124d570d8ff4911eecd2272492988919fc073e5864d4282e4acc3101c367076c1009e3af086792993fa96562c25699f1b537b88fed40a1f
diff --git a/sys-devel/make/make-4.3.91.ebuild b/sys-devel/make/make-4.3.92.ebuild
similarity index 100%
rename from sys-devel/make/make-4.3.91.ebuild
rename to sys-devel/make/make-4.3.92.ebuild
diff --git a/sys-firmware/Manifest.gz b/sys-firmware/Manifest.gz
index 0ebdd0cae945..6d312cf715d7 100644
Binary files a/sys-firmware/Manifest.gz and b/sys-firmware/Manifest.gz differ
diff --git a/sys-firmware/raspberrypi-wifi-ucode/Manifest b/sys-firmware/raspberrypi-wifi-ucode/Manifest
index 4e90c0a8932c..2578bef06e4e 100644
--- a/sys-firmware/raspberrypi-wifi-ucode/Manifest
+++ b/sys-firmware/raspberrypi-wifi-ucode/Manifest
@@ -1,6 +1,7 @@
 DIST firmware-nonfree_20190114-1+rpt11.debian.tar.xz 2038892 BLAKE2B a2d66e637cd26928c23855f5369c13b83e25b6b4353c82e9a62cb14b010a8c1fda566f6d200e0e7a706c7fb140238082238b7af80fe1f75fe3f07c815fc0eb6a SHA512 5ba6783dc3f3903f20321571a1fb2e11d7781de6d49689c68e6e1f194dad9cdddec90abc94a32a130323b2c8f9839af387c46aee895caf30ffb2f6dfe6d95b7d
 DIST firmware-nonfree_20210315-3+rpt5.debian.tar.xz 1743300 BLAKE2B 5de090eefc68ba34df43c58a08554891b8e98d1c8ebce37c63275af8ca438b42880d95dcddf902a1491e19007ccab8cec950f74f50c4f84df092c76e6ffb437b SHA512 8a2151b8c96b0ba806eb25fb0eed12c3b3b91d3386f8ed4ab8058dc5c5989ed5eee39c8c24ceaa8f343042a5031a8c4a2cd759b42cb12d76b58209de50c44083
+DIST firmware-nonfree_20210315-3+rpt7.debian.tar.xz 1755320 BLAKE2B d7d5a3a2a1f7fbf6f18c751a92012bb7018aab403091288c291d64dbc7c46b26053f3d8693253625d7603a3df9ef9ec8e5f27c365dd0e0904725f351c54931a7 SHA512 e0ae23a0306d941d0633be19e964dbaf657fe64d97bf767691558e8565814f71dbd4f45dad8219ccc8a8953bc8088f8a98e65a11d389e0d0868bf20349060ded
 EBUILD raspberrypi-wifi-ucode-20190114.1_p11.ebuild 2379 BLAKE2B 6f3569abe1d0c0071bcd03e7cbed2b45ce7eafdb59a20b793e6a6cb77e70c49c3acb432f2db4727acba3d8b0a2f00a62d7c80a9fc1d83f96940a153d8e8e7979 SHA512 63e2b279a8ca863d7837e6f2d864f4ad3ebb1a1bdb3555415415fb7b92e7739f8623322a41e479a442512df4d967a4ae9b8c04ead4ab1502d72b97873228b7c0
 EBUILD raspberrypi-wifi-ucode-20210315.3_p5-r1.ebuild 2469 BLAKE2B e53483e6971e8a1a71ab50de3011eee09b5df84ed7526617fb7206504b5161860c470db9be1b07c7ccf521c3859cfb12e005443d99b853c0e80f3dc1da4305cd SHA512 8da229dcd2ba62f120abebb9273dcea1d962209082e0fc72d23dc6170d412f42f1f0a8855c69bf961170f6c83669f7ec58cd6ff7a886747da35e1d26cf1e06e1
-EBUILD raspberrypi-wifi-ucode-20210315.3_p5.ebuild 2437 BLAKE2B e27c8c4773a6c22bf3270ab969766868ae33ffd579bd593da1598baaf5c3c593442346262d4cc7cffd1420328d08f7f2812b3576a9cbbde63e328216dc040c28 SHA512 adf77ca6d9ee3eec6fad4fbbee2c6e628620d3e0dffec45600011631b3219d40a9b70e948fe145e91283e916faec8f13b3546b8a6a9fa862cc72a07358818b85
+EBUILD raspberrypi-wifi-ucode-20210315.3_p7.ebuild 2469 BLAKE2B e53483e6971e8a1a71ab50de3011eee09b5df84ed7526617fb7206504b5161860c470db9be1b07c7ccf521c3859cfb12e005443d99b853c0e80f3dc1da4305cd SHA512 8da229dcd2ba62f120abebb9273dcea1d962209082e0fc72d23dc6170d412f42f1f0a8855c69bf961170f6c83669f7ec58cd6ff7a886747da35e1d26cf1e06e1
 MISC metadata.xml 713 BLAKE2B 0440fb00ea20009509c7d0aeb24bb26aa0e982e69457fd7f325aef56f810c448b5776fee4ec4aec58c40e4b895a724e7d0cec605037dea44f19cc487a9b423c3 SHA512 6fbe06d1c2c3913d2d4c40b575b9b0178110184e89be41302a176b15beafa81c7dbc4f755d92fa045210869902b2a37fe5f42bbaae69760c860a63a42d1ab04e
diff --git a/sys-firmware/raspberrypi-wifi-ucode/raspberrypi-wifi-ucode-20210315.3_p5.ebuild b/sys-firmware/raspberrypi-wifi-ucode/raspberrypi-wifi-ucode-20210315.3_p7.ebuild
similarity index 96%
rename from sys-firmware/raspberrypi-wifi-ucode/raspberrypi-wifi-ucode-20210315.3_p5.ebuild
rename to sys-firmware/raspberrypi-wifi-ucode/raspberrypi-wifi-ucode-20210315.3_p7.ebuild
index 79f547877a9a..ce8516611329 100644
--- a/sys-firmware/raspberrypi-wifi-ucode/raspberrypi-wifi-ucode-20210315.3_p5.ebuild
+++ b/sys-firmware/raspberrypi-wifi-ucode/raspberrypi-wifi-ucode-20210315.3_p7.ebuild
@@ -15,7 +15,10 @@ LICENSE="Broadcom"
 SLOT="0"
 KEYWORDS="~arm ~arm64"
 
-RDEPEND="!sys-kernel/linux-firmware[-savedconfig]"
+RDEPEND="
+	net-wireless/wireless-regdb
+	!sys-kernel/linux-firmware[-savedconfig]
+"
 
 pkg_pretend() {
 	local -a BADFILES=()
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 5b10f37eb18c..1c6043cbfd55 100644
Binary files a/sys-fs/Manifest.gz and b/sys-fs/Manifest.gz differ
diff --git a/sys-fs/btrfs-progs/Manifest b/sys-fs/btrfs-progs/Manifest
index abd9de1669c2..5c5de1c0c991 100644
--- a/sys-fs/btrfs-progs/Manifest
+++ b/sys-fs/btrfs-progs/Manifest
@@ -2,8 +2,10 @@ AUX btrfs-progs-5.18.1-glibc-2.36.patch 984 BLAKE2B d7aefe6434a4719d1b98ce1842e3
 DIST btrfs-progs-v5.15.1.tar.xz 2280796 BLAKE2B b460254a6261d3d04a2d265a3b4e05a89385888f7ea4f2b16ec5b73922646c7f47a546fc78ba7c009e65914125435cf38157eabffc74f5d00df2c21c844922e3 SHA512 68ed89e337ae857fdaf077eaa889e259e9f162ea2222bdaa03f4187783a8682c24d45c91b0559b901d81429ba2cd3f84087d032d354092d5512fb226bdf91549
 DIST btrfs-progs-v5.18.1.tar.xz 2293940 BLAKE2B ce2326cca51a4242895aada860e290c6af69a216dc6369673bb3321ab91bfe1c995fcc37dd0c1e15c8e28aabaedf3d6c9508bde393eb0ba4c7b9327c922f749a SHA512 265a03b0db00a231ad51bb75fb161dee0a7a51cd120a696ca0524f08ef635b18afe43b391fa9889a4a79734ccc3931e4374bd950eb26dc47ddc8482368efed0e
 DIST btrfs-progs-v5.19.1.tar.xz 2315036 BLAKE2B f1ae6901ddc8236f440d46a950923727c3f6168a220ec2c782102355fabcc2217e9617691550db203391279775d53676a2a7ad1920bfde07f39b3744b7f5fff5 SHA512 17fded8583b7392202b1bb408cbb5d42024623ac15415f95e8e56e27b43be79da6d4e6c191d39db4e5a8948390a7c216c0ea520171b0ab95438cc330084c8398
-EBUILD btrfs-progs-5.15.1.ebuild 3127 BLAKE2B 0cc891af7b7d35f97a9cd58546dc0f1c87ac33934e1eed2a1eac21f9ce57125125d781a455c227b6ecaf42f78af26a6d62e18a30bf14773057efe2890774dcac SHA512 b07954560785b0b3c28e422878cd6b812c48a9a9498905d60b752245d92e7a057309808485caa90e0579aec1f44930a2c146331cbc7ed1c5cbed7daacafcfaee
-EBUILD btrfs-progs-5.18.1-r1.ebuild 3353 BLAKE2B 3a7800157d8f7a79aa3498f97cafa7b9cae6a8b9a17c7d37db94d4e05871e8d848ec9f6002a1711c54fa1b07f4c31c64741078e35cb9cb7d200a5493441d5430 SHA512 795a6943caf136d6fe387abc07f27c2dd5a7fed1f99910b18c62bc07e1679e12dd5a7336186286e90a82f0e672f86c2aca593037d404598d22df09a993bc5873
-EBUILD btrfs-progs-5.19.1.ebuild 3282 BLAKE2B 75e89035a86b4498f80ff7a2d8a7bc6538c8ce2a79e9127d66fdaeea09a416024791e580b1deb91d5b86284bfee0da1a3c07e717cae53057bbf3f0befa5a88cd SHA512 2b054114a1622cb6a6bd6505904ef0da44fd8a5462da25c3c546341fd2753f618cd187798bc09c57be7046fa828865022a4493d026725ef28d50d4e4e554f84c
-EBUILD btrfs-progs-9999.ebuild 3282 BLAKE2B 75e89035a86b4498f80ff7a2d8a7bc6538c8ce2a79e9127d66fdaeea09a416024791e580b1deb91d5b86284bfee0da1a3c07e717cae53057bbf3f0befa5a88cd SHA512 2b054114a1622cb6a6bd6505904ef0da44fd8a5462da25c3c546341fd2753f618cd187798bc09c57be7046fa828865022a4493d026725ef28d50d4e4e554f84c
+DIST btrfs-progs-v6.0.tar.xz 2317272 BLAKE2B 0d81aefadafaaaf0e535bdb727a376c8476686f3b99b97061fdde75861272474bcc6d6dba3227ba23de621ef5c6afcb38fc8cd9fce32ee0fcb0de046f5dd07d8 SHA512 3ec532c7c96783da11d1c77619bfef87d9d52bf2f6df7bd89c200157052936a2bfd6c961c7e3519e7a12ec611e7b17fb4d6c3f192086bb1b4ebbf87c22cfe24a
+EBUILD btrfs-progs-5.15.1.ebuild 3167 BLAKE2B 56951fda134b6eef1a5a044eedd6212203a5214b4f9eb062bd31da41d475216499ffe521b75dcf88b67cb06a6b8c279042e1d46d8eb17d52a68c9e5fa74d8650 SHA512 e77895f4e6d0211168c60e256e56cac5d681593674d85971e49210ccf496fa8344055360130e5ae635dd197ee0e27fa6ed6c50647dc121a7e7392ef2bad7e276
+EBUILD btrfs-progs-5.18.1-r1.ebuild 3393 BLAKE2B a68726cab64d539fdd6f4f9f167719a1358b8889954d2e41ea4a4c0282cbe1e31e2416d3e2b9db19769d02703d928ddf3e164a8b54bc92f133dbfb4f254c4d36 SHA512 7055ba3f8f5c2f8ccb0029f32dd20531af0da42e0c29c05f2a4f3c040e0cd20b732c9978f3f164878c5df2e29185053eb17ac8f72acba6612815741fe9afb323
+EBUILD btrfs-progs-5.19.1.ebuild 3322 BLAKE2B 6463cd65703acb98f9b0ea498b391fb8cc4d44366481e944b71e2a68c64815aef3ac192a11b1ef3331af6a820cf7e48710ecb3ffd5f0e894464b730dd14a915e SHA512 c132b68c5fdc7eb26c05ac47c16c35aa803ffc21e9aebd7eb75735df51eaa00021673aedc04125326f5f44030a579585c1f8f0eb04aee977ac128280ffd3d018
+EBUILD btrfs-progs-6.0.ebuild 3322 BLAKE2B 6463cd65703acb98f9b0ea498b391fb8cc4d44366481e944b71e2a68c64815aef3ac192a11b1ef3331af6a820cf7e48710ecb3ffd5f0e894464b730dd14a915e SHA512 c132b68c5fdc7eb26c05ac47c16c35aa803ffc21e9aebd7eb75735df51eaa00021673aedc04125326f5f44030a579585c1f8f0eb04aee977ac128280ffd3d018
+EBUILD btrfs-progs-9999.ebuild 3322 BLAKE2B 6463cd65703acb98f9b0ea498b391fb8cc4d44366481e944b71e2a68c64815aef3ac192a11b1ef3331af6a820cf7e48710ecb3ffd5f0e894464b730dd14a915e SHA512 c132b68c5fdc7eb26c05ac47c16c35aa803ffc21e9aebd7eb75735df51eaa00021673aedc04125326f5f44030a579585c1f8f0eb04aee977ac128280ffd3d018
 MISC metadata.xml 524 BLAKE2B 4e27833128aeb064271af7a4f3c05699b4603b1d993b32bef3d9d973182d3d0c88ac799c95f0f35495e9a99e645627afd96049273c08c3e1334d8fe1ccf0debe SHA512 471014a98bc3feb75e7930485e89daf6cb3390c37a330b8373d5c3b0b764b9180cbff133839ce4742a3c76f63e6f18895060d5906e6a113d2cd43af0df3b0d5a
diff --git a/sys-fs/btrfs-progs/btrfs-progs-5.15.1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-5.15.1.ebuild
index 0920217e744f..82a6e4175c1e 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-5.15.1.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-5.15.1.ebuild
@@ -23,7 +23,7 @@ else
 fi
 
 DESCRIPTION="Btrfs filesystem utilities"
-HOMEPAGE="https://btrfs.wiki.kernel.org"
+HOMEPAGE="https://btrfs.wiki.kernel.org https://btrfs.readthedocs.io/en/latest/"
 
 LICENSE="GPL-2"
 SLOT="0/${libbtrfs_soname}"
diff --git a/sys-fs/btrfs-progs/btrfs-progs-5.18.1-r1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-5.18.1-r1.ebuild
index d9cb1c5f94db..11d5b820c544 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-5.18.1-r1.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-5.18.1-r1.ebuild
@@ -26,7 +26,7 @@ else
 fi
 
 DESCRIPTION="Btrfs filesystem utilities"
-HOMEPAGE="https://btrfs.wiki.kernel.org"
+HOMEPAGE="https://btrfs.wiki.kernel.org https://btrfs.readthedocs.io/en/latest/"
 
 LICENSE="GPL-2"
 SLOT="0/${libbtrfs_soname}"
diff --git a/sys-fs/btrfs-progs/btrfs-progs-5.19.1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-5.19.1.ebuild
index bf8cc19f185c..73fcf46caa45 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-5.19.1.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-5.19.1.ebuild
@@ -26,7 +26,7 @@ else
 fi
 
 DESCRIPTION="Btrfs filesystem utilities"
-HOMEPAGE="https://btrfs.wiki.kernel.org"
+HOMEPAGE="https://btrfs.wiki.kernel.org https://btrfs.readthedocs.io/en/latest/"
 
 LICENSE="GPL-2"
 SLOT="0/${libbtrfs_soname}"
diff --git a/sys-fs/btrfs-progs/btrfs-progs-6.0.ebuild b/sys-fs/btrfs-progs/btrfs-progs-6.0.ebuild
new file mode 100644
index 000000000000..73fcf46caa45
--- /dev/null
+++ b/sys-fs/btrfs-progs/btrfs-progs-6.0.ebuild
@@ -0,0 +1,150 @@
+# Copyright 2008-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit bash-completion-r1 python-single-r1 udev
+
+libbtrfs_soname=0
+
+if [[ ${PV} != 9999 ]]; then
+	MY_PV="v${PV/_/-}"
+	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"
+	fi
+
+	S="${WORKDIR}"/${PN}-${MY_PV}
+else
+	EGIT_REPO_URI="https://github.com/kdave/btrfs-progs.git"
+	EGIT_BRANCH="devel"
+	WANT_LIBTOOL="none"
+	inherit autotools git-r3
+fi
+
+DESCRIPTION="Btrfs filesystem utilities"
+HOMEPAGE="https://btrfs.wiki.kernel.org https://btrfs.readthedocs.io/en/latest/"
+
+LICENSE="GPL-2"
+SLOT="0/${libbtrfs_soname}"
+IUSE="+convert python +man reiserfs static static-libs udev +zstd"
+# Could support it with just !systemd => eudev, see mdadm, but let's
+# see if someone asks for it first.
+REQUIRED_USE="static? ( !udev )"
+
+# Tries to mount repaired filesystems
+RESTRICT="test"
+
+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_DEPS} )
+	udev? ( virtual/libudev:= )
+	zstd? ( app-arch/zstd:= )
+"
+DEPEND="${RDEPEND}
+	>=sys-kernel/linux-headers-5.10
+	convert? ( sys-apps/acl )
+	python? (
+		$(python_gen_cond_dep '
+			dev-python/setuptools[${PYTHON_USEDEP}]
+		')
+	)
+	static? (
+		dev-libs/lzo:2[static-libs(+)]
+		sys-apps/util-linux:0[static-libs(+)]
+		sys-libs/zlib:0[static-libs(+)]
+		convert? (
+			sys-fs/e2fsprogs[static-libs(+)]
+			reiserfs? (
+				>=sys-fs/reiserfsprogs-3.6.27[static-libs(+)]
+			)
+		)
+		zstd? ( app-arch/zstd[static-libs(+)] )
+	)
+"
+BDEPEND="virtual/pkgconfig
+	man? ( dev-python/sphinx )"
+
+if [[ ${PV} == 9999 ]]; then
+	BDEPEND+=" sys-devel/gnuconfig"
+fi
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	if [[ ${PV} == 9999 ]]; then
+		AT_M4DIR="m4" eautoreconf
+
+		mkdir config || die
+		local automakedir="$(autotools_run_tool --at-output automake --print-libdir)"
+		[[ -e ${automakedir} ]] || die "Could not locate automake directory"
+
+		ln -s "${automakedir}"/install-sh config/install-sh || die
+		ln -s "${BROOT}"/usr/share/gnuconfig/config.guess config/config.guess || die
+		ln -s "${BROOT}"/usr/share/gnuconfig/config.sub config/config.sub || die
+	fi
+}
+
+src_configure() {
+	local myeconfargs=(
+		--bindir="${EPREFIX}"/sbin
+
+		--enable-lzo
+		--disable-experimental
+		$(use_enable convert)
+		$(use_enable man documentation)
+		$(use_enable elibc_glibc backtrace)
+		$(use_enable python)
+		$(use_enable static-libs static)
+		$(use_enable udev libudev)
+		$(use_enable zstd)
+
+		# Could support libgcrypt, libsodium, libkcapi
+		--with-crypto=builtin
+		--with-convert=ext2$(usex reiserfs ',reiserfs' '')
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	emake V=1 all $(usev static)
+}
+
+src_install() {
+	local makeargs=(
+		$(usex python install_python '')
+		$(usex static install-static '')
+	)
+
+	emake V=1 DESTDIR="${D}" install "${makeargs[@]}"
+
+	newbashcomp btrfs-completion btrfs
+
+	use python && python_optimize
+}
+
+pkg_postinst() {
+	udev_reload
+}
+
+pkg_postrm() {
+	udev_reload
+}
diff --git a/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild b/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
index bf8cc19f185c..73fcf46caa45 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
@@ -26,7 +26,7 @@ else
 fi
 
 DESCRIPTION="Btrfs filesystem utilities"
-HOMEPAGE="https://btrfs.wiki.kernel.org"
+HOMEPAGE="https://btrfs.wiki.kernel.org https://btrfs.readthedocs.io/en/latest/"
 
 LICENSE="GPL-2"
 SLOT="0/${libbtrfs_soname}"
diff --git a/sys-fs/cryptsetup/Manifest b/sys-fs/cryptsetup/Manifest
index 710a151b074a..45c3d67de013 100644
--- a/sys-fs/cryptsetup/Manifest
+++ b/sys-fs/cryptsetup/Manifest
@@ -3,6 +3,6 @@ AUX 2.4.0-dmcrypt.rc 9059 BLAKE2B 622320bd69a9e2d2779bd0eb97034635335125d2def73f
 AUX 2.4.3-dmcrypt.confd 4306 BLAKE2B 107697c85548a8c5f1f4ffc1ae6ec785bcb9c63a55e52a97fd24c1a3c5e7867d031f494030a27be1efb8eab448a94e466c186c964b2638fd4d95250005fbf31d SHA512 d80701d1507c682d619e2ec433bebab2d64cc3e27c5ddc2e7c8408e07dcd353b4d66e9b8505719fa88fa734d7a7930fc90f5b8279e185580c3c038ac7ef7a02a
 AUX 2.4.3-dmcrypt.rc 9697 BLAKE2B 356a54e5de24717731ffdcf6235fe229bc57169c3bd248f5cac77c1cbf0c596c77c0d95a5ef502972db3bab155f4253a53db9be2b7787e10791275d4695821d2 SHA512 61434a6ae3346e5a2f330656055add0c32d1c79a62fec3e8b0f4e38e95f8cf0a3e8ab8d1cc0955316e2ea1b47d9863bffbf46c980fc2f32d6fdd4e817769ca9c
 DIST cryptsetup-2.4.3.tar.xz 11242152 BLAKE2B f5859d794d626cb19426a2c9afc4655fac3a1bae462daa42b37b925882804d5146aadff8733799dea89dcfdc311e628e5b806754495824705709ba105f91682f SHA512 2d52498497be37a837126d9cdc9b6331236eccf857c3482fe3347eb88fccc3cd0fd3d8b4490569603e18cfaa462431ae194bce0328f3eafa8bfe3e02e135a26e
-EBUILD cryptsetup-2.4.3-r2.ebuild 4261 BLAKE2B cb381432821e7f42eb2e12f174d8c585736820461b4a59b7e90d344c3be8b3d6df8f4b4fe358d0458b1dc3a268d5a12fe09d5fc4b95c5220bd7d8e6757e7c8a1 SHA512 8fc2fbb324b482fefeac1c7d7769396a4fb1f72072acd296b2b889edf9319f5d5f867edcf60aec5ce6373e21226f7c8771ebd3511d13f2452c760a53f6dd5042
+EBUILD cryptsetup-2.4.3-r2.ebuild 4260 BLAKE2B bea471e3704c7ddeeffc65783ebacf8967873bf5b5a3650888bb2f7108aa982ff3c2e1cf0a7dfae098b9796b879e309586dbb3b648f510e50e66d488b6db27ea SHA512 9990a313a6992ba81cdd233256a99420796cc6da712cf1c664a07c0fa46557a0ea34f0b3083e5995c80ba214ed5d7655d7d4a7baa8d1fdcd929efe6c192acbc2
 EBUILD cryptsetup-2.4.3.ebuild 4172 BLAKE2B 769f38ca8f374b8e08916ab3d7baa4a5bbb250d8fd4dc7f58b8f6a00a062b7def3e033a89781227f1edb15111da7b005dce2e5fe012d747f56d2e995f313baeb SHA512 d671d6d91158d2233b85b026f82fcfb79bf72d8bc0434bfe18cd803d974310c9962bcb4c98bd1bec23590fae7d073fea48bfbf2516322815a08a375679cec5fe
 MISC metadata.xml 1204 BLAKE2B aff35e9aa5025dce5c55206274e23bc575aa8138b1e8d0269ba322c86ef10f4702e69f7838c3d580a963e39c1270d2e907234f540febb5bd4fc403412623a83b SHA512 86f328fadbadb8e582b4ae9a055f943e0c9cb3711a9c80cf84868d5e329770957886d58fe43aaec7aa0f0985acb0e4ac12947f58d1a423814ea4ea8d290b2b39
diff --git a/sys-fs/cryptsetup/cryptsetup-2.4.3-r2.ebuild b/sys-fs/cryptsetup/cryptsetup-2.4.3-r2.ebuild
index 6c2a8edabdc2..a867b3a9d311 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.4.3-r2.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.4.3-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.kernel.org/pub/linux/utils/${PN}/v$(ver_cut 1-2)/${P/_/-}.t
 LICENSE="GPL-2+"
 SLOT="0/12" # libcryptsetup.so version
 [[ ${PV} != *_rc* ]] && \
-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"
 CRYPTO_BACKENDS="gcrypt kernel nettle +openssl"
 # we don't support nss since it doesn't allow cryptsetup to be built statically
 # and it's missing ripemd160 support so it can't provide full backward compatibility
diff --git a/sys-fs/f2fs-tools/Manifest b/sys-fs/f2fs-tools/Manifest
index 6ff0be08c1e3..a3381f7862a6 100644
--- a/sys-fs/f2fs-tools/Manifest
+++ b/sys-fs/f2fs-tools/Manifest
@@ -2,7 +2,7 @@ AUX f2fs-tools-1.15.0-lz4-1.9.4.patch 819 BLAKE2B 0bedeb4362cf2a85e172cc5bf8b4d6
 DIST f2fs-tools-1.14.0.tar.gz 371225 BLAKE2B 4b015e751ca7a8df8769de7a49afa1351717581d09973537d80780ff83f64db9a6fbf454a9a85d8acb761a8d00443a94d09d83cfaba9e5203c0fd656a96d505a SHA512 951b74178f99722550e73f331be066f124f6ee6022710f6b47ae47390b978b08f12a7f2a268d82ca69a32bf440cd3ce3adddc8a4c49c32df83da87e7f659f98d
 DIST f2fs-tools-1.15.0.tar.gz 387663 BLAKE2B 1e55f87c839cee6431d9a83e9786201e9b6b872be27c8b92854b30b0fd1c651a9b7235ce93e70c530bfa7a4e9f4dfd309c72702b3338a4aa96e365b29424fb1d SHA512 61e40f16296091b55cec2dbdc6306af6abc2d3f854f39ef03a741b7f6f47348f915498375789f017f8da27fa7d27c79c905dd047693518adde503ea7ebf89387
 EBUILD f2fs-tools-1.14.0.ebuild 837 BLAKE2B 2ea6e841526daf9f2bb0ab59edd35e60d811b4b57af64053046c8590ce3f0dedd093c58ac88ed2db1b6d192364589385817c6f37b4d4ae5ac297d5dbb6dade21 SHA512 3eefc0bccc21238919659c197a6083097711e4c2f77dc8d0914b542782be4a54e816a7f986d2fa214b160779bc94568fd957571c3ea0cf170a7c61713714459c
-EBUILD f2fs-tools-1.15.0-r1.ebuild 916 BLAKE2B c710374048602f46296f902610e58f31b779d6acee46699e180ccd60665127d983be35e8e22451d369cc72cdbda174553af3f50c4074dd5277e4a5526863a4b8 SHA512 3533e00e488c1e3d7d1c310199cb2772710ddfcb9cf9c25ba94e9de2396703be5d3c7f166e41c2e2c8b469022c46230e5575447e45fe4dce1dcb35a5b9c75753
+EBUILD f2fs-tools-1.15.0-r1.ebuild 911 BLAKE2B e461319916059ace490ba817be6d681fc50ae867e99f6f9d3d559f6eb2ebc3e78f09377a5b75207ed0ec9e519f66cf5cef3801ceb1402cf91d865b89d9d0ab48 SHA512 8da1cca34b5f352444f4e2c122a6f60460ec7907003d692941990cc9eb68d6c3334040ef6ee7928de2fd60d02842f4e1f854789e3668975d09aaddcb31e7b7c2
 EBUILD f2fs-tools-1.15.0.ebuild 852 BLAKE2B e42c5f52e4b83320e7d41428ccde29bf5845daa060500e4f39e261bf6aa536390154fe2d5f2c7e48d553dcc1c793944595a082d606ac4d4e8c2cde0625688ed9 SHA512 8f43a6fb6df23376408897fd8113acc749b2a5c0dc44eec054e88aa04bfd9a9330e0dc261eadbef92749eb12b2070848fd65468103e96633def32824af5761c2
 EBUILD f2fs-tools-9999.ebuild 802 BLAKE2B c88c57eced6a4405a0bf85a5025d7511fa6a714440391542a8d003443cd059cfd2725f98be580ae747215c8b40f3309e15946bd2328776be503221cebe2dcdb4 SHA512 64579db313bf22e86ca7c9df001505c0b7f63b3aa370cbde50227188ae71b39bc14ecb78009335b002f64c888f8670b63cd60f1caae2bde546d5408ee7e58460
 MISC metadata.xml 499 BLAKE2B cf24d50513eb8417e9b61fac55db48b2867a678f97408c6200607d30870ac6737ec497d3b8e864a2595db1c0c106117582b61fd4e7dce902f4b46bf109600236 SHA512 824226cd743055abbff2be7f1f67c18db293cd2c7cc0109e0a3a2f7cdc4e305da5656ff7aeb6d34d8dc723abd32152c408d97e2a1b43f8dd94a3771acb9b44a9
diff --git a/sys-fs/f2fs-tools/f2fs-tools-1.15.0-r1.ebuild b/sys-fs/f2fs-tools/f2fs-tools-1.15.0-r1.ebuild
index 654499bcdb8b..6b4c738b485e 100644
--- a/sys-fs/f2fs-tools/f2fs-tools-1.15.0-r1.ebuild
+++ b/sys-fs/f2fs-tools/f2fs-tools-1.15.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/${PN}.git/snaps
 
 LICENSE="GPL-2"
 SLOT="0/9"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~x86"
 IUSE="selinux"
 
 RDEPEND="
diff --git a/sys-fs/mtools/Manifest b/sys-fs/mtools/Manifest
index 8058157ac2bd..6271f5a31a12 100644
--- a/sys-fs/mtools/Manifest
+++ b/sys-fs/mtools/Manifest
@@ -1,5 +1,7 @@
 DIST mtools-4.0.39.tar.bz2 429751 BLAKE2B b1b04fa1614cf36245c60c3ef35de1869e53786dbc9a7e864278a51c9519c63b59fff9dffbd761fbc59782161ba201908b4a5b6792a7231fff6f27be2bea1d67 SHA512 6f84ce57a7c088b526e3e4fa7c509f1869a55b87951134d6257533d311b4a97496c44fa374de6f8cb15c645d60b9f9745ccbdf405d0d77a30a86e31ed8d54ce4
 DIST mtools-4.0.41.tar.bz2 447256 BLAKE2B 9c0d24a2340038a2f482569e9ae6e326b0ba5fbc9abac3f70637682231e0541711c970b58c3c419f6114ce046084731b2ee7efd8c1e0cf091debec8816d851b5 SHA512 930321004d55c3fee17b1ed2319080446799d3230eee8df1cf4f0bbbbf9a82685837c3bfcce0d84749516fc8b945b1db01ac0379439ca53d974141c66b58ca8c
+DIST mtools-4.0.42.tar.bz2 441506 BLAKE2B 07afec0aea49427ec71ae8ddde9c1dceb33b2533e9acbde3564b0715efce784b5ea8c2122ff588f84e42435abb73ac9912520fd654a078bf0336e62f35f3ce2a SHA512 fd8d56d2dea9ce5e2b311b29ebdd4d89ec7baaf5f2fbfdc85019d480eff4d198ebf0e591c0f28ee1e39d8b81d49d7d4e9ed94b0e94e5b02ce9bbc03632124811
 EBUILD mtools-4.0.39.ebuild 1067 BLAKE2B 2201d21726df7847dd3f9d8d531109c58a47d0282da4c63bdd11870f333bf220895aa3fb63a5f1c8d66624e22dc96c7e7819b240fc99cd0abf912ca38d47169e SHA512 708e4ed394adcc07965530f736cd5b80033f28563a596a1ccdb798af5fb1eaa41ca4e9f72ffe06a88654400a869358dfdbaf76985403d0edc99b9c5ffa4e64e1
 EBUILD mtools-4.0.41.ebuild 1073 BLAKE2B 283d037ca23d4f96b682ef56b73157b3e34dc8ffaf062a4459a97f75734fe23e398af57f8c385dcada4766ee57c5de46388f8bb4613e4437614329edc86e1dfa SHA512 b0de29e692932ed81b1ffa4e09b66daf328857b13714d793fa3d0c7ca4ae978d91450bf61aa65418468dd307207df8ba80ecff47dc1abd86253520c3a3e95730
+EBUILD mtools-4.0.42.ebuild 1073 BLAKE2B 283d037ca23d4f96b682ef56b73157b3e34dc8ffaf062a4459a97f75734fe23e398af57f8c385dcada4766ee57c5de46388f8bb4613e4437614329edc86e1dfa SHA512 b0de29e692932ed81b1ffa4e09b66daf328857b13714d793fa3d0c7ca4ae978d91450bf61aa65418468dd307207df8ba80ecff47dc1abd86253520c3a3e95730
 MISC metadata.xml 328 BLAKE2B c30c5c458fda474023b5e314ce53311d21a0f15b69463f18a32126f409a034153b8c5b65009584ac0f20666ec9780f7cf518b7207f8550a950dbd2e82da3e138 SHA512 43d7d1e26abf6567746dcab87215aa69faea5308f951348ae82bf9c6bd5e414a69898eb4a23a46ef84ee5be0aab2d019beb8287d2ed2195b6a1b56f25edc2316
diff --git a/sys-fs/mtools/mtools-4.0.42.ebuild b/sys-fs/mtools/mtools-4.0.42.ebuild
new file mode 100644
index 000000000000..c123dc4b895b
--- /dev/null
+++ b/sys-fs/mtools/mtools-4.0.42.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic
+
+DESCRIPTION="Utilities to access MS-DOS disks from Unix without mounting them"
+HOMEPAGE="https://www.gnu.org/software/mtools/ https://savannah.gnu.org/projects/mtools"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos ~x64-solaris"
+IUSE="gui"
+
+RDEPEND="
+	virtual/libiconv
+	gui? (
+		x11-libs/libICE
+		x11-libs/libXau
+		x11-libs/libSM
+		x11-libs/libX11
+		x11-libs/libXt
+	)
+"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	if ! use elibc_glibc && ! use elibc_musl ; then
+		# bug #447688
+		append-libs "-liconv"
+	fi
+
+	local myeconfargs=(
+		--sysconfdir="${EPREFIX}"/etc/mtools
+		$(use_with gui x)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	local -a DOCS=( README* Release.notes )
+
+	default
+
+	insinto /etc/mtools
+	doins mtools.conf
+
+	# Default is fine
+	sed -i -e '/^SAMPLE FILE$/s:^:#:' "${ED}"/etc/mtools/mtools.conf || die
+}
diff --git a/sys-fs/xfsprogs/Manifest b/sys-fs/xfsprogs/Manifest
index 1b0022e0075c..75da477808e0 100644
--- a/sys-fs/xfsprogs/Manifest
+++ b/sys-fs/xfsprogs/Manifest
@@ -4,6 +4,8 @@ AUX xfsprogs-5.18.0-include.patch 570 BLAKE2B c53be8940cfae61eed0cf75d3ac90c3985
 AUX xfsprogs-5.3.0-libdir.patch 1137 BLAKE2B 7e455b8b82c553a819155fb4c1fee3d5c31bef0fa4c7ab0bf4ad4558a9a5b0b2f408138558c3601deb3ba85d465ab2dae5248bc20a4ba83f08cf733b27a796a1 SHA512 eaec31b6dab500c2e9c4fe7d5d82e60a40f3073cff99af0ae2aa817f6e4541f6a3de0a48f9151a274c6dd97e99ca26192b95b920aea1c5227d75232b808c98fa
 DIST xfsprogs-5.14.2.tar.xz 1308912 BLAKE2B 04083bf7952015d64f16e1aec0fa74be1957543e2264914f69defe45a3dc9f2524d941abc064a25a2fd760ebd6dcdcdc2404fd305e08fff7f6be6c5fc11d4d2f SHA512 cb9794247a2eed8bd9f10ff811d38f97e4adbed97bad334b0fa8a26503ec224237eddd92fd78892584a153967417ab2009fb2fc8bab6ef12cd53fd20bdba1b4e
 DIST xfsprogs-5.18.0.tar.xz 1310008 BLAKE2B a2a2835d53ee6ac55279636f3f3cdcecab8757911ce5c1ea5f350a4da9ff4c1ca64b2aba1c0e5424c0c0a01fd0504396d5fecca12e4689c372ed5bb76b9ac24e SHA512 47d035a33367edae7357e34c70bdb0fe9219231153fb4c4f418ed1462d137dd77338c12a199eb71cd70e88903e5fc11e1e4fb595c622183786e87346e2f65739
+DIST xfsprogs-5.19.0.tar.xz 1325160 BLAKE2B 37258ca34b3fc241a5153518ac5230aec9aeefc04d3fc05b96087d8e2fb374094ba21027fbcfa163cbafab21a69a510a7b278972130083387a97fd0027def6e2 SHA512 0b069cd44eb87052ee55ebffcce736ef103adeda539e854bd86d53942f541c07d74cc174f06a2221230eaa82b21d43327833492cd0ded577d442e1935a0abe7d
 EBUILD xfsprogs-5.14.2.ebuild 2274 BLAKE2B 7c5cd884f8cb6283d7ab70094c0d50ef7eade177ae250110fce0d8180aca1b90d4b540cbdd8fff3f8ee3e8264d836bba5c85eec3878f02fd49f7ea7a36512ac7 SHA512 e90ba8d24e23e3a6ea057e050a1c9cf0426954e335bd95b8b826259ac145e6fd080e0a8fe2f9eb90d6c47c215ac5ef62baf764e9dee6326474220f7aafd5415e
 EBUILD xfsprogs-5.18.0-r1.ebuild 2335 BLAKE2B 889580817ad1ca670695eaf8575cd2ce8758785108ec97588b4b31f00d6023c7f770e54f934cd24c9bf6954fd0e7d1df3ffd4bfd17c9566feb03117ce6297d3a SHA512 c275a27e05ea97a5963889a0a7ff7950f3972b13595aedde9cf67d783ea532bbacd6b59a60ca09eec91cf3e1c631cb37c0a20f9f1b7718571dacf7cd1cc654a2
+EBUILD xfsprogs-5.19.0.ebuild 2335 BLAKE2B 889580817ad1ca670695eaf8575cd2ce8758785108ec97588b4b31f00d6023c7f770e54f934cd24c9bf6954fd0e7d1df3ffd4bfd17c9566feb03117ce6297d3a SHA512 c275a27e05ea97a5963889a0a7ff7950f3972b13595aedde9cf67d783ea532bbacd6b59a60ca09eec91cf3e1c631cb37c0a20f9f1b7718571dacf7cd1cc654a2
 MISC metadata.xml 339 BLAKE2B b7d67fc8bcf854e7a2453c23e5d5d8c193525ccd16a643e80415a103d2d22c892458ea6ada32653d04b3d471c780f07b2b0537a317d9e64468130e065c6f5ab1 SHA512 445b4f6d853a272cc6bf8fde42745adf226512fa310f9af4bbabad4cfa5a6888b2c2215dfc0896c07b800820b69417c6d408bb21ed17a5224b5c9e3412c5f62d
diff --git a/sys-fs/xfsprogs/xfsprogs-5.19.0.ebuild b/sys-fs/xfsprogs/xfsprogs-5.19.0.ebuild
new file mode 100644
index 000000000000..2f545bcf92b0
--- /dev/null
+++ b/sys-fs/xfsprogs/xfsprogs-5.19.0.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic systemd usr-ldscript
+
+DESCRIPTION="XFS filesystem utilities"
+HOMEPAGE="https://xfs.wiki.kernel.org/"
+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"
+IUSE="icu libedit nls selinux"
+
+RDEPEND="dev-libs/inih
+	dev-libs/userspace-rcu:=
+	>=sys-apps/util-linux-2.17.2
+	icu? ( dev-libs/icu:= )
+	libedit? ( dev-libs/libedit )"
+DEPEND="${RDEPEND}"
+BDEPEND="nls? ( sys-devel/gettext )"
+RDEPEND+=" selinux? ( sec-policy/selinux-xfs )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.3.0-libdir.patch
+	"${FILESDIR}"/${PN}-5.18.0-docdir.patch
+	"${FILESDIR}"/${PN}-5.18.0-include.patch
+)
+
+src_prepare() {
+	default
+
+	# Fix doc dir
+	sed -i \
+		-e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \
+		include/builddefs.in || die
+
+	# Don't install compressed docs
+	sed 's@\(CHANGES\)\.gz[[:space:]]@\1 @' -i doc/Makefile || die
+}
+
+src_configure() {
+	# include/builddefs.in will add FCFLAGS to CFLAGS which will
+	# unnecessarily clutter CFLAGS (and fortran isn't used)
+	unset FCFLAGS
+
+	# If set in user env, this breaks configure
+	unset PLATFORM
+
+	export DEBUG=-DNDEBUG
+
+	# Package is honoring CFLAGS; No need to use OPTIMIZER anymore.
+	# However, we have to provide an empty value to avoid default
+	# flags.
+	export OPTIMIZER=" "
+
+	# Avoid automagic on libdevmapper (bug #709694)
+	export ac_cv_search_dm_task_create=no
+
+	# Build fails with -O3 (bug #712698)
+	replace-flags -O3 -O2
+
+	# Upstream does NOT support --disable-static anymore,
+	# https://www.spinics.net/lists/linux-xfs/msg30185.html
+	# https://www.spinics.net/lists/linux-xfs/msg30272.html
+	local myconf=(
+		--enable-blkid
+		--with-crond-dir="${EPREFIX}/etc/cron.d"
+		--with-systemd-unit-dir="$(systemd_get_systemunitdir)"
+		$(use_enable icu libicu)
+		$(use_enable nls gettext)
+		$(use_enable libedit editline)
+	)
+
+	if is-flagq -flto ; then
+		myconf+=( --enable-lto )
+	else
+		myconf+=( --disable-lto )
+	fi
+
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	emake V=1
+}
+
+src_install() {
+	emake DIST_ROOT="${ED}" HAVE_ZIPPED_MANPAGES=false install
+	emake DIST_ROOT="${ED}" HAVE_ZIPPED_MANPAGES=false install-dev
+
+	gen_usr_ldscript -a handle
+}
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index c4f1f15d0949..e37b01b20163 100644
Binary files a/sys-kernel/Manifest.gz and b/sys-kernel/Manifest.gz differ
diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index d38cd63a8e17..67e3baba3d0b 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -6,10 +6,14 @@ DIST genpatches-5.15-78.base.tar.xz 3076864 BLAKE2B e868bff991ca299fe186380ef4e7
 DIST genpatches-5.15-78.extras.tar.xz 3932 BLAKE2B b971f35cd6b525ea2fa675909790f489b66a1bd96403d12acf47ac2cb00218181ad267649d143e37f2cc775f4892c0e3a24817c9270c27c7b937b69ad002000e SHA512 6973da0d4dc2d48c5c481a45581ca51449957bb662dc8520ae00a23056dc25f2b9d419cd2ccf9fd5244313ee2eee0b907cd367259ae1d27cbd226bbe8bbced32
 DIST genpatches-5.19-18.base.tar.xz 911172 BLAKE2B db20a811ffc927b01dc389fc3d959809442fa4065fc2951b992561fbc102e854b5fd8dd17833604458e95f8bcec23c75ae94095df90745b489628e52661b5878 SHA512 4e9b9eb22f6a3b634964c35241a9a50517228787f6bd7f25f2de3ff82336c8d0acd8b2fe703a9595ed32776d64bb66ba518919f597948922db6791c10c572b67
 DIST genpatches-5.19-18.extras.tar.xz 3808 BLAKE2B dab7e5596066c9b70ebc2b7413ec7dc9c35bddc29f230dfdc74a9594706713a6807e0ded167eea3ec6a4bcf0c901404bb4fe1a71fa1c8aa265c599b6a1dac8fa SHA512 f39d76551328f9e8d1aa646e819282096bbcea1cb22902fd087dec878a7d673aacb517441a9c213e85a03f2f15768e1a252f103ca89f1b84ef994a0998416bb8
+DIST genpatches-5.19-19.base.tar.xz 1098964 BLAKE2B c79251602e677d36db4f923ad148422c1c19d9e35b33d1eead75f317ac468ba919baa0c61a690425714bc0b29d96eb47aeb1c960ec4192ccb3905df752f81ab4 SHA512 bb0ed1e481a78f8f65229db777c5d8031edbd3d31cdc0ed45e48d4f5916b838397c1ccec5d465d957673494469290a1dffc8a4466c252395348c8160f2f5cc67
+DIST genpatches-5.19-19.extras.tar.xz 3804 BLAKE2B c73e8bb8be2845ada725f71045e69fa38c99d0561e702d38e3827cf1e25ff2ab2105e3142d0f85baea59fa4a28a4521202d222c53190b741055609551ac1039f SHA512 b6f813b816f475a120543f637857f683e82cb22484fad7149bfbc5bcdd6d5119373d915ac53d6b743197910e78fc2ebdf35bcfb3612015e571629d33740f2701
 DIST genpatches-5.4-223.base.tar.xz 5119600 BLAKE2B d2ad667a58be0061e5e94a885f3cafd7c0d99b108f129a5d7bdc18d0d77b99d52b2dfd0067f6d4657dadcc73f371555949c9ae70f71c1b457c9487179db25070 SHA512 0e58903a7e78f1a50a961a27929f3a936f07ee45343d079389cf9e8b9e78a1b542ec58bbba49ced2e0873d86d28ef2ebf3501a70a5cc8465298c267d95a09899
 DIST genpatches-5.4-223.extras.tar.xz 1812 BLAKE2B e0ebc78506b6ca3d8bc09164b26f15a8cc94495797fc17a36381a3f031dd81bf7870915a48b0deb4f58cfb43e5ec4a64e18e6ca6c00837bdfc5e4fab913752b8 SHA512 ce01405cfc355d6230e687c407c9a5e92d88c6f0837eda19d2bc23d3517df4c5159332d491459867841827e0dc3976c8229cf0d0cb1c9d39360ba67ea616a734
 DIST genpatches-5.4-224.base.tar.xz 5119576 BLAKE2B 3f5fa9712da6376491d9903759334ca4981a6fc9b24919ba6acb5114ce805333a26052570df1a192dc8e062ee77667b45dac62c309d37b02190e4f8a07640aea SHA512 d433e356e47f0a6be0ba3b41172618f0b9cce634e4227924d62a8487cb74af3ea0c4d3245ee4fd2936d39ed5eb839d52985866b9d796f7e7a84415a6b60f9b50
 DIST genpatches-5.4-224.extras.tar.xz 1812 BLAKE2B d28183946e63eedcde3ccc19d84baad11b74349abbba19501c0763ae4597150f2ad7397c19396ce07627643cae526e6ef216dfa2166d217e8452719887e7f2bd SHA512 6505c71e0da13992e0abf5ffd31b414b4bcbde4be78abee6e9d402c14eb329e212e85cca77cb79591ba6d66b3f3b4ae2014e57cd8a88b39373a5dc2403f37d26
+DIST genpatches-6.0-4.base.tar.xz 272160 BLAKE2B 3758714884e31f3ddb414d2011752cdf7fd2da9d54b6dd455e9b9ec559c0201fd7753df98a1cba0618f209552419a56ef8747ac0283f794a41769dc41b3844ad SHA512 ef8292b96f10586cbc9a9ba820bed3b3f30ab1e4b90d3452d94b5e44dd4c333818c99bf6cee1272416e83cda424942be84a7aa6f270687192d94a583e8a836c0
+DIST genpatches-6.0-4.extras.tar.xz 3808 BLAKE2B 42c2695cc364ed353e1ccfa945c6f69c2b3c81e32149de5134eeaf2a738b67a952ae33ace111122bf2c58083c81a4e056e8f666693d02c39f6631a7502c36038 SHA512 305cf01975f19237de99a40dfb2a395f0084809f00040296e5ec36ed949b4301cf7887dcd3f6e287945f8d92f3544e84f3ace2ba60d6720ae09458475159132c
 DIST gentoo-kernel-5.10.148-1.amd64.gpkg.tar 66600960 BLAKE2B 8aa2a893602b1f1b9b94e462c8e6588d04515e78f7ab41ce124db79ca46e890674bf2faff1245170cf27df0a8130b3229c9fa6b70975555b22f98c275216753e SHA512 eaed6a7c5a3f993d8023a05ce701303d2a3af7e4acf038a96ef90ff2fd05c1f1ff3b7ce58fc075758625fe0e3bddef69bc119b32717ba30bb65c30e85f69639f
 DIST gentoo-kernel-5.10.148-1.arm64.gpkg.tar 59760640 BLAKE2B 133644550ff4c86ab62eaef3dac0377d568765e0e5d25d2fe392b0950ac94e536ca9dca73bdf192d8994bcc326448529b76dcc8c55f4161c1960cd153b711470 SHA512 07b91fa83c509d62d05e1e6beb9ee80d0f3c68cbb2edf66b70d9646e190b5ea1bf162592c6d091c1699600285891f7abb8807d3d281086eb14c49ec3da457d3b
 DIST gentoo-kernel-5.10.148-1.ppc64le.gpkg.tar 55121920 BLAKE2B 764f413d2c48d9b1a6825ba7dc88ab24933fc08d5e949a41ade557d794a8f92a827b9211d76a0cfc67728490e2a9ba7152f0b2d0d27daf6bebcb13c9625834cd SHA512 0f469b0902d7849c9f77c489f005d64b1ff8ba6e26335188e9ab919732f9111733f603a5a86a22edee5c4e20738140f79e457a8631772ccf8c908f689a3c77f7
@@ -26,6 +30,10 @@ DIST gentoo-kernel-5.19.16-1.amd64.gpkg.tar 72704000 BLAKE2B a443464fa1f3a7066c5
 DIST gentoo-kernel-5.19.16-1.arm64.gpkg.tar 65198080 BLAKE2B d8d5c440c290a8ebcf2c6735705fe7134859052a8beb8b7a8d333939e6467f9b41659456bb10d8e2a79fb1a3c0ec7efdfefb89d220f951d3476bb2c68a0a8413 SHA512 87c2a5ca9a7f551e1801e68a7bf23d828aae415140bca607e1abccefa296f14ffbdbf87543975b7db732bd06493f2b112de6d652eb8002d201cb1a27d116e366
 DIST gentoo-kernel-5.19.16-1.ppc64le.gpkg.tar 59146240 BLAKE2B 4d208f55cec56233ec5156b34d34d9227dc65b1e95b953d82eda3451078be716e4a73ac5a6e77a260b50fb5abd8f8ceba91ae3abbbbe8d8d4d8a2f3d1bf10420 SHA512 ec2dcfc74804fe4e5ffa710a6520e42084a7c4fc80400dced643f37fa37ba65545b3bdd7563aec23f55297b34913a5dec03eb419214e51aed12d1c1eb1a277dd
 DIST gentoo-kernel-5.19.16-1.x86.gpkg.tar 62402560 BLAKE2B 6d3312df6f05ce0432df9be591d77d48714c6877ba9babfe22f970c2f2631dbf753affee286ce16c3da50d58eabc2130aa633aae394da21a65c09585f70cbc44 SHA512 f409c4776e8eae6e2090566fa2c480cac98ed26cd36d87f397d39b1b85ff3044432e09545d30c7b030735731fe9a728bed359d0d85793854b1555a66a98a633e
+DIST gentoo-kernel-5.19.17-1.amd64.gpkg.tar 72540160 BLAKE2B 18c079e028902f44f236222dc9ec0ed01edca3b8df5d667b05ff1c084f10f7dc64f1383e0e7c90330e33516e9901554e04a4518d4f07fbd54575d02de5469b89 SHA512 3f70e66bf1af9c0291bc0f19ab4fd24ea5acf98eb0bde3e4e74bd2cfd786c3cfd42b00da4adf8e8a74caa7204d7b37b8b3a7f11d25b1fa8907a6da72edb93527
+DIST gentoo-kernel-5.19.17-1.arm64.gpkg.tar 65095680 BLAKE2B 2895023dcd376bdcb936033408614f63a76110e68db108cb745bccbca573c66eb615ab683363428bf7fb7ec7da7c8e30fa88f5a1d41d1d54e5ef5a39e71a325f SHA512 610b12c9d6cf6124767163a03b254512dcb2b4bf5bf99459110a36b2b3965fadba75b2ebeeef4cc8a8460083460cde7c5c0fa9de95c2cd0b60501eadad5b56cb
+DIST gentoo-kernel-5.19.17-1.ppc64le.gpkg.tar 59043840 BLAKE2B ccbe861e45b1a40907b05b922f6f25aacb60ac94cffba372cfeacf905ab7946212e1422be0b6e59b51ce9221ab99fff3f6903ff7ba3a309f9350882f802361f5 SHA512 ea5ba28cb4dcba8b5fea921d0f17be0f4de6d5981e1685c5b2c2b9020680a04e0ae5bab528948d04e6ced8aa1a20f16a1b46988332b62b7c4b1b6b734116a6bf
+DIST gentoo-kernel-5.19.17-1.x86.gpkg.tar 62382080 BLAKE2B 445f87b7bc7585698ea8f67cfc9e2cd6c45001ad526be9a8fb309265c869270492e3536b1648ce7c528c9363a0c845ec99b94e4d5db56c98489be2aa445f9532 SHA512 a0d43732739e0c41116eabb90ab594ed77014410a21c234b5c9e1b48f533d9b237e1eb23e9e349042e8da2c9b8a7ce1baa3c2ad7cffe7a17b7c53f771f37c2e8
 DIST gentoo-kernel-5.4.218-1.amd64.gpkg.tar 60733440 BLAKE2B 1db4e1f0b0452173ef715348838a30a7d8a348810268b488646d6bbdd76ba4835c762b30342d8867d488b2653f7994b001ca97d1f003c55ad560550a280f952e SHA512 d911971ed47ae12ff58abd9e8ca0bb63237d2ec72962cc51da5c38525b2afbaf698682e3f6eaf59d0e580497138ed22448ed507e10e41acdd68d7dfcac027f41
 DIST gentoo-kernel-5.4.218-1.arm64.gpkg.tar 56934400 BLAKE2B d68cfa0d046ba6d161d3be877e79d46672933f88cdf1cc0e0cfc274a0b6c043b4c7bd3a673eac29fd7f3e395822e9709c475e8b67167605ecb507bbebf9ce7c2 SHA512 a06f40f330e4e0972cba8e8061d8099866a35a1f97e4989b82cff0fd70104e15a1c5fc2495ba2c19be00ffb61345c21d38b55bee1fba6188fc3e12fd1e32ae48
 DIST gentoo-kernel-5.4.218-1.ppc64le.gpkg.tar 54466560 BLAKE2B 5dbe9d43266feafb3403829532caab9b9b5c8165a1e80752dd876626b9208ce1dda990d9b010ab6a1d9d0937728ba59643612587e071231d76ed3d06298976f5 SHA512 60940c07de6dc71d659276e0a6d7688822de2bf5c355e2fd2045ac08b1f5724fe3ed97e61b3b48325e93cadf73086073af2baf8377a34591b6684d06750bfaa1
@@ -34,14 +42,21 @@ DIST gentoo-kernel-5.4.219-1.amd64.gpkg.tar 60631040 BLAKE2B b50c065ca4259719a0e
 DIST gentoo-kernel-5.4.219-1.arm64.gpkg.tar 56832000 BLAKE2B 75250e0407ea8b846658a59b0e53d9293112c7e109a004783ea9ac8e54534065a50ebfa22bd9f1f059f55129bb39ba8948cc53e5afab1527ca97ec23902738ee SHA512 2e55538b7f10def530abb3ced3dc042e0b6b4de173dea949610353e3e719136860bb7271e6164eb2dcf410486a2c249e4898f0bdf24bed3140d29963dba0e229
 DIST gentoo-kernel-5.4.219-1.ppc64le.gpkg.tar 54343680 BLAKE2B 28888b569baaca609212ac382b1a3ee11bf518587d00d3553118340e847c7a3e7f814bb4727a1931daa6c39afa8567579781fd05726b759f2df8d3a9b44f7ab1 SHA512 93a8bf9453f19222cf8c0e0ad399f3bab7aeaf0ebc1c8802fb53fa2277e150584203050aea9d0e549d1bbb96a88178b891552dfdba4c460b54e20f3629cf4435
 DIST gentoo-kernel-5.4.219-1.x86.gpkg.tar 52387840 BLAKE2B 9a91a823ff95ef19a88cba5d2c2992632edf2f8a8f88c42b43c0b7dc36bb67d4ac273b0661d96520caf92f69c871aab7a7d9db1dd2cceb2f628fe88557e600ad SHA512 aa1572341d40f80ed3136bb9efc1b0519cd67d71fee6a39307a1dbeda1c086b6eeed661ea5216a3f52125d3e4e89ecc421338d40d164520301747ae5b8f0e94b
+DIST gentoo-kernel-6.0.3-1.amd64.gpkg.tar 75898880 BLAKE2B 22fa37348aca6e271a09253e60ddf1bcc05a0a669c5eb6468a76e60e0c8a74714960a49d9d3ea98cb9c5f5df2d59d7fd357d03c811d948887fb76f98cac21407 SHA512 2a72a5bb597d5ffb31604d9d8d3ad9c70d10a2c9fa7d19ab38d26160f786097da65f5dbdc9aaa4e2b3a704cd23519852536260d2fc2f6314545467254ae76fb3
+DIST gentoo-kernel-6.0.3-1.arm64.gpkg.tar 68792320 BLAKE2B 0b823e99597f1f89e6753a41b9940eb65afbfd0c43b86c46ead94b81e82f9d1e2653ff2885691fcaf6c0f5e1dc2ebd047fa4fcc0d07a1a559cd72bfdec33d136 SHA512 8b991af4189f77a5c2afcfb1c3323fef4d743eb8243d6fe08202892db4ae77a2eac7b54c49aae649ab385818a85907731f61290541788dd6020246773018d477
+DIST gentoo-kernel-6.0.3-1.ppc64le.gpkg.tar 62126080 BLAKE2B f0ba8e04802ed6a1bc66f9965c83d3beb21b5ca016f3a77c9b0f15550fca521de395d410341d6d698053ab81bb454854a906774d2f819b5a0c04e1097286d5e8 SHA512 dee4eeeba7ec50148377e6912ee57c91715afc0161c14964d5d304446470587316ec61be2c084a524af2165ab6c66fadc89467d83c0a2c5bb299c4b027a687c6
+DIST gentoo-kernel-6.0.3-1.x86.gpkg.tar 65269760 BLAKE2B 87b2ebaf40b3d33d25da9db3ce6cbd045143b1f65e59dfd91854091b86eac7671f2b5464dac9da8b1ec5dbc29b64c3b01efddf57f5ac69d2a67186f18afd0468 SHA512 2ec2d81743c85a5b10bbd8796b6478899ff02f2e926ca38c1e65fa2811d060dc2537a3db7aa6f459d92cb1c3c58482d2547f39a853c9d935172f7583ab2f75a1
 DIST linux-5.10.tar.xz 116606704 BLAKE2B b923d7b66309224f42f35f8a5fa219421b0a9362d2adacdadd8d96251f61f7230878ea297a269a7f3b3c56830f0b177e068691e1d7f88501a05653b0a13274d1 SHA512 95bc137d0cf9148da6a9d1f1a878698dc27b40f68e22c597544010a6c591ce1b256f083489d3ff45ff77753289b535135590194d88ef9f007d0ddab3d74de70e
 DIST linux-5.15.tar.xz 121913744 BLAKE2B 3921274b23f7938abdf3ed9334534b4581e13d7484303d3a5280eddb038999aaa8b836666a487472d9c4a219af0f06b9fecccaf348fb5510ab8762f4ef4b7e83 SHA512 d25ad40b5bcd6a4c6042fd0fd84e196e7a58024734c3e9a484fd0d5d54a0c1d87db8a3c784eff55e43b6f021709dc685eb0efa18d2aec327e4f88a79f405705a
 DIST linux-5.19.tar.xz 131581464 BLAKE2B 4db03a6830a3b3bbf0837e1912182a443d9a4aa8af20a12e6ec814ed708038452d3c0ccee1258cca671c464d76461536363a8adc56e9d098c9a44ae3484a297a SHA512 00313b2f9b82d2dc3fb8294007cf7d7599d254b717ed2de23c81fa7a1bbcbc2798ad286cb94e2f7f5bd54132d1d764facd90d30f79dbcc6616cc7f926adc2623
 DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f
+DIST linux-6.0.tar.xz 133886176 BLAKE2B c09a9c877ac0fac83dc31d2d04d96f0a3331d4ed78e3ad4edfd4dc077e1c11d0c49f419fdac4008b5c93d1b09c2b724e12ef0b38371ad0962908abf85dfa95fa SHA512 bac41a7aeb6e809616cee2f13dcd1c45e829dfd1ccf60aee1dc4c46b1e28532f4485c7d819a32940de84fdfbf89db80a4e919bce8a74b2948c5a01551771b714
 EBUILD gentoo-kernel-bin-5.10.148.ebuild 2999 BLAKE2B 93c1a0cf84370f61fe9ec23bcccad5e2421ac6206411610653a1d8484c835de9def37872c3838f875767032d4331a245beff6cd619ccf53a43312c8331d86d3e SHA512 e4ced34e4d178d478f71d3199615f6b4b6d28127783ece7b7a04bbf376427c533539d75b07baa1692edb43a53a71c0a738982f34d68f6de1e0ef9a3c4260f4d9
 EBUILD gentoo-kernel-bin-5.10.149.ebuild 2999 BLAKE2B 93c1a0cf84370f61fe9ec23bcccad5e2421ac6206411610653a1d8484c835de9def37872c3838f875767032d4331a245beff6cd619ccf53a43312c8331d86d3e SHA512 e4ced34e4d178d478f71d3199615f6b4b6d28127783ece7b7a04bbf376427c533539d75b07baa1692edb43a53a71c0a738982f34d68f6de1e0ef9a3c4260f4d9
 EBUILD gentoo-kernel-bin-5.15.74.ebuild 2999 BLAKE2B bf50105e6cc148a793b36139a419ac66f4f14b4a73394b21af62803ab61347d87f800f066ccf7c9e33951c2efbb6d6dd77e7b7f296293cee6b0b7f17f3d1e7e2 SHA512 85bce161a2af46e8b9a2a005200e29e30e1bffc8c2263b7db2a756a73d411168dfc0e7720df907e58ccafe059f72558a47d8c93d9240222c093990de08d7500b
 EBUILD gentoo-kernel-bin-5.19.16.ebuild 3003 BLAKE2B 4ab34ea587fa8ccd865b3e236c492fb68a9d0f39c17503fe507107af52934cc14ec4dcf1afe08b92a78f6e4515da77cee078872b631e0711126b8c5b5661ef74 SHA512 6face53807c8ee8f1c1f9129d692514344491fed96102dd6579fd1ab3b0bcd02a730487a50b6a64da5f64050879231696c4d35b0d9862dbf98f4166ec1d55c4d
+EBUILD gentoo-kernel-bin-5.19.17.ebuild 3003 BLAKE2B 4ab34ea587fa8ccd865b3e236c492fb68a9d0f39c17503fe507107af52934cc14ec4dcf1afe08b92a78f6e4515da77cee078872b631e0711126b8c5b5661ef74 SHA512 6face53807c8ee8f1c1f9129d692514344491fed96102dd6579fd1ab3b0bcd02a730487a50b6a64da5f64050879231696c4d35b0d9862dbf98f4166ec1d55c4d
 EBUILD gentoo-kernel-bin-5.4.218.ebuild 2999 BLAKE2B be5c5e139ee4da605dd15cf02c6251a762426d0da46ac2b75d46b79226e7c41c57429ed847e2e646735545fee33cb7ac45d62039158c0004380197255477be12 SHA512 b0ee61606614ca61b655b50a578efefd7fb49437014df935c4ea312ab1257dc415425684a05c6dac1e5dbeac5b1eac81071bf7cae4fec7bd68f8cae985b1c969
 EBUILD gentoo-kernel-bin-5.4.219.ebuild 2999 BLAKE2B be5c5e139ee4da605dd15cf02c6251a762426d0da46ac2b75d46b79226e7c41c57429ed847e2e646735545fee33cb7ac45d62039158c0004380197255477be12 SHA512 b0ee61606614ca61b655b50a578efefd7fb49437014df935c4ea312ab1257dc415425684a05c6dac1e5dbeac5b1eac81071bf7cae4fec7bd68f8cae985b1c969
+EBUILD gentoo-kernel-bin-6.0.3.ebuild 3003 BLAKE2B dc3e591b87f0b7c9137e29fdff1d2d36e4af887e61238788671903a6526136350e19e829180fc2ddcbae54cfce4dadaceb55cb95a38c36e43e3414d0a9a9378f SHA512 624e77b77f71fdfed7f50b0cb3a8f225fb2e1a27cf5c9b3d4d454aa782a6479d7e079e3bdd9f320023ad2215fea9b283648b7d6879929020caf8913135b93765
 MISC metadata.xml 353 BLAKE2B cd022bd01b289ae703ae6ef6c2539fcfce833206c55e328ba02fc42b360d60f76b1920927b259dbb199724e6d3e7b0f68ba2044680d962d3cd03a973475582ff SHA512 10b10fd24801843108a71ca7d0c27514965b0a15a60da4d9b521fc41493448a1b1685ae3278dbd46cede0d069e51dede402d2c1448c8ae6a7fcfce8acf415bf3
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.19.17.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.19.17.ebuild
new file mode 100644
index 000000000000..0ba336c5c1aa
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.19.17.ebuild
@@ -0,0 +1,127 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit kernel-install toolchain-funcs unpacker
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 2 ))
+BINPKG=${P/-bin}-1
+
+DESCRIPTION="Pre-built Linux kernel with Gentoo patches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	amd64? (
+		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.amd64.gpkg.tar
+	)
+	arm64? (
+		https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.arm64.gpkg.tar
+	)
+	ppc64? (
+		https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.ppc64le.gpkg.tar
+	)
+	x86? (
+		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.x86.gpkg.tar
+	)
+"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel:${SLOT}
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+BDEPEND="
+	sys-devel/bc
+	sys-devel/flex
+	virtual/libelf
+	virtual/yacc
+"
+
+QA_PREBUILT='*'
+
+KV_LOCALVERSION='-gentoo-dist'
+KPV=${PV}${KV_LOCALVERSION}
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	cd "${MY_P}" || die
+	default
+}
+
+src_configure() {
+	# force ld.bfd if we can find it easily
+	local LD="$(tc-getLD)"
+	if type -P "${LD}.bfd" &>/dev/null; then
+		LD+=.bfd
+	fi
+
+	tc-export_build_env
+	local makeargs=(
+		V=1
+
+		HOSTCC="$(tc-getBUILD_CC)"
+		HOSTCXX="$(tc-getBUILD_CXX)"
+		HOSTCFLAGS="${BUILD_CFLAGS}"
+		HOSTLDFLAGS="${BUILD_LDFLAGS}"
+
+		CROSS_COMPILE=${CHOST}-
+		AS="$(tc-getAS)"
+		CC="$(tc-getCC)"
+		LD="${LD}"
+		AR="$(tc-getAR)"
+		NM="$(tc-getNM)"
+		STRIP=":"
+		OBJCOPY="$(tc-getOBJCOPY)"
+		OBJDUMP="$(tc-getOBJDUMP)"
+
+		# we need to pass it to override colliding Gentoo envvar
+		ARCH="$(tc-arch-kernel)"
+
+		O="${WORKDIR}"/modprep
+	)
+
+	mkdir modprep || die
+	cp "${BINPKG}/image/usr/src/linux-${KPV}/.config" modprep/ || die
+	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+	kernel-install_test "${KPV}" \
+		"${WORKDIR}/${BINPKG}/image/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
+		"${BINPKG}/image/lib/modules/${KPV}"
+}
+
+src_install() {
+	mv "${BINPKG}"/image/{lib,usr} "${ED}"/ || die
+
+	# FIXME: requires proper mount-boot
+	if [[ -d boot/dtbs ]]; then
+		mv "${BINPKG}"/image/boot "${ED}"/ || die
+	fi
+
+	# strip out-of-source build stuffs from modprep
+	# and then copy built files
+	find modprep -type f '(' \
+			-name Makefile -o \
+			-name '*.[ao]' -o \
+			'(' -name '.*' -a -not -name '.config' ')' \
+		')' -delete || die
+	rm modprep/source || die
+	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
+}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.0.3.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.0.3.ebuild
new file mode 100644
index 000000000000..5f8769d381a6
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.0.3.ebuild
@@ -0,0 +1,127 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit kernel-install toolchain-funcs unpacker
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 1 ))
+BINPKG=${P/-bin}-1
+
+DESCRIPTION="Pre-built Linux kernel with Gentoo patches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	amd64? (
+		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.amd64.gpkg.tar
+	)
+	arm64? (
+		https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.arm64.gpkg.tar
+	)
+	ppc64? (
+		https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.ppc64le.gpkg.tar
+	)
+	x86? (
+		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.x86.gpkg.tar
+	)
+"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel:${SLOT}
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+BDEPEND="
+	sys-devel/bc
+	sys-devel/flex
+	virtual/libelf
+	virtual/yacc
+"
+
+QA_PREBUILT='*'
+
+KV_LOCALVERSION='-gentoo-dist'
+KPV=${PV}${KV_LOCALVERSION}
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	cd "${MY_P}" || die
+	default
+}
+
+src_configure() {
+	# force ld.bfd if we can find it easily
+	local LD="$(tc-getLD)"
+	if type -P "${LD}.bfd" &>/dev/null; then
+		LD+=.bfd
+	fi
+
+	tc-export_build_env
+	local makeargs=(
+		V=1
+
+		HOSTCC="$(tc-getBUILD_CC)"
+		HOSTCXX="$(tc-getBUILD_CXX)"
+		HOSTCFLAGS="${BUILD_CFLAGS}"
+		HOSTLDFLAGS="${BUILD_LDFLAGS}"
+
+		CROSS_COMPILE=${CHOST}-
+		AS="$(tc-getAS)"
+		CC="$(tc-getCC)"
+		LD="${LD}"
+		AR="$(tc-getAR)"
+		NM="$(tc-getNM)"
+		STRIP=":"
+		OBJCOPY="$(tc-getOBJCOPY)"
+		OBJDUMP="$(tc-getOBJDUMP)"
+
+		# we need to pass it to override colliding Gentoo envvar
+		ARCH="$(tc-arch-kernel)"
+
+		O="${WORKDIR}"/modprep
+	)
+
+	mkdir modprep || die
+	cp "${BINPKG}/image/usr/src/linux-${KPV}/.config" modprep/ || die
+	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+	kernel-install_test "${KPV}" \
+		"${WORKDIR}/${BINPKG}/image/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
+		"${BINPKG}/image/lib/modules/${KPV}"
+}
+
+src_install() {
+	mv "${BINPKG}"/image/{lib,usr} "${ED}"/ || die
+
+	# FIXME: requires proper mount-boot
+	if [[ -d boot/dtbs ]]; then
+		mv "${BINPKG}"/image/boot "${ED}"/ || die
+	fi
+
+	# strip out-of-source build stuffs from modprep
+	# and then copy built files
+	find modprep -type f '(' \
+			-name Makefile -o \
+			-name '*.[ao]' -o \
+			'(' -name '.*' -a -not -name '.config' ')' \
+		')' -delete || die
+	rm modprep/source || die
+	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
+}
diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest
index 09c69159663e..cbc422588e90 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -6,36 +6,47 @@ DIST genpatches-5.15-78.base.tar.xz 3076864 BLAKE2B e868bff991ca299fe186380ef4e7
 DIST genpatches-5.15-78.extras.tar.xz 3932 BLAKE2B b971f35cd6b525ea2fa675909790f489b66a1bd96403d12acf47ac2cb00218181ad267649d143e37f2cc775f4892c0e3a24817c9270c27c7b937b69ad002000e SHA512 6973da0d4dc2d48c5c481a45581ca51449957bb662dc8520ae00a23056dc25f2b9d419cd2ccf9fd5244313ee2eee0b907cd367259ae1d27cbd226bbe8bbced32
 DIST genpatches-5.19-18.base.tar.xz 911172 BLAKE2B db20a811ffc927b01dc389fc3d959809442fa4065fc2951b992561fbc102e854b5fd8dd17833604458e95f8bcec23c75ae94095df90745b489628e52661b5878 SHA512 4e9b9eb22f6a3b634964c35241a9a50517228787f6bd7f25f2de3ff82336c8d0acd8b2fe703a9595ed32776d64bb66ba518919f597948922db6791c10c572b67
 DIST genpatches-5.19-18.extras.tar.xz 3808 BLAKE2B dab7e5596066c9b70ebc2b7413ec7dc9c35bddc29f230dfdc74a9594706713a6807e0ded167eea3ec6a4bcf0c901404bb4fe1a71fa1c8aa265c599b6a1dac8fa SHA512 f39d76551328f9e8d1aa646e819282096bbcea1cb22902fd087dec878a7d673aacb517441a9c213e85a03f2f15768e1a252f103ca89f1b84ef994a0998416bb8
+DIST genpatches-5.19-19.base.tar.xz 1098964 BLAKE2B c79251602e677d36db4f923ad148422c1c19d9e35b33d1eead75f317ac468ba919baa0c61a690425714bc0b29d96eb47aeb1c960ec4192ccb3905df752f81ab4 SHA512 bb0ed1e481a78f8f65229db777c5d8031edbd3d31cdc0ed45e48d4f5916b838397c1ccec5d465d957673494469290a1dffc8a4466c252395348c8160f2f5cc67
+DIST genpatches-5.19-19.extras.tar.xz 3804 BLAKE2B c73e8bb8be2845ada725f71045e69fa38c99d0561e702d38e3827cf1e25ff2ab2105e3142d0f85baea59fa4a28a4521202d222c53190b741055609551ac1039f SHA512 b6f813b816f475a120543f637857f683e82cb22484fad7149bfbc5bcdd6d5119373d915ac53d6b743197910e78fc2ebdf35bcfb3612015e571629d33740f2701
 DIST genpatches-5.4-223.base.tar.xz 5119600 BLAKE2B d2ad667a58be0061e5e94a885f3cafd7c0d99b108f129a5d7bdc18d0d77b99d52b2dfd0067f6d4657dadcc73f371555949c9ae70f71c1b457c9487179db25070 SHA512 0e58903a7e78f1a50a961a27929f3a936f07ee45343d079389cf9e8b9e78a1b542ec58bbba49ced2e0873d86d28ef2ebf3501a70a5cc8465298c267d95a09899
 DIST genpatches-5.4-223.extras.tar.xz 1812 BLAKE2B e0ebc78506b6ca3d8bc09164b26f15a8cc94495797fc17a36381a3f031dd81bf7870915a48b0deb4f58cfb43e5ec4a64e18e6ca6c00837bdfc5e4fab913752b8 SHA512 ce01405cfc355d6230e687c407c9a5e92d88c6f0837eda19d2bc23d3517df4c5159332d491459867841827e0dc3976c8229cf0d0cb1c9d39360ba67ea616a734
 DIST genpatches-5.4-224.base.tar.xz 5119576 BLAKE2B 3f5fa9712da6376491d9903759334ca4981a6fc9b24919ba6acb5114ce805333a26052570df1a192dc8e062ee77667b45dac62c309d37b02190e4f8a07640aea SHA512 d433e356e47f0a6be0ba3b41172618f0b9cce634e4227924d62a8487cb74af3ea0c4d3245ee4fd2936d39ed5eb839d52985866b9d796f7e7a84415a6b60f9b50
 DIST genpatches-5.4-224.extras.tar.xz 1812 BLAKE2B d28183946e63eedcde3ccc19d84baad11b74349abbba19501c0763ae4597150f2ad7397c19396ce07627643cae526e6ef216dfa2166d217e8452719887e7f2bd SHA512 6505c71e0da13992e0abf5ffd31b414b4bcbde4be78abee6e9d402c14eb329e212e85cca77cb79591ba6d66b3f3b4ae2014e57cd8a88b39373a5dc2403f37d26
+DIST genpatches-6.0-4.base.tar.xz 272160 BLAKE2B 3758714884e31f3ddb414d2011752cdf7fd2da9d54b6dd455e9b9ec559c0201fd7753df98a1cba0618f209552419a56ef8747ac0283f794a41769dc41b3844ad SHA512 ef8292b96f10586cbc9a9ba820bed3b3f30ab1e4b90d3452d94b5e44dd4c333818c99bf6cee1272416e83cda424942be84a7aa6f270687192d94a583e8a836c0
+DIST genpatches-6.0-4.extras.tar.xz 3808 BLAKE2B 42c2695cc364ed353e1ccfa945c6f69c2b3c81e32149de5134eeaf2a738b67a952ae33ace111122bf2c58083c81a4e056e8f666693d02c39f6631a7502c36038 SHA512 305cf01975f19237de99a40dfb2a395f0084809f00040296e5ec36ed949b4301cf7887dcd3f6e287945f8d92f3544e84f3ace2ba60d6720ae09458475159132c
 DIST gentoo-kernel-config-g1.tar.gz 4283 BLAKE2B 44dd51ec45ebc71bffcd6d85a2fefba053f7bce8035057f0bbe928e24816ad4ba03c9bf67dcfcd6d6d1833c0a2ea93e0fd486c2093664dc41ccce316e1e60588 SHA512 3a45f28df9d457df0fe0d185da8b10f4e35f49dad75075e041e8cf3cf6972fecc8145cd557b0bf3a8dea20ddffae0194f88e61c1e5098fa0a5ca301d40aeea2e
 DIST gentoo-kernel-config-g3.tar.gz 4411 BLAKE2B 00edc4b5dc943834bc7ee977382b2960160888db00a25c5a7f73968784aa39a2b3b69f0bbda89b3ce8eb55e746006cff2839481493ac8bfca6a21de2299564f7 SHA512 44beae869bebf5445655dafe1facc47c3dbe602b34c5bf2fa984a581bfe3250fa0df908b8807c333c2e66ab9d1a2bb8026e22140f2a1f522d0dd647c96ca4d5e
 DIST kernel-aarch64-fedora.config.5.10.12 223184 BLAKE2B a0246dac2f7a4ad6a55b611538d24382ac87a8960077811a859c9595ac67f961b4bccb7e139a89abc7c0e26e80832da5c94211fc658082f2e7dde984f14dd29d SHA512 7d803b347b136331db1ad6e22e0445fe0224c3e26cd7c034cbe9794915d457b492e05f77664865079874ec001351553652646e2e08d0fee31e30b841b0008f52
 DIST kernel-aarch64-fedora.config.5.15.19 242615 BLAKE2B 94e59440681535e38137b71814e1ae53f57a347f62cf31e0c1c8571ae43d9ae9be9957743c8cbc9ec74850c964eaabefe6799a28bc311ea7b99ee31391b47fb1 SHA512 fb77d3b73a215f97d70cd6d8c96ed20e497786b99ed7d7a7f2ed60cc1251289c1a4c7e058c41b5efac62e4a9b4b3d917dbdb11585955bba2b6584981430f4ddb
 DIST kernel-aarch64-fedora.config.5.19.13-gentoo 246842 BLAKE2B 4a824d02999749a0404437cae28721576511e06a5eaa9ebb1b1479c74e2b54402c440be7ea9159bf304661d4baaa5381c36b266ac0bba0b9bf3820eb04c6e4e0 SHA512 8862cf24b177ef3871f118712ceace2b496b04a488b045bbe3d83ab22942f064995486f5534630321faaa96ce60e5f237c4ded24a5468bea6e365aa3ea9f09c4
+DIST kernel-aarch64-fedora.config.6.0.3-gentoo 249641 BLAKE2B 292106b52829469fb8761faf983aaa160218eaeb1811f3fda811a8252d2d588e7d46863cae88490cff7e3c6ad518642250c80120e7e0c99fb3fdf745ce67c0da SHA512 5a6ffc5786d850e280fc67cf6d149c235c5a6b4f74d1785303cc5e999dbd70389b9a1012ab8596b63f5cad5563bf4076b781371a9cf59c0e7fab504e90abbaed
 DIST kernel-aarch64.config.5.4.21 199104 BLAKE2B 578ad451a76204df2a9bbbe34b5cb27051d2ac5e2c33967f562b01338c43f35da6dc33a4c2cc67ea6c3b32b155729360d3748ec28dcaa750f18449245b2e8a09 SHA512 66e9a437beb350fdc59512c17b8f72c5b5bfacf2b35070d810d77e66f49cf7929026cc28ad44b04a016d61e65d9fb4a10af6996ba09b604bf97e9c467d08f8ff
 DIST kernel-i686-fedora.config.5.10.12 205412 BLAKE2B 92c715b7e2cd7dd74da7970c05981f520597d3e403ce82c8cf4eee31c9f1f50b638792a6bdb256ef5bfdc99f1bcd594e819e8f44dc6febb2ad9a854bad817f2b SHA512 69d8db11723ae1b40fdedfaace74d15bb63198cdb0485e0a1e5eba95b31217110c93a93e39cc7370cf45f1d3a8bc7f75ec096d6db5ea9ecb28ac6b56702ebb10
 DIST kernel-i686-fedora.config.5.15.19 222233 BLAKE2B 9e0f4dd37058f59610e46a87d3165039e76299d3c186fbfc3312101bac1b8b198de404075f5bbc6f5e2ba04cfd45f9d02bdf94b01c3ed11b9275f37f11ee7617 SHA512 49ffc39de86763e707a5c0c07c1367d34e9249615f29fdf97904d7b61a375a86fc4ba37a2f02b5f61e4c76ad65d9ba12716d2523af6faa003f6336d7ae61a953
 DIST kernel-i686-fedora.config.5.19.13-gentoo 223571 BLAKE2B d56f8e019b0c58023b08ee358a9af46679ca0f734c075ba6cd65dd6e3277640c0b7683e5707c48f687644d815a3840eb58351c0dee84fe9ec1dcea525fb2e1e8 SHA512 0d9fa0592b6a9414f2967677c048a9e014a0e0d43274eea4fe10f8099befae7389bbcd033f4fb36c7c44bd30c2fb197e860151e27c10dc354fe9a86a8bb65e94
+DIST kernel-i686-fedora.config.6.0.3-gentoo 225842 BLAKE2B 507f389b83e0c84273cdabe39d9d319f34d07bea9ba5fa24d25f640f96f94c89aab806c78885c2a693cf7484dc4cacb73b2d6ed61e04dc9fcee6f6c9d517114c SHA512 0740d3e2830a35fe1f2c2bb0ae62ee0b1951a4dcccb27d19da96113dc48022396f2e5961e897a3546f67538b1b1552f7052639e00c0637a912704e2ebc9683ae
 DIST kernel-i686.config.5.4.21 183910 BLAKE2B 185126ffb85718bb73761d01683def80b6f002d7a7a6eddd8e858a30d8eadc863fb378d83a1cd2ed82b3540337fa66ae44475e31fb41ebc46d77005b6f54e5c0 SHA512 6307afc2295902e44fe65b1cccaa7a0260b295a5f21f1d67ec66197bd972bd3f5675b624f08d9da8b224cb3ec987d5c21cbd743599aeab9ac6214bc651f43476
 DIST kernel-ppc64le-fedora.config.5.10.12 192105 BLAKE2B 889141debb0656a358a3381bae14b5216b982acdfce0bc758f9445c16647807a68a788fb290199c2a1a23627bda1ef4c9405b3f5ac2a4176d1d2b55c71fb7db9 SHA512 3ab0f1401d9f50a61477c71369dede438f575d9d2c3a2f5c2cf36d624c2b59a938efca9c981b075511b3860c983eaaf5e5a9f877d659277f09ceba45edd43770
 DIST kernel-ppc64le-fedora.config.5.15.19 213339 BLAKE2B db6bbc9f402b8b48a2441e39d1a78dc112656ae842bc5594065cfd2ec3f6d462e4bde200e8736a70192af35fb3a5d1fc42683783a5b7620881f3a95bb0bc5f4d SHA512 b43439c24be8fa8bdd17d4c0beece799544ae45b2c289f0202fa5eb7a52dce0165a0cbc924b0decf877582af9688efd675cbfbd2313ff85fcc2c8563bba4b1ad
 DIST kernel-ppc64le-fedora.config.5.19.13-gentoo 213984 BLAKE2B 9abc1d2e03bb34908019dbbc4e54d3d176acddca6e7af72fe73461e60eb249486c4e8a81bfe2515849aa26939d9abef5e981deeaa55605b34bb59552cd3444fe SHA512 d857ce4178950a96ff029c3c9870211424e1c5e95dfef88d25d6d1d517493a6fd95d9d398f42b8a6cf72482b07789be38f674dd4a2b9855da57c8391b0c2708d
+DIST kernel-ppc64le-fedora.config.6.0.3-gentoo 215755 BLAKE2B a70566e48ded1bf85d41b776325f9a850b29e2238fc8e7b9d0ec2ba2ac2c51997d8565473c849ccaf7e2e81be3fe8a80b52c1e8fae48a524e1dc4f8563f5cc07 SHA512 015268d1ee705545f82e297c24ad49aa5f8f75aab5476a2bd177a1a0cc1594a4c2a142797f37517cef0670c7d374fbbf188cdf73e751b4606b41723c428bbe8d
 DIST kernel-ppc64le.config.5.4.21 172003 BLAKE2B b53887cb44f7c378cb3866780f8e556e19fdb02130d3b0df01d97698d2a91f7d90a200012559f288e962935742c3fdb67dfb6711876fad37862fe55cdca5b5f6 SHA512 82df8d0be47e9eb20bd7db570539bb061d0b6e2101dc78a54596cf4d0b4e0c536041449304ff9240b051ee09b342ea336c5645e9a3b66a5dfb96d7778ff86008
 DIST kernel-x86_64-fedora.config.5.10.12 206357 BLAKE2B 0eda9d4f3f973336cabd67c1ac78f100aabde926354743e8dcb7ff84496f0de49210d45f99bc850a2096078b0b4687aa7fd965d999248559506004f2b29dac0c SHA512 b12f43d3c1a52a4915cd73db98874ce9ae6c425672c0f1c19ed1b1101341c868ebf1c9620bef5449752ec0d7342c1ce38fb77779d0f89b9267096a605ebf7a26
 DIST kernel-x86_64-fedora.config.5.15.19 223286 BLAKE2B 239995703c01dcb6d179133dd115bc0a57872c07d7a08afaf4d92cf6d78f0c17b19487b5b399ac7fdde5d460fa7931628147817a569fef2c3a62951c96054bdf SHA512 9bee4aff7e5ef4ada57bee7496aaf47b8fdd5c936c4c9b580660d130db0678eaecdebdbcab0dfcaf5c17a71f6419069840db10f5886806b6fc810f8a3619554f
 DIST kernel-x86_64-fedora.config.5.19.13-gentoo 224246 BLAKE2B 6dd95fc7a8bd38387a3bfd6c00733220b34091961c8437cdac61e4376de8b35529808f3b8e2db91c1a0c90e1115395df153f94107e6f9884a61bf646cb40d25e SHA512 1393e6315581a4934a35f3e66146d014ad154025fbc71245bd4b6e7639952387449b69df41605df8590a4d363a5aab5111b442b1a9f56b4d2996ca416f7e5c23
+DIST kernel-x86_64-fedora.config.6.0.3-gentoo 226517 BLAKE2B 6cdbdd1d285e07a5c8866f90a035feb5d1123c5619005b489341ffdf6a860e253ed2883fea19fee89e22752e1b99a42cc8c14546066254928ec957fe97eef2ac SHA512 758e2674b67efabaa8b49349bcc00b70f69ee24f72a1b194384f0beb1da2ce207738cc8833fc4016029566561fb4f68a984c4e9eaff4ff156991bc7e84e1f4db
 DIST kernel-x86_64.config.5.4.21 184907 BLAKE2B 0eb2b07c14cea7545350fcdf3a94f2a531f0137c502ebda9299cacf44da5385686e2049b480b28bc153c9d413d453cfe682b9655eefe70428cb720f57c7bd200 SHA512 f3b3ee6841555ac3a9cc11536a7d44e1a5a8df2bab14ba341fda7df1ceb0de45cf1c799a1d54a64f2858fd1272d348bb52cf269ffa396878c5402baf2730237f
 DIST linux-5.10.tar.xz 116606704 BLAKE2B b923d7b66309224f42f35f8a5fa219421b0a9362d2adacdadd8d96251f61f7230878ea297a269a7f3b3c56830f0b177e068691e1d7f88501a05653b0a13274d1 SHA512 95bc137d0cf9148da6a9d1f1a878698dc27b40f68e22c597544010a6c591ce1b256f083489d3ff45ff77753289b535135590194d88ef9f007d0ddab3d74de70e
 DIST linux-5.15.tar.xz 121913744 BLAKE2B 3921274b23f7938abdf3ed9334534b4581e13d7484303d3a5280eddb038999aaa8b836666a487472d9c4a219af0f06b9fecccaf348fb5510ab8762f4ef4b7e83 SHA512 d25ad40b5bcd6a4c6042fd0fd84e196e7a58024734c3e9a484fd0d5d54a0c1d87db8a3c784eff55e43b6f021709dc685eb0efa18d2aec327e4f88a79f405705a
 DIST linux-5.19.tar.xz 131581464 BLAKE2B 4db03a6830a3b3bbf0837e1912182a443d9a4aa8af20a12e6ec814ed708038452d3c0ccee1258cca671c464d76461536363a8adc56e9d098c9a44ae3484a297a SHA512 00313b2f9b82d2dc3fb8294007cf7d7599d254b717ed2de23c81fa7a1bbcbc2798ad286cb94e2f7f5bd54132d1d764facd90d30f79dbcc6616cc7f926adc2623
 DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f
+DIST linux-6.0.tar.xz 133886176 BLAKE2B c09a9c877ac0fac83dc31d2d04d96f0a3331d4ed78e3ad4edfd4dc077e1c11d0c49f419fdac4008b5c93d1b09c2b724e12ef0b38371ad0962908abf85dfa95fa SHA512 bac41a7aeb6e809616cee2f13dcd1c45e829dfd1ccf60aee1dc4c46b1e28532f4485c7d819a32940de84fdfbf89db80a4e919bce8a74b2948c5a01551771b714
 EBUILD gentoo-kernel-5.10.148.ebuild 3598 BLAKE2B 08ce2dc5719f68b0359e131864a5b4d27a9cd1ca35d5ac0e1f9092958d8923015f99da9361104fa0fb45649c2422c2d204f89b9f66a38214d83ead29aa7f9f06 SHA512 b054a9e9858f23ef6f7ba77e6bf19abd9aec489661718107e5c3562362fbf1353319be98a7d6d551f9f998ee60ab2554ea6baadc744ce4527fc0695b4f05dff3
 EBUILD gentoo-kernel-5.10.149.ebuild 3598 BLAKE2B 08ce2dc5719f68b0359e131864a5b4d27a9cd1ca35d5ac0e1f9092958d8923015f99da9361104fa0fb45649c2422c2d204f89b9f66a38214d83ead29aa7f9f06 SHA512 b054a9e9858f23ef6f7ba77e6bf19abd9aec489661718107e5c3562362fbf1353319be98a7d6d551f9f998ee60ab2554ea6baadc744ce4527fc0695b4f05dff3
 EBUILD gentoo-kernel-5.15.74.ebuild 3595 BLAKE2B 3f9177ab76f55b26f0b9785ca179df92d66c3faf2a875ea90c996834670cb22a0b0076549390f48058b71d5b3e352e2ab7c01003b1224f3b1380c5cb20ab6b47 SHA512 d2b6b3aecc1b3571043b19deeb89ae32c07cc62e81bb9385628de7fe7506d277cadcdab5d75a6af07c9f62a0bb88e9c80ec6e467b3ded7a9468ad858ffa4cd8f
 EBUILD gentoo-kernel-5.19.16.ebuild 3860 BLAKE2B 83a9eb6186ac31ddcfcbb80401e078c150f2e1e1141e962e7f1891beae412391087764a48eab5ce0fc2f9b8bd00225e9122a95b2a15b320bf0de63622d98310e SHA512 345a88aa98de549dcba361e5def145e25eae6d715523cfc6b5adaa1782a5efbda2b415bb84c9541bae7ffb8cbe36f20ec41d11da72117122eb9d5303a95d4e0e
+EBUILD gentoo-kernel-5.19.17.ebuild 3860 BLAKE2B 83a9eb6186ac31ddcfcbb80401e078c150f2e1e1141e962e7f1891beae412391087764a48eab5ce0fc2f9b8bd00225e9122a95b2a15b320bf0de63622d98310e SHA512 345a88aa98de549dcba361e5def145e25eae6d715523cfc6b5adaa1782a5efbda2b415bb84c9541bae7ffb8cbe36f20ec41d11da72117122eb9d5303a95d4e0e
 EBUILD gentoo-kernel-5.4.218.ebuild 2799 BLAKE2B 925a58a4afcb3c66f5179e8e5c23912332e7a1025ecd9d77b7d53cb89b25482c3dbf136b0340ecbbc4bd1430599302e5537d7a9e9e0314b5bbec1f9b98e76166 SHA512 4d67a306017b4741452ebbe3d0be3f29cffb0debc69bc2a605c6298d730c19a908ce8aca41a30888d9015f1330b9b6a4f5ba518714df41daf17900e8f29ddd44
 EBUILD gentoo-kernel-5.4.219.ebuild 2799 BLAKE2B 925a58a4afcb3c66f5179e8e5c23912332e7a1025ecd9d77b7d53cb89b25482c3dbf136b0340ecbbc4bd1430599302e5537d7a9e9e0314b5bbec1f9b98e76166 SHA512 4d67a306017b4741452ebbe3d0be3f29cffb0debc69bc2a605c6298d730c19a908ce8aca41a30888d9015f1330b9b6a4f5ba518714df41daf17900e8f29ddd44
+EBUILD gentoo-kernel-6.0.3.ebuild 3858 BLAKE2B 45c32644ec54fb13b8aedf1c44a671ff8613b603265b05245996118156c7aa330c89a9d5e0fdc210647cbade3edf54d184eae2751d1c0f1ba10dbeddf6076784 SHA512 f4d60507210e73defb63a52f48c01999093177d940123db23b92903c60c38e99104eb6fb26d8097bfc31eb288e5c37da3de70d7eea3f15a780c1891b401227bc
 MISC metadata.xml 465 BLAKE2B ea1260a1638588a48d9dd776e9eabd9730a181af8416ba778c936fa2e80a2360be146d3cc80599e50e0a72ac709eb9538184aac87cb96528e445ed450e34f4af SHA512 c7b7b1a45fb7082b8d8d66cf5a387cc4f7207cd9488d1d5e1d6900f1e4147aa9290b5522a94d941a885f1599b5df2482b529e40912d2b2cff400ecd4b1704c41
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.19.17.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.19.17.ebuild
new file mode 100644
index 000000000000..09dafaff5094
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.19.17.ebuild
@@ -0,0 +1,137 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit kernel-build toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 2 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+# forked to https://github.com/projg2/fedora-kernel-config-for-gentoo
+CONFIG_VER=5.19.13-gentoo
+GENTOO_CONFIG_VER=g3
+
+DESCRIPTION="Linux kernel built with Gentoo patches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	https://github.com/projg2/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	amd64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )
+	hppa? ( savedconfig )
+	riscv? ( savedconfig )"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel-bin:${SLOT}
+"
+BDEPEND="
+	debug? ( dev-util/pahole )
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+
+QA_FLAGS_IGNORED="
+	usr/src/linux-.*/scripts/gcc-plugins/.*.so
+	usr/src/linux-.*/vmlinux
+	usr/src/linux-.*/arch/powerpc/kernel/vdso.*/vdso.*.so.dbg
+"
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	default
+
+	local biendian=false
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm)
+			return
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		hppa)
+			return
+			;;
+		ppc)
+			# assume powermac/powerbook defconfig
+			# we still package.use.force savedconfig
+			cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		riscv)
+			return
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local myversion="-gentoo-dist"
+	use hardened && myversion+="-hardened"
+	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
+	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
+
+	local merge_configs=(
+		"${T}"/version.config
+		"${dist_conf_path}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${dist_conf_path}"/no-debug.config
+	)
+	if use hardened; then
+		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
+
+		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
+
+		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
+			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
+		fi
+	fi
+
+	# this covers ppc64 and aarch64_be only for now
+	if [[ ${biendian} == true && $(tc-endian) == big ]]; then
+		merge_configs+=( "${dist_conf_path}/big-endian.config" )
+	fi
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-6.0.3.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-6.0.3.ebuild
new file mode 100644
index 000000000000..f494400b5148
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.0.3.ebuild
@@ -0,0 +1,137 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit kernel-build toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 1 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+# forked to https://github.com/projg2/fedora-kernel-config-for-gentoo
+CONFIG_VER=6.0.3-gentoo
+GENTOO_CONFIG_VER=g3
+
+DESCRIPTION="Linux kernel built with Gentoo patches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	https://github.com/projg2/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	amd64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )
+	hppa? ( savedconfig )
+	riscv? ( savedconfig )"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel-bin:${SLOT}
+"
+BDEPEND="
+	debug? ( dev-util/pahole )
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+
+QA_FLAGS_IGNORED="
+	usr/src/linux-.*/scripts/gcc-plugins/.*.so
+	usr/src/linux-.*/vmlinux
+	usr/src/linux-.*/arch/powerpc/kernel/vdso.*/vdso.*.so.dbg
+"
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	default
+
+	local biendian=false
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm)
+			return
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		hppa)
+			return
+			;;
+		ppc)
+			# assume powermac/powerbook defconfig
+			# we still package.use.force savedconfig
+			cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		riscv)
+			return
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local myversion="-gentoo-dist"
+	use hardened && myversion+="-hardened"
+	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
+	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
+
+	local merge_configs=(
+		"${T}"/version.config
+		"${dist_conf_path}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${dist_conf_path}"/no-debug.config
+	)
+	if use hardened; then
+		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
+
+		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
+
+		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
+			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
+		fi
+	fi
+
+	# this covers ppc64 and aarch64_be only for now
+	if [[ ${biendian} == true && $(tc-endian) == big ]]; then
+		merge_configs+=( "${dist_conf_path}/big-endian.config" )
+	fi
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest
index 1c5c3a3d53e8..1fa8720fafb8 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -28,30 +28,18 @@ DIST genpatches-4.9-332.extras.tar.xz 3676 BLAKE2B a1eb027f76856b2c08625186c24dc
 DIST genpatches-4.9-333.base.tar.xz 5317324 BLAKE2B d6a00d040f6e80a02ff3cfa558bdf466b26477499a65b3e975d3fc8e9f2924053231e5ae6403376b041f79516c4d9db0e970f40c16068c2377cf113a9f7cfa2e SHA512 35b45c584de8b21182a65dc5979945aba2b21bfe8b4397cdf893358ff17f34869ce603067f89c57a43a369861d83ad36bb45ca53b72376c0d0ba4ba554a482c5
 DIST genpatches-4.9-333.experimental.tar.xz 106384 BLAKE2B 0e6238ba0dd31d5b11ba81c39a49cfe92252a6e15802388354525b70b03017f694c9f91e91c6ca57ede445e15531e02885621f08d4666f3aaa639d4fd22f4813 SHA512 18b9880f0325ca120054489acd5ca1809aa3de81367088b8b1113e2d4a2865fff3d55376ae34fa535f5b445e3a6ca4e19651cc8537b0de038ccc9de659c75bd0
 DIST genpatches-4.9-333.extras.tar.xz 3672 BLAKE2B a9ed67b06a3b12f87d8174c79faf00d0a92b9c64651202ac159b355e3b917d5dc9009133920ed8f8b3727106199119897fba9e68d02e30fa748c85f7f63bd2d7 SHA512 3236bbc689212ad452e4bbd32d1786b249b3f6a7d0482c97d9e4bc9383851bc4ab6a4c20ec60abeec6fa081cdd5e0014971b42ba6a5e53a60634f6e1e12bd027
-DIST genpatches-5.10-157.base.tar.xz 4210372 BLAKE2B 607d4005190d4b623126ad644508f471cac783a365a0b1f15983eed50a1a594be6c473840c0d79a9c0847afb221a4b95e6dd954f6f7b57cdec6f53651a5fc9a0 SHA512 fd176ed3f4af5e4f3ecb37f553a9ceb034cb8d9602106818edf1deab8ecc34ab4e08009cb4608578fa4892bd5cc76952fa8ab9a010c9159680f860a23775d6bf
-DIST genpatches-5.10-157.experimental.tar.xz 16864 BLAKE2B 7afb7260727e9f574251ab7308704545ff3844002341f422349b34e6d26bc197b5043d199721215ebc2ec9f065b5b163f9e4943e3866cd39b569f9b4f4fc4058 SHA512 8be77c6c905568dae05dc08cbb0303b0f5093a8e2717921b5e49bf216bb8e48ce2538c7d88a9395c80e3df8e8352cfc1b38acca2424dc8b6832adb787319d3d9
-DIST genpatches-5.10-157.extras.tar.xz 3868 BLAKE2B 6662b3d2ab7179cd186061ac684324834a5322c0d6132cb61ba31098f360302534f9f59357c0044eccdb262a6c9f973a21c071c1e27fada967119fe793a7e6e1 SHA512 d85943c5b389d3b4966dac77bfd2abbb9e85c039dd365990cca40bebc82ee35d58a3a24a9a3a15a40eb36ee8671dcac9a43f9753ae48a7d19ac7a7e5013c7cc7
 DIST genpatches-5.10-158.base.tar.xz 4211444 BLAKE2B 0dc1d053275d080f7e61a280f8311c3da1a1497b929e6d1d4f24a15b7e6b5f4bebd4fdd49fe90137b7a01b5d1f4df60ed7c7bbe0089505a54632618d90b5fa63 SHA512 6630ede665881b848a768b0f959820be4370ea5ecc897e6fe819a186568d11d58373056266c62d858d004153fb894dbc64df48e03098bba4f68b560a5e273b70
 DIST genpatches-5.10-158.experimental.tar.xz 16872 BLAKE2B 5a1ce33f79ea8db3729b8afee36e145302ce7d45bc0548b7524fdee52049f27687c8638aab11302615697169777049a5fdb7b337e63c9c8a5e99afd5272dee15 SHA512 9b09ad4092e9a24b0794b872584388bf5424b1dfe4695a71cda370c4e07d8dc9918f98cd40db16a4988e79232aa1d05a7e3081b120c7a7ccda3fca175be994cd
 DIST genpatches-5.10-158.extras.tar.xz 3868 BLAKE2B c2cb0c011084012b46fede2333a7022bb78a4c92e675fdba5ba2c44f37cef35e6f0334dbfdf69b6b6c0602793a5821660aba29236d011eaed808f8db9b42c876 SHA512 85dc76fbfcc1cb8064faf012b8bb40eb1c6b7e2ab0adbf2af191b5c3ea0c6f57a685dd53d1e3c6266de4b88c414516371001d8b95648b02adb5c4f25d7ca1049
 DIST genpatches-5.15-78.base.tar.xz 3076864 BLAKE2B e868bff991ca299fe186380ef4e7222029fadf1eda5adf66ac6861fba5febcb222c69db93dedc3280c45a4a222f5800a497c12dd47425071b7dd5263ee680c3e SHA512 5018436394bc934ee2f0b50a3b012fbf86a615108bbf16d18d636b202d66d2bb75d9b04cabb87e75fbc7360c137ea52961609e90643caa2d9779628fd3292b60
 DIST genpatches-5.15-78.experimental.tar.xz 5420 BLAKE2B bf4aea35df32ae2a9b936804af40e994b65a91bd8f6d89e86e43c573bfaad5110c42ef30cc78c798d3d61b0e210851105a1fb6265c54361aa4b7f9110caf730c SHA512 5d583b5fa677f69b38a7d7e919fa2633c10faf30b7d6478b06f647fbcacc6a2cd1961a07c59983446fd27e2bf0863107720a714e0ab928a731c450240cd8ee53
 DIST genpatches-5.15-78.extras.tar.xz 3932 BLAKE2B b971f35cd6b525ea2fa675909790f489b66a1bd96403d12acf47ac2cb00218181ad267649d143e37f2cc775f4892c0e3a24817c9270c27c7b937b69ad002000e SHA512 6973da0d4dc2d48c5c481a45581ca51449957bb662dc8520ae00a23056dc25f2b9d419cd2ccf9fd5244313ee2eee0b907cd367259ae1d27cbd226bbe8bbced32
-DIST genpatches-5.19-18.base.tar.xz 911172 BLAKE2B db20a811ffc927b01dc389fc3d959809442fa4065fc2951b992561fbc102e854b5fd8dd17833604458e95f8bcec23c75ae94095df90745b489628e52661b5878 SHA512 4e9b9eb22f6a3b634964c35241a9a50517228787f6bd7f25f2de3ff82336c8d0acd8b2fe703a9595ed32776d64bb66ba518919f597948922db6791c10c572b67
-DIST genpatches-5.19-18.experimental.tar.xz 73248 BLAKE2B d6cdc6ce8056644b1de1a4d1099372130a583a439d3c83cc2b6237babce050373123f56b0f66a48954ba4ba42991033f0d35e783862e8912be0b7bffec71ba18 SHA512 13830db589b38ae4225823a124609a13c905afa68a942c352b62002c18daeb4e85b88b9b74c674aae91ea1c90bbcfb200193df5796fafee69a6743afbf056857
-DIST genpatches-5.19-18.extras.tar.xz 3808 BLAKE2B dab7e5596066c9b70ebc2b7413ec7dc9c35bddc29f230dfdc74a9594706713a6807e0ded167eea3ec6a4bcf0c901404bb4fe1a71fa1c8aa265c599b6a1dac8fa SHA512 f39d76551328f9e8d1aa646e819282096bbcea1cb22902fd087dec878a7d673aacb517441a9c213e85a03f2f15768e1a252f103ca89f1b84ef994a0998416bb8
 DIST genpatches-5.19-19.base.tar.xz 1098964 BLAKE2B c79251602e677d36db4f923ad148422c1c19d9e35b33d1eead75f317ac468ba919baa0c61a690425714bc0b29d96eb47aeb1c960ec4192ccb3905df752f81ab4 SHA512 bb0ed1e481a78f8f65229db777c5d8031edbd3d31cdc0ed45e48d4f5916b838397c1ccec5d465d957673494469290a1dffc8a4466c252395348c8160f2f5cc67
 DIST genpatches-5.19-19.experimental.tar.xz 73244 BLAKE2B 6d89efa7fd2c6af8145e08e0502dacea8b3bfc28a30e70a1ea82e36e2c4cf953fec159fbed97169a52d47046e23938a58bf3d8a331cdd816ed1dae6465adeff7 SHA512 9cb5bd9cd9accba3033a6b66e75879bda8d7e5a92752a878d256260c74e87ae71d79260819ec61f3b9ddd1eea9d733efbce8b8566e085ce3e081a5e830fb3470
 DIST genpatches-5.19-19.extras.tar.xz 3804 BLAKE2B c73e8bb8be2845ada725f71045e69fa38c99d0561e702d38e3827cf1e25ff2ab2105e3142d0f85baea59fa4a28a4521202d222c53190b741055609551ac1039f SHA512 b6f813b816f475a120543f637857f683e82cb22484fad7149bfbc5bcdd6d5119373d915ac53d6b743197910e78fc2ebdf35bcfb3612015e571629d33740f2701
-DIST genpatches-5.4-223.base.tar.xz 5119600 BLAKE2B d2ad667a58be0061e5e94a885f3cafd7c0d99b108f129a5d7bdc18d0d77b99d52b2dfd0067f6d4657dadcc73f371555949c9ae70f71c1b457c9487179db25070 SHA512 0e58903a7e78f1a50a961a27929f3a936f07ee45343d079389cf9e8b9e78a1b542ec58bbba49ced2e0873d86d28ef2ebf3501a70a5cc8465298c267d95a09899
-DIST genpatches-5.4-223.experimental.tar.xz 16896 BLAKE2B 8e8525edde173331149c0ca7c8fcc52ac07ca6dddd02c2b0b9e1310d963caa167e5ca05a0a0c5b3a2d5173ccaf4ee33c0e2826be3c6f2d5783728e5c8d24a85b SHA512 32c2fe9ece65e49a119e727eb3282045c7fcc9ae2587e88ad397f57fe13b629c853dad11a5f2b532ff23d3903c612722089e8d8e2dc79becef8c7d95e0ee67d9
-DIST genpatches-5.4-223.extras.tar.xz 1812 BLAKE2B e0ebc78506b6ca3d8bc09164b26f15a8cc94495797fc17a36381a3f031dd81bf7870915a48b0deb4f58cfb43e5ec4a64e18e6ca6c00837bdfc5e4fab913752b8 SHA512 ce01405cfc355d6230e687c407c9a5e92d88c6f0837eda19d2bc23d3517df4c5159332d491459867841827e0dc3976c8229cf0d0cb1c9d39360ba67ea616a734
 DIST genpatches-5.4-224.base.tar.xz 5119576 BLAKE2B 3f5fa9712da6376491d9903759334ca4981a6fc9b24919ba6acb5114ce805333a26052570df1a192dc8e062ee77667b45dac62c309d37b02190e4f8a07640aea SHA512 d433e356e47f0a6be0ba3b41172618f0b9cce634e4227924d62a8487cb74af3ea0c4d3245ee4fd2936d39ed5eb839d52985866b9d796f7e7a84415a6b60f9b50
 DIST genpatches-5.4-224.experimental.tar.xz 16900 BLAKE2B 4f49641399af48b9cfa88e6379a50716cef3c99d7571beda8d675a3d6b48e6a7761638e65685ca0ad8c69f2376442ebfc5ad2601d3d1a7d462caf8d5c91cac00 SHA512 ec203ba70fa1ac631e8a9b3923ad4f47de2ed91a57eb1f9eb18516881ab950be837b4391a5570e7105706cefbc9458730dcbb0db6cd2274e2946530599cd5dd1
 DIST genpatches-5.4-224.extras.tar.xz 1812 BLAKE2B d28183946e63eedcde3ccc19d84baad11b74349abbba19501c0763ae4597150f2ad7397c19396ce07627643cae526e6ef216dfa2166d217e8452719887e7f2bd SHA512 6505c71e0da13992e0abf5ffd31b414b4bcbde4be78abee6e9d402c14eb329e212e85cca77cb79591ba6d66b3f3b4ae2014e57cd8a88b39373a5dc2403f37d26
-DIST genpatches-6.0-3.base.tar.xz 24412 BLAKE2B 928ad17f3bc06683defc2494a748bfa68f29dabb71a043fb36ee332d44f625471069ab57dabc8db1e58f8ea636f94153231c80708ed933ccd139459941e03ca8 SHA512 ec800460b6cb2aae1873396ffe5d94fe58598f9bd8ccd4e264faf7a7372f2f02b6b99425ca06716539ae39528a2ec9ff6b29178cf2706fdaa8c56cb662b76293
-DIST genpatches-6.0-3.experimental.tar.xz 5400 BLAKE2B d82665bc6aa2bcdcd509234700ff9aea2c36dfcee4ccfee31d885da4df5a45a3cc3c98c64a4d6f7d8ebfbedf666ab955fa490025fa341624030bf68b685dc006 SHA512 071e0f384561ea6b4fd4736d5ff31689532f580c10684e53eac1cc5a7136b44f205525f9abe6b09cc226ea53b2d02f5950b0d24a4481a9e1bfa890de982cf771
-DIST genpatches-6.0-3.extras.tar.xz 3808 BLAKE2B 46bd473d14aed3a7b752c4e5093a7467dfeb1ee5f75aaf010c14fc940f8acbe7721b9df191613ab63dac7f96035087536a02386fc0feb1710763c766089e85e9 SHA512 a4c8257fe6ff3538d2040563b3c42ef68ce9130bedcf3422884bef78f2787888be4effc27b914d68ed70e44318a857ae6127c0fa78af4bbda6a110fe036fc7e6
 DIST genpatches-6.0-4.base.tar.xz 272160 BLAKE2B 3758714884e31f3ddb414d2011752cdf7fd2da9d54b6dd455e9b9ec559c0201fd7753df98a1cba0618f209552419a56ef8747ac0283f794a41769dc41b3844ad SHA512 ef8292b96f10586cbc9a9ba820bed3b3f30ab1e4b90d3452d94b5e44dd4c333818c99bf6cee1272416e83cda424942be84a7aa6f270687192d94a583e8a836c0
 DIST genpatches-6.0-4.experimental.tar.xz 5404 BLAKE2B 103b72e840e612d03dba399397bc6570b630968b4d29ab3d0b17a546adbc22d1ef37f7b0bebd92142085948085b006e22d0647a27faa448018857d8ba8647aff SHA512 5489e40b0c8f2402f4998e19dbb1e864f03c088e603c83d66da86917df694827b1a6092cbc2233b03432f31efb6cd1439e1c6b78c22de37e96eebe9ebdc472ff
 DIST genpatches-6.0-4.extras.tar.xz 3808 BLAKE2B 42c2695cc364ed353e1ccfa945c6f69c2b3c81e32149de5134eeaf2a738b67a952ae33ace111122bf2c58083c81a4e056e8f666693d02c39f6631a7502c36038 SHA512 305cf01975f19237de99a40dfb2a395f0084809f00040296e5ec36ed949b4301cf7887dcd3f6e287945f8d92f3544e84f3ace2ba60d6720ae09458475159132c
@@ -73,13 +61,9 @@ EBUILD gentoo-sources-4.19.261.ebuild 742 BLAKE2B 7d2131d16bc0d3c8a776c241727eeb
 EBUILD gentoo-sources-4.9.321.ebuild 667 BLAKE2B 444003c6649801be27c4571babb82c79050ca8dfb951509054b75de1091fca7c42f0f4267554b6203e6df75ce1cd6b7f5354b31eac068c806c426e0df5466f71 SHA512 8b24c4e9fa79a1d32fd09e5ba3b58b787f40fa5a51a1e3a482c680cade3d271a70ccfdf6ea3ffeeb323f2e87cba251568e9d3490e6cb76f48ef81c5eb855fbec
 EBUILD gentoo-sources-4.9.329.ebuild 735 BLAKE2B d8bdafd9ae65b5160e244cce0781e1e91beec4f923c116fa978cf230162ec21babf8e970bb6d2e62853c0b189cc7f3fe355923a2e97d711f1246efc8110d8ee1 SHA512 6a1df6636f09fa5ab4aa121b3303e2a346d24e6d626310cda7005d848150d216ae124b4728baf2790824320e954daf2acd825c07b88bb9d4f8dc348ccc8bcb21
 EBUILD gentoo-sources-4.9.330.ebuild 742 BLAKE2B f08b8f1e4d1402a75d8cbfefe9c0b92b135f51a936dd5d43523200fe2247908d5818f1e081fb3e1a94edb8aa0f7b84f0491671e5c39dc54d8477b0211a495541 SHA512 a8c90a1b2be46603442b17bab686c9d4b5c355502b443261c3a0ab3f7381ac75c2838931c7bd7df982f0d8c806566d7d250a969b91ed25cdc2931d3d62c379da
-EBUILD gentoo-sources-5.10.148.ebuild 741 BLAKE2B 4ca3d5a54e1435aa8be20b812bbe78546701a3b703f4bf6a20982ed8e5be0b27ca9a6e255502cafb1f396c608b8e3d8132efb8bf1194518d649903288442a189 SHA512 21089249e06ec75f8dca2b8c9e5a26f78da743056505a9c0cde4c9bb4368cad725d28f73559e7e86f06570fc91e35f978c64ddcf3f5b71c0beff1d0143ff436c
 EBUILD gentoo-sources-5.10.149.ebuild 741 BLAKE2B baab5ce976169f3307165030922df507b491967ce5620006e8d32cade5197ef9f0304bbdd0042e52fe6cfde2fd4666f7288651aead223444301e12dda4e66bbc SHA512 054e5c9a4b30fc8c1a39810b8f31ea7fe126b2ccd62204b2d78c3251fd78d1de3e012c31fb6a826353e33590b3532bcc18ff3d9a5bf4f512bc3e857c5fb94fee
 EBUILD gentoo-sources-5.15.74.ebuild 740 BLAKE2B fb89c3c7a6e33ab5c8fdb37e9ddf9f9c7cfc3c15baf505c5036b14f12d876b497edaba51723ce85283d9734b53ebb84b5ae089e65eacbef748253f7ee7bd78cb SHA512 517c90929232ffa17c783ca4243d7f955a6a19d5da244770d6739596df4929a7ee0462c5cca76565e5287fb35f950c6f1f5a85a905a0acb21787aaa9038cb923
-EBUILD gentoo-sources-5.19.16.ebuild 757 BLAKE2B cfc2252c4bcf62293d8b11b83bc30795a4b67e7043f4475cde3b9efc5c2492066e67349aac2f0273aaeab5d98aa112707c04f0440932fda1e57a2956c41d7999 SHA512 4ca50642fede28d712da30c7a267521f9df2e4176212af039d9704452ba0d497cfb4cb518f58da5bc15528a29aae57307282fe7da4a54a0165e96bcfe314b287
 EBUILD gentoo-sources-5.19.17.ebuild 757 BLAKE2B 6e24c356b5467f2d9e34b9b11587f0220b39114945ad8c8523e877ff37527789383a8d88f464ce5aab945d7e43e740d967df9c1c87584972ba85ec29cc49a11f SHA512 14961c8e6525c0fd38e3346ddca99c85782e68ba75aa919e866524a264db853ed2c997741a86a1aa6b7e59eff4e5fa15015f9b9ad933aaf6456e2f2db672dc96
-EBUILD gentoo-sources-5.4.218.ebuild 734 BLAKE2B 4afa20bec6dece3cfb6651821c8878635233ce0e7dfd4156b2617f7c4615581c940ee7524ae68ef790d395542f8f570c754bcbf65cef4fccea5d60d91da0ed59 SHA512 2b239b2129ad5271438fccb1632c7231fc4b8cb846c731970d5508887d625788a9679faa1d0df6489f86358aad48e4da80d905b1e9f277f42bb7d0c5bd2bcc93
 EBUILD gentoo-sources-5.4.219.ebuild 734 BLAKE2B c19c0cd5d15ea9f6ebed81a797d6994a434dfbafe3be4634fb059fa4bd11a54160d7f334c4845dae40461b6c24ac5c40ec2741c9b5cd2466c81ad38c347921fa SHA512 978fe7cb95044c363b8609ba3ddd76cd185ca87c1a763d814f3941099629737a083a532f58c138a1fb9b9a46d20ca512ca677980622a41de7520b0a200aa4d61
-EBUILD gentoo-sources-6.0.2.ebuild 741 BLAKE2B d7cc73a7e5bd4a201e540683366f944b5e6da10f5502b73717871b6da04c552b9a8c4191bae054b9285ab2508b6f7d7e450ce70ad5896a6e7d271c20be410085 SHA512 8fbb04ab8751f268974607acba538391a68df12f9db90b32c99770efd3690acc042ff5fabad499d2cba894e6cd8b2c14819e4a51b73bce5ba300d685b96b3745
 EBUILD gentoo-sources-6.0.3.ebuild 741 BLAKE2B 5ea1c1e649245e1c156ec44d9d454fded0e208ab1b0306f971808112994d7597760ad9bb0e5e518226098e812b9855272b2326bddedc21356d2a0e6756c16dca SHA512 b4c10e3ea61260f2df9ba92c7f6ec5a3b34ef12772fe4b3631a3c43948037f0709d6069b5bdfe7ef3855d19ca0fb1e6f491d8285769ad94a167b259e6fd00575
 MISC metadata.xml 501 BLAKE2B f5363c8a19540d5bb924b38bdebeb8dbc60c84e58d1d87a9148a3e7abb09b0a1b733c98b130b778b8ab3a88375598444aa9d537d8c5338864a3d4497600d7836 SHA512 bc1ba0d75dbf5b95b3f93e666389c6408f20aebeec99bc8ec00653758b67588e07214285ed106fd9e5aed2c8d57c625d666c797212fda51e1ab98ce1df816467
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.10.148.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.10.148.ebuild
deleted file mode 100644
index 9ef9c332908b..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.10.148.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"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="157"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
-IUSE="experimental"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.19.16.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.19.16.ebuild
deleted file mode 100644
index 73fda8684309..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.19.16.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"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="18"
-K_NODRYRUN="1"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
-IUSE="experimental"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.4.218.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.4.218.ebuild
deleted file mode 100644
index e3112cb1d677..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.4.218.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"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="223"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
-IUSE="experimental"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-6.0.2.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-6.0.2.ebuild
deleted file mode 100644
index 9fc029507ff0..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-6.0.2.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"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="3"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
-IUSE="experimental"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
index 1c900134c486..9a256ba310ed 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -3,18 +3,22 @@ DIST gentoo-kernel-config-g3.tar.gz 4411 BLAKE2B 00edc4b5dc943834bc7ee977382b296
 DIST kernel-aarch64-fedora.config.5.10.12 223184 BLAKE2B a0246dac2f7a4ad6a55b611538d24382ac87a8960077811a859c9595ac67f961b4bccb7e139a89abc7c0e26e80832da5c94211fc658082f2e7dde984f14dd29d SHA512 7d803b347b136331db1ad6e22e0445fe0224c3e26cd7c034cbe9794915d457b492e05f77664865079874ec001351553652646e2e08d0fee31e30b841b0008f52
 DIST kernel-aarch64-fedora.config.5.15.19 242615 BLAKE2B 94e59440681535e38137b71814e1ae53f57a347f62cf31e0c1c8571ae43d9ae9be9957743c8cbc9ec74850c964eaabefe6799a28bc311ea7b99ee31391b47fb1 SHA512 fb77d3b73a215f97d70cd6d8c96ed20e497786b99ed7d7a7f2ed60cc1251289c1a4c7e058c41b5efac62e4a9b4b3d917dbdb11585955bba2b6584981430f4ddb
 DIST kernel-aarch64-fedora.config.5.19.13-gentoo 246842 BLAKE2B 4a824d02999749a0404437cae28721576511e06a5eaa9ebb1b1479c74e2b54402c440be7ea9159bf304661d4baaa5381c36b266ac0bba0b9bf3820eb04c6e4e0 SHA512 8862cf24b177ef3871f118712ceace2b496b04a488b045bbe3d83ab22942f064995486f5534630321faaa96ce60e5f237c4ded24a5468bea6e365aa3ea9f09c4
+DIST kernel-aarch64-fedora.config.6.0.3-gentoo 249641 BLAKE2B 292106b52829469fb8761faf983aaa160218eaeb1811f3fda811a8252d2d588e7d46863cae88490cff7e3c6ad518642250c80120e7e0c99fb3fdf745ce67c0da SHA512 5a6ffc5786d850e280fc67cf6d149c235c5a6b4f74d1785303cc5e999dbd70389b9a1012ab8596b63f5cad5563bf4076b781371a9cf59c0e7fab504e90abbaed
 DIST kernel-aarch64.config.5.4.21 199104 BLAKE2B 578ad451a76204df2a9bbbe34b5cb27051d2ac5e2c33967f562b01338c43f35da6dc33a4c2cc67ea6c3b32b155729360d3748ec28dcaa750f18449245b2e8a09 SHA512 66e9a437beb350fdc59512c17b8f72c5b5bfacf2b35070d810d77e66f49cf7929026cc28ad44b04a016d61e65d9fb4a10af6996ba09b604bf97e9c467d08f8ff
 DIST kernel-i686-fedora.config.5.10.12 205412 BLAKE2B 92c715b7e2cd7dd74da7970c05981f520597d3e403ce82c8cf4eee31c9f1f50b638792a6bdb256ef5bfdc99f1bcd594e819e8f44dc6febb2ad9a854bad817f2b SHA512 69d8db11723ae1b40fdedfaace74d15bb63198cdb0485e0a1e5eba95b31217110c93a93e39cc7370cf45f1d3a8bc7f75ec096d6db5ea9ecb28ac6b56702ebb10
 DIST kernel-i686-fedora.config.5.15.19 222233 BLAKE2B 9e0f4dd37058f59610e46a87d3165039e76299d3c186fbfc3312101bac1b8b198de404075f5bbc6f5e2ba04cfd45f9d02bdf94b01c3ed11b9275f37f11ee7617 SHA512 49ffc39de86763e707a5c0c07c1367d34e9249615f29fdf97904d7b61a375a86fc4ba37a2f02b5f61e4c76ad65d9ba12716d2523af6faa003f6336d7ae61a953
 DIST kernel-i686-fedora.config.5.19.13-gentoo 223571 BLAKE2B d56f8e019b0c58023b08ee358a9af46679ca0f734c075ba6cd65dd6e3277640c0b7683e5707c48f687644d815a3840eb58351c0dee84fe9ec1dcea525fb2e1e8 SHA512 0d9fa0592b6a9414f2967677c048a9e014a0e0d43274eea4fe10f8099befae7389bbcd033f4fb36c7c44bd30c2fb197e860151e27c10dc354fe9a86a8bb65e94
+DIST kernel-i686-fedora.config.6.0.3-gentoo 225842 BLAKE2B 507f389b83e0c84273cdabe39d9d319f34d07bea9ba5fa24d25f640f96f94c89aab806c78885c2a693cf7484dc4cacb73b2d6ed61e04dc9fcee6f6c9d517114c SHA512 0740d3e2830a35fe1f2c2bb0ae62ee0b1951a4dcccb27d19da96113dc48022396f2e5961e897a3546f67538b1b1552f7052639e00c0637a912704e2ebc9683ae
 DIST kernel-i686.config.5.4.21 183910 BLAKE2B 185126ffb85718bb73761d01683def80b6f002d7a7a6eddd8e858a30d8eadc863fb378d83a1cd2ed82b3540337fa66ae44475e31fb41ebc46d77005b6f54e5c0 SHA512 6307afc2295902e44fe65b1cccaa7a0260b295a5f21f1d67ec66197bd972bd3f5675b624f08d9da8b224cb3ec987d5c21cbd743599aeab9ac6214bc651f43476
 DIST kernel-ppc64le-fedora.config.5.10.12 192105 BLAKE2B 889141debb0656a358a3381bae14b5216b982acdfce0bc758f9445c16647807a68a788fb290199c2a1a23627bda1ef4c9405b3f5ac2a4176d1d2b55c71fb7db9 SHA512 3ab0f1401d9f50a61477c71369dede438f575d9d2c3a2f5c2cf36d624c2b59a938efca9c981b075511b3860c983eaaf5e5a9f877d659277f09ceba45edd43770
 DIST kernel-ppc64le-fedora.config.5.15.19 213339 BLAKE2B db6bbc9f402b8b48a2441e39d1a78dc112656ae842bc5594065cfd2ec3f6d462e4bde200e8736a70192af35fb3a5d1fc42683783a5b7620881f3a95bb0bc5f4d SHA512 b43439c24be8fa8bdd17d4c0beece799544ae45b2c289f0202fa5eb7a52dce0165a0cbc924b0decf877582af9688efd675cbfbd2313ff85fcc2c8563bba4b1ad
 DIST kernel-ppc64le-fedora.config.5.19.13-gentoo 213984 BLAKE2B 9abc1d2e03bb34908019dbbc4e54d3d176acddca6e7af72fe73461e60eb249486c4e8a81bfe2515849aa26939d9abef5e981deeaa55605b34bb59552cd3444fe SHA512 d857ce4178950a96ff029c3c9870211424e1c5e95dfef88d25d6d1d517493a6fd95d9d398f42b8a6cf72482b07789be38f674dd4a2b9855da57c8391b0c2708d
+DIST kernel-ppc64le-fedora.config.6.0.3-gentoo 215755 BLAKE2B a70566e48ded1bf85d41b776325f9a850b29e2238fc8e7b9d0ec2ba2ac2c51997d8565473c849ccaf7e2e81be3fe8a80b52c1e8fae48a524e1dc4f8563f5cc07 SHA512 015268d1ee705545f82e297c24ad49aa5f8f75aab5476a2bd177a1a0cc1594a4c2a142797f37517cef0670c7d374fbbf188cdf73e751b4606b41723c428bbe8d
 DIST kernel-ppc64le.config.5.4.21 172003 BLAKE2B b53887cb44f7c378cb3866780f8e556e19fdb02130d3b0df01d97698d2a91f7d90a200012559f288e962935742c3fdb67dfb6711876fad37862fe55cdca5b5f6 SHA512 82df8d0be47e9eb20bd7db570539bb061d0b6e2101dc78a54596cf4d0b4e0c536041449304ff9240b051ee09b342ea336c5645e9a3b66a5dfb96d7778ff86008
 DIST kernel-x86_64-fedora.config.5.10.12 206357 BLAKE2B 0eda9d4f3f973336cabd67c1ac78f100aabde926354743e8dcb7ff84496f0de49210d45f99bc850a2096078b0b4687aa7fd965d999248559506004f2b29dac0c SHA512 b12f43d3c1a52a4915cd73db98874ce9ae6c425672c0f1c19ed1b1101341c868ebf1c9620bef5449752ec0d7342c1ce38fb77779d0f89b9267096a605ebf7a26
 DIST kernel-x86_64-fedora.config.5.15.19 223286 BLAKE2B 239995703c01dcb6d179133dd115bc0a57872c07d7a08afaf4d92cf6d78f0c17b19487b5b399ac7fdde5d460fa7931628147817a569fef2c3a62951c96054bdf SHA512 9bee4aff7e5ef4ada57bee7496aaf47b8fdd5c936c4c9b580660d130db0678eaecdebdbcab0dfcaf5c17a71f6419069840db10f5886806b6fc810f8a3619554f
 DIST kernel-x86_64-fedora.config.5.19.13-gentoo 224246 BLAKE2B 6dd95fc7a8bd38387a3bfd6c00733220b34091961c8437cdac61e4376de8b35529808f3b8e2db91c1a0c90e1115395df153f94107e6f9884a61bf646cb40d25e SHA512 1393e6315581a4934a35f3e66146d014ad154025fbc71245bd4b6e7639952387449b69df41605df8590a4d363a5aab5111b442b1a9f56b4d2996ca416f7e5c23
+DIST kernel-x86_64-fedora.config.6.0.3-gentoo 226517 BLAKE2B 6cdbdd1d285e07a5c8866f90a035feb5d1123c5619005b489341ffdf6a860e253ed2883fea19fee89e22752e1b99a42cc8c14546066254928ec957fe97eef2ac SHA512 758e2674b67efabaa8b49349bcc00b70f69ee24f72a1b194384f0beb1da2ce207738cc8833fc4016029566561fb4f68a984c4e9eaff4ff156991bc7e84e1f4db
 DIST kernel-x86_64.config.5.4.21 184907 BLAKE2B 0eb2b07c14cea7545350fcdf3a94f2a531f0137c502ebda9299cacf44da5385686e2049b480b28bc153c9d413d453cfe682b9655eefe70428cb720f57c7bd200 SHA512 f3b3ee6841555ac3a9cc11536a7d44e1a5a8df2bab14ba341fda7df1ceb0de45cf1c799a1d54a64f2858fd1272d348bb52cf269ffa396878c5402baf2730237f
 DIST linux-5.10.148.tar.sign 993 BLAKE2B 980955d55989336130219d93c49555ea5942c9922fdfb0b11243914a3749cb088c4ff21c7b9703cfaff9a4bd3caaee3bdda76b8f376f42787a37b8c687a5fcff SHA512 37f74ad7ab87ef35dfa11391aba91d635fa5479bf5525721e9fd3e5a8bf2cdf39cc583b6095ebc523e791773326254b125a5f8a2a599c3eee44df9188d657ab3
 DIST linux-5.10.148.tar.xz 120497176 BLAKE2B a2d356139a2549ed9f1bfc56cc0b2d61efea87f3a6e4a369c222820c0f5f36f99c0962fe52754f5d897566fa69cdea739536d2f98fa483ae1d7c7d04f25d3d89 SHA512 9cc354a14eac22cc41a0bcaeff0f6ef0a734713df45b15aefa120fa3eb5d7a6baf0e262cd702113ce37a2440ef826ee9b54117ec3976ad58bc6f5ba5286f755f
@@ -24,18 +28,24 @@ DIST linux-5.15.74.tar.sign 991 BLAKE2B 5f7a422d394ed9942d08569927d746ec5f7ae7d2
 DIST linux-5.15.74.tar.xz 126457328 BLAKE2B bfff9c714c2073444b64ed295293fe98b92a34631826da4c378f2ee15cf866ca844ae9bf659457bb9c4b135803b2db12a1edd68e64134506850748ce24ff0733 SHA512 fe65228eacf7ed9ccbcd96c84a11d5f9c62aee9eefaf7cdbc05bac2d700a4356a8a856d4d756358c28068505903ea419fc03a12a5add1a5890c9adf61fe80b80
 DIST linux-5.19.16.tar.sign 991 BLAKE2B eed8ba71c0c0247a125d8f9babec75d0f9ead0b034123862e0c1ad8a5513ff1ce045cdb3fac7c822bd97b5926c068849aa647fd8d414f3f236baca8825ccd4d0 SHA512 f89d029af39a5b70b37465f91f04915493d3b1a0f2fa42160e7b63261b1639d2b75e395200c5443676b3f2f619014e46fd715ea0f2a1f2f9a2a6c22df73fc972
 DIST linux-5.19.16.tar.xz 131631784 BLAKE2B 401e87fc4172c597228a3d58d95d89a8ce015662928a60bd527e2040786ab368b5b6d9d7f3dfa177f7608baea3b49f786c1d0efd93bb25d642d557b93f3d29c8 SHA512 1ff662424830fbd48ac1d8c1aabd4d11a8eabc284c4fe3fdf803064d4f56d9c1b631a0fb60679bac40a4e05b77d5e6706a8fd52a5e025ef4f1231a6cc84bbbde
+DIST linux-5.19.17.tar.sign 991 BLAKE2B 5f2a7a6e4bdc66f4803b03ba3e9c0b88f5eee798e192db40be092b7da480f326ea3898afe0b461f68e69bfbeb7cd5547529db72cf338ceeab3d111bf1b36ad6f SHA512 30d3a3e76be9327658391912720275c2a63ba1bca193b03989535ce6af1d8fa958a52abbb5ca9b3b614fcec88d547a4a0fa209eb738ed5ee90605517d74bc458
+DIST linux-5.19.17.tar.xz 131698200 BLAKE2B c672df8169c4b237b00759510fa5582089a92129bd60cb712faa94a14070c867a821aee088ccf75df136a728ff71a3fdaa3aaf4baebe9aa62ea8ad15ff5bc76d SHA512 aa1b471be303cbe470df7d8b681144f4352f677bed27b98056477f24c93684f8fc4e45bf91611b38f4798bacd3568b6e4bd3eb7641d618200815953ea05f441c
 DIST linux-5.4.218.tar.sign 991 BLAKE2B 821db66087ca8264ce3499cae2113868341f8ee176964b8dac7a156a62ce399b3dfc1ea4a199a7bb3e2f8d509087397dfb3981bde83226557529af835fcab512 SHA512 3eb5ec1f2ee535c3c6ec9c9ac021d3339a953cbc97bddba178491267a7ff19f2c73d89aa9b7c1dc2b851e27e83e4c5bbe1c67b66ab8a1059bb851cf178fa4af6
 DIST linux-5.4.218.tar.xz 112926060 BLAKE2B 4900ba1d0aabe61d2877d1b6ebda695e8ee5e1a4fd9ae3dab7010435f21a3cbd98fd36b8994f10eee1816b6a6561b958a2da176eeaf67309bf24fd90ff190df4 SHA512 51adf248105706eb30b611496baa7cc35be16857f890ac5ffb031373bf0538b6fdf3440c8b753b0d33aad6ec84ab2ef859585e79e65c470f5b4c9d728763aab4
 DIST linux-5.4.219.tar.sign 991 BLAKE2B 59380b43b19ae0521ea49ffb8aaf275e9b7f6b1317c31f9f8c8a179aedf32a053b8d9bbf4a424dd531dfe48e83c577936eb8968782c4d56a4909111d46054a69 SHA512 71141118cfbfd48a7b3e401bda0e75006efb5c4b935aa201fce2a0a94520ff30680e2db6852d89613d85b17f54e3073f8b6147be2cac27f69b01686759e202d5
 DIST linux-5.4.219.tar.xz 112952984 BLAKE2B 169d050a65f671467c2b874f0049789fe1fc15aec2654abdadc63a23e857408bb029beee6ce36c6048b87e1ed65f41573a56eeb92bb7f1b770aa15c022c5a440 SHA512 3eeffc922a154c44226f87bb55bf80fa24a1d9f5c3b7d58f6da07066795e757344c92c6e2351a30d2f6b5b63bd1f96648b745a1259e7fb9b70e81e069d6e2b43
+DIST linux-6.0.3.tar.sign 987 BLAKE2B 8c1796bdf0b846af4e1cae644930e6220a6ac2b628c6a53f505496457687e03f2afac6c3962fa5b37dd5c930e988589935164fc41d4cbdc36376dc4190d3f660 SHA512 27abba5616b4665ce040066038ad6af3a631208eb17f8273f99e30adf6af0741a4b9e361805eb2f9a9617a5acf05d5eadaf8d53a27a990bcc9497edb7196342a
+DIST linux-6.0.3.tar.xz 133903496 BLAKE2B 8ba900a7b98f22a208234cecc7813c4bd6125a6eb5a424b425c135a2de2780f2760a9d94da8ba3caa429c2ae4a9baf9407570cdc8aa9609e89787ba581a004a7 SHA512 953a4dfe46eeb5f4b7927c3e2af8e053b3a1a50a255f90bc33a7883fbcaa3a349044a2df1560ea2f84dab2668734ccf2cf4597b053950fd28bf07509e12f002d
 EBUILD vanilla-kernel-5.10.148.ebuild 3715 BLAKE2B 43376b8725a469a9f7e98e105b2e7617ee5c663b367b096292bd58e9b66905d1d40a8325714668ba3e04bf1d21d809950198aefab7b63b152c685f08b9bc497f SHA512 4bffc17a9a76ce0fd938ddd272587a294719262af38165686bafaa48a7a543068817b0b5136365e512a0f141bad06d545ded287786afb89df3bcd253280f30ff
 EBUILD vanilla-kernel-5.10.149.ebuild 3715 BLAKE2B 43376b8725a469a9f7e98e105b2e7617ee5c663b367b096292bd58e9b66905d1d40a8325714668ba3e04bf1d21d809950198aefab7b63b152c685f08b9bc497f SHA512 4bffc17a9a76ce0fd938ddd272587a294719262af38165686bafaa48a7a543068817b0b5136365e512a0f141bad06d545ded287786afb89df3bcd253280f30ff
 EBUILD vanilla-kernel-5.10.9999.ebuild 3234 BLAKE2B d1ae98cbcc1aa58bb90e787f61a60a3a1f5936fc7667d2ccf9d441c1445bedeec835e40609c28b586e199adb2ea75b68b01b1422d712eeef6d8129c516afa935 SHA512 304afe6d49b898671901bf8d8ebb380a4adb774d3263ddb19b8797d97708badb281e5cff02ef95392057be52e13004902d59fe5d91f5a2d7db0a734ec91a321b
 EBUILD vanilla-kernel-5.15.74.ebuild 3715 BLAKE2B 5f9721371b3ba0e5498b275fa2ed31fdb6f640e2506d4d246076460f085f33f1850adca9db07260deccd65b92c94488f60625b0f8fdb66d9294ae2a697f16493 SHA512 84eae31a460385f9508ced76a7f3f02be83a2283e6691fe94b56a8e68bacaa4c97604dde3691903195fef01ab5e1f55063421c895aa8d1737adca071aabd9477
 EBUILD vanilla-kernel-5.15.9999.ebuild 3234 BLAKE2B 996eac76e626ce6dc0a984e1edd9a0c0b7e5676c1a7537ec30f49041658600daccef70fbf325611dc1001ab5e73c24f5e107f7d78bc7460b911636c38c13e0f2 SHA512 505cee407fde3af7ba4cd631f743df29a1770396828de0090b1fb371eae3f811754bef70f8f6f61bf8eb2505285fdf93dbfe600d8fadaf5f0878a557388060e8
 EBUILD vanilla-kernel-5.19.16.ebuild 3835 BLAKE2B ba5aed4f0630a972dc9204da9b67184ff1ce8362ff445f469405e05e90a16db3d3dcb79fbbc2ae9867a62ecd518208472024673bfc0fe27b5758fd00d6bf43c2 SHA512 c5567b4c47a5cacd755ceff2d35ca716751f5759d7b13eafd83a4868fb144586bc20393ec2cec3298f19f8e98f9c53670e0692ad792bce507245c84089b25f6b
+EBUILD vanilla-kernel-5.19.17.ebuild 3835 BLAKE2B ba5aed4f0630a972dc9204da9b67184ff1ce8362ff445f469405e05e90a16db3d3dcb79fbbc2ae9867a62ecd518208472024673bfc0fe27b5758fd00d6bf43c2 SHA512 c5567b4c47a5cacd755ceff2d35ca716751f5759d7b13eafd83a4868fb144586bc20393ec2cec3298f19f8e98f9c53670e0692ad792bce507245c84089b25f6b
 EBUILD vanilla-kernel-5.19.9999.ebuild 3354 BLAKE2B 7d153d91d316f3f1a27a4f44d3b0d455182b046d0db44bf34adc00bcee00cda1e23cdd359bc655d8b67c74763cad8364a582c28fc57626e0ffb836ce4eeef369 SHA512 de41900154fc4c6e44b63e68caa6d87c60934acf4453b122103f1e655b10b23c601365af65d1af45246c4fc3cd763ab73bfd828e118398ec5b09d0c5b69d3f08
 EBUILD vanilla-kernel-5.4.218.ebuild 3001 BLAKE2B 2327a3c19157c0658328235c8853a8806b7e10af269041a7ff1d3a8d7b3df4ef767ebf12829b57d32892d9795619e946a574b704004da55b6f8641e71d832e69 SHA512 5068ce6fb368e17c40629eedc4cf78a7a5b9ca50b102d0378fe0022eeaba14ef710da4f5b31c7021b013c7745fcf52c569bc0bb11c8cb3de038a6f150680edfd
 EBUILD vanilla-kernel-5.4.219.ebuild 3001 BLAKE2B 2327a3c19157c0658328235c8853a8806b7e10af269041a7ff1d3a8d7b3df4ef767ebf12829b57d32892d9795619e946a574b704004da55b6f8641e71d832e69 SHA512 5068ce6fb368e17c40629eedc4cf78a7a5b9ca50b102d0378fe0022eeaba14ef710da4f5b31c7021b013c7745fcf52c569bc0bb11c8cb3de038a6f150680edfd
 EBUILD vanilla-kernel-5.4.9999.ebuild 2574 BLAKE2B 6a8f6619bc9a88b8076a80ad6158b8996544b2608a78571107ba0b7be09b5f35add48d99d54ab6a2232f110156df1cbf6f325da036be23c793b4f84bc0f995e5 SHA512 c95bf760e931180ca9cf09c91e7fe05039f2aa2d743ddc8aa3e14d765928d40fcea628754e0177cc66df3fddc0fa2fed54d962e8682c5aaa7fa416f0fe3ac323
+EBUILD vanilla-kernel-6.0.3.ebuild 3833 BLAKE2B ba32739ab7dab9b3a26798a39a2e2cd3f159648f7af56984292364b441ca55995dfa640625eeba053c045fd5143c8b21d1339972370f32ba790e4df78d7082f2 SHA512 a7a19990907b29b121982e245ccf5398468b8d51c5393f6a4fb46496c7e7601531b03c19e41b60d8c290903487d69b282ff4637ba2054e1148035783ea28f26a
 MISC metadata.xml 353 BLAKE2B cd022bd01b289ae703ae6ef6c2539fcfce833206c55e328ba02fc42b360d60f76b1920927b259dbb199724e6d3e7b0f68ba2044680d962d3cd03a973475582ff SHA512 10b10fd24801843108a71ca7d0c27514965b0a15a60da4d9b521fc41493448a1b1685ae3278dbd46cede0d069e51dede402d2c1448c8ae6a7fcfce8acf415bf3
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.19.17.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.19.17.ebuild
new file mode 100644
index 000000000000..43e75eed5fa0
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.19.17.ebuild
@@ -0,0 +1,134 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit kernel-build toolchain-funcs verify-sig
+
+MY_P=linux-${PV}
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+# forked to https://github.com/projg2/fedora-kernel-config-for-gentoo
+CONFIG_VER=5.19.13-gentoo
+GENTOO_CONFIG_VER=g3
+
+DESCRIPTION="Linux kernel built from vanilla upstream sources"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://github.com/projg2/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	verify-sig? (
+		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
+	)
+	amd64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )"
+
+BDEPEND="
+	debug? ( dev-util/pahole )
+	verify-sig? ( sec-keys/openpgp-keys-kernel )
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
+
+src_unpack() {
+	if use verify-sig; then
+		einfo "Unpacking linux-${PV}.tar.xz ..."
+		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
+			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
+		assert "Unpack failed"
+		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	default
+
+	local biendian=false
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm)
+			return
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		hppa)
+			return
+			;;
+		ppc)
+			# assume powermac/powerbook defconfig
+			# we still package.use.force savedconfig
+			cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local myversion="-dist"
+	use hardened && myversion+="-hardened"
+	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
+	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
+
+	local merge_configs=(
+		"${T}"/version.config
+		"${dist_conf_path}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${dist_conf_path}"/no-debug.config
+	)
+	if use hardened; then
+		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
+
+		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
+
+		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
+			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
+		fi
+	fi
+
+	# this covers ppc64 and aarch64_be only for now
+	if [[ ${biendian} == true && $(tc-endian) == big ]]; then
+		merge_configs+=( "${dist_conf_path}/big-endian.config" )
+	fi
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.0.3.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-6.0.3.ebuild
new file mode 100644
index 000000000000..a77bd2fb0699
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.0.3.ebuild
@@ -0,0 +1,134 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit kernel-build toolchain-funcs verify-sig
+
+MY_P=linux-${PV}
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+# forked to https://github.com/projg2/fedora-kernel-config-for-gentoo
+CONFIG_VER=6.0.3-gentoo
+GENTOO_CONFIG_VER=g3
+
+DESCRIPTION="Linux kernel built from vanilla upstream sources"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://github.com/projg2/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	verify-sig? (
+		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
+	)
+	amd64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )"
+
+BDEPEND="
+	debug? ( dev-util/pahole )
+	verify-sig? ( sec-keys/openpgp-keys-kernel )
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
+
+src_unpack() {
+	if use verify-sig; then
+		einfo "Unpacking linux-${PV}.tar.xz ..."
+		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
+			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
+		assert "Unpack failed"
+		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	default
+
+	local biendian=false
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm)
+			return
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		hppa)
+			return
+			;;
+		ppc)
+			# assume powermac/powerbook defconfig
+			# we still package.use.force savedconfig
+			cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local myversion="-dist"
+	use hardened && myversion+="-hardened"
+	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
+	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
+
+	local merge_configs=(
+		"${T}"/version.config
+		"${dist_conf_path}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${dist_conf_path}"/no-debug.config
+	)
+	if use hardened; then
+		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
+
+		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
+
+		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
+			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
+		fi
+	fi
+
+	# this covers ppc64 and aarch64_be only for now
+	if [[ ${biendian} == true && $(tc-endian) == big ]]; then
+		merge_configs+=( "${dist_conf_path}/big-endian.config" )
+	fi
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index 844787a74a6a..42c3a0af875e 100644
Binary files a/sys-libs/Manifest.gz and b/sys-libs/Manifest.gz differ
diff --git a/sys-libs/compiler-rt-sanitizers/Manifest b/sys-libs/compiler-rt-sanitizers/Manifest
index d1bc89233125..624a083db92c 100644
--- a/sys-libs/compiler-rt-sanitizers/Manifest
+++ b/sys-libs/compiler-rt-sanitizers/Manifest
@@ -12,8 +12,8 @@ DIST llvm-project-b34ea582774c057d9bf5591174d683fd3d8aa02b.tar.gz 169735900 BLAK
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
 EBUILD compiler-rt-sanitizers-13.0.1.ebuild 6369 BLAKE2B 4e8a715cd19dd39087fe7d6cad9e30a7e130c69bde12ea382fc748cc152099607c23b75915c644785820ded954eaba31779f7c58b63a71255f9c6b610afcee7d SHA512 f5a680a5de09feecde1a3038ab185cc3b321eb2dc15b5841cd58863323fd6da727307c44127d2af5077ce2b17744ee5d3f8a17dd3bceea71b1dec2a13555dd66
 EBUILD compiler-rt-sanitizers-14.0.6.ebuild 6381 BLAKE2B 010ce621c56c1568eaddeb6f4af6e680f2596106768e3b40bffd3c221df20b565c565793ff14a46b2a96b080a696a9217be0f547c2e85430e9031bd86adc2b90 SHA512 d68b96a7458c8b0d1946523a7c1b20e413de38b7f53bd87b8729103935cdb9ad8fc38863138ba36ffc8da57e0ddcf591c7deeb23fba0d76003adea978b262e37
-EBUILD compiler-rt-sanitizers-15.0.3.9999.ebuild 6363 BLAKE2B 640625391bc73444ed357c25028b641351e5e4f2661271e2d762a9d0a8bbf70a916018c82ddabb25f95679121eea1f35726e011f12d99bb88f1aa6aafef9f5ba SHA512 0c9b3e50c61cb6129fcc20e2fc08f7d32fd2ee180d2bad3e6ed9c7b71819320af9c74457332afac8c14b476d18b47ce7a353813e7bb29e0a568771d314f9c46a
 EBUILD compiler-rt-sanitizers-15.0.3.ebuild 6438 BLAKE2B 365a74be34dd43bb83e1eb3be7e643899baea439b56fca5b497ca3e92e001343de9a03d592b956c279d4994c805a5d975601f5f7750c8d099e2d446ed7e8b2eb SHA512 7a3836f239bf8053a07b38e112056506e3e3da363874fcb70d7a74bc72bea6a0298f08e97f3a73b5d3c1c4af57fdb692567fdff7775e5bcdff01eabfd2f962cb
+EBUILD compiler-rt-sanitizers-15.0.4.9999.ebuild 6363 BLAKE2B 640625391bc73444ed357c25028b641351e5e4f2661271e2d762a9d0a8bbf70a916018c82ddabb25f95679121eea1f35726e011f12d99bb88f1aa6aafef9f5ba SHA512 0c9b3e50c61cb6129fcc20e2fc08f7d32fd2ee180d2bad3e6ed9c7b71819320af9c74457332afac8c14b476d18b47ce7a353813e7bb29e0a568771d314f9c46a
 EBUILD compiler-rt-sanitizers-16.0.0.9999.ebuild 6322 BLAKE2B a6c3057587f87750a2ef204d1504ef86e579bb1c8eccbb366563a4c5899ee9357ed211affe9190c44bfbe397ee54dc7b05622a693acae8aa32ea2b4ef36c33be SHA512 bdf5995cf3973ccf9f5d5dd4baa1a8424fa01d9f95cf44a4c656e66bb98e81359a794b95603f29532675c5247b3f472b1c1fdb79066dfde8e7a383ab5929bf13
 EBUILD compiler-rt-sanitizers-16.0.0_pre20221016.ebuild 6322 BLAKE2B a6c3057587f87750a2ef204d1504ef86e579bb1c8eccbb366563a4c5899ee9357ed211affe9190c44bfbe397ee54dc7b05622a693acae8aa32ea2b4ef36c33be SHA512 bdf5995cf3973ccf9f5d5dd4baa1a8424fa01d9f95cf44a4c656e66bb98e81359a794b95603f29532675c5247b3f472b1c1fdb79066dfde8e7a383ab5929bf13
 EBUILD compiler-rt-sanitizers-16.0.0_pre20221023.ebuild 6321 BLAKE2B b80d3219c693b967278bcf2d8d42b7fb739c956406f1e1e9636c0bc98c8d8c86d6680d76b544d8f950024fa70780a4d6fbc72fc2bb20c6bc191b60ea1ed5d02e SHA512 fb01af84d6d60894627aa77fc484552f3ce1ed7f32d816303923708a023f80dfba724d13463b70c5b795e43ebf4d278f864011b244547e8a9905369c98cec161
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-15.0.3.9999.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-15.0.4.9999.ebuild
similarity index 100%
rename from sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-15.0.3.9999.ebuild
rename to sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-15.0.4.9999.ebuild
diff --git a/sys-libs/compiler-rt/Manifest b/sys-libs/compiler-rt/Manifest
index 9406745763f8..b40e2925eb67 100644
--- a/sys-libs/compiler-rt/Manifest
+++ b/sys-libs/compiler-rt/Manifest
@@ -13,8 +13,8 @@ DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69b
 EBUILD compiler-rt-13.0.1.ebuild 3880 BLAKE2B 83202517f413772d355aa49b5a3bd8b7000c86f6538da1a5ae96de5e84bc7536d0e639b530d1f504dc68b769565504434cc80d25426207b19283b9bc41df3388 SHA512 fe5329aee6c29d408c67af9e9891205fcdf313676780b948975f94ddce31b3f54e68cc041233c81b3005ff94f7685dcc09044f3634760d90e8c18c61f63651c3
 EBUILD compiler-rt-14.0.6-r1.ebuild 4248 BLAKE2B 8efb13b1c805b5178f01036e5ec3b9bf047066fd5d2fe09706bb40e1317fe8d2c3d72f2fd57536fbc5a0eeb6cc1b59d8290b2a342fcf8d6fc5bb8c6092276255 SHA512 52ae7b4f940ecf4f153ec001954589b4ece940e8a6302f5493d6edf5788d9db6f212fb165c7a6e07d1f8ad93e89f19520d0b65b9125a71e922b11503073f9e3e
 EBUILD compiler-rt-14.0.6.ebuild 4030 BLAKE2B 9881380671f25916b7a9356e14b45fd30b7c5cf5263fcf975b0d5ce0333389d519457dabaf1ac8dfc55f5206594335a5f996adcf26880f8a30c8a5ab99c3c391 SHA512 1ec4d79d5d319c5345caa7399c4d4bee5416af3952b9936f119764e17b1c05c25cc818a0c123c8b55ee31503e633999384d0a227a6c84d380cdbdc169f0f43ea
-EBUILD compiler-rt-15.0.3.9999.ebuild 4189 BLAKE2B da1b3444520bbb7a83569b65d7de338678a52b2aec70d29afee47142a268fb76310419dd00d1420445d2f30d3f567cf2bfe9e89cf89261843742094d477a2ef6 SHA512 d29905eca230cdba53aa9d63d1ccb68608b4ca74c4a6c3fbcab60245685c363d93e28ea3dba67f632c85964571da5c812ab8ca6c6be2bf97d06c93c072f75153
 EBUILD compiler-rt-15.0.3.ebuild 4264 BLAKE2B 7411477bbdf896d3cd8bd112b0aaf0fc92b21813b2808474571f90eb1b2bdcd1e617b6262267c3adb90c9993c7f0e5d326aac1430440873cbb2be1644499c156 SHA512 0dd3a2e968a4698bff0d617b710046e824fc219ce33998012cdf0bb62c56e2ff159122e39c0203a042e59c5f7f693dae8ea5dcccd4115871e0bd8b54f01469e0
+EBUILD compiler-rt-15.0.4.9999.ebuild 4189 BLAKE2B da1b3444520bbb7a83569b65d7de338678a52b2aec70d29afee47142a268fb76310419dd00d1420445d2f30d3f567cf2bfe9e89cf89261843742094d477a2ef6 SHA512 d29905eca230cdba53aa9d63d1ccb68608b4ca74c4a6c3fbcab60245685c363d93e28ea3dba67f632c85964571da5c812ab8ca6c6be2bf97d06c93c072f75153
 EBUILD compiler-rt-16.0.0.9999.ebuild 4189 BLAKE2B da1b3444520bbb7a83569b65d7de338678a52b2aec70d29afee47142a268fb76310419dd00d1420445d2f30d3f567cf2bfe9e89cf89261843742094d477a2ef6 SHA512 d29905eca230cdba53aa9d63d1ccb68608b4ca74c4a6c3fbcab60245685c363d93e28ea3dba67f632c85964571da5c812ab8ca6c6be2bf97d06c93c072f75153
 EBUILD compiler-rt-16.0.0_pre20221016.ebuild 4189 BLAKE2B da1b3444520bbb7a83569b65d7de338678a52b2aec70d29afee47142a268fb76310419dd00d1420445d2f30d3f567cf2bfe9e89cf89261843742094d477a2ef6 SHA512 d29905eca230cdba53aa9d63d1ccb68608b4ca74c4a6c3fbcab60245685c363d93e28ea3dba67f632c85964571da5c812ab8ca6c6be2bf97d06c93c072f75153
 EBUILD compiler-rt-16.0.0_pre20221023.ebuild 4188 BLAKE2B 8e254e1281744cab6aeff22c531781dba18cb652d0a09fa81df4cf2aaf7ad9e3b94765f1da8021486fc21b61a585c413be3797c656f08ccbb2003fc6dd35deac SHA512 a71d7386e11b00f623ec1d9f73c57325c2d77c61d8bef5054e6100fca6557a4f7caffed7fea8fe449bbbc9f57b3526e05e0b8824edebcbc1b3f833d67f91695a
diff --git a/sys-libs/compiler-rt/compiler-rt-15.0.3.9999.ebuild b/sys-libs/compiler-rt/compiler-rt-15.0.4.9999.ebuild
similarity index 100%
rename from sys-libs/compiler-rt/compiler-rt-15.0.3.9999.ebuild
rename to sys-libs/compiler-rt/compiler-rt-15.0.4.9999.ebuild
diff --git a/sys-libs/libcxx/Manifest b/sys-libs/libcxx/Manifest
index d1417db45891..8584af352fba 100644
--- a/sys-libs/libcxx/Manifest
+++ b/sys-libs/libcxx/Manifest
@@ -9,8 +9,8 @@ DIST llvm-project-b34ea582774c057d9bf5591174d683fd3d8aa02b.tar.gz 169735900 BLAK
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
 EBUILD libcxx-13.0.1.ebuild 6768 BLAKE2B 71b0f62e35538d718d99e3d43447f98752933868d999bf831969a6940d3a817452789c2044e9ca3bb4d5d1f0c2976fc276c4d10cb018c44e0cc6109095d9c6d6 SHA512 a12023fa135a7945e8088b34421f575cab32bb8ac53f1aeaa61bcf2a7b9fe045a6e21efba168056ef47b165ef3100e382100f910c84dee972017de6355d2e9c0
 EBUILD libcxx-14.0.6.ebuild 6948 BLAKE2B 203e04f4e2603ec0b8e3cd672ca2458c971e4ec3c1d24ea65f85db143561d349d9b7e4b4a58f7c57f5c0caa519e5a79f99f0a76c404aeba47b0bcc683adcb572 SHA512 c1a353dd558c68d439ab66e089e26993e66f1729f7879912413531bbd89318338649dccde1f84a32784de380997d2611d6b7cf86841feb47c3c0c8d67bfe28df
-EBUILD libcxx-15.0.3.9999.ebuild 5238 BLAKE2B bf9c8df5c949f999fdcfad82deb548231c5ef16c25b55c76fcdf3e8fa2e5c3be90fd6ceb4c747fb639de46ef2d192b7317ebf435dfcff44ba9ca5956e59012cf SHA512 519779336613cd1110194d8a7768d2e8c3f286c7ad72da87937bae694f1830dcbec686e2b8afa212b29a3d3406a504fc903e09599a4dc7c99f277ee8f5193a1c
-EBUILD libcxx-15.0.3.ebuild 5286 BLAKE2B 6de2e2e79fdaa428d3b8a3aa667168cd99725c718e1ddfbd2cb4e2d07d263a6a0a5af17f57d3c91e914c2c15183592c643de4fa8fff7df6ffb3674d7f811bc9d SHA512 e17d1c1777dff3c4f7a3608ddcb6194b652cebd2f99f4a93a87041c6d2a1d58840f823c1befc7d262ec2d7f9cb5d097d0b542faddbf509cd16965ecc78a9462e
+EBUILD libcxx-15.0.3.ebuild 5285 BLAKE2B d97bfc8b1190d3c02e5386112d9067ca0684c72709e70a4c72f7d097a867e4956308587ef29b7628e621712662d8c1cf35aae51b70ed844c00440e57041b4bd9 SHA512 a39041c6eb459b9c84c366898d3aed7e33b3dcfe0aee5010ff013194ad93777db91a848f26d4e19d6615c0223403380f60da8b2ae0221a038ee86008852cbf20
+EBUILD libcxx-15.0.4.9999.ebuild 5238 BLAKE2B bf9c8df5c949f999fdcfad82deb548231c5ef16c25b55c76fcdf3e8fa2e5c3be90fd6ceb4c747fb639de46ef2d192b7317ebf435dfcff44ba9ca5956e59012cf SHA512 519779336613cd1110194d8a7768d2e8c3f286c7ad72da87937bae694f1830dcbec686e2b8afa212b29a3d3406a504fc903e09599a4dc7c99f277ee8f5193a1c
 EBUILD libcxx-16.0.0.9999.ebuild 5238 BLAKE2B bf9c8df5c949f999fdcfad82deb548231c5ef16c25b55c76fcdf3e8fa2e5c3be90fd6ceb4c747fb639de46ef2d192b7317ebf435dfcff44ba9ca5956e59012cf SHA512 519779336613cd1110194d8a7768d2e8c3f286c7ad72da87937bae694f1830dcbec686e2b8afa212b29a3d3406a504fc903e09599a4dc7c99f277ee8f5193a1c
 EBUILD libcxx-16.0.0_pre20221016.ebuild 5238 BLAKE2B bf9c8df5c949f999fdcfad82deb548231c5ef16c25b55c76fcdf3e8fa2e5c3be90fd6ceb4c747fb639de46ef2d192b7317ebf435dfcff44ba9ca5956e59012cf SHA512 519779336613cd1110194d8a7768d2e8c3f286c7ad72da87937bae694f1830dcbec686e2b8afa212b29a3d3406a504fc903e09599a4dc7c99f277ee8f5193a1c
 EBUILD libcxx-16.0.0_pre20221023.ebuild 5238 BLAKE2B bf9c8df5c949f999fdcfad82deb548231c5ef16c25b55c76fcdf3e8fa2e5c3be90fd6ceb4c747fb639de46ef2d192b7317ebf435dfcff44ba9ca5956e59012cf SHA512 519779336613cd1110194d8a7768d2e8c3f286c7ad72da87937bae694f1830dcbec686e2b8afa212b29a3d3406a504fc903e09599a4dc7c99f277ee8f5193a1c
diff --git a/sys-libs/libcxx/libcxx-15.0.3.ebuild b/sys-libs/libcxx/libcxx-15.0.3.ebuild
index 8b5e382b8889..92d3ede4f699 100644
--- a/sys-libs/libcxx/libcxx-15.0.3.ebuild
+++ b/sys-libs/libcxx/libcxx-15.0.3.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://libcxx.llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~sparc ~x86 ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv sparc ~x86 ~x64-macos"
 IUSE="+clang +libcxxabi static-libs test"
 REQUIRED_USE="test? ( clang )"
 RESTRICT="!test? ( test )"
diff --git a/sys-libs/libcxx/libcxx-15.0.3.9999.ebuild b/sys-libs/libcxx/libcxx-15.0.4.9999.ebuild
similarity index 100%
rename from sys-libs/libcxx/libcxx-15.0.3.9999.ebuild
rename to sys-libs/libcxx/libcxx-15.0.4.9999.ebuild
diff --git a/sys-libs/libcxxabi/Manifest b/sys-libs/libcxxabi/Manifest
index cd86224d9fa8..69f0de842da0 100644
--- a/sys-libs/libcxxabi/Manifest
+++ b/sys-libs/libcxxabi/Manifest
@@ -7,8 +7,8 @@ DIST llvm-project-b34ea582774c057d9bf5591174d683fd3d8aa02b.tar.gz 169735900 BLAK
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
 EBUILD libcxxabi-13.0.1.ebuild 3468 BLAKE2B 0da66a538e0efab041fa5f56c31a116c9274bec95aa18f10b5759d6347e3e864922207cba0ddc6821eadad4243c247b01869d34f42e34c213f410896f5ac5b8f SHA512 2eaf47c438cae3b024eb64cecedf2643ff2ecbd35610d5cff6fb2f06847af766ff105d4923dfaf2f4d014944f2ef3ac54edd5f7c83e31d49c071ac57f56cd38f
 EBUILD libcxxabi-14.0.6.ebuild 3384 BLAKE2B c7091fc3a025d186909465ea46508b4cc22bfd5bd5156ed7b007c04e5fdb8c80565274ba085ffd5f8bbba2b9182ab3cff0e0c042346f4a04184b0cfd6e5a5d48 SHA512 92f71c9fd82a430c7bb6ecae347b6dff5739c825194731d877dc55f4be302cafeeac66cc2e24b6aa7f0a248af950305628b6ecbf2f6ffc70dce86b6723b75d27
-EBUILD libcxxabi-15.0.3.9999.ebuild 2866 BLAKE2B 00dc8f0473e5a8081727c83e3fc5459dafc7c680a68f7b237be5f3c8da6cee1916748083e3baf4fda71af8b55dfecb97d7a195b35d4958b8376dc7777df328a5 SHA512 f0f14175c68e080b199d8bcb62fa1387e1b6755bd804dc342dcaf671b84d9dfe29cf8a3559acfe0c9308a73e61416944519b94839c736837fd4bea059c91ec91
-EBUILD libcxxabi-15.0.3.ebuild 2914 BLAKE2B ebfb1baccb81d321dca037a620e0b87f5203b1e1a3da68bb8ff7276e23dc435d0effbfa8b8684adf3e41d15d576c6019153ec49ae21ff158b41f4ab9e601fda0 SHA512 822f1e85e15a58fa7d096983aef9cb2b881faf276ac6f133b836c16d783cba3e9950f5976b103ce4bb0ed3c7dfd1409fd3c88bdcd81fda822e7b4a0e2b973956
+EBUILD libcxxabi-15.0.3.ebuild 2913 BLAKE2B f6c5d5c8848d8e7a148f432bc6ccbfe68b67404af9a8f97480dc03321367ccfd30c0e076a99364631fbbaac956a6cc4b0f4004ced02f26bb25957b9986f8f6f0 SHA512 2ddcc790fe36b5724a06e13bea2aef0096e5f6a290cd4791c30efdc9c9c74c834e4497bddb45872d3363eb88b2a758896841fb06636c5b77979e07de151b9e72
+EBUILD libcxxabi-15.0.4.9999.ebuild 2866 BLAKE2B 00dc8f0473e5a8081727c83e3fc5459dafc7c680a68f7b237be5f3c8da6cee1916748083e3baf4fda71af8b55dfecb97d7a195b35d4958b8376dc7777df328a5 SHA512 f0f14175c68e080b199d8bcb62fa1387e1b6755bd804dc342dcaf671b84d9dfe29cf8a3559acfe0c9308a73e61416944519b94839c736837fd4bea059c91ec91
 EBUILD libcxxabi-16.0.0.9999.ebuild 2866 BLAKE2B 00dc8f0473e5a8081727c83e3fc5459dafc7c680a68f7b237be5f3c8da6cee1916748083e3baf4fda71af8b55dfecb97d7a195b35d4958b8376dc7777df328a5 SHA512 f0f14175c68e080b199d8bcb62fa1387e1b6755bd804dc342dcaf671b84d9dfe29cf8a3559acfe0c9308a73e61416944519b94839c736837fd4bea059c91ec91
 EBUILD libcxxabi-16.0.0_pre20221016.ebuild 2866 BLAKE2B 00dc8f0473e5a8081727c83e3fc5459dafc7c680a68f7b237be5f3c8da6cee1916748083e3baf4fda71af8b55dfecb97d7a195b35d4958b8376dc7777df328a5 SHA512 f0f14175c68e080b199d8bcb62fa1387e1b6755bd804dc342dcaf671b84d9dfe29cf8a3559acfe0c9308a73e61416944519b94839c736837fd4bea059c91ec91
 EBUILD libcxxabi-16.0.0_pre20221023.ebuild 2866 BLAKE2B 00dc8f0473e5a8081727c83e3fc5459dafc7c680a68f7b237be5f3c8da6cee1916748083e3baf4fda71af8b55dfecb97d7a195b35d4958b8376dc7777df328a5 SHA512 f0f14175c68e080b199d8bcb62fa1387e1b6755bd804dc342dcaf671b84d9dfe29cf8a3559acfe0c9308a73e61416944519b94839c736837fd4bea059c91ec91
diff --git a/sys-libs/libcxxabi/libcxxabi-15.0.3.ebuild b/sys-libs/libcxxabi/libcxxabi-15.0.3.ebuild
index b97740de2fbf..d8d3f74609d7 100644
--- a/sys-libs/libcxxabi/libcxxabi-15.0.3.ebuild
+++ b/sys-libs/libcxxabi/libcxxabi-15.0.3.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://libcxxabi.llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~sparc ~x86 ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv sparc ~x86 ~x64-macos"
 IUSE="+clang static-libs test"
 REQUIRED_USE="test? ( clang )"
 RESTRICT="!test? ( test )"
diff --git a/sys-libs/libcxxabi/libcxxabi-15.0.3.9999.ebuild b/sys-libs/libcxxabi/libcxxabi-15.0.4.9999.ebuild
similarity index 100%
rename from sys-libs/libcxxabi/libcxxabi-15.0.3.9999.ebuild
rename to sys-libs/libcxxabi/libcxxabi-15.0.4.9999.ebuild
diff --git a/sys-libs/libomp/Manifest b/sys-libs/libomp/Manifest
index b471ce0c01ba..a2ae27ae7eba 100644
--- a/sys-libs/libomp/Manifest
+++ b/sys-libs/libomp/Manifest
@@ -9,8 +9,8 @@ DIST llvm-project-b34ea582774c057d9bf5591174d683fd3d8aa02b.tar.gz 169735900 BLAK
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
 EBUILD libomp-13.0.1.ebuild 3907 BLAKE2B 46ed471cb355b70f78b59faeffbcc5148d47a3b971818c831e7b155f4f0973238fdbfb5f2fa91913fef93e01beed45f42b1158af92e56cd8445c4a8157508bb7 SHA512 13f150c5223689e4d98e16cafa11e44164b177eb68d3df213582b85c5194e7f736143b49b2075f4178689efcfa8320e2b1faf34242c09dbfcda923b443d42741
 EBUILD libomp-14.0.6-r1.ebuild 3917 BLAKE2B 23460d17ef5b7e107d8be1bd1c37028d69fda2e151e7d8f7f0c6d23dc00336f5a503a4e8e692b4203f3e4219fde6f96f9d30d4c7fed0348066f8c603636cc39b SHA512 aa9e9985a1941fe5c33b998d81bfdd838dbe965d5c82e20e366d2cf7a08db24feb2f3f7633740bea45a3685049d1593df6465b8c785b9a87c197402f559b26ca
-EBUILD libomp-15.0.3.9999.ebuild 3339 BLAKE2B 4fb077e0f5195f1c2fef3691aba3e8b674d340df9f3d1de8c9962a03267662bcf55a43af75db6e3ab5121de6c129c7f7514c127ec27c3b940cb2fbbf619788d4 SHA512 49aa1cb488a8e428892dd3b74a82462206e9c11e139b5b9b8e2edca496279c274f81ece0dcb9e71eea43c4e6f99ca4aacd5bdc48e4595743b7f98e7a1f7ae3d9
 EBUILD libomp-15.0.3.ebuild 3405 BLAKE2B e794e2ff98eb12991f899b50750624fa08f6b20dcde51e1be56f3f2c4a0a0e70fc157079fe14147334535b7f8388a704d6b4dd858e94be1368596bd2d333698a SHA512 a89c79b76a3ca6459c50d68949ef73d20e774b54e79dc49644512c58a757a7a5afbbd2ab003302662cf7598199748a4f55afbb3a9803dbf279c3fd82b1edccc8
+EBUILD libomp-15.0.4.9999.ebuild 3339 BLAKE2B 4fb077e0f5195f1c2fef3691aba3e8b674d340df9f3d1de8c9962a03267662bcf55a43af75db6e3ab5121de6c129c7f7514c127ec27c3b940cb2fbbf619788d4 SHA512 49aa1cb488a8e428892dd3b74a82462206e9c11e139b5b9b8e2edca496279c274f81ece0dcb9e71eea43c4e6f99ca4aacd5bdc48e4595743b7f98e7a1f7ae3d9
 EBUILD libomp-16.0.0.9999.ebuild 3444 BLAKE2B fb82f952dc3be9c2b651dc0d26552f1d5b89fbc3eeda67ed7a102a403a462d1e8c2d6d06d3fbf376fc17d4a0b5ada9dc1d1e60b468af5eeb61c597ec04c98dbe SHA512 3c5b094ac77e709b3c55e9fb4e005ec1725faa8be9abe48d1e4ac8eaa56920c5d143f61cc18997bf017c8abb0ac8121671b26dea311a5ac62eba3cd5983d57ae
 EBUILD libomp-16.0.0_pre20221016.ebuild 3444 BLAKE2B fb82f952dc3be9c2b651dc0d26552f1d5b89fbc3eeda67ed7a102a403a462d1e8c2d6d06d3fbf376fc17d4a0b5ada9dc1d1e60b468af5eeb61c597ec04c98dbe SHA512 3c5b094ac77e709b3c55e9fb4e005ec1725faa8be9abe48d1e4ac8eaa56920c5d143f61cc18997bf017c8abb0ac8121671b26dea311a5ac62eba3cd5983d57ae
 EBUILD libomp-16.0.0_pre20221023.ebuild 3444 BLAKE2B fb82f952dc3be9c2b651dc0d26552f1d5b89fbc3eeda67ed7a102a403a462d1e8c2d6d06d3fbf376fc17d4a0b5ada9dc1d1e60b468af5eeb61c597ec04c98dbe SHA512 3c5b094ac77e709b3c55e9fb4e005ec1725faa8be9abe48d1e4ac8eaa56920c5d143f61cc18997bf017c8abb0ac8121671b26dea311a5ac62eba3cd5983d57ae
diff --git a/sys-libs/libomp/libomp-15.0.3.9999.ebuild b/sys-libs/libomp/libomp-15.0.4.9999.ebuild
similarity index 100%
rename from sys-libs/libomp/libomp-15.0.3.9999.ebuild
rename to sys-libs/libomp/libomp-15.0.4.9999.ebuild
diff --git a/sys-libs/llvm-libunwind/Manifest b/sys-libs/llvm-libunwind/Manifest
index 41b3ad11a630..49cfa9ee584c 100644
--- a/sys-libs/llvm-libunwind/Manifest
+++ b/sys-libs/llvm-libunwind/Manifest
@@ -8,8 +8,8 @@ DIST llvm-project-b34ea582774c057d9bf5591174d683fd3d8aa02b.tar.gz 169735900 BLAK
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
 EBUILD llvm-libunwind-13.0.1-r1.ebuild 3772 BLAKE2B 8da1185d1b1c71fe4a84cf068847cdf86f210c181e5f745b3ed05635b8f2824ac7aab931a8066cf199c93553fe4a3a0915972f854af1e09b1a2411f66fee834d SHA512 736810a5a52be3271854a50b476874986618e79fb24022ae3188c68759b31b75071083db9a5c9ab8f9439edff3cf7df2e4a20a847ad330984796ed747eb1cd4f
 EBUILD llvm-libunwind-14.0.6-r1.ebuild 3161 BLAKE2B eba3be4b7bafe6a69329f7f565cf33fe3315949dd3e0a007079e1fb040bc746c9beec20c763c9c10fdc7eb7cd8cfc14053138594dd47db13df51dc3972365639 SHA512 83dbd99c4825aeb0aaeb3910af22717637a1be1ced85972381ea091183ca6ba128900511b26dedfafb4ac492d80ba3cd0982051fd71f5e72375af7e160da1f9b
-EBUILD llvm-libunwind-15.0.3.9999.ebuild 2978 BLAKE2B e1fc6e470239200cea2bd9b84e9e084c204536e1bd2886780849f342452cf6b86a6d4d5baac91d562af632a9bcf298569ff459f24464fabc1e01accdc30e0db1 SHA512 b9e5e37262bd55c9aa776b78bcbab46be96de644ddc182fa6787200e4d6746babb09f42481d61723faec935542f869b10e7ce3af688f36a5086bcd6b235bbeec
-EBUILD llvm-libunwind-15.0.3.ebuild 3038 BLAKE2B 13e59cb5fb42def342fc97b79a9ef44f5c87870b8e393e23c954ca187ca6cc5e0b797546a7e51d9381c1ca9c5608a8ddc32879a5bda8af681426c52a2b71624e SHA512 b3fd2851bb69f5ce9f4ecf813ec9667186d85e97f7e0c1f9db4c0fb8b0ffbdd7866065ac1a855be4592b5ca795623caf4aaf27fae344bc3024efcea5d71b5584
+EBUILD llvm-libunwind-15.0.3.ebuild 3037 BLAKE2B e6e891f992d26cd6456893323d692c32a4764071f06736e34d58fe26f5bc35555d30a4dbc78afdfa5962731e5e544b5ac82c6077e3dc7eaa825351c399a7bfb8 SHA512 ef1779dc7b352784efbb8e3063f94de2679b54e111fd6a9bd4347e6ac55cf0aa55160c1bdc6eacc15599c2323acb8cd0c44f918e926beb57b510fe1bbe1a7704
+EBUILD llvm-libunwind-15.0.4.9999.ebuild 2978 BLAKE2B e1fc6e470239200cea2bd9b84e9e084c204536e1bd2886780849f342452cf6b86a6d4d5baac91d562af632a9bcf298569ff459f24464fabc1e01accdc30e0db1 SHA512 b9e5e37262bd55c9aa776b78bcbab46be96de644ddc182fa6787200e4d6746babb09f42481d61723faec935542f869b10e7ce3af688f36a5086bcd6b235bbeec
 EBUILD llvm-libunwind-16.0.0.9999.ebuild 2978 BLAKE2B e1fc6e470239200cea2bd9b84e9e084c204536e1bd2886780849f342452cf6b86a6d4d5baac91d562af632a9bcf298569ff459f24464fabc1e01accdc30e0db1 SHA512 b9e5e37262bd55c9aa776b78bcbab46be96de644ddc182fa6787200e4d6746babb09f42481d61723faec935542f869b10e7ce3af688f36a5086bcd6b235bbeec
 EBUILD llvm-libunwind-16.0.0_pre20221016.ebuild 2888 BLAKE2B 256d1277c398fbfd6361c7ea7649d486fa7032a4d93bba637154a51c0612e43ae6276f4a653e83edd20dcc8bf903bc3c85930c5efd5f86a25f004e3e7c2120f1 SHA512 38676c41a2b511dd2094a9dee38261278617922f231e653c0c6ed7cbe347952562b3c55523d1282cc184be4c19806516075fe7c05a832d296451f0094530e53f
 EBUILD llvm-libunwind-16.0.0_pre20221023.ebuild 2888 BLAKE2B 256d1277c398fbfd6361c7ea7649d486fa7032a4d93bba637154a51c0612e43ae6276f4a653e83edd20dcc8bf903bc3c85930c5efd5f86a25f004e3e7c2120f1 SHA512 38676c41a2b511dd2094a9dee38261278617922f231e653c0c6ed7cbe347952562b3c55523d1282cc184be4c19806516075fe7c05a832d296451f0094530e53f
diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-15.0.3.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-15.0.3.ebuild
index 9323dc121cae..74722836ef03 100644
--- a/sys-libs/llvm-libunwind/llvm-libunwind-15.0.3.ebuild
+++ b/sys-libs/llvm-libunwind/llvm-libunwind-15.0.3.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://llvm.org/docs/ExceptionHandling.html"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv sparc ~x86 ~x64-macos"
 IUSE="+clang debug static-libs test"
 REQUIRED_USE="test? ( clang )"
 RESTRICT="!test? ( test )"
diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-15.0.3.9999.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-15.0.4.9999.ebuild
similarity index 100%
rename from sys-libs/llvm-libunwind/llvm-libunwind-15.0.3.9999.ebuild
rename to sys-libs/llvm-libunwind/llvm-libunwind-15.0.4.9999.ebuild
diff --git a/sys-process/Manifest.gz b/sys-process/Manifest.gz
index 39da624cdecf..f5dfd456b58d 100644
Binary files a/sys-process/Manifest.gz and b/sys-process/Manifest.gz differ
diff --git a/sys-process/cronie/Manifest b/sys-process/cronie/Manifest
index a80cd7e26655..7d669a4db22c 100644
--- a/sys-process/cronie/Manifest
+++ b/sys-process/cronie/Manifest
@@ -4,6 +4,6 @@ AUX cronie-1.4.3-pamd 231 BLAKE2B d993c025529e817435264c798bec757ead59d77540e1ff
 AUX cronie-1.5.3-systemd.patch 980 BLAKE2B dc11e7e1f072270f24e4ae420c2bde63412ec8d322d65972eb574cab2594388157c1ea4fb9297500de5ba4c32639792e810590e44dbc2650ae5bb5eab11c160b SHA512 a1e9fef4cff7503357785645ee91cccf54dcfd8433ed9d1fd22813849bcb47f0bb6f96b404a66450d865d586041415b480e53ef1599318df32331a657456b92f
 AUX cronie-crontab 476 BLAKE2B 7e2de210328ad714647b9ec50c611573ba166b63f68643aa001f8ca2d2c6e6a5b1300cbd8e1be2ba4374def366698abe6f990673b427e7db4883a9cb74bd06c0 SHA512 0d42a8e749db5c7f057b980678dbfada3dcf1418000168380097032a69a48ab4bc8fa228fb45c65c9c2a1a8d5290da3ca84816963fb7096fd13e293a68fea0c5
 DIST cronie-1.6.1.tar.gz 149913 BLAKE2B 7b563b90f386a8df09398661e2b3ddc1f83d6c0d19290a02c0622be461e1d160218572adf132d634c60ef8fd0a4bb100e830b90e26270c28c75a69591ccc18a6 SHA512 1e095df9670ec25d6629f4cf2cacd82c6c1cb1487a859815a7881a1d130e4f18f9976396f773abae24dadc232166bb6467bbaeac1cb0254209fcadf3530d5e6f
-EBUILD cronie-1.6.1-r1.ebuild 2587 BLAKE2B 1942016c49257749e54d0b13c1fa733cd6574cebeed5f89c80f0f9790f4bed5bbe353604bf22a22a0ca099f43b856062d861ef85cbf419b0e40bc3f4b599784f SHA512 4e9bc4893e734250efc61cc22540a6f197bfcfc82e0a736c25bb12999d1a615c9475fa38b7b79ed8539a5e1770b940b811e7330be950fec444c993d33e7eca53
-EBUILD cronie-1.6.1-r2.ebuild 2558 BLAKE2B 296c0c92c9703d75764af9800233abcb0f59581c8a58adeea9aa15892550f13aa9ab5eaf6bb116ba2caae5694dd0bb4c4f0aa92045b5f460a990f19f71eb648b SHA512 12b6f128ea53d80b5628d25dddfff3822cde4947aad33dabef0295be53cf0eef18d2ee4c4a50bfeacbaa8e87c9a35d2ce18b44f27ddf9325bc8c9f93eea46fc7
+EBUILD cronie-1.6.1-r1.ebuild 2611 BLAKE2B aec8fb9723cf37f4fc9aee4730699a5b148890667d04328c72fdcdfc4e9736a720ca33837ca3e6bc59268b9697f474fe8e5c482748ce5735260329ac05469392 SHA512 7195c78d7f8457afb9215bc4fc417798956a5bb56d199e110e07c8a5f734e8f42bb6111c9df34ec249e53f92a627c831d644f1bc129677ec686443d9e9646e96
+EBUILD cronie-1.6.1-r2.ebuild 2582 BLAKE2B 131d8221c05105e8d0e1ec9bb5d3105a03b0f6487da03de9af62d064303967369875c1a6080d131b7d1a21b08f5f640ce19ceab5895865996965aa2ab724ef6e SHA512 5bf03df820dc9ba2938d7ce955421c769c4939658455e120d349e356aff7c28a69f1ba0ea8aeafdd2a9fd4f19dcbacb15ba4866daae7cb2d9fb41c91f3252d9f
 MISC metadata.xml 821 BLAKE2B cb3c9d002c660aea2d9ebff9c48f32ca42e2dfb74b42dbd814b3acdd4afa71a9f6bf28fcd6df44492246b64f52a0537e5c24238bfd813f5b66c274242d4bc63e SHA512 2016c15fc50cb8766a8e701853f56f2823ee730e6cb0df122ba74526d0c0fa6909a3ed945a3a405d2d1c35933c4b80b44a9158ced8d8e68372954a740413dfe5
diff --git a/sys-process/cronie/cronie-1.6.1-r1.ebuild b/sys-process/cronie/cronie-1.6.1-r1.ebuild
index 97bb68713f7a..86e6ae54c2a8 100644
--- a/sys-process/cronie/cronie-1.6.1-r1.ebuild
+++ b/sys-process/cronie/cronie-1.6.1-r1.ebuild
@@ -13,8 +13,9 @@ LICENSE="ISC BSD BSD-2 GPL-2"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="+anacron +inotify pam selinux"
 
+BDEPEND="acct-group/crontab"
+
 DEPEND="
-	acct-group/crontab
 	pam? ( sys-libs/pam )
 	anacron? (
 		!sys-process/anacron
@@ -23,7 +24,9 @@ DEPEND="
 	)
 	selinux? ( sys-libs/libselinux )
 "
-RDEPEND="${DEPEND}
+RDEPEND="
+	${BDEPEND}
+	${DEPEND}
 	sys-apps/debianutils
 "
 
diff --git a/sys-process/cronie/cronie-1.6.1-r2.ebuild b/sys-process/cronie/cronie-1.6.1-r2.ebuild
index 18db278ec2e5..9c847ae19872 100644
--- a/sys-process/cronie/cronie-1.6.1-r2.ebuild
+++ b/sys-process/cronie/cronie-1.6.1-r2.ebuild
@@ -13,8 +13,9 @@ LICENSE="ISC BSD BSD-2 GPL-2"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="+anacron +inotify pam selinux"
 
+BDEPEND="acct-group/crontab"
+
 DEPEND="
-	acct-group/crontab
 	pam? ( sys-libs/pam )
 	anacron? (
 		!sys-process/anacron
@@ -23,7 +24,9 @@ DEPEND="
 	)
 	selinux? ( sys-libs/libselinux )
 "
-RDEPEND="${DEPEND}
+RDEPEND="
+	${BDEPEND}
+	${DEPEND}
 	sys-apps/debianutils
 "
 
diff --git a/sys-process/parallel/Manifest b/sys-process/parallel/Manifest
index a5bcc6614c15..b8a220981bf7 100644
--- a/sys-process/parallel/Manifest
+++ b/sys-process/parallel/Manifest
@@ -1,10 +1,10 @@
-DIST parallel-20220722.tar.bz2 1851613 BLAKE2B 76d9edddac82b5077d6416cf629dc02d427c93a42907f84a467a45805efe99154eaa175755a4a4c9a9d86df480842daef7064b1d324671eeb6c08fdbab3e7b70 SHA512 b3bee9861ad9537055f00ebc7a1593697cb9f53167bd79fb612b9567a1d19edb7b770e5e68cee410bf2a146f3c48608e7a47254972f28ca0418d725b8d2088d3
-DIST parallel-20220722.tar.bz2.sig 2080 BLAKE2B cf71695489b67cfc458e361db3dd5d195a12e127a7b48f8fbc6ce557ffc2d9e30137a462dae0f99361194313997ebc414cb1d3242a84bddb5dc233a9cc9721fb SHA512 5ade3326fa66ac544698cb43b9225bde9ccb77bae0e938c9d7e9f1ea27d254c2bb3a49a3601c430f31a4c651fc52dea9fee909cbbbf0d5c5138543358671c94d
 DIST parallel-20220822.tar.bz2 2389888 BLAKE2B 95e94064eaecf661a46d45f33f61c51c3873b38935adcb9705678f44e4583d4338d9914ca2b5be87f3551148ad9889cb11beda11ac5771d840337d5a1d33c1c4 SHA512 d2dc3b2e59eb777e24c4564c7a9b8460ae85d587b32aa50358583d90f1beea8f321c5e93bd6adf34731a447d7fc22942c81e27a75a4b0b02616af2887be6db12
 DIST parallel-20220822.tar.bz2.sig 2080 BLAKE2B 12b41f979f8a8c69c370cb1c0ff3687d1d7f12447060f3174d6379ed50caa8fb08682a71f7591bfb73e7f975a2f28cceda8e00a646afc5467caed4664767e6a8 SHA512 f0c6e1ddb08751da577d27a9cc1be725bfd7fce6fecb3b48f0fbddae42d5fdef264da36530cdf722bd19fa19308a77d9f7d16703f9f54697e60c4ea03286f58d
 DIST parallel-20220922.tar.bz2 2407177 BLAKE2B 5cdb9daef3731a0de9a845f9686d506abe378973992953feec0b3502498adb0b20ed6ed13795748180555fc3557127dbb5b847030432d7b0039ea2f56818cea4 SHA512 8a1b8b0e3cd5548ceb32b3dd160303e5efd2ed3c4bce09abc09e17437c17b3688324a6b257893e838fb19ca0d55d08288ce2898098346dd78298ffb04a3c9536
 DIST parallel-20220922.tar.bz2.sig 2080 BLAKE2B 79878e925776020308d6b0d981f3c83242f55c05fde5468b4da283ce5a2619edc7def6ad9f54287e16c948744ff37ac3934012b031844e0ad3bf7e4d8147857d SHA512 384cf27a7160327d31933b0a45b0eb340ae3b321c98463a2a9733db82aaf5cca9971dbdaffe223cca24daeb14bc87b33bbfd879d9715cd2e042cd3f44dec8bff
-EBUILD parallel-20220722.ebuild 905 BLAKE2B 97af6a0e201cef8e35b18d39385f6e631d0f8272935f2f749e445f0464bfcfa7123913b85106b682ad7bba8436c655e8c4e8f5a804b59223e51ed842275a7dd4 SHA512 13dc53c700f0651ba79142c42402304b37f28da042eebf7f8771f3074e346c4516820f4f451d5186404ba3daeb4eb9a9a5c7e0dbbfb5d01e3c144a1768363af8
+DIST parallel-20221022.tar.bz2 2409374 BLAKE2B 715ea3b0dbd103a7f37fc7f8a6e28d039393fa562f85283e7aba0e8e64dc673101d561eb1290a69ed9daf9876b40c9b8855d8c72ac35af0323298e9a54594272 SHA512 13746e51435271b702f4c581ece70689b1fb8d45115deb1543dc325a5026f4f23095fb85656314d7f7405e44e523a9e6629eba8ed37751f9c8e008354c76b2f9
+DIST parallel-20221022.tar.bz2.sig 2080 BLAKE2B b2b33ff702a718184eae78e32c3c9447a49d3025d930368d400a93719aef2b2a2edde95a26acd69c95407dd98f7be4b0a447612bf2d79915db89dca17cadec03 SHA512 40f14494db66274e121ffa6ce1668c0e9bc70c0fdb11fd91fe8c1bb035d9417add50fa49dbaa0f649ec2b2fdf7f4eb85d103727b2fff7ee0fa74e2df5d4dcb82
 EBUILD parallel-20220822.ebuild 905 BLAKE2B 97af6a0e201cef8e35b18d39385f6e631d0f8272935f2f749e445f0464bfcfa7123913b85106b682ad7bba8436c655e8c4e8f5a804b59223e51ed842275a7dd4 SHA512 13dc53c700f0651ba79142c42402304b37f28da042eebf7f8771f3074e346c4516820f4f451d5186404ba3daeb4eb9a9a5c7e0dbbfb5d01e3c144a1768363af8
 EBUILD parallel-20220922.ebuild 909 BLAKE2B 6874c466cbf7beae2e851b4f4cf0d2668ea46afce7e362a9a00b9bec552eb5d37be05e93cbced0896bd69da2c09ab076cb546f5ff8f1d5570ff57528e19cba29 SHA512 aa19025c50738d5d73070c34d88a538511a6924264b04193d958868d5871b2b96f62bd01dd2e018dac52060a9a4be058922f8609810eabf35292b3350107b292
+EBUILD parallel-20221022.ebuild 909 BLAKE2B 6874c466cbf7beae2e851b4f4cf0d2668ea46afce7e362a9a00b9bec552eb5d37be05e93cbced0896bd69da2c09ab076cb546f5ff8f1d5570ff57528e19cba29 SHA512 aa19025c50738d5d73070c34d88a538511a6924264b04193d958868d5871b2b96f62bd01dd2e018dac52060a9a4be058922f8609810eabf35292b3350107b292
 MISC metadata.xml 1078 BLAKE2B 190d48305a18559658e87132e6be2831db9d8c314b29cf4e5808b6308cf86cb5d46a1b80214fcb8f45f12578a18ebefad8b0b91912c9fbb68126be66ae62ad55 SHA512 80b649870b5b9e12b436f82ce8fd3efad8b3e251c919a90b8c32945332bb3dd88e5bfc96acca6a12a38f2d6e1ce63effa593ef975c8109bad3a85d2d69b2ed98
diff --git a/sys-process/parallel/parallel-20220722.ebuild b/sys-process/parallel/parallel-20221022.ebuild
similarity index 90%
rename from sys-process/parallel/parallel-20220722.ebuild
rename to sys-process/parallel/parallel-20221022.ebuild
index 35785e7adb17..5f26fa471823 100644
--- a/sys-process/parallel/parallel-20220722.ebuild
+++ b/sys-process/parallel/parallel-20221022.ebuild
@@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.bz2.sig )"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 RDEPEND="
 	dev-lang/perl
diff --git a/virtual/Manifest.gz b/virtual/Manifest.gz
index 1819970f75b3..e33ae1dc4d28 100644
Binary files a/virtual/Manifest.gz and b/virtual/Manifest.gz differ
diff --git a/virtual/dist-kernel/Manifest b/virtual/dist-kernel/Manifest
index 50a9e22cb832..92e0b0318141 100644
--- a/virtual/dist-kernel/Manifest
+++ b/virtual/dist-kernel/Manifest
@@ -2,6 +2,8 @@ EBUILD dist-kernel-5.10.148.ebuild 399 BLAKE2B 69c219977a0039ac43c6d4915c2328768
 EBUILD dist-kernel-5.10.149.ebuild 399 BLAKE2B 69c219977a0039ac43c6d4915c2328768340b1aed5cf30564cc284912cf114713e2065633f0abdf195c5384b26b791f124259189a2bd691abe82847437c02ae9 SHA512 aa0ef63357b18176f14bc297ad6099177c279ba4748115ae985ae2d4ce6270d00965d5297f77b703c71acc25b2595a77740b62b9f531aeddba4b36c704e6ed24
 EBUILD dist-kernel-5.15.74.ebuild 399 BLAKE2B 69c219977a0039ac43c6d4915c2328768340b1aed5cf30564cc284912cf114713e2065633f0abdf195c5384b26b791f124259189a2bd691abe82847437c02ae9 SHA512 aa0ef63357b18176f14bc297ad6099177c279ba4748115ae985ae2d4ce6270d00965d5297f77b703c71acc25b2595a77740b62b9f531aeddba4b36c704e6ed24
 EBUILD dist-kernel-5.19.16.ebuild 410 BLAKE2B 4fb6bcce0ba2d9710cc7a84d98203b5460c25c122aa052270a1c6c08a3201df47704fb9a2421f7894150830b1433a36137e8446f5d70749bdc7ff70678903be6 SHA512 40f1d6476b3076c1f5983bc08d1d5bd236d594a749e5a9147d7201d8b146d66255156b724d80e6af6ad7615c789f82fac3a432b97890c2cac2c062a6e3e7c0fe
+EBUILD dist-kernel-5.19.17.ebuild 410 BLAKE2B 4fb6bcce0ba2d9710cc7a84d98203b5460c25c122aa052270a1c6c08a3201df47704fb9a2421f7894150830b1433a36137e8446f5d70749bdc7ff70678903be6 SHA512 40f1d6476b3076c1f5983bc08d1d5bd236d594a749e5a9147d7201d8b146d66255156b724d80e6af6ad7615c789f82fac3a432b97890c2cac2c062a6e3e7c0fe
 EBUILD dist-kernel-5.4.218.ebuild 388 BLAKE2B 2cdbd973ff8c248bfe49420683c3040deb65612b315e212e61657b071338e9e54b321a9167467da27a04f185d9e8c4f38142f5195a8a9d658c2a464f76c0ee49 SHA512 164347601db14a749e61850cc9407485f8581a05efca57df2d57561ba467184728373f7ef5cf5b956bc695274814a4880ab3556b6e71187ae0050cf6bd228a11
 EBUILD dist-kernel-5.4.219.ebuild 388 BLAKE2B 2cdbd973ff8c248bfe49420683c3040deb65612b315e212e61657b071338e9e54b321a9167467da27a04f185d9e8c4f38142f5195a8a9d658c2a464f76c0ee49 SHA512 164347601db14a749e61850cc9407485f8581a05efca57df2d57561ba467184728373f7ef5cf5b956bc695274814a4880ab3556b6e71187ae0050cf6bd228a11
+EBUILD dist-kernel-6.0.3.ebuild 410 BLAKE2B 4fb6bcce0ba2d9710cc7a84d98203b5460c25c122aa052270a1c6c08a3201df47704fb9a2421f7894150830b1433a36137e8446f5d70749bdc7ff70678903be6 SHA512 40f1d6476b3076c1f5983bc08d1d5bd236d594a749e5a9147d7201d8b146d66255156b724d80e6af6ad7615c789f82fac3a432b97890c2cac2c062a6e3e7c0fe
 MISC metadata.xml 291 BLAKE2B f8eaa7c5aaced8dad269f9939139bcdd32c64dcc4ebff2b0b41dea61de5aed39723d73721bc44c2bee64717de093b97dc326037a335616caada3ea857c98fb07 SHA512 4fb007791c48eddbb1ee30cde6c1618ef67fbe62a29f3b805a7224818c34ce986b6e3d9378ab500875e012e9ea48663809204d69a410b23d12925f11ada333ca
diff --git a/virtual/dist-kernel/dist-kernel-5.19.17.ebuild b/virtual/dist-kernel/dist-kernel-5.19.17.ebuild
new file mode 100644
index 000000000000..c2caefd6cfca
--- /dev/null
+++ b/virtual/dist-kernel/dist-kernel-5.19.17.ebuild
@@ -0,0 +1,19 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Virtual to depend on any Distribution Kernel"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	|| (
+		~sys-kernel/gentoo-kernel-${PV}
+		~sys-kernel/gentoo-kernel-bin-${PV}
+		~sys-kernel/vanilla-kernel-${PV}
+	)"
diff --git a/virtual/dist-kernel/dist-kernel-6.0.3.ebuild b/virtual/dist-kernel/dist-kernel-6.0.3.ebuild
new file mode 100644
index 000000000000..c2caefd6cfca
--- /dev/null
+++ b/virtual/dist-kernel/dist-kernel-6.0.3.ebuild
@@ -0,0 +1,19 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Virtual to depend on any Distribution Kernel"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	|| (
+		~sys-kernel/gentoo-kernel-${PV}
+		~sys-kernel/gentoo-kernel-bin-${PV}
+		~sys-kernel/vanilla-kernel-${PV}
+	)"
diff --git a/www-apache/Manifest.gz b/www-apache/Manifest.gz
index 00600f04292f..6b536b6b9c69 100644
Binary files a/www-apache/Manifest.gz and b/www-apache/Manifest.gz differ
diff --git a/www-apache/mod_h2/Manifest b/www-apache/mod_h2/Manifest
index 043775ecbc44..61799676c750 100644
--- a/www-apache/mod_h2/Manifest
+++ b/www-apache/mod_h2/Manifest
@@ -1,7 +1,5 @@
 AUX mod_http2.conf 154 BLAKE2B b7d38cff9c5b4248d43aa1be55ec4b90fa197213ddd2a8ac3409f69f8e31a7e0a8eb14aab4f2abe1d7ec833896d950d3878020e05100f83ae63a3823b0e91b9d SHA512 85b20350c8abb947c91e2cb462d4cd62f502e6eede3bddd5c10502b61a24396bec57c15d4419d31d4afc857053c1fb2606392023527b7eceea0b10978ce170e5
-DIST mod_h2-2.0.10.tar.gz 681662 BLAKE2B f4a8f1947881e1913bb45723a4e95ce12ecc8a113b837082abfba1fda278c1de026f45ca60a8b80dfab857ccdb2f2f00b4313672674cd6713f29bf64b26141b4 SHA512 4ca0ef69bd367625846e4b7b9967c9ab112f17b6bd31db5d61bc7315fab0294551dcf36845f2aabfa6944dd25a34dd0137c63ba0a969913c4d65a10854062a9e
-DIST mod_h2-2.0.9.tar.gz 679900 BLAKE2B 56cdef908cc5f95b860b4603122c0e7a09eddb8ae8c5f3173aef90971324810b8a9cbed778eb8ff5510f6a1d9cf101ee6d845631dc6b59e90f559cf462bc150e SHA512 68007181bca0c250c21be4f35fbc90be15bac4b74f32ef537c52ef4a1adc6619d7925e20e5562bfce182b5bc12159382a402f3aad7b94ac174c5b80c948a73c9
-EBUILD mod_h2-2.0.10.ebuild 935 BLAKE2B 6c4ebc185351916c2a983f59c52c4c207b76f283068cd7a7de81c973e8c245112186a96b0e0815ea82adadf6f27301b10c6e38ac826873b5704f7f7f9246ab5b SHA512 1de444a765a898fc3f8203c8f5d4d441379375cfc59575403b7285e337f4f4f594d30242d56ec2376486d4567feed96795a57c7e6815d7de4c275ba25a1832aa
-EBUILD mod_h2-2.0.9.ebuild 935 BLAKE2B 6c4ebc185351916c2a983f59c52c4c207b76f283068cd7a7de81c973e8c245112186a96b0e0815ea82adadf6f27301b10c6e38ac826873b5704f7f7f9246ab5b SHA512 1de444a765a898fc3f8203c8f5d4d441379375cfc59575403b7285e337f4f4f594d30242d56ec2376486d4567feed96795a57c7e6815d7de4c275ba25a1832aa
+DIST mod_h2-2.0.11.tar.gz 681879 BLAKE2B e49de5c117c61fc462d6556602f6f975f61754feba6b33f331f391612d8bd447cf2ee8f546e6a5cc6dd766daee0b6678865fbf3e3ed5d670bf67008d14d337ad SHA512 b0dd3ac8e179b78141b2c523a79d9d790588b13988b853a91d99f0f30e4fe0207e17b7dd333d178450ddf4784dedd0fb88d3fd46b96272aa8af6ac7a38fb8d00
+EBUILD mod_h2-2.0.11.ebuild 935 BLAKE2B 6c4ebc185351916c2a983f59c52c4c207b76f283068cd7a7de81c973e8c245112186a96b0e0815ea82adadf6f27301b10c6e38ac826873b5704f7f7f9246ab5b SHA512 1de444a765a898fc3f8203c8f5d4d441379375cfc59575403b7285e337f4f4f594d30242d56ec2376486d4567feed96795a57c7e6815d7de4c275ba25a1832aa
 EBUILD mod_h2-9999.ebuild 935 BLAKE2B 6523bf0f4b1a12a823a7a1458046151b7ea52e4e68396307c16c095d9f17201fb93e3dfe94cfb1f72b798ea5eb978d3506e89a647da3a071073f8c4458c83ea7 SHA512 fac393c1667d1c161ea2255f08185975f5863165485184835e9aa4da497074c288783fdd66b60dab0bf95364e1e58744614951bff4f59c2c81ef4a70abc7b25b
 MISC metadata.xml 326 BLAKE2B 200b47b41409bd7167132c55b5e77b5efa2ec18859520ea38d61a625a6e68bbb1cb0095dda3fd7d273e17114e7cc0ff2fe5c1bbb66ea3a90b4796490fc04a2e8 SHA512 6d45faf84382555d53dc9f38f8d7a23454d763025bbb345f51bece78b36287372d86e173c894038839092adce210e444389b8c41644f44bce0c912880d788080
diff --git a/www-apache/mod_h2/mod_h2-2.0.10.ebuild b/www-apache/mod_h2/mod_h2-2.0.11.ebuild
similarity index 100%
rename from www-apache/mod_h2/mod_h2-2.0.10.ebuild
rename to www-apache/mod_h2/mod_h2-2.0.11.ebuild
diff --git a/www-apache/mod_h2/mod_h2-2.0.9.ebuild b/www-apache/mod_h2/mod_h2-2.0.9.ebuild
deleted file mode 100644
index 34f8a15777b3..000000000000
--- a/www-apache/mod_h2/mod_h2-2.0.9.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit apache-module autotools
-
-MY_P="${PN/h2/http2}-${PV}"
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/icing/mod_h2.git"
-	inherit git-r3
-else
-	MY_PV="${PV/_rc/-rc}"
-	MY_P="${PN}-${MY_PV}"
-	S="${WORKDIR}/${MY_P}"
-	SRC_URI="https://github.com/icing/mod_h2/archive/v${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="HTTP/2 module for Apache"
-HOMEPAGE="https://github.com/icing/mod_h2"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="ssl"
-
-RDEPEND=">=net-libs/nghttp2-1.0
-	>=www-servers/apache-2.4.48[-apache2_modules_http2,ssl?]"
-DEPEND="${RDEPEND}"
-
-need_apache2_4
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_compile() {
-	default
-}
-
-src_install() {
-	default
-
-	APACHE2_MOD_DEFINE="HTTP2"
-	insinto "${APACHE_MODULES_CONFDIR}"
-	newins "${FILESDIR}/mod_http2.conf" "41_mod_http2.conf"
-}
diff --git a/www-apache/mod_qos/Manifest b/www-apache/mod_qos/Manifest
index 39163e2dda59..0016aaf76d11 100644
--- a/www-apache/mod_qos/Manifest
+++ b/www-apache/mod_qos/Manifest
@@ -6,5 +6,5 @@ DIST mod_qos-11.72.tar.gz 1283276 BLAKE2B 1769a7198f5569b2c205a0939928f6949e950d
 EBUILD mod_qos-11.66.ebuild 1141 BLAKE2B 4c08f022489736efcf3833b70c6ae90663ccb34bbed965e14b55e4c028c039e1e438618ebd153eca1e22c2b0f1a541a68c2383d4b80d8cbb7bd549a766bb6f06 SHA512 54ab558430ec323df724e4f4d2a2c0019c94f97d656b1d75107b0e1ac0a905fe4cce2422f28d79342aae2b41f7466461fd6480518a0d6d89c3396f26dedfab4e
 EBUILD mod_qos-11.70.ebuild 1142 BLAKE2B 8b9f5e9626719ec8390b401df2b9f17a00231cad9135c5a107f9e965a24f6823c60d99faec0a6dcaecd18a957ac1930078f9937d3694fa66edede3fd960e34ca SHA512 aea1e1ffaddbb25679e7815e1ad48f76cc8ab59606c20beaf8dcfe54640c9a939f2dd864550911d0257554ad39f529fa9a09bead62e2ab04d029fefc8fbe9887
 EBUILD mod_qos-11.71.ebuild 1142 BLAKE2B 169c4a162118afb590a56a8ad230a273820c2129a9e207843a4565701ba37bf4e46d2f1e7b25db049fcef70a9c106a31cd21437f52954f3d829d185056028d9b SHA512 007b46552dc1f398600ece4d6b6105a4f7ccbd7db88aef19afcf05c64cfa28da4fa7467225d45d325adbec90f6cd3d4a30b7232578b819de97bbb9ca1fc26d1d
-EBUILD mod_qos-11.72.ebuild 1142 BLAKE2B 169c4a162118afb590a56a8ad230a273820c2129a9e207843a4565701ba37bf4e46d2f1e7b25db049fcef70a9c106a31cd21437f52954f3d829d185056028d9b SHA512 007b46552dc1f398600ece4d6b6105a4f7ccbd7db88aef19afcf05c64cfa28da4fa7467225d45d325adbec90f6cd3d4a30b7232578b819de97bbb9ca1fc26d1d
+EBUILD mod_qos-11.72.ebuild 1141 BLAKE2B db2e5f9e9eb28d23d1d14a9d248dbef49860cce6431fba53f4592104fd8830d369c9e42752fd4435e7955ed8d9771316f75e79cf79c2d1aeeedd6459a4662b09 SHA512 6dd74da124ae7de36b05f88499d05f8918812cf77c5e4bef3987f7e1937a81e2d523064d7a7a59afa4362b9ff2d77d448fede6bca70cd65d7c288784802eb06c
 MISC metadata.xml 326 BLAKE2B 469e74aa98baf0a4789743501b566d233d6072595c29c91ef4cffb4a9e4a986dde186cef2326e5b1e02d57a69f49b9dcf9fd045c857a5627f68f50787cd6d072 SHA512 bd08a8ffbee3d67a6b5a81e615ad0bf161204027e91ae69bd5a541a2d76f0ec52ca7405647d03d2ed3b51c756fb16d0386c97b1bab8be52a1b3803f0b2c301dc
diff --git a/www-apache/mod_qos/mod_qos-11.72.ebuild b/www-apache/mod_qos/mod_qos-11.72.ebuild
index a6cc2a461250..e440a61cc67c 100644
--- a/www-apache/mod_qos/mod_qos-11.72.ebuild
+++ b/www-apache/mod_qos/mod_qos-11.72.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/mod-qos/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 RDEPEND="
 	dev-libs/libpcre:3
diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index 7d6da201c348..847b946ee028 100644
Binary files a/www-apps/Manifest.gz and b/www-apps/Manifest.gz differ
diff --git a/www-apps/cgit/Manifest b/www-apps/cgit/Manifest
index e51ef32d8995..e4240a90abf9 100644
--- a/www-apps/cgit/Manifest
+++ b/www-apps/cgit/Manifest
@@ -3,5 +3,5 @@ AUX postinstall-en.txt 1847 BLAKE2B 20dab86a97dc42b4b6c16db6d72a3bd74a2ad2d0948a
 DIST cgit-1.2.3.tar.xz 90632 BLAKE2B 594a9b2ae0b449e0ef090f428f955cc02833f5f5b1e4d6dc8c737daa565d01ba6840933c0bdc53d4eb683b2f44e2fae885ddd020cfb2de38141a870a6eae2380 SHA512 58f9bb644b07be49dc51f3ef30a3d0e53699cede3c06b1d6920f3874fe846c83dd2589632aa84357b70ea2d60272448409aa1b892f405d14dd6745f5559b4504
 DIST git-2.25.1.tar.xz 5875548 BLAKE2B 582da3d4ac996d7b9ce6cf505661496ab1a2cd061f058745350498121956b33d79739b567fb5fea0b4e298303261256034aa0b8da0b842feab04ae67a7d5b142 SHA512 15241143acfd8542d85d2709ac3c80dbd6e8d5234438f70c4f33cc71a2bdec3e32938df7f6351e2746d570b021d3bd0b70474ea4beec0c51d1fc45f9c287b344
 EBUILD cgit-1.2.3-r100.ebuild 2383 BLAKE2B 900ad85af0923fb039dd32531370860a52717bb8ba77822e028ac8b664cd0673964425a7d086ad2eba28d873604147e6f0aa143ab729ce36ac5d8ce2de4f7590 SHA512 df5bdbdb0e7c27de5414685f836dab07df25c7723d57e827c874f482ce09ae0b9feb47cbb188eace40afdaaffec52730853df42a00bc3a5753904d63fbfe02da
-EBUILD cgit-1.2.3-r201.ebuild 2788 BLAKE2B 3f5f64b648887db97b3ba436e41c612dcc90ede9c9d33fe3b54ecd9695f2b2c70a7f4c38e673afc7ea62561522307462482fdc073ad7007b18bd930a00a79924 SHA512 895e5af4cf47633ddc878f10c31ffc45ce257d0001aebe2584100f43847f2533d76cde46ad54b3e0ec327a627035758eb071a47b0222cbc8ddcaba941dabf2e0
+EBUILD cgit-1.2.3-r201.ebuild 2795 BLAKE2B c77572ad42dda4b43f71a0e7b842d8307ad876d4bc304389f0a64276abf24ea0fd277f9ae46c11104c69eb0ac2a993f72ef0c1d081ab4714869f0c2f36007502 SHA512 9847f1fc346fae27c7eaca43298dc4aeab7f422120ad4afacf20c17462b91e9771ceaa12f784f56e25f1e5961f6c0e3c2b39822edcc0fa54c25fa323fd3691e5
 MISC metadata.xml 582 BLAKE2B 581c8c3d61029e5857f51951bff4df8b71f0a01964a5bb822c06969d219b852f74bc56ced4f7434356cdf67b4c6dba6cb3ad1732875a7a1e62b36880c83d94c7 SHA512 bbc7e8dbd323908b9b03597a884a20a7d6d820b757fa912951bdc700ef2072880ff2412c5dcb724420e7d288e772e9f88aded81b981c47b72be4e9fa8c23cd9a
diff --git a/www-apps/cgit/cgit-1.2.3-r201.ebuild b/www-apps/cgit/cgit-1.2.3-r201.ebuild
index 579c8c34abcd..e897bc2878e1 100644
--- a/www-apps/cgit/cgit-1.2.3-r201.ebuild
+++ b/www-apps/cgit/cgit-1.2.3-r201.ebuild
@@ -22,7 +22,7 @@ SRC_URI="https://www.kernel.org/pub/software/scm/git/git-${GIT_V}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm x86"
+KEYWORDS="amd64 arm ~riscv x86"
 IUSE="doc +highlight +lua test"
 REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} ) ${PYTHON_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index 2041356eb6e7..d355e3ff742f 100644
Binary files a/www-client/Manifest.gz and b/www-client/Manifest.gz differ
diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index f3e66e89ac66..1edd30a55131 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -7,104 +7,6 @@ AUX gentoo-hwaccel-prefs.js-r2 265 BLAKE2B ac3053eb15e2dac446337c29184b5ec54fb30
 AUX icon/firefox-r2.desktop 8137 BLAKE2B 5d0ce737c0e0969cb1a61de7989f5ca1ca0dff413d6d98bb0c93e0fed510b4e075a88fc117d3713e5e11ee7471ceaeffa9bc9dfd4282f3ddb1ea837d823e4887 SHA512 749a50b11d89c1329a52d13745ff8d5f801e565038cb5341319b4b515f36baf1c0c740003d6d01188c27e31d7ddeff58310e7b2420681292d0f2522bc5bd34b6
 AUX icon/firefox-r3.desktop 8116 BLAKE2B 50b476a1be87bcca0bd6175b7a7f5e67ac5d3f40b0a5a99c2244036a9eea53fb518f59c1d87b18723c4ae6c261bfb692ef0b52c6714402b0a98da4b6867ab977 SHA512 07c9d89babe20fba9531396c9aa2b692aae77606be2b8a750481b6b8f9b3eab320fef313d1ed4b15d3fbc4cd94dfb56b62ce1a3e89ba7143c6aa9acc0f919bf8
 AUX icon/firefox-symbolic.svg 7432 BLAKE2B 33a552ffb9850f6b9cd3cb8d9f7f80268ac08f00a0bd5eb15d892c6fbb950f8cacf6058b9c838f5be1ae1b53541f143a1ec0c1302ae85b49100b166fcbccdce6 SHA512 ba7db9a7c95a051bcd84e4c09c802fc55ee3c0d1d06ec1b169b04e414259b75bbe92fe584aee41a1e3f71e71c160df8bedf5393449e5024110ed27dbc0579ea8
-DIST firefox-102.3.0esr-ach.xpi 453455 BLAKE2B b89f8b8b5a42f703b84a5f003c8d4c3ff9cb82e86ef522c6495664f4f6462ab25f650bebc362474641ae5749c7f8d4e2249f68c528888ac1b7c848c431aafcf3 SHA512 1c5bad68c11af14db55c2c950df243621538f3bc0341953482c4333929452e4fb32d4cb625c0a0969afdded17904e72b75276bde86470bdd45a06ad48f2b5c47
-DIST firefox-102.3.0esr-af.xpi 418247 BLAKE2B 6c75efa232644b892aae95a73b6cc66b357610f6a32b1ddd82ca4078c5245f3228f506c809847a3bff0ae49b9b7acaef405fc19c000762d4611a3fbf53d29fd7 SHA512 e60e9753293086fc26684fc4e5932f14a3a7f4b65cf590a750dcd47b95bbba75605b31b8e5a3daedaf1177867de3e7ba90e87df256937c1d6f737928536ea3a8
-DIST firefox-102.3.0esr-an.xpi 498403 BLAKE2B 4f7666361af01b53b4f5a046fc956cf72de668772c7cab5dbc841104c5526ade61fed2c577c0742c4841e2abd77dff6cb9e804698c5ad9f519c2740ea2991a13 SHA512 f55efa9f76df914ec8371ea902406d60f0ef6ac13825fe1d0e45c2e587d299dc2480b4df6536fda74f1f6f8438a2566a8dcb503c56ec41e805331684c3829065
-DIST firefox-102.3.0esr-ar.xpi 563015 BLAKE2B 59f76a4ec1a10b5287405ff5db54cc35bac362d304f869d85b2e9f61d8c53ab80d5e61b9df89ceee3a85395ea82e63b0da51b8e0f6efee55cda2e8924abac6ba SHA512 5edd4030772c1cfb080d0033a810e903f88ccfcf686ad9606a03bf2b4d8e1972381a229674ec457851d0dd19855b85f02db1463dc54f9de152f2fd4096e614fb
-DIST firefox-102.3.0esr-ast.xpi 493499 BLAKE2B bed8f3312b393715022d9d74dfef19fc19cec37ddb19333191d775642ea703914c22860965edb3efff1b7203569b966f7ddad275ad551f513b560ad2ee71f6e3 SHA512 0e044f108521022f3e8c84cb2f9d09a94a0d05ec7eba961fe24552ecbe3756ec05bbd1d4335044b4250819dda9b275e09d0b6e3fac8e491747ccadbff6a1d0b0
-DIST firefox-102.3.0esr-az.xpi 485920 BLAKE2B 778a9ffaf0a33ef8f82342efe676b4d6c4ce4ccc20af2603d517fa65b737cbe160a22e8b7f457001675a592802044dbeb7ae315043762d8c10f0a79a529c574e SHA512 f80c2fbf32fa719b65dc6b35d88f21360c8206d4224c27aec34f4a9b07eeb63cb8abbdcfde69388e7eed6d7209eea23d1f9c545e89e451b58046dac6aa4f6ef7
-DIST firefox-102.3.0esr-be.xpi 638906 BLAKE2B 27f3b238ab4fa420f365d683f81c1b42d8f22b70491b8ca898ef7f8d8891b434adbdac4d4e8f37dd98348283d6de046b0b3bffbc78e1b0725d9a0d3174abd012 SHA512 7d955be75b94ef5d05a68a4d1750d61a674b21d6408d0402f30ecb128ce9aeb24ab6a72e26097053f8b1ee1acce653dbc2de95197fd5b28e2aab16a5a57c01ab
-DIST firefox-102.3.0esr-bg.xpi 578861 BLAKE2B 719fd25f559053a035681871fa8acf42c85000c462d5170ac3ffee762a5d531a8d6bda59bd0b1b48e65e8069f2ef3f20808b7b0d6d1b659b6fb375b18555ccb8 SHA512 38a53a1fc200fcad3f7c843559a6843a6c0be296eb5a2f04f1f19f68db7bac68dd5b57fc2c159e4a97f8460347a05764b3660e0adaf844ab701d65a9cfe2bff1
-DIST firefox-102.3.0esr-bn.xpi 576721 BLAKE2B 80d5f2dee94516196cfd206f952d1d9eaf97fa973a1c89ed65ce2f094fdf814b38c5cd738983ad767f88f417135a39df952872639f56478c0e8a9f4ebafc2276 SHA512 0232cbbb6062db4e71b2a58c4b43c8976bdc431475f6a91d6213558114832692ff439b9a40bc0b0700431e47e130b42e4146ae94250665e73772e672dfb693d7
-DIST firefox-102.3.0esr-br.xpi 531022 BLAKE2B 4b5080825076a583f7b1a9e5cce63a7a4aa6d9e57759415d14d730ea8aaf1fbdc785f1b2f5aac8372c45f2b984c5dd4d0dd31f64b8cc841fd8df3c109879c627 SHA512 782b9c57186d6902f3c49fd55adb256f45d52eff16dc21268b34bfb45a9dafbffd1013db45c8b3f2d6afe53c5c0c072c07887da8aad1e96a64caa08fc988cc64
-DIST firefox-102.3.0esr-bs.xpi 462131 BLAKE2B 15e77e28870bf7b2efaae16e082589e125d7cf1a89fc34398a879d6edc1ddc97c6474d630f7170fc8675304fa11cf051601864059fd22f85d305140981614d50 SHA512 6e3ae23473090a10ed61e4ca6a446e595974d3e7e8cf54ad37cefecd99b3c6d08e288057d2fe41e8762046d3408f0fd5b605bdb1062c73ef64244e2a7c3e9fc8
-DIST firefox-102.3.0esr-ca-valencia.xpi 537517 BLAKE2B 23c14a46134d41e50aef405bcdd25f8a8da947d745ad45ba3724a7c7cbc4b05c10ca29ee5dd141ed866b7a8d041326d16b38af5907fe673964393bac58b67331 SHA512 93c1046f4b6b77f4b97668c26f5042b7b93c3b9b57f2e9d4e5e5e662d8ec4f78cbe2ac186ffc2a6650aa86759cdf401869e0548fb6af108b6058c9027a291105
-DIST firefox-102.3.0esr-ca.xpi 540477 BLAKE2B 3cfea1d14a00bc625200a3d1e1c276094de1edbb35b9e29edae819a8e8b738460f6d0b0545d052674cae21da3d5a6a4f258be92d1345b0b7cb654ac87cd774f2 SHA512 b30ff4b0c424ea12b298c5f3b1a7805aff074cda8c297a9ba93d2804732294250e354f0d40665cded19715850237dc4d5030deeb3e44107974e4a88f3acf7568
-DIST firefox-102.3.0esr-cak.xpi 550775 BLAKE2B 9052bc53ad297d12dafac397c05a0fe6b775ad4bcc705416cde8e4687e53e3860d1456eb3f591d75401ee31d071aa8ef58c68bf62f9c136f85a3358134f63e06 SHA512 824668d6bd7d9c7fa67cadf4557e736f4b915536579787e065024a32447d2a4dbed57e6445918ff3b6a30b805dc873aa014029664174e047f6257fd7f76f30ed
-DIST firefox-102.3.0esr-cs.xpi 573455 BLAKE2B 0ac0e4aeb7c40155a119b412f6d2ff60b14af5c48f6a661a29ea4190b354cb81eee743d62c4cdcc98443abae969ed9f8a8f382bf5daae0c302a7a184f370211d SHA512 622db5c0d53f39afeb9750e126e015677f08003032a27b5ebcfebd7f131df9b6a1ee705855fb98133e692f3169492a49ca4a04705de8244116ce45250d116dea
-DIST firefox-102.3.0esr-cy.xpi 554750 BLAKE2B fb5a29a1aedd47e2cc83ba8515f017fbf707c74e27443ed3931d61adcf6fa53bfd6a63f86e5bd48fdaecd5e601ae77fd8e1e0550817ada638b3f501a8e6e4e18 SHA512 1c3b1cd61ad432d95d020d06c63594587bf62fa1ee56beb842a434c9e297c892f6ae1c699f9e9080068d14bb3ad14572270431d87428a9c51f40c86da7ae795a
-DIST firefox-102.3.0esr-da.xpi 546947 BLAKE2B 3d5db31de7cc30a2317c699cf7559e70d274c83b46508f98ef11880ec7dcc982064c93f89e948a6a368e20bcce7b937dbeedacbbd35781494386390b0e482462 SHA512 a47b65fa09b68e6b08f0fbda74f046efeed3a22f0e6cca902420fd21b351eb1b6403fd7ef5a93f7c3630eafebb16f71569d2b21c59ca6c7f6c659935a3f8677e
-DIST firefox-102.3.0esr-de.xpi 567046 BLAKE2B dfd661d963788405960c99d930b065f2c1b66b575914a38a4d43fa7f9e06346b3c74c4e580ee71da032ccb6481488ea74946cd84c2c46bae4813134d3b752660 SHA512 d1d9a3e0965be66f4b56ff526ed5a3d86e677e3497014d8ba06d119f1e9129b0931c3d69a6fa11f6026c850bde7a858c377b0915160ed22e954a08a58c0b06bf
-DIST firefox-102.3.0esr-dsb.xpi 579784 BLAKE2B 4513cc52cf1978548a002e23f22aff14aaab59bb98712bf4fa0c3b8adf05afb2a83bb3684060dc5cd8c39046f369b27672382514b7acb4c11f74809de8a72f2c SHA512 38e7d81a4894cf2ec9ffd87f53e90cb5974f420276036cacdbb58077f413a85506d0d88c2db31161b1446941f14326224ef0fd3afc8edf8350e40616f9adb79b
-DIST firefox-102.3.0esr-el.xpi 655029 BLAKE2B 1b92a1d7785279a66abbeae8b17b068cec127f98a6b214d35981fb40f07b7a560d1ca048373a50e794f788004f7870fa652cdae233fa1b25a77f0a2d83ed81ef SHA512 ae2924a48bc6716fffffdae4c623d9b5ec76ccfc286765315b1b45bf78ac98caba5dd024360296fe9a94df8bf409e047bec9a0d964b63728dc77605b7f67b51c
-DIST firefox-102.3.0esr-en-CA.xpi 514604 BLAKE2B a2330a5d480c0e3885581ba1d2d8e91d0f5c1ec7cc9256397838470ed803e09978595ca3284bd2093d78c67e78ed7add64719e7e0b0c8ec1949561fceb597bca SHA512 a2d9a00e44a07aec9d43496b47405a30c71f6d6019dc9ff52737c0020c2efe3050aed0ca5218499fa362fe574a9ae1a74a3a321f3fd91129854ee48359123ee7
-DIST firefox-102.3.0esr-en-GB.xpi 522699 BLAKE2B 55042f1722163590006544ce314ff07a169598e45c95f61287313d2627170db40dcc2c96b82f236b389b85218fdea6c05bbd565ef74c3bdb03dd58988fe1c6de SHA512 8494171611818f4a3c2ece4321252ff0c74e82864c97b3688e7d968a8f047cde0bc9d5fa652425306106dab1a81c92a2d2b1777e6e6ddaaeaec89c07fc98d1ea
-DIST firefox-102.3.0esr-eo.xpi 545935 BLAKE2B 11b2dab95d74307e05fa41dc3bf6c7ace25c9a2860fe4beaf189f34b78b12e7e865a19590497174bcd2636ab1495f7f63e05e09c58a7865cc965bade5a52cddf SHA512 1fb688fc8b4420019980955bbfcfc0446c2e8ab9cadc957af1254537e4e541305751a1fedc311fc168ceeae5080829612b4ae0aecd0d86ad5302fa3d70dd408e
-DIST firefox-102.3.0esr-es-AR.xpi 560326 BLAKE2B 4c48314897346a94bc3b4559e4e0cf8a9cf9dcf4e1c072c418c7f4921f65f407362e91e5b14253d766a261119fe0814afaea603d3e19ac378ba9fbda68cc2407 SHA512 da9e497c489815747718f3de802f141f076b222ba26585726aaba59f9e2ebe407d2a461f2eaa5cabe05627372622b585936f99108e6e7948dfa8ee9adde0e8ad
-DIST firefox-102.3.0esr-es-CL.xpi 559370 BLAKE2B 2cf5c1bed76ec905f0617532b558a6ba47d6c3eeba3fb7999bbc4d523c5c1fbc4c801a7a4508b8225fc8182d80a0729919dd011cbffe240331e64be7ad233e86 SHA512 5308bd3f90b61c9afa4a83c3d4b42ff77830743760d2c4b0418dba7ef701e9e07abdedb4a3b9aa507db45176df5431f273e16468e2e5c0ac586b19258b53fb1e
-DIST firefox-102.3.0esr-es-ES.xpi 544164 BLAKE2B 495ec841b827552ffafbac3e92024dec571081fe65a227d3de680a36df36041dc6246d4a70db2cd3b6db280f896c8d040cd79f729a8ed84bff1e684b4998680f SHA512 16e580ca4f0dde68d9fdce3a0d0336eba77b6d6cfe378633c3bdc0061b0954de6dd74cf38e5a9e8d9f0269de55ef117e438ed58c3488d66d072ba660133b0ebe
-DIST firefox-102.3.0esr-es-MX.xpi 563464 BLAKE2B c2e95d7c5a2e9c6b2544de8195b3b41fcd2f16315c36a3a1a463660386a77f5e1b041a810ac1a4661a9fd3bea004e14d1a999b2520d99bbed59166d0377e40f2 SHA512 d733a06266a6546a96637532abc9cec7b3f38c9243a3a9622bdf0c098a16e67bbda793d87650ac41ddfad949ec93a5a3296ec883ebc7880e4c931ece8ef56013
-DIST firefox-102.3.0esr-et.xpi 531816 BLAKE2B 5976155f1898b7b4b3f48dbd44448e2800726d085384082873e9cb24b29b0ad02faefdbbd9bc190cdf650a03d893054332b2e6f94642464613938eeecd28ffe6 SHA512 8216b66a34510a48a0441e68f5ea06774fb4be1ead029c26f0c30dd82ff0b884fb620c31c0d85053338fed461f62bbbf156757fef1e01709f098f3ae8c863dff
-DIST firefox-102.3.0esr-eu.xpi 548210 BLAKE2B d4995ef93d4b0df73a99915c0f1962fe432cffcdc4c84d390961539bcde382d81b2874428f7565e65142968395da1fbc54cf15b3d3cbe63da6f617562cb3115e SHA512 9a5568e046251ee7410a9704ba637df0829cfe2bc6f9e2ddaf710f7abb9618742c0710859f997261200172035fd1e07dfcb727c84803139ab170ce9c568f2b6d
-DIST firefox-102.3.0esr-fa.xpi 562344 BLAKE2B fa22d089f9f7498d06bfce03e811b9c64bb0141fc043af4c35928e23d4ecfe06115a9ec66ac946d1b6c5e9d3a7eefced986d86cf7c0cf0e6a968e7599789610d SHA512 905aa6979ceefea7503d10409b75a7e58ebff6eae06e9c2777c8a353fe895f224a610a80db71e5772715c61946b26adcc5efa0d0f0a4c2633b9b5750804a1233
-DIST firefox-102.3.0esr-ff.xpi 472169 BLAKE2B a54f9e7c891dbfacf9a29a524e041c14555b58ae414911ef6e2596fe97c7932727abb1f546edccef615d25ec21b92255755f8131d964bf38e253b4a7d45df74e SHA512 7c21b35fa781f453d05a0a8a81095c02e8d30c307e23b23d6276f2b35ee744e00c8f41908f6aba8b44a999f886dd7662649cc6de1920ac0d0b849455fd070fd9
-DIST firefox-102.3.0esr-fi.xpi 544783 BLAKE2B b1a9269fc70d1295aa184a38c238702a7bad749b6f3b58da4c14d4bf1940c67050e27bcec0ffed01644ac1764f98b913c707ec516461163e1603467521a87975 SHA512 1f4a32769955cff68bb3347cc82880ee582511ebdee766d73d5f39aa6de73a704341abd999ef1960609206a7222cb344c792f679071f26807d00eeee1957bcf4
-DIST firefox-102.3.0esr-fr.xpi 571385 BLAKE2B 85dd921fedf3a491b6743954bfa6c64795dd2f18de9a06fabc466a92cf8ea9001dc7cb89bc6d6771b69d77edcbe85c637410b2738fed645ef985a615375bf913 SHA512 ed84c1d311ec7842832e183342c2bb3e10d462460d3c0fb03d0d4cc81af2bb73f5483997acf166eb8767260a0c43e701bfa41c0951f7a29ef4325ff07fc1007e
-DIST firefox-102.3.0esr-fy-NL.xpi 556592 BLAKE2B 2e83c92963a330519e761ec02d5f838a615a6c14036fe3f153802949cbf2fd51d52afb1405b1ab53f9b39833decb71f4a1d9303cc9b2cfa0ebb79d2dd35b549a SHA512 94908b1c05bc15c9736da83560813917ee4e76876f3c31394ef6c0dda3b0f980bab70ec34304341b05df17bd49eba2f0cc369efa2ac8972a8fd100fcf5f5070e
-DIST firefox-102.3.0esr-ga-IE.xpi 470608 BLAKE2B 4181f987725e6a66729a204d51ac1a1dbdfab1e11d1b00560a14a911fb97deb582b0291d50d0397a30a8640ecb96b3bebf229e40b336a7705d8a2575046ddef2 SHA512 1ba5c0dbf71561b29b6bcb0aab20e4b07a7f72422d9d0d2061273cdff7c2cf2375da5a8988ead21f927d0301ca4ceaec3a956726e8dae68e62a672ba85d1f80d
-DIST firefox-102.3.0esr-gd.xpi 543720 BLAKE2B 1e4a3b3ec4a0997c6bced200c09085b81b037b012c6e976a1bdf8868b2985322757305c59bfc25085d79d03e605d1ae99185e104d9765de3d97fd0128cb07e1e SHA512 ebc9c6771d5daa35521ae7b923ec24adf862a45feafbde8b3e264aae280ba6e9287d045a74a2cbdf62e6b572ea59a755384e24fd8dcfbd190112c7dcfbf5b690
-DIST firefox-102.3.0esr-gl.xpi 539053 BLAKE2B 4c5d5fcced6b2a8d416205e62c21496ea6fc4783aa7a592575f457c83d1d699cfde3adb9c391da7f100e228e3cc81da648a0b838d9e4604afb34ea810f1b85b4 SHA512 c1d6f2194c851ef2044f2eb242a032c48afa3399d45b2df98642dbdc02a85afaf41a00a200166bf581a5d4f70d9e5fb9183f577f340d62bfd6d2f6b331879002
-DIST firefox-102.3.0esr-gn.xpi 570897 BLAKE2B 09a7119908a040d719235dda7b4a2fe5ec2b7ffdc66211c5c0b548abf7f116982f4c36df0eba5f707c9a31938d07672b40c0f43c1756c9754bf3dfe6957b2a52 SHA512 a1c4845740441b0b71b18b653b3948d6fd244d3cf6726e49845541be4b8167e2e9095d38123fe94c0169afac421b248fbce4f76ea9290e50ebeb9e6cd9d22190
-DIST firefox-102.3.0esr-gu-IN.xpi 527872 BLAKE2B 69e8ddcd76a678bd78463f1b240f91722c18d74f128e22fb9724c3d79d6669b70e34a4f20e4b9854ebf17bc08e8ed4247cc6c0bcad4a919b7f117b3f8f6aa5f5 SHA512 0be7d68f54661c8070b80a4e9504bf6352f3aaf087f5ef14a3b521fd1c15d5cdb7927b76ae06369290ce6878c9320b02946522df381ebc3146fdf68955ad4749
-DIST firefox-102.3.0esr-he.xpi 568678 BLAKE2B 79a89e55a135ad7c12b2eb2c503b68eaf8441c58fa353ffa4f3d51bce4f0b1561763018826ff02e2ce0abed1f2b80b3c11320439db956ef93e000d9e4f85e3d8 SHA512 2719300e548aae73bb53ada61a0d24c126d0fe825cdfa5f0834bb3e4495daa12c38338c4eaa89ae575c85c0f0a8f19659e674b4e65fa2029e385949006b00334
-DIST firefox-102.3.0esr-hi-IN.xpi 558539 BLAKE2B c2ddfdedcc15c7a7d37cafbfe05272c885208aec6826c0377c2dc9920c9d48e2a6c23876e9fe01502fa53ef01a8f886b1e53464f75332ec6c544a4134f09c5f2 SHA512 64dc592725ce712c4d68c9dcb39ba6793204f88b4a8f46bccbba9ab22e818885591078a013c727481b24f509f06ee8063f972d1d7d7e4a6496b02432497e0b20
-DIST firefox-102.3.0esr-hr.xpi 529738 BLAKE2B 16dbb6af30f269d8b66b13ac66fd2223f4843decce8e94bebbf9c9fc2897e3b4de14bd8ae0ee9a50f931454bb7eb14b423761b92a3509cadd0fff14a8e0c65a6 SHA512 325b8f12d299cfea651edddbb237462090b287b68bf0c2feae67767bb6f7d0279fef10e798e5982cc17802ca847d6262500c92f04711dfc6640390c764dd31d5
-DIST firefox-102.3.0esr-hsb.xpi 575946 BLAKE2B 30bd83aecf189348ba972a364fa5148c3152f9544b7059bb06ccd74ca7bc2481f53c5e51dd2b4910e3adcd7d761be0807c025a15bd2d8027aae26056e94ec585 SHA512 30444fad035a5083140a20a014c5b8a9b4f014c073b88199584519bc6ce9996bf0da170cd1360281800233e81475409c6f5d0f16b802902cf5338dc549279b45
-DIST firefox-102.3.0esr-hu.xpi 580250 BLAKE2B adb670db4b95a76709d42951478591e70d264fb771d8aa60f9e0fadeb9606152acf1295f38c017ac1cd744e99d8b7512baad47071f3f20bbb5a08fb664420028 SHA512 f61f86cf40b53bfd4680edfddecd396a2635bef0c2419445cf52f63dca53da27603862b54de23f97386c8837a5f6d2fa1a8df2425176dc4fadbebb42bf33ddef
-DIST firefox-102.3.0esr-hy-AM.xpi 582119 BLAKE2B 8551ed1377108803d46dbd185b4a9a06c4139d6a2fe14d5cd4fbf2dfac3626852de294413263f664d9e295e1227b6eccb70953899a50c13629ce0000456b897a SHA512 324c4c994e55cdda393da1d0dbf8cf7d8e794481432939d4b9b0d158ee518129abc830228fca229889723e7457b1ff33784f7093e66c2c89fc078bcdaab8c6bc
-DIST firefox-102.3.0esr-ia.xpi 545262 BLAKE2B da53ab9a57d9e2ce8c4741af776bf266d25053741a6e2d6d6400372365c93716b5c137f8272edf020b1e18643470bae5b8eebdae08c00a983c23f79c865d2bd6 SHA512 8d41339c86ddacdd5faad662f331a01f1d777f21165c4908ec39be9f2a8c966adda5d7d14324a58bf0a84175e855d0a2cd77f15679c3755f24b7d47f3f48a28c
-DIST firefox-102.3.0esr-id.xpi 542448 BLAKE2B 7eec3c870b40712da44c45c4f497f51370561a5ed0427193053fc9cbb5ed0f3c44ef449417c83dbe5ba979ca6a8d12030a380ebbf6ec905e67745a5c1d845f8b SHA512 cf67e20d2efe267b2bf46d32cf684ba7a8d60c87781c1246c2eb2ad3f74f194c63637fb1f2a2e6524edffbdccd97253f16b16aa8c3b7de8fb110c7e3ae752d7f
-DIST firefox-102.3.0esr-is.xpi 551935 BLAKE2B bc1f402c582ef0a22cf1db81e88a5d77cac245721544ad36e8f4f328b51ccc1396b4393c90e42cfe1a653fc57b220a0947d5516e796191b2fd0db40e7ad4065a SHA512 fb0c29ebf12c4901a24b78dc996f6ca390603f5ad2f23def32af82cbfbc5e9a47e1069841ab0db3f68937b33a7e7fe60ca773c154498e37646b3211cbe06655d
-DIST firefox-102.3.0esr-it.xpi 463213 BLAKE2B b68825a8c43b9014b9871e38d57d92bd0a3d41c355e8825e117f6de2b33890a4484fa47d429c93be3e732a93e3ed0ae8fbe813e2e1b75b51eeb61e4e340f8f07 SHA512 f37bac0b09a23c3a200c16b025cec1c1e470eba8fc52a30fb048c3b6d5cca7f3a578c2c245ec378facc9d55eaeab82a24928d91985a5bf65a03b7f5123b928fa
-DIST firefox-102.3.0esr-ja.xpi 586305 BLAKE2B f1a969fbd12c82432e5ea8ab9610095ed7f3a2fe8f750b28ef9ebeabc0888c92fb1c09857c75e02848150d64b93dfaac32f3a3873337a21c2a11e724c2214c0e SHA512 599904bf221abf952a7d6b45e387a7e43f4c4970c6a7a5772f8bfd2b4d79294073a791ad48a6b2b60430cad9c5c7cc161068c7bec54edebc5ad56765738d8d6f
-DIST firefox-102.3.0esr-ka.xpi 606132 BLAKE2B f5459ae508d5a7f2d4e71a885670cf7dc4551905697d280f93403c40f528d566e3d600b6771300bdd4038c020bef8f3c1e09850ff47417c91c4966b502697fe5 SHA512 1fcc7c63220df66363b1294162ae98809a207cff602f5490a42169889b8f27309796d56fcfc81fe0e87df3f19e6e5e12365acbbb6dc0b509aa8658dd1de1aadf
-DIST firefox-102.3.0esr-kab.xpi 565741 BLAKE2B 52ccb77cde51b9f8e4b7b5100dfa63444a779f62f16fb19912b53de6d1950dcd797febdbff5b2f84b1e2ea4b9996d787d4be507462158a83359ee53b9108e8f9 SHA512 33384e39af5c30f56fce040e09117fd0879c3b2f49a0fd0c700dd53e29662f20c191e6f6a99bf9254f5cd1278784095488d1896aa55bd50ae6e1474516ff2545
-DIST firefox-102.3.0esr-kk.xpi 621839 BLAKE2B e290bbe5d9ff14d6bbd9154d45184017291278723aba83875cb181a79e1f24c117e43445f974483c5ace4e9a4b62c73649ece43cdc269f864af12fa5537f5ffd SHA512 d8b612ba4921f23e464775f009487365b11295010016f2d87b6096c83c08cc7fe1241994cdd2fe1303d4651e1d61a41639437c11384fe0ee076c4a7593011413
-DIST firefox-102.3.0esr-km.xpi 531579 BLAKE2B 80ac1403094fb789e258fb5cc8884fe85d7b701f8098a4c546b3b8c7508bba422cc1f41b16248670152f78bc7a1111a426fcc65f42ff109e8403b6c0d8645604 SHA512 87c030793fd4c3e254a7de40d88b328c9c0e2e15a22ad70045b9d122f54b11b1c49ec42dd11765d661124d2540e40bba533831f0575fe9aa0ee915ca30470fe0
-DIST firefox-102.3.0esr-kn.xpi 497201 BLAKE2B 854d219b8f5f13daeb89d90eacb5c4689e77b6c2bea4f60002f06fbf277d0579bfd433a4b5e7192cbdd77f896ebb3e841e50557326674bdf31db326b007995a0 SHA512 572c0f699deedbeca7443bc9d0c935141636114bf986f59a3a4ff96ddadbdddf81c5745c15a755765b3d0ba2a9ef749276071f8bb884ba2e44b3596ad93e4500
-DIST firefox-102.3.0esr-ko.xpi 593293 BLAKE2B e29f63fb5e37124b6a148f6308cf30480c383ae28515c4bcdaebcb0f0bb2ba25dc6eba88d74e719afdaaf9ec872ebff6977db6c2a1d1dee5b6d01db5df380c79 SHA512 7935db3542dd510f8dd2a150033d282fc46728be34bd35af7d94a968c633640be92ffa03a3c4b30fe1d5c2cea7fa61e68d643191613437c28711a7d0c28e2ed3
-DIST firefox-102.3.0esr-lij.xpi 470141 BLAKE2B 0e654ef57bcfc6b308387d2083ec147b82986ea59cf8beb2338830b6a719787306a02a0ab65118952030bb0e85fc7196bfba8ab3deeb9fec247ccd36a263017b SHA512 3d842507516fe2cf5d80c06f871c757a08060ba3e857845fe0e3c15c1df31ca3bf0a5ef6bc7c83ee1a15f59b4f2d5ac00e1ca9f2fd1839e957800e33147d9078
-DIST firefox-102.3.0esr-lt.xpi 561127 BLAKE2B 0a6d1c86e7fdb915a863b54d8d75d35ed5bafdacae0bab31bbce97b44e21cd9538abadd1f1a3e6c2a66170e84dead65a15b3f014bd929678ef10101ac453404c SHA512 e2b0b2858a0fc97b0af32bff1651246b1558ba8be16c941193f9a31feecc380fb1d93b926ebd734a9f125c2715c364bec4c247b3b6aed84cc475b064ef8a24d6
-DIST firefox-102.3.0esr-lv.xpi 463020 BLAKE2B 56d01f39fc29842911363d6bd4b1dbcbaa039467973a2dafe9cc097b8e36dc07b0d4854d256059ebf6f5d0d04c0a157a096eec3f1e01671997244b9bbace079a SHA512 ede171b2bf31b34c9b6dccce9cd8be85e701bab6ad84f9a43e7bee3c6601c4946cdfb1267ac8da2e9bbfe4efd39fa0f1a4f3633e0e33a5f41f8b413a22652be4
-DIST firefox-102.3.0esr-mk.xpi 482313 BLAKE2B 9b5382542944828faf99a79d56cb22807aad65507bdb290b46c107d82f2a390cc760f8d3add494963299d808e82f05c9a350da5066d591d71305f26d6f8d06de SHA512 934d0fa0a0ceec899c18ee16e020a26a9c0599d51f1139a26b0508ea1c570602a9028692ac36dd9ff87d2026e3a3dca8c88d3d39b82da8961fa035f8e0dab0d3
-DIST firefox-102.3.0esr-mr.xpi 531252 BLAKE2B ffadb2926faeb3e4ecf0c1f6ce8cacb8102fa8f5a7c05c709d89a47d965252b380de6aab8f5a8bf786e104bd5fce0752feecf9698a05de1c22a82879c066d726 SHA512 01e1c0614096df55093e7f0a203ac5ab141bcd663c5f71a2173d7d716022c6bbba4f1f3ef66d5c583d81a1d614659f82368a5a98991478bfd4969cbb335d0aaa
-DIST firefox-102.3.0esr-ms.xpi 448123 BLAKE2B 33e996afe1d849dddbdd246b1e04b881af0c358f6bb5d305d1a7c11e6ac4597696d949fc49be2eb2cb4311c19736c0c631825fcc4feab9eb2e22c6af3129ec89 SHA512 7ac315d4cda83106258ccfba4f1945f817d5fd5f7dde625f641ee790bfe0193660f57dd69258c0db4bdc8d334b1a9520c5f856b7914b571e4315fba6b16ee7ff
-DIST firefox-102.3.0esr-my.xpi 511807 BLAKE2B 4416387c070b261c1aafa2ae51eec94529ddb06f2bb9e8dc722a9681a75be4cbfaacbad1f8f6f9243b5d5fde3bbe93205318900ed0c2f63d3ed6e780d47bb805 SHA512 e7187d9b0c5a787f6f6d1f337a072a0eb57b1b25bbf74a8c4068075a1e747042ee23fc23e7f333df1c94c03d29c49d8b69448079c8fe7a07c2a202b465b8f979
-DIST firefox-102.3.0esr-nb-NO.xpi 541242 BLAKE2B cbaac4222370b1cecfdbf7a073d1a7dda69c6621b5c2da21ae9a6f7fa5a789459cf37fa47b835bd51fdce81f1d0ee40f910bf6322ac3967fee2e95cfa0330482 SHA512 49dc8f417aaac2aea5fde3781c5b159127d9a76813aea3b242fe3058c7e775761805415e85c6e80813fa5c0815277a9ddeedee5aa7625b8ed137d92fd3d6eb14
-DIST firefox-102.3.0esr-ne-NP.xpi 489420 BLAKE2B 107e3f27d3bf0aad6e59c7a942825f32918850b50a7b94e697cbd6509ec5ff31c3057584c392ba5e840d9251a523c825d3d9a76e032351320b9aee3f2d988520 SHA512 ac48878324241ee9e4b31f91b7400985795201c6c94ce2878f5fb39da25fe479669748dc07778c806a1bf382e65080a79f44d8a80c7ebf59d363fad5fa0084e3
-DIST firefox-102.3.0esr-nl.xpi 550349 BLAKE2B 2a180b9b7271c5565cbd65981d9326304247bbeacdddef12da34b505f49cba9b4ac4dbb338a6048ac4a3eb5d985a0b513f89800ebc120123a790f14b668576d5 SHA512 cd18f08fe259778d0cd059357f1f46c014eead4008645a022c9b0891471ac72df6824b72c0440a1dc610baccbc1b9dd1d2ceb80dfa7313f26478c8930f427489
-DIST firefox-102.3.0esr-nn-NO.xpi 541467 BLAKE2B a21752e1a92ceb0c48e614878622892181ef4caf677b4698f0632aeff9d43d3015d2d6614d27c2087b77104098e6fd52faa37e19b194720adfc60e32bf340c25 SHA512 bda7179ceb26453e9ef8ef37dd83d03a32fb16f0b798f280b23ba6c47f3d268286ea5a4beb55f7feabbdc2bde182c2620f6b8edf41748401112a3c656d00e6bf
-DIST firefox-102.3.0esr-oc.xpi 560885 BLAKE2B 2ff5630e76f4c7875e65eb267cb482c232131bfdd93995afd304ef4c1e9c05427d299b4784a61a1722578a2a66d264f4d31307254ea2b52e083a9a65bfc29ae4 SHA512 1f495b4497dd7a90e8d111ea453ed351b44ced910fbba4bac669a77631368337c1cba58d042e5f8abacb079c48bf1f79df0275bc1728f2f918055b3653e817ae
-DIST firefox-102.3.0esr-pa-IN.xpi 612447 BLAKE2B 7c681875f8fbd7d33db5cc803d9ea63db473902f41fefb2cfb32503be05370e2c21e2a4d25941c7415ac436689fb6d8bc39dd7c7ca206c0e2e26824ae886d562 SHA512 ec36cb6dfdd677e7b22415703e5a62326abe13ecb2e90f4c3565ef4149a4e63d53e01b2de6b23b66491cf217777353521da9fe5667f246bdbc827b0358cc0a67
-DIST firefox-102.3.0esr-pl.xpi 571733 BLAKE2B 16dfad3e0d49ba8e68ba847b4990911026e0e378e49d65104523fc47452aa57be621d3efacbf6823e96b32d46e4fb3a5fa2962c1127e92c3c479c581338073d3 SHA512 412b95f604a655d915e323e1ed1b2510b708c39eaf147c45eeac46fffc2cace2e57db848b8c77ddb5ccc96be8e9315193d904bb5e3a7839d358ebe1d37d70fdc
-DIST firefox-102.3.0esr-pt-BR.xpi 555920 BLAKE2B 5343560b00743773b099a2146ca11544e22b2309708d1c3381f27004e8f458daaad3dba5aa10aa8ddd55fe3f989862e94eb79ff1889602af041a52ae4871b477 SHA512 aabad94bc00aaec4929cc02d37f4926df22526cdf7d4e2cce12a103ca69554597a7d09951c66260f1ff1605dfa9eb07571f5a39668de3f9fdc9a51af288bb501
-DIST firefox-102.3.0esr-pt-PT.xpi 555205 BLAKE2B 579cac7775a5028dfb010e0d483110ddae0a8e8cc850eb0e786c3f3a29e102a6e1282ffbc80543f8134e31db8ca2e3026bd8e3767c30fb61dda6454d89c06f7c SHA512 2ff0d5a2fcae26591e8fc5a1be1e2b35b442dec8f2932b0770c777136b642cbc202c7cb645095c7e6eca713b2fabe7523fb70ee84349e76a0bf0ee1fa5866d61
-DIST firefox-102.3.0esr-rm.xpi 538504 BLAKE2B 76a14f62f381b492b87a6dfc992cf56bc80e66e24b50a16ccc2a6434ba2efa1eaf0e05358fd5b42e372845a23d0cb716585194f461805ba7777b8cebbe571afd SHA512 40b8dbc6dbbe021c0cc40c321553ac69d25789622234eb1c1da0aa747f2c641483a387d796c5b4fa1489aecbf83d579a0cb670d9aa1b95f78c2a0c5fb411b78f
-DIST firefox-102.3.0esr-ro.xpi 527971 BLAKE2B 54935a691b4b89a24ab1da688b7127ffc82d55b863308a844dfa78ce3f45a74638ca56304bd8a2290282a65e1bbdc3685e23ab3f7f7772d06dc301b29fbb4c1e SHA512 ea5f4c06434500f954611ea1324b4497c2a2518fb36bb724e1190b159e1f865110b22e06fc0aaa33ed0803c23a0df2e56eb6f6d05918e6c7db7e25de3d75ca0a
-DIST firefox-102.3.0esr-ru.xpi 642366 BLAKE2B be51c0c62009bda55fcc9dff436fee78f1f038b218886e84c3997c0ea1b5020a28d66f94be15ccd5f8d2131996b23f63e10f4223a518f786ca750e5689a585ca SHA512 b86159d177844c330824896853b8194fe122629673a279a3829282f6e90c4dae65547f15382993098b97510e76d1cfce1b3ebc01138041bc23ec03305a5993b2
-DIST firefox-102.3.0esr-sco.xpi 496336 BLAKE2B 7c9ef809ec723c27e62cd81feb841e75b624fb2bdaa09931162faab53a34c23de9d5c2c6199aa7a6e41d8977b938a8775dc36e4562bf9c7c46500ebe5dbac042 SHA512 d0fff7b6e4d3f7a7985ade738f21f559a0e8ebd2304fcc9f22755b658e350b9063e3ee14515098afa33c0aaacc60c42ef5b3d58fab32f7e132c7a3f99c555dca
-DIST firefox-102.3.0esr-si.xpi 564314 BLAKE2B 74ce40ebfddb64b3a743993a07764186a69893b8ad9812fb9f96dd824a06d9f55fccab8df7f248ab48f50d40579170b765b2ea412672c8fde61d52640c73574f SHA512 c9b61b8d62a643c869c258ff747ddd9dadb4504e1b7e6b7678b9fc64cb40a7de417ead175da2ddebe4994ee5c5ff89f645ab7793c20845fb49395f746642d6f9
-DIST firefox-102.3.0esr-sk.xpi 580588 BLAKE2B f6a7e5e6e0c7fb0fd4521ee22530cce5c53868fa400ddbef7d3f56a8a866c36d78e43aaf698f5e379fd3a6f917120ebd0f0ef5f7426dc5a607d4f01382d9275a SHA512 6e9ae7c608a032cc5ec9eb60683dbb9b16f82448506b1ba3987501e3f5d0c148babca5626dcfe46d658dcd88ed82cf6c9f5e21da9de17fe03fd3f54751589141
-DIST firefox-102.3.0esr-sl.xpi 553154 BLAKE2B ce9ceab97fa9c38e231c2040bb10796169072f99778bcef8318b3adabf6675d61e3c5ae040eb03a12fd4fe6c8089c20f0ba33357fc2b65d87dd972f05ba2fbf0 SHA512 3f09114a0d2250710ea2a4d9172d03d323199a52d9c10966d7c9fd13b664c305660687058e6339d94cf1a75a70436e29c7851de750e320c632d3948d1b592321
-DIST firefox-102.3.0esr-son.xpi 424697 BLAKE2B 584eff5eca60738aed08237f468794f3ffb46ab577f06dd7ecb56959646fe8197936c47f439ee726ac565fd8e27c5889e946a1f1203188794fed182041ceb871 SHA512 29f30e325bbde80e567a1394bd14a541bf340fb809273225e50b71c92127d0a987b60ec7a2bf1f037ee2bea8304bc382bba8fd12992308e0ea19e831ad1c70ce
-DIST firefox-102.3.0esr-sq.xpi 556113 BLAKE2B 3ab043804ecb52c9eb4c6c87448dac9ce6d496c03d2dad463acd22d4fc144fb05add1881ae359e7e9bc3c76658fb7caa2153ffaf62d835fb5d8a8b979d764b26 SHA512 c6abce9bb925753423878b8adb1edb8230d19c37a2b755f981f358177544ddda8a117f56e592fee32ad7469db0ee79d54290b66e5f81b2fa840795d4710b3065
-DIST firefox-102.3.0esr-sr.xpi 595492 BLAKE2B 949054d9008ef4d18aa4221669c193f81997c870901f0833c6503a3152ab41ac429ee65332ec7ed710106a13d8e370fa1d77c4fcdf68a50226a2cb772876bc49 SHA512 16f358ce2cc654cc27f1ad54bcbb772eba9b48303afeca80d7e5f292a75b98f6e091b447ba092fc164cb28279a53637c139fc9a9a8de07a5cb2e28455237e794
-DIST firefox-102.3.0esr-sv-SE.xpi 553017 BLAKE2B adb51c3f04048758918452badb6fcd81511261d0c61b119a0a4568e61f2f03bc4fe69041960b611829f6dbd5e5691c2bd66604b612b1952ff42935c5cb98686d SHA512 acdf0afc289f7a521640094f33e745a1c6b3e09c2b96be1e9019562cc2cd20fd7252ced9e898e6443f237b924b4e5673de714b3066c22f2d3c31c0ac60b1b25e
-DIST firefox-102.3.0esr-szl.xpi 512005 BLAKE2B 498e98ef7f1962a129d197e754f64e527b37639aceecaa9b964014d165602c8304544e37852c361095154c6222bc5737221d3ade2c0f1e981676c92d24000495 SHA512 1d2210f160d92da7074d119ea1806c9b88b206b44742b9e8a4d0d37a1c9ca74f17c8a12834323aa12948c2e5ab0f890edeb57b94782339079b73de32ad1ae1a1
-DIST firefox-102.3.0esr-ta.xpi 510340 BLAKE2B 8dfb9e20ac388b1e82139bb5a27f1cff19e0bcd9d0ef054ba2ac34cf7a3792add4f9e949bdbfbca907060e9f57528df070a792d1b9bd40957ace7e61d4a16130 SHA512 1cad1416c798fd2fab469f2cbabd33de93abe2ba906429f96c22aaee7378e0e1be6a7ee49bc093ecc5fea14310820d4d997e34e8d5dad7c2bca4475bfa04a0db
-DIST firefox-102.3.0esr-te.xpi 551584 BLAKE2B 1c6c1baa598bfad8cc5b7639c4c2e62d5fb1714d354630d5fd863d02e83c6937f306095683f12248c854f264d43b634a3f267c041c8e72b9da447920cf82d1da SHA512 6dd038446414dbce78efc0d4cdc13c92ae611c84540b832dba64138b5a95d55305317b24594113e50f2819a4999c253879732d10621f4b75e7ffdb1cfe5a2591
-DIST firefox-102.3.0esr-th.xpi 612082 BLAKE2B 69f67b021e69c8d45db99c079425f6c260c7a4ab6bb2352d2c2400ff724f626b212f57294822ee8c8bf363515cec377d53ccb3f14dabeacc8e946a7e7eadcf4a SHA512 aeccdeadc400c69941c4d3878657e0a4708e64e4f5e780c289287797dd561703b736a30fd91c3217a7918a60c43e403abbfbb11f0db12b07b9f148de60e40a5a
-DIST firefox-102.3.0esr-tl.xpi 518943 BLAKE2B 5c7562dc434f80bf9821f3e0ffda53afa5a47e4c8f4173dc828c1de3f747654783e6ff422a01d22029fb1d30d7abd441511009283ded4194833ba27ee4bcc159 SHA512 fc620e959eac61b653a160336163bf3a974da47364503d0992b7be0156d9b77b18388e3a721828b86c218ddc8d692c5244ac1dcf2d596c6fc675053230ad62c5
-DIST firefox-102.3.0esr-tr.xpi 567030 BLAKE2B adcc39e2c690a3fdd1731de99f91647ddf49a9ae1e3db379674da4edeb016b1659074d5f463d75a79fa27013d0ad7dbfa526aee943b6ad57533dc1a10c582379 SHA512 1fcf727cd521072fafae5797cc758f7d862648a88b283b0b3d91b755377cfd9f4e853abcb6cd930c576434ab013fbf02fdb7b9139affd9091ef4a548ef345cea
-DIST firefox-102.3.0esr-trs.xpi 490213 BLAKE2B e8edb6a7d535788bf6c3ce3ce545b834095fc58e9e780b467050567f89329e31ec3f24293ba5e8b3fb5b9dc310ab4c0d8322e360875dc874e5b34882f0ee295b SHA512 ac5046eff687566e2917915ec886982137d8bfb0c4d1026763ab7d1358022c7d504a9cde89e0f34149bd4103d8d18f3534cea7cf444cdaf750277956c939e053
-DIST firefox-102.3.0esr-uk.xpi 635945 BLAKE2B 46b3a19488904df7bef1883cff005ee63a5b1b3c2090c64fb366c934d5a88037fe89027c2685d6820d032147dae1abe4917fe1fd45d3a4015b5b191a1a6c2108 SHA512 ab9eda82ec04e9ed5e7532181cb1f78388f6db76823b40280b6872ba6522d244d81f40273ccbda12ee0d87f9263cf8d32a43478c5b4db77ff522ae634699ec7b
-DIST firefox-102.3.0esr-ur.xpi 558059 BLAKE2B 5901db9e23122470312df1c61acc4b7a1e5de16d53701e8dbf8ab1828fdbdb9e7223f146675a7f6357de8ed4f6dcb2b17bae02fa4b13c55ef8f767ed0a8739bf SHA512 c17ad720bf22daa4a8f6bd2046e218875ac1fd8d1e256b6a0bc4d9d162764f0af1cc900b9dd54189ad750deff2faedb183301318131d725a2da761267d5bd706
-DIST firefox-102.3.0esr-uz.xpi 478246 BLAKE2B 580a168a88a12ae18162aede8c6a3f32b1f7ce9e938daef6dfd00c9ffe3d968c10efe40354c458b6312d374c8a2fe4a88b1ba59e5b3c39d535deb5570b131642 SHA512 106f5806dc52f3c49cb162b850e85cb159284072b0cd0e833885aff89d711be76debab4e377e9edb11f1f5aae437670aae5df76c1b5ab22a77c047e21fb44404
-DIST firefox-102.3.0esr-vi.xpi 586368 BLAKE2B 3ec464d87002e196970b04792767e539c9c12c1e17165539492ef00b6d9a7b8916ab4f3c5e05a218be746dfbd43dfeafa2336f8fe841ee5225ba556c252407b7 SHA512 362aac1e18f3a3f694b657cf9bdb7c2c2cf9810387bbd71e13e0b9e455f3d3e588b7500fe6cef299c43c4d793a7ebdd31a15e30076c0e7e2600555c5b187fa46
-DIST firefox-102.3.0esr-xh.xpi 427184 BLAKE2B 85d46e7f2d1220e13ce660677603cb9ba90e2244c6140cb02ed3a93745479268c4b72a04d02ee184b88519b69b2c5784526625f3e478f41040a07200002bf8ef SHA512 a8ebe8abaed1019b5b8cdf567f1bd8eb41f34b75609e99e7abf53c92884c49a886d5c481245b4411ecf735acf2e611f872464d47a040ec7e6a6f19eafd23f51d
-DIST firefox-102.3.0esr-zh-CN.xpi 589094 BLAKE2B d496632b1f029535012ad3b43e93534b206651701a83e32750f03f3d7c2b2b22c6165aa0748fcee89c1b97a535e521ee4e8c20ea51fb6633892a0e851b8adaee SHA512 b328345dba6f6d02561fd63dad909b1c071af652d36c198bbbbfb746fd7907b6ca7d048899a4ef42477ccfbe5c2345be3afd4bbed1fa75f04f6c6714f0831e1b
-DIST firefox-102.3.0esr-zh-TW.xpi 590469 BLAKE2B 71323bfe2c05d01e38ad6629291a83f82eb2b5486a133d0836e5982d6ca8e2fda0ec11e66d874dfefff31b6b42237324b80146ac643b78d557102a8b693f6847 SHA512 3038339af3b2c01824c17bdcdfbe64354c63e4bc55b6bd463297c1f875c49980a747c5447f9f468ff567d6bb2b883b2cec91a1d716fed3245aa1a1bd840412fc
-DIST firefox-102.3.0esr.source.tar.xz 478260896 BLAKE2B c40ddcfefee874f6dff5d175331144461917269e912d959af20aa19cb8bdc57209403d1e5962311614be8fede33733f734c19bb0d32d881421fa1197539dce5f SHA512 35357791f4de8b474780083a22fb52b7846b8012cbf01403f2b9526151d11c196ce0f9fba8e0f16d8235d7259af6fba1bc3acbb5b7e79129a28f390467aa7556
 DIST firefox-102.4.0esr-ach.xpi 453446 BLAKE2B 61752c8ba1df1e9cf08543efcea3d5a17179a85ab5cef40eefc69009963c8784d6b9ffe2a190ed4ee891446ea6d0cc63c72c4aa1fe03ad2aef2e7616bb75c99a SHA512 3fbaab97f3b45c1ad17dc71c390d758fc1f49ab33baea5965f0dfcc023040f6105af6078b0510a3c02ef776cc5a6dfbcb317790f129acb18e5b24e81db725ead
 DIST firefox-102.4.0esr-af.xpi 418250 BLAKE2B 9635e007c9af5d0eeaad86e6f56d4262c43f705930bebf2098f2d70277d858e72e2c676971480669aeae0f4ce44a6318f11249376278e4d1fe48014f559338bf SHA512 b74f776ef685ded49b355029903301b9e7c7ef2979708d0545209151af1f7fb5684697e11fbbd6a3cfb6f00896534c0c8744560fda5536f26642164cfb7b56e5
 DIST firefox-102.4.0esr-an.xpi 498413 BLAKE2B 63589bda0efef5c67e04aafc4859959f880a9300075246db7e303d917c2423082c45debbd7f2c898d2071a8f099e07940a2d0aec6ebc19b35a5449c7736e5d7a SHA512 1b0a59e373e8502f6b83f18362590c36d1984138a483ab24533e0d9870bfab18cd7da751bcf54fe025cacc675b7a067ddfc5ee358af7957fad189bab089f1fc4
@@ -203,206 +105,8 @@ DIST firefox-102.4.0esr-xh.xpi 427181 BLAKE2B 5f1966e0dbd2aa3813166dc850f177934a
 DIST firefox-102.4.0esr-zh-CN.xpi 589096 BLAKE2B ba7ec34f1f70fbc2800821ef4cd55bdae4544fdd71ba180907cccc68e1df773b1e4a681c67bf9a018eec4f9012c6750df829c81e4cc80f3a32ae1bd480304240 SHA512 85e624355363f9d2e5717723da6aeb920342c551f3448f1581c9ecafd7dcf06a7188176a73ab39faa54c4b856ea3d0a98438111e1211abc7af72fe5fe4470530
 DIST firefox-102.4.0esr-zh-TW.xpi 590475 BLAKE2B ca73c38446e2fc3daf4f5e7a4e27cca153f0df38ca83e9368a71e108820709ce588593e3562941d310224bce606da77682afee90829bbb4feb34d64ca595ef85 SHA512 94bac8f5b13099eef8570f1e9a7dc0509886aae3e3c1b952f970cf1adf99062405ea504e1417e3e54b92a551bfdb666274ad47c9fd08d2a72fa6f6579fb2b3a3
 DIST firefox-102.4.0esr.source.tar.xz 482118312 BLAKE2B dadb293edf4df20da5345aab6845ca9da8143a966b38d3660ea8ebc4f24ecab72097ba4345d30895907c83895883379867437f8097b86af4e7e0e691da551793 SHA512 30d9e6ef04fd86516e2cea3c797ec99af4c96b08576bb3409c0026da4fd1218167f89a007109e1fa4e2571f98f2dbe5ab58a26473533d45301f75b90ec3dbf28
-DIST firefox-102esr-patches-03j.tar.xz 20768 BLAKE2B 49c5be06c5df5eda693a9712a63989f71dbbfc34fb3dadd74f0c95a25b2d8123af973ce92d7c7b342de311d8e94fd652a3c126ad6b9f0eeda09e709d42959cf4 SHA512 8d1e9e37095fc2d1a24064b6b6b16e5535dd387d7a566c52b8add7e060e9e7d0f0c14ff46efe370dc7b8bf7469fe9cb0ba4c2014829195f922bdbb0a2f41bc31
 DIST firefox-102esr-patches-04j.tar.xz 21860 BLAKE2B 1cc1d6493912f85e71cb5a0ec2c3196cda203242f3503bb6ce8c23a93e71a6e8b1138f88498a6a9698066134cc234989b35cb378693fb2cbc9ba4caa8d66761d SHA512 9f7188dd79b9856826ae2a60b0109c2c86c60c10b03cd1828a9f7a7576df5c49ed3e11e4d3319d80e117204d6bc3408e375a62ad16ec8d2e53f999cd298811d8
-DIST firefox-105-patches-05j.tar.xz 19144 BLAKE2B 61bdd5bde8fcb0f71f45595dfd289e3798ae9ae64e2c7bb3db54816a5ba494cfb0bcebbc42d47f4cc395260a01c6444588ebf0ccae481cbe0db5e3d42646cb78 SHA512 140da5d340ea38d0d431533961d7219414162046d6e1f6c0af582ebf5a92ed4b8a88a87991dc231434bf5a0e7250244283b2d36f519fbcbb62d5bf82d8f10187
-DIST firefox-105.0.2-ach.xpi 462391 BLAKE2B 9f81f3f73fd3f616495e0d3e215cd3164a407a28ec5ccb89a723fa02f32131251b5eab3fc91be15dbcc80fc77041c360791c638c63f8463fd9e2063ade45397a SHA512 c6f202ad025b5cce4b92ed32a55996f5bae9f6a2cbc5d26ead6399332cfe41d9020afe01ad3f4dd21f42d81982ad61e4f718bda006027fb8edc51e2103f17d42
-DIST firefox-105.0.2-af.xpi 426879 BLAKE2B 4635cfeb46eec321bf06b9d2ff2866a112817155de4dfd13fffed3e53ae3e121eaa398655a817bb2d728b86f2d7ab80be680f7a49a252a147785245aa0a7c107 SHA512 5a98eba4e0a00baac7c0f3f824816efb206c4bd8381af56f8956164d50f1afe74988a34bd5f74d5076baab55c6bafb9d08169f6b9491f6fd5e4da3cc40cc0832
-DIST firefox-105.0.2-an.xpi 507319 BLAKE2B 01c9eedc3a2784b3bde71d9e9edb5a2da8b329c21e5a048334cbc021f67f3980905ad0040cd9a3ddc12f7b844957817351f471711172f55242edacfae6d5f65a SHA512 d3857557ca2cfc20bc95d61d564e17d102d56c5de5f8b9f8529ff098aa3fe6dd3264d7cdddd78498252f42053349f68ddce496d2c5b61bc6d0e08a618dee605f
-DIST firefox-105.0.2-ar.xpi 571520 BLAKE2B ac4ee3a8906ee9e32256038753854badec8ce610930276b558f64b6cb17c09d7b995e8f1de48b9a13fb52a1a5708821a27b9502fcc83ed4f1e7f12ed84264def SHA512 d082aac8ce3d1d5e0afa5b019c57dbb47b1d43b75334f451b21b1a931b29325bf70849c581dab334f0f49cee70eca1aec1eb5fb745f4197d4c51623edfb0bb54
-DIST firefox-105.0.2-ast.xpi 502233 BLAKE2B 6b3baca0af83953bce5214c82ca7b3b89585fc9aecb4e22e676fbd86f4ecd9769bee90d2e7f53786a65d47605f25709aa36701b33a05e2b85279d4a9d4ab7d0f SHA512 c65f70642a917a40eb63a95d4e773afadbdb0048ba1b4f6120f11d22d15317c1326ae47755425e396a2c05a8d36d02e9153047ba7a3b9b5902bf90e15bb1f39f
-DIST firefox-105.0.2-az.xpi 494481 BLAKE2B 5f3c0f47c70945512bcd2d8ce77163d1222cafac66d6f40cf72f3c3285efe86c0a77b0d43e9f023f8175247330d11242bb9b0cc25aac5b4e984c060240f8a0a1 SHA512 09c48ec36988b66486a8cca6584f9e95172f24ec2b9222aa148c82f923a5fb773f65e6ba8effbc9de051488b6e2b7fb3e2c8ebb24084d0513b604574d66c49dd
-DIST firefox-105.0.2-be.xpi 647127 BLAKE2B a35edee8ea0dbcf970797ce1ef26e58d7b336bf4ea81fc5df4e85ae64a2a316237ba35c76a49cdd19006063d03cbcdb633353948b131cb099d3d7a09c2abb0c2 SHA512 26f97144bc0aa86917d39abf2df6a7ff71b0b32840730f67bf55c7ead27fd2711fe935753df3c743a00548bc777b8e300558a2a0a77c9b88e911b799cd3a69e1
-DIST firefox-105.0.2-bg.xpi 587140 BLAKE2B 6af462bb2ab04a951c7761218667058daa3c8d0c94e052176b38cc5223addc08392769778af58377876aadb6d72d5f5dc729d15ff11a171574f904f6c875ba5e SHA512 71839cfc774a01cf5e006acc6a3cd9f78f748f1c3902826d59c28a22dfbc8d930b9f6d695b1eb06ac4b24b8e4e01046d26b7252bddafc64fd435e63dcdb92ddc
-DIST firefox-105.0.2-bn.xpi 585368 BLAKE2B f04d81ac30695ccf974ae20e685cba3a714203dd5aec27b8a474fdfaf51033661852bea98408a9c4f3ef8417e39cf973e95a0aaeee6f3c844ef3019a6eb971cc SHA512 788cf144dfb42b5433c718bb422a5654ce1f6f726ed2a65b3b3fda9e9ba50ce2a5c094dd8419b0c97bc59ff81872d9cbf9477dd44214584559075fcae0b9c252
-DIST firefox-105.0.2-br.xpi 539966 BLAKE2B 0a4b89e3fdf802b3eb1993a9d63bb525abcd39531106f429033f35e5c88e03f00b5ddc4ca14bfd7bd57bec09822b5ecbfb1179d293593d28ace4b7448e60686b SHA512 bb546c791a44da27146c1874286d9a1ac3fc50d5c455d1ea9e6821d1422fdd4333cc7a0cdcf6d2d81d2a5c40e890bbbb849d38d336ac9c4490e0e50dbdae223a
-DIST firefox-105.0.2-bs.xpi 470953 BLAKE2B 28e3474d912227a80b43da629b9bbe0e2d3e4e31f0605c697b9464eff598dd1f95181ebf1c2f7ef67e374e0387c77812664260bd0504fdbec371ce060e3831fe SHA512 b70570bce2139c7117fbc8159ce194e7d4b9d2777c551cc81c258ebbe66fd79ce0c215afc6b2f9b0678a7a62377653942b7c2c8b8091129cb3c585a2d543efa4
-DIST firefox-105.0.2-ca-valencia.xpi 546426 BLAKE2B 65326ae5b3b91f00ad7c3c31125a39142492c767559cba70437f8232d02e4a13428a972ca1d2f253b1e488a4b4f3311a3bdf3e6e116af13d9a89051530d5ca5a SHA512 16a40af9545846298d55070136e43af57295c264cd8dcc93633ce11041400707fe8211063e46333cb7dadeb489c031919fb46ebe442b1a391038309bc33d1436
-DIST firefox-105.0.2-ca.xpi 549857 BLAKE2B 00b0b750ff0c9f3e208fd1705ec209084c34bf4e56ff46277b0aed73036d1c96a68ffeadd2a36111c631355f374ab160c79c422b099d6ad2fbbdb90074aa773f SHA512 912b56033a54ea3d45633f5393748377d178cee7c2f472248d69c0545b705266f7305d112715d36ba575dff9aa09a95f4e0bc36672101c161d57c39d5944076a
-DIST firefox-105.0.2-cak.xpi 559990 BLAKE2B 9ae57c23e5a4b5b4921e1c09510f0964bbb448f6e5e55a2caa8cb676478fb71a3771b47c1ee1e2250589bcb5517a6a951502fed9c4f955f9f182986e6fdd1fe7 SHA512 600a1b9babe5b40442d10b0162e6080920f563cadbe03d15457aa4a71088e56017936c78e0eeb6ec21fc37f20d3d4b6b47dc3bcd607e79e9165cc58c0124ee03
-DIST firefox-105.0.2-cs.xpi 581735 BLAKE2B ccb36c77d6ddba17017b748c34de7ed0f37b07748051d148c7660dc75127e9df8f4d3c02a542226073f28755eda2d19b3037175a479f9d30b04a57bec267b33b SHA512 21bd4ae4f92dc1c6bd87a5989c198e8cfdb9b4ec604e4c6fe455d48f792e2c03b63cef9c052bbe24fe1f153637df4261bc04a312037b477d6386a8b1b0882a56
-DIST firefox-105.0.2-cy.xpi 562730 BLAKE2B c00bdaf2d4b8b8a89b4f9cff462d6ccc771a208c2b2cdf8d5f83eeef9975f91122e3cee6c843fd88f3c880015995b60a4fe659d3d18246099b3a1cc107bc65fe SHA512 c62d561bcc3294be67231b12ad326fb910f96c2500dfd405db73ec3dd77e9983eb3754d6a2f37eeb6ef3507a44699d4e9f707da0782abcaedada21d7dac011d0
-DIST firefox-105.0.2-da.xpi 553592 BLAKE2B d619659f46f6fadcd0149dbf2f74acd69a7bce12c6a12e0dd29a70492bf0630fde34e23bfe7948907542ad91a321b75877d9d71d11482c3afed00929b2533eef SHA512 775de9c470f9cd08eaae484e3e7fc6083464ed9636f49a5328be596dc1ae7e57167e4dde462a74f8b0a754ef8a84f48a9f33fc8d37852409787f6f9704f9c802
-DIST firefox-105.0.2-de.xpi 574355 BLAKE2B 53b41e092a4f341eeaf28ae621f4ec3e8776cd482a53098cace4fdcdedc30cc4144e996530acb8f76aac8e8baf7cf2b6ead541783d90db2e63c143c6e9479257 SHA512 caa2f03277946d819214df127ebb5d13534fa1ac9633e560b4194234faf893c48b7becc6238d1e30100d431289dc2469e623998fa517308d64b6e31bb7dade56
-DIST firefox-105.0.2-dsb.xpi 587695 BLAKE2B a9b84253f0d47007924a99d7b5bbf3b289a2363f56ff3ef9d2d727eb85ef7dc71258952ce8b3443f2ac2ee4137afac328cdce83d108989d8141a92401c821fd7 SHA512 944f42bf5ba38d2f9aacf65bf3a762bce77dd5b9dc53e33004482b868a8c69dab934c1d883c2ebcb9661ee730efb427b2b0e166d24381796b04580f719daf279
-DIST firefox-105.0.2-el.xpi 663186 BLAKE2B 511539d15d52006e37e0327c1c0b22401e71504233cc25e9ebfe679262e05cb65627f065d1fe6a37a171abd058c1db92ef78432803a120d74cac8298cd60fd1f SHA512 beb94e7f840dac1745c6d332d6694be9f803a950976e573f29646b0faad5df91e7d821fb3fde945b5285e5e7e10f0ec39e2f60e5e35d98ee90c47d7cdadcdf89
-DIST firefox-105.0.2-en-CA.xpi 523073 BLAKE2B 748421a0eff80fbff1f9dbb80b646480b73c48825704fac6f8b0a8affe1a1832bb3bc11011d837919134594de78c7a4c939d49322983e3797b3b99ce59d26c67 SHA512 e02a51f671cc79140d0c1c8b4884c30653037fc7e90e0f0063b67895e524f6db7576efc521dbd31a0dc8f4bc13bf787e445f005b17d6036b496c6e19a5f3bacc
-DIST firefox-105.0.2-en-GB.xpi 530696 BLAKE2B 94a7ac14d7f783521dea81b62766b4f3a51b82368c097df055bd277dbbc183e0184f19422adf89247cbdd48acaaf609ae3a50b29a8d9b8ef5601b2929308961b SHA512 fe6dfd391693661a481b6939597276e821cba417eea8ff6243da77bcb823a137f359a54fd633f55a5b72094e8a48f251f3d319e9ca09a0e05263a212293d1bff
-DIST firefox-105.0.2-eo.xpi 554046 BLAKE2B 9f071b86a6d9b1d080d37de736d37eccb034dc2d04a87d6c1f8243dd1729c0a15de017c5373c152a26644f3c9f7c1c86d72f0723be8cb258d801ceb9235a77b3 SHA512 05c48cddd2c9d773561aaf5b331112b58c79e4c9e0ab3823549a5360b618932bed00cea63d7c5486c66c64218aef78318cf5746641557872eab8ac75d0613de2
-DIST firefox-105.0.2-es-AR.xpi 568715 BLAKE2B 48f6219030d8de47ea70e2575c20758e38ab7b568543c166c6e5b263ecb57b6e9fbd749074216f791f65854bcf1c8144bc181cb05b0fd6656d9dbab8573d4901 SHA512 89a4c9bf604b12ac2e8c3838810ea8fdf9b230ac2f19be15939e5ccb8776f2f3f1439be2287341ebe0921ec78a040631ac7ce1bf1c034ba7ed1f730e8968e440
-DIST firefox-105.0.2-es-CL.xpi 567813 BLAKE2B 712cc833ae89c4d95107cd99f75faa387531b867599a2e26973ee5ca1d053ebe1ad4a206f7b8befd9766caddc8ac96e9f68f2a0d2581f3cf2be2c2e3b7e59b75 SHA512 8120371a7346ff95da760e27c250f50c223d5b32fa0e6fce73914e37a47beebae60885b5537cf627a15d4f75e5a777211d8a9bfe27f34c8370e2a21e1c0fc676
-DIST firefox-105.0.2-es-ES.xpi 553328 BLAKE2B be7eb7433d61cd31989ed80974a27424caa31958217b0d35e9bfb9ad711bd1adb670d9dc0ee7aa71bb6f136d74521d7dcf1dce69675be939d7d9171ee74bed4e SHA512 b28cdd4117168a21c705ba8e20373574c422b0d4938396b297f76395792282a920eca98dc2c6b0d9bd1df20f7dd8dae5f67a9e6865c9da2dbcc882fd94e6f3b5
-DIST firefox-105.0.2-es-MX.xpi 571868 BLAKE2B c543064b6d40624e9f57d9ffc80541ff6f2fd1f4d742572c9665a696fb56bcd190a5de3637d1790fa0b25f3ad1759bd3b4be74c444747184c5003902197b6569 SHA512 eb6b65b9e2dc341cddd35aee7b5afd06bea4ee53cb5f8172e103d64ed985d8049c70e9249a8f8c51074d2c727c66d6c159a0435c09899c8ea36c862688e5f724
-DIST firefox-105.0.2-et.xpi 539893 BLAKE2B c28506dae8d9f1efadc99cf8de6f9bbecbb37c4780c1e10d2bd976b5816cc6f7e603c19ff0413e5e47eabdfb343ce884416aea5ddf64426949f929fe35d86e4a SHA512 889a3ea25723267092a1cf7479987ef93b6305947bd2fb7682803e44aaa94365ea6da1f955d560b567ea77166201cfff9e0857ba0a2a891703860d898917fe66
-DIST firefox-105.0.2-eu.xpi 556241 BLAKE2B 6357354b9234585062fa200ba378919cd60a6f84b7382f33e71530c2d688b33e1ac7bd91093d718c04e766178c44099ac78794315c4373d1232aad70898d1e6a SHA512 1a6413a3d4af7fbf174fb245fbf558549db51ed1d51861b86656222c1ec00fea70253720412fd7bd1a30e0fe034d0aa77fe53164022355f8cf0d9db974f60385
-DIST firefox-105.0.2-fa.xpi 571117 BLAKE2B fca76032dc92af5b980e5683c3a6a3bc69a3f1608ffc4e0144e61b19fa3d4e48632f4b5eb7bcb9f4899dd1241fb649f8d195a685ff6b9938a8bac46fbf939151 SHA512 004e0cf5efc9ca14df73529a2449b7ece5ced626288d9424e3913921901c6fd9de617f75fe13330a866fe28c9a47913abbd232fe24bdf6539e6000a14e18540c
-DIST firefox-105.0.2-ff.xpi 481142 BLAKE2B 0382a55580a424337ec6dbd3efdbcea4ff6f98ad98593a3e6df7392e2aab1d06ca2063b5ec1c86f8dda857c50be39af0cf36d605791f32d6c02b326651e32341 SHA512 728f94c6b71498cab1e66f3aef0f561e3d676ebdc1bac5398980397afed21da232ac9c2985ffee079a53a198d5a5dd5f9c8e520f6a3a8b3b70fde14ea07e75b8
-DIST firefox-105.0.2-fi.xpi 552067 BLAKE2B 273af3719257320d79ac206c907bea0b278241d2497f798f9afd8925827b6fecc9462d16b67cb7cb54586322ee7a476419f29cad33b1508a99c26d22d027e755 SHA512 4ff1b20dccd06ea78ac2b8588e88254662d119637edb4b3d176e204a42e6201eb81381e7b53fb4d98c37a19addaba6ae3698dfeaaa6d2a23065af1378fd8956a
-DIST firefox-105.0.2-fr.xpi 580226 BLAKE2B 997438094937024513daa2fcbbc5a7dccb70706e0292ab58630d7fa83668535e099163cf336418e8651407e246837ae919663053108ac8dcbc8749f39fb06b12 SHA512 87cc753dd7d07f791996fcaa13d4a058ffc7db7884b8150630d25e5da4cda5eca5eec0db3a054dca5c9dbf31e802b65c0aeab83492f76f240cfb1f8ee48e6c45
-DIST firefox-105.0.2-fy-NL.xpi 564523 BLAKE2B 9fd34d35c3f9b1b7716cce11aea6902813a4227259b33324150fbb494753d92a35b3f54775aebc2957fafc0b8967ddd68d59509c960758a2cba3e6417c6e5f47 SHA512 b9ab504502de460bb98f96001f96794545c2d565c9b78cbd5e581b51ff7234a4f92e5e1129f953b4ae0c862a45ae0df30a43edfe4ba7e0b2e8ac2bd2bd0d43b4
-DIST firefox-105.0.2-ga-IE.xpi 479298 BLAKE2B ee35cbc6b9f94671afc3223de9e7f070f20b96de787e30535975db1d6eddeebca4a9f8477400d05d4248f2b635cb094992f01d9b8f798eaf57f97150afadfca1 SHA512 922659b1536a28a73ff8047a5cdd2cc3875e2c761cb98acb239f1eabc72aa39647a4f086cfc12af3fe69e46bf9203fce7c12813b99bc72712889c43c373b72c0
-DIST firefox-105.0.2-gd.xpi 552649 BLAKE2B 74e95bcddd8aa7ae80c03d31d3bcc78bf5d2e4a32636c6da7f550ebc2c1fedcd4f209722761f140e66bff3b3eb7f3bf0b0f7b9ce432323e82c97fdca37155d5e SHA512 4c153764aec66677b7d9da70643710bc0553ebfefc2bd5d365afa0267396fe0f34f98bfa08cb118acaa42b36574842720048da88833b9bce594550ad9be7035e
-DIST firefox-105.0.2-gl.xpi 548793 BLAKE2B 135d55e43c2c59357f8b074b32d8b5767973ec9336eed0778990d010ca77a5c99dae77d5f91b331d509905dabb142e5d0ba9475d0fc7368d6522f672d7edbcb9 SHA512 d63d78644218a73e819df2f72eb686b2cf67732db33f6b63b254cba1da1ee8c6a866ff0b58c039854d7dc7287f78461ae1982884826648b81ec828e994458476
-DIST firefox-105.0.2-gn.xpi 579022 BLAKE2B 5db2fdfce8876095a6f3eec8c2d028319a383a46527e6e99cc4f197c32ec137b0e3d6a268e26b9df4ec70cfbd32c865ba15efa907c1cceb41d4df6025111b925 SHA512 5cbac237d4169bd69ca0e436a3cf17ffa7d2119924f37de749ca6dbb26a6238b5af79e3970d9f630e52b9655d3b6914d2a8880ac98c7b0be1779be0397f4b8c3
-DIST firefox-105.0.2-gu-IN.xpi 536346 BLAKE2B d01ee9f850392293e9f8c8b3c58f345b270ee18902ce76fc3a5917a7a1522abc91e7dc64c7169a95ec5e4e8160e228c4006b2b2cfdd29596fe4486eb064f9399 SHA512 adbd5a13cc0c3b88b61fe2e534ac9cdf62eb3d368de75b38c82d877714f3c30d348cb96a12b9af9c43347fd5aaba66dded560365cefdd24d53cdaac402d30158
-DIST firefox-105.0.2-he.xpi 575463 BLAKE2B cf12486a720fc4214b5df159d7ea5d2bdf82ad3d9566e31b298b3aa2ccff286d1b59677ee6bdbce7ed1a2e8ceca575869aee01752211c678e3ea62d9ad429597 SHA512 1b2fdaf49a552f960b625c45647e919c458f25edb3b47215a3a3a1e7ea2fbd50993578bd60244ca40195ca69efd1f0502958afad26f4d5678c8dcd55cb2ce95f
-DIST firefox-105.0.2-hi-IN.xpi 566805 BLAKE2B bfc296aa079b42deca8ab19da62568389263b7755883879c88f026f4ba3badb2a84762708d011f5d7aeb33574d4d80dff6a76b9a946ed01b3b5013a17c75c476 SHA512 39185e597b71e97e2a126fdcdb193152f3c191af86c4f8b73129a0cf2c6146b67084a492bfde5a648d28bf735082e0dbf86be9290c25230a4bb1e1495d71ea82
-DIST firefox-105.0.2-hr.xpi 539465 BLAKE2B 161d395c3c18d89d80ad88f0aa4e6ea43b47bdb6cd7da1dc85f1c200b9ab3ad74770a3adfa15e767f0461452da5a260a67217947f44d8bb7cbe769c3e921bffc SHA512 85e9dd87f45634ce5344b9f4f705251413be8048fd438e341d8311424e81fb03626d4b67df11fd31fe9fdd41a71705d47fe2f358b2a11deea0b8715f5f36ddcf
-DIST firefox-105.0.2-hsb.xpi 583869 BLAKE2B 7e9c3b2b5190f9aadf66486cc6b7ddf9b551309ff9f202bdc419c992d75d0285adf78d669522fa801d814176d6ae7dde95b1e8ee2e0a89cab34c759cc0c85bfe SHA512 2105e5bac07bc11cca7357853abe9d13d37681cb051cd89e34b8c5662168deef74bb63fb36c264ed05af7912770e14f4b0d6bd2c2372cd197d9469594c7b1058
-DIST firefox-105.0.2-hu.xpi 588455 BLAKE2B 31bc6acb3bae6f04331894bbd0bfb7d75cfec5986d49e0754cd6da5fa7be082c3bdc662dd302546c0a79b70342bc6984fb905380bbb95ab9382832bbc14bc021 SHA512 f829abe9d78b76f12e27b36c2f0560156d0d603ed5c21fee94a30013c6201d9d4fd002ec9ae775f48c3549067ebd1f6ffe6d024833e8e8432b69248eac742112
-DIST firefox-105.0.2-hy-AM.xpi 591365 BLAKE2B a03540a5115f6e00d13d809402486b9ec5566c9dfeb0c5a40b67f959dc20b0f2a363b437ff629dc9ddb6022c00c3d5320f05b182ac3e37ca05f37de2b64450f0 SHA512 31e36b5ca62cbd39630a82715b4e7fc9b96b151e4e4c4e84ebcf6fb5e580b3fe02ba5d24bf164abb4b2eab78609a0564486e6b0e9d55783db95a4337d9b61b15
-DIST firefox-105.0.2-ia.xpi 553264 BLAKE2B ab39a8ae95b164e223aa903510f00fa6059306ee6442c4ac894d6de0f50aaa30d4a15d38f16ac06940f705cedad6d3d1c830fe3a6cfe8c3434201458b15c92fd SHA512 a368af9ab1c8bdcdb8df23c16d8072c076af2aae511cc2a84c1f693f232f3305a26b6440f850a12aaa4ee05fe5cc750dd6a0c425b06712070a5e8cd210edb74c
-DIST firefox-105.0.2-id.xpi 550335 BLAKE2B dc8a6307176a2f8f2a6368749e8f9e9a7320d4244434768b85183505a9c8d5163542a453641725586c76bec814ede5a19a88112f996a8fe9be31cd7b4a5ceeff SHA512 fbc9068c66d3e7f16aca2d8e51411f57f1976a95859f2b794c07c74a135f0c85e008ef59b9a4ead8852cbafd8c9189adb6dbbe6fb9ddfc393fab6c659abb9311
-DIST firefox-105.0.2-is.xpi 560812 BLAKE2B 1182c294e5a76da3f13b71f46b11424e8e2dee07ec598051969a30ddbc2abd077dc4d44ef4f4f9cdc524b87335e7e25b3efbad1782b40c42f9246d454da36c81 SHA512 936c3e0e52113544e6f5780cc3ad9026b2a9545bb1cd505f40592efed072d7aa5c66ea1aaefe5cb0e5bacca9c75fa8f77fbfd21bc67384dbbf3fd17141abcbb9
-DIST firefox-105.0.2-it.xpi 471258 BLAKE2B 05cff008ec080bf47918fb0f4dabaf17f3826fd68c6c02fefcb59c867011e62246d5c142e843be4db65bd594bae40e6d29f02e750b390be60e8923e0ba4591a1 SHA512 e41202b8dc98966c4624654d4d748adec28c9374dcec30386b99bf604be2d0fe93b80b18149c224f041f4af8c9e41fe4cf35727a5e7f10420ee44efec9fc7135
-DIST firefox-105.0.2-ja.xpi 593781 BLAKE2B fa2b731ec606d949f3456787c80cd783c5310362f23ef440df46b83def7ac57ea54986283077bc37345c52874edafe147aab6feef11cc314704948e9c8685586 SHA512 77c3e9076b2a24b2bc999fed73338d1c628bb8d3bbdec2165cb9098bb56eb389cdcb3bceb3f3a0cd8b60622ee36d289de9febd008fd64efe21e58030e1ee1f7c
-DIST firefox-105.0.2-ka.xpi 614606 BLAKE2B 5db2ebb8c3330339397b1c4a0029673a4b87b473cac6199c5316659dced0c09fd156a48ab1710bfeac8b627f8c499f5731b71bac4b2b80dc87c8bdba3514c75c SHA512 6a5602c95d56da7eaa968996547e9b08dbc60c43d0e990ae61f652af0c894a20ec7398b9b4e3026aaf2ceb1e3d017e47aeddffac5244ec0f43c51ad4361a9efe
-DIST firefox-105.0.2-kab.xpi 573733 BLAKE2B fc06539af9610e0219c9c76fd558ca348a93ef70e84bb1edb0c0f9d6cb093a633121dc84577b4721d77fce17a4acebcec765c1bd6d1cc5a9b31f4400ae1f6464 SHA512 56ce13fd7acbe8f89004014c27271ea037e20a7f2d7bbaab2ee3acc12e3381ec9e2d1f91f2794c289d337280ef2902446fd577db8d435e543aa62ae16b4bb30b
-DIST firefox-105.0.2-kk.xpi 631204 BLAKE2B 77de41694d8b20d475ff5804bf03faa81cf6e8335fd3e5ad31adc541aa29638c3d3f6e43895afd7961ec32133b2a3deed1bbb5a77eec12399de417e5c53a06d6 SHA512 8433172fd1518933e17f36f146b2aebe6433a786c9d0a5fef2643aa7cb5b2c57108baaf83187860798e21d533dc0677814bbdbbcca8c5ec0662e027d78b788c2
-DIST firefox-105.0.2-km.xpi 540639 BLAKE2B dc637b0f092d4987174c71ff4d4effa805d73f5b40280df5de684081fa4fec4f076468566922fa88cae86fbbfe5cce43597b34f0107ce3f8dfb330a91b19fdf8 SHA512 9d34bc9d55b8af500520618eddf88167bd19684bb2855d6b21b2d95268eb9c84dfd6e725f1d999c288fc0ef200834fa37b90df241bcde013ab4fd6b83193aca8
-DIST firefox-105.0.2-kn.xpi 506463 BLAKE2B d738431c8d3b6bfbfe90106130c35033e3eb24513e2ac82088495240e855d5350a907aad0bebb407574e9f25c34cdc767f2f5e160cae9a50188acd5739563c92 SHA512 0c073a6a36655415030357e1a524253228edc79958c8f667cb97c9e0e2724e6d320160b5bd5b077e91661dd7b4e7aa6ebe70693f247c545078fedef82a67aa1d
-DIST firefox-105.0.2-ko.xpi 600527 BLAKE2B 2c4b4484986851912c4cfbe016e2b080af2f2e571b1d3e105ae3861b8ae145b3de78d9d1dce2ab47b8595a65005c3ed37533f8c78c3c61bf4e735b1b024deeb4 SHA512 64641a3cd47d4ea247f98649ea37655c8121267be4ce86037a1d5b2d0a8a8227a11497d2375a41f0ad7b651a38b696721bbd8a5074a933a938e0a889a3dd502a
-DIST firefox-105.0.2-lij.xpi 479004 BLAKE2B 5ebd246289cc6a3a3678d631e512eb87c9b6e1d3d32f57c57c06067aac810bfa57a719546ae68918d9a328a38ed7db16e4808e982eda410c603ac03ce7cca17e SHA512 e8eff656624960054785f1f41316cd033e3cdf611519c7faa89787159c21998e1b0a4c02103fc7b3ea2b67f37e94abf222819d7603c200dd6d508bf0bcb9fb3b
-DIST firefox-105.0.2-lt.xpi 570062 BLAKE2B 92ab598525aef040e1306ea1cf1cf87d9570b59af8150126415068633f380724e7aca9f280c12d9f5e7107c64afaffc0b65925eb4ed1f66f2b0decf645a13905 SHA512 f02380bb025843dd5699902d6ddd22e38051a9fe5909d9dd04c9d32ef1a4aa380404c031d88db3689a197b28a3f647a9a5d8bafec3034a21fcfcef226e0cef05
-DIST firefox-105.0.2-lv.xpi 472208 BLAKE2B 8727f396c7e64de6d66e7677972ac7142557bfa3c4dba53d1ecc4c902ab9572968a8108f4f96e1b99862290e5c3d3cbbad54f83b37613684702ca1ebc888bdc6 SHA512 4a6cdf9945ff7e00d0abeaac8df1e484498d6e9da2e489828f75959890688c497972ac2a466cab487a32a7782033a70a3568f5ea1ed6b52659872542f14fbf30
-DIST firefox-105.0.2-mk.xpi 490866 BLAKE2B 1a3259166faadf2996e60b7911981541c6dcd7eb6b2c74932fbcbb02ecdadd97a15215cf8a3276edf5fc400b60f2bca1d4e6ed056519b6f621112998a1586bfd SHA512 7dd9b7fb92111e36cd9ee913fbaa85a8e8ea795e22b9867bd0ae465c2e2e3171516909266fc645c6d23c968a069237c19683f158b4475e6c41fc3363eb81abea
-DIST firefox-105.0.2-mr.xpi 539894 BLAKE2B cec13d18f7f9f159058f824a60347f017a95dfb8610b1d0fe06c29e06d3fc065511288c4418add83d06d730cc70338caed72068cf0ba3c7ef248dc91da261b1f SHA512 3cdd72a08cfc9dab83319cbcff0bee1d5e23a568dfd62a3ed2822114ed07005d66e3f6db2df73892243159c589e26272231d13cb47ad194afb4578430596bce4
-DIST firefox-105.0.2-ms.xpi 457120 BLAKE2B 0c22455c08f6206b4217464379a64658f14286300b600027c9991cb2c04f2448f45be2547959b4d6dd32ec73b96b7d10badb288d4c7992ab3b06e7768f79d4dc SHA512 4162c44076a79251b63bae7a747561bf9721edde8a5434b988b98d34df724591f945010b03eb016d393cb5060309a0ef75cc875bd77ed5e60a858c23a452b31a
-DIST firefox-105.0.2-my.xpi 520844 BLAKE2B 7b999dc1294e0573ee41386f4ec1a04f19572950085c342850b544939063682e2adbba6152dc80e0baac85a962373f9209b95006ccea845c4ec06a9a2cdb5ccc SHA512 e0eb4c0c406cb17ebe92dbc1670bc65dbe2e357e95dbd3ff664f99bab7cc000d7adeca95dd9fbc0adf3e0cdadf190c030d0d4d25ae36198e03f973f9a4177c8a
-DIST firefox-105.0.2-nb-NO.xpi 549443 BLAKE2B 9f956621045003c573e2caa5c74fe017b59eb1665456bb950d449a07f20c53ad2bb1e05e02f47280114f3bba36001bdc305ca196f6f19800b83e44d4d08eba2b SHA512 9d79a8f27df35757f41d8ab5db1de6b787606d9f845bb88599cd9078448f08158e51f5d10d6ab4713e0ca4b3fb292335056211fb546b5ad2d914ef2e907a839a
-DIST firefox-105.0.2-ne-NP.xpi 498120 BLAKE2B a16bce2197c3808f16d2f36a49429dcc75006eed6ff528a6c0cf9ff57ad4193e54706f18ce78f489fa5c4631bf06c96798fd0daea5aa13afe3563a2dde8e6a5d SHA512 8a06dc72092c6dc09edb29b9d188668615e2e34368321936af44bd38f58bb21c498a8176e2f56d6c102dfd7663398a6bcc4b21b12cd23a8efdb8d0a512965085
-DIST firefox-105.0.2-nl.xpi 558682 BLAKE2B 25a6ad19d04bc652384b12eb70677ab8a7cc65d6268958466eae9d2f62bfe7e2c4a482de4c0968e35a752d3ded0dcd855e1e1867713f5e39928c15e72fa5c8c1 SHA512 0e2a606d4ca500d4b70e3f629b17b51f2fc7fef58a986a3515320b41e0479578d632924fdbd5b0af6a72f56e02ac4c4b6ec97f21363f48aaa0140656409f8c15
-DIST firefox-105.0.2-nn-NO.xpi 549960 BLAKE2B d4d83daa43a715e79c4a29e0a9b0c72667392ef2461c5996a4a1237d4ee2158dba6cb2853e977b5bf54c179c06c05884360f31625317c709f1e92b61ccee3746 SHA512 ca5721d397699573ccabbd27cedc011777abf1720e5e798d8946a96bc18949f23a1307271bc9948b26093fa855cce1b0a9af67be0dfc2e74bb2c0d49bf8966eb
-DIST firefox-105.0.2-oc.xpi 569604 BLAKE2B 753263c3baf420a020eecef985a1d07f001077993cc2df29c1b7e935d7e13fccab041d6c7930beb44c6b26e430cdb1403ab1cf3e1977eb8b226067e34444d920 SHA512 6a8cdc4c0e72e0db6cdad8a0e23501aa8a3f7a3845dab0c37f9b107c856ba8a9d48454cbacbc3a135ee65360d1da6a7adb8d1476b8c141e45a8344c3708a64a3
-DIST firefox-105.0.2-pa-IN.xpi 621212 BLAKE2B bfadf1e8ab2df2be22f84fb7c8a901e104a032f22868908414323ce2a9be65de873be362e0e48b6f057f3d4d6dc56bfa325be8024fd584fe3cd60aecd7b4dfe9 SHA512 107853f670afa0acc5e8968f210b9d9a85e93da23030e05959ba413cf8579bfb924f3b5692d54d23bb94693e212b84b4d22c4f4560d24c3855d4e8c244c333dd
-DIST firefox-105.0.2-pl.xpi 579337 BLAKE2B 9f694fb64a8037060211f669bd2b4865e12988e86b70965f49f9f8cd87d808a1dfc5d3a6bf7f22846da67e3c2c6f57cd9f8b051bd22df2bdb05dc40561117272 SHA512 0f79f8dad4ae55ced8e426136a27358254a5155f96ad6e74a1f3ac410180f3fab44b691ad9f3e90e446ece375c90b27fbe8df0dbc7b3dfd86e95c168c87fcbb3
-DIST firefox-105.0.2-pt-BR.xpi 563724 BLAKE2B 6108ad4774905ed8e1978d4af9b19c5420032b9ca7619cbc5d129afbd91d17ab6ccc429a77e3fc83cd8e58649e5223f8e06c411cfebad0e683747f2db465d98f SHA512 5d5e1834b394c1f27ce9acb0858aa114c9fbb97f9bc49d91b65e0d49d733b5233f7f01d30f4baab6adb62c9142cfdd96f8fe29e7c555c9fb60d18775131684b8
-DIST firefox-105.0.2-pt-PT.xpi 563885 BLAKE2B 522266f206108090f0c5775a241d05ef52ff47bc866f75addef0dfe67c06d170874ec687541573a13d018578d1f27d04e40a6f3468819d37747bd35f7571915b SHA512 5157855e5d111a693f1b904de840d1d9be7982389492888b1a95d1c78f5e4c1a08923d2a84333e3e1428d52dbfa7bd3096fe4045ceb6480a14eb2d7dbfc0d435
-DIST firefox-105.0.2-rm.xpi 547530 BLAKE2B 41eb8198de05b03ac4bd46bf9f6f4f15b33f947fa6c166ed61ca874f5d5049f6b757b63824ed4ef78cf281c708a6d885c2eea2fbecc25451ff0a0ff6cd24d6ea SHA512 716900f7c6dd71729558923d8c8922201e3daacb557fe5013fefc2222693ec2b4b7b1dd94c5dc600b97f09da32d5d6c3a01b7cd9c1027a406e7785e3c8f6586c
-DIST firefox-105.0.2-ro.xpi 537771 BLAKE2B 4c4b399d81d0bf477206416767564ddd2ccb91cfbd266c9d23cb7bc781a4cafffa7ba86da3c7036cc64faf349afbc9c50676eb2797c8fee320b55f746a4ab4fb SHA512 f6475731eb5ac23fea200f357a917fc705dd6bb53795e1b5d9511396f478ccb947a50f024447670d40b8f76d45fb8e64811cd08668e86b36583899199758fdce
-DIST firefox-105.0.2-ru.xpi 651176 BLAKE2B d23b863128d69f50b44955613c15604fc76c99f782501296455d7084b1a7c1ce4b29903652d48745e364d760bb23ba89070da078ed64d649d8809c5451f091fd SHA512 df80b532a180e6174664fd3920180f6fd4dec999e67115054b46c34bd7a5feacd30d038fdca9c5251a11ec2c69addf1152ac39472178cfea07f2e324d92df77b
-DIST firefox-105.0.2-sco.xpi 505200 BLAKE2B fcbad87d322d5dfb0a08efb297b6e9eff29e6bb11feb1cffa29c825d0a57f06d6a6b3ea8c06c617b72e76543d0779bee550bfaf900ff8427b8f1140250323097 SHA512 0f3a4fc9f6eaaf98303f79e404dac201ff26bb9d131fb3747242fef3ec0e27173e669b00a06b9a26c452d544009404768426c7c40bb84d16060995205d0d124d
-DIST firefox-105.0.2-si.xpi 573141 BLAKE2B def1a9fee03d08b66f3bb2e1efb3ac15204ed8665b9c1f74019f2f416ba1d7921476be868c18fcb94b90e04ddb553543137f39d708819385fd7c8d2129582a81 SHA512 217dc40d788645d07f602f6909bfc3b4b6501161fb4a032da4ab19fba980d6fa680c6946833fceaca417f4b97de330b8bf73f38b9fd561cbc784aaa7b3185d55
-DIST firefox-105.0.2-sk.xpi 588220 BLAKE2B 649bc547f8e0f76c54a851f4f9097d25f6076f16a3cd9f3b356af503a58fa6061c395dc7800ba8598e9a70ddb362a64120c4b0582b9006963032ca75396f36ed SHA512 eafcd8fea9a51480177be4ae7c3d2622eff0c0642dc6d0d08e5c9406525d286dc0d430bade1877e2cb4a429b497fe3bebc1524fee770e15335751a7af4869419
-DIST firefox-105.0.2-sl.xpi 561133 BLAKE2B 6f182a93f64f273fc251514c0cf8868513fbea4b519a51760e5eaeea0a1d224646087261e8115b20ee18fd800cdb1b5abc1e4d6cc27e6ce02e957b5283cecf0e SHA512 e2fd7db4e37ba1fec406b554b8730d53ff36dfa4136efaef942fa05afc7b125f3bf98c0478fb6591f1dfed7a10bab4b9bf2d4710673e7c29f9274fbb91d70b57
-DIST firefox-105.0.2-son.xpi 433323 BLAKE2B 423c15959c5b00bf743f6c9569d0059faac22066524cae248dcc49ff3192fd607ce5ca3258028cda10edb2c5222d759b08fc999451f16b0c1c6b0292fd378bbf SHA512 d65d8bdd5cfa5135ce376e5c7f4f788d60250f13889dbdab6843afdc4ed30106ee055a904c8ffab3d77a48b9a56334772ca08d735979c9e04ed754d2de50ab82
-DIST firefox-105.0.2-sq.xpi 565442 BLAKE2B fdb1df972ffc71a77fb9f180bd2c4660012a3c7963c7db9bc06ebdb9b3296e2a0d1e431653074866f7e2ac171d892d25f1285210eb1e522ff71bf04acd5ed6e0 SHA512 8653eac8102c7b43da6fd30b7458a6036019de9d97a5f6fda4b0372b27f1d5a33f2887ef8f5d659948f108464421d6217c02e88d8cfebb0e079a510010e0cfe7
-DIST firefox-105.0.2-sr.xpi 604657 BLAKE2B 9abf459951edd1f2d1a698215b63ec0f868d8bafa237a82ab433313a80e9220405fbf84863ae26cea1bf83e0eaac70a355e5710f2cb7b720f9c6545e86ba62e1 SHA512 894daf0c67f31d8f5668ffa7c977b80ca772d15698cbd2e2f6834c9ec23033d8143f4b1731ea4b448af0b510110539973f97b1275bfbab0b2bc1980d1b847ca2
-DIST firefox-105.0.2-sv-SE.xpi 560629 BLAKE2B f760e5db8f846aaccea52e8ba4b6afe4c23232e0199d11a7eb5c81180d06cc57a399f911089f788ea82c4424cede03f8785c65e13e539c5a94bad4752d932f71 SHA512 3325452ea4220f0a39f7da7564371da4093d375cccb51b668ef80af2b094b6e656cf350c0703e35afaeb4e314924c689c38de8826641c592d8580d5e7337247b
-DIST firefox-105.0.2-szl.xpi 520748 BLAKE2B 52a69ee514be1c9b2cbc7059e5b504eff501201111832ff6d709e0b2fc331df4ebd43c522a9ad6e70a4263c0430755a1630ded0ecfc0f71f9d0f83812884c190 SHA512 63f4aa51177ada21945c3a3f854bc9832ff36c1c71b3b0c2ff63b15e30db872d7e68950079890bf61d0b3658682ee91a40f0019bc5f000de9672647ebd13d02e
-DIST firefox-105.0.2-ta.xpi 519016 BLAKE2B 2a259071d0d6a77f6fb1856e2dfad5c06c9afdca1b5af52e9f922c69127e5767ba753497ec6a943086f91735c2837139c368e0168338a688eccd3c84fc8d35af SHA512 b83e641dcd43ad819ff592f47e98117ef489b20e4d2d47b655e9ec2f4525001f2e56fd138c2e744aa3ac872b9f87956414c63fe38d2956d75c1900a799cb9bfb
-DIST firefox-105.0.2-te.xpi 560557 BLAKE2B 334813703d71c92753165f3a6ff07269721f6d50d32afd691655a82dc95f2afabbf8b69983c4e34c105b24d13d5df38ba1ff119fb6df3996b7c98afd00dd80aa SHA512 bc8adb85c9f65cd9eea265d37bf323c1b80917dca252e6d522b33a7edfb49244869a093c62726f0f74e52562361edcc558a585d99fa2af0baa7c6b6da9606853
-DIST firefox-105.0.2-th.xpi 621832 BLAKE2B aa70347ecf893f0cdfffb9ac0e61f04efaf346f4f04f3b7c2a5f862ab00344631f1763c9393d04574433549d0b605b0874a95c1b175a44fcd9db13eb935059d5 SHA512 efdcc907cc964cd5dec9c5556535f565340b35e952483358d6e24be091a942a93dc848c7d632b2dd0fecd473df64a9316285fed6492bd771319d73d1f5d798e1
-DIST firefox-105.0.2-tl.xpi 528007 BLAKE2B 7af70e5c8d1867c90331f5aff1c9aa7fcf95a1f39cd2379b4cb17bf30c9cfe6e60d8ce4368410cb532c6fd3cc1e21e74cdfc181f491dea35006bd17808980013 SHA512 d2d62fa4a327ccd3502b80fbde00f9d4c8644db114c2950901380e0083af6e4452ab9464a615133f0f8467cf16615d24b42efbe442748414b6ee808b3f4630d7
-DIST firefox-105.0.2-tr.xpi 574329 BLAKE2B a3a62faa581a789340d2ad212c4bf803e5ca14d2b6be4865cb0d12bbde07882a98500c34a62a2c55edd75268a4f67d896c593115aef2f72a8034e29a854dd14a SHA512 e5f6421ce6e3da7b870c8cb1884dfa7bab71bacc707ba167dfcc7e558fdf6ac2c31e550067c0ffa7ec51a30f03b0f5bfc00d9ed1b1a81bb46ba06695c6ec7583
-DIST firefox-105.0.2-trs.xpi 498814 BLAKE2B ad77f52bf2ba9dca857b173726551c518ab14c7ada704ffbee4183a0b88ba87869be2eb6ae80f947a906f664f2ae4ea74f9060aa95547db1d14b0a7cae633357 SHA512 92f0f9ab1f2698bd9136119814a34153b131a2bbc5b358f18fd61205a1445b7fa945b24400a147bd2d6a2e27c23590dfcc1ecc7fd0eb7013f1f967d78f0170c8
-DIST firefox-105.0.2-uk.xpi 644340 BLAKE2B d7e9ef6b3de37799a2c432c9ba8d0e9c1aa00c12190823f7d33b7ad9580a85777b8aafb97eb0d31e590cd68737433d55188ce0068e63c6ebc22da08ef6225508 SHA512 77a246ea5d9735dcf485c19802ef4dcda67ed92da2a86cbd0fd7b10d49ffa96738458c019d1bdb7800ddee61f18f2a0d075e649894b879c085e9da0a66ce72f3
-DIST firefox-105.0.2-ur.xpi 566539 BLAKE2B bab7cd6dfe93afbc868e7d917fc981e5a6a075b28608640919e132c59c78ab5326e3715a754f060fd3723a477e5ba346db7ccadd20ae30421d95f3326d06c3f2 SHA512 950b4a90a382e48522e9b9ef90841e13a148d1fa1be510032010f7d9a55a818a4b6758958413a8d6aba36d8cbb3e3c3ea6abf89f05451438930550fe51cd99c7
-DIST firefox-105.0.2-uz.xpi 486870 BLAKE2B e3d241fc034cf2da5ac4cdd4152064a8ad9a353c7db528c32cd87ab0fdc02ddb310581911ae7cdc71d5898fafc4878c6a661b5fa69e3a060bc7888c4fe4d0f82 SHA512 bd5c01ca9564ef53fedbb1f1407c415c4f1220c2bef5dc6de4e647ae0ec45a60cedfc97eebfb8b036719553fd59da1c501032255d6ef07339bef442b559aff96
-DIST firefox-105.0.2-vi.xpi 595145 BLAKE2B 1768fd7fc806be488ecf1ec4f71522bf9def3294369f79261d1a76d248bb1680c9333345000602b2a93ae22c68fc8523f751426b4f4e7c523a5b3cc141694f98 SHA512 a217641e3ebbc6b5e42c8932c16e8ad4364b75bed5b46caf1d0d4579faa2eef40e03854616b018b311d9fd2fa251a5bdc107ebf87629dc1faf38d037a7b2f1d6
-DIST firefox-105.0.2-xh.xpi 435744 BLAKE2B 525f5a7ba427a5ae4323cfc71968f24598b1ad06a4a28b2bcafa457bd7f8a51a6a7e8f361e5d253a13a20e4989ff0e57e3a54acbca159506476963adc9041caa SHA512 dc3057114fca4b5a34c22f463aa5d0f149c4d560a8d896e8efcf5aede896792220239d76dc96815481046c98113ccf2717da9e1743da3a34647153e4308d06db
-DIST firefox-105.0.2-zh-CN.xpi 596364 BLAKE2B 9528ab694ce2070e977440bf4dc542774a1bfdef68612bde73a667799fdfb3c05031f6722ea397cc1cb1eccd2ce7ab4f23bbb6b06b5534f5372a291309f1b626 SHA512 43d867cfe07e90bb86647e2a8d66ca8d07e87dddabd3ce045c13d3512b346e16fb3f1f7c7bc2df37b257009d977fbc4bbaf4e7f3dd3919f529095cff02084c9c
-DIST firefox-105.0.2-zh-TW.xpi 597430 BLAKE2B 57b1e25bcecd1b917348bcecfdfc247497c914ca2ee06531531bd34191bf9d588216ce9689926b8c1d4cd770d554ff066a2239d8d170d8fda90bb669d57b1bc7 SHA512 468570b38d2b4f637b22cd0c7f7010d7675e4859bf84d6cf5c00b6e548a91dcc55f49442bf6f9afa2ca4d9f35fdd1319b7feb6aecd56a1c5067726434149aa03
-DIST firefox-105.0.2.source.tar.xz 481457328 BLAKE2B 0c789702678956fa51ddf3c2eea4f12a903cf62068759b66bff2d7239bfb40ca6e16bd0ec367f3ed00d2f3df68899e1b945e296577df0503380c9f872012d7c3 SHA512 49f4c0e7ecf2cef6fa7de8362185bd9ce6950304dadbbea0522a5782016587b9d58f32b45f0e0edf7a2cc31ea158ed10c886b287a18d1f2bff3daf50d9f0b926
-DIST firefox-106-patches-01j.tar.xz 21628 BLAKE2B 69e7d925e764de90dbb28b18a6ff9e72be344413bc161195d419e40bd6b1e74a45c0fcacb49c09b20f9032e3281b213e5fa472d7c68dc8124e8833f13a54c6ba SHA512 366413cced550280f29fab16e9d1e5245dcd82a7f90b736b748af27cc2e58def0d454fba25a71429f2db4101a47472191d4382f12e001d3478d58503922bc921
 DIST firefox-106-patches-02j.tar.xz 22024 BLAKE2B 329c8afbf319c6145878abc97428941c58683a0d1089f6a3408ae2d4d793a8fff5228acad86319b2973b4b3ef773c0374764905f33f88367ac19616258a80d10 SHA512 4f4fb6fe826007aa9214cfdd60a607b04c0342ed670cb9d9fbd3dab574e98aef7bcdfb4154d612ee91e6f6d4c4502d66fdb6dcd3f1263e6835c1c3563cf16365
-DIST firefox-106.0-ach.xpi 460137 BLAKE2B e42862b66bb21e4290218537cde2c31cf7df5edee239707ae007f87ebf1dcd44bd1c42bd291362f89cafcb6bd2899ee993c519910a408446a446ed20e7d9db42 SHA512 98d46fb86831095f1dec0dc85dc2f2cd4163903eefc5be0bc5b2d11756da32e7e4a5ffc51b421729d9e67c297209233d7210406f1416e50fbd08d5ecafd426dd
-DIST firefox-106.0-af.xpi 428340 BLAKE2B 576c36bcda9c7edeac3de09f268b0176eeb9dd4c5165160eff0fcede863a0f65f7da5217c69f20bffcc0a1688b221b3b0e54d851a37c780c6d1b833c13a680a3 SHA512 fc5b7c0cc6695734c6f2aa99bda974fb47963622686f6fe1df36f189861142da46faab54f6f22e870786e7a2a7d37dd419551873393db041118a30175db80fda
-DIST firefox-106.0-an.xpi 507373 BLAKE2B 6153c6416a865470b25712bf8e21ebbe990a81cd271fd7c4e65550f35a9dbd4af74cc1cbd7403b3a477fb376c15703e68a684ce8a69d6ec6c84a09acbf03eae9 SHA512 e90f449bca2bfc0b0c8aab905307f9672314b6a55eab75b710aa5dbb12fe21d0a085cde1265625852a2372f016c87a95ed8aa5593c01cc1a222313826a2fa2b6
-DIST firefox-106.0-ar.xpi 573895 BLAKE2B fbd35f94b546ee106d217796d1498d7ca911e8f05ee018832162d0ad534aafe6f57d7fc8ad31e19a5fda0ab34f8befbbf8895a06ee42ccdab34367fd5e0e9778 SHA512 b3a8b57b13775eaf26f82bc6eef22482751c4b2aeadbcd48a22d1c164ac4bb7eb9c791f56cadb96baeb3dff862e98b1fae0a8931e58392d402b8dd435388e9c4
-DIST firefox-106.0-ast.xpi 494679 BLAKE2B 66b36c32c036d4e476dcccc45a1ba837f5592b5cadcb69ae5bf15b841e97b3b19a98f41cbf8da280a6110995850a6a32de877b7208c4ec368db7739cf7d712bd SHA512 2974eaf240594b2c62424ec3788ac8b89d8c55be34cfb3885cc8a52bb6cc756cd5ea3288e9377f2d25f2a5a18935b00f9624fd306e483f8036b6405ed950b32e
-DIST firefox-106.0-az.xpi 497308 BLAKE2B d2b6c7e7183a5f5b659598befbc8076cf2ad2fb594c74a8add8f57ff98d0ca41b5ae7dcb6afc311febec1104bedeb7e68b78336cdd4d681b2a60b2d5e6b7a1d9 SHA512 bbcaf66f4ae182e7d4954ada312e65883fac05c3633070e956d6e019b7f103092fd2e78823bfa9b697fada894b0f914de0ca7909c087051c560eb65d08541951
-DIST firefox-106.0-be.xpi 647941 BLAKE2B 735666e57b1d359c9b0e0df8c928c250962c68ebcec9310a49fdda99bd4ecd37d0c2b5cf25ee93cf7b5c3dc0303287acd4366b1bec08e2c1eb198af2b12c8f8b SHA512 34a484eb5ce58c65a489c90a725f4a88c5b54c31567dcfde40461b1a2e5537ca606add0d85037cf66c39454997fde924a0d1376e9f7ad540de2c84c9dd8a8ef1
-DIST firefox-106.0-bg.xpi 586678 BLAKE2B bbe42003d24110b083da4dac1c480d00c2bbe122632a744bf673a7f3b14f9523dbea033b2b53fe3b4141770f88d25ef2bf299ac2856ec5fa62182e6ed0ff9d16 SHA512 f2bf1b79b795613c64dddce10c9c6a67d5984d874c57e76ad8855e4123c59c8a87c66266404ebea5e4da83a434342651bb373f074a53155d88d6f7c189a052d0
-DIST firefox-106.0-bn.xpi 587357 BLAKE2B 75b4f11bef5846ebaf3841261e49697f4d7428802b9d30225ce09883ee1f4e7f3d6fdf7f71599f70417e0265ca55a669fc5a7df884a7b69c53e34622d6e0849b SHA512 1b8793691c9b53a61a9fdc84573bc0bf71066baaf410831ea9c5fa45313888dc0cb46404667fe68de213a24d6df692bfc935ee142e6742cea5e30bbb9856d9cd
-DIST firefox-106.0-br.xpi 546144 BLAKE2B 8411f8b925c745459c2bf1aefd1d846d2d392e203465ccd257bb30111fe6173c29a67bcf8b67f3f281048e0457647ae2125da62ca63603c43c2ae90ab1248439 SHA512 0426cd1190275973b8287cdc69e8b237e55a149aa621b07887f76ddd063b2ef3427911ee51c949f27466b94ddad51e919402834202582105e9d60c2dd432109f
-DIST firefox-106.0-bs.xpi 468735 BLAKE2B b3ee1258d1b376627fd687ebd136c76847040f1e6bb4d65d9fe740d28613a95ac287ddf367eccdc630337707aea7c000ee572666daae814e1da32f0de903e219 SHA512 1ceafba76a921c63629aa3d16808c0892c81d7dcbfb9e48ed35e74ece436aa20669e765531ce28933d08d4a70a176bfd6ffbd92a06ab01fdf3c2d52e2e781ef8
-DIST firefox-106.0-ca-valencia.xpi 545332 BLAKE2B b2a697d015b2b8ff2fcdbcb81ab716961eb5f65121f7c3eea6b498fbd2f6b1f70966cfe688221377bc755faa0ea8c86a887c854e03fd319849453ac464286c79 SHA512 b05921a8819e9dd68e521bfcda8e7f7e5e8893b5258521572612f5782ac7e90083f354997fa573242cfb99e500a4e587cf7f509afb63d73e68482c130737edb2
-DIST firefox-106.0-ca.xpi 548753 BLAKE2B 3d3a63991db7d0c729dec2e13ab4b8f8f4b3e687765e698eb9a3abffab25e2d7fb8090759aaafe2bff7a20780bf476df3c97b44617a1ac677963c6633bfc6777 SHA512 87d2eaaf211a1eb1432e6e4911848fab78123627b98882506b03a57cb6ccf48f1ec6cb1a4f4113fcca859c8e53b46df5a01e5a6efca78c301cfbf800188f6fe2
-DIST firefox-106.0-cak.xpi 560422 BLAKE2B dbf14bcb621d665a5ce19112ba05935deea1bc6e6f9caadb2d67c5c40ec9b98e53dd87da0c966d8042076992d507b7bf42fbe277b792f410ab4ae56ecba0c5c2 SHA512 e7e1ce2583788cb328607322806e3a0ba1e7c517548e0fcf3ce2193ad762c8c24824d55ef2d725348c93847fadefd7386be705f5ea5347a85c8ed4c153322b52
-DIST firefox-106.0-cs.xpi 580716 BLAKE2B 19fa0b59a60e374415d5499bfbb6a755a9e5e13bf08257362710cc8275139c895f312361f102bb4542a3240553918217bf69fa54e39495973e0fbb4dd1b3a20b SHA512 a56c37f11a6a23dd6bd0f760a73199db12ea31676308d224ca30b49b407e0973fd20ae6fcf821479704fa6df211a7081087f5b74ac050ea3e2a4f87247d9dfa3
-DIST firefox-106.0-cy.xpi 562861 BLAKE2B b8ccbfed3ac90c3bd57ac381fd51fef8147885fe8b995d39743b80767136c2a65d239c91093603f380da92304333875f1da446439b47090500b3c89899350b67 SHA512 555e0bad601ddad13395f38a2f5d7bdba5675fba2e6af5af3720ab9e307ea272ccf05d75d2856d889610656dee75e767996623a801963281d4d9a945dba2f52e
-DIST firefox-106.0-da.xpi 553184 BLAKE2B 884718825fc007e772a56ecadeada1063ed344202db05dbf123ec07e84d5495a1d86afbae51e00f78c44708b587b3e05e085c43cbf453da12ea4c53f09328947 SHA512 f4b222deb212c6b9cf450c1ed8f6a24e496e40924eb37def5bcf311e6e3b48fe0dd8b917c24593d834ce3b033f55e7d61eaeacf8551482dbf8a2b555cb2b1ca0
-DIST firefox-106.0-de.xpi 574539 BLAKE2B e5e9f65405f4e5c2cdc879ea5a31b782cb78d109095d989c93ff18987a6204c120921df0da9d46302c712b00e64333b3d4ba9961bde6e70f6dbc78c3929eeb27 SHA512 db9a8198c1c8c05115dc491cf25c95ba400cad81c59c62e2751ac1f9dbd11e7adb5b1ad645701750926188fb34e3abf53dbeed409d1dca9e00913461aa248463
-DIST firefox-106.0-dsb.xpi 588022 BLAKE2B 44c9759211dac224af8f8909c6c6acce5dbc97b3a559691e4f0fa783bdb62dfddb9bd966bef9138a84e9d5132a0e7ef25b8e25729f37168592bae8f3758ad2ea SHA512 e7a572561085ee9b646b77bc8b004c070c2ee793e40a12add63f40e1cddad6a4651fc07dde832e55884620a3bba1ccb652e200bbfaa81cb08b30294231c72bea
-DIST firefox-106.0-el.xpi 663905 BLAKE2B 1f10d508cc441840380deb5f72a427316cdebdc52d5116e069b38bfa781b3d33ca7e5da6406003ddc882ab61ca69a15ddf467dcf28a3f3f21b048eb8fe6149ae SHA512 eb40ecaf5d7495aecf51af5f6032dea5005ce67f619352a3f9d124232afca4bf65c8080dfcb16730227ef1668e0702e8a815ef85baced986d3b78608fd904f13
-DIST firefox-106.0-en-CA.xpi 528602 BLAKE2B 2678394a722165671b82cd64ffa3a0774dcf5948f4084905c37212624cd49b9730e5703c303cd65923950e2de8488f4caeb80033c4365ecc0664881b428cd823 SHA512 ad38bbb629eddd6c3d1e3413fe2a36973e2bc04c44daee0ca10420849cb24ec3359ad1d0834d865d8a77f9da1d58292f2a30dfc605e579de78716834534133f2
-DIST firefox-106.0-en-GB.xpi 529343 BLAKE2B d41dd4d7903278b09d3378ceb911ea256b7680852a8ffb591b2e52da066597fd37d9551105aded7b424b39e24932efef3db6714867d83ce2cc9b8e81c96e5f75 SHA512 f60062f4f3508e15d8a1c9c6d1ffa687e81bf9936765bf719aecb4a49065d164d131da564e8dcfe32b93efb287f092229d0dd839662af8e299b0f74c42566041
-DIST firefox-106.0-eo.xpi 556640 BLAKE2B 052ead7f1756685aa62d4a59e6b1494c532059a546f73bbff290291666399405b1ad13429c5a203597a08045e93c9bb9306cc822eefc2c5b9cbb5dc5dd1f43ff SHA512 c731a8abe3ee1a6db5b6f6cd1ae868c199d6fc0435026d3fa367c6b778c33bd8e08ddb9e4c67da2c0acc94b7ae97a7d29ce615f7e4540bc70053e9965fedff03
-DIST firefox-106.0-es-AR.xpi 568404 BLAKE2B ccb2d749c8549f7269c80688637c1f2f48f03aae72c1a0f6566a17232a1e1b1e312a215d15382b81aa0a01e0ed920b1ee4e596398ec6e11c6a905996c7f2f028 SHA512 71ff9218c567db3271f5fba013b3cfb2fc6f9648e09e068843bd8547b9bc8e169795b6c83548e1eee31cb58372619f94f825dd0a62f3c287b939fc55d4b00be8
-DIST firefox-106.0-es-CL.xpi 567431 BLAKE2B e99eb6370a437103dcb7eacbf1970b0c29a0f619504b8352a44cfb34518485e89d090d75629c980fddb05d53142c96e91be91c1db70f621f88a94c30b4279167 SHA512 e8c4bde5dbdc280477dc0ad64d06a9ecd9d63be43aab34f161cc0d2d7c7952942958bfe93216d9a91b37ac9d146405d838aeeae1dd8b5f9c338e9eb820d7c9c8
-DIST firefox-106.0-es-ES.xpi 559871 BLAKE2B d4df595be6ba09665c2ff9aab02ca88ab883b8cdd04512a8c98ad4156c46028eec4dc3b92e8df04ccbfb77ade7f3ecbd6cd58071c6abe5726d75168161d9f670 SHA512 08f4a2b0bbda5e37a055dc6d90f481359350814745c70c20e1723cea4e361502f7a9a6bfea5ebbb284e31ce6936bedc1fd7af94379de81abd5676fe3cd7d71fc
-DIST firefox-106.0-es-MX.xpi 571124 BLAKE2B e8c0b71aabb2f0b6a528e53709897cb8be07122928ec5460830e67f22825989b655d9999598e3b99b85be0f8bb72defdcb738c001cb6e0ff4b639dc43804b5d0 SHA512 c15316f7bb0cb129de413416be6e29f9e37e473ecfd4312bdb721da73d2d0d7acfcd1d079091721251e2d8bf0937571aaa3314613bb716648197e2b16ffa1869
-DIST firefox-106.0-et.xpi 539260 BLAKE2B 5174e608f2b439fc93d84e18f3722332cab347428357f962e609a7ca58374d7a9727c5830d165885012a296c30484a00777b955116e1254b1437d13a2fa5ae2d SHA512 09930f9417b0a46347cc64150972e8ce5ae83a8c50cacd5517a88690e69c83e0275ca230c5b34b363d9963b289b74ac6edc0e948f626e92bf0ff4c28c0602752
-DIST firefox-106.0-eu.xpi 554702 BLAKE2B 7fe6af0b324629fa82c641c74eda323ee4a8f85348111028f8e8c16bbdce53f9034207d082f3f1308b1a222e3bb31509e4e13ccdcb87838ee7c80d5c6a695b4f SHA512 06f38af9beae4c3f55089898d554355e932afce6e34890101f96afdffb5fb303c1810b9fe0d881b4d6e70018fdcf87eae740cfc1675ffe660fa7a76d59cce642
-DIST firefox-106.0-fa.xpi 571096 BLAKE2B 8db633fbd586919a71b9b98b5c821f8457bd3488580c8571582155b5e7418bbb34b79375c5c1b3b3420d1944a2737f0134f91bcb2b8e641b41641b51550efd66 SHA512 d12d255d11d4381020d0d331afc2ac67caba1d71a785cc39a7ba3484905d802de28fd7c1b6aa16171914d360a0661b9ca30cd002fbfcb8b0c1ed0de10743b7ec
-DIST firefox-106.0-ff.xpi 480585 BLAKE2B 419871ce05761cb82c277bbacb677eb84f3ab139bec7b48fc7b4fd9d68a2867453bc03188012b39e5dfde8e4490b968a83d441c9e073a798604f9e6a7569a13a SHA512 d181417cabc9120643d1901d081551a3d92c37758979a6cd5d70c90970f14c4e891eb96348a46766ad1f922bff36debf1c428f9372f05fe1b9f9267c34b17ecd
-DIST firefox-106.0-fi.xpi 553329 BLAKE2B 3d6e1f94d405d61a4b48573ab98e7967498d6ca3ebcd6aa72bd72b347c80890a9d4f05d677b5bc2069009fc5b8c05462037946f4ab617ddf38a4e73bba017aac SHA512 016278a95d4205f73fb949f6a70c21dee281277e48ad8e53ec2143571857f78aa98ead6e4c22882eaea66f50aa45d56e806c6b4f390cd7acb8b5382717dd41de
-DIST firefox-106.0-fr.xpi 580181 BLAKE2B e90392c5daa8f381b57921badc922eaaba80c844dc83811a5492f3c35a204236fa6393f9daf88490fbfda2b9ea98f0796f1c38a9cd5dd06ee315cdaa777920a4 SHA512 e4317c872f4f33b1eed1d6b49971017f77f47b197e9eb90cdccf5d5e67b211ebaa3fefe52b1548ffba6f1e08292005e0d9745189fbfcca459b11e486a2b3c324
-DIST firefox-106.0-fy-NL.xpi 563946 BLAKE2B 17d3e643e289f052a8a1931b7a94d7311a78b36d1db6c0f3df0568ab213ba3bc62da6a3d8c0c99cb6fdc54a52c41193348b8d1030491a088e2605bbd6d871ab5 SHA512 d8763d12cc965b2eed4faa3734b482fea02f4cd34b0b48ba33e86fd270b37c38974d2c01157582181d8b2aef24e4106b87490e24757a0156be5c0b11a037aefb
-DIST firefox-106.0-ga-IE.xpi 476063 BLAKE2B f92fd8aa1f54487aa849ae6a744b4d7e38a826e313d300e70ca313b1f5d34c9bb8999bdb1850ca309e2489dd464c1a4f338a5587dbc97619ed2805135908bc1a SHA512 8b1807e53b8aac7fd03ea44f06106d75f6802c0ea45eb5bff1699d4700c8473e9e22e2f72ddf752313c4713213ac6384a9eaece4d852b92f6267a08c2591003a
-DIST firefox-106.0-gd.xpi 554225 BLAKE2B c847cc5a27cf201aa6d4bc0bfacbcc63b6e146acd5fcde246551f06ab55711c8a2b2981e825640e5e7c9ea8ad9ee4244ebd44e4f1ee04343b7a37fd01fb5bc8f SHA512 650e7e388513904ad8f407dfaafc08f526c267b03e59da72d3e2da1c254eb50b9705ebbb32f362701899b5a65898736e85bd73b274ea558ce5481e9315b53229
-DIST firefox-106.0-gl.xpi 548330 BLAKE2B 6f84a1f10af81e17ee44879a599fcb4c34a413eaa11cfed4b5d93703aaa024bb1071b354dfd18d53230a2b050fda55d97bcb3b4e2a83d79be4fc57475ea0f84d SHA512 d126aa68f929d9b09c98ebe58a120f21b22f2fe546b0063ef234d3256917f6ae222af4b04f226a3feacdb806f7f6226aaed744f0a0623c3454964b55f49016f0
-DIST firefox-106.0-gn.xpi 577830 BLAKE2B c753cdd847df39d09cda46bd8a7e362ed1d68a8ae1f0a5ec27736a9bc3ddf8c56fd5843b4490e70abc75090e5bba64e9da23e26314267b1239607355dcadb5cb SHA512 81877da1a6ddfd4d1b11acaea08c0b86e6e3bd4f79a7d1bb20326e08ca36ea36c47d35c365c3044a3a1e83f4d1b59f95942a5a67e29c2020cfb7993b7e6d440c
-DIST firefox-106.0-gu-IN.xpi 537613 BLAKE2B 4c3cbc720628d899478ccffad0ff456d6d2317f1d3f5c762d4ff0060ed6e80dfe729c2099d3e68b774e7cd4aee32650b39070bf296038c80163caa8ebf2d98aa SHA512 9e374ba72ded9626a7a3fd604a3cb021ff22c47dd61fc3fd08fab55304788b4eb52f0f819a620d106785c98d06646b21f41f88e00c81653becdf5b68c861263e
-DIST firefox-106.0-he.xpi 574394 BLAKE2B fe166ba6ae76d6a4bb20d66efbb100ffdde8624498964f74013db0e72332d4d8df20e486080e4720e861f76e8ea797795339f0376c6308709dc09eee056f5861 SHA512 5414142e508649a9c55fe2c406b5d999883bb677a3c5db7a5735716eccd53fa7bb57f653bd98c385c7296d26bea628c008daffdc24f18084b2b49f69530db669
-DIST firefox-106.0-hi-IN.xpi 565730 BLAKE2B 2c366e1dcf7b55add5ea4f0b062ed50b04a5a3b950077b64f501b8a72c1064438c57e81d40043910385114af1d7e2287f5b29ab6ad8a801c58377532c7a7eb7b SHA512 e8c51823bc3a2a70d89156d3e9ad5eb985a590a2d6ac3543d375ee5030938f3e663cf069d7e31b5ef4f92b93e3632d01779951cdb27e87f865fb47a383fabb15
-DIST firefox-106.0-hr.xpi 539363 BLAKE2B 3832947bd1fb4239077a6e8734e6b31019318fa7ab02a3c7cdfe741062e918600fbd9be72528f17ed82e3349ea0d3561a359c4ac4096add50eba4cf19042b3c5 SHA512 514552328e7117a9bcb676760fad9a1332bd669e9e4096eed85defbd817eb8f78abbeeeeeca5c9947cb703dd0da4c679aef7b1f51371ca6583cd9a671661afa7
-DIST firefox-106.0-hsb.xpi 583934 BLAKE2B 2f7ecc70c85f2247fa97c31a9e5a8a5dbbd3251c73edfbcd8a7d434029b0f5da98cdc523245ffc98641c58e3e949201d7b1a6578acc39a4fbbd68c9af576ca30 SHA512 d3ed3144e94efe8559388149a7c8e9f99e6de796f1beeac7650c8ec5076dff4af6adc6bd0e264da93fa1ea0bcaf09ac19158eae94979fda9c928578c67ee406f
-DIST firefox-106.0-hu.xpi 588133 BLAKE2B e1ae7a5b1dc9ebb86861c48d2f1a6429bc07b74124c70bdc4a50c08f2f50612c2db29093c8baad692b4f7e68bdadcea9eaa45c6e604a36cd13e68ad605beec90 SHA512 bc86efe76549d0e807947d2b13e0f170856cfeb7816dc921dd9a0c5a9f21eef475e80b0237bd10442f423446d6e7c109578703ba6cbb1378cee73e4d9347c74e
-DIST firefox-106.0-hy-AM.xpi 592228 BLAKE2B 659172717f635fddbc5a1df745903908b473e0d8d55aaab790c71686169ed8eaad908eef05c22e2f5b9a9df72120874db635557cfaa3ed172bedb5915e816ba3 SHA512 9d8211eb298bdf7d9d3a995e6915068bdfe58bca6ff3a03f4cc8fb97c5f1a7f638e7e682ccd14582cd93266e869dfc40afaf49ca556f604309bbcfb55b32b83b
-DIST firefox-106.0-ia.xpi 552318 BLAKE2B f7e8da92f1d17779a77e2ec78ee3ba01c007ff61f2e037e49828086b74a80f6b17b60ee38cde9f8eba3e876c00d00ae370f1063c0547fb94e589a08d3e7d9733 SHA512 6c0114be0bf7f132021ab00a9397710a6b84bb4a00b00356bceae8272d5dca9fb8290ab1e7375f10d5f9c53a31a78c95b1774fdb56225e20e8047316501ef22f
-DIST firefox-106.0-id.xpi 549215 BLAKE2B dd2f1e0f2ece37322118e4e5d3cb4013e90a3547584ebc467033921362e7de91e4dc77a9d62456eacc76b1e62d6aeae84b49b6aac1fd35e9f74d7ace486fff87 SHA512 850f506f11a78b46f3cc20b9a1ec80a53bb943dbed7702450c459b8fa1f8528ba0915fbd73303d46773154c591962544848575162a2c99bd8e91049acb2583f0
-DIST firefox-106.0-is.xpi 562109 BLAKE2B dc54ee659447116660da93dcb1b35bb463a8aad18ac902b66c48c0d2a54735fd89c3fe15a2dcc52b6c8d7f16cf57a73b95ebe08323bcedc1702da05518a68fe6 SHA512 c03900765cb2cb03a49e895a78481ab2e502b37e85290dbe743d5a755ab456657ab86f042a91da7f13551561ce8ca4957ab2955b46dc45fd26aefa3df3aa3f13
-DIST firefox-106.0-it.xpi 489731 BLAKE2B 79c75e77718c46e78ab56922bc3e8228bbda98c5318a4b71d4e819f00f1da8db96e65eb360bf4ab79215cfb16a4e6211b286b00c97b69b79172e7a4abeaaf7ab SHA512 7a1c03f068d846a81bbc45f880f531a3c6b7f5738f9b65e4d402aae3914459eb035c443ff1f761f7e574235f229527e55f039349f8152f9c52167dfe2f664bd0
-DIST firefox-106.0-ja.xpi 613423 BLAKE2B 6f20d57b0c27cef3577da05cb0763d994fdda1f8a81e3c8c5d23078a7eae55f7eafabebfced72f4754e960893140e63fd08f49d405a93ef1c0bda7fa604806bf SHA512 13606594fcaf0e5a78c484a66f0278e945ec0f8dfb91d80744df0817bc1c4456fa62537f47dc5f76f82412d773d3dca625e31228a036c882ff57296369263d57
-DIST firefox-106.0-ka.xpi 617306 BLAKE2B f3ecdf9a2920da827b9e3924f446af55b9d30269eb898931899a907569365995b0251ba738a8f2d2a2583f99194e529a1bb51b2a03a6dd9617d72c6ec32361d2 SHA512 6d070ac25475cd21abbfacf332b3b5793859aa69d8a19089fc374e7582259905df12754394101e71a7784b0b3bb2dd136f58998d119e93c186719ce3ef7e621f
-DIST firefox-106.0-kab.xpi 572402 BLAKE2B eae98e6b0e2780be00535362ce07057ad12d2180e872796cff51fb139a81ed9b2e60053571eba628379c79d0733aa1aba7d6498cd882e3f7e18dc889bcc59cbb SHA512 b018d072681beb1b7c42db14c5391c24edfd1d26d421c6b78d05de08e24916f8794c03a3499c0916588b34c8a8472229b3811fe5156630083bc7037ffbfc124a
-DIST firefox-106.0-kk.xpi 633098 BLAKE2B b6134da3954e55271c58dd1fa63ce717414c6b23f302259e56e762bd89e3d42e458460a50f7255fa11208b07c3aff6e673a615c522feeb3437c0ceab9c33a4e2 SHA512 62304bd1c7bef2729e271f7369644103133e5dfa90a00cc0204825d7cc8e05b475d419b2b01fb465f2805a3379818d8604dede823d8e63cb81926847b22edf56
-DIST firefox-106.0-km.xpi 540438 BLAKE2B e062dd357dac4dbdc8a6e9ba743c3e4c2332ce4f3f2fa510b10e5eebedbab02e9c3473d0e7fb582cd82dfc5cdd369a71aaaa7ef52a232b01f746ae010c0ea407 SHA512 de32e91b72d8c273c9119cbedf4574447ec6768ccd80a9ca5c5c49efc1b83a2855555ff89678f68dbe6d4f792a56b6eeb5fad3d4c6fae97ced41e2fa98e51c7b
-DIST firefox-106.0-kn.xpi 505952 BLAKE2B 8eb1bd4f2ac389b28e9f6d73ab64457d0f59b296865fe359f92f27ae786d308c2a9792320f9c24a64093feedf67b4d4f3fe27242cad09af1feb3b3418916f254 SHA512 c4b847868da33c74dbd36dae2fc8814508bfb7338aa56c0948a97c066871c8dfce47b472943eae69efa09dca66901270f7229c3600374785e693e2c89f5dd498
-DIST firefox-106.0-ko.xpi 599629 BLAKE2B e506ff20611f048e81ad37c36b6af4704f7ad92140d9e8d2acc8024e56e6767b7833d32bca6d235a38931dd589a170c69b30a1edf82d1da3a3aaaf1dedf3eece SHA512 41bf0b56a1e376a80ded6b3ef7f6171d21412f5b1f50df34e07b1f0bb67458433b6f53a378f701fcdc40d4a91f89a4103b5d3c2f414325b818015fac9a2ee660
-DIST firefox-106.0-lij.xpi 477201 BLAKE2B 8122c249784088da96615304d311f615ee17bc618489a4f36c63ac5dab2a92a15630db792ace749567ba6e3f7f052a53e61b0fb71cc24c69797eed11033cd8f4 SHA512 61a32878a58cb35ab343666d88250d5d26a6d60c3e01589f4f03d6c6ea89ce447d51b23da1fe1052d75e7be36ac596d6bd414c1cdd14a7a8be829b211f14630c
-DIST firefox-106.0-lt.xpi 569662 BLAKE2B c22b2aacc83df787804dc259cbebd28dda1a2600e4c120b168877657e1e396c62b2dc9811fab078c76a062fda8136764380a4f9b17c4b7825b76a758c8c2836a SHA512 f9086b44a0d39d73fa6d0324b5df4bca966d5bb35c7fd5f0fff4e5b3ca3deaa6f5dba37c6ce139dfe93f507135fc646036e113a875b5257ae8e6d7d7189bc7a0
-DIST firefox-106.0-lv.xpi 472671 BLAKE2B 40614bf8baed1cfaed97fa85f9512c65d53be5e6f5c499d94f605494e0c147640394ef084096b2d5dbbc385376888981490adb65ed5542181e185adb7016ab8c SHA512 9cdcb655077f441da597672c7789bdafee73fb763135b32948d52c10a47aea9893d99167606fe8df769af36ca2ad4087915beb54c45aa87dea9e58c38b467aa3
-DIST firefox-106.0-mk.xpi 496305 BLAKE2B b5ba919f68218390949e457f0b636db4b257768b9f846deff048df09914992197df917bb629ea767d3f8f77f21b78d29408206a1490f8c901db822b67f28406e SHA512 8b21df4524975168b5f301bcb568653e5aba3b56156c0e863fe670691a5ed6c0052f56c3b55847dcdc404e266f7d951bc4c7aaebe32e4235779307bdb4b2007a
-DIST firefox-106.0-mr.xpi 539605 BLAKE2B e796b6eb30ec810c2c3a8ad6b1b112ba17f25e668768c3e7827a4244d32c4173795507a259f3448ad2fd15837bc600f58e768efa97a194757bcc9f8fcb02fb86 SHA512 fcae3600c0c6b88e211d7019b3af2b5ae710f17cf9f83df671c5af915124c602def41f1d3a6f0bff054d327e745c4a9aed8e2c7e9ea30316a3d1431ddf867514
-DIST firefox-106.0-ms.xpi 456693 BLAKE2B 25ca2e70172d3eafa13ac8e7c16ab36ba3636484097b0efae96d852f9a982d96cab40071cb1d68a00ca6471f93bc704479e98cef60ffd0bdcb65864fea4d9857 SHA512 64e8bd483dcbbf311c84fddd03e18bc0f5d618f02c69724342ccf57c0c3eb7230773f56119490880a112640707c7b8d45e4864ad5dc139d54a7c9ac1bd74922d
-DIST firefox-106.0-my.xpi 526209 BLAKE2B f3d89bb3e628a5034163f7bbd0788e06ef488c0a928588c573b2229be90c7743ec073fdafe1f441f36ba3f919d54eaafdc2619044080322e8de411f74421210b SHA512 7ef19e4d5e475bee160b8567d88db29f7d2df161139264f8c44cc8d542dd10af0c301e4a7b4b0e4dd8ebe13cbea63252ab2d4b3a4e6bd064cfac6f8a3921348f
-DIST firefox-106.0-nb-NO.xpi 550273 BLAKE2B 7d28bb05d762dcca01e08fc787eef7ec17e0df79eaf7a6451da493feffd00fd56e318e64fe1a77136b9c61af7b4304ce280294b00ebf8e6ac490ec2f405f38f1 SHA512 8334bb52929a1c7b8f07f1df646942b81401553835f15de0ef5dc53acc180de19ffcaa49cdae6b66e8350b728b2b434e222d426eb5491bde07483fca9efe6fc9
-DIST firefox-106.0-ne-NP.xpi 493192 BLAKE2B 4ba9bb6628e0a97b4e696f4c3caf7ef3356030bac4759c001cf79e4dcc316cfb7fb27288ac89c1366b6fc7ae51496e548d715a94e8101f6fdf3c76509c7afe31 SHA512 f538cddd7ab915b053934893eef790de495da7c6661fcc0f7386392098b707a593150598bce241b2195ba3890130e7035a549762e938f2069a02d43b8352d933
-DIST firefox-106.0-nl.xpi 557944 BLAKE2B a69794574160221500d71a62428d360010b73f4b9149c4adb47420da63b4b26898f8dfcc78ce9300fb5600ec2e9e551045a2f0c55717da91aa1e7a813b09dce2 SHA512 b91e28e482ea894271f68bc9b3b2a548a0f155e6f16cc85e70449eefaafbbcc5a49b491959bb7a8b4c01912fb8282a608d4b30e841b982d9b978b7b0393ac92f
-DIST firefox-106.0-nn-NO.xpi 550859 BLAKE2B 784e3c3eac66cb646319f23136e64381ac105c47e41083f4f25ea90e4bb04df1fccce0f0f85ae69060c4cadf7b8fb79301e83a71578525acd631d9e71d90256c SHA512 453bab840d7b68e8239154536bf8667b3ede2664f50bf33bb44d173633bb97fe804c8f2a9b446950bf6f4b6414bd27fd31c32cf77a00e6289d2d5aeeb3d12b2d
-DIST firefox-106.0-oc.xpi 574505 BLAKE2B 6fa067a9e63578474cbd5453055a19602f136d6169c7df5ca51d4d0fd01deb78c407c39e4390c1ed3b6592b684536a923e94ea1213b56837b60ca5383c7dd5e8 SHA512 86326e1c8d7fe5cb0dc5e7d57ff688b1f8ba9616f1b665326790b139663908e275982b5401a3e3d07b33827606f1cf780292f751ed7521e01aec1e6cf8222fa7
-DIST firefox-106.0-pa-IN.xpi 630425 BLAKE2B cd38afe9964cae0546863b469c1df185f032974175c788ae8f87eef28b34e45eda6ce2f1909963d22f39d71825abc3daac1aec2b514b2cb38db2fb24a4e7ccb5 SHA512 9c82d1737e80a087a829e07f8c846e1b3f84e4bbd2eea219495cd42eaaa3565ec89600995808c95cfc6910947cfb642a52da0464fd85ee5c0097afe98f7ab13a
-DIST firefox-106.0-pl.xpi 580614 BLAKE2B b9efd4c7d4840a6aa4b94c2e45b937255fc59a97377cb3d0d3ebbcdd2a3e957c31dab7a419c64d0980cbe8d0bd9deeee7007baff31a5889eb85a3a2171cede31 SHA512 d0098c54f16d3b2dfb8a1ef018e466ba441727131f7e5ade1462d63887a27f393cd460e687fb1053aecf14cee590d548d1bae60fef5ea48c32c60489531533f6
-DIST firefox-106.0-pt-BR.xpi 563211 BLAKE2B 3972416e9aaca3093400af6b702024c17935ea192f34903dc740f72fd04a70cfa04a7cbe27bd4682dac8d647f983a95f5399f1bee5be55cc32cea166154dd719 SHA512 ac049b9d1792df7cf39f07dc35f253620ecbed4e7c95142834f3a073f0b0c848d62ebb44f234fa1fe12e24f4d6254f0321f463d56f5149ffae248f54d050b839
-DIST firefox-106.0-pt-PT.xpi 567716 BLAKE2B b24851a16220a31c35336b3573ff00f7fe0480041f444ccb82c839d039b4e475bee6ea5f2e811a4dd9903182bc8ba7f128a47482be0d34210ffeed7acceb2d7a SHA512 a26fdbf64779f778ea1a9fbf878c73422838d195fa9578f8f2d7a71fd749167dc530c297bdc3e89684fa0c8845d30bfe67852fbb9b267c5542e841de585bd9ca
-DIST firefox-106.0-rm.xpi 558453 BLAKE2B 5c16a24cb820897f902a004a1bf196e8f200d3aad801cbce3b708a8f50711a049fa71b5ee373db1516ec45f3deb285d74535850321bc9a8df95c09f18847b33b SHA512 28c1f4c0cc6c6ac125af7f4c796cfcde47d3057a418a39ea29ab85d8c52b8b59d6f30c6f26012525838cdd26c8093aeb8dace271c87dbc2b4048091018a6b29a
-DIST firefox-106.0-ro.xpi 539419 BLAKE2B cec0846ebe9af78b4ba31a2a2b77ed68e5bf3566933c6c931fc38666a951bbb294da6456857f77af2bba8e202bf6663afe6716993d50ba12fed1c4a69a547a39 SHA512 3a1fda7967b0cf46b6e341f138d50f996ac5537d58b6f01d04328462da44974318f1fa07d768f2bdf57e12c9473cc8163eb1a47c8610488d8ef8bb9e227c4186
-DIST firefox-106.0-ru.xpi 652355 BLAKE2B 3a916c73380d740a431e9e614ec693b3873436325e5d76284c4faf573a3b8f0ef63c88b6572af9db2791cbdf17e64659be91f6c3480f9c446322abe052143858 SHA512 3c5c12baaffd9cafd13899dd7ec9b687ad0e60fc08af51fb3b95bd7e943d96a16bc0de2308a66a96e0ea5d2853eadfa5de7f2cd6b1d099b04addf69c2804d5f8
-DIST firefox-106.0-sco.xpi 509981 BLAKE2B 6e1ffd2a3b245816cac7621f0a8eb130ee4b940e378df10cbec8810fbd692fda642f54dcad08129a775a592d2ee12853d5331bce78587fb197a574a99730131f SHA512 30b2252eca69141c5efca34ac643bed44b149917e1b49a45eca0eb8ec5fa9c4789b084690857fd925e317ea752d41f1ce147e28a7c1d43115394fa6f3f5cb3f1
-DIST firefox-106.0-si.xpi 577792 BLAKE2B 2ee552a78f649ea827417406b7b92ff377a6005e1efa03b1a3a817cf1ad5d573094bbf0aa6dbb2f09d9d77fa3cdde6b68ded12cc93b7e1d1289ece63d3dc7b01 SHA512 422f72ab794337367ff65b1c6290f6270ad95f3a707657d6240a5381d5a2fbab2c3773aa52528fc27414c84f39c06e754faeb8cbbda106446dab7f72a41872cd
-DIST firefox-106.0-sk.xpi 588280 BLAKE2B fe7b422f89ef19ff2850a89049e02e1236bcb99230305b2eb533736b16f2151674d09159bb5aaabc52e19ef03f918047ff917a9696de15c9f913d6e832bad2d1 SHA512 92df39c43227ca9a1b4ccf048a0d52b8e29877c9bccdff490f01bc09d55f1a1af2a786e67e65e18659f2e918abda09e811e5797cadee47bb627a7e20a8f1c517
-DIST firefox-106.0-sl.xpi 561258 BLAKE2B 08cbc6f4287e92b58d7f06b8d08d67cd523d21b5857c7c105d74b8a94f95f0905d54150e0b6acfa95be80b9ae7c766a75104a5f9793514efe31ac2d4a4f5eccc SHA512 7c3136bc0363ca71ec15678b282f136bbfc29684bfb2381383035af091a72fddb5c46f19847f663f79c7d8d7ba8b8a4dc09c0a19339a905dbb066958e981caec
-DIST firefox-106.0-son.xpi 429528 BLAKE2B b78b4633721571ec47ecadcac3323cd6e3845eb8ecf9841a9a989af6e07fecbb5282ae1cc088cb460983c00d319115924c493648fcdcd32ae7b64ad2e5642671 SHA512 84d70a4e358ce9a8fd468f35811a8546ea895eab21a49db652e990f7b99b44c491b52f25ded3e9ce729b73dc3e2232cfb54e33da2bf9b06ed8442027cb808f35
-DIST firefox-106.0-sq.xpi 565747 BLAKE2B 9cc96b92e86c2db5766d582be6b2880373bdbc6c71b24e409824884743e5387b1936e8b2dd3f6b3a71aad98e6cc15a88c0a1160399e3134a97255a10634ecb25 SHA512 fb0dfbdfa1b32bc72646f24c0eeb140ad73029c4c9bccd4401db1ec8180b55d47d90570e68f45ab501d805d1ab43ea727f7a15bd69a10efa325d81c57b94758b
-DIST firefox-106.0-sr.xpi 607532 BLAKE2B 7a9097199421383d54f54898969ef6dc375314aedbc1ea946831102b45f9768ef35cbe2b342b0a4b0b18f0f8d51a5c8e43a67c4986b0012a57d37dab4af579de SHA512 c73bb7405f203158ad38df5089f44477579ea86c9f1f1f14146c4bf66f262071ec8613c941cf00e422c7a229c3d21bfbe26c3bac723db6147d3fae04a42df07d
-DIST firefox-106.0-sv-SE.xpi 559813 BLAKE2B 1f65d2d49d02afce2ceb660077d55e64a2b7ba1df67087681f2e148305b1cf2a458fd7942cb9c6bf3d45a19f05548d620cc0f379e88ce8d14ac421064876a22c SHA512 0f6d664cddd2dcdcf1b2c8a1db02d9b7578d645da7ee6f94176a7e9747dbadad56893edd7ff102851ca62e57fbee9add41ffd08fce87f6cb4c51ec89ef1b80e0
-DIST firefox-106.0-szl.xpi 523778 BLAKE2B 71841301c450b3475ff6e2ca0329127d71716ce71c65be3e9e8e1c63be5466b64d22f8a6f205f967da7d0bbeeb4917e2bc4fd98125f982b2fc3ec47e74736fef SHA512 315a883cce7ab2c46f2014a096c55768905ece3942645471af70b12c121bc0fa71a934faa9bbe2fd7742fa01f4c4aafc0ac4c910a0fcc7c284bdfbcf7c1a39cc
-DIST firefox-106.0-ta.xpi 517847 BLAKE2B 81341361af18521f24ffdf752f22abbb388f389aecb9e520cec29f07bdb497fbab32566db42458fd8b54d6779d1404f243d9dccc112a4c5cef94f0c749eb1797 SHA512 bcdf10dcb97f2ba2d9c434bab9825bcc7a633c38095c8a6b3432b1452bfc0b2f85accc655151ae55d977786d4888025dc90091afe3f45940c2075aaf397bca1f
-DIST firefox-106.0-te.xpi 564264 BLAKE2B 54c0417de09671642a729b0e82b8cf93da58682ca7533fa4b85106bc601c516f87655df143b0d184ffc097a943c4a2b04eb344eb14c6c89157cbb3df88f6f37c SHA512 53bf6286748547381bfd461af78318031c91e43378e17480c9db8df5eac6246ca9ab8fc95f131eb16092abc058e391b54dee836edcadb06979f2a8fb44db0c31
-DIST firefox-106.0-th.xpi 628694 BLAKE2B 5d12b53cb5841a6ca369bbfa3cb4e4c42f8252be1e9a8e540a1a5e463bddd31c04ccc2b099d1b1c1362348e908497fc42603e7fb022e95fe93a75562b308089d SHA512 6849f139105a97df0bb72e4c61edb5c414e36739327bd26b7f486b002b84e3115adab83b70d1c178558e7768dfa87abf37888a01e9f87a4537246b8e53ce121f
-DIST firefox-106.0-tl.xpi 528359 BLAKE2B 6e16646e507974e4f09fcc332a87eb76c3eebafc32245e5621333f33f7436c739505a4694246982d01bce1fc8ff33eabe36ea43a78ac27504209bc27fc436b3d SHA512 13d9957cee4ba8591b14377d2661b5c07f1547d5eaaa3351a91ba35feb526d9bd77c28dffd95e1ed1a46139058da4ab0893d9240c4daddfcac59e056b53f0f05
-DIST firefox-106.0-tr.xpi 573861 BLAKE2B 16682fcb8d634e2ae832e99de7d4253e778b761930906fb9bc7df9a8e7ed223d9dce40e0f1d6f87aee807e6b61733df29df9702db4db3f60d3c4a405f2e6de3c SHA512 2704a0ce0d1ecc972d9791e1cc3d2c6b83fd7ed7c3d0269ffa081ea024103a1fd828c73b20d5b09d52385e8e4359c00d293231ccefc045adf51f66e23c713658
-DIST firefox-106.0-trs.xpi 493781 BLAKE2B 51e5d62cdc4c3d551f719c0a21a8835a17b6b543e41c7b520e3228c4fef2b422a397c869c4d5bb3531605039b93941a1662b678e0f5aeee1b6925d5c98673b41 SHA512 13722d9cb958939b79bca2d2df5590a19a78006978316dde4d3eacaa8b2181d32c502f3d0deeb256e90a445cc72f0739cfba892837e89b59b1738308bcfdeece
-DIST firefox-106.0-uk.xpi 645593 BLAKE2B 53e74fd17231682d4203b2231ab42c53b1bed7fc6409c105e64d3a14c2223c25c7fdd8ed0227a63b951ad22d1d59aacd8ee6609a322cfd9efafd292509f50192 SHA512 ed7c10a68a4d1ca9b7fb9debf6040f6019208b909ae2f3fd4e3866a70825182b92cda4528b9030fd7e5f4b736950f15fa2ee9829a4bede782ac345fbbf265820
-DIST firefox-106.0-ur.xpi 566157 BLAKE2B 17c16300736d22e71905895d41175413780ec5a4aff2c90baf1fe16ddf795d5d56459ecbb609b81285c4fb7aa64a513a78885a2c9e45f3b7688089e4dd086391 SHA512 beb084d46bc4e95dac2ba7062531459e6b72f027bac6f83b56c2e49f98a628de7734c8e2df2a93facd8b82f4a78009fb34d6d8743810598946b88a99efe4c405
-DIST firefox-106.0-uz.xpi 485812 BLAKE2B 4439e372132c3bb1481854a8610b9ba8487960326f27fb54e804fadcecf8a2c1dd38634e1a828009a82a8267766700b4e425bb67d8875e929895292bf707039a SHA512 57f5b770987bcec432c37c8123cfcace950da89897a9880f542f22584b0070ce182c740035eec7db5d199f5c207abd95d82965ba6dbc63d7b3784e9e763e0ed4
-DIST firefox-106.0-vi.xpi 595204 BLAKE2B c1035f6931c0f1561cfefd7f27174c4657e3c8340f0823e5471529099ed5f79495b19be594b810b1a583cad0a2a69dcd841dbb06f034555fa7ccc3ba0bdc5007 SHA512 3065a08f7321490026897f11e49d2fcfbf0703f1f35b0a49b451978bb8d34dcbe0e93cd23f5aef0d4e4adedbe03ac8aed8fbed982a8cbe6b1e46f90695800cff
-DIST firefox-106.0-xh.xpi 426995 BLAKE2B b0ebff77538848270c140547e88a253bf14a6f982d20f51dfd3e4e770a576ea0eb3fd34100dfea32393bfcdd20f47afd5ce9285c14bda7e4c71160e7fbd31fbf SHA512 2575811ffec99f10fd8eaa7401c70e5284caf25cd06c979ee1cec90eac7cd4d55c4ff954a2825cf5078a71a75b05d8c177a800dce976dc52ac90e9dd2df79831
-DIST firefox-106.0-zh-CN.xpi 595323 BLAKE2B 546fabe04b7b691afa2d14516471dea1b6a93a3c58f4e2eb5d5c7470254195fce1c5813a023ffbc621c1848c8b39cfac042c18c1fd74283b76a6da5938f942ef SHA512 a466782afae6d422f491fb363e737638f5128fe1b456e47b7a72db376682757208b5a496b0ebfc416776a973d866d438a0ac84540b030735ea145400c2486c41
-DIST firefox-106.0-zh-TW.xpi 596105 BLAKE2B bc35a4d6a28462acea79ace4139bf9e641fe28b2eeebc0e2c6d90f5ac978570c9956de372e90db069f3b31432e79f9c616fba7431899f304dad33b4b2642a6af SHA512 3d76fe47c5b8ab1ff4b612e49e0cfd7a0a825b72b673697f3262a5cef6e660b291a161d6664da3e351a8e51d8d8d14d859dae2d97b09d0ba7b67d9704e6d9ad4
 DIST firefox-106.0.1-ach.xpi 460152 BLAKE2B 282d137211ab5b74538b9d76100d26e79236e21f27ccf46ffe4d231ecf1e7166865c2b240f06048d462adc419c07e930143707222ddbf5117b30a2b46bcdf62d SHA512 20ae74577a663aaeafc17a23e3a683ab503cecb666dec0219a1b4ea080e14be752efdd3b9f3de3001dced7b39ec19239a454c58d25f55536077746283aea2f24
 DIST firefox-106.0.1-af.xpi 428351 BLAKE2B feb7f9053ddc1d891ceea93836825f81d4d2e85dfe25845543b39440985bb2ad20fae465fb11cfa5f6533103c3d0f653d06717187157a48b35cffa5f5aa6e411 SHA512 edf8908c02e2e42798f6a2e9df98aa3d2bd6a12926a649827bce977532e22608bee6fbd4a7c39edaf50465d4b7a45a52d7e4f1b4716d882a88d6d3294ea93060
 DIST firefox-106.0.1-an.xpi 507373 BLAKE2B b70c953cf8296dcbd29128d09ad76ca2b561e3a13f0bd03ae519b7299f6f18e2f27bb3ac530899ea88a6fdf733b7ddad22040dbd132e137f3a007896e9142d8d SHA512 33612ac0f792a254efccfba4939a3c15ba84b0f17428c37c2e0ae6b37afb1bf5b3ea18036c8581e342a74d52a8bb1d8af22c645f1457d55567f02aa6a4b4b2f5
@@ -501,10 +205,6 @@ DIST firefox-106.0.1-xh.xpi 427003 BLAKE2B a969fa4cf091e34e1038d893c19aede541b43
 DIST firefox-106.0.1-zh-CN.xpi 595316 BLAKE2B 8d8c6611167fe8f2d2e7d44109b52e47e17193925306fa2edd497bcbca790a32d0a265caa8a7e2a143b9c625d186caf163d2917241803bd4739d1a5bae45e2f7 SHA512 b997cb0ae5d2c76ba4ce885da09207b2561c1f4453ac284a58ddbed5de41f0378bb4ae7507573df378a176476392b278e5d025a8d59f23962d6fcef72805420f
 DIST firefox-106.0.1-zh-TW.xpi 596106 BLAKE2B eefdbba0813fbe04bc1f9737b4c1a3e608c40bfc58454db12c447a7b134efd51c1f38297dfe06ad8587c22b4195994237806918179d8583538e477f8cdcfe542 SHA512 c6849a68624ec1ae00fd5f622efb5dc6e79a03c23f924c40e2ef448a4d52b9da972c263c3719c3ca033433212cc47b200e53403f5c26fdc3561a297911ad48a2
 DIST firefox-106.0.1.source.tar.xz 501822184 BLAKE2B 8443392cf1f1ca5d41ba2d9571a6817f4b82ee31f21eb99586f6736783c56d53e0c67be485768ee70fb06040cafc6548e7082bf6f4bb360f2cf0cfbeba2e89e2 SHA512 15f5a65a69e11dd0c463b358cafb5ad0f31db93619b9ec3f89e8c5e14d4d319d9423fe4dcd0dbbcbedc1ad444dcbd8e5e30e483220277f5b550bff6124b66519
-DIST firefox-106.0.source.tar.xz 500449804 BLAKE2B fe003b0d4933a73f1435ec640b052ea72f3226c51257c2a6fa3b2d0bb22e45d2a0709c32592a2d443601cd61884ae057226b756ca19fe182f92aad8e0104c7a1 SHA512 30ced2fff818858267eaab23974f6962c5d39433ce8e26507589535fc9348f00cf5e45b90997dfb6e2361b70900547fdb0e70d741127cc6705089ea585ea2296
-EBUILD firefox-102.3.0.ebuild 36274 BLAKE2B 38ad5876eecab2edebc273cb5f4f5cbcc453158242a5b04a6befe8857cb9a800d6e235395e11c82ba85a55518be4e8d6c924257b3b6497d564928c65abfd43d2 SHA512 a81aaacbcce4f7258026a20633b402fb9039b7979ce344e608c768e753663cb4b2c9f7e1e51684003729a006b30f2026ed76b2e804f2f5d184911554f1395586
-EBUILD firefox-102.4.0.ebuild 36273 BLAKE2B 39ad53fb05be22398e925612d994ee8c8954728f775f72377e1d8e0fca67e18d14cc35fb23b21514f4f7c862d7801627e39d6fd7250c006b93481d41615edcba SHA512 a00bca7b57e8d745dd02dd494de77444bd1bf79110e3c15d9b38a6e52644fb1ae960fcb2218eb87526becfb6ead9038ea492093072d02cc316dd61492fe3d873
-EBUILD firefox-105.0.2.ebuild 38137 BLAKE2B 49284b24dcbdc57d0408f33a84f36cc603c99a92713e9382b9b1639fce75ec5c29d023df7698ac2932a4885e15299c5edd2f7510ede70e7d45fdc740449962f3 SHA512 4b0a674f18d78e075918ee3d087e35f790a6c83e714a618ae9fdf54df4b3072317d078368b36f027c2e168eb7defaa28aaff217753c205039a0d9c01b2888173
+EBUILD firefox-102.4.0.ebuild 36270 BLAKE2B 6837b774261e3f5dce707881e556112d7c931328fde0b524cab76cbc2fcf5591d4dbc09ba2677be226329ad58db918918d892f0adb8cb2021758fea69ab71d95 SHA512 768dc68293057c733299b063582600a791c6d55893f36ec500582a66cae8c3102a10869b4f68aaec18a80096ad1bf4cd6b5dcf20811aaa79fe983bde85a32530
 EBUILD firefox-106.0.1.ebuild 38042 BLAKE2B de8af13de0378ea23e890762f8a50bec1a04df60a8e4f77847ab017729be2d835ce188a05c3e169d7ace4cf5decfc7534024c1fcf05d9007785b4ce58cf0d9e8 SHA512 e54fc64d2a34f20ea473ef5a042bd52796f9c3bb463e44e6af808d3a82f2d7f4e7eeb36447e019e8eedf828cabafadda8c7a5e681c21ed93f6efb4835f270bc5
-EBUILD firefox-106.0.ebuild 38042 BLAKE2B 1e4003ea71eda1e24cc3f4712bd38749ee7ae52edfde8ec3cd53f462bb6224604a299f62a168618f64af78d61c3fcb44fab931ab53e0b06dea2110c48c8d93c3 SHA512 989310f403880dc892c4ee4b6d381bbd3a0e814895a935c46f1d95a12b998b6ba0690008406d12aec51491d2312f417360c7c16382d8d6ffc8fcb8e8812b2cfd
 MISC metadata.xml 2219 BLAKE2B 064f486eecd2a66ef4c9cccef46803f877039bf16bc40b699a48e28e04e816d0ad434ce65ae2e056e1a4126a67a7dd7eff16040276159c1f5aa8966b1c0d7b6c SHA512 522b09ffc2857553e240b1e7c82c11ccc281dd87c720c6292ec9314b91319e0a55ca2838f17e878f5c1e58e4f22caa1b0c3b90506b65b350beff06f3f397d897
diff --git a/www-client/firefox/firefox-102.3.0.ebuild b/www-client/firefox/firefox-102.3.0.ebuild
deleted file mode 100644
index 3c37dbddf5c5..000000000000
--- a/www-client/firefox/firefox-102.3.0.ebuild
+++ /dev/null
@@ -1,1266 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-FIREFOX_PATCHSET="firefox-102esr-patches-03j.tar.xz"
-
-LLVM_MAX_SLOT=14
-
-PYTHON_COMPAT=( python3_{8..11} )
-PYTHON_REQ_USE="ncurses,sqlite,ssl"
-
-WANT_AUTOCONF="2.1"
-
-VIRTUALX_REQUIRED="pgo"
-
-MOZ_ESR=yes
-
-MOZ_PV=${PV}
-MOZ_PV_SUFFIX=
-if [[ ${PV} =~ (_(alpha|beta|rc).*)$ ]] ; then
-	MOZ_PV_SUFFIX=${BASH_REMATCH[1]}
-
-	# Convert the ebuild version to the upstream Mozilla version
-	MOZ_PV="${MOZ_PV/_alpha/a}" # Handle alpha for SRC_URI
-	MOZ_PV="${MOZ_PV/_beta/b}"  # Handle beta for SRC_URI
-	MOZ_PV="${MOZ_PV%%_rc*}"    # Handle rc for SRC_URI
-fi
-
-if [[ -n ${MOZ_ESR} ]] ; then
-	# ESR releases have slightly different version numbers
-	MOZ_PV="${MOZ_PV}esr"
-fi
-
-MOZ_PN="${PN%-bin}"
-MOZ_P="${MOZ_PN}-${MOZ_PV}"
-MOZ_PV_DISTFILES="${MOZ_PV}${MOZ_PV_SUFFIX}"
-MOZ_P_DISTFILES="${MOZ_PN}-${MOZ_PV_DISTFILES}"
-
-inherit autotools check-reqs desktop flag-o-matic gnome2-utils linux-info \
-	llvm multiprocessing pax-utils python-any-r1 toolchain-funcs \
-	virtualx xdg
-
-MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/releases/${MOZ_PV}"
-
-if [[ ${PV} == *_rc* ]] ; then
-	MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/candidates/${MOZ_PV}-candidates/build${PV##*_rc}"
-fi
-
-PATCH_URIS=(
-	https://dev.gentoo.org/~{juippis,whissi,slashbeast}/mozilla/patchsets/${FIREFOX_PATCHSET}
-)
-
-SRC_URI="${MOZ_SRC_BASE_URI}/source/${MOZ_P}.source.tar.xz -> ${MOZ_P_DISTFILES}.source.tar.xz
-	${PATCH_URIS[@]}"
-
-DESCRIPTION="Firefox Web Browser"
-HOMEPAGE="https://www.mozilla.com/firefox"
-
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-
-SLOT="esr"
-LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-
-IUSE="+clang cpu_flags_arm_neon dbus debug eme-free hardened hwaccel"
-IUSE+=" jack libproxy lto +openh264 pgo pulseaudio sndio selinux"
-IUSE+=" +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent +system-libvpx system-png system-python-libs +system-webp"
-IUSE+=" wayland wifi"
-
-# Firefox-only IUSE
-IUSE+=" geckodriver +gmp-autoupdate screencast"
-
-REQUIRED_USE="debug? ( !system-av1 )
-	pgo? ( lto )
-	wayland? ( dbus )
-	wifi? ( dbus )"
-
-# Firefox-only REQUIRED_USE flags
-REQUIRED_USE+=" screencast? ( wayland )"
-
-FF_ONLY_DEPEND="!www-client/firefox:0
-	!www-client/firefox:rapid
-	screencast? ( media-video/pipewire:= )
-	selinux? ( sec-policy/selinux-mozilla )"
-BDEPEND="${PYTHON_DEPS}
-	app-arch/unzip
-	app-arch/zip
-	>=dev-util/cbindgen-0.24.3
-	net-libs/nodejs
-	virtual/pkgconfig
-	virtual/rust
-	|| (
-		(
-			sys-devel/clang:14
-			sys-devel/llvm:14
-			clang? (
-				=sys-devel/lld-14*
-				pgo? ( =sys-libs/compiler-rt-sanitizers-14*[profile] )
-			)
-		)
-		(
-			sys-devel/clang:13
-			sys-devel/llvm:13
-			clang? (
-				=sys-devel/lld-13*
-				pgo? ( =sys-libs/compiler-rt-sanitizers-13*[profile] )
-			)
-		)
-	)
-	amd64? ( >=dev-lang/nasm-2.14 )
-	x86? ( >=dev-lang/nasm-2.14 )"
-
-COMMON_DEPEND="${FF_ONLY_DEPEND}
-	|| (
-		>=app-accessibility/at-spi2-core-2.46.0:2
-		dev-libs/atk
-	)
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/libffi:=
-	>=dev-libs/nss-3.79.1
-	>=dev-libs/nspr-4.34
-	media-libs/alsa-lib
-	media-libs/fontconfig
-	media-libs/freetype
-	media-libs/mesa
-	media-video/ffmpeg
-	sys-libs/zlib
-	virtual/freedesktop-icon-theme
-	virtual/opengl
-	x11-libs/cairo[X]
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:3[X]
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXrandr
-	x11-libs/libXtst
-	x11-libs/libxcb:=
-	x11-libs/libxkbcommon[X]
-	x11-libs/pango
-	x11-libs/pixman
-	dbus? (
-		dev-libs/dbus-glib
-		sys-apps/dbus
-	)
-	jack? ( virtual/jack )
-	libproxy? ( net-libs/libproxy )
-	sndio? ( >=media-sound/sndio-1.8.0-r1 )
-	system-av1? (
-		>=media-libs/dav1d-1.0.0:=
-		>=media-libs/libaom-1.0.0:=
-	)
-	system-harfbuzz? (
-		>=media-gfx/graphite2-1.3.13
-		>=media-libs/harfbuzz-2.8.1:0=
-	)
-	system-icu? ( >=dev-libs/icu-71.1:= )
-	system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
-	system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] )
-	system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] )
-	system-png? ( >=media-libs/libpng-1.6.35:0=[apng] )
-	system-webp? ( >=media-libs/libwebp-1.1.0:0= )
-	wayland? (
-		x11-libs/gtk+:3[wayland]
-		x11-libs/libdrm
-		x11-libs/libxkbcommon[wayland]
-	)
-	wifi? (
-		kernel_linux? (
-			dev-libs/dbus-glib
-			net-misc/networkmanager
-			sys-apps/dbus
-		)
-	)"
-
-RDEPEND="${COMMON_DEPEND}
-	jack? ( virtual/jack )
-	openh264? ( media-libs/openh264:*[plugin] )
-	pulseaudio? (
-		|| (
-			media-sound/pulseaudio
-			>=media-sound/apulse-0.1.12-r4
-		)
-	)"
-
-DEPEND="${COMMON_DEPEND}
-	x11-libs/libICE
-	x11-libs/libSM
-	pulseaudio? (
-		|| (
-			media-sound/pulseaudio
-			>=media-sound/apulse-0.1.12-r4[sdk]
-		)
-	)"
-
-S="${WORKDIR}/${PN}-${PV%_*}"
-
-# Allow MOZ_GMP_PLUGIN_LIST to be set in an eclass or
-# overridden in the enviromnent (advanced hackers only)
-if [[ -z "${MOZ_GMP_PLUGIN_LIST+set}" ]] ; then
-	MOZ_GMP_PLUGIN_LIST=( gmp-gmpopenh264 gmp-widevinecdm )
-fi
-
-llvm_check_deps() {
-	if ! has_version -b "sys-devel/clang:${LLVM_SLOT}" ; then
-		einfo "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-		return 1
-	fi
-
-	if use clang ; then
-		if ! has_version -b "=sys-devel/lld-${LLVM_SLOT}*" ; then
-			einfo "=sys-devel/lld-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-			return 1
-		fi
-
-		if use pgo ; then
-			if ! has_version -b "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}*" ; then
-				einfo "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-				return 1
-			fi
-		fi
-	fi
-
-	einfo "Using LLVM slot ${LLVM_SLOT} to build" >&2
-}
-
-MOZ_LANGS=(
-	af ar ast be bg br ca cak cs cy da de dsb
-	el en-CA en-GB en-US es-AR es-ES et eu
-	fi fr fy-NL ga-IE gd gl he hr hsb hu
-	id is it ja ka kab kk ko lt lv ms nb-NO nl nn-NO
-	pa-IN pl pt-BR pt-PT rm ro ru
-	sk sl sq sr sv-SE th tr uk uz vi zh-CN zh-TW
-)
-
-# Firefox-only LANGS
-MOZ_LANGS+=( ach )
-MOZ_LANGS+=( an )
-MOZ_LANGS+=( az )
-MOZ_LANGS+=( bn )
-MOZ_LANGS+=( bs )
-MOZ_LANGS+=( ca-valencia )
-MOZ_LANGS+=( eo )
-MOZ_LANGS+=( es-CL )
-MOZ_LANGS+=( es-MX )
-MOZ_LANGS+=( fa )
-MOZ_LANGS+=( ff )
-MOZ_LANGS+=( gn )
-MOZ_LANGS+=( gu-IN )
-MOZ_LANGS+=( hi-IN )
-MOZ_LANGS+=( hy-AM )
-MOZ_LANGS+=( ia )
-MOZ_LANGS+=( km )
-MOZ_LANGS+=( kn )
-MOZ_LANGS+=( lij )
-MOZ_LANGS+=( mk )
-MOZ_LANGS+=( mr )
-MOZ_LANGS+=( my )
-MOZ_LANGS+=( ne-NP )
-MOZ_LANGS+=( oc )
-MOZ_LANGS+=( sco )
-MOZ_LANGS+=( si )
-MOZ_LANGS+=( son )
-MOZ_LANGS+=( szl )
-MOZ_LANGS+=( ta )
-MOZ_LANGS+=( te )
-MOZ_LANGS+=( tl )
-MOZ_LANGS+=( trs )
-MOZ_LANGS+=( ur )
-MOZ_LANGS+=( xh )
-
-mozilla_set_globals() {
-	# https://bugs.gentoo.org/587334
-	local MOZ_TOO_REGIONALIZED_FOR_L10N=(
-		fy-NL ga-IE gu-IN hi-IN hy-AM nb-NO ne-NP nn-NO pa-IN sv-SE
-	)
-
-	local lang xflag
-	for lang in "${MOZ_LANGS[@]}" ; do
-		# en and en_US are handled internally
-		if [[ ${lang} == en ]] || [[ ${lang} == en-US ]] ; then
-			continue
-		fi
-
-		# strip region subtag if $lang is in the list
-		if has ${lang} "${MOZ_TOO_REGIONALIZED_FOR_L10N[@]}" ; then
-			xflag=${lang%%-*}
-		else
-			xflag=${lang}
-		fi
-
-		SRC_URI+=" l10n_${xflag/[_@]/-}? ("
-		SRC_URI+=" ${MOZ_SRC_BASE_URI}/linux-x86_64/xpi/${lang}.xpi -> ${MOZ_P_DISTFILES}-${lang}.xpi"
-		SRC_URI+=" )"
-		IUSE+=" l10n_${xflag/[_@]/-}"
-	done
-}
-mozilla_set_globals
-
-moz_clear_vendor_checksums() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -ne 1 ]] ; then
-		die "${FUNCNAME} requires exact one argument"
-	fi
-
-	einfo "Clearing cargo checksums for ${1} ..."
-
-	sed -i \
-		-e 's/\("files":{\)[^}]*/\1/' \
-		"${S}"/third_party/rust/${1}/.cargo-checksum.json \
-		|| die
-}
-
-moz_install_xpi() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 2 ]] ; then
-		die "${FUNCNAME} requires at least two arguments"
-	fi
-
-	local DESTDIR=${1}
-	shift
-
-	insinto "${DESTDIR}"
-
-	local emid xpi_file xpi_tmp_dir
-	for xpi_file in "${@}" ; do
-		emid=
-		xpi_tmp_dir=$(mktemp -d --tmpdir="${T}")
-
-		# Unpack XPI
-		unzip -qq "${xpi_file}" -d "${xpi_tmp_dir}" || die
-
-		# Determine extension ID
-		if [[ -f "${xpi_tmp_dir}/install.rdf" ]] ; then
-			emid=$(sed -n -e '/install-manifest/,$ { /em:id/!d; s/.*[\">]\([^\"<>]*\)[\"<].*/\1/; p; q }' "${xpi_tmp_dir}/install.rdf")
-			[[ -z "${emid}" ]] && die "failed to determine extension id from install.rdf"
-		elif [[ -f "${xpi_tmp_dir}/manifest.json" ]] ; then
-			emid=$(sed -n -e 's/.*"id": "\([^"]*\)".*/\1/p' "${xpi_tmp_dir}/manifest.json")
-			[[ -z "${emid}" ]] && die "failed to determine extension id from manifest.json"
-		else
-			die "failed to determine extension id"
-		fi
-
-		einfo "Installing ${emid}.xpi into ${ED}${DESTDIR} ..."
-		newins "${xpi_file}" "${emid}.xpi"
-	done
-}
-
-mozconfig_add_options_ac() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 2 ]] ; then
-		die "${FUNCNAME} requires at least two arguments"
-	fi
-
-	local reason=${1}
-	shift
-
-	local option
-	for option in ${@} ; do
-		echo "ac_add_options ${option} # ${reason}" >>${MOZCONFIG}
-	done
-}
-
-mozconfig_add_options_mk() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 2 ]] ; then
-		die "${FUNCNAME} requires at least two arguments"
-	fi
-
-	local reason=${1}
-	shift
-
-	local option
-	for option in ${@} ; do
-		echo "mk_add_options ${option} # ${reason}" >>${MOZCONFIG}
-	done
-}
-
-mozconfig_use_enable() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 1 ]] ; then
-		die "${FUNCNAME} requires at least one arguments"
-	fi
-
-	local flag=$(use_enable "${@}")
-	mozconfig_add_options_ac "$(use ${1} && echo +${1} || echo -${1})" "${flag}"
-}
-
-mozconfig_use_with() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 1 ]] ; then
-		die "${FUNCNAME} requires at least one arguments"
-	fi
-
-	local flag=$(use_with "${@}")
-	mozconfig_add_options_ac "$(use ${1} && echo +${1} || echo -${1})" "${flag}"
-}
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]] ; then
-		if use pgo ; then
-			if ! has usersandbox $FEATURES ; then
-				die "You must enable usersandbox as X server can not run as root!"
-			fi
-		fi
-
-		# Ensure we have enough disk space to compile
-		if use pgo || use lto || use debug ; then
-			CHECKREQS_DISK_BUILD="13500M"
-		else
-			CHECKREQS_DISK_BUILD="6600M"
-		fi
-
-		check-reqs_pkg_pretend
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]] ; then
-		if use pgo ; then
-			if ! has userpriv ${FEATURES} ; then
-				eerror "Building ${PN} with USE=pgo and FEATURES=-userpriv is not supported!"
-			fi
-		fi
-
-		# Ensure we have enough disk space to compile
-		if use pgo || use lto || use debug ; then
-			CHECKREQS_DISK_BUILD="13500M"
-		else
-			CHECKREQS_DISK_BUILD="6400M"
-		fi
-
-		check-reqs_pkg_setup
-
-		llvm_pkg_setup
-
-		if use clang && use lto ; then
-			local version_lld=$(ld.lld --version 2>/dev/null | awk '{ print $2 }')
-			[[ -n ${version_lld} ]] && version_lld=$(ver_cut 1 "${version_lld}")
-			[[ -z ${version_lld} ]] && die "Failed to read ld.lld version!"
-
-			local version_llvm_rust=$(rustc -Vv 2>/dev/null | grep -F -- 'LLVM version:' | awk '{ print $3 }')
-			[[ -n ${version_llvm_rust} ]] && version_llvm_rust=$(ver_cut 1 "${version_llvm_rust}")
-			[[ -z ${version_llvm_rust} ]] && die "Failed to read used LLVM version from rustc!"
-
-			if ver_test "${version_lld}" -ne "${version_llvm_rust}" ; then
-				eerror "Rust is using LLVM version ${version_llvm_rust} but ld.lld version belongs to LLVM version ${version_lld}."
-				eerror "You will be unable to link ${CATEGORY}/${PN}. To proceed you have the following options:"
-				eerror "  - Manually switch rust version using 'eselect rust' to match used LLVM version"
-				eerror "  - Switch to dev-lang/rust[system-llvm] which will guarantee matching version"
-				eerror "  - Build ${CATEGORY}/${PN} without USE=lto"
-				eerror "  - Rebuild lld with llvm that was used to build rust (may need to rebuild the whole "
-				eerror "    llvm/clang/lld/rust chain depending on your @world updates)"
-				die "LLVM version used by Rust (${version_llvm_rust}) does not match with ld.lld version (${version_lld})!"
-			fi
-		fi
-
-		python-any-r1_pkg_setup
-
-		# Avoid PGO profiling problems due to enviroment leakage
-		# These should *always* be cleaned up anyway
-		unset \
-			DBUS_SESSION_BUS_ADDRESS \
-			DISPLAY \
-			ORBIT_SOCKETDIR \
-			SESSION_MANAGER \
-			XAUTHORITY \
-			XDG_CACHE_HOME \
-			XDG_SESSION_COOKIE
-
-		# Build system is using /proc/self/oom_score_adj, bug #604394
-		addpredict /proc/self/oom_score_adj
-
-		if use pgo ; then
-			# Allow access to GPU during PGO run
-			local ati_cards mesa_cards nvidia_cards render_cards
-			shopt -s nullglob
-
-			ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
-			if [[ -n "${ati_cards}" ]] ; then
-				addpredict "${ati_cards}"
-			fi
-
-			mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
-			if [[ -n "${mesa_cards}" ]] ; then
-				addpredict "${mesa_cards}"
-			fi
-
-			nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
-			if [[ -n "${nvidia_cards}" ]] ; then
-				addpredict "${nvidia_cards}"
-			fi
-
-			render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
-			if [[ -n "${render_cards}" ]] ; then
-				addpredict "${render_cards}"
-			fi
-
-			shopt -u nullglob
-		fi
-
-		if ! mountpoint -q /dev/shm ; then
-			# If /dev/shm is not available, configure is known to fail with
-			# a traceback report referencing /usr/lib/pythonN.N/multiprocessing/synchronize.py
-			ewarn "/dev/shm is not mounted -- expect build failures!"
-		fi
-
-		# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
-		# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
-		# get your own set of keys.
-		if [[ -z "${MOZ_API_KEY_GOOGLE+set}" ]] ; then
-			MOZ_API_KEY_GOOGLE="AIzaSyDEAOvatFogGaPi0eTgsV_ZlEzx0ObmepsMzfAc"
-		fi
-
-		if [[ -z "${MOZ_API_KEY_LOCATION+set}" ]] ; then
-			MOZ_API_KEY_LOCATION="AIzaSyB2h2OuRgGaPicUgy5N-5hsZqiPW6sH3n_rptiQ"
-		fi
-
-		# Mozilla API keys (see https://location.services.mozilla.com/api)
-		# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
-		# get your own set of keys.
-		if [[ -z "${MOZ_API_KEY_MOZILLA+set}" ]] ; then
-			MOZ_API_KEY_MOZILLA="edb3d487-3a84-46m0ap1e3-9dfd-92b5efaaa005"
-		fi
-
-		# Ensure we use C locale when building, bug #746215
-		export LC_ALL=C
-	fi
-
-	CONFIG_CHECK="~SECCOMP"
-	WARNING_SECCOMP="CONFIG_SECCOMP not set! This system will be unable to play DRM-protected content."
-	linux-info_pkg_setup
-}
-
-src_unpack() {
-	local _lp_dir="${WORKDIR}/language_packs"
-	local _src_file
-
-	if [[ ! -d "${_lp_dir}" ]] ; then
-		mkdir "${_lp_dir}" || die
-	fi
-
-	for _src_file in ${A} ; do
-		if [[ ${_src_file} == *.xpi ]]; then
-			cp "${DISTDIR}/${_src_file}" "${_lp_dir}" || die "Failed to copy '${_src_file}' to '${_lp_dir}'!"
-		else
-			unpack ${_src_file}
-		fi
-	done
-}
-
-src_prepare() {
-	if use lto; then
-		rm -v "${WORKDIR}"/firefox-patches/*-LTO-Only-enable-LTO-*.patch || die
-	fi
-
-	eapply "${WORKDIR}/firefox-patches"
-
-	# Allow user to apply any additional patches without modifing ebuild
-	eapply_user
-
-	# Make cargo respect MAKEOPTS
-	export CARGO_BUILD_JOBS="$(makeopts_jobs)"
-
-	# Make LTO respect MAKEOPTS
-	sed -i \
-		-e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
-		"${S}"/build/moz.configure/lto-pgo.configure \
-		|| die "sed failed to set num_cores"
-
-	# Make ICU respect MAKEOPTS
-	sed -i \
-		-e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
-		"${S}"/intl/icu_sources_data.py \
-		|| die "sed failed to set num_cores"
-
-	# sed-in toolchain prefix
-	sed -i \
-		-e "s/objdump/${CHOST}-objdump/" \
-		"${S}"/python/mozbuild/mozbuild/configure/check_debug_ranges.py \
-		|| die "sed failed to set toolchain prefix"
-
-	sed -i \
-		-e 's/ccache_stats = None/return None/' \
-		"${S}"/python/mozbuild/mozbuild/controller/building.py \
-		|| die "sed failed to disable ccache stats call"
-
-	einfo "Removing pre-built binaries ..."
-	find "${S}"/third_party -type f \( -name '*.so' -o -name '*.o' \) -print -delete || die
-
-	# Create build dir
-	BUILD_DIR="${WORKDIR}/${PN}_build"
-	mkdir -p "${BUILD_DIR}" || die
-
-	# Write API keys to disk
-	echo -n "${MOZ_API_KEY_GOOGLE//gGaPi/}" > "${S}"/api-google.key || die
-	echo -n "${MOZ_API_KEY_LOCATION//gGaPi/}" > "${S}"/api-location.key || die
-	echo -n "${MOZ_API_KEY_MOZILLA//m0ap1/}" > "${S}"/api-mozilla.key || die
-
-	xdg_environment_reset
-}
-
-src_configure() {
-	# Show flags set at the beginning
-	einfo "Current BINDGEN_CFLAGS:\t${BINDGEN_CFLAGS:-no value set}"
-	einfo "Current CFLAGS:\t\t${CFLAGS:-no value set}"
-	einfo "Current CXXFLAGS:\t\t${CXXFLAGS:-no value set}"
-	einfo "Current LDFLAGS:\t\t${LDFLAGS:-no value set}"
-	einfo "Current RUSTFLAGS:\t\t${RUSTFLAGS:-no value set}"
-
-	local have_switched_compiler=
-	if use clang && ! tc-is-clang ; then
-		# Force clang
-		einfo "Enforcing the use of clang due to USE=clang ..."
-		have_switched_compiler=yes
-		AR=llvm-ar
-		AS=llvm-as
-		CC=${CHOST}-clang
-		CXX=${CHOST}-clang++
-		NM=llvm-nm
-		RANLIB=llvm-ranlib
-	elif ! use clang && ! tc-is-gcc ; then
-		# Force gcc
-		have_switched_compiler=yes
-		einfo "Enforcing the use of gcc due to USE=-clang ..."
-		AR=gcc-ar
-		CC=${CHOST}-gcc
-		CXX=${CHOST}-g++
-		NM=gcc-nm
-		RANLIB=gcc-ranlib
-	fi
-
-	if [[ -n "${have_switched_compiler}" ]] ; then
-		# Because we switched active compiler we have to ensure
-		# that no unsupported flags are set
-		strip-unsupported-flags
-	fi
-
-	# Ensure we use correct toolchain
-	export HOST_CC="$(tc-getBUILD_CC)"
-	export HOST_CXX="$(tc-getBUILD_CXX)"
-	tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
-
-	# Pass the correct toolchain paths through cbindgen
-	if tc-is-cross-compiler ; then
-		export BINDGEN_CFLAGS="${SYSROOT:+--sysroot=${ESYSROOT}} --target=${CHOST} ${BINDGEN_CFLAGS-}"
-	fi
-
-	# Set MOZILLA_FIVE_HOME
-	export MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
-
-	# python/mach/mach/mixin/process.py fails to detect SHELL
-	export SHELL="${EPREFIX}/bin/bash"
-
-	# Set state path
-	export MOZBUILD_STATE_PATH="${BUILD_DIR}"
-
-	# Set MOZCONFIG
-	export MOZCONFIG="${S}/.mozconfig"
-
-	# Initialize MOZCONFIG
-	mozconfig_add_options_ac '' --enable-application=browser
-
-	# Set Gentoo defaults
-	export MOZILLA_OFFICIAL=1
-
-	mozconfig_add_options_ac 'Gentoo default' \
-		--allow-addon-sideload \
-		--disable-cargo-incremental \
-		--disable-crashreporter \
-		--disable-gpsd \
-		--disable-install-strip \
-		--disable-parental-controls \
-		--disable-strip \
-		--disable-updater \
-		--enable-negotiateauth \
-		--enable-new-pass-manager \
-		--enable-official-branding \
-		--enable-release \
-		--enable-system-ffi \
-		--enable-system-pixman \
-		--host="${CBUILD:-${CHOST}}" \
-		--libdir="${EPREFIX}/usr/$(get_libdir)" \
-		--prefix="${EPREFIX}/usr" \
-		--target="${CHOST}" \
-		--without-ccache \
-		--without-wasm-sandboxed-libraries \
-		--with-intl-api \
-		--with-libclang-path="$(llvm-config --libdir)" \
-		--with-system-nspr \
-		--with-system-nss \
-		--with-system-zlib \
-		--with-toolchain-prefix="${CHOST}-" \
-		--with-unsigned-addon-scopes=app,system \
-		--x-includes="${ESYSROOT}/usr/include" \
-		--x-libraries="${ESYSROOT}/usr/$(get_libdir)"
-
-	# Set update channel
-	local update_channel=release
-	[[ -n ${MOZ_ESR} ]] && update_channel=esr
-	mozconfig_add_options_ac '' --update-channel=${update_channel}
-
-	if ! use x86 && [[ ${CHOST} != armv*h* ]] ; then
-		mozconfig_add_options_ac '' --enable-rust-simd
-	fi
-
-	# For future keywording: This is currently (97.0) only supported on:
-	# amd64, arm, arm64 & x86.
-	# Might want to flip the logic around if Firefox is to support more arches.
-	if use ppc64; then
-		mozconfig_add_options_ac '' --disable-sandbox
-	else
-		mozconfig_add_options_ac '' --enable-sandbox
-	fi
-
-	if [[ -s "${S}/api-google.key" ]] ; then
-		local key_origin="Gentoo default"
-		if [[ $(cat "${S}/api-google.key" | md5sum | awk '{ print $1 }') != 709560c02f94b41f9ad2c49207be6c54 ]] ; then
-			key_origin="User value"
-		fi
-
-		mozconfig_add_options_ac "${key_origin}" \
-			--with-google-safebrowsing-api-keyfile="${S}/api-google.key"
-	else
-		einfo "Building without Google API key ..."
-	fi
-
-	if [[ -s "${S}/api-location.key" ]] ; then
-		local key_origin="Gentoo default"
-		if [[ $(cat "${S}/api-location.key" | md5sum | awk '{ print $1 }') != ffb7895e35dedf832eb1c5d420ac7420 ]] ; then
-			key_origin="User value"
-		fi
-
-		mozconfig_add_options_ac "${key_origin}" \
-			--with-google-location-service-api-keyfile="${S}/api-location.key"
-	else
-		einfo "Building without Location API key ..."
-	fi
-
-	if [[ -s "${S}/api-mozilla.key" ]] ; then
-		local key_origin="Gentoo default"
-		if [[ $(cat "${S}/api-mozilla.key" | md5sum | awk '{ print $1 }') != 3927726e9442a8e8fa0e46ccc39caa27 ]] ; then
-			key_origin="User value"
-		fi
-
-		mozconfig_add_options_ac "${key_origin}" \
-			--with-mozilla-api-keyfile="${S}/api-mozilla.key"
-	else
-		einfo "Building without Mozilla API key ..."
-	fi
-
-	mozconfig_use_with system-av1
-	mozconfig_use_with system-harfbuzz
-	mozconfig_use_with system-harfbuzz system-graphite2
-	mozconfig_use_with system-icu
-	mozconfig_use_with system-jpeg
-	mozconfig_use_with system-libevent
-	mozconfig_use_with system-libvpx
-	mozconfig_use_with system-png
-	mozconfig_use_with system-webp
-
-	mozconfig_use_enable dbus
-	mozconfig_use_enable libproxy
-
-	use eme-free && mozconfig_add_options_ac '+eme-free' --disable-eme
-
-	mozconfig_use_enable geckodriver
-
-	if use hardened ; then
-		mozconfig_add_options_ac "+hardened" --enable-hardening
-		append-ldflags "-Wl,-z,relro -Wl,-z,now"
-	fi
-
-	local myaudiobackends=""
-	use jack && myaudiobackends+="jack,"
-	use sndio && myaudiobackends+="sndio,"
-	use pulseaudio && myaudiobackends+="pulseaudio,"
-	! use pulseaudio && myaudiobackends+="alsa,"
-
-	mozconfig_add_options_ac '--enable-audio-backends' --enable-audio-backends="${myaudiobackends::-1}"
-
-	mozconfig_use_enable wifi necko-wifi
-
-	if use wayland ; then
-		mozconfig_add_options_ac '+x11+wayland' --enable-default-toolkit=cairo-gtk3-x11-wayland
-	else
-		mozconfig_add_options_ac '+x11' --enable-default-toolkit=cairo-gtk3
-	fi
-
-	if use lto ; then
-		if use clang ; then
-			# Upstream only supports lld when using clang
-			mozconfig_add_options_ac "forcing ld=lld due to USE=clang and USE=lto" --enable-linker=lld
-
-			mozconfig_add_options_ac '+lto' --enable-lto=cross
-
-		else
-			# ThinLTO is currently broken, see bmo#1644409
-			mozconfig_add_options_ac '+lto' --enable-lto=full
-			mozconfig_add_options_ac "linker is set to bfd" --enable-linker=bfd
-		fi
-
-		if use pgo ; then
-			mozconfig_add_options_ac '+pgo' MOZ_PGO=1
-
-			if use clang ; then
-				# Used in build/pgo/profileserver.py
-				export LLVM_PROFDATA="llvm-profdata"
-			fi
-		fi
-	else
-		# Avoid auto-magic on linker
-		if use clang ; then
-			# This is upstream's default
-			mozconfig_add_options_ac "forcing ld=lld due to USE=clang" --enable-linker=lld
-		else
-			mozconfig_add_options_ac "linker is set to bfd" --enable-linker=bfd
-		fi
-	fi
-
-	# LTO flag was handled via configure
-	filter-flags '-flto*'
-
-	mozconfig_use_enable debug
-	if use debug ; then
-		mozconfig_add_options_ac '+debug' --disable-optimize
-	else
-		if is-flag '-g*' ; then
-			if use clang ; then
-				mozconfig_add_options_ac 'from CFLAGS' --enable-debug-symbols=$(get-flag '-g*')
-			else
-				mozconfig_add_options_ac 'from CFLAGS' --enable-debug-symbols
-			fi
-		else
-			mozconfig_add_options_ac 'Gentoo default' --disable-debug-symbols
-		fi
-
-		if is-flag '-O0' ; then
-			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O0
-		elif is-flag '-O4' ; then
-			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O4
-		elif is-flag '-O3' ; then
-			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O3
-		elif is-flag '-O1' ; then
-			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O1
-		elif is-flag '-Os' ; then
-			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-Os
-		else
-			mozconfig_add_options_ac "Gentoo default" --enable-optimize=-O2
-		fi
-	fi
-
-	# Debug flag was handled via configure
-	filter-flags '-g*'
-
-	# Optimization flag was handled via configure
-	filter-flags '-O*'
-
-	# Modifications to better support ARM, bug #553364
-	if use cpu_flags_arm_neon ; then
-		mozconfig_add_options_ac '+cpu_flags_arm_neon' --with-fpu=neon
-
-		if ! tc-is-clang ; then
-			# thumb options aren't supported when using clang, bug 666966
-			mozconfig_add_options_ac '+cpu_flags_arm_neon' \
-				--with-thumb=yes \
-				--with-thumb-interwork=no
-		fi
-	fi
-
-	if [[ ${CHOST} == armv*h* ]] ; then
-		mozconfig_add_options_ac 'CHOST=armv*h*' --with-float-abi=hard
-
-		if ! use system-libvpx ; then
-			sed -i \
-				-e "s|softfp|hard|" \
-				"${S}"/media/libvpx/moz.build \
-				|| die
-		fi
-	fi
-
-	if use clang ; then
-		# https://bugzilla.mozilla.org/show_bug.cgi?id=1482204
-		# https://bugzilla.mozilla.org/show_bug.cgi?id=1483822
-		# toolkit/moz.configure Elfhack section: target.cpu in ('arm', 'x86', 'x86_64')
-		local disable_elf_hack=
-		if use amd64 ; then
-			disable_elf_hack=yes
-		elif use x86 ; then
-			disable_elf_hack=yes
-		elif use arm ; then
-			disable_elf_hack=yes
-		fi
-
-		if [[ -n ${disable_elf_hack} ]] ; then
-			mozconfig_add_options_ac 'elf-hack is broken when using Clang' --disable-elf-hack
-		fi
-	elif tc-is-gcc ; then
-		if ver_test $(gcc-fullversion) -ge 10 ; then
-			einfo "Forcing -fno-tree-loop-vectorize to workaround GCC bug, see bug 758446 ..."
-			append-cxxflags -fno-tree-loop-vectorize
-		fi
-	fi
-
-	# Additional ARCH support
-	case "${ARCH}" in
-		arm)
-			# Reduce the memory requirements for linking
-			if use clang ; then
-				# Nothing to do
-				:;
-			elif use lto ; then
-				append-ldflags -Wl,--no-keep-memory
-			else
-				append-ldflags -Wl,--no-keep-memory -Wl,--reduce-memory-overheads
-			fi
-			;;
-	esac
-
-	if ! use elibc_glibc ; then
-		mozconfig_add_options_ac '!elibc_glibc' --disable-jemalloc
-	fi
-
-	# Allow elfhack to work in combination with unstripped binaries
-	# when they would normally be larger than 2GiB.
-	append-ldflags "-Wl,--compress-debug-sections=zlib"
-
-	# Make revdep-rebuild.sh happy; Also required for musl
-	append-ldflags -Wl,-rpath="${MOZILLA_FIVE_HOME}",--enable-new-dtags
-
-	# Pass $MAKEOPTS to build system
-	export MOZ_MAKE_FLAGS="${MAKEOPTS}"
-
-	# Use system's Python environment
-	PIP_NETWORK_INSTALL_RESTRICTED_VIRTUALENVS=mach
-
-	if use system-python-libs; then
-		export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE="system"
-	else
-		export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE="none"
-	fi
-
-	# Disable notification when build system has finished
-	export MOZ_NOSPAM=1
-
-	# Portage sets XARGS environment variable to "xargs -r" by default which
-	# breaks build system's check_prog() function which doesn't support arguments
-	mozconfig_add_options_ac 'Gentoo default' "XARGS=${EPREFIX}/usr/bin/xargs"
-
-	# Set build dir
-	mozconfig_add_options_mk 'Gentoo default' "MOZ_OBJDIR=${BUILD_DIR}"
-
-	# Show flags we will use
-	einfo "Build BINDGEN_CFLAGS:\t${BINDGEN_CFLAGS:-no value set}"
-	einfo "Build CFLAGS:\t\t${CFLAGS:-no value set}"
-	einfo "Build CXXFLAGS:\t\t${CXXFLAGS:-no value set}"
-	einfo "Build LDFLAGS:\t\t${LDFLAGS:-no value set}"
-	einfo "Build RUSTFLAGS:\t\t${RUSTFLAGS:-no value set}"
-
-	# Handle EXTRA_CONF and show summary
-	local ac opt hash reason
-
-	# Apply EXTRA_ECONF entries to $MOZCONFIG
-	if [[ -n ${EXTRA_ECONF} ]] ; then
-		IFS=\! read -a ac <<<${EXTRA_ECONF// --/\!}
-		for opt in "${ac[@]}"; do
-			mozconfig_add_options_ac "EXTRA_ECONF" --${opt#--}
-		done
-	fi
-
-	echo
-	echo "=========================================================="
-	echo "Building ${PF} with the following configuration"
-	grep ^ac_add_options "${MOZCONFIG}" | while read ac opt hash reason; do
-		[[ -z ${hash} || ${hash} == \# ]] \
-			|| die "error reading mozconfig: ${ac} ${opt} ${hash} ${reason}"
-		printf "    %-30s  %s\n" "${opt}" "${reason:-mozilla.org default}"
-	done
-	echo "=========================================================="
-	echo
-
-	./mach configure || die
-}
-
-src_compile() {
-	local virtx_cmd=
-
-	if use pgo ; then
-		virtx_cmd=virtx
-
-		# Reset and cleanup environment variables used by GNOME/XDG
-		gnome2_environment_reset
-
-		addpredict /root
-	fi
-
-	local -x GDK_BACKEND=x11
-
-	${virtx_cmd} ./mach build --verbose \
-		|| die
-}
-
-src_install() {
-	# xpcshell is getting called during install
-	pax-mark m \
-		"${BUILD_DIR}"/dist/bin/xpcshell \
-		"${BUILD_DIR}"/dist/bin/${PN} \
-		"${BUILD_DIR}"/dist/bin/plugin-container
-
-	DESTDIR="${D}" ./mach install || die
-
-	# Upstream cannot ship symlink but we can (bmo#658850)
-	rm "${ED}${MOZILLA_FIVE_HOME}/${PN}-bin" || die
-	dosym ${PN} ${MOZILLA_FIVE_HOME}/${PN}-bin
-
-	# Don't install llvm-symbolizer from sys-devel/llvm package
-	if [[ -f "${ED}${MOZILLA_FIVE_HOME}/llvm-symbolizer" ]] ; then
-		rm -v "${ED}${MOZILLA_FIVE_HOME}/llvm-symbolizer" || die
-	fi
-
-	# Install policy (currently only used to disable application updates)
-	insinto "${MOZILLA_FIVE_HOME}/distribution"
-	newins "${FILESDIR}"/distribution.ini distribution.ini
-	newins "${FILESDIR}"/disable-auto-update.policy.json policies.json
-
-	# Install system-wide preferences
-	local PREFS_DIR="${MOZILLA_FIVE_HOME}/browser/defaults/preferences"
-	insinto "${PREFS_DIR}"
-	newins "${FILESDIR}"/gentoo-default-prefs.js gentoo-prefs.js
-
-	local GENTOO_PREFS="${ED}${PREFS_DIR}/gentoo-prefs.js"
-
-	# Set dictionary path to use system hunspell
-	cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set spellchecker.dictionary_path pref"
-	pref("spellchecker.dictionary_path",       "${EPREFIX}/usr/share/myspell");
-	EOF
-
-	# Force hwaccel prefs if USE=hwaccel is enabled
-	if use hwaccel ; then
-		cat "${FILESDIR}"/gentoo-hwaccel-prefs.js-r2 \
-		>>"${GENTOO_PREFS}" \
-		|| die "failed to add prefs to force hardware-accelerated rendering to all-gentoo.js"
-
-		if use wayland; then
-			cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set hwaccel wayland prefs"
-			pref("gfx.x11-egl.force-enabled",          false);
-			EOF
-		else
-			cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set hwaccel x11 prefs"
-			pref("gfx.x11-egl.force-enabled",          true);
-			EOF
-		fi
-	fi
-
-	if ! use gmp-autoupdate ; then
-		local plugin
-		for plugin in "${MOZ_GMP_PLUGIN_LIST[@]}" ; do
-			einfo "Disabling auto-update for ${plugin} plugin ..."
-			cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to disable autoupdate for ${plugin} media plugin"
-			pref("media.${plugin}.autoupdate",   false);
-			EOF
-		done
-	fi
-
-	# Force the graphite pref if USE=system-harfbuzz is enabled, since the pref cannot disable it
-	if use system-harfbuzz ; then
-		cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set gfx.font_rendering.graphite.enabled pref"
-		sticky_pref("gfx.font_rendering.graphite.enabled", true);
-		EOF
-	fi
-
-	# Install language packs
-	local langpacks=( $(find "${WORKDIR}/language_packs" -type f -name '*.xpi') )
-	if [[ -n "${langpacks}" ]] ; then
-		moz_install_xpi "${MOZILLA_FIVE_HOME}/distribution/extensions" "${langpacks[@]}"
-	fi
-
-	# Install geckodriver
-	if use geckodriver ; then
-		einfo "Installing geckodriver into ${ED}${MOZILLA_FIVE_HOME} ..."
-		pax-mark m "${BUILD_DIR}"/dist/bin/geckodriver
-		exeinto "${MOZILLA_FIVE_HOME}"
-		doexe "${BUILD_DIR}"/dist/bin/geckodriver
-
-		dosym ${MOZILLA_FIVE_HOME}/geckodriver /usr/bin/geckodriver
-	fi
-
-	# Install icons
-	local icon_srcdir="${S}/browser/branding/official"
-	local icon_symbolic_file="${FILESDIR}/icon/firefox-symbolic.svg"
-
-	insinto /usr/share/icons/hicolor/symbolic/apps
-	newins "${icon_symbolic_file}" ${PN}-symbolic.svg
-
-	local icon size
-	for icon in "${icon_srcdir}"/default*.png ; do
-		size=${icon%.png}
-		size=${size##*/default}
-
-		if [[ ${size} -eq 48 ]] ; then
-			newicon "${icon}" ${PN}.png
-		fi
-
-		newicon -s ${size} "${icon}" ${PN}.png
-	done
-
-	# Install menu
-	local app_name="Mozilla ${MOZ_PN^}"
-	local desktop_file="${FILESDIR}/icon/${PN}-r3.desktop"
-	local desktop_filename="${PN}-esr.desktop"
-	local exec_command="${PN}"
-	local icon="${PN}"
-	local use_wayland="false"
-
-	if use wayland ; then
-		use_wayland="true"
-	fi
-
-	cp "${desktop_file}" "${WORKDIR}/${PN}.desktop-template" || die
-
-	sed -i \
-		-e "s:@NAME@:${app_name}:" \
-		-e "s:@EXEC@:${exec_command}:" \
-		-e "s:@ICON@:${icon}:" \
-		"${WORKDIR}/${PN}.desktop-template" \
-		|| die
-
-	newmenu "${WORKDIR}/${PN}.desktop-template" "${desktop_filename}"
-
-	rm "${WORKDIR}/${PN}.desktop-template" || die
-
-	# Install wrapper script
-	[[ -f "${ED}/usr/bin/${PN}" ]] && rm "${ED}/usr/bin/${PN}"
-	newbin "${FILESDIR}/${PN}-r1.sh" ${PN}
-
-	# Update wrapper
-	sed -i \
-		-e "s:@PREFIX@:${EPREFIX}/usr:" \
-		-e "s:@MOZ_FIVE_HOME@:${MOZILLA_FIVE_HOME}:" \
-		-e "s:@APULSELIB_DIR@:${apulselib}:" \
-		-e "s:@DEFAULT_WAYLAND@:${use_wayland}:" \
-		"${ED}/usr/bin/${PN}" \
-		|| die
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-
-	# If the apulse libs are available in MOZILLA_FIVE_HOME then apulse
-	# does not need to be forced into the LD_LIBRARY_PATH
-	if use pulseaudio && has_version ">=media-sound/apulse-0.1.12-r4" ; then
-		einfo "APULSE found; Generating library symlinks for sound support ..."
-		local lib
-		pushd "${ED}${MOZILLA_FIVE_HOME}" &>/dev/null || die
-		for lib in ../apulse/libpulse{.so{,.0},-simple.so{,.0}} ; do
-			# A quickpkg rolled by hand will grab symlinks as part of the package,
-			# so we need to avoid creating them if they already exist.
-			if [[ ! -L ${lib##*/} ]] ; then
-				ln -s "${lib}" ${lib##*/} || die
-			fi
-		done
-		popd &>/dev/null || die
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	if ! use gmp-autoupdate ; then
-		elog "USE='-gmp-autoupdate' has disabled the following plugins from updating or"
-		elog "installing into new profiles:"
-		local plugin
-		for plugin in "${MOZ_GMP_PLUGIN_LIST[@]}" ; do
-			elog "\t ${plugin}"
-		done
-		elog
-	fi
-
-	if use pulseaudio && has_version ">=media-sound/apulse-0.1.12-r4" ; then
-		elog "Apulse was detected at merge time on this system and so it will always be"
-		elog "used for sound.  If you wish to use pulseaudio instead please unmerge"
-		elog "media-sound/apulse."
-		elog
-	fi
-
-	local show_doh_information
-	local show_normandy_information
-	local show_shortcut_information
-
-	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
-		# New install; Tell user that DoH is disabled by default
-		show_doh_information=yes
-		show_normandy_information=yes
-		show_shortcut_information=no
-	else
-		local replacing_version
-		for replacing_version in ${REPLACING_VERSIONS} ; do
-			if ver_test "${replacing_version}" -lt 91.0 ; then
-				# Tell user that we no longer install a shortcut
-				# per supported display protocol
-				show_shortcut_information=yes
-			fi
-		done
-	fi
-
-	if [[ -n "${show_doh_information}" ]] ; then
-		elog
-		elog "Note regarding Trusted Recursive Resolver aka DNS-over-HTTPS (DoH):"
-		elog "Due to privacy concerns (encrypting DNS might be a good thing, sending all"
-		elog "DNS traffic to Cloudflare by default is not a good idea and applications"
-		elog "should respect OS configured settings), \"network.trr.mode\" was set to 5"
-		elog "(\"Off by choice\") by default."
-		elog "You can enable DNS-over-HTTPS in ${PN^}'s preferences."
-	fi
-
-	# bug 713782
-	if [[ -n "${show_normandy_information}" ]] ; then
-		elog
-		elog "Upstream operates a service named Normandy which allows Mozilla to"
-		elog "push changes for default settings or even install new add-ons remotely."
-		elog "While this can be useful to address problems like 'Armagadd-on 2.0' or"
-		elog "revert previous decisions to disable TLS 1.0/1.1, privacy and security"
-		elog "concerns prevail, which is why we have switched off the use of this"
-		elog "service by default."
-		elog
-		elog "To re-enable this service set"
-		elog
-		elog "    app.normandy.enabled=true"
-		elog
-		elog "in about:config."
-	fi
-
-	if [[ -n "${show_shortcut_information}" ]] ; then
-		elog
-		elog "Since ${PN}-91.0 we no longer install multiple shortcuts for"
-		elog "each supported display protocol.  Instead we will only install"
-		elog "one generic Mozilla ${PN^} shortcut."
-		elog "If you still want to be able to select between running Mozilla ${PN^}"
-		elog "on X11 or Wayland, you have to re-create these shortcuts on your own."
-	fi
-
-	# bug 835078
-	if use hwaccel && has_version "x11-drivers/xf86-video-nouveau"; then
-		ewarn "You have nouveau drivers installed in your system and 'hwaccel' "
-		ewarn "enabled for Firefox. Nouveau / your GPU might not support the "
-		ewarn "required EGL, so either disable 'hwaccel' or try the workaround "
-		ewarn "explained in https://bugs.gentoo.org/835078#c5 if Firefox crashes."
-	fi
-
-	elog
-	elog "Unfortunately Firefox-100.0 breaks compatibility with some sites using "
-	elog "useragent checks. To temporarily fix this, enter about:config and modify "
-	elog "network.http.useragent.forceVersion preference to \"99\"."
-	elog "Or install an addon to change your useragent."
-	elog "See: https://support.mozilla.org/en-US/kb/difficulties-opening-or-using-website-firefox-100"
-	elog
-}
diff --git a/www-client/firefox/firefox-102.4.0.ebuild b/www-client/firefox/firefox-102.4.0.ebuild
index da231a0559f3..b2861a3a5b41 100644
--- a/www-client/firefox/firefox-102.4.0.ebuild
+++ b/www-client/firefox/firefox-102.4.0.ebuild
@@ -57,7 +57,7 @@ SRC_URI="${MOZ_SRC_BASE_URI}/source/${MOZ_P}.source.tar.xz -> ${MOZ_P_DISTFILES}
 DESCRIPTION="Firefox Web Browser"
 HOMEPAGE="https://www.mozilla.com/firefox"
 
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 
 SLOT="esr"
 LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
diff --git a/www-client/firefox/firefox-105.0.2.ebuild b/www-client/firefox/firefox-105.0.2.ebuild
deleted file mode 100644
index 1c4172c64be5..000000000000
--- a/www-client/firefox/firefox-105.0.2.ebuild
+++ /dev/null
@@ -1,1323 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-FIREFOX_PATCHSET="firefox-105-patches-05j.tar.xz"
-
-LLVM_MAX_SLOT=14
-
-PYTHON_COMPAT=( python3_{8..11} )
-PYTHON_REQ_USE="ncurses,sqlite,ssl"
-
-WANT_AUTOCONF="2.1"
-
-VIRTUALX_REQUIRED="manual"
-
-MOZ_ESR=
-
-MOZ_PV=${PV}
-MOZ_PV_SUFFIX=
-if [[ ${PV} =~ (_(alpha|beta|rc).*)$ ]] ; then
-	MOZ_PV_SUFFIX=${BASH_REMATCH[1]}
-
-	# Convert the ebuild version to the upstream Mozilla version
-	MOZ_PV="${MOZ_PV/_alpha/a}" # Handle alpha for SRC_URI
-	MOZ_PV="${MOZ_PV/_beta/b}"  # Handle beta for SRC_URI
-	MOZ_PV="${MOZ_PV%%_rc*}"    # Handle rc for SRC_URI
-fi
-
-if [[ -n ${MOZ_ESR} ]] ; then
-	# ESR releases have slightly different version numbers
-	MOZ_PV="${MOZ_PV}esr"
-fi
-
-MOZ_PN="${PN%-bin}"
-MOZ_P="${MOZ_PN}-${MOZ_PV}"
-MOZ_PV_DISTFILES="${MOZ_PV}${MOZ_PV_SUFFIX}"
-MOZ_P_DISTFILES="${MOZ_PN}-${MOZ_PV_DISTFILES}"
-
-inherit autotools check-reqs desktop flag-o-matic gnome2-utils linux-info \
-	llvm multiprocessing pax-utils python-any-r1 toolchain-funcs \
-	virtualx xdg
-
-MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/releases/${MOZ_PV}"
-
-if [[ ${PV} == *_rc* ]] ; then
-	MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/candidates/${MOZ_PV}-candidates/build${PV##*_rc}"
-fi
-
-PATCH_URIS=(
-	https://dev.gentoo.org/~{juippis,whissi,slashbeast}/mozilla/patchsets/${FIREFOX_PATCHSET}
-)
-
-SRC_URI="${MOZ_SRC_BASE_URI}/source/${MOZ_P}.source.tar.xz -> ${MOZ_P_DISTFILES}.source.tar.xz
-	${PATCH_URIS[@]}"
-
-DESCRIPTION="Firefox Web Browser"
-HOMEPAGE="https://www.mozilla.com/firefox"
-
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-
-SLOT="rapid"
-LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-
-IUSE="+clang cpu_flags_arm_neon dbus debug eme-free hardened hwaccel"
-IUSE+=" jack libproxy lto +openh264 pgo pulseaudio sndio selinux"
-IUSE+=" +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent +system-libvpx system-png system-python-libs +system-webp"
-IUSE+=" wayland wifi"
-
-# Firefox-only IUSE
-IUSE+=" geckodriver +gmp-autoupdate screencast +X"
-
-REQUIRED_USE="debug? ( !system-av1 )
-	pgo? ( lto )
-	wifi? ( dbus )"
-
-# Firefox-only REQUIRED_USE flags
-REQUIRED_USE+=" || ( X wayland )"
-REQUIRED_USE+=" screencast? ( wayland )"
-
-FF_ONLY_DEPEND="!www-client/firefox:0
-	!www-client/firefox:esr
-	screencast? ( media-video/pipewire:= )
-	selinux? ( sec-policy/selinux-mozilla )"
-BDEPEND="${PYTHON_DEPS}
-	app-arch/unzip
-	app-arch/zip
-	>=dev-util/cbindgen-0.24.3
-	net-libs/nodejs
-	virtual/pkgconfig
-	>=virtual/rust-1.61.0
-	|| (
-		(
-			sys-devel/clang:14
-			sys-devel/llvm:14
-			clang? (
-				=sys-devel/lld-14*
-				pgo? ( =sys-libs/compiler-rt-sanitizers-14*[profile] )
-			)
-		)
-		(
-			sys-devel/clang:13
-			sys-devel/llvm:13
-			clang? (
-				=sys-devel/lld-13*
-				pgo? ( =sys-libs/compiler-rt-sanitizers-13*[profile] )
-			)
-		)
-	)
-	amd64? ( >=dev-lang/nasm-2.14 )
-	x86? ( >=dev-lang/nasm-2.14 )
-	pgo? (
-		X? (
-			x11-base/xorg-server[xvfb]
-			x11-apps/xhost
-		)
-		wayland? (
-			>=gui-libs/wlroots-0.15.1-r1[tinywl]
-			x11-misc/xkeyboard-config
-		)
-	)"
-COMMON_DEPEND="${FF_ONLY_DEPEND}
-	|| (
-		>=app-accessibility/at-spi2-core-2.46.0:2
-		dev-libs/atk
-	)
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/libffi:=
-	>=dev-libs/nss-3.82
-	>=dev-libs/nspr-4.34.1
-	media-libs/alsa-lib
-	media-libs/fontconfig
-	media-libs/freetype
-	media-libs/mesa
-	media-video/ffmpeg
-	sys-libs/zlib
-	virtual/freedesktop-icon-theme
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/pango
-	x11-libs/pixman
-	dbus? (
-		dev-libs/dbus-glib
-		sys-apps/dbus
-	)
-	jack? ( virtual/jack )
-	libproxy? ( net-libs/libproxy )
-	selinux? ( sec-policy/selinux-mozilla )
-	sndio? ( >=media-sound/sndio-1.8.0-r1 )
-	screencast? ( media-video/pipewire:= )
-	system-av1? (
-		>=media-libs/dav1d-1.0.0:=
-		>=media-libs/libaom-1.0.0:=
-	)
-	system-harfbuzz? (
-		>=media-gfx/graphite2-1.3.13
-		>=media-libs/harfbuzz-2.8.1:0=
-	)
-	system-icu? ( >=dev-libs/icu-71.1:= )
-	system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
-	system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] )
-	system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] )
-	system-png? ( >=media-libs/libpng-1.6.35:0=[apng] )
-	system-webp? ( >=media-libs/libwebp-1.1.0:0= )
-	wayland? (
-		>=media-libs/libepoxy-1.5.10-r1
-		x11-libs/gtk+:3[wayland]
-		x11-libs/libdrm
-		x11-libs/libxkbcommon[wayland]
-	)
-	wifi? (
-		kernel_linux? (
-			dev-libs/dbus-glib
-			net-misc/networkmanager
-			sys-apps/dbus
-		)
-	)
-	X? (
-		virtual/opengl
-		x11-libs/cairo[X]
-		x11-libs/gtk+:3[X]
-		x11-libs/libX11
-		x11-libs/libXcomposite
-		x11-libs/libXdamage
-		x11-libs/libXext
-		x11-libs/libXfixes
-		x11-libs/libxkbcommon[X]
-		x11-libs/libXrandr
-		x11-libs/libXtst
-		x11-libs/libxcb:=
-	)"
-RDEPEND="${COMMON_DEPEND}
-	jack? ( virtual/jack )
-	openh264? ( media-libs/openh264:*[plugin] )
-	pulseaudio? (
-		|| (
-			media-sound/pulseaudio
-			>=media-sound/apulse-0.1.12-r4
-		)
-	)"
-DEPEND="${COMMON_DEPEND}
-	pulseaudio? (
-		|| (
-			media-sound/pulseaudio
-			>=media-sound/apulse-0.1.12-r4[sdk]
-		)
-	)
-	X? (
-		x11-libs/libICE
-		x11-libs/libSM
-	)"
-
-S="${WORKDIR}/${PN}-${PV%_*}"
-
-# Allow MOZ_GMP_PLUGIN_LIST to be set in an eclass or
-# overridden in the enviromnent (advanced hackers only)
-if [[ -z "${MOZ_GMP_PLUGIN_LIST+set}" ]] ; then
-	MOZ_GMP_PLUGIN_LIST=( gmp-gmpopenh264 gmp-widevinecdm )
-fi
-
-llvm_check_deps() {
-	if ! has_version -b "sys-devel/clang:${LLVM_SLOT}" ; then
-		einfo "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-		return 1
-	fi
-
-	if use clang ; then
-		if ! has_version -b "=sys-devel/lld-${LLVM_SLOT}*" ; then
-			einfo "=sys-devel/lld-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-			return 1
-		fi
-
-		if use pgo ; then
-			if ! has_version -b "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}*" ; then
-				einfo "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-				return 1
-			fi
-		fi
-	fi
-
-	einfo "Using LLVM slot ${LLVM_SLOT} to build" >&2
-}
-
-MOZ_LANGS=(
-	af ar ast be bg br ca cak cs cy da de dsb
-	el en-CA en-GB en-US es-AR es-ES et eu
-	fi fr fy-NL ga-IE gd gl he hr hsb hu
-	id is it ja ka kab kk ko lt lv ms nb-NO nl nn-NO
-	pa-IN pl pt-BR pt-PT rm ro ru
-	sk sl sq sr sv-SE th tr uk uz vi zh-CN zh-TW
-)
-
-# Firefox-only LANGS
-MOZ_LANGS+=( ach )
-MOZ_LANGS+=( an )
-MOZ_LANGS+=( az )
-MOZ_LANGS+=( bn )
-MOZ_LANGS+=( bs )
-MOZ_LANGS+=( ca-valencia )
-MOZ_LANGS+=( eo )
-MOZ_LANGS+=( es-CL )
-MOZ_LANGS+=( es-MX )
-MOZ_LANGS+=( fa )
-MOZ_LANGS+=( ff )
-MOZ_LANGS+=( gn )
-MOZ_LANGS+=( gu-IN )
-MOZ_LANGS+=( hi-IN )
-MOZ_LANGS+=( hy-AM )
-MOZ_LANGS+=( ia )
-MOZ_LANGS+=( km )
-MOZ_LANGS+=( kn )
-MOZ_LANGS+=( lij )
-MOZ_LANGS+=( mk )
-MOZ_LANGS+=( mr )
-MOZ_LANGS+=( my )
-MOZ_LANGS+=( ne-NP )
-MOZ_LANGS+=( oc )
-MOZ_LANGS+=( sco )
-MOZ_LANGS+=( si )
-MOZ_LANGS+=( son )
-MOZ_LANGS+=( szl )
-MOZ_LANGS+=( ta )
-MOZ_LANGS+=( te )
-MOZ_LANGS+=( tl )
-MOZ_LANGS+=( trs )
-MOZ_LANGS+=( ur )
-MOZ_LANGS+=( xh )
-
-mozilla_set_globals() {
-	# https://bugs.gentoo.org/587334
-	local MOZ_TOO_REGIONALIZED_FOR_L10N=(
-		fy-NL ga-IE gu-IN hi-IN hy-AM nb-NO ne-NP nn-NO pa-IN sv-SE
-	)
-
-	local lang xflag
-	for lang in "${MOZ_LANGS[@]}" ; do
-		# en and en_US are handled internally
-		if [[ ${lang} == en ]] || [[ ${lang} == en-US ]] ; then
-			continue
-		fi
-
-		# strip region subtag if $lang is in the list
-		if has ${lang} "${MOZ_TOO_REGIONALIZED_FOR_L10N[@]}" ; then
-			xflag=${lang%%-*}
-		else
-			xflag=${lang}
-		fi
-
-		SRC_URI+=" l10n_${xflag/[_@]/-}? ("
-		SRC_URI+=" ${MOZ_SRC_BASE_URI}/linux-x86_64/xpi/${lang}.xpi -> ${MOZ_P_DISTFILES}-${lang}.xpi"
-		SRC_URI+=" )"
-		IUSE+=" l10n_${xflag/[_@]/-}"
-	done
-}
-mozilla_set_globals
-
-moz_clear_vendor_checksums() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -ne 1 ]] ; then
-		die "${FUNCNAME} requires exact one argument"
-	fi
-
-	einfo "Clearing cargo checksums for ${1} ..."
-
-	sed -i \
-		-e 's/\("files":{\)[^}]*/\1/' \
-		"${S}"/third_party/rust/${1}/.cargo-checksum.json \
-		|| die
-}
-
-moz_install_xpi() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 2 ]] ; then
-		die "${FUNCNAME} requires at least two arguments"
-	fi
-
-	local DESTDIR=${1}
-	shift
-
-	insinto "${DESTDIR}"
-
-	local emid xpi_file xpi_tmp_dir
-	for xpi_file in "${@}" ; do
-		emid=
-		xpi_tmp_dir=$(mktemp -d --tmpdir="${T}")
-
-		# Unpack XPI
-		unzip -qq "${xpi_file}" -d "${xpi_tmp_dir}" || die
-
-		# Determine extension ID
-		if [[ -f "${xpi_tmp_dir}/install.rdf" ]] ; then
-			emid=$(sed -n -e '/install-manifest/,$ { /em:id/!d; s/.*[\">]\([^\"<>]*\)[\"<].*/\1/; p; q }' "${xpi_tmp_dir}/install.rdf")
-			[[ -z "${emid}" ]] && die "failed to determine extension id from install.rdf"
-		elif [[ -f "${xpi_tmp_dir}/manifest.json" ]] ; then
-			emid=$(sed -n -e 's/.*"id": "\([^"]*\)".*/\1/p' "${xpi_tmp_dir}/manifest.json")
-			[[ -z "${emid}" ]] && die "failed to determine extension id from manifest.json"
-		else
-			die "failed to determine extension id"
-		fi
-
-		einfo "Installing ${emid}.xpi into ${ED}${DESTDIR} ..."
-		newins "${xpi_file}" "${emid}.xpi"
-	done
-}
-
-mozconfig_add_options_ac() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 2 ]] ; then
-		die "${FUNCNAME} requires at least two arguments"
-	fi
-
-	local reason=${1}
-	shift
-
-	local option
-	for option in ${@} ; do
-		echo "ac_add_options ${option} # ${reason}" >>${MOZCONFIG}
-	done
-}
-
-mozconfig_add_options_mk() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 2 ]] ; then
-		die "${FUNCNAME} requires at least two arguments"
-	fi
-
-	local reason=${1}
-	shift
-
-	local option
-	for option in ${@} ; do
-		echo "mk_add_options ${option} # ${reason}" >>${MOZCONFIG}
-	done
-}
-
-mozconfig_use_enable() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 1 ]] ; then
-		die "${FUNCNAME} requires at least one arguments"
-	fi
-
-	local flag=$(use_enable "${@}")
-	mozconfig_add_options_ac "$(use ${1} && echo +${1} || echo -${1})" "${flag}"
-}
-
-mozconfig_use_with() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 1 ]] ; then
-		die "${FUNCNAME} requires at least one arguments"
-	fi
-
-	local flag=$(use_with "${@}")
-	mozconfig_add_options_ac "$(use ${1} && echo +${1} || echo -${1})" "${flag}"
-}
-
-virtwl() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	[[ $# -lt 1 ]] && die "${FUNCNAME} needs at least one argument"
-	[[ -n $XDG_RUNTIME_DIR ]] || die "${FUNCNAME} needs XDG_RUNTIME_DIR to be set; try xdg_environment_reset"
-	tinywl -h >/dev/null || die 'tinywl -h failed'
-
-	# TODO: don't run addpredict in utility function. WLR_RENDERER=pixman doesn't work
-	addpredict /dev/dri
-	local VIRTWL VIRTWL_PID
-	coproc VIRTWL { WLR_BACKENDS=headless exec tinywl -s 'echo $WAYLAND_DISPLAY; read _; kill $PPID'; }
-	local -x WAYLAND_DISPLAY
-	read WAYLAND_DISPLAY <&${VIRTWL[0]}
-
-	debug-print "${FUNCNAME}: $@"
-	"$@"
-
-	[[ -n $VIRTWL_PID ]] || die "tinywl exited unexpectedly"
-	exec {VIRTWL[0]}<&- {VIRTWL[1]}>&-
-}
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]] ; then
-		if use pgo ; then
-			if ! has usersandbox $FEATURES ; then
-				die "You must enable usersandbox as X server can not run as root!"
-			fi
-		fi
-
-		# Ensure we have enough disk space to compile
-		if use pgo || use lto || use debug ; then
-			CHECKREQS_DISK_BUILD="13500M"
-		else
-			CHECKREQS_DISK_BUILD="6600M"
-		fi
-
-		check-reqs_pkg_pretend
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]] ; then
-		if use pgo ; then
-			if ! has userpriv ${FEATURES} ; then
-				eerror "Building ${PN} with USE=pgo and FEATURES=-userpriv is not supported!"
-			fi
-		fi
-
-		# Ensure we have enough disk space to compile
-		if use pgo || use lto || use debug ; then
-			CHECKREQS_DISK_BUILD="13500M"
-		else
-			CHECKREQS_DISK_BUILD="6400M"
-		fi
-
-		check-reqs_pkg_setup
-
-		llvm_pkg_setup
-
-		if use clang && use lto ; then
-			local version_lld=$(ld.lld --version 2>/dev/null | awk '{ print $2 }')
-			[[ -n ${version_lld} ]] && version_lld=$(ver_cut 1 "${version_lld}")
-			[[ -z ${version_lld} ]] && die "Failed to read ld.lld version!"
-
-			local version_llvm_rust=$(rustc -Vv 2>/dev/null | grep -F -- 'LLVM version:' | awk '{ print $3 }')
-			[[ -n ${version_llvm_rust} ]] && version_llvm_rust=$(ver_cut 1 "${version_llvm_rust}")
-			[[ -z ${version_llvm_rust} ]] && die "Failed to read used LLVM version from rustc!"
-
-			if ver_test "${version_lld}" -ne "${version_llvm_rust}" ; then
-				eerror "Rust is using LLVM version ${version_llvm_rust} but ld.lld version belongs to LLVM version ${version_lld}."
-				eerror "You will be unable to link ${CATEGORY}/${PN}. To proceed you have the following options:"
-				eerror "  - Manually switch rust version using 'eselect rust' to match used LLVM version"
-				eerror "  - Switch to dev-lang/rust[system-llvm] which will guarantee matching version"
-				eerror "  - Build ${CATEGORY}/${PN} without USE=lto"
-				eerror "  - Rebuild lld with llvm that was used to build rust (may need to rebuild the whole "
-				eerror "    llvm/clang/lld/rust chain depending on your @world updates)"
-				die "LLVM version used by Rust (${version_llvm_rust}) does not match with ld.lld version (${version_lld})!"
-			fi
-		fi
-
-		python-any-r1_pkg_setup
-
-		# Avoid PGO profiling problems due to enviroment leakage
-		# These should *always* be cleaned up anyway
-		unset \
-			DBUS_SESSION_BUS_ADDRESS \
-			DISPLAY \
-			ORBIT_SOCKETDIR \
-			SESSION_MANAGER \
-			XAUTHORITY \
-			XDG_CACHE_HOME \
-			XDG_SESSION_COOKIE
-
-		# Build system is using /proc/self/oom_score_adj, bug #604394
-		addpredict /proc/self/oom_score_adj
-
-		if use pgo ; then
-			# Update 105.0: "/proc/self/oom_score_adj" isn't enough anymore with pgo, but not sure
-			# whether that's due to better OOM handling by Firefox (bmo#1771712), or portage
-			# (PORTAGE_SCHEDULING_POLICY) update...
-			addpredict /proc
-
-			# May need a wider addpredict when using wayland+pgo.
-			addpredict /dev/dri
-
-			# Allow access to GPU during PGO run
-			local ati_cards mesa_cards nvidia_cards render_cards
-			shopt -s nullglob
-
-			ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
-			if [[ -n "${ati_cards}" ]] ; then
-				addpredict "${ati_cards}"
-			fi
-
-			mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
-			if [[ -n "${mesa_cards}" ]] ; then
-				addpredict "${mesa_cards}"
-			fi
-
-			nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
-			if [[ -n "${nvidia_cards}" ]] ; then
-				addpredict "${nvidia_cards}"
-			fi
-
-			render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
-			if [[ -n "${render_cards}" ]] ; then
-				addpredict "${render_cards}"
-			fi
-
-			shopt -u nullglob
-		fi
-
-		if ! mountpoint -q /dev/shm ; then
-			# If /dev/shm is not available, configure is known to fail with
-			# a traceback report referencing /usr/lib/pythonN.N/multiprocessing/synchronize.py
-			ewarn "/dev/shm is not mounted -- expect build failures!"
-		fi
-
-		# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
-		# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
-		# get your own set of keys.
-		if [[ -z "${MOZ_API_KEY_GOOGLE+set}" ]] ; then
-			MOZ_API_KEY_GOOGLE="AIzaSyDEAOvatFogGaPi0eTgsV_ZlEzx0ObmepsMzfAc"
-		fi
-
-		if [[ -z "${MOZ_API_KEY_LOCATION+set}" ]] ; then
-			MOZ_API_KEY_LOCATION="AIzaSyB2h2OuRgGaPicUgy5N-5hsZqiPW6sH3n_rptiQ"
-		fi
-
-		# Mozilla API keys (see https://location.services.mozilla.com/api)
-		# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
-		# get your own set of keys.
-		if [[ -z "${MOZ_API_KEY_MOZILLA+set}" ]] ; then
-			MOZ_API_KEY_MOZILLA="edb3d487-3a84-46m0ap1e3-9dfd-92b5efaaa005"
-		fi
-
-		# Ensure we use C locale when building, bug #746215
-		export LC_ALL=C
-	fi
-
-	CONFIG_CHECK="~SECCOMP"
-	WARNING_SECCOMP="CONFIG_SECCOMP not set! This system will be unable to play DRM-protected content."
-	linux-info_pkg_setup
-}
-
-src_unpack() {
-	local _lp_dir="${WORKDIR}/language_packs"
-	local _src_file
-
-	if [[ ! -d "${_lp_dir}" ]] ; then
-		mkdir "${_lp_dir}" || die
-	fi
-
-	for _src_file in ${A} ; do
-		if [[ ${_src_file} == *.xpi ]]; then
-			cp "${DISTDIR}/${_src_file}" "${_lp_dir}" || die "Failed to copy '${_src_file}' to '${_lp_dir}'!"
-		else
-			unpack ${_src_file}
-		fi
-	done
-}
-
-src_prepare() {
-	use lto && rm -v "${WORKDIR}"/firefox-patches/*-LTO-Only-enable-LTO-*.patch
-	! use ppc64 && rm -v "${WORKDIR}"/firefox-patches/*bmo-1775202-ppc64*.patch
-	eapply "${WORKDIR}/firefox-patches"
-
-	# Allow user to apply any additional patches without modifing ebuild
-	eapply_user
-
-	# Make cargo respect MAKEOPTS
-	export CARGO_BUILD_JOBS="$(makeopts_jobs)"
-
-	# Make LTO respect MAKEOPTS
-	sed -i \
-		-e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
-		"${S}"/build/moz.configure/lto-pgo.configure \
-		|| die "sed failed to set num_cores"
-
-	# Make ICU respect MAKEOPTS
-	sed -i \
-		-e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
-		"${S}"/intl/icu_sources_data.py \
-		|| die "sed failed to set num_cores"
-
-	# sed-in toolchain prefix
-	sed -i \
-		-e "s/objdump/${CHOST}-objdump/" \
-		"${S}"/python/mozbuild/mozbuild/configure/check_debug_ranges.py \
-		|| die "sed failed to set toolchain prefix"
-
-	sed -i \
-		-e 's/ccache_stats = None/return None/' \
-		"${S}"/python/mozbuild/mozbuild/controller/building.py \
-		|| die "sed failed to disable ccache stats call"
-
-	einfo "Removing pre-built binaries ..."
-	find "${S}"/third_party -type f \( -name '*.so' -o -name '*.o' \) -print -delete || die
-
-	# Clearing checksums where we have applied patches
-	moz_clear_vendor_checksums audioipc
-	moz_clear_vendor_checksums audioipc-client
-	moz_clear_vendor_checksums audioipc-server
-
-	# Create build dir
-	BUILD_DIR="${WORKDIR}/${PN}_build"
-	mkdir -p "${BUILD_DIR}" || die
-
-	# Write API keys to disk
-	echo -n "${MOZ_API_KEY_GOOGLE//gGaPi/}" > "${S}"/api-google.key || die
-	echo -n "${MOZ_API_KEY_LOCATION//gGaPi/}" > "${S}"/api-location.key || die
-	echo -n "${MOZ_API_KEY_MOZILLA//m0ap1/}" > "${S}"/api-mozilla.key || die
-
-	xdg_environment_reset
-}
-
-src_configure() {
-	# Show flags set at the beginning
-	einfo "Current BINDGEN_CFLAGS:\t${BINDGEN_CFLAGS:-no value set}"
-	einfo "Current CFLAGS:\t\t${CFLAGS:-no value set}"
-	einfo "Current CXXFLAGS:\t\t${CXXFLAGS:-no value set}"
-	einfo "Current LDFLAGS:\t\t${LDFLAGS:-no value set}"
-	einfo "Current RUSTFLAGS:\t\t${RUSTFLAGS:-no value set}"
-
-	local have_switched_compiler=
-	if use clang && ! tc-is-clang ; then
-		# Force clang
-		einfo "Enforcing the use of clang due to USE=clang ..."
-		have_switched_compiler=yes
-		AR=llvm-ar
-		AS=llvm-as
-		CC=${CHOST}-clang
-		CXX=${CHOST}-clang++
-		NM=llvm-nm
-		RANLIB=llvm-ranlib
-	elif ! use clang && ! tc-is-gcc ; then
-		# Force gcc
-		have_switched_compiler=yes
-		einfo "Enforcing the use of gcc due to USE=-clang ..."
-		AR=gcc-ar
-		CC=${CHOST}-gcc
-		CXX=${CHOST}-g++
-		NM=gcc-nm
-		RANLIB=gcc-ranlib
-	fi
-
-	if [[ -n "${have_switched_compiler}" ]] ; then
-		# Because we switched active compiler we have to ensure
-		# that no unsupported flags are set
-		strip-unsupported-flags
-	fi
-
-	# Ensure we use correct toolchain
-	export HOST_CC="$(tc-getBUILD_CC)"
-	export HOST_CXX="$(tc-getBUILD_CXX)"
-	tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
-
-	# Pass the correct toolchain paths through cbindgen
-	if tc-is-cross-compiler ; then
-		export BINDGEN_CFLAGS="${SYSROOT:+--sysroot=${ESYSROOT}} --target=${CHOST} ${BINDGEN_CFLAGS-}"
-	fi
-
-	# Set MOZILLA_FIVE_HOME
-	export MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
-
-	# python/mach/mach/mixin/process.py fails to detect SHELL
-	export SHELL="${EPREFIX}/bin/bash"
-
-	# Set state path
-	export MOZBUILD_STATE_PATH="${BUILD_DIR}"
-
-	# Set MOZCONFIG
-	export MOZCONFIG="${S}/.mozconfig"
-
-	# Initialize MOZCONFIG
-	mozconfig_add_options_ac '' --enable-application=browser
-
-	# Set Gentoo defaults
-	export MOZILLA_OFFICIAL=1
-
-	mozconfig_add_options_ac 'Gentoo default' \
-		--allow-addon-sideload \
-		--disable-cargo-incremental \
-		--disable-crashreporter \
-		--disable-gpsd \
-		--disable-install-strip \
-		--disable-parental-controls \
-		--disable-strip \
-		--disable-updater \
-		--enable-negotiateauth \
-		--enable-new-pass-manager \
-		--enable-official-branding \
-		--enable-release \
-		--enable-system-ffi \
-		--enable-system-pixman \
-		--enable-system-policies \
-		--host="${CBUILD:-${CHOST}}" \
-		--libdir="${EPREFIX}/usr/$(get_libdir)" \
-		--prefix="${EPREFIX}/usr" \
-		--target="${CHOST}" \
-		--without-ccache \
-		--without-wasm-sandboxed-libraries \
-		--with-intl-api \
-		--with-libclang-path="$(llvm-config --libdir)" \
-		--with-system-nspr \
-		--with-system-nss \
-		--with-system-zlib \
-		--with-toolchain-prefix="${CHOST}-" \
-		--with-unsigned-addon-scopes=app,system \
-		--x-includes="${ESYSROOT}/usr/include" \
-		--x-libraries="${ESYSROOT}/usr/$(get_libdir)"
-
-	# Set update channel
-	local update_channel=release
-	[[ -n ${MOZ_ESR} ]] && update_channel=esr
-	mozconfig_add_options_ac '' --update-channel=${update_channel}
-
-	if ! use x86 && [[ ${CHOST} != armv*h* ]] ; then
-		mozconfig_add_options_ac '' --enable-rust-simd
-	fi
-
-	# For future keywording: This is currently (97.0) only supported on:
-	# amd64, arm, arm64 & x86.
-	# Might want to flip the logic around if Firefox is to support more arches.
-	if use ppc64; then
-		mozconfig_add_options_ac '' --disable-sandbox
-	else
-		mozconfig_add_options_ac '' --enable-sandbox
-	fi
-
-	if [[ -s "${S}/api-google.key" ]] ; then
-		local key_origin="Gentoo default"
-		if [[ $(cat "${S}/api-google.key" | md5sum | awk '{ print $1 }') != 709560c02f94b41f9ad2c49207be6c54 ]] ; then
-			key_origin="User value"
-		fi
-
-		mozconfig_add_options_ac "${key_origin}" \
-			--with-google-safebrowsing-api-keyfile="${S}/api-google.key"
-	else
-		einfo "Building without Google API key ..."
-	fi
-
-	if [[ -s "${S}/api-location.key" ]] ; then
-		local key_origin="Gentoo default"
-		if [[ $(cat "${S}/api-location.key" | md5sum | awk '{ print $1 }') != ffb7895e35dedf832eb1c5d420ac7420 ]] ; then
-			key_origin="User value"
-		fi
-
-		mozconfig_add_options_ac "${key_origin}" \
-			--with-google-location-service-api-keyfile="${S}/api-location.key"
-	else
-		einfo "Building without Location API key ..."
-	fi
-
-	if [[ -s "${S}/api-mozilla.key" ]] ; then
-		local key_origin="Gentoo default"
-		if [[ $(cat "${S}/api-mozilla.key" | md5sum | awk '{ print $1 }') != 3927726e9442a8e8fa0e46ccc39caa27 ]] ; then
-			key_origin="User value"
-		fi
-
-		mozconfig_add_options_ac "${key_origin}" \
-			--with-mozilla-api-keyfile="${S}/api-mozilla.key"
-	else
-		einfo "Building without Mozilla API key ..."
-	fi
-
-	mozconfig_use_with system-av1
-	mozconfig_use_with system-harfbuzz
-	mozconfig_use_with system-harfbuzz system-graphite2
-	mozconfig_use_with system-icu
-	mozconfig_use_with system-jpeg
-	mozconfig_use_with system-libevent
-	mozconfig_use_with system-libvpx
-	mozconfig_use_with system-png
-	mozconfig_use_with system-webp
-
-	mozconfig_use_enable dbus
-	mozconfig_use_enable libproxy
-
-	use eme-free && mozconfig_add_options_ac '+eme-free' --disable-eme
-
-	mozconfig_use_enable geckodriver
-
-	if use hardened ; then
-		mozconfig_add_options_ac "+hardened" --enable-hardening
-		append-ldflags "-Wl,-z,relro -Wl,-z,now"
-	fi
-
-	local myaudiobackends=""
-	use jack && myaudiobackends+="jack,"
-	use sndio && myaudiobackends+="sndio,"
-	use pulseaudio && myaudiobackends+="pulseaudio,"
-	! use pulseaudio && myaudiobackends+="alsa,"
-
-	mozconfig_add_options_ac '--enable-audio-backends' --enable-audio-backends="${myaudiobackends::-1}"
-
-	mozconfig_use_enable wifi necko-wifi
-
-	if use X && use wayland ; then
-		mozconfig_add_options_ac '+x11+wayland' --enable-default-toolkit=cairo-gtk3-x11-wayland
-	elif ! use X && use wayland ; then
-		mozconfig_add_options_ac '+wayland' --enable-default-toolkit=cairo-gtk3-wayland-only
-	else
-		mozconfig_add_options_ac '+x11' --enable-default-toolkit=cairo-gtk3
-	fi
-
-	if use lto ; then
-		if use clang ; then
-			# Upstream only supports lld when using clang
-			mozconfig_add_options_ac "forcing ld=lld due to USE=clang and USE=lto" --enable-linker=lld
-
-			mozconfig_add_options_ac '+lto' --enable-lto=cross
-
-		else
-			# ThinLTO is currently broken, see bmo#1644409
-			mozconfig_add_options_ac '+lto' --enable-lto=full
-			mozconfig_add_options_ac "linker is set to bfd" --enable-linker=bfd
-		fi
-
-		if use pgo ; then
-			mozconfig_add_options_ac '+pgo' MOZ_PGO=1
-
-			if use clang ; then
-				# Used in build/pgo/profileserver.py
-				export LLVM_PROFDATA="llvm-profdata"
-			fi
-		fi
-	else
-		# Avoid auto-magic on linker
-		if use clang ; then
-			# This is upstream's default
-			mozconfig_add_options_ac "forcing ld=lld due to USE=clang" --enable-linker=lld
-		else
-			mozconfig_add_options_ac "linker is set to bfd" --enable-linker=bfd
-		fi
-	fi
-
-	# LTO flag was handled via configure
-	filter-flags '-flto*'
-
-	mozconfig_use_enable debug
-	if use debug ; then
-		mozconfig_add_options_ac '+debug' --disable-optimize
-	else
-		if is-flag '-g*' ; then
-			if use clang ; then
-				mozconfig_add_options_ac 'from CFLAGS' --enable-debug-symbols=$(get-flag '-g*')
-			else
-				mozconfig_add_options_ac 'from CFLAGS' --enable-debug-symbols
-			fi
-		else
-			mozconfig_add_options_ac 'Gentoo default' --disable-debug-symbols
-		fi
-
-		if is-flag '-O0' ; then
-			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O0
-		elif is-flag '-O4' ; then
-			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O4
-		elif is-flag '-O3' ; then
-			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O3
-		elif is-flag '-O1' ; then
-			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O1
-		elif is-flag '-Os' ; then
-			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-Os
-		else
-			mozconfig_add_options_ac "Gentoo default" --enable-optimize=-O2
-		fi
-	fi
-
-	# Debug flag was handled via configure
-	filter-flags '-g*'
-
-	# Optimization flag was handled via configure
-	filter-flags '-O*'
-
-	# Modifications to better support ARM, bug #553364
-	if use cpu_flags_arm_neon ; then
-		mozconfig_add_options_ac '+cpu_flags_arm_neon' --with-fpu=neon
-
-		if ! tc-is-clang ; then
-			# thumb options aren't supported when using clang, bug 666966
-			mozconfig_add_options_ac '+cpu_flags_arm_neon' \
-				--with-thumb=yes \
-				--with-thumb-interwork=no
-		fi
-	fi
-
-	if [[ ${CHOST} == armv*h* ]] ; then
-		mozconfig_add_options_ac 'CHOST=armv*h*' --with-float-abi=hard
-
-		if ! use system-libvpx ; then
-			sed -i \
-				-e "s|softfp|hard|" \
-				"${S}"/media/libvpx/moz.build \
-				|| die
-		fi
-	fi
-
-	if use clang ; then
-		# https://bugzilla.mozilla.org/show_bug.cgi?id=1482204
-		# https://bugzilla.mozilla.org/show_bug.cgi?id=1483822
-		# toolkit/moz.configure Elfhack section: target.cpu in ('arm', 'x86', 'x86_64')
-		local disable_elf_hack=
-		if use amd64 ; then
-			disable_elf_hack=yes
-		elif use x86 ; then
-			disable_elf_hack=yes
-		elif use arm ; then
-			disable_elf_hack=yes
-		fi
-
-		if [[ -n ${disable_elf_hack} ]] ; then
-			mozconfig_add_options_ac 'elf-hack is broken when using Clang' --disable-elf-hack
-		fi
-	elif tc-is-gcc ; then
-		if ver_test $(gcc-fullversion) -ge 10 ; then
-			einfo "Forcing -fno-tree-loop-vectorize to workaround GCC bug, see bug 758446 ..."
-			append-cxxflags -fno-tree-loop-vectorize
-		fi
-	fi
-
-	# Additional ARCH support
-	case "${ARCH}" in
-		arm)
-			# Reduce the memory requirements for linking
-			if use clang ; then
-				# Nothing to do
-				:;
-			elif use lto ; then
-				append-ldflags -Wl,--no-keep-memory
-			else
-				append-ldflags -Wl,--no-keep-memory -Wl,--reduce-memory-overheads
-			fi
-			;;
-	esac
-
-	if ! use elibc_glibc ; then
-		mozconfig_add_options_ac '!elibc_glibc' --disable-jemalloc
-	fi
-
-	# Allow elfhack to work in combination with unstripped binaries
-	# when they would normally be larger than 2GiB.
-	append-ldflags "-Wl,--compress-debug-sections=zlib"
-
-	# Make revdep-rebuild.sh happy; Also required for musl
-	append-ldflags -Wl,-rpath="${MOZILLA_FIVE_HOME}",--enable-new-dtags
-
-	# Pass $MAKEOPTS to build system
-	export MOZ_MAKE_FLAGS="${MAKEOPTS}"
-
-	# Use system's Python environment
-	PIP_NETWORK_INSTALL_RESTRICTED_VIRTUALENVS=mach
-
-	if use system-python-libs; then
-		export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE="system"
-	else
-		export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE="none"
-	fi
-
-	# Disable notification when build system has finished
-	export MOZ_NOSPAM=1
-
-	# Portage sets XARGS environment variable to "xargs -r" by default which
-	# breaks build system's check_prog() function which doesn't support arguments
-	mozconfig_add_options_ac 'Gentoo default' "XARGS=${EPREFIX}/usr/bin/xargs"
-
-	# Set build dir
-	mozconfig_add_options_mk 'Gentoo default' "MOZ_OBJDIR=${BUILD_DIR}"
-
-	# Show flags we will use
-	einfo "Build BINDGEN_CFLAGS:\t${BINDGEN_CFLAGS:-no value set}"
-	einfo "Build CFLAGS:\t\t${CFLAGS:-no value set}"
-	einfo "Build CXXFLAGS:\t\t${CXXFLAGS:-no value set}"
-	einfo "Build LDFLAGS:\t\t${LDFLAGS:-no value set}"
-	einfo "Build RUSTFLAGS:\t\t${RUSTFLAGS:-no value set}"
-
-	# Handle EXTRA_CONF and show summary
-	local ac opt hash reason
-
-	# Apply EXTRA_ECONF entries to $MOZCONFIG
-	if [[ -n ${EXTRA_ECONF} ]] ; then
-		IFS=\! read -a ac <<<${EXTRA_ECONF// --/\!}
-		for opt in "${ac[@]}"; do
-			mozconfig_add_options_ac "EXTRA_ECONF" --${opt#--}
-		done
-	fi
-
-	echo
-	echo "=========================================================="
-	echo "Building ${PF} with the following configuration"
-	grep ^ac_add_options "${MOZCONFIG}" | while read ac opt hash reason; do
-		[[ -z ${hash} || ${hash} == \# ]] \
-			|| die "error reading mozconfig: ${ac} ${opt} ${hash} ${reason}"
-		printf "    %-30s  %s\n" "${opt}" "${reason:-mozilla.org default}"
-	done
-	echo "=========================================================="
-	echo
-
-	./mach configure || die
-}
-
-src_compile() {
-	local virtx_cmd=
-
-	if use pgo; then
-		# Reset and cleanup environment variables used by GNOME/XDG
-		gnome2_environment_reset
-
-		addpredict /root
-
-		if ! use X; then
-			virtx_cmd=virtwl
-		else
-			virtx_cmd=virtx
-		fi
-	fi
-
-	if ! use X; then
-		local -x GDK_BACKEND=wayland
-	else
-		local -x GDK_BACKEND=x11
-	fi
-
-	${virtx_cmd} ./mach build --verbose || die
-}
-
-src_install() {
-	# xpcshell is getting called during install
-	pax-mark m \
-		"${BUILD_DIR}"/dist/bin/xpcshell \
-		"${BUILD_DIR}"/dist/bin/${PN} \
-		"${BUILD_DIR}"/dist/bin/plugin-container
-
-	DESTDIR="${D}" ./mach install || die
-
-	# Upstream cannot ship symlink but we can (bmo#658850)
-	rm "${ED}${MOZILLA_FIVE_HOME}/${PN}-bin" || die
-	dosym ${PN} ${MOZILLA_FIVE_HOME}/${PN}-bin
-
-	# Don't install llvm-symbolizer from sys-devel/llvm package
-	if [[ -f "${ED}${MOZILLA_FIVE_HOME}/llvm-symbolizer" ]] ; then
-		rm -v "${ED}${MOZILLA_FIVE_HOME}/llvm-symbolizer" || die
-	fi
-
-	# Install policy (currently only used to disable application updates)
-	insinto "${MOZILLA_FIVE_HOME}/distribution"
-	newins "${FILESDIR}"/distribution.ini distribution.ini
-	newins "${FILESDIR}"/disable-auto-update.policy.json policies.json
-
-	# Install system-wide preferences
-	local PREFS_DIR="${MOZILLA_FIVE_HOME}/browser/defaults/preferences"
-	insinto "${PREFS_DIR}"
-	newins "${FILESDIR}"/gentoo-default-prefs.js gentoo-prefs.js
-
-	local GENTOO_PREFS="${ED}${PREFS_DIR}/gentoo-prefs.js"
-
-	# Set dictionary path to use system hunspell
-	cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set spellchecker.dictionary_path pref"
-	pref("spellchecker.dictionary_path",       "${EPREFIX}/usr/share/myspell");
-	EOF
-
-	# Force hwaccel prefs if USE=hwaccel is enabled
-	if use hwaccel ; then
-		cat "${FILESDIR}"/gentoo-hwaccel-prefs.js-r2 \
-		>>"${GENTOO_PREFS}" \
-		|| die "failed to add prefs to force hardware-accelerated rendering to all-gentoo.js"
-
-		if use wayland; then
-			cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set hwaccel wayland prefs"
-			pref("gfx.x11-egl.force-enabled",          false);
-			EOF
-		else
-			cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set hwaccel x11 prefs"
-			pref("gfx.x11-egl.force-enabled",          true);
-			EOF
-		fi
-	fi
-
-	if ! use gmp-autoupdate ; then
-		local plugin
-		for plugin in "${MOZ_GMP_PLUGIN_LIST[@]}" ; do
-			einfo "Disabling auto-update for ${plugin} plugin ..."
-			cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to disable autoupdate for ${plugin} media plugin"
-			pref("media.${plugin}.autoupdate",   false);
-			EOF
-		done
-	fi
-
-	# Force the graphite pref if USE=system-harfbuzz is enabled, since the pref cannot disable it
-	if use system-harfbuzz ; then
-		cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set gfx.font_rendering.graphite.enabled pref"
-		sticky_pref("gfx.font_rendering.graphite.enabled", true);
-		EOF
-	fi
-
-	# Install language packs
-	local langpacks=( $(find "${WORKDIR}/language_packs" -type f -name '*.xpi') )
-	if [[ -n "${langpacks}" ]] ; then
-		moz_install_xpi "${MOZILLA_FIVE_HOME}/distribution/extensions" "${langpacks[@]}"
-	fi
-
-	# Install geckodriver
-	if use geckodriver ; then
-		einfo "Installing geckodriver into ${ED}${MOZILLA_FIVE_HOME} ..."
-		pax-mark m "${BUILD_DIR}"/dist/bin/geckodriver
-		exeinto "${MOZILLA_FIVE_HOME}"
-		doexe "${BUILD_DIR}"/dist/bin/geckodriver
-
-		dosym ${MOZILLA_FIVE_HOME}/geckodriver /usr/bin/geckodriver
-	fi
-
-	# Install icons
-	local icon_srcdir="${S}/browser/branding/official"
-	local icon_symbolic_file="${FILESDIR}/icon/firefox-symbolic.svg"
-
-	insinto /usr/share/icons/hicolor/symbolic/apps
-	newins "${icon_symbolic_file}" ${PN}-symbolic.svg
-
-	local icon size
-	for icon in "${icon_srcdir}"/default*.png ; do
-		size=${icon%.png}
-		size=${size##*/default}
-
-		if [[ ${size} -eq 48 ]] ; then
-			newicon "${icon}" ${PN}.png
-		fi
-
-		newicon -s ${size} "${icon}" ${PN}.png
-	done
-
-	# Install menu
-	local app_name="Mozilla ${MOZ_PN^}"
-	local desktop_file="${FILESDIR}/icon/${PN}-r3.desktop"
-	local desktop_filename="${PN}.desktop"
-	local exec_command="${PN}"
-	local icon="${PN}"
-	local use_wayland="false"
-
-	if use wayland ; then
-		use_wayland="true"
-	fi
-
-	cp "${desktop_file}" "${WORKDIR}/${PN}.desktop-template" || die
-
-	sed -i \
-		-e "s:@NAME@:${app_name}:" \
-		-e "s:@EXEC@:${exec_command}:" \
-		-e "s:@ICON@:${icon}:" \
-		"${WORKDIR}/${PN}.desktop-template" \
-		|| die
-
-	newmenu "${WORKDIR}/${PN}.desktop-template" "${desktop_filename}"
-
-	rm "${WORKDIR}/${PN}.desktop-template" || die
-
-	# Install wrapper script
-	[[ -f "${ED}/usr/bin/${PN}" ]] && rm "${ED}/usr/bin/${PN}"
-	newbin "${FILESDIR}/${PN}-r1.sh" ${PN}
-
-	# Update wrapper
-	sed -i \
-		-e "s:@PREFIX@:${EPREFIX}/usr:" \
-		-e "s:@MOZ_FIVE_HOME@:${MOZILLA_FIVE_HOME}:" \
-		-e "s:@APULSELIB_DIR@:${apulselib}:" \
-		-e "s:@DEFAULT_WAYLAND@:${use_wayland}:" \
-		"${ED}/usr/bin/${PN}" \
-		|| die
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-
-	# If the apulse libs are available in MOZILLA_FIVE_HOME then apulse
-	# does not need to be forced into the LD_LIBRARY_PATH
-	if use pulseaudio && has_version ">=media-sound/apulse-0.1.12-r4" ; then
-		einfo "APULSE found; Generating library symlinks for sound support ..."
-		local lib
-		pushd "${ED}${MOZILLA_FIVE_HOME}" &>/dev/null || die
-		for lib in ../apulse/libpulse{.so{,.0},-simple.so{,.0}} ; do
-			# A quickpkg rolled by hand will grab symlinks as part of the package,
-			# so we need to avoid creating them if they already exist.
-			if [[ ! -L ${lib##*/} ]] ; then
-				ln -s "${lib}" ${lib##*/} || die
-			fi
-		done
-		popd &>/dev/null || die
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	if ! use gmp-autoupdate ; then
-		elog "USE='-gmp-autoupdate' has disabled the following plugins from updating or"
-		elog "installing into new profiles:"
-		local plugin
-		for plugin in "${MOZ_GMP_PLUGIN_LIST[@]}" ; do
-			elog "\t ${plugin}"
-		done
-		elog
-	fi
-
-	if use pulseaudio && has_version ">=media-sound/apulse-0.1.12-r4" ; then
-		elog "Apulse was detected at merge time on this system and so it will always be"
-		elog "used for sound.  If you wish to use pulseaudio instead please unmerge"
-		elog "media-sound/apulse."
-		elog
-	fi
-
-	local show_doh_information
-	local show_normandy_information
-	local show_shortcut_information
-
-	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
-		# New install; Tell user that DoH is disabled by default
-		show_doh_information=yes
-		show_normandy_information=yes
-		show_shortcut_information=no
-	else
-		local replacing_version
-		for replacing_version in ${REPLACING_VERSIONS} ; do
-			if ver_test "${replacing_version}" -lt 91.0 ; then
-				# Tell user that we no longer install a shortcut
-				# per supported display protocol
-				show_shortcut_information=yes
-			fi
-		done
-	fi
-
-	if [[ -n "${show_doh_information}" ]] ; then
-		elog
-		elog "Note regarding Trusted Recursive Resolver aka DNS-over-HTTPS (DoH):"
-		elog "Due to privacy concerns (encrypting DNS might be a good thing, sending all"
-		elog "DNS traffic to Cloudflare by default is not a good idea and applications"
-		elog "should respect OS configured settings), \"network.trr.mode\" was set to 5"
-		elog "(\"Off by choice\") by default."
-		elog "You can enable DNS-over-HTTPS in ${PN^}'s preferences."
-	fi
-
-	# bug 713782
-	if [[ -n "${show_normandy_information}" ]] ; then
-		elog
-		elog "Upstream operates a service named Normandy which allows Mozilla to"
-		elog "push changes for default settings or even install new add-ons remotely."
-		elog "While this can be useful to address problems like 'Armagadd-on 2.0' or"
-		elog "revert previous decisions to disable TLS 1.0/1.1, privacy and security"
-		elog "concerns prevail, which is why we have switched off the use of this"
-		elog "service by default."
-		elog
-		elog "To re-enable this service set"
-		elog
-		elog "    app.normandy.enabled=true"
-		elog
-		elog "in about:config."
-	fi
-
-	if [[ -n "${show_shortcut_information}" ]] ; then
-		elog
-		elog "Since ${PN}-91.0 we no longer install multiple shortcuts for"
-		elog "each supported display protocol.  Instead we will only install"
-		elog "one generic Mozilla ${PN^} shortcut."
-		elog "If you still want to be able to select between running Mozilla ${PN^}"
-		elog "on X11 or Wayland, you have to re-create these shortcuts on your own."
-	fi
-
-	# bug 835078
-	if use hwaccel && has_version "x11-drivers/xf86-video-nouveau"; then
-		ewarn "You have nouveau drivers installed in your system and 'hwaccel' "
-		ewarn "enabled for Firefox. Nouveau / your GPU might not support the "
-		ewarn "required EGL, so either disable 'hwaccel' or try the workaround "
-		ewarn "explained in https://bugs.gentoo.org/835078#c5 if Firefox crashes."
-	fi
-
-	elog
-	elog "Unfortunately Firefox-100.0 breaks compatibility with some sites using "
-	elog "useragent checks. To temporarily fix this, enter about:config and modify "
-	elog "network.http.useragent.forceVersion preference to \"99\"."
-	elog "Or install an addon to change your useragent."
-	elog "See: https://support.mozilla.org/en-US/kb/difficulties-opening-or-using-website-firefox-100"
-	elog
-}
diff --git a/www-client/firefox/firefox-106.0.ebuild b/www-client/firefox/firefox-106.0.ebuild
deleted file mode 100644
index bedbd980b08e..000000000000
--- a/www-client/firefox/firefox-106.0.ebuild
+++ /dev/null
@@ -1,1321 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-FIREFOX_PATCHSET="firefox-106-patches-01j.tar.xz"
-
-LLVM_MAX_SLOT=14
-
-PYTHON_COMPAT=( python3_{8..11} )
-PYTHON_REQ_USE="ncurses,sqlite,ssl"
-
-WANT_AUTOCONF="2.1"
-
-VIRTUALX_REQUIRED="manual"
-
-MOZ_ESR=
-
-MOZ_PV=${PV}
-MOZ_PV_SUFFIX=
-if [[ ${PV} =~ (_(alpha|beta|rc).*)$ ]] ; then
-	MOZ_PV_SUFFIX=${BASH_REMATCH[1]}
-
-	# Convert the ebuild version to the upstream Mozilla version
-	MOZ_PV="${MOZ_PV/_alpha/a}" # Handle alpha for SRC_URI
-	MOZ_PV="${MOZ_PV/_beta/b}"  # Handle beta for SRC_URI
-	MOZ_PV="${MOZ_PV%%_rc*}"    # Handle rc for SRC_URI
-fi
-
-if [[ -n ${MOZ_ESR} ]] ; then
-	# ESR releases have slightly different version numbers
-	MOZ_PV="${MOZ_PV}esr"
-fi
-
-MOZ_PN="${PN%-bin}"
-MOZ_P="${MOZ_PN}-${MOZ_PV}"
-MOZ_PV_DISTFILES="${MOZ_PV}${MOZ_PV_SUFFIX}"
-MOZ_P_DISTFILES="${MOZ_PN}-${MOZ_PV_DISTFILES}"
-
-inherit autotools check-reqs desktop flag-o-matic gnome2-utils linux-info \
-	llvm multiprocessing pax-utils python-any-r1 toolchain-funcs \
-	virtualx xdg
-
-MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/releases/${MOZ_PV}"
-
-if [[ ${PV} == *_rc* ]] ; then
-	MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/candidates/${MOZ_PV}-candidates/build${PV##*_rc}"
-fi
-
-PATCH_URIS=(
-	https://dev.gentoo.org/~{juippis,whissi,slashbeast}/mozilla/patchsets/${FIREFOX_PATCHSET}
-)
-
-SRC_URI="${MOZ_SRC_BASE_URI}/source/${MOZ_P}.source.tar.xz -> ${MOZ_P_DISTFILES}.source.tar.xz
-	${PATCH_URIS[@]}"
-
-DESCRIPTION="Firefox Web Browser"
-HOMEPAGE="https://www.mozilla.com/firefox"
-
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-
-SLOT="rapid"
-LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-
-IUSE="+clang cpu_flags_arm_neon dbus debug eme-free hardened hwaccel"
-IUSE+=" jack libproxy lto +openh264 pgo pulseaudio sndio selinux"
-IUSE+=" +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent +system-libvpx system-png system-python-libs +system-webp"
-IUSE+=" wayland wifi"
-
-# Firefox-only IUSE
-IUSE+=" geckodriver +gmp-autoupdate screencast +X"
-
-REQUIRED_USE="debug? ( !system-av1 )
-	pgo? ( lto )
-	wifi? ( dbus )"
-
-# Firefox-only REQUIRED_USE flags
-REQUIRED_USE+=" || ( X wayland )"
-REQUIRED_USE+=" screencast? ( wayland )"
-
-FF_ONLY_DEPEND="!www-client/firefox:0
-	!www-client/firefox:esr
-	screencast? ( media-video/pipewire:= )
-	selinux? ( sec-policy/selinux-mozilla )"
-BDEPEND="${PYTHON_DEPS}
-	app-arch/unzip
-	app-arch/zip
-	>=dev-util/cbindgen-0.24.3
-	net-libs/nodejs
-	virtual/pkgconfig
-	>=virtual/rust-1.61.0
-	|| (
-		(
-			sys-devel/clang:14
-			sys-devel/llvm:14
-			clang? (
-				sys-devel/lld:14
-				pgo? ( =sys-libs/compiler-rt-sanitizers-14*[profile] )
-			)
-		)
-		(
-			sys-devel/clang:13
-			sys-devel/llvm:13
-			clang? (
-				sys-devel/lld:13
-				pgo? ( =sys-libs/compiler-rt-sanitizers-13*[profile] )
-			)
-		)
-	)
-	amd64? ( >=dev-lang/nasm-2.14 )
-	x86? ( >=dev-lang/nasm-2.14 )
-	pgo? (
-		X? (
-			x11-base/xorg-server[xvfb]
-			x11-apps/xhost
-		)
-		wayland? (
-			>=gui-libs/wlroots-0.15.1-r1[tinywl]
-			x11-misc/xkeyboard-config
-		)
-	)"
-COMMON_DEPEND="${FF_ONLY_DEPEND}
-	|| (
-		>=app-accessibility/at-spi2-core-2.46.0:2
-		dev-libs/atk
-	)
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/libffi:=
-	>=dev-libs/nss-3.83
-	>=dev-libs/nspr-4.35
-	media-libs/alsa-lib
-	media-libs/fontconfig
-	media-libs/freetype
-	media-libs/mesa
-	media-video/ffmpeg
-	sys-libs/zlib
-	virtual/freedesktop-icon-theme
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/pango
-	x11-libs/pixman
-	dbus? (
-		dev-libs/dbus-glib
-		sys-apps/dbus
-	)
-	jack? ( virtual/jack )
-	libproxy? ( net-libs/libproxy )
-	selinux? ( sec-policy/selinux-mozilla )
-	sndio? ( >=media-sound/sndio-1.8.0-r1 )
-	screencast? ( media-video/pipewire:= )
-	system-av1? (
-		>=media-libs/dav1d-1.0.0:=
-		>=media-libs/libaom-1.0.0:=
-	)
-	system-harfbuzz? (
-		>=media-gfx/graphite2-1.3.13
-		>=media-libs/harfbuzz-2.8.1:0=
-	)
-	system-icu? ( >=dev-libs/icu-71.1:= )
-	system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
-	system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] )
-	system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] )
-	system-png? ( >=media-libs/libpng-1.6.35:0=[apng] )
-	system-webp? ( >=media-libs/libwebp-1.1.0:0= )
-	wayland? (
-		>=media-libs/libepoxy-1.5.10-r1
-		x11-libs/gtk+:3[wayland]
-		x11-libs/libdrm
-		x11-libs/libxkbcommon[wayland]
-	)
-	wifi? (
-		kernel_linux? (
-			dev-libs/dbus-glib
-			net-misc/networkmanager
-			sys-apps/dbus
-		)
-	)
-	X? (
-		virtual/opengl
-		x11-libs/cairo[X]
-		x11-libs/gtk+:3[X]
-		x11-libs/libX11
-		x11-libs/libXcomposite
-		x11-libs/libXdamage
-		x11-libs/libXext
-		x11-libs/libXfixes
-		x11-libs/libxkbcommon[X]
-		x11-libs/libXrandr
-		x11-libs/libXtst
-		x11-libs/libxcb:=
-	)"
-RDEPEND="${COMMON_DEPEND}
-	jack? ( virtual/jack )
-	openh264? ( media-libs/openh264:*[plugin] )
-	pulseaudio? (
-		|| (
-			media-sound/pulseaudio
-			>=media-sound/apulse-0.1.12-r4
-		)
-	)"
-DEPEND="${COMMON_DEPEND}
-	pulseaudio? (
-		|| (
-			media-sound/pulseaudio
-			>=media-sound/apulse-0.1.12-r4[sdk]
-		)
-	)
-	X? (
-		x11-libs/libICE
-		x11-libs/libSM
-	)"
-
-S="${WORKDIR}/${PN}-${PV%_*}"
-
-# Allow MOZ_GMP_PLUGIN_LIST to be set in an eclass or
-# overridden in the enviromnent (advanced hackers only)
-if [[ -z "${MOZ_GMP_PLUGIN_LIST+set}" ]] ; then
-	MOZ_GMP_PLUGIN_LIST=( gmp-gmpopenh264 gmp-widevinecdm )
-fi
-
-llvm_check_deps() {
-	if ! has_version -b "sys-devel/clang:${LLVM_SLOT}" ; then
-		einfo "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-		return 1
-	fi
-
-	if use clang ; then
-		if ! has_version -b "=sys-devel/lld-${LLVM_SLOT}*" ; then
-			einfo "=sys-devel/lld-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-			return 1
-		fi
-
-		if use pgo ; then
-			if ! has_version -b "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}*" ; then
-				einfo "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-				return 1
-			fi
-		fi
-	fi
-
-	einfo "Using LLVM slot ${LLVM_SLOT} to build" >&2
-}
-
-MOZ_LANGS=(
-	af ar ast be bg br ca cak cs cy da de dsb
-	el en-CA en-GB en-US es-AR es-ES et eu
-	fi fr fy-NL ga-IE gd gl he hr hsb hu
-	id is it ja ka kab kk ko lt lv ms nb-NO nl nn-NO
-	pa-IN pl pt-BR pt-PT rm ro ru
-	sk sl sq sr sv-SE th tr uk uz vi zh-CN zh-TW
-)
-
-# Firefox-only LANGS
-MOZ_LANGS+=( ach )
-MOZ_LANGS+=( an )
-MOZ_LANGS+=( az )
-MOZ_LANGS+=( bn )
-MOZ_LANGS+=( bs )
-MOZ_LANGS+=( ca-valencia )
-MOZ_LANGS+=( eo )
-MOZ_LANGS+=( es-CL )
-MOZ_LANGS+=( es-MX )
-MOZ_LANGS+=( fa )
-MOZ_LANGS+=( ff )
-MOZ_LANGS+=( gn )
-MOZ_LANGS+=( gu-IN )
-MOZ_LANGS+=( hi-IN )
-MOZ_LANGS+=( hy-AM )
-MOZ_LANGS+=( ia )
-MOZ_LANGS+=( km )
-MOZ_LANGS+=( kn )
-MOZ_LANGS+=( lij )
-MOZ_LANGS+=( mk )
-MOZ_LANGS+=( mr )
-MOZ_LANGS+=( my )
-MOZ_LANGS+=( ne-NP )
-MOZ_LANGS+=( oc )
-MOZ_LANGS+=( sco )
-MOZ_LANGS+=( si )
-MOZ_LANGS+=( son )
-MOZ_LANGS+=( szl )
-MOZ_LANGS+=( ta )
-MOZ_LANGS+=( te )
-MOZ_LANGS+=( tl )
-MOZ_LANGS+=( trs )
-MOZ_LANGS+=( ur )
-MOZ_LANGS+=( xh )
-
-mozilla_set_globals() {
-	# https://bugs.gentoo.org/587334
-	local MOZ_TOO_REGIONALIZED_FOR_L10N=(
-		fy-NL ga-IE gu-IN hi-IN hy-AM nb-NO ne-NP nn-NO pa-IN sv-SE
-	)
-
-	local lang xflag
-	for lang in "${MOZ_LANGS[@]}" ; do
-		# en and en_US are handled internally
-		if [[ ${lang} == en ]] || [[ ${lang} == en-US ]] ; then
-			continue
-		fi
-
-		# strip region subtag if $lang is in the list
-		if has ${lang} "${MOZ_TOO_REGIONALIZED_FOR_L10N[@]}" ; then
-			xflag=${lang%%-*}
-		else
-			xflag=${lang}
-		fi
-
-		SRC_URI+=" l10n_${xflag/[_@]/-}? ("
-		SRC_URI+=" ${MOZ_SRC_BASE_URI}/linux-x86_64/xpi/${lang}.xpi -> ${MOZ_P_DISTFILES}-${lang}.xpi"
-		SRC_URI+=" )"
-		IUSE+=" l10n_${xflag/[_@]/-}"
-	done
-}
-mozilla_set_globals
-
-moz_clear_vendor_checksums() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -ne 1 ]] ; then
-		die "${FUNCNAME} requires exact one argument"
-	fi
-
-	einfo "Clearing cargo checksums for ${1} ..."
-
-	sed -i \
-		-e 's/\("files":{\)[^}]*/\1/' \
-		"${S}"/third_party/rust/${1}/.cargo-checksum.json \
-		|| die
-}
-
-moz_install_xpi() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 2 ]] ; then
-		die "${FUNCNAME} requires at least two arguments"
-	fi
-
-	local DESTDIR=${1}
-	shift
-
-	insinto "${DESTDIR}"
-
-	local emid xpi_file xpi_tmp_dir
-	for xpi_file in "${@}" ; do
-		emid=
-		xpi_tmp_dir=$(mktemp -d --tmpdir="${T}")
-
-		# Unpack XPI
-		unzip -qq "${xpi_file}" -d "${xpi_tmp_dir}" || die
-
-		# Determine extension ID
-		if [[ -f "${xpi_tmp_dir}/install.rdf" ]] ; then
-			emid=$(sed -n -e '/install-manifest/,$ { /em:id/!d; s/.*[\">]\([^\"<>]*\)[\"<].*/\1/; p; q }' "${xpi_tmp_dir}/install.rdf")
-			[[ -z "${emid}" ]] && die "failed to determine extension id from install.rdf"
-		elif [[ -f "${xpi_tmp_dir}/manifest.json" ]] ; then
-			emid=$(sed -n -e 's/.*"id": "\([^"]*\)".*/\1/p' "${xpi_tmp_dir}/manifest.json")
-			[[ -z "${emid}" ]] && die "failed to determine extension id from manifest.json"
-		else
-			die "failed to determine extension id"
-		fi
-
-		einfo "Installing ${emid}.xpi into ${ED}${DESTDIR} ..."
-		newins "${xpi_file}" "${emid}.xpi"
-	done
-}
-
-mozconfig_add_options_ac() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 2 ]] ; then
-		die "${FUNCNAME} requires at least two arguments"
-	fi
-
-	local reason=${1}
-	shift
-
-	local option
-	for option in ${@} ; do
-		echo "ac_add_options ${option} # ${reason}" >>${MOZCONFIG}
-	done
-}
-
-mozconfig_add_options_mk() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 2 ]] ; then
-		die "${FUNCNAME} requires at least two arguments"
-	fi
-
-	local reason=${1}
-	shift
-
-	local option
-	for option in ${@} ; do
-		echo "mk_add_options ${option} # ${reason}" >>${MOZCONFIG}
-	done
-}
-
-mozconfig_use_enable() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 1 ]] ; then
-		die "${FUNCNAME} requires at least one arguments"
-	fi
-
-	local flag=$(use_enable "${@}")
-	mozconfig_add_options_ac "$(use ${1} && echo +${1} || echo -${1})" "${flag}"
-}
-
-mozconfig_use_with() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 1 ]] ; then
-		die "${FUNCNAME} requires at least one arguments"
-	fi
-
-	local flag=$(use_with "${@}")
-	mozconfig_add_options_ac "$(use ${1} && echo +${1} || echo -${1})" "${flag}"
-}
-
-virtwl() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	[[ $# -lt 1 ]] && die "${FUNCNAME} needs at least one argument"
-	[[ -n $XDG_RUNTIME_DIR ]] || die "${FUNCNAME} needs XDG_RUNTIME_DIR to be set; try xdg_environment_reset"
-	tinywl -h >/dev/null || die 'tinywl -h failed'
-
-	# TODO: don't run addpredict in utility function. WLR_RENDERER=pixman doesn't work
-	addpredict /dev/dri
-	local VIRTWL VIRTWL_PID
-	coproc VIRTWL { WLR_BACKENDS=headless exec tinywl -s 'echo $WAYLAND_DISPLAY; read _; kill $PPID'; }
-	local -x WAYLAND_DISPLAY
-	read WAYLAND_DISPLAY <&${VIRTWL[0]}
-
-	debug-print "${FUNCNAME}: $@"
-	"$@"
-
-	[[ -n $VIRTWL_PID ]] || die "tinywl exited unexpectedly"
-	exec {VIRTWL[0]}<&- {VIRTWL[1]}>&-
-}
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]] ; then
-		if use pgo ; then
-			if ! has usersandbox $FEATURES ; then
-				die "You must enable usersandbox as X server can not run as root!"
-			fi
-		fi
-
-		# Ensure we have enough disk space to compile
-		if use pgo || use lto || use debug ; then
-			CHECKREQS_DISK_BUILD="13500M"
-		else
-			CHECKREQS_DISK_BUILD="6600M"
-		fi
-
-		check-reqs_pkg_pretend
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]] ; then
-		if use pgo ; then
-			if ! has userpriv ${FEATURES} ; then
-				eerror "Building ${PN} with USE=pgo and FEATURES=-userpriv is not supported!"
-			fi
-		fi
-
-		# Ensure we have enough disk space to compile
-		if use pgo || use lto || use debug ; then
-			CHECKREQS_DISK_BUILD="13500M"
-		else
-			CHECKREQS_DISK_BUILD="6400M"
-		fi
-
-		check-reqs_pkg_setup
-
-		llvm_pkg_setup
-
-		if use clang && use lto ; then
-			local version_lld=$(ld.lld --version 2>/dev/null | awk '{ print $2 }')
-			[[ -n ${version_lld} ]] && version_lld=$(ver_cut 1 "${version_lld}")
-			[[ -z ${version_lld} ]] && die "Failed to read ld.lld version!"
-
-			local version_llvm_rust=$(rustc -Vv 2>/dev/null | grep -F -- 'LLVM version:' | awk '{ print $3 }')
-			[[ -n ${version_llvm_rust} ]] && version_llvm_rust=$(ver_cut 1 "${version_llvm_rust}")
-			[[ -z ${version_llvm_rust} ]] && die "Failed to read used LLVM version from rustc!"
-
-			if ver_test "${version_lld}" -ne "${version_llvm_rust}" ; then
-				eerror "Rust is using LLVM version ${version_llvm_rust} but ld.lld version belongs to LLVM version ${version_lld}."
-				eerror "You will be unable to link ${CATEGORY}/${PN}. To proceed you have the following options:"
-				eerror "  - Manually switch rust version using 'eselect rust' to match used LLVM version"
-				eerror "  - Switch to dev-lang/rust[system-llvm] which will guarantee matching version"
-				eerror "  - Build ${CATEGORY}/${PN} without USE=lto"
-				eerror "  - Rebuild lld with llvm that was used to build rust (may need to rebuild the whole "
-				eerror "    llvm/clang/lld/rust chain depending on your @world updates)"
-				die "LLVM version used by Rust (${version_llvm_rust}) does not match with ld.lld version (${version_lld})!"
-			fi
-		fi
-
-		python-any-r1_pkg_setup
-
-		# Avoid PGO profiling problems due to enviroment leakage
-		# These should *always* be cleaned up anyway
-		unset \
-			DBUS_SESSION_BUS_ADDRESS \
-			DISPLAY \
-			ORBIT_SOCKETDIR \
-			SESSION_MANAGER \
-			XAUTHORITY \
-			XDG_CACHE_HOME \
-			XDG_SESSION_COOKIE
-
-		# Build system is using /proc/self/oom_score_adj, bug #604394
-		addpredict /proc/self/oom_score_adj
-
-		if use pgo ; then
-			# Update 105.0: "/proc/self/oom_score_adj" isn't enough anymore with pgo, but not sure
-			# whether that's due to better OOM handling by Firefox (bmo#1771712), or portage
-			# (PORTAGE_SCHEDULING_POLICY) update...
-			addpredict /proc
-
-			# May need a wider addpredict when using wayland+pgo.
-			addpredict /dev/dri
-
-			# Allow access to GPU during PGO run
-			local ati_cards mesa_cards nvidia_cards render_cards
-			shopt -s nullglob
-
-			ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
-			if [[ -n "${ati_cards}" ]] ; then
-				addpredict "${ati_cards}"
-			fi
-
-			mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
-			if [[ -n "${mesa_cards}" ]] ; then
-				addpredict "${mesa_cards}"
-			fi
-
-			nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
-			if [[ -n "${nvidia_cards}" ]] ; then
-				addpredict "${nvidia_cards}"
-			fi
-
-			render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
-			if [[ -n "${render_cards}" ]] ; then
-				addpredict "${render_cards}"
-			fi
-
-			shopt -u nullglob
-		fi
-
-		if ! mountpoint -q /dev/shm ; then
-			# If /dev/shm is not available, configure is known to fail with
-			# a traceback report referencing /usr/lib/pythonN.N/multiprocessing/synchronize.py
-			ewarn "/dev/shm is not mounted -- expect build failures!"
-		fi
-
-		# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
-		# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
-		# get your own set of keys.
-		if [[ -z "${MOZ_API_KEY_GOOGLE+set}" ]] ; then
-			MOZ_API_KEY_GOOGLE="AIzaSyDEAOvatFogGaPi0eTgsV_ZlEzx0ObmepsMzfAc"
-		fi
-
-		if [[ -z "${MOZ_API_KEY_LOCATION+set}" ]] ; then
-			MOZ_API_KEY_LOCATION="AIzaSyB2h2OuRgGaPicUgy5N-5hsZqiPW6sH3n_rptiQ"
-		fi
-
-		# Mozilla API keys (see https://location.services.mozilla.com/api)
-		# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
-		# get your own set of keys.
-		if [[ -z "${MOZ_API_KEY_MOZILLA+set}" ]] ; then
-			MOZ_API_KEY_MOZILLA="edb3d487-3a84-46m0ap1e3-9dfd-92b5efaaa005"
-		fi
-
-		# Ensure we use C locale when building, bug #746215
-		export LC_ALL=C
-	fi
-
-	CONFIG_CHECK="~SECCOMP"
-	WARNING_SECCOMP="CONFIG_SECCOMP not set! This system will be unable to play DRM-protected content."
-	linux-info_pkg_setup
-}
-
-src_unpack() {
-	local _lp_dir="${WORKDIR}/language_packs"
-	local _src_file
-
-	if [[ ! -d "${_lp_dir}" ]] ; then
-		mkdir "${_lp_dir}" || die
-	fi
-
-	for _src_file in ${A} ; do
-		if [[ ${_src_file} == *.xpi ]]; then
-			cp "${DISTDIR}/${_src_file}" "${_lp_dir}" || die "Failed to copy '${_src_file}' to '${_lp_dir}'!"
-		else
-			unpack ${_src_file}
-		fi
-	done
-}
-
-src_prepare() {
-	use lto && rm -v "${WORKDIR}"/firefox-patches/*-LTO-Only-enable-LTO-*.patch
-	! use ppc64 && rm -v "${WORKDIR}"/firefox-patches/*bmo-1775202-ppc64*.patch
-	eapply "${WORKDIR}/firefox-patches"
-
-	# Allow user to apply any additional patches without modifing ebuild
-	eapply_user
-
-	# Make cargo respect MAKEOPTS
-	export CARGO_BUILD_JOBS="$(makeopts_jobs)"
-
-	# Make LTO respect MAKEOPTS
-	sed -i \
-		-e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
-		"${S}"/build/moz.configure/lto-pgo.configure \
-		|| die "sed failed to set num_cores"
-
-	# Make ICU respect MAKEOPTS
-	sed -i \
-		-e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
-		"${S}"/intl/icu_sources_data.py \
-		|| die "sed failed to set num_cores"
-
-	# sed-in toolchain prefix
-	sed -i \
-		-e "s/objdump/${CHOST}-objdump/" \
-		"${S}"/python/mozbuild/mozbuild/configure/check_debug_ranges.py \
-		|| die "sed failed to set toolchain prefix"
-
-	sed -i \
-		-e 's/ccache_stats = None/return None/' \
-		"${S}"/python/mozbuild/mozbuild/controller/building.py \
-		|| die "sed failed to disable ccache stats call"
-
-	einfo "Removing pre-built binaries ..."
-	find "${S}"/third_party -type f \( -name '*.so' -o -name '*.o' \) -print -delete || die
-
-	# Clearing checksums where we have applied patches
-	moz_clear_vendor_checksums bindgen
-
-	# Create build dir
-	BUILD_DIR="${WORKDIR}/${PN}_build"
-	mkdir -p "${BUILD_DIR}" || die
-
-	# Write API keys to disk
-	echo -n "${MOZ_API_KEY_GOOGLE//gGaPi/}" > "${S}"/api-google.key || die
-	echo -n "${MOZ_API_KEY_LOCATION//gGaPi/}" > "${S}"/api-location.key || die
-	echo -n "${MOZ_API_KEY_MOZILLA//m0ap1/}" > "${S}"/api-mozilla.key || die
-
-	xdg_environment_reset
-}
-
-src_configure() {
-	# Show flags set at the beginning
-	einfo "Current BINDGEN_CFLAGS:\t${BINDGEN_CFLAGS:-no value set}"
-	einfo "Current CFLAGS:\t\t${CFLAGS:-no value set}"
-	einfo "Current CXXFLAGS:\t\t${CXXFLAGS:-no value set}"
-	einfo "Current LDFLAGS:\t\t${LDFLAGS:-no value set}"
-	einfo "Current RUSTFLAGS:\t\t${RUSTFLAGS:-no value set}"
-
-	local have_switched_compiler=
-	if use clang && ! tc-is-clang ; then
-		# Force clang
-		einfo "Enforcing the use of clang due to USE=clang ..."
-		have_switched_compiler=yes
-		AR=llvm-ar
-		AS=llvm-as
-		CC=${CHOST}-clang
-		CXX=${CHOST}-clang++
-		NM=llvm-nm
-		RANLIB=llvm-ranlib
-	elif ! use clang && ! tc-is-gcc ; then
-		# Force gcc
-		have_switched_compiler=yes
-		einfo "Enforcing the use of gcc due to USE=-clang ..."
-		AR=gcc-ar
-		CC=${CHOST}-gcc
-		CXX=${CHOST}-g++
-		NM=gcc-nm
-		RANLIB=gcc-ranlib
-	fi
-
-	if [[ -n "${have_switched_compiler}" ]] ; then
-		# Because we switched active compiler we have to ensure
-		# that no unsupported flags are set
-		strip-unsupported-flags
-	fi
-
-	# Ensure we use correct toolchain
-	export HOST_CC="$(tc-getBUILD_CC)"
-	export HOST_CXX="$(tc-getBUILD_CXX)"
-	tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
-
-	# Pass the correct toolchain paths through cbindgen
-	if tc-is-cross-compiler ; then
-		export BINDGEN_CFLAGS="${SYSROOT:+--sysroot=${ESYSROOT}} --target=${CHOST} ${BINDGEN_CFLAGS-}"
-	fi
-
-	# Set MOZILLA_FIVE_HOME
-	export MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
-
-	# python/mach/mach/mixin/process.py fails to detect SHELL
-	export SHELL="${EPREFIX}/bin/bash"
-
-	# Set state path
-	export MOZBUILD_STATE_PATH="${BUILD_DIR}"
-
-	# Set MOZCONFIG
-	export MOZCONFIG="${S}/.mozconfig"
-
-	# Initialize MOZCONFIG
-	mozconfig_add_options_ac '' --enable-application=browser
-
-	# Set Gentoo defaults
-	export MOZILLA_OFFICIAL=1
-
-	mozconfig_add_options_ac 'Gentoo default' \
-		--allow-addon-sideload \
-		--disable-cargo-incremental \
-		--disable-crashreporter \
-		--disable-gpsd \
-		--disable-install-strip \
-		--disable-parental-controls \
-		--disable-strip \
-		--disable-updater \
-		--enable-negotiateauth \
-		--enable-new-pass-manager \
-		--enable-official-branding \
-		--enable-release \
-		--enable-system-ffi \
-		--enable-system-pixman \
-		--enable-system-policies \
-		--host="${CBUILD:-${CHOST}}" \
-		--libdir="${EPREFIX}/usr/$(get_libdir)" \
-		--prefix="${EPREFIX}/usr" \
-		--target="${CHOST}" \
-		--without-ccache \
-		--without-wasm-sandboxed-libraries \
-		--with-intl-api \
-		--with-libclang-path="$(llvm-config --libdir)" \
-		--with-system-nspr \
-		--with-system-nss \
-		--with-system-zlib \
-		--with-toolchain-prefix="${CHOST}-" \
-		--with-unsigned-addon-scopes=app,system \
-		--x-includes="${ESYSROOT}/usr/include" \
-		--x-libraries="${ESYSROOT}/usr/$(get_libdir)"
-
-	# Set update channel
-	local update_channel=release
-	[[ -n ${MOZ_ESR} ]] && update_channel=esr
-	mozconfig_add_options_ac '' --update-channel=${update_channel}
-
-	if ! use x86 && [[ ${CHOST} != armv*h* ]] ; then
-		mozconfig_add_options_ac '' --enable-rust-simd
-	fi
-
-	# For future keywording: This is currently (97.0) only supported on:
-	# amd64, arm, arm64 & x86.
-	# Might want to flip the logic around if Firefox is to support more arches.
-	if use ppc64; then
-		mozconfig_add_options_ac '' --disable-sandbox
-	else
-		mozconfig_add_options_ac '' --enable-sandbox
-	fi
-
-	if [[ -s "${S}/api-google.key" ]] ; then
-		local key_origin="Gentoo default"
-		if [[ $(cat "${S}/api-google.key" | md5sum | awk '{ print $1 }') != 709560c02f94b41f9ad2c49207be6c54 ]] ; then
-			key_origin="User value"
-		fi
-
-		mozconfig_add_options_ac "${key_origin}" \
-			--with-google-safebrowsing-api-keyfile="${S}/api-google.key"
-	else
-		einfo "Building without Google API key ..."
-	fi
-
-	if [[ -s "${S}/api-location.key" ]] ; then
-		local key_origin="Gentoo default"
-		if [[ $(cat "${S}/api-location.key" | md5sum | awk '{ print $1 }') != ffb7895e35dedf832eb1c5d420ac7420 ]] ; then
-			key_origin="User value"
-		fi
-
-		mozconfig_add_options_ac "${key_origin}" \
-			--with-google-location-service-api-keyfile="${S}/api-location.key"
-	else
-		einfo "Building without Location API key ..."
-	fi
-
-	if [[ -s "${S}/api-mozilla.key" ]] ; then
-		local key_origin="Gentoo default"
-		if [[ $(cat "${S}/api-mozilla.key" | md5sum | awk '{ print $1 }') != 3927726e9442a8e8fa0e46ccc39caa27 ]] ; then
-			key_origin="User value"
-		fi
-
-		mozconfig_add_options_ac "${key_origin}" \
-			--with-mozilla-api-keyfile="${S}/api-mozilla.key"
-	else
-		einfo "Building without Mozilla API key ..."
-	fi
-
-	mozconfig_use_with system-av1
-	mozconfig_use_with system-harfbuzz
-	mozconfig_use_with system-harfbuzz system-graphite2
-	mozconfig_use_with system-icu
-	mozconfig_use_with system-jpeg
-	mozconfig_use_with system-libevent
-	mozconfig_use_with system-libvpx
-	mozconfig_use_with system-png
-	mozconfig_use_with system-webp
-
-	mozconfig_use_enable dbus
-	mozconfig_use_enable libproxy
-
-	use eme-free && mozconfig_add_options_ac '+eme-free' --disable-eme
-
-	mozconfig_use_enable geckodriver
-
-	if use hardened ; then
-		mozconfig_add_options_ac "+hardened" --enable-hardening
-		append-ldflags "-Wl,-z,relro -Wl,-z,now"
-	fi
-
-	local myaudiobackends=""
-	use jack && myaudiobackends+="jack,"
-	use sndio && myaudiobackends+="sndio,"
-	use pulseaudio && myaudiobackends+="pulseaudio,"
-	! use pulseaudio && myaudiobackends+="alsa,"
-
-	mozconfig_add_options_ac '--enable-audio-backends' --enable-audio-backends="${myaudiobackends::-1}"
-
-	mozconfig_use_enable wifi necko-wifi
-
-	if use X && use wayland ; then
-		mozconfig_add_options_ac '+x11+wayland' --enable-default-toolkit=cairo-gtk3-x11-wayland
-	elif ! use X && use wayland ; then
-		mozconfig_add_options_ac '+wayland' --enable-default-toolkit=cairo-gtk3-wayland-only
-	else
-		mozconfig_add_options_ac '+x11' --enable-default-toolkit=cairo-gtk3
-	fi
-
-	if use lto ; then
-		if use clang ; then
-			# Upstream only supports lld when using clang
-			mozconfig_add_options_ac "forcing ld=lld due to USE=clang and USE=lto" --enable-linker=lld
-
-			mozconfig_add_options_ac '+lto' --enable-lto=cross
-
-		else
-			# ThinLTO is currently broken, see bmo#1644409
-			mozconfig_add_options_ac '+lto' --enable-lto=full
-			mozconfig_add_options_ac "linker is set to bfd" --enable-linker=bfd
-		fi
-
-		if use pgo ; then
-			mozconfig_add_options_ac '+pgo' MOZ_PGO=1
-
-			if use clang ; then
-				# Used in build/pgo/profileserver.py
-				export LLVM_PROFDATA="llvm-profdata"
-			fi
-		fi
-	else
-		# Avoid auto-magic on linker
-		if use clang ; then
-			# This is upstream's default
-			mozconfig_add_options_ac "forcing ld=lld due to USE=clang" --enable-linker=lld
-		else
-			mozconfig_add_options_ac "linker is set to bfd" --enable-linker=bfd
-		fi
-	fi
-
-	# LTO flag was handled via configure
-	filter-flags '-flto*'
-
-	mozconfig_use_enable debug
-	if use debug ; then
-		mozconfig_add_options_ac '+debug' --disable-optimize
-	else
-		if is-flag '-g*' ; then
-			if use clang ; then
-				mozconfig_add_options_ac 'from CFLAGS' --enable-debug-symbols=$(get-flag '-g*')
-			else
-				mozconfig_add_options_ac 'from CFLAGS' --enable-debug-symbols
-			fi
-		else
-			mozconfig_add_options_ac 'Gentoo default' --disable-debug-symbols
-		fi
-
-		if is-flag '-O0' ; then
-			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O0
-		elif is-flag '-O4' ; then
-			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O4
-		elif is-flag '-O3' ; then
-			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O3
-		elif is-flag '-O1' ; then
-			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O1
-		elif is-flag '-Os' ; then
-			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-Os
-		else
-			mozconfig_add_options_ac "Gentoo default" --enable-optimize=-O2
-		fi
-	fi
-
-	# Debug flag was handled via configure
-	filter-flags '-g*'
-
-	# Optimization flag was handled via configure
-	filter-flags '-O*'
-
-	# Modifications to better support ARM, bug #553364
-	if use cpu_flags_arm_neon ; then
-		mozconfig_add_options_ac '+cpu_flags_arm_neon' --with-fpu=neon
-
-		if ! tc-is-clang ; then
-			# thumb options aren't supported when using clang, bug 666966
-			mozconfig_add_options_ac '+cpu_flags_arm_neon' \
-				--with-thumb=yes \
-				--with-thumb-interwork=no
-		fi
-	fi
-
-	if [[ ${CHOST} == armv*h* ]] ; then
-		mozconfig_add_options_ac 'CHOST=armv*h*' --with-float-abi=hard
-
-		if ! use system-libvpx ; then
-			sed -i \
-				-e "s|softfp|hard|" \
-				"${S}"/media/libvpx/moz.build \
-				|| die
-		fi
-	fi
-
-	if use clang ; then
-		# https://bugzilla.mozilla.org/show_bug.cgi?id=1482204
-		# https://bugzilla.mozilla.org/show_bug.cgi?id=1483822
-		# toolkit/moz.configure Elfhack section: target.cpu in ('arm', 'x86', 'x86_64')
-		local disable_elf_hack=
-		if use amd64 ; then
-			disable_elf_hack=yes
-		elif use x86 ; then
-			disable_elf_hack=yes
-		elif use arm ; then
-			disable_elf_hack=yes
-		fi
-
-		if [[ -n ${disable_elf_hack} ]] ; then
-			mozconfig_add_options_ac 'elf-hack is broken when using Clang' --disable-elf-hack
-		fi
-	elif tc-is-gcc ; then
-		if ver_test $(gcc-fullversion) -ge 10 ; then
-			einfo "Forcing -fno-tree-loop-vectorize to workaround GCC bug, see bug 758446 ..."
-			append-cxxflags -fno-tree-loop-vectorize
-		fi
-	fi
-
-	# Additional ARCH support
-	case "${ARCH}" in
-		arm)
-			# Reduce the memory requirements for linking
-			if use clang ; then
-				# Nothing to do
-				:;
-			elif use lto ; then
-				append-ldflags -Wl,--no-keep-memory
-			else
-				append-ldflags -Wl,--no-keep-memory -Wl,--reduce-memory-overheads
-			fi
-			;;
-	esac
-
-	if ! use elibc_glibc ; then
-		mozconfig_add_options_ac '!elibc_glibc' --disable-jemalloc
-	fi
-
-	# Allow elfhack to work in combination with unstripped binaries
-	# when they would normally be larger than 2GiB.
-	append-ldflags "-Wl,--compress-debug-sections=zlib"
-
-	# Make revdep-rebuild.sh happy; Also required for musl
-	append-ldflags -Wl,-rpath="${MOZILLA_FIVE_HOME}",--enable-new-dtags
-
-	# Pass $MAKEOPTS to build system
-	export MOZ_MAKE_FLAGS="${MAKEOPTS}"
-
-	# Use system's Python environment
-	PIP_NETWORK_INSTALL_RESTRICTED_VIRTUALENVS=mach
-
-	if use system-python-libs; then
-		export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE="system"
-	else
-		export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE="none"
-	fi
-
-	# Disable notification when build system has finished
-	export MOZ_NOSPAM=1
-
-	# Portage sets XARGS environment variable to "xargs -r" by default which
-	# breaks build system's check_prog() function which doesn't support arguments
-	mozconfig_add_options_ac 'Gentoo default' "XARGS=${EPREFIX}/usr/bin/xargs"
-
-	# Set build dir
-	mozconfig_add_options_mk 'Gentoo default' "MOZ_OBJDIR=${BUILD_DIR}"
-
-	# Show flags we will use
-	einfo "Build BINDGEN_CFLAGS:\t${BINDGEN_CFLAGS:-no value set}"
-	einfo "Build CFLAGS:\t\t${CFLAGS:-no value set}"
-	einfo "Build CXXFLAGS:\t\t${CXXFLAGS:-no value set}"
-	einfo "Build LDFLAGS:\t\t${LDFLAGS:-no value set}"
-	einfo "Build RUSTFLAGS:\t\t${RUSTFLAGS:-no value set}"
-
-	# Handle EXTRA_CONF and show summary
-	local ac opt hash reason
-
-	# Apply EXTRA_ECONF entries to $MOZCONFIG
-	if [[ -n ${EXTRA_ECONF} ]] ; then
-		IFS=\! read -a ac <<<${EXTRA_ECONF// --/\!}
-		for opt in "${ac[@]}"; do
-			mozconfig_add_options_ac "EXTRA_ECONF" --${opt#--}
-		done
-	fi
-
-	echo
-	echo "=========================================================="
-	echo "Building ${PF} with the following configuration"
-	grep ^ac_add_options "${MOZCONFIG}" | while read ac opt hash reason; do
-		[[ -z ${hash} || ${hash} == \# ]] \
-			|| die "error reading mozconfig: ${ac} ${opt} ${hash} ${reason}"
-		printf "    %-30s  %s\n" "${opt}" "${reason:-mozilla.org default}"
-	done
-	echo "=========================================================="
-	echo
-
-	./mach configure || die
-}
-
-src_compile() {
-	local virtx_cmd=
-
-	if use pgo; then
-		# Reset and cleanup environment variables used by GNOME/XDG
-		gnome2_environment_reset
-
-		addpredict /root
-
-		if ! use X; then
-			virtx_cmd=virtwl
-		else
-			virtx_cmd=virtx
-		fi
-	fi
-
-	if ! use X; then
-		local -x GDK_BACKEND=wayland
-	else
-		local -x GDK_BACKEND=x11
-	fi
-
-	${virtx_cmd} ./mach build --verbose || die
-}
-
-src_install() {
-	# xpcshell is getting called during install
-	pax-mark m \
-		"${BUILD_DIR}"/dist/bin/xpcshell \
-		"${BUILD_DIR}"/dist/bin/${PN} \
-		"${BUILD_DIR}"/dist/bin/plugin-container
-
-	DESTDIR="${D}" ./mach install || die
-
-	# Upstream cannot ship symlink but we can (bmo#658850)
-	rm "${ED}${MOZILLA_FIVE_HOME}/${PN}-bin" || die
-	dosym ${PN} ${MOZILLA_FIVE_HOME}/${PN}-bin
-
-	# Don't install llvm-symbolizer from sys-devel/llvm package
-	if [[ -f "${ED}${MOZILLA_FIVE_HOME}/llvm-symbolizer" ]] ; then
-		rm -v "${ED}${MOZILLA_FIVE_HOME}/llvm-symbolizer" || die
-	fi
-
-	# Install policy (currently only used to disable application updates)
-	insinto "${MOZILLA_FIVE_HOME}/distribution"
-	newins "${FILESDIR}"/distribution.ini distribution.ini
-	newins "${FILESDIR}"/disable-auto-update.policy.json policies.json
-
-	# Install system-wide preferences
-	local PREFS_DIR="${MOZILLA_FIVE_HOME}/browser/defaults/preferences"
-	insinto "${PREFS_DIR}"
-	newins "${FILESDIR}"/gentoo-default-prefs.js gentoo-prefs.js
-
-	local GENTOO_PREFS="${ED}${PREFS_DIR}/gentoo-prefs.js"
-
-	# Set dictionary path to use system hunspell
-	cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set spellchecker.dictionary_path pref"
-	pref("spellchecker.dictionary_path",       "${EPREFIX}/usr/share/myspell");
-	EOF
-
-	# Force hwaccel prefs if USE=hwaccel is enabled
-	if use hwaccel ; then
-		cat "${FILESDIR}"/gentoo-hwaccel-prefs.js-r2 \
-		>>"${GENTOO_PREFS}" \
-		|| die "failed to add prefs to force hardware-accelerated rendering to all-gentoo.js"
-
-		if use wayland; then
-			cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set hwaccel wayland prefs"
-			pref("gfx.x11-egl.force-enabled",          false);
-			EOF
-		else
-			cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set hwaccel x11 prefs"
-			pref("gfx.x11-egl.force-enabled",          true);
-			EOF
-		fi
-	fi
-
-	if ! use gmp-autoupdate ; then
-		local plugin
-		for plugin in "${MOZ_GMP_PLUGIN_LIST[@]}" ; do
-			einfo "Disabling auto-update for ${plugin} plugin ..."
-			cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to disable autoupdate for ${plugin} media plugin"
-			pref("media.${plugin}.autoupdate",   false);
-			EOF
-		done
-	fi
-
-	# Force the graphite pref if USE=system-harfbuzz is enabled, since the pref cannot disable it
-	if use system-harfbuzz ; then
-		cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set gfx.font_rendering.graphite.enabled pref"
-		sticky_pref("gfx.font_rendering.graphite.enabled", true);
-		EOF
-	fi
-
-	# Install language packs
-	local langpacks=( $(find "${WORKDIR}/language_packs" -type f -name '*.xpi') )
-	if [[ -n "${langpacks}" ]] ; then
-		moz_install_xpi "${MOZILLA_FIVE_HOME}/distribution/extensions" "${langpacks[@]}"
-	fi
-
-	# Install geckodriver
-	if use geckodriver ; then
-		einfo "Installing geckodriver into ${ED}${MOZILLA_FIVE_HOME} ..."
-		pax-mark m "${BUILD_DIR}"/dist/bin/geckodriver
-		exeinto "${MOZILLA_FIVE_HOME}"
-		doexe "${BUILD_DIR}"/dist/bin/geckodriver
-
-		dosym ${MOZILLA_FIVE_HOME}/geckodriver /usr/bin/geckodriver
-	fi
-
-	# Install icons
-	local icon_srcdir="${S}/browser/branding/official"
-	local icon_symbolic_file="${FILESDIR}/icon/firefox-symbolic.svg"
-
-	insinto /usr/share/icons/hicolor/symbolic/apps
-	newins "${icon_symbolic_file}" ${PN}-symbolic.svg
-
-	local icon size
-	for icon in "${icon_srcdir}"/default*.png ; do
-		size=${icon%.png}
-		size=${size##*/default}
-
-		if [[ ${size} -eq 48 ]] ; then
-			newicon "${icon}" ${PN}.png
-		fi
-
-		newicon -s ${size} "${icon}" ${PN}.png
-	done
-
-	# Install menu
-	local app_name="Mozilla ${MOZ_PN^}"
-	local desktop_file="${FILESDIR}/icon/${PN}-r3.desktop"
-	local desktop_filename="${PN}.desktop"
-	local exec_command="${PN}"
-	local icon="${PN}"
-	local use_wayland="false"
-
-	if use wayland ; then
-		use_wayland="true"
-	fi
-
-	cp "${desktop_file}" "${WORKDIR}/${PN}.desktop-template" || die
-
-	sed -i \
-		-e "s:@NAME@:${app_name}:" \
-		-e "s:@EXEC@:${exec_command}:" \
-		-e "s:@ICON@:${icon}:" \
-		"${WORKDIR}/${PN}.desktop-template" \
-		|| die
-
-	newmenu "${WORKDIR}/${PN}.desktop-template" "${desktop_filename}"
-
-	rm "${WORKDIR}/${PN}.desktop-template" || die
-
-	# Install wrapper script
-	[[ -f "${ED}/usr/bin/${PN}" ]] && rm "${ED}/usr/bin/${PN}"
-	newbin "${FILESDIR}/${PN}-r1.sh" ${PN}
-
-	# Update wrapper
-	sed -i \
-		-e "s:@PREFIX@:${EPREFIX}/usr:" \
-		-e "s:@MOZ_FIVE_HOME@:${MOZILLA_FIVE_HOME}:" \
-		-e "s:@APULSELIB_DIR@:${apulselib}:" \
-		-e "s:@DEFAULT_WAYLAND@:${use_wayland}:" \
-		"${ED}/usr/bin/${PN}" \
-		|| die
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-
-	# If the apulse libs are available in MOZILLA_FIVE_HOME then apulse
-	# does not need to be forced into the LD_LIBRARY_PATH
-	if use pulseaudio && has_version ">=media-sound/apulse-0.1.12-r4" ; then
-		einfo "APULSE found; Generating library symlinks for sound support ..."
-		local lib
-		pushd "${ED}${MOZILLA_FIVE_HOME}" &>/dev/null || die
-		for lib in ../apulse/libpulse{.so{,.0},-simple.so{,.0}} ; do
-			# A quickpkg rolled by hand will grab symlinks as part of the package,
-			# so we need to avoid creating them if they already exist.
-			if [[ ! -L ${lib##*/} ]] ; then
-				ln -s "${lib}" ${lib##*/} || die
-			fi
-		done
-		popd &>/dev/null || die
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	if ! use gmp-autoupdate ; then
-		elog "USE='-gmp-autoupdate' has disabled the following plugins from updating or"
-		elog "installing into new profiles:"
-		local plugin
-		for plugin in "${MOZ_GMP_PLUGIN_LIST[@]}" ; do
-			elog "\t ${plugin}"
-		done
-		elog
-	fi
-
-	if use pulseaudio && has_version ">=media-sound/apulse-0.1.12-r4" ; then
-		elog "Apulse was detected at merge time on this system and so it will always be"
-		elog "used for sound.  If you wish to use pulseaudio instead please unmerge"
-		elog "media-sound/apulse."
-		elog
-	fi
-
-	local show_doh_information
-	local show_normandy_information
-	local show_shortcut_information
-
-	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
-		# New install; Tell user that DoH is disabled by default
-		show_doh_information=yes
-		show_normandy_information=yes
-		show_shortcut_information=no
-	else
-		local replacing_version
-		for replacing_version in ${REPLACING_VERSIONS} ; do
-			if ver_test "${replacing_version}" -lt 91.0 ; then
-				# Tell user that we no longer install a shortcut
-				# per supported display protocol
-				show_shortcut_information=yes
-			fi
-		done
-	fi
-
-	if [[ -n "${show_doh_information}" ]] ; then
-		elog
-		elog "Note regarding Trusted Recursive Resolver aka DNS-over-HTTPS (DoH):"
-		elog "Due to privacy concerns (encrypting DNS might be a good thing, sending all"
-		elog "DNS traffic to Cloudflare by default is not a good idea and applications"
-		elog "should respect OS configured settings), \"network.trr.mode\" was set to 5"
-		elog "(\"Off by choice\") by default."
-		elog "You can enable DNS-over-HTTPS in ${PN^}'s preferences."
-	fi
-
-	# bug 713782
-	if [[ -n "${show_normandy_information}" ]] ; then
-		elog
-		elog "Upstream operates a service named Normandy which allows Mozilla to"
-		elog "push changes for default settings or even install new add-ons remotely."
-		elog "While this can be useful to address problems like 'Armagadd-on 2.0' or"
-		elog "revert previous decisions to disable TLS 1.0/1.1, privacy and security"
-		elog "concerns prevail, which is why we have switched off the use of this"
-		elog "service by default."
-		elog
-		elog "To re-enable this service set"
-		elog
-		elog "    app.normandy.enabled=true"
-		elog
-		elog "in about:config."
-	fi
-
-	if [[ -n "${show_shortcut_information}" ]] ; then
-		elog
-		elog "Since ${PN}-91.0 we no longer install multiple shortcuts for"
-		elog "each supported display protocol.  Instead we will only install"
-		elog "one generic Mozilla ${PN^} shortcut."
-		elog "If you still want to be able to select between running Mozilla ${PN^}"
-		elog "on X11 or Wayland, you have to re-create these shortcuts on your own."
-	fi
-
-	# bug 835078
-	if use hwaccel && has_version "x11-drivers/xf86-video-nouveau"; then
-		ewarn "You have nouveau drivers installed in your system and 'hwaccel' "
-		ewarn "enabled for Firefox. Nouveau / your GPU might not support the "
-		ewarn "required EGL, so either disable 'hwaccel' or try the workaround "
-		ewarn "explained in https://bugs.gentoo.org/835078#c5 if Firefox crashes."
-	fi
-
-	elog
-	elog "Unfortunately Firefox-100.0 breaks compatibility with some sites using "
-	elog "useragent checks. To temporarily fix this, enter about:config and modify "
-	elog "network.http.useragent.forceVersion preference to \"99\"."
-	elog "Or install an addon to change your useragent."
-	elog "See: https://support.mozilla.org/en-US/kb/difficulties-opening-or-using-website-firefox-100"
-	elog
-}
diff --git a/x11-base/Manifest.gz b/x11-base/Manifest.gz
index 17b32380c0d2..939bbc7ef33a 100644
Binary files a/x11-base/Manifest.gz and b/x11-base/Manifest.gz differ
diff --git a/x11-base/xwayland/Manifest b/x11-base/xwayland/Manifest
index fb4082f57278..25d66ec4044b 100644
--- a/x11-base/xwayland/Manifest
+++ b/x11-base/xwayland/Manifest
@@ -1,6 +1,8 @@
 AUX xwayland-drop-redundantly-installed-files.patch 664 BLAKE2B 95773c2287be7f985f5156eebb4e01be236b3f8a2b217c31ea4d7c2f7ad826716ff8ac7951c5ee7963a057a5afe71040ddf1ca72151fb90923364cabfefc34c2 SHA512 35e329763122726eca8dd7014ee1c0321a4b23f32441a180fd4dfa2fd91b508b71a57270cc335460ca84a1483dc7c6d7cec56f55a2506aecbb73c14e4705d252
 AUX xwayland-drop-redundantly-installed-files_v2.patch 745 BLAKE2B eb9a61b2746c7b694bde5ed946ecb818f1933edcaaff45a491667cb2ebca81343c40fc3f5caf544e9e15bc41e3bd0777086fc9c0b48aa98d7aceb152dabbc168 SHA512 a4eab1cf0a31cd049ad83f7402746eca8948fcccdf162e4b216efd203fba8eca9ccc5594d483abc5591322f65a8fb937057c08caaec040b350b790fddcb21d24
 DIST xwayland-22.1.3.tar.xz 1272440 BLAKE2B 5f35d6675ee90d910ed39921b4590e7a5325f941238c69b09d6b7063bcded992d1e4425327ae4626e8e9cead7dc17b4d892642a1a3bdb3a4de797f8f733202c4 SHA512 be15cb398f9a8aad70352d09b0745c827d4766d5996e817b92c828b5ede27b10186c7ee319901abdc5e141da97170a3ace039269146461d4e2ceb5002a7c35b4
+DIST xwayland-22.1.4.tar.xz 1273552 BLAKE2B c492968f335ebd5b194d91729476047760b85620366fc587cace5f1cdef8cb22576293fb3799eedfe4a9c1eeff78dd18abaead67422caeb04b1ceb419509fbc6 SHA512 a1301df1687ac276172565c98b1fb3d5f35f67d47f625b81fce485d1818cf4896f88c2750b4e93596fa6f7fd515e258d201ca3d0cc39943b576f2d2c3f9be8cd
 EBUILD xwayland-22.1.3.ebuild 2148 BLAKE2B 7be8706e2e0d4694506c7de67c914f75be631f17964feab9b05bd72d7d4e1a4e583f04ab753c0e5d732ef435dce5a0a28d3758304bb820bc9e184a9ef6948401 SHA512 731fdcb1bcba4612381c1b97ae2d7e7fea20b86530ea2a8820ba755f830093377f76d1c6f353df1468e45a02554d22afb3ad76c06633296961165daffa3b1839
+EBUILD xwayland-22.1.4.ebuild 2154 BLAKE2B e76ecab4126e3bd7a4f37633ab56773759de72653e2d04ed8a58c278720770d38efac5dba2ae53acbbf560d3b3494de34d0dc4a32370bde9daa03fce940645ab SHA512 3216ab44000ff2bda753586a506251a3ec7ba3320497d347a3888f7638ba93622abec5ad03b7951a88915bc7ecc53afd67eef8c6d9192d10c35a1c4d24454924
 EBUILD xwayland-9999.ebuild 2221 BLAKE2B 79ebcf371891bcf3000095f61b53459279b78e1461e6ce361532452f6d20a5f5a204d1c366fe5cdd36093d40237932866d08a62edfca2aa7b82960285d1360f2 SHA512 67fad119e1bef87751bdb1ebff8d349e122875a9940bd2557d93ce2db99209d663e9f3c74486775d6cb9258d692642bc9472344e5bf4063d34ceb8ea6fe9456a
 MISC metadata.xml 543 BLAKE2B 6d9eaf03b02d3db1a546ca6443bc0e4964be085031c18ba0b5e58e615ef48090f181894fc9aec4abe358a8b59131423135b3bb25f0fe3a3cbb628e8d0f52c273 SHA512 075a7e2f5b39b537472c2ce242d9c7dde98be8230c6b48ec4a4115bd740011d1792a9d8188b44326276c91b7ddb56f01d1e548199786885b0f766854eab047b6
diff --git a/x11-base/xwayland/xwayland-22.1.4.ebuild b/x11-base/xwayland/xwayland-22.1.4.ebuild
new file mode 100644
index 000000000000..384312c2aa5c
--- /dev/null
+++ b/x11-base/xwayland/xwayland-22.1.4.ebuild
@@ -0,0 +1,100 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/xserver.git"
+	inherit git-r3
+else
+	SRC_URI="https://xorg.freedesktop.org/archive/individual/xserver/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+DESCRIPTION="Standalone X server running under Wayland"
+HOMEPAGE="https://wayland.freedesktop.org/xserver.html"
+
+IUSE="selinux video_cards_nvidia unwind xcsecurity"
+
+LICENSE="MIT"
+SLOT="0"
+
+COMMON_DEPEND="
+	dev-libs/libbsd
+	dev-libs/openssl:=
+	>=dev-libs/wayland-1.20
+	>=dev-libs/wayland-protocols-1.22
+	media-fonts/font-util
+	>=media-libs/libepoxy-1.5.4[X,egl(+)]
+	media-libs/libglvnd[X]
+	>=media-libs/mesa-21.1[X(+),egl(+),gbm(+)]
+	>=x11-libs/libdrm-2.4.89
+	>=x11-libs/libXau-1.0.4
+	x11-libs/libxcvt
+	>=x11-libs/libXdmcp-1.0.2
+	>=x11-libs/libXfont2-2.0.1
+	x11-libs/libxkbfile
+	>=x11-libs/libxshmfence-1.1
+	>=x11-libs/pixman-0.27.2
+	>=x11-misc/xkeyboard-config-2.4.1-r3
+
+	unwind? ( sys-libs/libunwind )
+	video_cards_nvidia? ( gui-libs/egl-wayland )
+"
+DEPEND="
+	${COMMON_DEPEND}
+	x11-base/xorg-proto
+	>=x11-libs/xtrans-1.3.5
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	x11-apps/xkbcomp
+	!<=x11-base/xorg-server-1.20.11
+	selinux? ( sec-policy/selinux-xserver )
+"
+BDEPEND="
+	sys-devel/flex
+	dev-util/wayland-scanner
+"
+
+PATCHES=(
+	"${FILESDIR}"/xwayland-drop-redundantly-installed-files.patch
+)
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use selinux xselinux)
+		$(meson_use unwind libunwind)
+		$(meson_use xcsecurity)
+		$(meson_use video_cards_nvidia xwayland_eglstream)
+		-Ddpms=true
+		-Ddri3=true
+		-Ddrm=true
+		-Ddtrace=false
+		-Dglamor=true
+		-Dglx=true
+		-Dipv6=true
+		-Dsecure-rpc=false
+		-Dscreensaver=true
+		-Dsha1=libcrypto
+		-Dxace=true
+		-Dxdmcp=true
+		-Dxinerama=true
+		-Dxvfb=true
+		-Dxv=true
+		-Dxwayland-path="${EPREFIX}"/usr/bin
+		-Ddocs=false
+		-Ddevel-docs=false
+		-Ddocs-pdf=false
+	)
+
+	meson_src_configure
+}
+
+src_install() {
+	dosym ../bin/Xwayland /usr/libexec/Xwayland
+
+	meson_src_install
+}
diff --git a/x11-drivers/Manifest.gz b/x11-drivers/Manifest.gz
index d729ccb4493c..8934bce14dc0 100644
Binary files a/x11-drivers/Manifest.gz and b/x11-drivers/Manifest.gz differ
diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
index 2484a0efeced..8189e00f00fd 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -20,7 +20,7 @@ DIST NVIDIA-Linux-x86-390.154.run 49362860 BLAKE2B 083d9dd234a37ec39a703ef7e0eb6
 DIST NVIDIA-Linux-x86_64-390.154.run 84438529 BLAKE2B e1bd2982f9697e74b593380acf471e03192cd8d20f14bd9b43e6d5925421c518278e75515a0713be25b29bf99d7ea49c770adf2cede79736a03f323d5ed96a33 SHA512 cab7de6db783089c1e385da0296c43d2cbbe266bac2bc177044e279224a6ef9c76495b46c4b7056eb5a82b21932a2002e0c12f7659b446a2586f9df30a69a9a3
 DIST NVIDIA-Linux-x86_64-470.141.03.run 272986406 BLAKE2B 12ef580dd98146715442e6b8e9f27bab4a12121f3edb2e291961f8dea96ec1b81d2c974d380018223999c67a7bec9873675487f436e60aab34e83b1a5b7065f1 SHA512 07aca8ea6aac5592060b4177ef43e9a3a5b2e3bc1a2d5959bf2ae349763fc62ed80b987af5607bf2d9a48e25c4e38e64970bca0177d63bd57a703d47debf5e18
 DIST NVIDIA-Linux-x86_64-510.85.02.run 329836795 BLAKE2B f9f56a2498d223ee5a27b783bb2cffb8e77cdb9ed5139afce2bd6fc4e9eccb19b7068b9fa15b4e9f7242cfcdd1fe3f93faf342aae1eb5e9b32625663a0c32463 SHA512 ce04706b707d08f601ee23ed2f4b5d6b4c2e8c17d74557b720be64e0c0f4ff915bcf35efa2470c27d90a7e1bad4eab48e6d9b2b1f05442546d3324f2a10fa69b
-DIST NVIDIA-Linux-x86_64-515.49.19.run 361577305 BLAKE2B 7f7afef43aa2a832689d411f823d582a4fd304598d36209ef7eaa0d57e971955f05b48839e1a78e11299a0c12e237095a40a2a948daa821c0d574bf6822f992a SHA512 87b129b3d24a70a7ae18640e995e165fe3e8188ec984c84295fc5db8ed56843cbb787130fbf3a94540dcab234c929bc013b94c5408c573c047b207d1d7b921df
+DIST NVIDIA-Linux-x86_64-515.49.24.run 361551549 BLAKE2B 65a4fa80446c2d4fb078293922d31c1bfe12284486eb7b6ac24ee226e523ae9af5a1b6b02ef5dcd2ead0a1424afc2d781851bdbb6ddb4eaefda6a55f560be2fb SHA512 30d697e02247698289410cc2a03a963d9031ec9a10acde1a34d79c8267e5c6dc5d82e7218c2a08c7c092d9d6428c9411395abed99ed7c02cc4e02494b70949d1
 DIST NVIDIA-Linux-x86_64-515.65.01.run 364182561 BLAKE2B 552084a5347c0388f5cb0a6eecf41fb3d401356cbbbe957569e3eb0a4ca03b3db0dea0f7f6a37a6b66cf6d5377677ee57a6df73668002a13efd8140b153fcf03 SHA512 5221a4ac071eb39a37a841f19cfe4983286dc35e918956b40604404ef36c122612475df7b9a391a9a70bd60f44e598c8a0e5ec54ccc3e90d51f01e1b2fbe5e33
 DIST NVIDIA-Linux-x86_64-520.56.06.run 406178736 BLAKE2B 9c30a769b9662deef9e5bdd74e26c166a3d0fcf54481b86bf811d20ebb73efa6385b28fe5ecbc35900f74ef2293503e9d84e64d6c4401aa0335de98550a1e193 SHA512 ac5a98964e1b7435a0919d313080e53c0453ca3a817ed1ed1693a0164f286973d93f4130428a3737a4871f512c686d72e2606038f533d016d6b9c2873eaa1f8a
 DIST NVIDIA-kernel-module-source-515.65.01.tar.xz 7510104 BLAKE2B 806f895d2de136427702c21ae231ba0e304850b07f2f43f3f2f1ba7b0115b7c9bb36435ad53ade6c778ab74af976c4613427644c1c03e3a9df9ddcb6f79de0fc SHA512 2975a498d7dbeace6feae5611b27be640e05fedf5faa257abde839756f508bae238de59a3277fb3326a51c048d9478b19d9ef7968061aaac9f1f588851bdf983
@@ -50,11 +50,11 @@ DIST nvidia-xconfig-470.141.03.tar.bz2 108888 BLAKE2B 1701f6a7d81dd4eb7a17d79882
 DIST nvidia-xconfig-510.85.02.tar.bz2 109790 BLAKE2B 09313f0f423c52c81550e8d94b82b88961bdab702bfa2086ffe148b517f82cdaada0ef5e2e5074c6bef174d64661ced63b4c52108c021e7cdadcb7b55cf8f6dc SHA512 5b9a0055643c9368689fd5d0fd47ddfb6352d903913271a577f8b0a8f92e0ce9700287c512269e91285ea9f385dcb4ed9c33410d5244234be7a7f34242df9bab
 DIST nvidia-xconfig-515.65.01.tar.bz2 109681 BLAKE2B b41b3ec377c79af6906a47c826d9930cc5ea6e85e8404e6882f3bc03cfccfa03d8ef7c280453ab29edb208173aeb576d33df00f92c225a86bc3cb571b352cdbc SHA512 6f0752e32af6772e85bd2799ea2d895bd5b5faee4c1b6813eb839e75af43d07ef09be6606e7dfc40491e07c25333e9c4145465f97dc0338053e8be1c19220bf9
 DIST nvidia-xconfig-520.56.06.tar.bz2 110304 BLAKE2B 31888ae4eb675e3e877150120b2fb02be9560e6abd885799d87b94bcce5b784d6640c3018c8db5ea3c9645e0907312956c7d6bdd2317cdf79fb758dc9ba0957f SHA512 9bcf55f13ad99571e2ad605704f8297b529f32e4f1bebe1a3eccf648c6559e1b6e2867e9f406cf34f0e4d240ddc12559e7dfaa790e700d1b3f5a7582bcffb27c
-DIST open-gpu-kernel-modules-515.49.19.tar.gz 7417963 BLAKE2B 3dd1ce0f55776413697252f901183359be764dfed067b14f6d5c9fc6a234b6f96fbe046729be9f5136fa8e11c813e9ffe54d510d772d5ccb562aa3d65a127088 SHA512 a601e25898aa9a1fc96fe61e0be97cd82ab42136faf153710f205960b9d3fb42bc445ba78542150ee31f000653cd456ec2266426c7a741b9dd06c39fd1f52e51
+DIST open-gpu-kernel-modules-515.49.24.tar.gz 7418026 BLAKE2B 1102a9b6f130cb7f56024d11f95a2a994be565acd1ffb2536c810c7c620e45d4fa1ae3fc159f1814bfcfb70f3930773770bbb98266fb55d9b59f54a8a6fc0d0c SHA512 e6ef132214ca3d82a889641f3d408a47ede28e8c8c4a0dfebdef071ca6692e3029d0e9386d7fc2b8f53decd83d0794f0b52aadd2c7bed6db0437231ecac7c76f
 EBUILD nvidia-drivers-390.154.ebuild 17212 BLAKE2B 77868fc519e9ba52b89f9783a3b5545727514986c635221e79770258a9f96876705a3b9facfc791fb21b558577253e59e95148950e11b478cb00fb3d6744e750 SHA512 6e83321569bbd466cd4e0174d37da136207b174af3cdf0c06c6bd1e3b2f70a409a49a2a9d63c48a896305ca0f75e22153edaaae5f8480816a0656675a4e8dad0
 EBUILD nvidia-drivers-470.141.03.ebuild 17883 BLAKE2B 4906d5425e96f3b05b8b39f55e6dfa9789b22d606ea4b138985629b1e3b8eb9b8ca8afc5b456214ae78b2339dadb832ef7940d652aaa7e958f63b3d5e68b9491 SHA512 404586e8174a4630e7847bd4e887db447cacb9894baefee3fe65b4584bbc9750c0c135020334649e5bfae68980f0c37d21289e65a0c46582e683f7e24b73ee31
 EBUILD nvidia-drivers-510.85.02.ebuild 18213 BLAKE2B d7b2c04537fe8e39989eeb791ff5110958019e5c8ea076e3cc6139cc209773eb39bec81780052bd7d9d96bf79a7a718a02437a8348ff45dc48ee316064435acd SHA512 77d8ce84bd6b2d9e07e11b91982fc22efbc74c4a102c677e4ceaa71eba07c4dc867b9f6c8d242b2fc899add99efcea9e2da82bff9bf4503cb210b265827c5011
-EBUILD nvidia-drivers-515.49.19.ebuild 19995 BLAKE2B 5c0876fb3382480b894f04ebcf1b8c4ecb4aeffa6eec0464c3e90ebde4098209ceb363861c0d17019f74cea459755462d228149d724d9753163c7c8d0fc050d2 SHA512 576aec92de550407a9f5d31683d813a78afb024bec03dcc095c4081e6fd5b48709c267d39305cd425047fc22cbbfc894a84165c6366e7501ab837a9c745f226d
+EBUILD nvidia-drivers-515.49.24.ebuild 19995 BLAKE2B 5c0876fb3382480b894f04ebcf1b8c4ecb4aeffa6eec0464c3e90ebde4098209ceb363861c0d17019f74cea459755462d228149d724d9753163c7c8d0fc050d2 SHA512 576aec92de550407a9f5d31683d813a78afb024bec03dcc095c4081e6fd5b48709c267d39305cd425047fc22cbbfc894a84165c6366e7501ab837a9c745f226d
 EBUILD nvidia-drivers-515.65.01.ebuild 20241 BLAKE2B ed64ad6932154d87114bdda9a684bc1a73d6686b30626da18e527339a27b598a592f19750a94cd007fc1628f1a4b10613c7dea42d563d87a73ee852d54aef092 SHA512 dc5a3215ed27db4ee6bf87c6fe5bbd33f7102311c47de0e18c209134907d82be312a06bd9a48f0c8a3f4e36ab649782a5478ffa0c297359331bfeded2dcfc788
 EBUILD nvidia-drivers-520.56.06.ebuild 19996 BLAKE2B eeede6ff880fdb58bebbd17292083458403e852d6e3f1b76de6769903867e87b9eba9bbf64d43b2080ea6ebb7b7ec136420353a5c3c2296454630737ecc30c19 SHA512 1e31924f419f61a48c04488e510ef57d39a0eb0e7a8e8d602b4d023a443b90990b20d78a12dbcaa21d4ebc5ddc363f1110de6211a7309fcf2f3ed0010242e863
 MISC metadata.xml 1320 BLAKE2B f8aa8f9a39d6da284b60afb50087acf75744057628e79b77a95e6bebb1e386e9d1a819f41e73d3e94b8ab74322ec8e8b077ad6d2af0804a5c6f20b4dd5f2897d SHA512 9fb939f8c8892ce43afc4f577181474c88a0aae3cc58af57987000b82f6c52f3f7b40fc538fa8eae0d5dbaf1fe3734d84f72fda2106853edd945149b3f2d2747
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-515.49.19.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-515.49.24.ebuild
similarity index 100%
rename from x11-drivers/nvidia-drivers/nvidia-drivers-515.49.19.ebuild
rename to x11-drivers/nvidia-drivers/nvidia-drivers-515.49.24.ebuild
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index 082199d69dc7..2517df506570 100644
Binary files a/x11-libs/Manifest.gz and b/x11-libs/Manifest.gz differ
diff --git a/x11-libs/gdk-pixbuf/Manifest b/x11-libs/gdk-pixbuf/Manifest
index 7f3e32f0ab86..9e6096795f00 100644
--- a/x11-libs/gdk-pixbuf/Manifest
+++ b/x11-libs/gdk-pixbuf/Manifest
@@ -1,6 +1,8 @@
 AUX gdk-pixbuf-2.32.3-fix-lowmem-uclibc.patch 1075 BLAKE2B e6fc37605b136d12dbc7e7c95c59ec0b8d5f65f72c1675186b0c0cc105be5537e7b4660730dce3799227217a582a64f295afbd33a8cf52071f5fe8c4e153c0d3 SHA512 0a3e51c52f947d6231b472525b11e13fdc752b8eaa34c95ec3c76cfb0faf33ef3109c8381189261e8ebae76a4070af24e58c373bebc69bbb6b69399bf833395d
+DIST gdk-pixbuf-2.42.10.tar.xz 6519776 BLAKE2B b6bec388b70a971ea5b336001920fdf433bcbc539d54e62c7b6198e968f0bd3560ef9adc94215b64b01e7d5db69c95d5a1d32654b38b051fceb75e93666b3385 SHA512 ad64963b61ef8cc84ae450328ec8c90a852f974e29ffdd42263ed32de47af93c058f3ffdf91c5d6e9bba815f4e8e8fe5a19422ac1bfb079666339814ac059b3a
 DIST gdk-pixbuf-2.42.8.tar.xz 8503020 BLAKE2B 39960043c5aa980f311d2705c868c170c90c7b580ac9ae849a3fdfc6a5faffcc24be23b82ca8fefb1cd5c28d2a02bfb87b1c5c5d1eab7b897f5e551a57577f7c SHA512 994a1374becec6235d347f4980afcc8b85f43ac373e4d7e00b7445880d0a51932e63b54429b28ab5af09e7c4437f9d6008e1c25b2d44a2c9ef7cc9821b478387
 DIST gdk-pixbuf-2.42.9.tar.xz 6596068 BLAKE2B f464a6b326aee185b30b24f66267ad7eacd12e8b3bd07e7cebfb42a496791561cdd71cd937282d72f1fc55ee1e86b531f7e737a2dd00f2187d705865be177919 SHA512 032869c98d22cc4add05198baec5a64d29af247a99a084d7c498f82f467fb2a2008a8d0d4564ee5d963f6965dc9b3ff61b6c07377f67fec70ddf14e5373abfb3
+EBUILD gdk-pixbuf-2.42.10.ebuild 2680 BLAKE2B 120cc3dc25f7312b6275102ee0ded8f7ba20d24fa7d0c1f8c12e6ba52b7829e82359d71f938567c0c005d065b187b802b33e0edba0535b33fb66e8c6e1d389c5 SHA512 ed38bfe5b15cfae2ea20c7e5b2d16399fc13f8b2646fe8520cc84fb8ccae213983dee27e49cba6fe98248b48640329adc0d25f5a9876d874b832e46aa2f71ba6
 EBUILD gdk-pixbuf-2.42.8.ebuild 3459 BLAKE2B 76c75c89dbaf850cb2943962ccf72eaab6c2ebb5bd78f4f3f214f64be80adf41f3204167aa2e6ce2be2cfb46d5917d50676f0a3ee54320956b914786cfc8e5dd SHA512 293bf38a0ca34fd3c9669e56631e0823aca22fd48308f94961c7acb32de7d7670d7302b43f486d3f93c49a86190a3fcc2df942342dc2d27d108103bbd732cf6b
 EBUILD gdk-pixbuf-2.42.9.ebuild 2801 BLAKE2B affdad5c20e4106b9e21c61b697f524f3f5e4a849db5e5a564339fd18faefe9e0055394900f1dfa5650ee320a2a157c340b34df7352e0fd27827d5970b46bb5b SHA512 58138905a87ac0d673d37585bd52cbdbf55c868ed327bda4025a09888b65048a3836d507b4316d3ee46ec94b1d8f717809dcc875ca273b37b5505e84f2b5166f
 MISC metadata.xml 332 BLAKE2B d11021f9889f64b977816523c2ed8f4b122b3f510e9649ef1548584f99b97e28f782d6fa753e92042bfefc8da4d1c9694949559660d99bdcdaa648af0bb01c4d SHA512 9bfa76b3e49cc2038dfa8af478bd12ec1832c4cf073987a88d6c1b0da791496d45f20b7a411e08c89bcffa1ce207fa07c08da244f93a2534175e0b80079965af
diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.10.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.10.ebuild
new file mode 100644
index 000000000000..265bd38a9b6e
--- /dev/null
+++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.10.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome.org gnome2-utils meson-multilib multilib xdg
+
+DESCRIPTION="Image loading library for GTK+"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/gdk-pixbuf"
+
+LICENSE="LGPL-2.1+"
+SLOT="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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="gtk-doc +introspection jpeg test tiff"
+RESTRICT="!test? ( test )"
+
+# TODO: For windows/darwin support: shared-mime-info conditional, native_windows_loaders option review
+DEPEND="
+	>=dev-libs/glib-2.56.0:2[${MULTILIB_USEDEP}]
+	x11-misc/shared-mime-info
+	>=media-libs/libpng-1.4:0=[${MULTILIB_USEDEP}]
+	jpeg? ( media-libs/libjpeg-turbo:0=[${MULTILIB_USEDEP}] )
+	tiff? ( >=media-libs/tiff-3.9.2:0[${MULTILIB_USEDEP}] )
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	gtk-doc? ( >=dev-util/gi-docgen-2021.1 )
+	app-text/docbook-xsl-stylesheets
+	app-text/docbook-xml-dtd:4.3
+	dev-libs/glib:2
+	dev-libs/libxslt
+	dev-python/docutils
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/gdk-pixbuf-query-loaders$(get_exeext)
+)
+
+src_prepare() {
+	default
+	xdg_environment_reset
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Dpng=enabled
+		$(meson_feature tiff)
+		$(meson_feature jpeg)
+		-Dbuiltin_loaders=png,jpeg
+		-Drelocatable=false
+		#native_windows_loaders
+		$(meson_use test tests)
+		-Dinstalled_tests=false
+		-Dgio_sniffing=true
+		$(meson_native_use_bool gtk-doc gtk_doc)
+		$(meson_native_use_feature introspection)
+		$(meson_native_true man)
+	)
+
+	meson_src_configure
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	if use gtk-doc; then
+		mkdir -p "${ED}"/usr/share/gtk-doc/html/ || die
+		mv "${ED}"/usr/share/doc/gdk-pixbuf "${ED}"/usr/share/gtk-doc/html/ || die
+		mv "${ED}"/usr/share/doc/gdk-pixdata "${ED}"/usr/share/gtk-doc/html/ || die
+	fi
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+
+	multilib_pkg_preinst() {
+		# Make sure loaders.cache belongs to gdk-pixbuf alone
+		local cache="usr/$(get_libdir)/${PN}-2.0/2.10.0/loaders.cache"
+
+		if [[ -e ${EROOT}/${cache} ]]; then
+			cp "${EROOT}"/${cache} "${ED}"/${cache} || die
+		else
+			touch "${ED}"/${cache} || die
+		fi
+	}
+
+	multilib_foreach_abi multilib_pkg_preinst
+	gnome2_gdk_pixbuf_savelist
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	multilib_foreach_abi gnome2_gdk_pixbuf_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+
+	if [[ -z ${REPLACED_BY_VERSION} ]]; then
+		rm -f "${EROOT}"/usr/lib*/${PN}-2.0/2.10.0/loaders.cache
+	fi
+}
diff --git a/x11-libs/libXrender/Manifest b/x11-libs/libXrender/Manifest
index eec679950b99..803c1b52c530 100644
--- a/x11-libs/libXrender/Manifest
+++ b/x11-libs/libXrender/Manifest
@@ -1,3 +1,5 @@
 DIST libXrender-0.9.10.tar.bz2 308318 BLAKE2B c9e250e16118a4878e7439fdb37549596abfd6a17f50e4e88242579fc285d0ef5b0c8d5d0fb592c7dbcd6e77c5fb284e6644e4edf9b12118cbfc0f179e274313 SHA512 16ea0cf638b32d7df54b270457ef8c9d9a80da27fa845b105b560cb31027b4c7fe799cf23d6b6bac492be5961264e96d7845d316a9af4de9ff38bf40885ea6fe
+DIST libXrender-0.9.11.tar.xz 302900 BLAKE2B b603118a02bc0bd64a98ac9820e6fd46a0613441b630d10aa8955c3a5e364c283f3d7323f7cd64e6c3a4c599409ae9d7c847751edc3250946342008abb66a015 SHA512 2327cc1b530382d81df29b8d579f801f1f990202107cc84506986bcf5d15010d414e9418987b200e3f222d188afce46f0d7754febcdca62a5fc1e541b3bb82de
 EBUILD libXrender-0.9.10-r2.ebuild 492 BLAKE2B 4d6168dbe0f0b42c8648c54dc17a984f11bd73681f03f84086def1cbbfafd86f548883a1b82a82432d04cb71dde7dc5a54948c70f9df6365a42aee12afd3998e SHA512 b320b7b5eaacc83ad59224f088e0d1aca8249adef7927baf169cfe3931482ae4b8c3af2504245b228477aa2647166e4aad57456e04806ff16fe2d1a2b46e6774
+EBUILD libXrender-0.9.11.ebuild 527 BLAKE2B 44d9f60dfe54a85a5aba4c61a8957e71bf8ef8e5f9a7f3cd6c3348f5846f0a1a282359cf3e89f08b592c5f622b197bca571d26798b7115467d117e6bedcaaf87 SHA512 2241a2815e4378ee0c147512bd1d644a62fcde2554c80376ae6e8edb0df8114ac892ee6694fda2f4b86e83ed2e4de4f2db8af49aabb750650f37493b264791df
 MISC metadata.xml 341 BLAKE2B 02c79694315c5ca33c90a8854cbf506addc7b69a68fe066f99a45c3fbe7764ebc69c03808215e056c2bd0f7b0261ec173d02a623e8c91c3a090b9ae77a1c83a8 SHA512 158a1a560ef016f8fd5c85a6dc65fae5ce9e960f65be43913a58a4218b2f24ef4cd925a490140f8463b206fb50d5c18243c9dc0ea56b0639f5ad9e5fbc0cb31c
diff --git a/x11-libs/libXrender/libXrender-0.9.11.ebuild b/x11-libs/libXrender/libXrender-0.9.11.ebuild
new file mode 100644
index 000000000000..8b3adb71de24
--- /dev/null
+++ b/x11-libs/libXrender/libXrender-0.9.11.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+XORG_MULTILIB=yes
+XORG_TARBALL_SUFFIX="xz"
+inherit xorg-3
+
+DESCRIPTION="X.Org Xrender library"
+
+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"
+
+RDEPEND="
+	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
diff --git a/x11-libs/vte/Manifest b/x11-libs/vte/Manifest
index a1dfc85bd305..b9ccd7feeadd 100644
--- a/x11-libs/vte/Manifest
+++ b/x11-libs/vte/Manifest
@@ -9,7 +9,9 @@ DIST vte-0.68.0-command-notify.patch.xz 9748 BLAKE2B de2d4c9b7f2c2b21518984f818d
 DIST vte-0.68.0.tar.bz2 507598 BLAKE2B 10274d9e804f00bf071b7848633ca8de2953f4e91dc2967e33b7d6698bb304baac4f0e0431debae5a972c2c56c65efd1c5b92455a17db08cf254ddec56d3276e SHA512 785df7261b5075f166e59de7d3535b381564715ce65efd4837a130e153528691b610fc6160c00f0f17008f5f4ee94c23350d9a477b4b1d58da6ace083e5caae1
 DIST vte-0.70.0-command-notify.patch.xz 9040 BLAKE2B 108dd05d00409af90b1fd3e9b5c3b0e5586ac80204cef8840fda935204cbc480fec1193e2a0a2782f98e2b094c3caebbfe61cf18631b16921df05cf3808afd22 SHA512 92123e7f5cb6ef876f2b2b108dbef59bce212efebd64cd790d49d9ee3215344acd848eec5d326fe2c3bd236846ed3b896148024390093491b2f6e2f7c46e2bd1
 DIST vte-0.70.0.tar.bz2 499283 BLAKE2B 694cf4dfee334e9b54bb8e47f862167acbb8ffc7ac8e81889acd4786449cb45944a87a5adaa036f46458c350ca2119bb356e90dfa71f03638c9c2b14d2ccb877 SHA512 362b71296ae39a16b55402f524a39b063f66ae237e6e161ccc89ca2bb1f2a5c43f4d706d9f3bfae12a99fdb81c4e70408c7f3eca2c01316950b0a3a1a1d79423
+DIST vte-0.70.1.tar.bz2 502044 BLAKE2B 0a9ce43c1863e823fcd073fd30fb6b2cb39e9168e850796fe12be2b9bdfc0b24ceea974b4c94bcdd10f2225613990e0e079194380241b7e625cb6dc4309a7476 SHA512 88de629b382eca8a42199b2ba9b248e231817e1de7183417aed150bcf61530084f7177d73dee9aab25fe4c3ab80d795b5fdcae336687560d3b582bd04181353d
 EBUILD vte-0.28.2-r209.ebuild 1864 BLAKE2B 61c287edd403d36a67fa2b45987bcb7a5ee446516df9c84a2ae10bcdcf8318795a98683a702e868aa4f6178d7dfd8c59afdc1a4a412544c52a01131ad2a41bc6 SHA512 c5ea6ab70fc89c5ddb4f097c5ee699829d96c98bc0fe4430b8aa3bf8e5767fcd5aff112304d8ea680f92a8b6ceccc1bbdd29ebce10c126f9b329ad5869da246b
 EBUILD vte-0.68.0.ebuild 2741 BLAKE2B 66debeedcbd37b16ed63f2618bebc1c0b611855016a18dd51e54be535130843c58c1bd2a583f83563268fbb33cb40c4070352518be8aa0e1168f72c63b2b2d57 SHA512 93344cd296bc3ee4ff50df052c0118fa4529efd5f2b72c0904258f090d42ab640eb4ffd8616a085d90a13f9af04d7d9cad90acc8855573879318a4b45e348744
 EBUILD vte-0.70.0.ebuild 3183 BLAKE2B a82a76018feda98c892290f2ef5c91098040613bffbded0629067622ee07a88cdebe343d9b9c60b3ba494bce561071652ef4332ed24b83a9b5498f78de59d331 SHA512 834488332f71b0742143cc2baa64ec91f724d43e0fdea0dcca9f0c005296e8417d8ea3524b536642c433ec76b2ab21a8332be9cc70f67bf6c1eec6b5dfbe46a0
+EBUILD vte-0.70.1.ebuild 3183 BLAKE2B a82a76018feda98c892290f2ef5c91098040613bffbded0629067622ee07a88cdebe343d9b9c60b3ba494bce561071652ef4332ed24b83a9b5498f78de59d331 SHA512 834488332f71b0742143cc2baa64ec91f724d43e0fdea0dcca9f0c005296e8417d8ea3524b536642c433ec76b2ab21a8332be9cc70f67bf6c1eec6b5dfbe46a0
 MISC metadata.xml 519 BLAKE2B e34530c7e9882f9d61b6c1fe9cc1d523037bcc05034e3f98351ff33bb543a0a25d96c0debdd1572cfeb0d2166b41a324c7fdfed38482c11cbe053db96b312ef8 SHA512 313a0af6b28d47bf385594a9306f38476bbfcc44517d7219ba1d0a8ddee224a37cd4ee8f7c4f8aed8bd7eae0ad2b3461bc4ae49c5eb8b08bc61459c76bf7a5ef
diff --git a/x11-libs/vte/vte-0.70.1.ebuild b/x11-libs/vte/vte-0.70.1.ebuild
new file mode 100644
index 000000000000..49b766e1be02
--- /dev/null
+++ b/x11-libs/vte/vte-0.70.1.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit gnome.org meson python-any-r1 vala xdg
+
+DESCRIPTION="Library providing a virtual terminal emulator widget"
+HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/VTE https://gitlab.gnome.org/GNOME/vte"
+
+# Once SIXEL support ships (0.66 or later), might need xterm license (but code might be considered upgraded to LGPL-3+)
+LICENSE="LGPL-3+ GPL-3+"
+SLOT="2.91"      # vte_api_version in meson.build
+IUSE="+crypt debug gtk-doc +icu +introspection systemd +vala vanilla"
+KEYWORDS="~amd64"
+REQUIRED_USE="
+	gtk-doc? ( introspection )
+	vala? ( introspection )
+"
+
+# Upstream is hostile and refuses to upload tarballs.
+SRC_URI="https://gitlab.gnome.org/GNOME/${PN}/-/archive/${PV}/${P}.tar.bz2"
+SRC_URI="${SRC_URI} !vanilla? ( https://dev.gentoo.org/~mattst88/distfiles/${PN}-0.70.0-command-notify.patch.xz )"
+
+DEPEND="
+	>=x11-libs/gtk+-3.24.22:3[introspection?]
+	>=dev-libs/fribidi-1.0.0
+	>=dev-libs/glib-2.52:2
+	crypt?  ( >=net-libs/gnutls-3.2.7:0= )
+	icu? ( dev-libs/icu:= )
+	>=x11-libs/pango-1.22.0
+	>=dev-libs/libpcre2-10.21:=
+	systemd? ( >=sys-apps/systemd-220:= )
+	sys-libs/zlib
+	introspection? ( >=dev-libs/gobject-introspection-1.56:= )
+	x11-libs/pango[introspection?]
+"
+RDEPEND="${DEPEND}
+	~gui-libs/vte-common-${PV}[systemd?]
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-libs/libxml2:2
+	dev-util/glib-utils
+	gtk-doc? ( dev-util/gi-docgen )
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+"
+
+src_prepare() {
+	default
+	use vala && vala_setup
+	xdg_environment_reset
+
+	use elibc_musl && eapply "${FILESDIR}"/${PN}-0.66.2-musl-W_EXITCODE.patch
+
+	if ! use vanilla; then
+		# Part of https://src.fedoraproject.org/rpms/vte291/raw/f37/f/vte291-cntnr-precmd-preexec-scroll.patch
+		# Adds OSC 777 support for desktop notifications in gnome-terminal or elsewhere
+		eapply "${WORKDIR}"/${PN}-0.70.0-command-notify.patch
+	fi
+
+	# -Ddebugg option enables various debug support via VTE_DEBUG, but also ggdb3; strip the latter
+	sed -e '/ggdb3/d' -i meson.build || die
+	sed -i 's/vte_gettext_domain = vte_api_name/vte_gettext_domain = vte_gtk3_api_name/' meson.build || die
+}
+
+src_configure() {
+	local emesonargs=(
+		-Da11y=true
+		$(meson_use debug debugg)
+		$(meson_use gtk-doc docs)
+		$(meson_use introspection gir)
+		-Dfribidi=true # pulled in by pango anyhow
+		-Dglade=true
+		$(meson_use crypt gnutls)
+		-Dgtk3=true
+		-Dgtk4=false
+		$(meson_use icu)
+		$(meson_use systemd _systemd)
+		$(meson_use vala vapi)
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_install # not meson_src_install because this would include einstalldocs, which would result in file collisions with gui-libs/vte
+	# Remove files that are provided by gui-libs/vte-common
+	rm "${ED}"/usr/libexec/vte-urlencode-cwd || die
+	rm "${ED}"/etc/profile.d/vte.sh || die
+	rm "${ED}"/etc/profile.d/vte.csh || die
+	if use systemd; then
+		rm "${ED}"/usr/lib/systemd/user/vte-spawn-.scope.d/defaults.conf || die
+	fi
+	if use gtk-doc; then
+		mkdir -p "${ED}"/usr/share/gtk-doc/ || die
+		mv "${ED}"/usr/share/doc/vte-${SLOT} "${ED}"/usr/share/gtk-doc/vte-${SLOT}-gtk3 || die
+	fi
+}
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 02e662f74c0f..287831db68c0 100644
Binary files a/x11-misc/Manifest.gz and b/x11-misc/Manifest.gz differ
diff --git a/x11-misc/qtfm/Manifest b/x11-misc/qtfm/Manifest
index 12bbe9a35537..3c010b18b067 100644
--- a/x11-misc/qtfm/Manifest
+++ b/x11-misc/qtfm/Manifest
@@ -1,7 +1,5 @@
 AUX qtfm-6.2.0-qt-5.15.patch 1037 BLAKE2B cb48575cb9097b84ed1bb739c0f6254d1bf88196d08e5ceee7b43ebae71f45dd0bf68dadfd0dce7b7f94958453d9d40f1750f291049a6c2936d24c79d2943ebe SHA512 19ffb3a4d322b1fce676819c75e13ef2952dd50182e3162c55dde26badf90f29cb4db1f388b894699cf55f7c123b6bb810864f2f603ab6c01116ceac78bfabba
-DIST qtfm-6.2.0.tar.gz 411064 BLAKE2B dce16b79753de31c58b36aa51b2f5555a12e19778ce81ca980bb5775f694d5315df97f4ac7b060653748a3ec2bc69b0f88599bca44696ce8b6a8026b30abbf9f SHA512 44bcef3d9e4111388aa93fd8c51d65a5210e969071d79336a4451a78ec7503867d8c667325eeafa5f85ee922dd787746e6ac94e17a61c07914c12364cfa8951d
 DIST qtfm-6.2.1.tar.gz 410958 BLAKE2B fe542b935dfa0d16198f9a0dc3fb5e0b43718056ebc0987ef73ff8c56258e8ba660ef7f294cc424aab397cd26a2aba37048806d9175fe86004298129443c707b SHA512 911c90a6f9bcfe539aaacf3476d660116f2dc18821b23cc420615be649bbffd530abf640ebf77d80ee85b61779e4844e0bc10f8fd3f3b0686366e6b5372f9f2c
-EBUILD qtfm-6.2.0.ebuild 1104 BLAKE2B 761437994d50ca6f4a9bc7165238f41e434d33290d4fe566423be1c1133ea62a1baa877eb8a1cb9a6d92ec91b2a11d8b9ed873fd7831f2dd8fefebf4c976a691 SHA512 c64343feebb7c46cd7ad67b98a9f1386144b39e43fd80cef811e2ea1d110e998563d7cbbc5e731560561bf6bcb138ab5674ba6df4d9a0c7c5983b77334af791f
-EBUILD qtfm-6.2.1.ebuild 912 BLAKE2B 9a9d81b5d613ce01c1239b10b7eac9e2a0820b7e577c0af0e6bd11daf0e858511e3c87ffabfa9ef793edf802665b9551d621c7b1968b360ee33032547e055835 SHA512 789e96684831b6f0d70ee247c45a9964384bcd1416dc1b5e2fbdeacffd1341e19f98206b0b40ec62bbdad491f623ae8fe85c5f15162c63d4e2cf0fd867f6756c
+EBUILD qtfm-6.2.1.ebuild 910 BLAKE2B 2b2a4d59a5e992994661a74b5b35332dcb18a317bd75059391c080a76e69c4c304dbb1d7f6468f2c1cd8c21641f087c22102d7efef06e9fb85ab497a89793637 SHA512 768027180fc575bdd2f5e61dfdbabfea970a744b295d839c06d8d29dc92d18618a0592830605a20d2ee1bf7c65c5bf82bf8cef7ce8a9bfef7c9a363e8f5a9ab8
 EBUILD qtfm-99999.ebuild 817 BLAKE2B e3f980a4939b1a2328666868f68d4e62543b22fdfcc0e86c21c67bfd0306891685a0d620cc07bb6ab88002ebcedce9e7474a4b8e502dc97987ce27cb5e6ff037 SHA512 631beccfbe339420ccc7224e94c184a65dfc09fef5aef813f58d18148834d3e819c3f01902077e1d04ca639e4b6f7ecb5e544685594c6ad2427647d8181f954e
 MISC metadata.xml 403 BLAKE2B 7befbfef66548288987666d889d847f730d3aca25b443f688483eca608848b612891d56c6b17f0520040622e63b3c0f74998b174758fc91811b98f23cad476a8 SHA512 230bdca0e66f1a18421719bec8a47ef93c311e3a64011246b1fc3731e6f1507a35613b873ce26cb7fb30600858a36e209a6397bcf92bd3d9a3d0aa88bb3c1887
diff --git a/x11-misc/qtfm/qtfm-6.2.0.ebuild b/x11-misc/qtfm/qtfm-6.2.0.ebuild
deleted file mode 100644
index 2701a220c7e8..000000000000
--- a/x11-misc/qtfm/qtfm-6.2.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit qmake-utils xdg-utils
-
-DESCRIPTION="Small, lightweight file manager based on pure Qt"
-HOMEPAGE="https://qtfm.eu/"
-SRC_URI="https://github.com/rodlie/qtfm/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+dbus shared"
-
-BDEPEND="
-	app-arch/unzip
-	dev-qt/linguist-tools:5
-"
-RDEPEND="
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	sys-apps/file
-	dbus? ( dev-qt/qtdbus:5 )
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}"/${P}-qt-5.15.patch )
-
-src_configure() {
-	eqmake5 \
-		$(usex dbus '' 'CONFIG+=no_dbus CONFIG+=no_tray') \
-		$(usex shared 'CONFIG+=sharedlib' '') \
-		$(usex shared 'CONFIG+=with_includes' '') \
-		LIBDIR="/usr/$(get_libdir)" \
-		PREFIX="/usr" \
-		XDGDIR="/etc/xdg"
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-	einstalldocs
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/x11-misc/qtfm/qtfm-6.2.1.ebuild b/x11-misc/qtfm/qtfm-6.2.1.ebuild
index 82c4fe88eab6..9e46320ebd05 100644
--- a/x11-misc/qtfm/qtfm-6.2.1.ebuild
+++ b/x11-misc/qtfm/qtfm-6.2.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/rodlie/qtfm/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+dbus shared"
 
 RDEPEND="
diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz
index 01a1a17f4849..471d1f11e9ca 100644
Binary files a/x11-terms/Manifest.gz and b/x11-terms/Manifest.gz differ
diff --git a/x11-terms/gnome-terminal/Manifest b/x11-terms/gnome-terminal/Manifest
index e1eff6626950..cd9bd3f26a76 100644
--- a/x11-terms/gnome-terminal/Manifest
+++ b/x11-terms/gnome-terminal/Manifest
@@ -4,6 +4,8 @@ DIST gnome-terminal-3.44.0-cntr-ntfy-autottl-ts.patch.xz 37248 BLAKE2B b3599386e
 DIST gnome-terminal-3.44.1.tar.xz 1813032 BLAKE2B 3e001139aa0516bd27f7215c692c048393d6ad41737b8817f212529d3c530f6417d05601f63e6265e3fb84e788322341c25784a0a26ee7434f1d4bccd31c1eea SHA512 afaa9a1b4fa86fea853a242f167d1ba3438efe4e049336bae138cb800d43c3325f624849463f16c9d4e34360916377c4edbfd2f3977212b51e35a41cca88b283
 DIST gnome-terminal-3.46.2-cntr-ntfy-autottl-ts.patch.xz 34980 BLAKE2B 97a634da8f586fe03770540a00480f04de5d3210bb45e9af216ac876a85a8199d2d9ed651cae6631a0b432c96d28b5a07202baf79765a2b3767160c1df5cb84a SHA512 96591f7e1f4febfce9d8b10a0fc8aebc09ad07cb2fb36876affaa47f19360944c37e63c173af6f07807247c6f60f34e4e39590ccb1632a64d6e5dbf3912bea74
 DIST gnome-terminal-3.46.2.tar.gz 2881209 BLAKE2B 191e9f2f074e2965e85708e92608903173228e9c8df8df3f67eea33a95ab0726f5a0e10c80839d735c57f47ee5388fe70b2eedff21c1d73019ede95d6a00fd78 SHA512 b5a6507f9e908d9bdd4659d961e9618ff75ed5c6e02c6818d8399d4ea355dff7ea1b8bafb4304501d5a46e83e5f8633524c7851d42a39b1bdea5a1545ca1d31d
+DIST gnome-terminal-3.46.3.tar.gz 2881211 BLAKE2B a5c0aea858692bbab3ed20d4daa54dc97c98d4b920b09fa0aa52963658f6a327e90398c45ae5ed4dd3a40823ba84eff208f6df5e5e0731a1b1e7d8e531ad7b73 SHA512 d1408bfaf0a7c0b090f140c5ac12fe406fcfb18ddda5745616f209e196cc0b29887a312afa29a8ce319cbc7a0093908305a0fc95c357f8c714084cc696c8e79c
 EBUILD gnome-terminal-3.44.1.ebuild 2953 BLAKE2B dd07246a8212d5c03274d63cd91ca2a5b74ecce4b1e14fb156b02bc7c3dd17b16bc24b8c4fde71c40138573092fcba4c30b20175209a1d3f2019e6ffbf381fc6 SHA512 a227e96ef2ce12def2a85ca071dd789c6c13a60e15add1a4fba9ef19228406eb2616b0192b92b37a22339f6c4c76ce4bea564a7b9278f2f3d6cf916e997df67e
 EBUILD gnome-terminal-3.46.2.ebuild 2981 BLAKE2B ffb040b8f7b8840ef8177cabe0e2d7b6933805ca040399d9121f7e8ce51f339c877ada98ed4e86ba138aade83052044b38d6e893b603f14cb236c4338c36a036 SHA512 1251905a80fd114277e3533f55ca4ae30c510e1df4069c99f303a5a2442bc9d1f9f1d161755871b909fc42bf2d6c3316b3f2d3267f4d8962fc8557cadc30bd02
+EBUILD gnome-terminal-3.46.3.ebuild 2981 BLAKE2B ffb040b8f7b8840ef8177cabe0e2d7b6933805ca040399d9121f7e8ce51f339c877ada98ed4e86ba138aade83052044b38d6e893b603f14cb236c4338c36a036 SHA512 1251905a80fd114277e3533f55ca4ae30c510e1df4069c99f303a5a2442bc9d1f9f1d161755871b909fc42bf2d6c3316b3f2d3267f4d8962fc8557cadc30bd02
 MISC metadata.xml 429 BLAKE2B 34e0c5a2d28f7aa2f8a6059af38935306a01af79daa081d71146600f6fb866038cb9122cc92570a68cfeb5ca82c76385d14046ca8fbf182c5046314f71348cb9 SHA512 8ab3ef95678ceee2c76131f4c05f620bd4f71ab26784dcbb552e4342aac0f33cf879992543365db16ae2c1d39e694aa25d0b9ee205c38fc06642b5f0c51ba7c5
diff --git a/x11-terms/gnome-terminal/gnome-terminal-3.46.3.ebuild b/x11-terms/gnome-terminal/gnome-terminal-3.46.3.ebuild
new file mode 100644
index 000000000000..465352fb409b
--- /dev/null
+++ b/x11-terms/gnome-terminal/gnome-terminal-3.46.3.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..11} )
+inherit gnome.org gnome2-utils meson python-any-r1 readme.gentoo-r1 xdg
+
+DESCRIPTION="A terminal emulator for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/ https://gitlab.gnome.org/GNOME/gnome-terminal"
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="debug +gnome-shell +nautilus vanilla"
+
+# Upstream is hostile and refuses to upload tarballs.
+SRC_URI="https://gitlab.gnome.org/GNOME/${PN}/-/archive/${PV}/${P}.tar.gz"
+SRC_URI+=" !vanilla? ( https://dev.gentoo.org/~mattst88/distfiles/${PN}-3.46.2-cntr-ntfy-autottl-ts.patch.xz )"
+
+KEYWORDS="~amd64"
+
+# FIXME: automagic dependency on gtk+[X], just transitive but needs proper control, bug 624960
+RDEPEND="
+	>=dev-libs/glib-2.52:2
+	>=x11-libs/gtk+-3.22.27:3
+	>=x11-libs/vte-0.70.0:2.91[!vanilla?]
+	>=dev-libs/libpcre2-10
+	>=gnome-base/gsettings-desktop-schemas-0.1.0
+	sys-apps/util-linux
+	gnome-shell? ( gnome-base/gnome-shell )
+	nautilus? ( >=gnome-base/nautilus-43.0 )
+"
+DEPEND="${RDEPEND}"
+# itstool required for help/* with non-en LINGUAS, see bug #549358
+# xmllint required for glib-compile-resources, see bug #549304
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+DOC_CONTENTS="To get previous working directory inherited in new opened tab, or
+	notifications of long-running commands finishing, you will need
+	to add the following line to your ~/.bashrc:\n
+	. /etc/profile.d/vte-2.91.sh"
+
+src_prepare() {
+	eapply "${FILESDIR}"/${PN}-3.44.1-fix-missing-wexitcode.patch
+	if ! use vanilla; then
+		# https://bugzilla.gnome.org/show_bug.cgi?id=695371
+		# Fedora patches:
+		# Restore transparency support (with compositing WMs only)
+		# OSC 777 desktop notification support (notifications on tabs for long-running commands completing)
+		# Restore "Set title" support
+		# Automatic title updating based on currently running foreground process
+		# https://src.fedoraproject.org/rpms/gnome-terminal/raw/f31/f/gnome-terminal-cntr-ntfy-autottl-ts.patch
+		# Depends on vte[-vanilla] for OSC 777 and the preexec/precmd/etc patches in VTE
+		eapply "${WORKDIR}"/${PN}-3.46.2-cntr-ntfy-autottl-ts.patch
+	fi
+	default
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use debug dbg)
+		-Ddocs=false
+		$(meson_use nautilus nautilus_extension)
+		$(meson_use gnome-shell search_provider)
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	if ! use vanilla; then
+		# Separate "New Window/Tab" menu entries by default, instead of unified "New Terminal"
+		insinto /usr/share/glib-2.0/schemas
+		newins "${FILESDIR}"/separate-new-tab-window.gschema.override org.gnome.Terminal.gschema.override
+	fi
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/x11-terms/xterm/Manifest b/x11-terms/xterm/Manifest
index 904d3acdaf30..78c073ebb70a 100644
--- a/x11-terms/xterm/Manifest
+++ b/x11-terms/xterm/Manifest
@@ -1,8 +1,6 @@
 DIST xterm-372.tgz 1507107 BLAKE2B 256b99b13512740086203c4c05685cd170356118e11029a01d30b32f69c1fc5088efa0dabc955d8a24acf36f3e061faf7af9866c2302a4ac45405b97455384a0 SHA512 f65fee6227ca27be85569ec06f3701a6114489e036975d0fe37f3c71d7598d1b06c8689cfbda593a98418eec1417bd60b33e3978752b255989cfa0bb4ce332bf
-DIST xterm-373.tgz 1518059 BLAKE2B f215e6e695696cba3a0e02eac9e236fbcb50b3b99febba972bd42eb71b724ad596062ad567aaa89ff74d785c198c35ac6e99693f8231d763a4f054123863ba3b SHA512 0e1ef4165137fa5369ac2b2b93c73527a23c89a3f5e4b9de7a24dca5af78a6cb34cddb47a5aec2b16b1b302347c79447fbee87bddae3c569bbaac8765e7875f9
-DIST xterm-374.tgz 1518184 BLAKE2B fdd7f3361214217aae12fe3645b5df51085261b4d5a09e66be7867dd77aa9290be4cd54d7e52dbcddca173272c8a260c458b3d6172d82a8e953f2e4537104a70 SHA512 aba16f31e79ff13dd8c5576890cac40276e55b89e037d888d4cc0a73bf6e57e0f2e63a6684f5fdd6aaf0a0980586424f302bdf6ed5a4b0c96f61ec435a1de2e8
-DIST xterm-374.tgz.asc 729 BLAKE2B a97383910dfb22f40e9b8d38cd031af839b95a3d0fe8f8de3f72ad57b1d62687f6fe386ca4e6cdb54ca3a2d905e2e20f83a81a570f3b039dcb896caba449a652 SHA512 4b67de66be7bd00f479df43b15faf523f6041a5f2d4c245d361ae64efb97ae34fd160e416e41c1ca76b3f2b69088871928fb4a6c40489c047fd08351df60f662
+DIST xterm-375.tgz 1518304 BLAKE2B 29b81cc7ceb9cf03d4e91f731b4e78dcf963afe8995dab442f7bdb9df0f41b1ba0b2fbe45f220868c6d4e2655714d308064d41b9346edc5f61e5157fa21a966e SHA512 5492320055348f5f0c42789a2e47ae2fba4c19f7d55f50c174948fc79ab011e52435755b302e1439390a4ba44316eaaa7b79ce0ad9a366e53a84cfb2c3565a51
+DIST xterm-375.tgz.asc 729 BLAKE2B 2ae5833284a7cb978625be0de1233e8ba54a36fae7657e0169e94de907e37cc4677d1b3a8d89384f469c6f2786a91dc280a930c6fc04c21d74a0a83571771b5a SHA512 c7b4b5006c7a197e29adfbb741ff57a6e39f97e23e1739a3935ff9bb338f4245809591974aa8a5608261e190355ad76b810b757a18740918b6fcaf5292240a40
 EBUILD xterm-372.ebuild 2602 BLAKE2B 34217a79398617f43dceb77255dc2f60ef742e0626a75a3362e0f440e976eabeabe5b68f01b64b04c944102b041b490550a7cfa11a49bb9a26a4f4a7045d4326 SHA512 931ebdb5db36135ab730418b2bcef4565040250f27b4d403cfa57abead4b2b2046f5982c202a034b5dfca3705b3dd613359b56740d8280336bb66da1211be1e0
-EBUILD xterm-373.ebuild 2619 BLAKE2B f89d4634c1ea84350ed93a3afe2259812d80a1b9a5dddb7e71366db422e4a9012e305d20385d58f0cef3ce0ab1c025e3847b9acf6c362e1c294d4819ceb633f0 SHA512 5efcbcb55ea3b402b6225431c01c6b0e8dc31d42bff8a4f476030e1c5b75088e2cd293c9ead52d4765a667529140bab944a805d8c84d315c73a76c1ffda527d6
-EBUILD xterm-374.ebuild 2855 BLAKE2B cc5a90b64fdb663588c788d413379e73103a1b7cbe62d6f5bcc7140606805ff5166b5638c24de19f909824d9d2ae5d913719e4aed30ebc057ac98e2810d3b298 SHA512 5bb04e7e79911c6cb742c63b52a12337324152f06a2351a6b81f0660388241e448bf5c568ed0d76a6dca0d7cc54f320e1ed9535fba661830fc257e1f8c98fd29
+EBUILD xterm-375.ebuild 2855 BLAKE2B cc5a90b64fdb663588c788d413379e73103a1b7cbe62d6f5bcc7140606805ff5166b5638c24de19f909824d9d2ae5d913719e4aed30ebc057ac98e2810d3b298 SHA512 5bb04e7e79911c6cb742c63b52a12337324152f06a2351a6b81f0660388241e448bf5c568ed0d76a6dca0d7cc54f320e1ed9535fba661830fc257e1f8c98fd29
 MISC metadata.xml 552 BLAKE2B 1de52230aa9b681cee30dd4ee4651521bf9474cb2a99168fd6c8f13e0918cf185dbddd3dc6f97e0c81118680294e9c4d74137378763b021a07d8ce0a1430e18c SHA512 019a08f2f03a270da7a33bf1b0e9bb42864b806990884b9f2c19110238ad5d5fd18bc896e9fa7cde130b4ccf3f7003db43f6b485caf5b021f5d5e36f279f9d36
diff --git a/x11-terms/xterm/xterm-373.ebuild b/x11-terms/xterm/xterm-373.ebuild
deleted file mode 100644
index efd8182bd33e..000000000000
--- a/x11-terms/xterm/xterm-373.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit desktop flag-o-matic toolchain-funcs
-
-DESCRIPTION="Terminal Emulator for X Windows"
-HOMEPAGE="https://invisible-island.net/xterm/"
-SRC_URI="ftp://ftp.invisible-island.net/${PN}/${P}.tgz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="+openpty sixel toolbar truetype unicode Xaw3d xinerama"
-
-DEPEND="
-	kernel_linux? ( sys-libs/libutempter )
-	media-libs/fontconfig:1.0
-	>=sys-libs/ncurses-5.7-r7:0=
-	x11-apps/xmessage
-	x11-libs/libICE
-	x11-libs/libX11
-	x11-libs/libXaw
-	x11-libs/libXft
-	x11-libs/libxkbfile
-	x11-libs/libXmu
-	x11-libs/libXrender
-	x11-libs/libXt
-	unicode? ( x11-apps/luit )
-	Xaw3d? ( x11-libs/libXaw3d )
-	xinerama? ( x11-libs/libXinerama )"
-RDEPEND="${DEPEND}
-	media-fonts/font-misc-misc
-	x11-apps/rgb"
-DEPEND+=" x11-base/xorg-proto"
-BDEPEND="virtual/pkgconfig"
-
-DOCS=( README{,.i18n} ctlseqs.txt )
-
-src_configure() {
-	DEFAULTS_DIR="${EPREFIX}"/usr/share/X11/app-defaults
-
-	# bug #454736
-	# Workaround for ncurses[tinfo] until upstream fixes their buildsystem using
-	# something sane like pkg-config or ncurses5-config and stops guessing libs
-	# Everything gets linked against ncurses anyways, so don't shout
-	append-libs $($(tc-getPKG_CONFIG) --libs ncurses)
-
-	local myeconfargs=(
-		--disable-full-tgetent
-		--disable-imake
-		--disable-setgid
-		--disable-setuid
-		--enable-256-color
-		--enable-broken-osc
-		--enable-broken-st
-		--enable-dabbrev
-		--enable-exec-xterm
-		--enable-i18n
-		--enable-load-vt-fonts
-		--enable-logging
-		--enable-screen-dumps
-		--enable-warnings
-		--enable-wide-chars
-		--libdir="${EPREFIX}"/etc
-		--with-app-defaults="${DEFAULTS_DIR}"
-		--with-utempter
-		--with-x
-		$(use_enable openpty)
-		$(use_enable sixel sixel-graphics)
-		$(use_enable toolbar)
-		$(use_enable truetype freetype)
-		$(use_enable unicode luit)
-		$(use_enable unicode mini-luit)
-		$(use_with Xaw3d)
-		$(use_with xinerama)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	docinto html
-	dodoc xterm.log.html
-	domenu *.desktop
-
-	# Fix permissions -- it grabs them from live system, and they can
-	# be suid or sgid like they were in pre-unix98 pty or pre-utempter days,
-	# respectively (#69510).
-	# (info from Thomas Dickey) - Donnie Berkholz <spyderous@gentoo.org>
-	fperms 0755 /usr/bin/xterm
-
-	# restore the navy blue
-	sed -i -e 's:blue2$:blue:' "${D}${DEFAULTS_DIR}"/XTerm-color || die
-}
diff --git a/x11-terms/xterm/xterm-374.ebuild b/x11-terms/xterm/xterm-375.ebuild
similarity index 100%
rename from x11-terms/xterm/xterm-374.ebuild
rename to x11-terms/xterm/xterm-375.ebuild
diff --git a/xfce-extra/Manifest.gz b/xfce-extra/Manifest.gz
index 5764a005dc1b..09d8171079fb 100644
Binary files a/xfce-extra/Manifest.gz and b/xfce-extra/Manifest.gz differ
diff --git a/xfce-extra/xfce4-screenshooter/Manifest b/xfce-extra/xfce4-screenshooter/Manifest
index b931857c1442..f5e83093554e 100644
--- a/xfce-extra/xfce4-screenshooter/Manifest
+++ b/xfce-extra/xfce4-screenshooter/Manifest
@@ -1,3 +1,3 @@
 DIST xfce4-screenshooter-1.9.11.tar.bz2 585007 BLAKE2B 2ffb2f4fb9bbba393b56d253919f999790a7d7fb8679fadd2365828d76b89fb736a2d7ff78556b75665936c197bb33363bc9e5c15bd94cb265d57d11b24f69da SHA512 fec4a374047dc0dddddd5d498f6ffb55bc590f209b31fa5e3ca5871788568145ad910fd535fced2f1d2eb52c52e219981eee3aba2e63ab1c56448bb313376155
-EBUILD xfce4-screenshooter-1.9.11.ebuild 1147 BLAKE2B f70a62328933e887792c2dbee3e196c0423e779c4705764f28c9a3dd7a28e4ccb3ffe9e6e569daf53e5060f8e1eb0c9a2822b7547a7354aa26d6d1e3ddc6bfda SHA512 1925fe784a5989bdc684150798d856a3beb75898896a122897ea4098f8503d8a296eb7a70d38b5f4f2c33e90cfdb671688de7d1b8106542c38e17499daeb9bb8
+EBUILD xfce4-screenshooter-1.9.11.ebuild 1154 BLAKE2B fd44e0a914f0fff4d931d4d2ac179e9da5474120898c448ee84d70a3cf45a7cacd1a08e3e4207393d7617d09f7abd1b55ad991b7ee4309ee081ae3552ae1e76e SHA512 33837041ba6300cb5e2dcddea84f091c89dfbae5d8ade6350e6e8e0a4ee69f5b2587a6a7398c669a9ff9d7e31840bd62899a2c170c879af8b0443938a0356895
 MISC metadata.xml 248 BLAKE2B 83bf47dc3dbedea8a88932e922075f0ba8fd841433c4ab750e2ab61c22e8cbfaa1acb04a903d89ef5140a75dfc4c4899354623e0160df5b7c178c190f8494515 SHA512 b5200cfe30adef8e869fada87f1b4171210b2427cd3ac12edef70948f305d5e612ca5f24d377f9823a6022c8867db635db50ddd3d6cb362d6b0137c299fe07e5
diff --git a/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.9.11.ebuild b/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.9.11.ebuild
index 3837e47082dd..4d79e3cc8d00 100644
--- a/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.9.11.ebuild
+++ b/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.9.11.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~ia64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~arm64 ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-libs/glib-2.16:=