gentoo auto-resync : 26:07:2022 - 20:59:46

author: V3n3RiX <venerix@koprulu.sector> 2022-07-26 20:59:46 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2022-07-26 20:59:46 +0100
commit: 1d4cc2fdaa7a04ed1fe39b6cf1d892bd83bd8030 (patch)
tree: 15bcf4c47e609ca1bd3dc164c91a9cfbe566dd3f
parent: 1503b28e7a30c164cab750c27268f704b8a5cec6 (diff)
323 files changed, 2922 insertions, 1158 deletions
diff --git a/Manifest b/Manifest
index 889625b4b990..e1fb29c2bec7 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29625 BLAKE2B 8b210e7e7d1d5168d1e7943defc359d1c8dbc75f05975ac483724a4eaef9a66f81fd8759625caa45c77fd0b91e5c65e33621bd4af2932c9fa8b7405543a7e9cf SHA512 0b5dcc8c64c2352530da43c7c6943d5f04e469abeb8a50053cf6d66974cfc152393349d75ca856ffba8a289a10f1f945871b7d02a6d7a1f09ac2c314df31bae0
-TIMESTAMP 2022-07-26T12:39:56Z
+MANIFEST Manifest.files.gz 29634 BLAKE2B a549cc7a5a1f56341ef12ffb456f58b02a87a2bae2a082204a42412e327ffe4a2308e4843752ff55ce4542a02e77d725eae5db59831f530ab4f9817f839d8a8e SHA512 ab4b3ce580de972cc4a8ce3d463c60e7a9918a4b809ac2b9663df58c8946f976b7b9615a06034f2ffc6651cd163589bc5f9d660eff3170ddf960ad5f62e594fd
+TIMESTAMP 2022-07-26T18:39:57Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLf4JxfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLgNP1fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAWhg//cruYSf9qw5eiRwFuSNxPIiWaBOL6fzXPTU/yoV52fr96AYLlUp7RYTa8
-CaeO+mRp/kSOZxFTmD4g5erC0r0u00ZFy4KUPlSpeCywS7Fquc2eUmgKmcdOfEbq
-MC8BYQfF6gEr/hxjuWIWisfs5Hv09akQyZRKv/PmY+k4Vw6mTy+smJRqMuRvEfxJ
-ieuktG1ApvDjwu/KzWUujD0YUfgwF9NYitG59cHuY5QCTLAXiRWPKjUvINu8mp8H
-Z7OO7rzX5QtFchDkfe51PoBXqjKZUgjir1SY569XhKlVgDrSGgi1Zvomq06j7y4+
-iWvkErO69JNo4xBHIDB/U2bf7X+s5WRbC+dh7BQC0oEkyXg/25bo/YSXMzCMvDmc
-DP6pzv7I2Q75wGYD9MgamIO7NJdWOMsh0ZmR9U5aQ5HLYAq7ssJwbqkZawjWmczc
-P+AorTNcim5wmNyoYQFFkjprgTdI34iWXAj+pdDT4yIGY0YOggE2X8JOPEYfm81J
-apUU8zdArPqZhbXMmBxfehaujlrMcMnP8MIw9IbguvTQCaugbAHvotVPX+PIJP4g
-xMM9ypsSlULvlJkpZHE4tY372VnlnHXGvC8d49Pe2/vgW1FzxY3jSd6vmJPy/qQU
-616ADdv7fKB5LPYyV5RjpWpXedcCY39am6QA/70teIEha/MDByM=
-=jL25
+klD8HQ/+N1PFYutFConGxWl/EmmwTADChjCKQMX/rgiCosnAzT/yFc1LZRGGnzv/
+bqPdyyQpxfubJwqU1iGr992psxD8P2ps149u73Wzk0sZSrtrsPwrsmpK2W1sOVb/
+L/yF1Sga0pQvdJu2GXnLLZoXodOr/JPxS3M7f5QtV2SJMUbN+HgUiCFYiAUZiHgY
+PVr9j/bwpr5/cz63VDfaood7JQ9vude9zsAncafDuWQLEzm4ud6TNJX2kKheFudu
+mX9Cr4AR9XIpW5/WaEubDOzUB7UvPTkUTg36Z/Uzl7a0H+/uGiS+ddff/gckpWtj
+LPpKFfMqGFjOiVXssg8foQldkFNNHYZjw1zCMwYGOsHTN/nufXqHKD2twqcPcnEm
+y/YvRmZSt1SMIKoy1pPxMrgdnaTJkpUwcqGo7uX3gqPuBfvSFElQlyip2OY6jBik
+Yj/p3ZkhJqBm8yLDiw4yPpzMU0pBK1jOT7T+TNHLHI9Gmyc1yS2iF8wV5Hdl+gog
+0mnad1i+mYD0qm44tHwGEv0GnRywrNwNiZwAkVt+vNt8EiAJCj/R6c8c+O1BO7+1
+VG41ZLCjGxan/uDMDXoQZly5n/9wl0Ndu1koh7Ir/yPZlR+JnApURFM691AAyrjJ
+TYK7HI481LNRnCTfXH/gcpevw4FSKT2oZzuxpVmqVupwdF6I98c=
+=M4Ru
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index de2a5b0dae84..c0f7a7857090 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-accessibility/Manifest.gz b/app-accessibility/Manifest.gz
index 91c22602d8fb..5ee0a5cc97ef 100644
--- a/app-accessibility/Manifest.gz
+++ b/app-accessibility/Manifest.gz
diff --git a/app-accessibility/speech-tools/Manifest b/app-accessibility/speech-tools/Manifest
index 243cbc341bab..70cd63852151 100644
--- a/app-accessibility/speech-tools/Manifest
+++ b/app-accessibility/speech-tools/Manifest
@@ -4,6 +4,6 @@ AUX speech-tools-2.5.0-fno-common.patch 1003 BLAKE2B 6b4dcdf205f2e986e659efda4d5
 AUX speech-tools-2.5.0-warnings.patch 1467 BLAKE2B ae91bce60190029ba2850c2649e3f7f116357b2c4f77f90a1ba3176ba43daf732d690e1e0e6ad2820db34417f4732d8c177e2fb25325d4994c29061739f2fc95 SHA512 16911fb73f43cdb9db7d426cc68549077bd53798dadd17965607853886284521f5bfa2632b6888e46eca3b3fe2e5bd27523304aa9305e2a410d5477f46e618d8
 DIST speech_tools-2.1-r3-patches.tar.gz 6876 BLAKE2B 84ddc30de90459f913cc32d4338097feb35dc08c48cbda7fc47a78ee0384668828d7166a5ebb1264272a6c326afd4ff2efdf1d793bb8f33937c09d2c7cd9a2b5 SHA512 db4d656a77e3fcfc43447c11b160cf9b45f0c4ec10f2697e4357f0ec86ea56e2841f1b887493a781406975003f5d8065ffbb75eeebb79fcd9873055b52c248e3
 DIST speech_tools-2.5.0-release.tar.gz 1328624 BLAKE2B 445dd5a5e39c02352a850fd92de5b3852ae382a4bd013dccb3fdd46b0b22ce0bd10d089f9e860ae3d3e73a489b20b7c8b78335e57a49e40ae01b0f4997d55315 SHA512 013540a5252efb57633f442143a51bc87aac719dfb46c8f47e750322d19dac9b504f55125462a2ee74a6b0bd2661a63a1fc73a8c3c6d2886e38b136a80447fd7
-EBUILD speech-tools-2.5.0-r1.ebuild 3877 BLAKE2B 783f5cdb99851f70bbea19833882edc87cd29c455bebdb308230c9600cc32baf0b147ab13720ecdd50dd9c7eb72cac041c355782b06b5e5cd2da20d6ce16d2cd SHA512 b647fd71f66f5bee381b948c3347b21d0638ec00ad7a6bb185be906225a9484a212dfbbc8831a86345396634f7ec04225ab0ec4e6342b60c10fe4bd23b185fc1
+EBUILD speech-tools-2.5.0-r1.ebuild 3875 BLAKE2B 278c5f95da89ad03121e07aa9b63ecd6c193967eb22d5aeca79a1f0a5131527273f454c8af8bd7fe9e1393ba93fb7f31f91db30e355b54447e6fa99b4367332a SHA512 11f6ef583aa98b0191ae20f19a051aaf62b237575da1c0c0c4ea643b6e5e5ce7ca1507b7c2f129bf986d889216f2e02a233494cc8593e6caa3069edb0def621d
 EBUILD speech-tools-2.5.0.ebuild 3772 BLAKE2B b7a494b2a9cf6e356271c8db84c52394657f9747f9eb84780928ffd5e5476ad66e839ffec8385dbd6a0f58a2a759f05a69bbe10e62ac4ddb10727189517c2ec0 SHA512 d6a809b62fbaaaf3b38e608c0274b516340d14c10f2092a2eb1d5ab7b0a450cfe9e7cf60786bd94ec0598545d024a41b7300e58f7fde78880d8be0f01591595c
 MISC metadata.xml 483 BLAKE2B b5318b0e97d1e7e19848eeae2b447037e940cda1ca1c7cc4204cbf9d95d52a5fce5430efe94f0d8e3066a974b78d1a8abdc72580b7678ae86e30577e9545f787 SHA512 e7d6f2ccbebfb2ae9bf41577a3b1d902c7d711d5887d9a4233f7c5d42a57915e1874f97676c61d79fb5ececa0e7244f58533c17f098c717712ac274d60c14ee7
diff --git a/app-accessibility/speech-tools/speech-tools-2.5.0-r1.ebuild b/app-accessibility/speech-tools/speech-tools-2.5.0-r1.ebuild
index 70fd1c72b861..5e3d29432faa 100644
--- a/app-accessibility/speech-tools/speech-tools-2.5.0-r1.ebuild
+++ b/app-accessibility/speech-tools/speech-tools-2.5.0-r1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/speech_tools"
 
 LICENSE="FESTIVAL HPND BSD rc regexp-UofT"
 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="nas openmp X"
 
 RDEPEND="
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index d22c8007ac6e..985d0b9e1a49 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index 06b6d988ffa5..84ed4ff87476 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -1,7 +1,9 @@
 DIST aws-cli-1.25.26.gh.tar.gz 2230449 BLAKE2B bb792fb2e4ba25870168e4fc3301d4b92d93d831301b0a46ec7dab1ac4b1bdeda9d43f9f6cf20de153f9df3d6b66b0d9ed9754ee4c27b79aacf9d9b8d7e11c2f SHA512 56f9d02d54d20624944c8749860d3e92e7c0887b1c6f524545394ad590ad5ab63752abf25ecba400cfcb9273bdecbae110e4811804e287f15bdfde0d8638adff
 DIST aws-cli-1.25.31.gh.tar.gz 2233721 BLAKE2B 791bd78851c5643ee72faddc8e4d4e39c94a91e4879d749bcf2cadbe4797cdd448a95dd2b3c626b76e648303ec93fc0338d08f79227f05ff467754810166731b SHA512 586f0fa0f81ec8acc0b79fba5372a37ebcf162981c8fbab31633f63736337cae0b4788bb7a4cdabf6e04800fb63ed6804a6a73a7d5552a9b4c85b4eb273ee6d8
 DIST aws-cli-1.25.36.gh.tar.gz 2237211 BLAKE2B fbab136a1c1211646c1213357cd80068da376e4aceb38007c14b2fb670a694b37aaa0157d58eb4edf10c3a9b5a700575a42b48c06db1c4034f39ccda584be19a SHA512 b66ba357085c82dcefc4ed9a6d0765d8768c8d216cd255056be055d3b5f604b62bace3eacccac83275d7c9487847f7de542efa804f8e0f454947cfe453d6e705
+DIST aws-cli-1.25.37.gh.tar.gz 2237143 BLAKE2B 3c51a5e56964fb8c4e5374892e185da7817f798a66fac2fd181acf068e1419bf4e8749590c9cbeb0d4344b82de4ecc44ce8b4eaf8b133895d60055783f1a6263 SHA512 533459e94db747fe4a6daad598b2b0d894202e60080505ad3d0864c54c8286c7d56d615cb1232cfadd1bd1181aede327d3fed3eca863dcfc92efb4867736b7fb
 EBUILD awscli-1.25.26.ebuild 1834 BLAKE2B 8dd7abd62571c499386dcc73967b693b028c094797cb10c43b7719b7ad2af01e683c056e9888e6ab6119204362dd2e61b6a465d3d115045130075d54c16295aa SHA512 84785cb46646fc3c97a504a712db51fc68d92739732fe696c1d5e198b99fc5665776629400cb99cb17fcebc47f6a426cc3678c827ebf28912854b8f9b5960906
 EBUILD awscli-1.25.31.ebuild 1836 BLAKE2B dae7d5415e625d711cf8b71492dfe80e2ffe77da7c538f4a7b04e2777c942973ad985fdb2f65a96511ce7486c3a4e78daed6110194672b19651191f7db2f484a SHA512 8454d269cfbca202e068c39704fdf48b9e21985e6ee1e825399620585707d315c867ef26f9726c2d8b8f55054980bd5f8e88ffaa0ed8cf45a4eedb5c410325d2
 EBUILD awscli-1.25.36.ebuild 1836 BLAKE2B dae7d5415e625d711cf8b71492dfe80e2ffe77da7c538f4a7b04e2777c942973ad985fdb2f65a96511ce7486c3a4e78daed6110194672b19651191f7db2f484a SHA512 8454d269cfbca202e068c39704fdf48b9e21985e6ee1e825399620585707d315c867ef26f9726c2d8b8f55054980bd5f8e88ffaa0ed8cf45a4eedb5c410325d2
+EBUILD awscli-1.25.37.ebuild 1836 BLAKE2B dae7d5415e625d711cf8b71492dfe80e2ffe77da7c538f4a7b04e2777c942973ad985fdb2f65a96511ce7486c3a4e78daed6110194672b19651191f7db2f484a SHA512 8454d269cfbca202e068c39704fdf48b9e21985e6ee1e825399620585707d315c867ef26f9726c2d8b8f55054980bd5f8e88ffaa0ed8cf45a4eedb5c410325d2
 MISC metadata.xml 334 BLAKE2B 84c9f50e6c0d015aad36a7f625cddf90cf1137a8c2d445cc641cd4890d64261187c10fde59ee1a6c19b98cfdb6ff534c66ae7a7a48a00ec62d6984c9a1891750 SHA512 a845de531df2cd75abf23cdbfa613e586855b95ac4e96566ef193708d7ecf2ec7f7db72fd31b8af0ac4ccd57e51da9c6d129d426bfdc6c4feb57d7df8647f160
diff --git a/app-admin/awscli/awscli-1.25.37.ebuild b/app-admin/awscli/awscli-1.25.37.ebuild
new file mode 100644
index 000000000000..9f176fa05cc8
--- /dev/null
+++ b/app-admin/awscli/awscli-1.25.37.ebuild
@@ -0,0 +1,72 @@
+# 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 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 ~x86"
+
+# botocore is x.(y+2).z
+BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)"
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	dev-python/colorama[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/rsa[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	!app-admin/awscli-bin
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-forked[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+	# strip overzealous upper bounds on requirements
+	sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# 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-containers/Manifest.gz b/app-containers/Manifest.gz
index 3d147776269b..47d07f09421b 100644
--- a/app-containers/Manifest.gz
+++ b/app-containers/Manifest.gz
diff --git a/app-containers/cosign/Manifest b/app-containers/cosign/Manifest
index 79b77f26aa3e..c461aec872bb 100644
--- a/app-containers/cosign/Manifest
+++ b/app-containers/cosign/Manifest
@@ -1,7 +1,10 @@
+DIST cosign-1.10.0-deps.tar.xz 393342088 BLAKE2B 527a143a1a81b86c8d2d2186c6e18111aa46a7cd908c77bf8f6cc7ebd53a4a8461168dacf46d97dc7e2a14d9e7fe1d7cc59cd81a4fd695177863ec5893577ba3 SHA512 9b764f7d642fd2b7ad3210d7b0fe16b1d5d24ea581266e4f43b0039cb63b1dfbac8fa6826d0359ac3a85575fb03562938ced72e6673fe9a5a4fe85601001adba
+DIST cosign-1.10.0.tar.gz 7140596 BLAKE2B 796ada75ce24ba8d2c7ad8702b9abeb82fd3ae75decac58c8e95f41bda7420056659cf76b4d79a1eaf3e3752c91ebb5da7bbb8bfbcfc0e99bea335ee7566183d SHA512 8ce41349737835945b0a5fe66d9b87b8747301c4e067db305ad7fc573bb8e86b2c6ae787944e01f8490a6db7aba72c33e285f098d0b7c710f1e54814a9cb2cdd
 DIST cosign-1.8.0-deps.tar.xz 541301856 BLAKE2B fb1fd9c2570f327876a5d151261f906951c57fdbaa6eefe1dcb84166f71ae381053f44a3d8a5707660cba066435aa6747aa5c47896b19b461954f6c824c33cd2 SHA512 b2773c1f07d32edc6a4ba02c487a3620eea141f29b425159eb2973ef32867afa7f334fdde2a23d00c84314a236b3bd513f1ea8faf231204a7fd9358ba0ba5234
 DIST cosign-1.8.0.tar.gz 7217748 BLAKE2B 2d9625609f86cad05770085617cd80335d62554e608f64abf96a3dcf5f0d4449b850d493ce2faff2593d0f996d2ace3f304d89ef99c7bfa2a2027a419ae6da1d SHA512 7d45e80ae5fa15fa7fe14bc5cd13a159356b58afc3baebac5d2c64fa38c74e73a3d17f75bed0730fe842da63de5487c54dfb9f77bbffa1f943281b74d3b30c94
 DIST cosign-1.9.0-deps.tar.xz 543778128 BLAKE2B 56f1e75c4199ae8bb33e71546709ebf621bab8123036f80e61624929e46d679353a211eb2da30197181f285033293c35f055977d762684bfc88d843deb06edc6 SHA512 07942be16e53e4325b3026b51557f352d45eee0d0b4cf84d823ebdd53573630c9e461f8dd6e93068dc20e6f25d589241a4e809839c7aa2aab65e3b7aebc2f3a3
 DIST cosign-1.9.0.tar.gz 7240352 BLAKE2B c6b9c617e288b6104d683a1b1ce8c22897e122a70429dd3db2a4643b91d4cf492c1fcd016ac4bcae32de51464aea538babbb04a8fe7d3b3275310adba528d945 SHA512 1a2a7b32aa0d4f2ad90113a3b5923390d29564d3ddc5e9c8539c8ad646541734164942e93d56321b9ff78910532911272a0e3ee007c2066e40656caac17d6c16
+EBUILD cosign-1.10.0.ebuild 608 BLAKE2B 82d6bcc2fcdb44150cb2bade0338fb578210a7b72165a1fc12e0e74b46a006a0cdd51875503768c99d0507231407d39f509c1269824a11b22f31e0872bb79bd3 SHA512 b6437ef76dae9ac0fbc1aa241a0fc4f6e3cddf1e7750b842ebfca265a13d75173099a705dbace009eea15e576bc02a6236d89d8891ee2763ed23cb07bc86b8d5
 EBUILD cosign-1.8.0.ebuild 608 BLAKE2B 464b5611d6dc9bc0027d14ed821c90527cdb6c7b739b1658d2c1eb4ffd515fa75471685f5b708772e39cbc20ecf77f77b66fc54ea02e735066a6fd34ece51247 SHA512 7d2404c8bd7d1d74e246592ed9bbe69af4c337c8dac09882eafaec32589ba9639f430b2b31381506e32f2775edce4a383ee78b40b28cbcc47712c14946436ed2
 EBUILD cosign-1.9.0.ebuild 608 BLAKE2B 9f4853c72225e3e4a87e6db4baf5324a08bff02e3ca3e3e8164a90d5f8b228d5b14eda18875b545295b2b8b347409a05b2017658e5303ab42fcedad886178a6f SHA512 1673577c5978614568be95eb6f7f002d1ee93229942731272482659b9af1cb0fef459e7d2356ee66bcd41d07240aeadcf31fe93e916476ff42f684c744760b80
 MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
diff --git a/app-containers/cosign/cosign-1.10.0.ebuild b/app-containers/cosign/cosign-1.10.0.ebuild
new file mode 100644
index 000000000000..194effdf1cd3
--- /dev/null
+++ b/app-containers/cosign/cosign-1.10.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GIT_HASH=3a6088d03d7c053f9b3bd61ed07fba92133579cf
+inherit go-module
+
+DESCRIPTION="container signing utility"
+HOMEPAGE="https://sigstore.dev"
+SRC_URI="https://github.com/sigstore/cosign/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RESTRICT="test"
+
+src_compile() {
+	emake \
+		GIT_HASH=${GIT_HASH} \
+		GIT_VERSION=v${PV} \
+		GIT_TREESTATE=clean
+}
+
+src_install() {
+	dobin cosign
+	einstalldocs
+}
diff --git a/app-eselect/Manifest.gz b/app-eselect/Manifest.gz
index 8139bf54477c..0b1dbf9ffe2c 100644
--- a/app-eselect/Manifest.gz
+++ b/app-eselect/Manifest.gz
diff --git a/app-eselect/eselect-java/Manifest b/app-eselect/eselect-java/Manifest
index a8f1a0e1d9d5..8a344e2080a8 100644
--- a/app-eselect/eselect-java/Manifest
+++ b/app-eselect/eselect-java/Manifest
@@ -1,5 +1,3 @@
-DIST eselect-java-0.4.3.tar.bz2 13799 BLAKE2B 353035ef1c0b3e1cd79021c9198bedf29fdcb3f13fdfb2e5a8384796f2a48236d671f07d7657409273dd1f52e37272d91383d2a14d64ed0cedb686a8e277b009 SHA512 40b10768f00f03c49e1b60aab615658ac1d986444aaf487ca74f7c14edb5dce62d85fc3ce049e857d0ec2eaea496afa17c45de59e7179331f112eb51cbe451e5
 DIST eselect-java-0.5.0.tar.bz2 14271 BLAKE2B dc285ad17b62043cc5085a586547a06a12c09f5a80f25dc423db9cb806baaa669a55106f605973fcae7103e35ec673ae2e3a6119730b1789e816a09079deabc8 SHA512 89724b96125911f0abc0363e0b2c9df75d0d52df1a5e16e80efa20a8de39b1bc0d411d297581b3440c944f498688e5dcffe5432f5e46836115d2eb620f31c03a
-EBUILD eselect-java-0.4.3.ebuild 1137 BLAKE2B 23e53bcd19631221f9afb67a326e54a5fa630f0cab37114c61d2d9c9535df88ccc3eadb70bb8b9d54cf7b5a1b9c965be5560d7610573aa4fc70ab7e062456a59 SHA512 4557a383fb8e3c1901324d53b18fe9a77d4fbb7a495d593d02a8c9d1ef5b62084e1ca417d648d262072ca9896e6a5eb70bc852356de27553d5144c2b4070d044
 EBUILD eselect-java-0.5.0.ebuild 1107 BLAKE2B b9ab924ce4dba555a6c7def2eb0805e3c6ce79359b9a6e0b9825690598e18a874deeb45c8d2deea1fefda0b89c7a59bc6ce9b56d7fce36fecae1b9a085af5c2f SHA512 33cf45c185a8172afaa7316c74570f1fe332e7b366739acab70a55254e01b10fb1fd0e0be158eae24f6bbee53c74a1a10881b5a73475992af40e6a9d48157917
 MISC metadata.xml 256 BLAKE2B 06034a9ec5059f1276335c4e4c5ec5203bccdecd555ff0c8c1d9d19db69f1540efc0c2265f4598fcd207d1b656a390c34908acd72600176a202d76ce64605270 SHA512 94123950f1f7bc7ec13f90d1c3f9f4c04deb2ac8997673683acf491733eb329a8b67658bd2fcfd11d2648823cbe4493ba14f0e549f711b477086d7ac98400e4e
diff --git a/app-eselect/eselect-java/eselect-java-0.4.3.ebuild b/app-eselect/eselect-java/eselect-java-0.4.3.ebuild
deleted file mode 100644
index 3f13e2ff4fe4..000000000000
--- a/app-eselect/eselect-java/eselect-java-0.4.3.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
-
-inherit autotools
-
-DESCRIPTION="A set of eselect modules for Java"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Java"
-SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="
-	!app-eselect/eselect-maven
-	app-admin/eselect"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-pkg_postinst() {
-	local REMOVED=0
-
-	rm -v "${EROOT}"/usr/lib*/nsbrowser/plugins/javaplugin.so 2>/dev/null && REMOVED=1
-	rm -v "${EROOT}"/etc/java-config-2/current-icedtea-web-vm 2>/dev/null && REMOVED=1
-
-	if [[ ${REMOVED} = 1 ]]; then
-		elog "The eselect java-nsplugin module has been removed and your configuration"
-		elog "has been cleaned up. From now on, you may only install either Oracle or"
-		elog "IcedTea's plugin but not both. Note you can use IcedTea's plugin with an"
-		elog "Oracle VM. See the README installed with icedtea-web for more details."
-	fi
-}
diff --git a/app-pda/Manifest.gz b/app-pda/Manifest.gz
index 951a7b8d7d3f..6dc62327ec7a 100644
--- a/app-pda/Manifest.gz
+++ b/app-pda/Manifest.gz
diff --git a/app-pda/ifuse/Manifest b/app-pda/ifuse/Manifest
index 12ed119110cf..e23cfa5e7850 100644
--- a/app-pda/ifuse/Manifest
+++ b/app-pda/ifuse/Manifest
@@ -1,5 +1,3 @@
-DIST ifuse-1.1.3.tar.bz2 90803 BLAKE2B fd47f2e73d11e8f7c26f5684f4287ba51a8c65b0d6e0ff058bdd0290810ab9de671a2a61a089713e7560506f607d47692d882c7e49d8d3d154f9cf7940e5e153 SHA512 bacf0b00ebc7681022f6e85daa005ee19c99f3222e5db5c4ea6630c2c46111dd3ccd7efcfdbcfabf06cc18ceb58b054c1adb2d106d9b3b7d60a12f3b79c64a3c
 DIST ifuse-1.1.4.tar.bz2 94137 BLAKE2B 0abe1a2324820380faf5868f59a45c11aab8991ff8529bd6f64a279b046da88a9cd35b352cd89b4a64d36f35c56b46efab5138f3b72ec8886103ffaaeeff50f1 SHA512 671fabb0828fb6dd5ddba80ef418005305f4ee4676ab1078513a83582e84616f47c8973c25e1fdd8897b08a01a135080898a55d3ad8b31e89c0bb72ee865cdff
-EBUILD ifuse-1.1.3-r1.ebuild 894 BLAKE2B a6633a4d83b6f856940252ff65352d134f68a8f44c6b2a3d4d22b77e74261a9fbae9c9532f68d52310952fde2d7032add3b9004a06d3ce2cc16116a47c0a9285 SHA512 e41469aeaae2509e224c28e47d81a6810398561454834eb9c94c88114d72a9459d5af0c2d5463f80d852fd8504d8f33fed8f20352321b3654d2fbf6ca5e686a8
 EBUILD ifuse-1.1.4.ebuild 985 BLAKE2B 1b4478bd492532d0c4e603d8dab4fb25aca275b7ece5538c854117da7077f570beb7b2286b3c3c15c5a3da096fc1343d9ce8ca2ae2e32d5250be317fba335167 SHA512 fa166e67c6a16357db0d9810fbceae9979b24448f284189ee0645db60f97a5fbad4367aa97564086d99b5fc5ca2c0e1719f924820659c1f640c7e310a913dd7a
 MISC metadata.xml 248 BLAKE2B 2a8d109f789d4f561986cfd5830c49c96b715e2fd50c0340e5c7ca385f72d09c0accf9102e1e1338e971400861d3baa95c083623231cbe96dc9e8163639dee25 SHA512 46a1388868fb5dcf5e3f85cbe8438d441c8a1ff291fcceb1cb4cf20a505e84e945c73967342eb7faadbaa51a7630977d9d447fe16505395fe7a05024e6242185
diff --git a/app-pda/ifuse/ifuse-1.1.3-r1.ebuild b/app-pda/ifuse/ifuse-1.1.3-r1.ebuild
deleted file mode 100644
index 39a2c3689e14..000000000000
--- a/app-pda/ifuse/ifuse-1.1.3-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit readme.gentoo-r1
-
-DESCRIPTION="Mount Apple iPhone/iPod Touch file systems for backup purposes"
-HOMEPAGE="http://www.libimobiledevice.org/"
-SRC_URI="http://www.libimobiledevice.org/downloads/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=app-pda/libimobiledevice-1.1.4:=
-	>=app-pda/libplist-1.8:=
-	sys-fs/fuse:0="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOC_CONTENTS="Only use this filesystem driver to create backups of your data.
-The music database is hashed, and attempting to add files will cause the
-iPod/iPhone to consider your database unauthorised.
-It will respond by wiping all media files, requiring a restore through iTunes."
-
-src_install() {
-	default
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index abc3c80344dd..a60c1d543408 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/docbook-sgml-utils/Manifest b/app-text/docbook-sgml-utils/Manifest
index 5fb24ebdee51..12220c86883a 100644
--- a/app-text/docbook-sgml-utils/Manifest
+++ b/app-text/docbook-sgml-utils/Manifest
@@ -3,5 +3,5 @@ AUX docbook-utils-0.6.14-elinks.patch 239 BLAKE2B 3f2b99e9afe33849af50428053cd05
 AUX docbook-utils-0.6.14-prefix.patch 2810 BLAKE2B 1dcb7b40cabc930f96d2caa3c541dba42c7ab380a08cbaf6bf87b9c84dbb13f976c7f1dc05883c308b789c5295fd5ec97c2ef2aa8cf5046c9f302e3d8c873fe8 SHA512 c0fcd0575b031c9dba6ca42cac7e46bfeb687279006b69ba931dbbd546234309f9667e9a6bdd355bd518d8346589a68e1c453b36239fcb158899693819c41f70
 DIST docbook-utils-0.6.14.tar.gz 124998 BLAKE2B c0ae31adbbbf78732362638bdc73638cd67205b4ce2b2ac4e740334fd230c8cb031e5ba3ee9e34110c48ea42115f2f5f4dab4b4b6dd45d963976d2b48d7836a2 SHA512 8052316a643b5eaa6c0373a9ed7f2406e7c3cb3da9d3c955a271c89813a8f3196fcd9e6c8385c7b6b7ecb916515e3ec7897aece4473989f0e4dc52a2bc8bbfdf
 EBUILD docbook-sgml-utils-0.6.14-r4.ebuild 1825 BLAKE2B 663ce29c6c25416b5a0a405f4a20059c1b565a218684a4ae7c0a0e2f3ee4ea842c080527aafa0c4a62e14bd825f6d07f47602e3585e4a08709f863778cf6ec99 SHA512 a0ecbc59c6355206064cee0253b4cba479555af7fc13c24c1622a14095a1314cf80ccc7e72aebd79a4ce6e2ded63031e4f0e61fbb15759ebb1d5e3a6b52afbde
-EBUILD docbook-sgml-utils-0.6.14-r5.ebuild 1842 BLAKE2B f0683b2942bd5817f434a42b2ed63fe4a32a1f2873e13464d0c345b6af84d0e67c991e14d3b81d65148dc008083c9bed2e0c45de7a281266f8a18cfa7fed828a SHA512 b9da49d8e35e803f0d9f7bbe98699255f3d11a771be7fe11435b38c9b29acae3e36363d4ba11eb9359b93d7f39594058fceacf6a1ab249ec2282c78bfbc120ab
+EBUILD docbook-sgml-utils-0.6.14-r5.ebuild 1840 BLAKE2B 2fe20be602e3020968924711af1a0cc95abfba8b4e97ad87ee01e4dbdc4c727f857d6037c819ca4a9e17786a8f1ff3835d1c22293944eb42040b8abbd93c9602 SHA512 5051bb6dd4563b12b9458cb4daee3129b45b5f9bca4c655d29cbcfd496c85878e74143cc5074c82b5980ac9c3bc22e4bf5f3471909d514f98bdf0f6ae5a8548a
 MISC metadata.xml 376 BLAKE2B 41601b1cfab5c502384fe8f8d13e1404d91434eb58573a527d6999d82c26761bce727f42e467f6336c41220d1dc4446b4ff020f3fa66b7ff1c968bf3f688717b SHA512 750848b4e8edd39b3032e4c10f0c3bcb1d5e2251c2faab08cea9effd19ae67263d956dfae37677770fc1a6cce434b3d89b209f78fc164ed48b3fb86968eda59f
diff --git a/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r5.ebuild b/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r5.ebuild
index 9ca02f2f13de..2336c59e11eb 100644
--- a/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r5.ebuild
+++ b/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r5.ebuild
@@ -13,7 +13,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="jadetex"
 
 DEPEND=">=dev-lang/perl-5
diff --git a/app-text/iso-codes/Manifest b/app-text/iso-codes/Manifest
index 78634a529ef2..8138b3b5fea9 100644
--- a/app-text/iso-codes/Manifest
+++ b/app-text/iso-codes/Manifest
@@ -1,3 +1,5 @@
 DIST iso-codes-v4.10.0.tar.gz 14624397 BLAKE2B a797db4cad381ae92bdeebf2b771059b5033a763dd1dc4ec85ac9eb81448482b20fc2c7293605816ad59ca6f5559221c72e22b6c0cd2c167af77b4f40dece4e3 SHA512 f77568fd803c32d8f28fc123c64c3122859f51c4c8f2f9cc4dc857e51d6fd6d1dfa42a4531f699b1f4b4b89adecb541a56e2cce0aac81ebf83f9c063dd79c86e
+DIST iso-codes-v4.11.0.tar.gz 14756251 BLAKE2B dd3bc5bae4def6338527a9c7c41f0ef9603eb2a2a7e4e2a95399bc4891a0d66fa323bb1f960263662cd6b4a42902defede64ad732f4a894d3073a7a68b5b9f80 SHA512 524be572c2505b0b2d55a7a0dd8d6bdff68edbc89c569652b11070cc6412881c98ea66a001193f1540153d44d6b41d921444a1d1a2bde6929bbe445eb369ea3e
 EBUILD iso-codes-4.10.0.ebuild 2644 BLAKE2B 553b3e2e087900b73225a27feeb22671704ee8c193982c74b3e81a1e14e3aad7753531a9f28cd7228cb122939b3ea5d12e6266099ccea85961a54e6ed883d731 SHA512 6abffc569b59f98750c220af0666c1a2b27cd533ce687f0205307c3a946cddb3d7fad8a1f9e3e4a1e2573d055b0800b2e8b0375e4f99a094aa82024a7b175705
+EBUILD iso-codes-4.11.0.ebuild 2651 BLAKE2B 1314ac207eeab5f0f6c67ccb0074a78925c428d657626555f3bbdd65e861c0733a1df8ff7391598d467f162a1aeacdc30c575cf3d28a8392a0207e43cbbc3534 SHA512 7cf9f0bf8969fb95ae55c426a7c708fbf6d61045e9961be22bcffa88fe0c7e38add46824e9487655b5ae3e97cd9f4f141ef4a9bf08193838e0836effd1ea4906
 MISC metadata.xml 481 BLAKE2B e19ee7de8b2de3aa09f97bb7eb4247ba2979614d768c0dd92a8cc131269e46a560baa1c0ea8fcceb49073efb1b890cd54d939c16ac7412413983a19083f05337 SHA512 f1e20f870fabd59d97ca612c3db3443a6a1544de3b03f12fe0c9c44a1740b06bf38c394b489738e60b22fa0797379d24c0ec8371efa067873910ba39fe30f194
diff --git a/app-text/iso-codes/iso-codes-4.11.0.ebuild b/app-text/iso-codes/iso-codes-4.11.0.ebuild
new file mode 100644
index 000000000000..b27a4c748d97
--- /dev/null
+++ b/app-text/iso-codes/iso-codes-4.11.0.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+PLOCALES="ab ace ach af ak am an ar as ast ay az ba bar be bg bi bn bn_BD bn_IN br bs byn ca ce ch chr ckb crh cs csb cv cy da de dv dz ee el en eo es et eu fa ff fi fil fo fr frp fur fy ga gez gl gn gu gv ha haw he hi hr ht hu hy ia id io is it iu ja jam ka kab ki kk kl km kmr kn ko kok kv kw ky lo lt lv mai mhr mi mk ml mn mo mr ms mt my na nah nb nb_NO ne nl nn nso nv oc or pa pap pi pl ps pt pt_BR ro ru rw sc sd si sk sl so son sq sr sr@latin sv sw ta te tg th ti tig tk tl tr tt tt@iqtelif tzm ug uk ur uz ve vi wa wal wo xh yo zh_CN zh_HK zh_Hans zh_Hant zh_TW zu"
+
+inherit python-any-r1
+
+DESCRIPTION="ISO language, territory, currency, script codes and their translations"
+HOMEPAGE="https://salsa.debian.org/iso-codes-team/iso-codes"
+SRC_URI="https://salsa.debian.org/${PN}-team/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+
+BDEPEND="${PYTHON_DEPS}
+	sys-devel/gettext
+"
+S="${WORKDIR}/${PN}-v${PV}"
+
+# This ebuild does not install any binaries.
+RESTRICT="binchecks strip"
+
+DOCS=( CHANGELOG.md README.md )
+
+# plocale_find_changes doesn't support multiple directories,
+# so need to do the update scan ourselves.
+check_existing_locales() {
+	local std loc all_locales=()
+
+	ebegin "Looking for new locales"
+	for std in "${all_stds[@]}"; do
+		pushd "${std}" >/dev/null || die
+		for loc in *.po; do
+			all_locales+=( "${loc%.po}" )
+		done
+		popd >/dev/null
+	done
+
+	all_locales=$(echo $(printf '%s\n' "${all_locales[@]}" | LC_COLLATE=C sort -u))
+	if [[ ${PLOCALES} != "${all_locales}" ]]; then
+		eend 1
+		eerror "There are changes in locales! This ebuild should be updated to:"
+		eerror "PLOCALES=\"${all_locales}\""
+		die "Update PLOCALES in the ebuild"
+	else
+		eend 0
+	fi
+}
+
+src_prepare() {
+	default
+
+	local std loc mylinguas
+	local all_stds=( iso_15924 iso_3166-{1,2,3} iso_4217 iso_639-{2,3,5} )
+
+	check_existing_locales
+
+	# Modify the Makefiles so they only install requested locales.
+	for std in "${all_stds[@]}"; do
+		einfo "Preparing ${std} ..."
+		pushd "${std}" >/dev/null || die
+		mylinguas=()
+		for loc in *.po; do
+			if has ${loc%.po} ${LINGUAS-${loc%.po}}; then
+				mylinguas+=( "${loc}" )
+			fi
+		done
+
+		sed \
+			-e "/^pofiles =/s:=.*:= ${mylinguas[*]}:" \
+			-e "/^mofiles =/s:=.*:= ${mylinguas[*]/%.po/.mo}:" \
+			-i Makefile.am Makefile.in || die "sed in ${std} folder failed"
+		popd >/dev/null
+	done
+}
diff --git a/app-text/xpdf/Manifest b/app-text/xpdf/Manifest
index d21584f6261e..9e69f43deace 100644
--- a/app-text/xpdf/Manifest
+++ b/app-text/xpdf/Manifest
@@ -2,7 +2,6 @@ AUX xpdf-automagic.patch 924 BLAKE2B df4d7a245d8f710568d455660b29a81fd4d4dcfb21f
 AUX xpdf-shared-libs.patch 2286 BLAKE2B 63d668f5ab910ede26c85ec8fb379baa39112c0056ab61d3d8192447d76a5d455a3d3eb43ac1f0f3e275ed38d8cfaa56ed45432cf2f0d22a5eeaa63fa8e794e6 SHA512 560bf773fea8aed81678710aebb5733c8134ea7c088a761e20726c8758a98219c977a32437bd6f425271ed7c76a2742705074e11db108cb4bf71c0530b10276c
 AUX xpdf-visibility.patch 414 BLAKE2B 835bdfdbb39297859d1886a5ebd76bec23a8b8df744f627a475d8c00ae3cdcfe219ec039f00b7b6a7305e6c451399c422fafdea0599bf22d2ef34bd4912eae4c SHA512 a1f87523aeb657484181005b3e40a90eaaee2d00452bfc50bc23913d6e1e5a9117600959b3800e789be50f6d12d726f875caf02b73ec41dc9d98e1215b2e964e
 AUX xpdf.desktop 3300 BLAKE2B 9e7ce7533fc7f44fce84475c7c95265633d158311c69dcc5b2d2a63cb8b0cb8fe324f46a461627362eabec275129557ac12a97e3c01d374f0189a8b71973ebee SHA512 ef7cdfa09fa18e7dd3a126a07fcf246ac766adad3d67fbdf5a1aa0edd76f4b533ea6a2016a7d53208b0d18e84a143aaa0e40c0c625c78276499c1bfbad144775
-DIST xpdf-4.03.tar.gz 936046 BLAKE2B bd0198ec6be627edce6386f0d93b0921906b2c5f79b3eb02f89719e64cbe3ca3b2df53db8aecc6df3581eb022ca0d4c209a880760e5bbb3eb46b40b106d6d144 SHA512 5f8478c2c4863a3c50f9b45a6fec73c7e67a74adbeaa651dd2e29982ea4cf050740874ee670672f985a323c12c28c968c16238c4238aeb52810a45e2728d622f
 DIST xpdf-4.04.tar.gz 969535 BLAKE2B 981f791c098b4632dd65ad581c0284beb730ebe1935dbe942882aa63fb23920eb241334e946ba9be07b5bc1b0c73effcccb2c8b2c95182a06d35a745862926a8 SHA512 a26b67a4b3d5a5a365153845bf72d77949e683ce26aaf4705b49194cb32bbc581617c3e9c37f74bf6c49480df06d49e8c38d41233966b6215eacf92591d4d9bf
 DIST xpdf-4.04.tar.gz.sig 801 BLAKE2B 2f2b5c6a70ae007165afd3ec78c2fe168a380f6960176cc6c655a235aa83c1f7e608c5fd82cbce0b0877a92e3dea76950db450b96527eb14813ddcab2125a3ab SHA512 4c2740cf6a659e896584339a1238089465a548547c829f047d0313e46f6e3bba6c404ff37df7baf2f5d0c317d6ec954167f31bb1501a65e638b2617c6730d925
 DIST xpdf-arabic.tar.gz 1057 BLAKE2B 5889fa5704a805b152886043ee32082d5e60044fb96f91d429661f823d1ea9c929dcae22460421a7c26a7aae43d5926263fa2a1ea4c07e0e130e67f2fb0b6fab SHA512 1ddaee045c0c3576bda0ebf065021e66e1ac6673d6872aff8e8afb3bae33dd927d920d89761553bade040d20e4b60eb286131bdb2f2d75ec1e833b9a9ce58d3e
@@ -16,6 +15,5 @@ DIST xpdf-korean-20201222.tar.gz 809664 BLAKE2B 3c3a4397f25ae74ed8bd68d0736144b9
 DIST xpdf-latin2.tar.gz 1431 BLAKE2B db8c823c4e90643b9d08c9a4106f479470236a00115d2dc6f3a71da4bc9b5e33561da5ac5dce81cbf5fc943a65572f3595601f6e9f31a3fba9bc0d35f28e0016 SHA512 5fe0b60bfac7f0f4a26e3e7216de5043f6b94446f464c984b7c25431ec01a5912952c0dc66bb2c7159c9f63e4805689c6cfc761086aad9e59f1f21d0cddb5d15
 DIST xpdf-thai.tar.gz 1878 BLAKE2B dbcc2aa2652c40c2220688767a58cadcfbe39310d6c2664b98392a03b00de6d558fa3f333a085e7c6ff3476b6ffcd98fcc228eeb8dd59e905f870c8a39143ac9 SHA512 5584b590e34da29285c379e3b7a7243c28241ec6fddb3e4a8e2e7bf88b8f7aaae3483061d12c332a1ff042ec5e2b31869a67d60512ac48f7903c5e2fc871aa87
 DIST xpdf-turkish.tar.gz 1137 BLAKE2B f735e9842361a5a73fabe40aa4e9cb552475d3751df3e885c5a1a68e0de8ca7b5a031e6332495f70abdc1e943fa615f09185e9ba22922f37f02e42f59ddfc57c SHA512 a73e90bce8f2a12154b06ef29333a45d96258c0d653d5cb15afd2e5ad9e79a9b617e5f8ebeb20bde545684d50f3bc1349800c99f70c863bdd502c24c266b4fb1
-EBUILD xpdf-4.03.ebuild 3637 BLAKE2B c2ff73425db4cd26b2b8b4cc655a074341384e11ff2784a390ef6a4e7e4b38c09f8c5db72c84f60978edca8cf7ea3196230ff77d4a9747ac5db71ae9ff2c738a SHA512 36c8c9ddadca31aa673135c9cf361d9889a2e81a00b3377c5150982919b05dac439cca40d23a9f898bb0317dc5ecb69153abf7330dead28f3cd867734a8f204f
-EBUILD xpdf-4.04.ebuild 3822 BLAKE2B 8a4c097e1874e6f3b158a63ff3b23265a7c0269a6a0d409e50c461b251332f512fbede817ae87f8bd4b192e9c91c8cff99bd81f759ffe15e2410e964dee974f4 SHA512 c438b5c3de349f0f4b7bc2dc5c0674e73777ef639e293f01258002f7377429b58db46440b07094372ceda53e43802f71237f2f4a0c160c12795b6f189c0a063a
+EBUILD xpdf-4.04.ebuild 3939 BLAKE2B 1c0d9dab0a6d42bee4dd2f24694cd8238aab3c3c833ae35725a4920bb7ea67cfefe0f9c44dc72625b879fc3f6371f269edee0be56d30892e1ba26f7ee764c0c6 SHA512 baa126049cd56569ed0b1fb5d8da8c651edeba64aa4c805460d7a52b585c649350b79b6b1e62d94d899bed50313e9d02c77f1c91e5ecfea270949414f3102031
 MISC metadata.xml 993 BLAKE2B 14996cd8a901c0cee2ff357b6d7e0ba523cef08d39997b4e3266b9f07e75e31fcbbee940d25eb318bcfc7144781d490a8604a9c57d8dd883ce08f51323139099 SHA512 b0245e750f66aeb07c9a35ad8bcc2d6fa01debf62870104b87ba824c79350dc4dbb620d8d4a535c774709f49b47d2808baeb9ddb88d209e48e3cfd6309fd8628
diff --git a/app-text/xpdf/xpdf-4.03.ebuild b/app-text/xpdf/xpdf-4.03.ebuild
deleted file mode 100644
index c9761c8e26b8..000000000000
--- a/app-text/xpdf/xpdf-4.03.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake desktop xdg
-
-DESCRIPTION="The PDF viewer and tools"
-HOMEPAGE="https://www.xpdfreader.com"
-SRC_URI="https://dl.xpdfreader.com/${P}.tar.gz
-	i18n? (
-		https://dl.xpdfreader.com/xpdf-arabic.tar.gz
-		https://dl.xpdfreader.com/xpdf-chinese-simplified.tar.gz -> xpdf-chinese-simplified-20201222.tar.gz
-		https://dl.xpdfreader.com/xpdf-chinese-traditional.tar.gz -> xpdf-chinese-traditional-20201222.tar.gz
-		https://dl.xpdfreader.com/xpdf-cyrillic.tar.gz
-		https://dl.xpdfreader.com/xpdf-greek.tar.gz
-		https://dl.xpdfreader.com/xpdf-hebrew.tar.gz
-		https://dl.xpdfreader.com/xpdf-japanese.tar.gz -> xpdf-japanese-20201222.tar.gz
-		https://dl.xpdfreader.com/xpdf-korean.tar.gz -> xpdf-korean-20201222.tar.gz
-		https://dl.xpdfreader.com/xpdf-latin2.tar.gz
-		https://dl.xpdfreader.com/xpdf-thai.tar.gz
-		https://dl.xpdfreader.com/xpdf-turkish.tar.gz
-	)"
-
-LICENSE="|| ( GPL-2 GPL-3 ) i18n? ( BSD )"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="cmyk cups +fontconfig i18n icons +libpaper metric opi png +textselect utils"
-
-BDEPEND="
-	icons? ( gnome-base/librsvg )
-"
-DEPEND="
-	cups? (
-		dev-qt/qtprintsupport:5[cups]
-		net-print/cups
-	)
-	fontconfig? ( media-libs/fontconfig )
-	libpaper? ( app-text/libpaper )
-	utils? ( png? ( media-libs/libpng:0 ) )
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	media-libs/freetype
-	sys-libs/zlib
-"
-RDEPEND="${DEPEND}
-	dev-qt/qtsvg:5
-	media-fonts/urw-fonts
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-automagic.patch
-	"${FILESDIR}"/${PN}-visibility.patch
-	"${FILESDIR}"/${PN}-shared-libs.patch
-)
-
-DOCS=( ANNOUNCE CHANGES README )
-
-src_prepare() {
-	sed -i \
-		"s|/usr/local/etc|${EPREFIX}/etc|;
-		 s|/usr/local|${EPREFIX}/usr|" \
-		doc/sample-xpdfrc || die
-
-	if use i18n; then
-		sed -i "s|/usr/local|${EPREFIX}/usr|" "${WORKDIR}"/*/add-to-xpdfrc || die
-	fi
-
-	xdg_environment_reset
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DA4_PAPER=$(usex metric)
-		-DNO_FONTCONFIG=$(usex fontconfig off on)
-		-DNO_TEXT_SELECT=$(usex textselect off on)
-		-DOPI_SUPPORT=$(usex opi)
-		-DSPLASH_CMYK=$(usex cmyk)
-		-DWITH_LIBPAPER=$(usex libpaper)
-		-DWITH_LIBPNG=$(usex png)
-		-DXPDFWIDGET_PRINTING=$(usex cups)
-		-DSYSTEM_XPDFRC="${EPREFIX}/etc/xpdfrc"
-	)
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-
-	if use icons; then
-		sizes="16 22 24 32 36 48 64 72 96 128 192 256 512"
-		cd xpdf-qt
-		mkdir $sizes
-		local i
-		for i in $sizes; do
-			rsvg-convert xpdf-icon.svg -w $i -h $i -o $i/xpdf.png
-		done
-	fi
-}
-
-src_install() {
-	cmake_src_install
-
-	domenu "${FILESDIR}/xpdf.desktop"
-	newicon -s scalable xpdf-qt/xpdf-icon.svg xpdf.svg
-	if use icons; then
-		local i
-		for i in $sizes; do
-			doicon -s $i xpdf-qt/$i/xpdf.png
-		done
-		unset sizes
-	fi
-
-	insinto /etc
-	newins doc/sample-xpdfrc xpdfrc
-
-	local d i
-	if use utils; then
-		for d in "bin" "share/man/man1"; do
-			pushd "${ED}/usr/${d}" || die
-			for i in pdf*; do
-				mv "${i}" "x${i}" || die
-			done
-			popd || die
-		done
-
-		einfo "PDF utilities were renamed from pdf* to xpdf* to avoid file collisions"
-		einfo "with other packages"
-	else
-		rm -rf "${ED}"/usr/bin/pdf* \
-			   "${ED}"/usr/share/man/man1/pdf* \
-			   "${ED}"/usr/$(get_libdir) || die
-	fi
-
-	if use i18n; then
-		for i in arabic chinese-simplified chinese-traditional cyrillic greek \
-				 hebrew japanese korean latin2 thai turkish; do
-			insinto "/usr/share/xpdf/${i}"
-			doins -r $(find -O3 "${WORKDIR}/xpdf-${i}" -maxdepth 1 -mindepth 1 \
-				! -name README ! -name add-to-xpdfrc || die)
-
-			cat "${WORKDIR}/xpdf-${i}/add-to-xpdfrc" >> "${ED}/etc/xpdfrc" || die
-		done
-	fi
-}
diff --git a/app-text/xpdf/xpdf-4.04.ebuild b/app-text/xpdf/xpdf-4.04.ebuild
index f5fa12f939ab..682bfe8d9f78 100644
--- a/app-text/xpdf/xpdf-4.04.ebuild
+++ b/app-text/xpdf/xpdf-4.04.ebuild
@@ -59,6 +59,13 @@ PATCHES=(
 
 DOCS=( ANNOUNCE CHANGES README )
 
+src_unpack() {
+	if use verify-sig; then
+		verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.sig}
+	fi
+	default
+}
+
 src_prepare() {
 	sed -i \
 		"s|/usr/local/etc|${EPREFIX}/etc|;
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index 5559c817ed62..87dd1b99b4b4 100644
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
diff --git a/dev-cpp/json11/Manifest b/dev-cpp/json11/Manifest
index 46138b57cece..433e89ba0b77 100644
--- a/dev-cpp/json11/Manifest
+++ b/dev-cpp/json11/Manifest
@@ -1,4 +1,4 @@
 AUX json11-1.0.0-fix-multiarch-install.patch 786 BLAKE2B 5362fce55049ed95f0de5467a53c54bd3e0b82c91fcbefe1d6b8d35629a1d968527157720a19c478690d787a1baac634d4b927424d6e4c27abdc89427fe46b7f SHA512 0ef4a3ff19d2ffbf7772b83782ada2fcd2e3baacdd32d6a74931b035166041b7471800fbb01801dbe9b5b1cc003128dbb406a736da1f016c4cb1980ec11a9902
 DIST json11-1.0.0.tar.gz 13104 BLAKE2B 9f4fef741b40f1d163dd96555a521b6220c47402624baa5446fb94592989a830a0c511162a6af64b76962c8b07b83a324845dc61c1ca91bbb99e2b0511fb962a SHA512 c49aa9ebc75199528a13cd255d9362acb797d73a17fd69fb22673e945b8719a3d70fdf2d886fed342ca13ed1b4ea578534520d87c46c4a418929f9124aee3ec3
-EBUILD json11-1.0.0.ebuild 405 BLAKE2B f8ad7ab79fb78587e7e07274ad35f24e6a0acf2223c220fd8ea8f93bfec8735d4334a0f9af7b98a557730b097a53b66d5991e88cccf018de83799db177e4dc94 SHA512 e68ac3ec7beb420c39d03f5a9153019a1e714d4051f767889f186e1ad496aff731955368dba6705d2fc6d7569dcd6a8b9a19111744a60f56de1a15af7304c532
+EBUILD json11-1.0.0.ebuild 410 BLAKE2B f62afb0b6253c472ea3d7b35448267a6dec8da133f6eb69d3a7a887906e2f617c97dd0893f0ef71a1981e707a3c009f8648905425122245a47b7312d5406afe2 SHA512 0059d42200bf7745c9767d580479ec951a4a529f4fb964587fa6af36f46f2051afdd8e5fe421900120a5bb74df82b945b27da15c074dc2e53ae47b095dc82369
 MISC metadata.xml 247 BLAKE2B f18c471812d5b8c75f2e05c4fb556108fb93554b59ee61a8215803f2654854a7401fcd62964192c228bfebfb52ae4573cfd24b29a944630c8c733d154d2b0d9a SHA512 cea16f7db3110bd4629b9265d5acdec6d70877330664f8e83f726002eb69aec7f822e9cde9c7da900451cdef60f1ceba373dfe73c73f82173bbf1d2f9f7338b7
diff --git a/dev-cpp/json11/json11-1.0.0.ebuild b/dev-cpp/json11/json11-1.0.0.ebuild
index f19252f78fb7..3a4518df699f 100644
--- a/dev-cpp/json11/json11-1.0.0.ebuild
+++ b/dev-cpp/json11/json11-1.0.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/dropbox/json11/archive/refs/tags/v${PV}.tar.gz -> ${
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64"
+KEYWORDS="amd64 ~x86"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-fix-multiarch-install.patch
diff --git a/dev-embedded/Manifest.gz b/dev-embedded/Manifest.gz
index 8749227a3a10..40cccb7c7313 100644
--- a/dev-embedded/Manifest.gz
+++ b/dev-embedded/Manifest.gz
diff --git a/dev-embedded/esptool/Manifest b/dev-embedded/esptool/Manifest
index a70bbf835772..0d77beaa9e0a 100644
--- a/dev-embedded/esptool/Manifest
+++ b/dev-embedded/esptool/Manifest
@@ -3,5 +3,5 @@ DIST esptool-3.3.1.tar.gz 7261340 BLAKE2B c6ee391dcbc331d9f931bfd969333fc3bfc562
 DIST esptool-4.1.tar.gz 7275429 BLAKE2B d89e0d2b90a9005deea71ba14328c5616062d0ada82c309fa4ad4f4c3861e0683b99e70328d6ae60f0fc0e788e25d6b0a4e39596c1c6cfac0e779840ec796f18 SHA512 b9df8d361fe1a97f0649fed03abc919df1c2ff118dc4dd05abeec641ba2d16e6c308894bd91657768e03a6801ec9e5393e573b4c3016b624e842fef7c6354b41
 EBUILD esptool-3.2.ebuild 1421 BLAKE2B c15f2a10e98031acaa71f54eb0346a3d060924f518607f5645bd3b32006d1ac4d15844023f9b78d16cd150b2bc7561c0951ca3a8a2002cdc887fde012843e5b5 SHA512 1f0e339a7e0f9a5b6c5978b46ec38974463ec3b6bc40b00c4be82ddda44b7c7d647f207c722283bdebcb435a7f7effb3bc1fbbc766f9bfe2e65316bbf69992b3
 EBUILD esptool-3.3.1.ebuild 1414 BLAKE2B 8651f22883c4ec4f05e9f8d72a2405852f0b338a4107522f393c6964c14f45d4625aef0c0cad85d2933f9d51e623c9aa09eebf8e14b860775309ab2b6f3825e8 SHA512 37dd050eeef999bfeeb6334c403f125a01311426fbc16b3e3a82238176e36bf4bbab85264ca68e8745a195bd8821eac005657799cefa32c2fbaeb3ad298927d3
-EBUILD esptool-4.1.ebuild 2187 BLAKE2B 709260cbe82ebf278365e516be28612e19ce2a068053cdce16012fc7f94b2a2aaf758c27ef2a23a28a7b235e239ecb03f6312348e6b4da9a6c32ad3ae96ca165 SHA512 79bcd828b00a8286cf9f674f32cef6771692ba7c4eb91ef9837923a0394c01a0f393454ad96aa787a2d364a3dc1c69a4f60d67c7f1b37376c786839cc78c7c13
+EBUILD esptool-4.1.ebuild 2183 BLAKE2B c052290996012845cafd45b2353798914143d7c8faf7b06c62a8a984035a97251c040cc955dfdf04f2e3b6ace68301a863060a799cdc0c21f09e49e0a3568f49 SHA512 4abf5bb5621834758e14e4d8329ec2a0aafe0f17122663e4995d3db2fc5904de2b9bdf56659782e19fc16a41c4016cc4d038764db91f4285f83f52c222f813e3
 MISC metadata.xml 504 BLAKE2B 578f33b9dc0f1748ecd37c355efd7f4acb041c192e44b89ad926c482c2a1d422080a0ed3c74311895b9f1ef996315965a79adc31b86437b3ea63bae321dd6294 SHA512 e8ed1644714bc0878d2d955f9d90bd6e0ca9fa183186ff160adaaaa46573fc696e49783c793f225a32b47b23da9f5df4d77d5fd59d7a52fc6386ec59f892cb83
diff --git a/dev-embedded/esptool/esptool-4.1.ebuild b/dev-embedded/esptool/esptool-4.1.ebuild
index a0694e75b119..16c7d1459d52 100644
--- a/dev-embedded/esptool/esptool-4.1.ebuild
+++ b/dev-embedded/esptool/esptool-4.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/espressif/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
@@ -48,7 +48,7 @@ python_test() {
 }
 
 pkg_postinst() {
-	if ver_test "${REPLACING_VERSIONS}" -lt 4; then
+	if ver_test ${REPLACING_VERSIONS} -lt 4; then
 		ewarn "${P} - new 4.x release with breaking changes:"
 		ewarn "  - Public API has been defined by limiting access to internals that have been refactored into multiple source files"
 		ewarn "  - If active security features are detected, the default behavior changes to prevent unintentional bricking"
diff --git a/dev-games/Manifest.gz b/dev-games/Manifest.gz
index 5784302eeed6..7eb7766aabbe 100644
--- a/dev-games/Manifest.gz
+++ b/dev-games/Manifest.gz
diff --git a/dev-games/aseprite/Manifest b/dev-games/aseprite/Manifest
index d11413fc30b4..4121cfaeec7a 100644
--- a/dev-games/aseprite/Manifest
+++ b/dev-games/aseprite/Manifest
@@ -9,5 +9,5 @@ DIST Aseprite-v1.1.9-Source.zip 11746265 BLAKE2B fa16be059a7bb3b83705c56e7e93cbb
 DIST Aseprite-v1.2.35-Source.zip 61972632 BLAKE2B f9e24d04a19756f65041cb9c96a4142fe5078a4f6d8b48f69e79501822ff8a5070f350cf9016e5500fec5aeb82d4d8eb2c8d8b42a73fd8bc73aecab185d002fe SHA512 2577a683516adc9c601300da15e9099d6fa698fec32f4b62ce95c46412c1dd26b0538cc23996e0a1060ac4a4de47c2538124c4a01ade375f3b4efcbc99fbbdc8
 DIST skia-m102-3338e90707323d2cd3a150276acb9f39933deee2.gh.tar.gz 53944562 BLAKE2B 9da3e8386cd7a18a6ee9362743bee4146c41038af8868a6f5e8a2dce468e4dc4669b488861d117da8d1bd8461b2ad47bfc300774a33a84153bca345d63a929a7 SHA512 9ae0032ee3861ce4958af6eb7047273d28b1faa3823576ef568e3c7faed7f49a9976540a72c3fa38234a4ae6319ac381324eff807938f9763781fd33ad67d075
 EBUILD aseprite-1.1.9.ebuild 2751 BLAKE2B 6c5780619c95e893e181291c0fbce2f826f8ac6ba2cc559fd33c1461432e2498461f02496031b0ffc50bd974dc64ae47301c4546d600c823d809a7f162c74e64 SHA512 4178e2fb7f9c8b6b267cae0bc83d9887718057c99c4f6dd9acf7c2f41f484e463e75df78a60fbd7f8699de5ae2ee221e476148bf2bb5e93e7c064b66f6b1ac2e
-EBUILD aseprite-1.2.35.ebuild 4948 BLAKE2B d98e5dfee3f7ff05976afd380f36f44faeb546bb08bb232df6d2761f7a72d3f5594aacfc031501c70f86ea35e25a06b8726962c099e95e1914a48de9b20f63a4 SHA512 668f7431d22782a2eaecaa4c85ecb6d2f4de093f8e65ae6ae25d410247ae2d1b74211722e105b5fd4b43cb66cd28c8327063cf6a74f98d6460f8d4aa277d5fae
+EBUILD aseprite-1.2.35.ebuild 4953 BLAKE2B 486a36e9842834b2459fa6c01d17746662aa8c12bbd14ec1fa93492b98abce1dc74826ba4493a08aef4319f8fe7f34590aa29833eadc355efbccb43554e7e2a3 SHA512 0c2714d682069e7f1c47b1a080316f7428069fdce440c4b1a8df15084787d44711489a969e510c4812527d994273a5a89de25a9cdae8e07b701c3470e1d747df
 MISC metadata.xml 684 BLAKE2B a1ad6d72f940738634ce874c50abaadaee4f897a1a694170da97d4403a9fa69383934fff7392c1417b9b954c3c98a4f138a9da1921e01171a8ebf1ab91d9f256 SHA512 a4d1efc2228d170e868d8328d64a8195fec01807ca4a4424e44f55354d57ab1949c827dbadf6b8a2037979fa684cb6445d95feb37a61b4d3ac637620699f9a77
diff --git a/dev-games/aseprite/aseprite-1.2.35.ebuild b/dev-games/aseprite/aseprite-1.2.35.ebuild
index 5e6b00b68a0c..701559c4ea4b 100644
--- a/dev-games/aseprite/aseprite-1.2.35.ebuild
+++ b/dev-games/aseprite/aseprite-1.2.35.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/aseprite/aseprite/releases/download/v${PV}/Aseprite-
 # See https://github.com/aseprite/aseprite#license
 LICENSE="Aseprite-EULA"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 
 IUSE="kde test webp"
 RESTRICT="bindist mirror !test? ( test )"
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index f23a6ddb2daa..75683e457db1 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
index a0f4e7a30bfe..55cbc79ac6bb 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -2,6 +2,7 @@ AUX 2.5-build-r1.xml 3084 BLAKE2B 6eb6025444ad6b2af035217bc7c1410a1238e25eaafdfd
 AUX jsp-api-2.0-manifest 474 BLAKE2B 51ae750bf0caa563387eb51f0fb1be53c693c7cb0d1e0b8193fa80d70a776c0cf24b2eee585cf77292bc2112b60075414a4d05ebe16dc26eb3c2976a44420774 SHA512 f2e21cee74fd1c3f1403eb3e26c1c7a59be420bc25da842af0cfae851fcf4bb22575b147feb2ffd3a52410e0e552bafb4414b9f8ef5f9a0f4df1d061f2c6be41
 AUX servlet-api-2.4-manifest 310 BLAKE2B 8400197ebfe43615dbea9ac8fad2b85f89abe9e8414cbc1ce835f09ccc2921e3aa50bffc3d3c38364bd61d38f14e979219f93125c3b61403ebecebd16226fa56 SHA512 bb16a0fd2d277d2b7990294bfc730def285d6e390c8ab3166d8ffb08e9d9c62c9f462893fdd9eb84cfa93685262a8800622acdbf0fd9a7f2ffb5709f0387f9ca
 DIST apache-tomcat-10.0.22-src.tar.gz 6115322 BLAKE2B 6a9d2e6896fa266b4d75627f85ffa4f132c3cf30db24a331ef2d279e4c618aa817981a963c54148cbcd01af0d502ecf2c4c0f4debdb301f202ea748ea2572a66 SHA512 2d26828a1c44876feb4746186090866784f2a136d8120eb3dc106af7cc4cb95e94c6cbb51a3d4a14ea7159cd3351f4bd475153864e43d7e192296b5382c93a83
+DIST apache-tomcat-10.0.23-src.tar.gz 6136614 BLAKE2B 4eaf963187b9a754ed459d7f85e6f7d329927b949bb4a390a602cdc6651aa037aeec559c511ddb9880b6ec4d7cd97b96d82da341509370e412e1b21b799d8c2e SHA512 19ec026bae75318e9ffbe2e619ad2e12ec116382ea88a1064696275afb3fd13e6f08efe497dde79689bfc828f76e27d114ad3a9284b79c8d956a6a85bdac6360
 DIST apache-tomcat-4.1.40-src.tar.gz 3709719 BLAKE2B f7ca82052c1148a5c384fcbc3871beeddccdb4cfed05ba176581ebb50f52ba867bed8dbc500e97b7348a3a87b9693fb73eb81209df4f31e8c1ced7e30a6af30b SHA512 c455fa3da9da8fcbf1d54ae5dce808f8a4520ccafd627a6b2d1b003c37e8395d8b2a55d5471bf6c196549d082715862b3b8958aef88613293a07fc0160aa5c6e
 DIST apache-tomcat-5.5.36-src.tar.gz 3743113 BLAKE2B dbfcfd123a23b0ceb9f1fdd936e42324ea8b10cf327a1d0abf1703006535859c7122690a08b5ec27b86b526cc7709a7199b4f35f123538ff11f23f3b489358f3 SHA512 845636b5b992fbbb7d657d192afbab1e6a924bfd0c71b025cf22776eb4527d92d63f9b3f33475d4349a0df4cebd984ba3776eedd7482b820abdea909e90a97b7
 DIST apache-tomcat-6.0.53-src.tar.gz 3522914 BLAKE2B 054b097c16861abaa8bdbeba713b49bc1dfcff573bb3f4bd0ff5807c33a2a0fb991af618f6e11e5b3ce3fa55c589fc6569342cab5d5a00349c79bc7061d81e40 SHA512 915a0a18f5c2883625c9441eed6465973eff4f6bf41e08e925c7edaea89ef8f6ee9476d3e06fa38228d4bcb4decaf53e3a7bdb7ec7e899e6250db3e12a9f5f2c
@@ -10,6 +11,7 @@ DIST apache-tomcat-8.5.81-src.tar.gz 5988747 BLAKE2B 569e1564cf6f5419aaa0d66a249
 DIST apache-tomcat-9.0.64-src.tar.gz 6174208 BLAKE2B 3ec55872dc73279202faae10b4825ca8cd4f5d2763c43778445b2f1aee27ed1cd765e7345276735359e3a40779eaf2ef8f9120eaca8d38af07cbbcd0584078b4 SHA512 7e01a979d41f7d73204b7a7ae5a85b0094626bf64bcfa3a52f1fc46989369d504b6dd49718084ee0a10af775cab488aae1e18ce05eb2b527800e2a693c7b6386
 DIST apache-tomcat-9.0.65-src.tar.gz 6195265 BLAKE2B 13ca956b58e9f1831700f67d1fa8883f6471ab6b700b2af169bf284552658a4e9ad4130451b36976af4dd366cc987e228e0b0f98e688cccf577c626dfc78aae7 SHA512 3ff344370cc36f5bed389ed198054783a4f5bc86476a751cda280618457a06bae38c1e764b0c110c2f68efe2d34243a4e24596e8b90e8fbd171bf584a22fd3bc
 EBUILD tomcat-servlet-api-10.0.22.ebuild 3021 BLAKE2B 5a7b1fc041750ed25e2b2ebd91a46d422b8b84455814a95f0ecc4b13634e8df876a1cc95e4f6318380392feb80f8a748bfe21898e18169ddb05eea7a0f086c2f SHA512 da77418b28127f4d7e05f691f835e7eb01a59e2f33daf15ecc2f76ccbc1f136e7b446d14104d9cbc62f9d251f926dc698e8051b877c61f4adbce45c51b21822a
+EBUILD tomcat-servlet-api-10.0.23.ebuild 3025 BLAKE2B 2198be652150c8c8d0cb4c7dab9beca30094e184e1812038df79b193a8c3c148d076fe8164a9d0b746b667dfbe9b261da266513573352229980b3481faf4fb56 SHA512 5ea6ad3fba96aef3ff05897fb1a13f58b7b106a6b9a8dc265851747719592dda261fa6b7fca1640c1dc1b3aa4e4e75b5ba8e22d4a2797a66f8b708bdfb5ed32b
 EBUILD tomcat-servlet-api-4.1.40.ebuild 1007 BLAKE2B 47367c64fb51f41908e0d04234e09306c56ed593120c5daa3ddd18e583d1ec3c1fa77b620613aa9b79dcd87e5a7b631cbe5c33443ae00380abfed671c93cd7d5 SHA512 c126e35ef153353c5cb5127ad7c6b46230a6ae0b70b873ce323e7906680becad7f99844792500281e4532e45ddb050e0f40079daea05ba514d733458aec4a715
 EBUILD tomcat-servlet-api-5.5.36.ebuild 1417 BLAKE2B 698cf8076448e7478124561d802e96cdb2d431778dced5de495f7ed2c665ff079300b37e658b3cad133c99bda92505eaf8add6c3e582d00ccdad61ebc4097c80 SHA512 7a571e537319eee86a34070e5e8e2baa722238fff2a57bea51a9e9ca746ec43ef07c7864a7235ef3ab33560b111c8d4971b8e4848f1e54f2719ed162857a7437
 EBUILD tomcat-servlet-api-6.0.53-r1.ebuild 961 BLAKE2B 66d34a80d320dd032acd712b2549a23f359648d8df6f69399be2c821eb55426fd9cdaa284aa3d474bf26a3cbed649d0e46ccf0a2334f8430e0927d35a72d8dbf SHA512 0ad484e1c808864d96daec646c5a14857f87ae097388f02631687a199c12888581edf24ff2e992a3b48ed0d4f5f5e954960673519705f4885004a46bd47dca78
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.23.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.23.ebuild
new file mode 100644
index 000000000000..acb0d6c5fcea
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.23.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="source"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_A="apache-${PN}-${PV}-src"
+MY_P="${MY_A/-servlet-api/}"
+DESCRIPTION="Tomcat's Servlet API 5.0/JSP API 3.0/EL API 4.0 implementation"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/tomcat/tomcat-10/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="5.0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+
+S="${WORKDIR}/${MY_P}/"
+
+JAVA_TEST_SRC_DIR="src/test"
+
+SERVLET_API_JAR="servlet-api.jar"
+SERVLET_API_SRC="src/main/servlet-api"
+SERVLET_API_RESOURCES="src/resources/servlet-api"
+EL_API_JAR="el-api.jar"
+EL_API_SRC="src/main/el-api"
+EL_API_RESOURCES="src/resources/el-api"
+JSP_API_JAR="jsp-api.jar"
+JSP_API_SRC="src/main/jsp-api"
+JSP_API_RESOURCES="src/resources/jsp-api"
+
+src_prepare() {
+	default
+
+	# The sources and also resources are mixed together so we first give it a structure to make it easier to compile and package
+	mkdir -p ${SERVLET_API_SRC} ${SERVLET_API_RESOURCES} \
+		${EL_API_SRC} ${EL_API_RESOURCES} \
+		${JSP_API_SRC}/jakarta/servlet ${JSP_API_RESOURCES} \
+		${JAVA_TEST_SRC_DIR} || die "Failed to create source directory"
+
+	pushd java || die "Failed to cd to java dir"
+
+	cp --parents -R jakarta/servlet "${S}/${SERVLET_API_SRC}/" || die "Failed to copy servlet-api sources"
+	mv "${S}/${SERVLET_API_SRC}/jakarta/servlet/jsp" "${S}/${JSP_API_SRC}/jakarta/servlet" || die "Failed to copy jsp-api sources"
+	cp --parents -R jakarta/el "${S}/${EL_API_SRC}/" || die "Failed to copy el-api sources"
+
+	popd
+
+	for file in $(find src -type f | grep -vE "\.java$"); do
+		target_dir=$(dirname $file | sed "s%src/main/%src/resources/%g")
+		mkdir -p ${target_dir} || die "Failed to create resource directory"
+		mv $file ${target_dir} || die "Failed to move resource file"
+	done
+
+	mv test/jakarta ${JAVA_TEST_SRC_DIR} || die "Failed to copy test sources"
+
+	java-pkg-2_src_prepare
+}
+
+src_compile() {
+	JAVA_SRC_DIR="${SERVLET_API_SRC}"
+	JAVA_RESOURCE_DIRS="${SERVLET_API_RESOURCES}"
+	JAVA_JAR_FILENAME="${SERVLET_API_JAR}"
+	java-pkg-simple_src_compile
+	rm -fr target || die "Failed to remove compiled files"
+
+	JAVA_SRC_DIR="${EL_API_SRC}"
+	JAVA_RESOURCE_DIRS="${EL_API_RESOURCES}"
+	JAVA_JAR_FILENAME="${EL_API_JAR}"
+	java-pkg-simple_src_compile
+	rm -fr target || die "Failed to remove compiled files"
+
+	JAVA_SRC_DIR="${JSP_API_SRC}"
+	JAVA_RESOURCE_DIRS="${JSP_API_RESOURCES}"
+	JAVA_JAR_FILENAME="${JSP_API_JAR}"
+	JAVA_GENTOO_CLASSPATH_EXTRA="servlet-api.jar:el-api.jar"
+	java-pkg-simple_src_compile
+}
+
+src_install() {
+	JAVA_SRC_DIR="${SERVLET_API_SRC}"
+	JAVA_JAR_FILENAME="${SERVLET_API_JAR}"
+	java-pkg-simple_src_install
+
+	JAVA_SRC_DIR="${EL_API_SRC}"
+	JAVA_JAR_FILENAME="${EL_API_JAR}"
+	java-pkg-simple_src_install
+
+	JAVA_SRC_DIR="${JSP_API_SRC}"
+	JAVA_JAR_FILENAME="${JSP_API_JAR}"
+	java-pkg-simple_src_install
+}
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 649f293711cc..9e847bb84517 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index fd69e6b84092..a1718b6119aa 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -6,6 +6,8 @@ DIST Python-3.10.5.tar.xz 19361320 BLAKE2B 7f3629f8a16faeb0311947b7d5162bc45d9ed
 DIST Python-3.10.5.tar.xz.asc 833 BLAKE2B 36da2d557a5c38cfc473b2138412f9bc011d19c8538475e623bf41d81eb2c8f8e977945a3065a48c5b234d2b2c7d0dd5e83112c948591628cec344651dc9055c SHA512 72d0ab09900e2a10b85ccac804efd5536251152798e7347576e0e28bff4ab4a84b08d646329b225f9949047586686f9f4e7f05652526657a0948951b739c14e0
 DIST Python-3.11.0b4.tar.xz 19573532 BLAKE2B d28b85c4af39ea8c8b1448857698a7018c9d115f0f861ff1649101e4c9d3ebbea14e1f5da8158b1734bf8743d96ed3683a8192e07ff06c0ccd964ec7ddee3832 SHA512 1530f4dcba6325ac8e9bb955604fc504a4306e3291b667d1d8490b78e1c50924d81ff8ab50d08c736e70d3e42788aabaa162179a77c03860ee8064f17f93bb09
 DIST Python-3.11.0b4.tar.xz.asc 833 BLAKE2B eaedd106d3599c7ee6974ff9eee33899b119fdb45ab5b760f5f02e51e12ba58b3161f6853464a32638385fd596ddd350097c28dde55e3efeacc6719f16275d84 SHA512 8f6c633911755767d351fc86e031df6cedd6091ca5ec0ef55331ac65d2ad532c71e568c173513a2bbb2235e5e3fc9dd77e1b7ed230df1f0d8bd6e23da470b1e2
+DIST Python-3.11.0b5.tar.xz 19792136 BLAKE2B 574ed58b2d063b954931c39c1154e776f5d233fe6e3f0803e5a93b68f48aacef1d9df60a2839df952b631d8988d6c44fee073dae5486420b808866944a3025d5 SHA512 b1013e449c9a0e9b61df5a266b5f05458d284b3524c6c44d44d8a5007bcb95ff754f21296cd695f353111575c7cce71f8a2808a9adf8c573512bf97f691d2200
+DIST Python-3.11.0b5.tar.xz.asc 833 BLAKE2B 80594608751a141a6e5ded035c4de1a73716d72442228fa2dfcffc10d1ccb9928b864591fad4b5fb3a55e20629a22ad92fcc4a40d8e294858a85088b26d545af SHA512 6f658c7623e7750c0c8c18b4a2fe86d6a2414f3b411487ca4d2dd9840165ae3e6eea8b3468b1376862181b7b58d3fe99681a00d290172a6986f0f2ead5d6c3bd
 DIST Python-3.8.13.tar.xz 19023016 BLAKE2B d3cb8624496e56d93d34f2aa5082746869a99210197529bc19e6a9d265f4ce246e0e83a3528a7602a28aac8855bf84e6bf6495b85e9202fcf04ef90600cb5e43 SHA512 5c732b5d21b189b99a0e9ccd3ae59466bed60a930d5d3f437a262d38f0797b776cecbf12a1852eaebcfb638a6f2e28e471cc2ebf94237cc728144be21842cb81
 DIST Python-3.8.13.tar.xz.asc 833 BLAKE2B 918894777e1a783f2a7c7958a808610631cb7a6039df84675158e8d2fd66782f29921d44ab9b4625c4ca3821852e0d0e0005163b086c7d0c3d617e3a76cb7033 SHA512 6683c4ae6cf20a97a29165f96b9f5dd09d618892583650d803aa677240695968dfe344294fc33db68fd4669c82021afcc29a1f6afe49915be51fae281eeeedbe
 DIST Python-3.9.13.tar.xz 19754368 BLAKE2B 4f583f66c28b791e19cd6d79695fe9eb815fd333542be22aec8bd73d1f4d3f17f2c4e9de198e7b16c1ca6362a613a8a02fb965c7dc7db3e510fd31de15ba2d19 SHA512 e9664e7f908092df11236b22465d217531d6f0378e88d889108d19fe77f28f46ffb629b8733f84b41409e255367321893a2b1bd64518930d9d8cae5d1b774d23
@@ -13,11 +15,13 @@ DIST Python-3.9.13.tar.xz.asc 833 BLAKE2B db01c01be9d56cd15f9ab4a9e2cfa800faf4eb
 DIST python-gentoo-patches-2.7.18_p15.tar.xz 34956 BLAKE2B d173f276dd9c0ce31004dcc55a0d18e9ce25a47683c2df3c4dd62e967dfbbb35be59a2f08cf20f30a19475a8a2344dd95b17400eafa88b5fdbe9270a12ccbf32 SHA512 d9386808265f978808e5c0ffd384cefe54fb0e05aeccfd394167d5227d9cd66e25c8e93c54914762b2cfc3c2dd851b26a7a84d62634c6aa8a0798aacbb7ac25f
 DIST python-gentoo-patches-3.10.5.tar.xz 8584 BLAKE2B d4a812a33e485b1eae5629e519dca4dc6625b743b07c7f7bbc62562f345d87723ba499893702310b1e96e443d2946e27a8d4971f32ca1125d4827d0d594ccaa6 SHA512 77f0478f7d0491e103857a83a97d6e04a9ec68740a7f9357cbbdd316462e7d98ea8236bd05a30e7556457ece5fbcfa4a7a78a25d4eb12779455ce2bb5b6f30d0
 DIST python-gentoo-patches-3.11.0b4.tar.xz 4388 BLAKE2B 16b112f1ecdce86022ed64d7c7007fb323b7bd4497b5802a48bb0a86667c282d1a9150d744f44cefbe9321af4916d35941707c1259a0cf175c0161c8e1b17e97 SHA512 f9c8c7180da20e839a0862571b9077b2702dbee8a1acd55ebb11329912cf9f81862ba615be484b92d39461c3eb6c38890f8d58bcbce2c4722418a967faedc1f5
+DIST python-gentoo-patches-3.11.0b5.tar.xz 4384 BLAKE2B b036e9103f8315d6e2bb6e85a2db12ec60f8e05ccff083183f24c0b4ba16c807a2eb1fa43b88f8d7a253d5bbeef0880b31d60e13b449f7de992156319753ef33 SHA512 af6315f97b0f2463d6c0f18a99a5ff5f96c3d18567ae0d73461f0fc82ca2173a8f6c3fedc2fada2b9460547a457d4264bc2acb90f1906599229afe85bcc2afde
 DIST python-gentoo-patches-3.8.13_p2.tar.xz 18816 BLAKE2B 8612ca33e5569319c5d1a5a3fb1a81e860bd515bfde656b79f087ccf7020923fbd06b315178bef8630e4c36bb22c27299fe439aadc6a161f1ec93be8778314ee SHA512 be5668a0a4be0a03e61466436973125a3be4f33a61524e4a5c8d86745727cfcae59e5048477887c9f6bfc09727f3aef3652ad47a13a6bf0f1452d3172f1c34dc
 DIST python-gentoo-patches-3.9.13.tar.xz 12836 BLAKE2B ba687a3d6e00baf4d9640ab78a29c3e21bf1872b5019198991521cf37bb0780f592db742ee4fdfe6bfb1cab1c1f6587889dfdb024cae72766b6c83c2ffe319be SHA512 e393992ff92625771c6ffeb500637862f0163c689c685fd245a6e5bbdd3128154ce439ecab56eaf1359e67ea0d173dfb19f65a4098ea2266922bfb43aba517dc
 EBUILD python-2.7.18_p15.ebuild 9827 BLAKE2B 77ebeacfa236e518ec0c0a791e0da60f8158d369e870c88ce69d1eef25cdc99e658903abf313452b849254e97b4c9f583e0edb75ec845faf5b47fb2fc3173ce4 SHA512 19219cd43391d8d53838c9b0e15b30f8ccb5d5a23503a213cc961ff2fa545cd17a5ecc6ce253e2a01534db3bc931be212969c40885c2e99f203c23a5ecb689a1
 EBUILD python-3.10.5.ebuild 11701 BLAKE2B e83015ffd3bdcbceab4271ed82f6ee54d8b79494458a51ff46221ecfd1f39319fd00ad4d27471c73ef2fab3a3468b587138f9dd3d431ebf8192f31789c9d58f0 SHA512 fe2a00f53699a0ea809d891b66e0c1973402e8a504dc45bb67f57d1549b3809c2f894cb27264d8d8f35071c5fc967cb43c6250382e2627ec4197635d7f91a023
 EBUILD python-3.11.0_beta4-r2.ebuild 13637 BLAKE2B 230701d089c7e42f80b0666a1ac6c5d48ff6fe8a5b7822ee3d4cd41adfe6e50143ecde143e228416f97cc0886910b22bc0fbb83ffad3ad19006aebcc382516fc SHA512 ec7a302106654abefb0672e25e1f189506d35111be4a983ae5b51281bd195a452fe1fb7170b77f8048c880563664f8b9b3624c434594a4f3b36306a203e299e9
+EBUILD python-3.11.0_beta5.ebuild 13637 BLAKE2B 230701d089c7e42f80b0666a1ac6c5d48ff6fe8a5b7822ee3d4cd41adfe6e50143ecde143e228416f97cc0886910b22bc0fbb83ffad3ad19006aebcc382516fc SHA512 ec7a302106654abefb0672e25e1f189506d35111be4a983ae5b51281bd195a452fe1fb7170b77f8048c880563664f8b9b3624c434594a4f3b36306a203e299e9
 EBUILD python-3.8.13_p2.ebuild 10219 BLAKE2B c736d7417d2f7c8f8a6ee61182e1b2b9e22873343594a3779c83fc1af03103ae71f440f856d7dae7a661dc7190e70afa7c478dd7d8531d28637897c1ebd4106f SHA512 89f482e716b308565f41c4c6ce1db32f9a4023a41570070ddad4ac9d156f802d79f8ad7d2971b9ed02487482c50d8e4de64d212df092dd907d2c94838e6af921
 EBUILD python-3.9.13.ebuild 11462 BLAKE2B cfa217f58ee03528ce5dd467daa9023c67f89d4673def5a183eb7a0c2db6fe40527a78067803f7edcdcf32eef5dc72179b9be9d9a04f5766258945a4a16e3991 SHA512 4a7fbd6f6e7ae1fc1726a170879e26a6f7e74fe4fc2b52efacf5608350bd967ee52d63df4fb8d52aebe881bc003285e29d55fca5aedf74182cdb5f8b120ca8c4
 MISC metadata.xml 740 BLAKE2B 31abd8d03440517adf39f29f36e87f821dbf029602f40d4b252b1ec8e6a52955ad9325fe66a9a3bd2e9c4436e6c6865853f75c3169016c7a44327a06b07694df SHA512 b601a773d5fe4e29d43e9ce5d857bb525b706b95745056a74a2476a37f182075363cb44814f9d6f73b8be08a63d75ec322b608463796c6eef7aa8d636a2350b8
diff --git a/dev-lang/python/python-3.11.0_beta5.ebuild b/dev-lang/python/python-3.11.0_beta5.ebuild
new file mode 100644
index 000000000000..aab4bbbdc169
--- /dev/null
+++ b/dev-lang/python/python-3.11.0_beta5.ebuild
@@ -0,0 +1,475 @@
+# 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 \
+	python-utils-r1 toolchain-funcs verify-sig
+
+MY_PV=${PV/_beta/b}
+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 examples gdbm hardened libedit lto +ncurses pgo +readline +sqlite +ssl test tk wininst"
+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
+	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 )
+	!sys-devel/gcc[libffi(-)]
+"
+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, libffi and zlib are not used.
+	rm -fr Modules/expat || die
+	rm -fr Modules/_ctypes/libffi* || die
+	rm -fr Modules/zlib || die
+
+	local PATCHES=(
+		"${WORKDIR}/${PATCHSET}"
+	)
+
+	default
+
+	# https://bugs.gentoo.org/850151
+	sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" setup.py || die
+
+	# force correct number of jobs
+	# https://bugs.gentoo.org/737660
+	local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")
+	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
+	use bluetooth || export ac_cv_header_bluetooth_bluetooth_h=no
+
+	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.
+	use ncurses && append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw
+
+	local dbmliborder
+	if use gdbm; then
+		dbmliborder+="${dbmliborder:+:}gdbm"
+	fi
+
+	if use pgo; then
+		local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")
+		export PROFILE_TASK="-m test -j${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)
+		PROFILE_TASK+=" -x test_socket -x test_asyncio -x test_httpservers -x test_logging -x test_multiprocessing_fork -x test_xmlrpc"
+
+		if has_version "app-arch/rpm" ; then
+			# Avoid sandbox failure (attempts to write to /var/lib/rpm)
+			PROFILE_TASK+=" -x test_distutils"
+		fi
+	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
+
+		$(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
+
+	# Skip failing tests.
+	local skipped_tests="gdb"
+
+	if use sparc ; then
+		# bug #788022
+		skipped_tests+=" multiprocessing_fork"
+		skipped_tests+=" multiprocessing_forkserver"
+	fi
+
+	for test in ${skipped_tests}; do
+		mv "${S}"/Lib/test/test_${test}.py "${T}"
+	done
+
+	# Expects to find skipped tests and fails
+	mv "${S}"/Lib/test/test_tools/test_freeze.py "${T}" || die
+
+	# bug 660358
+	local -x COLUMNS=80
+	local -x PYTHONDONTWRITEBYTECODE=
+	# workaround https://bugs.gentoo.org/775416
+	addwrite /usr/lib/python3.11/site-packages
+
+	local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")
+
+	emake test EXTRATESTOPTS="-u-network -j${jobs}" \
+		CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
+	local result=$?
+
+	for test in ${skipped_tests}; do
+		mv "${T}/test_${test}.py" "${S}"/Lib/test
+	done
+
+	mv "${T}"/test_freeze.py "${S}"/Lib/test/test_tools/test_freeze.py || die
+
+	elog "The following tests have been skipped:"
+	for test in ${skipped_tests}; do
+		elog "test_${test}.py"
+	done
+
+	elog "If you would like to run them, you may:"
+	elog "cd '${EPREFIX}/usr/lib/python${PYVER}/test'"
+	elog "and run the tests separately."
+
+	if [[ ${result} -ne 0 ]]; then
+		die "emake test failed"
+	fi
+}
+
+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
+
+	use sqlite || rm -r "${libdir}/"sqlite3 || die
+	use tk || rm -r "${ED}/usr/bin/idle${PYVER}" "${libdir}/"{idlelib,tkinter,test/test_tk*} || die
+
+	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 "${S}"/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-libs/Manifest.gz b/dev-libs/Manifest.gz
index a3c975da0d2e..402246fcc3d7 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/tree-sitter-bash/Manifest b/dev-libs/tree-sitter-bash/Manifest
index e69c94055eae..5931b08894d9 100644
--- a/dev-libs/tree-sitter-bash/Manifest
+++ b/dev-libs/tree-sitter-bash/Manifest
@@ -1,3 +1,3 @@
 DIST tree-sitter-bash-0.19.0.tar.gz 187286 BLAKE2B 8812a593366a65a9cae3eaac5bb81c71e95f4abe8558a01b908333e471f05714b1c768b71e66d3890d1e63202819290813e499a5e8ba49e72bb466b9b0f245f8 SHA512 62bc8bc25c999f9c79632bd6b236edd21ef15b14365dd1a956237b11a32f5e60a2f420ec67b60d46203699b7841d4bc10978fc0307d0c4013b376c6c024d89ae
-EBUILD tree-sitter-bash-0.19.0.ebuild 354 BLAKE2B fb70ddad7d900e727855803ee5485776cea2df096b431c07cc1bf039c6250885cc09272471b7018bc0d802cf8511129ae23b42aff4ee562d5153bd4f476eb1aa SHA512 64cd58254997d9ece4be5bb90fede6de4726bcad0cd88c6ac3c295fa21ab629a599cab611899a5dd7cb8afdcedd4cc924e8d793d0c29f89a20eabe7b41b908e1
+EBUILD tree-sitter-bash-0.19.0.ebuild 347 BLAKE2B e1156a69eecc2a762b134e17bb1b8798d432badf4bee8c398646d17c5f3539c37d9904776a73e609b28aa0bd8fbfcd3e48feaeb6c61dc1e11ba3f0d90a0b40bc SHA512 efe321e72d5dd43a80e2a1dda92ec2d07b3b22c16bd5d1f59ae58d3d2d20b11f3d5cba06f6eb427bec666f397e7be5c278c2416872f9ebfbbcd0d3544774c432
 MISC metadata.xml 446 BLAKE2B 60052c2b380610a7baea0e630cbe82709976827341183e1a1a7c846913f3fb0ae8ad85c40701ec827685592e326405a9b2cab1674d015c7111c1df90ad8a162f SHA512 e845bf4cd56026aec1b531cd23ea6bf5eed38ac0d3f91dedead87907e4708bac82db87b3c7ccaa1135a4c25911f2b369836c2689faac9ad54782978dd2c8f95b
diff --git a/dev-libs/tree-sitter-bash/tree-sitter-bash-0.19.0.ebuild b/dev-libs/tree-sitter-bash/tree-sitter-bash-0.19.0.ebuild
index d3caafe0dedb..0afa9e6d8e27 100644
--- a/dev-libs/tree-sitter-bash/tree-sitter-bash-0.19.0.ebuild
+++ b/dev-libs/tree-sitter-bash/tree-sitter-bash-0.19.0.ebuild
@@ -10,4 +10,4 @@ HOMEPAGE="https://github.com/tree-sitter/tree-sitter-bash"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
diff --git a/dev-libs/wayland-protocols/Manifest b/dev-libs/wayland-protocols/Manifest
index 77e615a60dcd..a2b951c21043 100644
--- a/dev-libs/wayland-protocols/Manifest
+++ b/dev-libs/wayland-protocols/Manifest
@@ -1,6 +1,6 @@
 DIST wayland-protocols-1.25.tar.xz 79784 BLAKE2B 6ca7fdc910bfd70ee5c3bb192bcf1c79c66c4bb713531b2d1d493bd3ec8509e1231176144d75f4e97a4c6ccc4ee1d836a7ac1cfeaaa59e927f10fa4a40cf023a SHA512 8269694a0780e4d32f1982ff4cbb50b1ef85f08157b9486bc6d7e489c64665a9d9f959121d0eede7c7b108a604d974b64d74cfdef8b5f14304465309afb0768f
 DIST wayland-protocols-1.26.tar.xz 81028 BLAKE2B 0813b8117c48b965560c3f112f67fa209f29b0c40fab2b46f46ccae227d68902277cce06281a6bd938fb3c2186e0cf4ea3670ed6d3b48b51ed655012bb1452ce SHA512 fa9c3963b548197461c8c0b9e16ebbf9cfa5b60053fc17f51b41e63a55b8c5420dd7e42313f93946b438ab47f04e1cd17bc92aae9e1074b47177dc7ce7042167
 EBUILD wayland-protocols-1.25.ebuild 755 BLAKE2B 3fc5c050521210e255e4f84757d8db55799f8f1f24a29cb80212e7961f73c16e043a64f76dfa3185aa56ed20a3e0759247f87cc41ff9f1adde61b147a276d2f4 SHA512 9ba008e0875dbcc8b3c597eb49073bce8afc3d94c0bf6837a684ef692e202b85eeb162640229199965922625763107080e4bf76388fc31b30d3eac2c758e08b6
-EBUILD wayland-protocols-1.26.ebuild 762 BLAKE2B 4f80b6c474c0ea97061ef6fb7703479bb82831a9a25450269356f967855e5b2d255d09a55db9a876ff7789dd8eab5d32c875c3947bf6e64c8eeabeb4c3faed4d SHA512 09dab59db34d5361d9630dc45c7728cf20c5f4491f6022093062b37756b776404964031664dd97efaaa878eb6fc850ce861b32d8e764173ecb28d432452ed719
+EBUILD wayland-protocols-1.26.ebuild 760 BLAKE2B ad8e823b5b2072b00098878d0a61031612a7281e081616c7d784395b955ba89a89188b2e728e6811b1b21c383258320bb651ac4616e738fcb0420e07c4cd6d9c SHA512 2be7605aa3a8c2eb24405476c94faa65a9e47c54f3ebbaa97c737745a45d3279c67975a92f59473779aab5e75cdedf95c080100c8df258d14846fb31ec3fea19
 EBUILD wayland-protocols-9999.ebuild 762 BLAKE2B 4f80b6c474c0ea97061ef6fb7703479bb82831a9a25450269356f967855e5b2d255d09a55db9a876ff7789dd8eab5d32c875c3947bf6e64c8eeabeb4c3faed4d SHA512 09dab59db34d5361d9630dc45c7728cf20c5f4491f6022093062b37756b776404964031664dd97efaaa878eb6fc850ce861b32d8e764173ecb28d432452ed719
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/dev-libs/wayland-protocols/wayland-protocols-1.26.ebuild b/dev-libs/wayland-protocols/wayland-protocols-1.26.ebuild
index fd84b9649f01..54c8c26bfe66 100644
--- a/dev-libs/wayland-protocols/wayland-protocols-1.26.ebuild
+++ b/dev-libs/wayland-protocols/wayland-protocols-1.26.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = 9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://wayland.freedesktop.org/releases/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 fi
 
 LICENSE="MIT"
diff --git a/dev-libs/wayland/Manifest b/dev-libs/wayland/Manifest
index 14c5fcd7ae56..09a1e7fa2cf0 100644
--- a/dev-libs/wayland/Manifest
+++ b/dev-libs/wayland/Manifest
@@ -1,6 +1,6 @@
 DIST wayland-1.20.0.tar.xz 225188 BLAKE2B d607610ad8b30b6b3bbfc3945679f698030f271766cfb72425f98f170a96469fb085fb9a746a866b8562d7f452c844e61ad57f634dcf365474c7d050b76022e9 SHA512 e8a1f410994b947f850799bdd0d95a2429d8467f853e62a0ab3915a4e9fe130f8aa977e03715114ab740c6ec546edea63d275ce7f927d4f3029ea126e6a7d215
 DIST wayland-1.21.0.tar.xz 225936 BLAKE2B 2b43eb1517d476bb2b4daed1083373655b57d047968fdb93dbbbbe4235af12e25557627e30b5c3d2575bac4beaf1e0a0b8ef10a3c673538d9097501f33c05836 SHA512 5575216d30fdf5c63caa6bcad071e15f2a4f3acb12df776806073f65db37a50b5b5b3cc7957c5497636f4ac01893e2eaab26e453ded44b287acde01762f5fdc3
 EBUILD wayland-1.20.0.ebuild 1516 BLAKE2B 1a602cda157f1184410d3d1bb71969f182ce9098e9ea0c9be023c1cf158850bd2b9fa3958caa7f3f5fd3974697e408425abe65c1a34d7fc8a826e21e3411325f SHA512 8f2522a515137cab3c4682b136b5a733ef155db57f88e49e4ccb6cfd79911f57173df94d2233ca8a9d9cfe94ad4f6f5ef243d3586345dc9b8e5856409717dfc4
-EBUILD wayland-1.21.0.ebuild 1485 BLAKE2B 8e82cc08d4efab01be9e60daa08f568c9c2760cd5247f66ac2aac0886ec0dcb3b9d5cc262ed7612e08c77f97c08371b454a35f2af693eb6a8cc88a19c23575d0 SHA512 fbb427c35c1e5df874e99391438babcca5c943b548dfc8c4380e694979833045a94be367d920d696c9e5b332171351e2ff298214e7e82c0c4bbc42a669ca9f12
+EBUILD wayland-1.21.0.ebuild 1483 BLAKE2B e643361dd571a206e4999a239072319da27037f1fd9bd8cd7590d47b06f65fa32d712fa31f36d91345642590df3f59bd570cd04ad821280eedf01f263eff8d1e SHA512 7074b2804f2c46c7b80b0b7401a0db13260a3affd022912b3bf7b0f5c665eeae31f13f1e15fe78476bab4321bf55d211f7a4d6c11e4548088faede3562c2256c
 EBUILD wayland-9999.ebuild 1485 BLAKE2B 8e82cc08d4efab01be9e60daa08f568c9c2760cd5247f66ac2aac0886ec0dcb3b9d5cc262ed7612e08c77f97c08371b454a35f2af693eb6a8cc88a19c23575d0 SHA512 fbb427c35c1e5df874e99391438babcca5c943b548dfc8c4380e694979833045a94be367d920d696c9e5b332171351e2ff298214e7e82c0c4bbc42a669ca9f12
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/dev-libs/wayland/wayland-1.21.0.ebuild b/dev-libs/wayland/wayland-1.21.0.ebuild
index bbe4c3904bca..c4f06b0dce3c 100644
--- a/dev-libs/wayland/wayland-1.21.0.ebuild
+++ b/dev-libs/wayland/wayland-1.21.0.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://gitlab.freedesktop.org/wayland/${PN}/-/releases/${PV}/downloads/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 fi
 inherit meson-multilib
 
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 077165927b6c..0131033cb815 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/aesara/Manifest b/dev-python/aesara/Manifest
index e07d382c5442..d9fcf92a1279 100644
--- a/dev-python/aesara/Manifest
+++ b/dev-python/aesara/Manifest
@@ -4,9 +4,11 @@ DIST aesara-rel-2.7.5.gh.tar.gz 7920343 BLAKE2B 04f7c1cf587799b915a54067a98608ce
 DIST aesara-rel-2.7.6.gh.tar.gz 7917317 BLAKE2B 21f801bebfe207586482b7eddb2fb1a2d812cb7c9bb28f2a7bc96543dabbe7ea7aa16781636d9e52d8abd389c8c148b3ae16696214d2914b702bb9dce114f149 SHA512 719d6ded6a058b739b3f2dcd734ef785b05eb07dec152c523d2ace7c5e9dd05d1550113f10e114b63b72d3a697900763c6f1e753db9c8d01a6c877fc5d3c2732
 DIST aesara-rel-2.7.7.gh.tar.gz 7918070 BLAKE2B 70a48fdeac8be6c070850294101aa379652f26c2ff7c9723232d6aea31b3aa52675299c2f85fb6e1b5a4c5dfc020f12d72bf1e8b5ddc1d487e750c2ad7583d8c SHA512 2a1e4488aab1dbef71537871cc9a2060d4e760a1b4dfc74ed1d4d2b2acf6a030c4ee27c9f464934219630eaffde4431571a4424bf27f6ee53a80b7bfc1fdfa2b
 DIST aesara-rel-2.7.8.gh.tar.gz 7918625 BLAKE2B 89f600e6b053526b8a214246746138066e2937633e132e68eef52e5dffa33509d4eee48f513077128e865f265a4e4b0ebe727dce5ed699c3f445b6850966c3c5 SHA512 33d57a5679480176cd814f6f5a36dc83ab0fe5f704a60ced2beceb10a4684bba7464f0d9473adc65541b755d3a5850af61d5ac8d8303f31d9c6718109ee331e1
+DIST aesara-rel-2.7.9.gh.tar.gz 7919763 BLAKE2B f877edcc824f3d790a56422a0fa660e8e3f653fff7e3d87ef4a95fa76369b1bb5df351a571ea039d66d79c0f564512437672df76c3b82e7d660c865cf908dea3 SHA512 061f7e39343eb081b28dd20b1eb7ffc226b7e4b96695d5beb9e28eb3f5ec9480c02c7889c932290248baa908dc0047c19e4cef3c220eccc4cc617b2050a9614e
 EBUILD aesara-2.7.3.ebuild 2614 BLAKE2B e360f5cbaae35848f952a831da22796d20c8ac3764431efc97ea295c4c93d9176be7b3a4e8f6a4e5bd79b5e967d2a4418c56851aa2d7255b76ed5c118369d293 SHA512 67ceaa8380df3d4484b0c168ebe0fe214e6fd3b4c4fcfe7e10f10f3817532ed496111d31a4ea5d7c5ecbe4603c4edbb9e97c2c3e1afc9381697011ced2819d1b
 EBUILD aesara-2.7.5.ebuild 2616 BLAKE2B 827420e734f8ec6771c1ee54124dd50a34dcaffb267509e762bc3d1b38d327385b53d60edd239ec404bf4d1a9ce4e80462e65e79dd5b0bd7a8c35376ed013ae9 SHA512 5d2b17595a3086483f2443e5d3608117d2e10fb5e64d0b33f2c2b26a346868abaa8ea09c08ba8beff734ee1ae1d0a878e064f2f8862b3f5838883d449bb0efa1
 EBUILD aesara-2.7.6.ebuild 2616 BLAKE2B 827420e734f8ec6771c1ee54124dd50a34dcaffb267509e762bc3d1b38d327385b53d60edd239ec404bf4d1a9ce4e80462e65e79dd5b0bd7a8c35376ed013ae9 SHA512 5d2b17595a3086483f2443e5d3608117d2e10fb5e64d0b33f2c2b26a346868abaa8ea09c08ba8beff734ee1ae1d0a878e064f2f8862b3f5838883d449bb0efa1
 EBUILD aesara-2.7.7.ebuild 2702 BLAKE2B f9f26d758b9a8baadacd1570cdccc49320e60971e4657aae72b247994f9906e11be8e96c493fc0db82e27fd1958008ab9eea7d0fe4acf739954b95ccb3d7f48c SHA512 ebb736dd14d8923a10697d19786cbb8a3275e6327c3882a7b0dccaaf8135829aad4060f38449823f6030033a165d08c762eadc8ea32df1fb1237ed95fc8e76cf
 EBUILD aesara-2.7.8.ebuild 2748 BLAKE2B add4e324bef647c7448fa953ba3981ec990c447f6104b75d89ce49dc318362e40832cd1936340941e43b8fea75b7a1b43e9b5dea8be8ae4f89775f17befa531c SHA512 9d208b2c70a5b432e30e6b12182ea894bc5ac903dd43c5103f8369b81e04c0e4a5da417e2c33b096f2ba2d3a6cdce2b75575827e88906ca7f5dc2fa4e3a8a530
+EBUILD aesara-2.7.9.ebuild 2748 BLAKE2B add4e324bef647c7448fa953ba3981ec990c447f6104b75d89ce49dc318362e40832cd1936340941e43b8fea75b7a1b43e9b5dea8be8ae4f89775f17befa531c SHA512 9d208b2c70a5b432e30e6b12182ea894bc5ac903dd43c5103f8369b81e04c0e4a5da417e2c33b096f2ba2d3a6cdce2b75575827e88906ca7f5dc2fa4e3a8a530
 MISC metadata.xml 506 BLAKE2B be65b6be62282fa47152985d79892fd04105a47e00a427ee8341d27aeff21b144bee7e7d0f16b2f4b617c941bdf5ebd9de37a42c39d117cdfd579c3035d35a74 SHA512 a207ec3db85a8e6f03feabd14da588f0b9ca9a88ab2495ade0f40b516b3bbd20fe78b14698d28da7ceed238737a9f4d63f587156ef609e846b485132d598c6bb
diff --git a/dev-python/aesara/aesara-2.7.9.ebuild b/dev-python/aesara/aesara-2.7.9.ebuild
new file mode 100644
index 000000000000..88ef6a3516d2
--- /dev/null
+++ b/dev-python/aesara/aesara-2.7.9.ebuild
@@ -0,0 +1,96 @@
+# 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..10} )
+
+inherit distutils-r1 multiprocessing optfeature
+
+MY_P=aesara-rel-${PV}
+DESCRIPTION="Library for operating on mathematical expressions with multi-dimensional arrays"
+HOMEPAGE="
+	https://github.com/aesara-devs/aesara/
+	https://pypi.org/project/aesara/
+"
+SRC_URI="
+	https://github.com/aesara-devs/aesara/archive/rel-${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	dev-python/cons[${PYTHON_USEDEP}]
+	dev-python/etuples[${PYTHON_USEDEP}]
+	dev-python/logical-unification[${PYTHON_USEDEP}]
+	dev-python/minikanren[${PYTHON_USEDEP}]
+	dev-python/filelock[${PYTHON_USEDEP}]
+	<dev-python/numpy-1.23[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/scipy[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-45[${PYTHON_USEDEP}]
+	dev-python/typing-extensions[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/aesara-2.6.5-compiledir-tid.patch
+)
+
+distutils_enable_sphinx doc 'dev-python/sphinx_rtd_theme'
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# speed tests are unreliable
+		tests/scan/test_basic.py::test_speed
+		tests/scan/test_basic.py::test_speed_rnn
+		tests/scan/test_basic.py::test_speed_batchrnn
+		tests/link/test_vm.py::test_speed
+		tests/link/test_vm.py::test_speed_lazy
+		tests/tensor/test_gc.py::test_merge_opt_runtime
+
+		# rounding problem?
+		# https://github.com/aesara-devs/aesara/issues/477
+		tests/tensor/test_math_scipy.py::TestGammaUBroadcast::test_good
+		tests/tensor/test_math_scipy.py::TestGammaUInplaceBroadcast::test_good
+
+		# dunno
+		'tests/tensor/test_elemwise.py::TestDimShuffle::test_memory_leak[False]'
+	)
+	local EPYTEST_IGNORE=(
+		# we do not package numba
+		tests/link/test_numba.py
+		tests/link/test_numba_performance.py
+		# ..or jax
+		tests/link/test_jax.py
+	)
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x AESARA_FLAGS="cxx=${CXX}"
+	AESARA_FLAGS+=",config.gcc__cxxflags=\"${CXXFLAGS}\""
+	AESARA_FLAGS+=',compiledir_format="compiledir_%(thread_id)s"'
+
+	epytest -p xdist.plugin -n "$(makeopts_jobs)"
+	# clean up the compiledir, as it can grow pretty large
+	rm -r "${HOME}"/.aesara || die
+}
+
+python_compile() {
+	distutils-r1_python_compile
+	rm "${BUILD_DIR}/install$(python_get_sitedir)/bin/__init__.py" || die
+}
+
+pkg_postinst() {
+	optfeature "GPU code generation/execution on NVIDIA gpus" dev-util/nvidia-cuda-toolkit dev-util/nvidia-cuda-sdk
+	optfeature "GPU/CPU code generation on CUDA and OpenCL devices" dev-libs/libgpuarray dev-python/pycuda
+}
diff --git a/dev-python/aws-sam-translator/Manifest b/dev-python/aws-sam-translator/Manifest
index 993dcce6fd1b..9161bbd92698 100644
--- a/dev-python/aws-sam-translator/Manifest
+++ b/dev-python/aws-sam-translator/Manifest
@@ -1,5 +1,7 @@
 DIST aws-sam-translator-1.46.0.gh.tar.gz 1082378 BLAKE2B 915f09ab6ecdecca7cc149ebd93d7370a3cfd103cf7e222fe5f8aefe084a8f285606a7a18467d996d643c70b132014d7ebeeb6d313498b8879ad13d905f3afbb SHA512 c33edd6209d7051a0d8132cdb675953a691f371e4ce02207d047be03211aff4d4c491c0f8d0fb8776a0693ff702d24ffc338d005bc9c6f166658e8293e478731
 DIST aws-sam-translator-1.47.0.gh.tar.gz 1087660 BLAKE2B 47e13a468f2ac0015683acb187a83f0e8f8b23162d4cd1b70eadfe36d3e10ea19259f2f313beb557175456f3455da3b08594207bb013cc33d30e4964ddec8ba8 SHA512 29af2b6c51384c906328d839f412dddbf0d9fcf07e77484567fd6c63be44d152b003087595530e20c63e504bc2fc27cc041c4cf21aab070240b6211a93a2dd20
+DIST aws-sam-translator-1.48.0.gh.tar.gz 1098247 BLAKE2B 99f3c94f94535e1ccfac5e20a2e403d7be6867bf7a644390a0aeb3444edaecf55d6b9454dd01c09ab12693c9abbf9c2994ea018f636f759f0f2d67e364ef4dd6 SHA512 150447a0068e056f38b246f27e3c5db831fb4a01cbc302d6203713d935a480bcd8d758873819eda02f2a4bf5a07ab397cbe63b6006bd053c5589b3220515eb65
 EBUILD aws-sam-translator-1.46.0.ebuild 2296 BLAKE2B fa619349b1d53e29f090ca641a7e4d926f2b69d4d6406e93ddc3cd7413b97252d61dacd94bec36fad3596886b70a8fcc037ea004c1918e7d08054899aca555a9 SHA512 f4baa83bcafa8452758d4977b20b4b0df4924540ce3bb08fbfb4488fd983af8365ede182503859bdb87b005dfa7645a791d7ceebbb3d2637ae2bb9351ad36d90
 EBUILD aws-sam-translator-1.47.0.ebuild 2298 BLAKE2B 00b0c58231c5c470c4fa9c5a8a45f1d6328c96183af14b0ebd5f3050401df631704f76f35d71ece3a3853edbc10553edd2eb85505c5b5ca5efc515583ec51037 SHA512 7d2b130306f5c0a0abd8bc582b6a0cf451e28f7950d6c78bffc8c6c667f057a7e3c7e2baa49d3fef49f99d3adf2b4131a72b9e08d7ac168b12d3c6716fb5d002
+EBUILD aws-sam-translator-1.48.0.ebuild 2298 BLAKE2B 00b0c58231c5c470c4fa9c5a8a45f1d6328c96183af14b0ebd5f3050401df631704f76f35d71ece3a3853edbc10553edd2eb85505c5b5ca5efc515583ec51037 SHA512 7d2b130306f5c0a0abd8bc582b6a0cf451e28f7950d6c78bffc8c6c667f057a7e3c7e2baa49d3fef49f99d3adf2b4131a72b9e08d7ac168b12d3c6716fb5d002
 MISC metadata.xml 603 BLAKE2B 89556267393186cf69a585c58efeb6fa599bfb42ef221bea955ea807a28edee89036a2ee0d0ca81ae55d96702a01b171b837754dabf38047ecc2789157bb7116 SHA512 106b6d241eadf7807dadf03329073703f8b51e7443eddc4db8752878b6dd84cc4357689cd4b796b3a083192e9d98eacbe9e7b8af0273160c7b89846e78230a88
diff --git a/dev-python/aws-sam-translator/aws-sam-translator-1.48.0.ebuild b/dev-python/aws-sam-translator/aws-sam-translator-1.48.0.ebuild
new file mode 100644
index 000000000000..50524b4a89f5
--- /dev/null
+++ b/dev-python/aws-sam-translator/aws-sam-translator-1.48.0.ebuild
@@ -0,0 +1,60 @@
+# 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-2.6[${PYTHON_USEDEP}]
+	>=dev-python/six-1.11[${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/boto3/Manifest b/dev-python/boto3/Manifest
index cc488849667d..2dc037980bc1 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -1,8 +1,10 @@
 DIST boto3-1.24.26.gh.tar.gz 515531 BLAKE2B 34f99c4dd224731e07c2f0b175d6d172661ce454a7af16be6856053af1bfac69b7f56ada5b154fb625fe2ba1fb22fbe34b5150c550890e46a923b48f2466b06b SHA512 a3980ec79abd5e2656d7d02b36dff6b8c2acb67033eff134d96dccbb9d8bbc2d711698b87d08d537256fad7e3b3cd7af008018ef567b12d63ef0fc871a8f3b3e
 DIST boto3-1.24.31.gh.tar.gz 519387 BLAKE2B 8581d1018f0e1f0802779851edb52fdb6860c44bf46e6315eddd3b603cb65a0763707686286aa06447e90df6c8e6cae3de0e6bae8a9836ad90e5a3f4335797bf SHA512 370773f2365f4dcc7b73d0828bc84f0de5c15b189d23b799738c2358b1b0119e5e457f26529b7a6c90d637c2142121a2874d088671715c8deb4b793afbf7fd38
 DIST boto3-1.24.36.gh.tar.gz 522156 BLAKE2B b76cb50f01ff85c960a0984f950e72f02ac6e85131fd344142b886a3c745cb8b9073f865527911b88c462912413fce6df4066752ab5eec8ad1561d349ad22437 SHA512 fe00e78cc522248c449f83f869bb7d76793db9aa436259e74d0aa25984a02876191a7df41b1ad7658b06e418f248ad616743698c87a5c9696f77a196a53c561e
+DIST boto3-1.24.37.gh.tar.gz 522233 BLAKE2B ab361fd7443ff499c18a8e86c9a80da14e6a1d960fbac26d2e12d8806684daf169010225ce7a402626a814cb29fcc281ea61d293eb5eb197f48dccdb8a7a14ef SHA512 b75ea002f3a3e3b8c498797278adbf5f7d4b220baf7b8fa3be8c972bf2981933d962878b7d96a7c01c9a28be267effea34b48692716e7eabfa077ede380c816e
 EBUILD boto3-1.24.26.ebuild 1579 BLAKE2B 394d8a1bb7a1036ab4821bc789c9eea285f8a6a7c21e751d60c94a53d5fdd37119eab54bfd19bfe0856b7557df04340f50c7cebbe631234e8f582e7d62af13ec SHA512 beee3b634e3b1d66365beb2e97b9d09188fa795e00d9d05f2101de423128741ee1f8ad8ae4b0c35f1e6c6473ce73cc3acf47d9141029b4435d39a9803a5fe1b2
 EBUILD boto3-1.24.31.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
 EBUILD boto3-1.24.36.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
+EBUILD boto3-1.24.37.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.37.ebuild b/dev-python/boto3/boto3-1.24.37.ebuild
new file mode 100644
index 000000000000..6edcc751d54b
--- /dev/null
+++ b/dev-python/boto3/boto3-1.24.37.ebuild
@@ -0,0 +1,68 @@
+# 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/botocore/Manifest b/dev-python/botocore/Manifest
index 8e758d068839..b83163444b3a 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -1,8 +1,10 @@
 DIST botocore-1.27.26.tar.gz 9167551 BLAKE2B 9e95c1e6e5261b08247615446a589318d92cc86768c5e3999f99fb8e2a4a888309d72d4d3d66a1ebf9c1e2b6ccab6265a1d94ad9dcbf9da22aa1ae012aa2bfb3 SHA512 bbb563c2bc8eb3fe022f0b7be263ef16de93aadb02fb7a8e242f53a957a97e8f8b5d043ea8897a7b268d4d64b1e4972f2ccc91b8255f232c858f6a9ba1d93f34
 DIST botocore-1.27.31.tar.gz 9184651 BLAKE2B 01dcd9e94490923f7d0f463d3019007f58c5e441ae65ea2c365ed20417e8f7b532228a335c6f461ca97411269aaa78aa48fa33cccd8b2e45a6665c2410bb4352 SHA512 27f810e0519144fae71600ea7f6d9a15cca30386ee0f2b06beeeb64c06da8728b54709fb770673f708697dd930fe744703728ce00b6a1149361ab550fef9ccb4
 DIST botocore-1.27.36.gh.tar.gz 9465835 BLAKE2B c22c341d6e762316f3d8719bd8c1fd52140642739361a7ade326d739005dbd141a6b4e1798287b40bf7ba40cd5e158d36f195893d529f5ba375b06087d2122b9 SHA512 09ef156b3c0457ceef341bf26e3f060d3e91808f1da66d1dbb06ba2826be3c61e047383dc9d8a719bb8e172e91f6475f4613c14d30c57c6a909b51c8ba7334cc
+DIST botocore-1.27.37.gh.tar.gz 9466348 BLAKE2B 56c670e22204dcd12164094d52b1ed4ec820241f1423738e008f24762a5702149f2eb57283ec194a77cc2d57bc1183d91a90ca55ae0cf977aa1abdacb922ed86 SHA512 adb18c54a757077f7cff4b9b6716d015998432faeb3eb7d0a631631e5b0cf7814b40843ba379841cef920d3eca1367623f52491f53fed9f318898b3a6197eac9
 EBUILD botocore-1.27.26.ebuild 1572 BLAKE2B d019098e9bd4f40cfe93307947813ffe3e880e9462b25ff6eaa16caf3ffad2ea5c6db9e482b7b3dc995ca174bde48e90ecd8861a86291c1d454dcf6212bbe7d8 SHA512 db12020b9130b5b940a44ae7fca5a6b0e4c3d84fa2efcff156099d355cab185ea52cb3c4740ebbea25d865d6af8d64ae58ea1e4c6129b1c1026fe8bce6f0580d
 EBUILD botocore-1.27.31.ebuild 1579 BLAKE2B 6223a51641d2a9a33b13fb58d2cb65f1722824f1be352966b98e6da851c83a5c67d26ab3274250cb5e3084dc0b9afe34aa320746d1e09b21f1927dd27875e31c SHA512 f181b6a3f1c9047acad789651b36666cd97ce046b9b0449c8b0162d2fbbda45ed6c30a1ab43228693215ca324079689e622aada7084d2b3516805f96984aa484
 EBUILD botocore-1.27.36.ebuild 1617 BLAKE2B d33413fa74479d5ca72e82609b4b1c57a33f6953d5acb82db1e2f9de7599190c69d8e633ac0da8417121a9959346723f509d5bb8945d1de63689046756ba303a SHA512 20aeccea53aa2e5d294739c9256fb590d21a89c216411383b1bc8c1ee25528ce4ac94fe3a210a1a6ff173b81c1d97b0972d611772963592a9c8be8039c12717a
+EBUILD botocore-1.27.37.ebuild 1617 BLAKE2B d33413fa74479d5ca72e82609b4b1c57a33f6953d5acb82db1e2f9de7599190c69d8e633ac0da8417121a9959346723f509d5bb8945d1de63689046756ba303a SHA512 20aeccea53aa2e5d294739c9256fb590d21a89c216411383b1bc8c1ee25528ce4ac94fe3a210a1a6ff173b81c1d97b0972d611772963592a9c8be8039c12717a
 EBUILD botocore-9999.ebuild 1617 BLAKE2B d33413fa74479d5ca72e82609b4b1c57a33f6953d5acb82db1e2f9de7599190c69d8e633ac0da8417121a9959346723f509d5bb8945d1de63689046756ba303a SHA512 20aeccea53aa2e5d294739c9256fb590d21a89c216411383b1bc8c1ee25528ce4ac94fe3a210a1a6ff173b81c1d97b0972d611772963592a9c8be8039c12717a
 MISC metadata.xml 499 BLAKE2B e5aaa7da26f200c09adfdf38b68f656bbccbec627cb5d966b280ac2165334e7eec659c89075bcace748f58e2ec3e7d2998e54a688d56ecea2d30653c67dfd35a SHA512 103c554d5dbd967bf9b6e418b3913d9235e7e910d012160909ce0715134ed2e37b06e6a345395f9d16ce08d1cf51f3ce458bce93c6a978fd3dca6610f2acdbd0
diff --git a/dev-python/botocore/botocore-1.27.37.ebuild b/dev-python/botocore/botocore-1.27.37.ebuild
new file mode 100644
index 000000000000..6558cbe56a50
--- /dev/null
+++ b/dev-python/botocore/botocore-1.27.37.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=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
+	)
+
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/braintree/Manifest b/dev-python/braintree/Manifest
index 73ec8ae2f82d..a8de8ad124c2 100644
--- a/dev-python/braintree/Manifest
+++ b/dev-python/braintree/Manifest
@@ -1,3 +1,5 @@
 DIST braintree-4.15.2.gh.tar.gz 207089 BLAKE2B 5ed62e341c05e254cf3bec47f91704670bb57873be995352ce1e427e8075aee6193e11cbd863074b1ae39ddbf2c1a77f7c0207ffa9c8b7ca9335e2beeed42f29 SHA512 324823a078bc4068577793b169dd6b3d67e05d77850cebfe09602c0f6c3626ef1098f612c0ddfb7cc72b4b734d7319944c30297658f77edaf906334d27393f13
+DIST braintree_python-4.16.0.gh.tar.gz 211927 BLAKE2B 335215a538f00b04bda607887c582c1f55fcf3918f5c662f435791889cfc4f813a1e4362056bd8c5e4d907a77cf2eab11463bf1b5b839ce615350fa1614adad8 SHA512 6eaed1dec96032f3522e59e66c64ab674324518b7086ed9aefd2cdd5ae70e2d3e114a2e422f3edcae47dd95a5f332182dd65800cacb20bcbdf7e01a1e96498bb
 EBUILD braintree-4.15.2.ebuild 716 BLAKE2B e8d1f98a5cbef751686ab49ca6633c9d79ddf0e930309a4f40df594547dd5d9f47dc58b42a75b78718f3077cf0ef59376effd691f5b12305f9b538868ef18f04 SHA512 f1bafa0905ab067b89e37f42db8f82c6a012cb7855695e4420754838385090631cc4d84f4ce1903e635c00d53f65842654ca0be9cb4620b5c99088b1046900e0
+EBUILD braintree-4.16.0.ebuild 764 BLAKE2B 4c42342a9ec06c38f42eaf8e82e004a32fb9b81e4a9acb0f3520dcc94508f6373bb939a05d6fd7bdb6d6a1ab97f69a92900a57fe90baf28585d843b16f376e9b SHA512 a5fd102d011e159ece22204e7d888be6573f61fadb42301a3cd1f4adda0fc93534fcf81bfa0e9d1057a26b883cf97a8739e77bf9232cf94bf2d778ec6ac90272
 MISC metadata.xml 484 BLAKE2B 17a5993a7630126f55e88b92bf917ae068282c36813ea739407b65d91542d2a9977f3057889838bce776b38c5e64e4a17fabc3367ac01ae8512d06897de1a060 SHA512 c0f5406afc289683369998c79009defdd07735e6aaf60d777e524eee6c58dbaff4b936e990490cd15cd53f175accbfb3adbe55896511c79e9655f08bda24ba49
diff --git a/dev-python/braintree/braintree-4.16.0.ebuild b/dev-python/braintree/braintree-4.16.0.ebuild
new file mode 100644
index 000000000000..d7355667355f
--- /dev/null
+++ b/dev-python/braintree/braintree-4.16.0.ebuild
@@ -0,0 +1,38 @@
+# 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..10} )
+
+inherit distutils-r1
+
+MY_P=braintree_python-${PV}
+DESCRIPTION="Braintree Python Library"
+HOMEPAGE="
+	https://developer.paypal.com/braintree/docs/reference/overview/
+	https://github.com/braintree/braintree_python/
+	https://pypi.org/project/braintree/
+"
+SRC_URI="
+	https://github.com/braintree/braintree_python/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/requests-0.11.1[${PYTHON_USEDEP}]
+"
+
+DOCS=( README.md )
+
+distutils_enable_tests nose
+
+python_test() {
+	nosetests -v tests/unit || die
+}
diff --git a/dev-python/dominate/Manifest b/dev-python/dominate/Manifest
index f13f8bdba9d8..9e97cd84437b 100644
--- a/dev-python/dominate/Manifest
+++ b/dev-python/dominate/Manifest
@@ -1,3 +1,5 @@
 DIST dominate-2.6.0.tar.gz 35034 BLAKE2B f3a7aba630e925874da7387a1eed7ca15c353cb6464971d73e86eb259cbabad8b7736a0240d5c1578f84dc828f1ad6cd2e404c323dab9c0305031115e450944e SHA512 1bb690d05a290753cabac045160500717eda8c7610ce88d2b88a490abaa64b2cdb07067c433fa6a27110ec6cb67d884d335663217391e61215ac8eb30003d8e6
+DIST dominate-2.7.0.tar.gz 36351 BLAKE2B aae802626a9e7f6b6f45f39a5b2cd6a6846ca42617e9a5ac5fe8e4a871e8ecfb89124e079313838c6f098ea5107a904d230808eda29cb05293e18ef4bdaa2504 SHA512 8ecca393548bd7c39b5d1800fee94634a60e4e12db44e16df316c9e0f5f04dc6c91e11fbe242d3c6dade3a5e09bec7e3becbfd4f8eaa58f9a8fc7ee15ac3bf31
 EBUILD dominate-2.6.0-r1.ebuild 475 BLAKE2B 6aa96bc695fd8686c18a802d0f38d3203bb0a5ce8ca69081f01fc92372dc33fca12320843052f8aa510b66a75238a7d72f5c35413b8d7709d0245f7b184ce32b SHA512 0c17397614d59527065322d0b7a3624e859f0a31888eb46ddd428ff87fdcd1e264a4abc0a477274646ea9001342a7a9ffe2b4267f6e7a526b63e2973b46eb9a2
+EBUILD dominate-2.7.0.ebuild 517 BLAKE2B 8bde4cf96a9ef1193ff8edaa6fc8dd1e6d4b219bbd99c26dfda95bc568a031f64202a519ef3821c528f6723010491d06c2601e7d1141ff633f66bb92ed21bbf9 SHA512 185105db4706b3f8835e43baaf07d78b9fbcd40c37fb38757070849a76fe2f9b443e0e924c8573d35dc112f8a387ab7407467e719b898080fcd098a717e04a14
 MISC metadata.xml 796 BLAKE2B a6b8a73d12e14552aed0f4b4f2a4b5ff282829d44da6a3e283a04575bc31069d5e83a0f475d184896c586b416882507fa22ccfb346aec90692a47f28ea54646c SHA512 9a018dd4858f7a89ac7cfd8b1814df9bb24ebe9e811f0f98e2fe52f047b14bf742648de9c0e4ce55ff69434755d8b365297bd41a5909c63697eed925e1a30b03
diff --git a/dev-python/dominate/dominate-2.7.0.ebuild b/dev-python/dominate/dominate-2.7.0.ebuild
new file mode 100644
index 000000000000..f58f231f6f4e
--- /dev/null
+++ b/dev-python/dominate/dominate-2.7.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="Library for creating and manipulating HTML documents using an elegant DOM API"
+HOMEPAGE="
+	https://github.com/Knio/dominate/
+	https://pypi.org/project/dominate/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+distutils_enable_tests pytest
diff --git a/dev-python/flask-login/Manifest b/dev-python/flask-login/Manifest
index 4f74e4bcca86..d9750f0040f7 100644
--- a/dev-python/flask-login/Manifest
+++ b/dev-python/flask-login/Manifest
@@ -1,3 +1,5 @@
 DIST flask-login-0.6.1.gh.tar.gz 48215 BLAKE2B eb1fa81aad9bd8cf663b3ea85649f90f39d7a91c4c771e697b0cb7d66c7e4a5994befbaad36a7deba6f5aea27e6f47ff616aa00cd073433851cf8a9248e4b3a3 SHA512 f220e24079923c669d1ce27fdbc7ff8e07e92bc947e2708034cb349176e33ae0adf36ef6c30e8328f592d9a3eb6d0796dc577033f07c33ef0bc48c13a11a942e
+DIST flask-login-0.6.2.gh.tar.gz 48195 BLAKE2B 74d980f9900d9c583e03caa704cf637c5c6dac6a26e74bc008f47c18213764bafef16e33d9d28eee588b3c2f7d2a5895eae88e5adf755fe0448f7e74d5c65e74 SHA512 b286272ad5f7de2cfc913bee4a3eac46e4c1ce274bb12467009e1abae422f1a855aa49fd898778b8a2e937eebe9fbb387af11815267a2bc120cde943939111ec
 EBUILD flask-login-0.6.1.ebuild 882 BLAKE2B f4a096f3043834730dc33b5c501a78f326a20c60d1ed01687208334103a87539d385b9eac03e381bbecf8f6b2cb4220ed1f00e9ab23e0ea4c8120a1f370594dd SHA512 e7ac45b5c0758923ba80188cc014e1c538326bb4a78f8bc7ca995bd7db9b9e41dc0205f603a131311639fb3c8c4a7c89b94fe8c3128b7714dd6e1bc43116414e
+EBUILD flask-login-0.6.2.ebuild 886 BLAKE2B 967d66e63ced91c3f1150ef8cd9ce250c3641ba63c957e1ab583f924c5ced210e903cc7fa7410a06e30b68ac6b37a8431ece41547931325dba71b48c340808bf SHA512 966497d5c7b8188a6efc8bc578ada44fcb0ba9cb312c30863672744dbfe167620427c4ffb43b629981ebf138951576dbc520774836ed498964cb997bc906631d
 MISC metadata.xml 404 BLAKE2B 8f8070dd3be696102c88bf75e22511b75432dfd17d21f6f3ce084cbae8092bc91ce1cbb7e47d691c7ac502afd58882ccd0bd1ea732df9239a4ec1b70e8728f19 SHA512 0b32444d9f1508697be1a19a6eb57efa5cbff443baf35958c24161d0b716a55d96b0caf66936925970904642fde975d94f4360b8b96d018ebe0fad24216769a4
diff --git a/dev-python/flask-login/flask-login-0.6.2.ebuild b/dev-python/flask-login/flask-login-0.6.2.ebuild
new file mode 100644
index 000000000000..132e7072e390
--- /dev/null
+++ b/dev-python/flask-login/flask-login-0.6.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="Login session support for Flask"
+HOMEPAGE="
+	https://github.com/maxcountryman/flask-login/
+	https://pypi.org/project/Flask-Login/
+"
+SRC_URI="
+	https://github.com/maxcountryman/flask-login/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/flask-1.0.4[${PYTHON_USEDEP}]
+	>=dev-python/werkzeug-1.0.1[${PYTHON_USEDEP}]
+"
+DEPEND="
+	test? (
+		dev-python/asgiref[${PYTHON_USEDEP}]
+		dev-python/blinker[${PYTHON_USEDEP}]
+		dev-python/semantic_version[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs
+distutils_enable_tests pytest
+
+python_test() {
+	epytest -p no:httpbin
+}
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index ed57ecdb2549..20fc121b1383 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -3,6 +3,7 @@ DIST hypothesis-6.52.1.gh.tar.gz 9321216 BLAKE2B a05c1778088455010c444be13e5c469
 DIST hypothesis-6.52.2.gh.tar.gz 9321530 BLAKE2B d54b97bf15895b503d14629c61cd99d120f318d485c37d2d2e0c012f3a55c361a11caea6329d76baaa1e39635fcd24d0694b45edbf2d0976d29848501c1030f4 SHA512 ac912865374297a299aea0a1f9b56cd5ddd89b8659f81112e7993039ccfb726835730103c756067c6c7ae00833352cda8dd4d555e3c11741b527b8f9c9b83fd4
 DIST hypothesis-6.52.3.gh.tar.gz 9321591 BLAKE2B 50415d463d2513b023b8a6ac87a2bb6dae433b823fd209ec1137a26184bb5550fb9606e006cffecbff09c523fb244b9f8c119e1c9dc765b925f8aa6b0dc43bed SHA512 f8aae5976cc2bd47e157310434d2717caea5e639daf1d794fa6c45332fe44fc5873904451f1fb0b53d56e64147428c4c87e130b4776fd3b14e2c2b961660231d
 DIST hypothesis-6.52.4.gh.tar.gz 9323011 BLAKE2B fece23da48d4849252a0fa48ae741506f49aa1f2b63f81afe3b71d18e0325a4e337bebde1a1707390d38bdf57e2ce1145985231f68557b36c58886d82774a7d9 SHA512 c51f29d52757d08652f83deda48825ca38c86e0bc67743c2cff9c85f52d726671f07d0249dfdc761b2ba8250d40beacdf5e037e8629f24df5baeddd297f38030
+DIST hypothesis-6.53.0.gh.tar.gz 9323355 BLAKE2B 589cd4803351e72cc1896453e5e548bb6fb5f998032bce91708e02f3c8ff5d288ec76d65eeffde5fa31b6b86fbb3ad81dfe3eebaaac841f197de3a07acfa12bd SHA512 ab4de3764ca3ce8e5e50966ea94fcadd85e7c9f170dbbd17383b5516528e091ebfe3b06846513ee77a1f7a2e827236d323c12cc120cac421ec7aa9f3a2ca5e4a
 DIST hypothesis-hypothesis-python-6.46.11.gh.tar.gz 9312248 BLAKE2B 78b5ca5bd38bd62d2fe50ab929df075e253c059aed329d6b52051fb01449f8de84ae340ba42a4af94ef592411139a45d34aad232fe4bb2d8412165730bbeca01 SHA512 6fdd54f28d275eb65a4f6e6919437d503eba6254c25e22298c34ac67e6de03cd99a5178b1a475b1da7f7afeed8406e89c20b4818436143f442222d26f0d94796
 EBUILD hypothesis-6.46.11.ebuild 2005 BLAKE2B fb8a9862f49589a6bf5d8ddf74153a0c4246baaabfec70c1f07c1cb098709be34305ec921b2935b400c4fadbd61a3be4047ebf469cfab2745160aa72a430c558 SHA512 b187453909858b3397ea0d02aa029a89d06f51a539d08d7dbb2253abcff8e1d9226af315f2401e34debcbcc91cbb50344fc7197bbcb1647bb88c325c6940b6fb
 EBUILD hypothesis-6.49.1.ebuild 2079 BLAKE2B 3ca3774b2abf108f255001aea7609dd5d6681779c9ad7f338fbdd6b071d96c393d96acf7c98a2a06fa3f486aa9497b19512e5fbc812388aaf91826bf5714c6e7 SHA512 34e3d21d2c225c4c9cc287b3da3f4cbea4a74055f250037c6e964312387a342360b8f9424e40becfa583d9fba941640fc537e188bc9fe036b37d2825fdd57d8d
@@ -10,4 +11,5 @@ EBUILD hypothesis-6.52.1.ebuild 2086 BLAKE2B bcb3fca12e4ca3e6595ad6db87d0efa7b70
 EBUILD hypothesis-6.52.2.ebuild 2086 BLAKE2B bcb3fca12e4ca3e6595ad6db87d0efa7b7029471da4ecf98ec59ac4597ded88f4996a97966996544d76af871c08a56d43333b269ba15a34b6198fa7f359df2f6 SHA512 958ec21680ae6029bb5adb1711631b5352631899bb25084fb35d28bbffc44bc0054456fc3711a828f0e224af322c4499df7a5c2bc39bb6158728842a6d76f5a4
 EBUILD hypothesis-6.52.3.ebuild 2086 BLAKE2B bcb3fca12e4ca3e6595ad6db87d0efa7b7029471da4ecf98ec59ac4597ded88f4996a97966996544d76af871c08a56d43333b269ba15a34b6198fa7f359df2f6 SHA512 958ec21680ae6029bb5adb1711631b5352631899bb25084fb35d28bbffc44bc0054456fc3711a828f0e224af322c4499df7a5c2bc39bb6158728842a6d76f5a4
 EBUILD hypothesis-6.52.4.ebuild 2086 BLAKE2B bcb3fca12e4ca3e6595ad6db87d0efa7b7029471da4ecf98ec59ac4597ded88f4996a97966996544d76af871c08a56d43333b269ba15a34b6198fa7f359df2f6 SHA512 958ec21680ae6029bb5adb1711631b5352631899bb25084fb35d28bbffc44bc0054456fc3711a828f0e224af322c4499df7a5c2bc39bb6158728842a6d76f5a4
+EBUILD hypothesis-6.53.0.ebuild 2086 BLAKE2B bcb3fca12e4ca3e6595ad6db87d0efa7b7029471da4ecf98ec59ac4597ded88f4996a97966996544d76af871c08a56d43333b269ba15a34b6198fa7f359df2f6 SHA512 958ec21680ae6029bb5adb1711631b5352631899bb25084fb35d28bbffc44bc0054456fc3711a828f0e224af322c4499df7a5c2bc39bb6158728842a6d76f5a4
 MISC metadata.xml 756 BLAKE2B 26e40ab96ddcbd5751023e3c0cc9aa86e96d73ba02bca750ad15eb4301beb0318d3d694c54c2c2a2cb50937731af727411e8afb67e1a21e58e0ff611eeea9149 SHA512 cd48d35c5fe41aa9efcfea9eb7b2d78a4646658b5aab7533ca6492d4700032099fd34ca2dc45a6198c27351650c9e901c8b7c4d53ade2b56695d5e26ca371238
diff --git a/dev-python/hypothesis/hypothesis-6.53.0.ebuild b/dev-python/hypothesis/hypothesis-6.53.0.ebuild
new file mode 100644
index 000000000000..1065b755121f
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-6.53.0.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+CLI_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( "${CLI_COMPAT[@]}" python3_11 pypy3 )
+PYTHON_REQ_USE="threads(+),sqlite"
+
+inherit distutils-r1 multiprocessing optfeature
+
+TAG=hypothesis-python-${PV}
+MY_P=hypothesis-${TAG}
+DESCRIPTION="A library for property based testing"
+HOMEPAGE="
+	https://github.com/HypothesisWorks/hypothesis/
+	https://pypi.org/project/hypothesis/
+"
+SRC_URI="
+	https://github.com/HypothesisWorks/hypothesis/archive/${TAG}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S="${WORKDIR}/${MY_P}/hypothesis-python"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="cli"
+
+RDEPEND="
+	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/exceptiongroup-1.0.0_rc8[${PYTHON_USEDEP}]
+	' 3.8 3.9 3.10)
+	cli? (
+		$(python_gen_cond_dep '
+			dev-python/black[${PYTHON_USEDEP}]
+			dev-python/click[${PYTHON_USEDEP}]
+		' "${CLI_COMPAT[@]}")
+	)
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	# subtests are broken by warnings from random plugins
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=xdist.plugin,pytest_forked,_hypothesis_pytestplugin
+
+	epytest tests/cover tests/pytest tests/quality -n "$(makeopts_jobs)"
+}
+
+python_install() {
+	distutils-r1_python_install
+	if ! use cli || ! has "${EPYTHON}" "${CLI_COMPAT[@]/_/.}"; then
+		rm -r "${ED}/usr/bin" "${D}$(python_get_scriptdir)" || die
+	fi
+}
+
+pkg_postinst() {
+	optfeature "datetime support" dev-python/pytz
+	optfeature "dateutil support" dev-python/python-dateutil
+	optfeature "numpy support" dev-python/numpy
+	optfeature "django support" dev-python/django dev-python/pytz
+	optfeature "pandas support" dev-python/pandas
+	optfeature "pytest support" dev-python/pytest
+}
diff --git a/dev-python/imageio/Manifest b/dev-python/imageio/Manifest
index a6c7257bd0cb..668d2c8536a3 100644
--- a/dev-python/imageio/Manifest
+++ b/dev-python/imageio/Manifest
@@ -1,5 +1,7 @@
 DIST imageio-2.19.3.gh.tar.gz 388949 BLAKE2B bf7f7b2cc036d6bc808cedeefe624dfe43b232518f78974fffe9c664f23c8e89da73e5b777ee6049aa0ec363400fe8d9df1388a91a4b0a01089609d7ce12eaf3 SHA512 5ad9f332ea723facd5d9295e463b12d2cc17dfef8a7349ce194a8d32fcc5d07a29550834c66dc6e5837f8440347387b46624243fa267750f986042910ff6cb90
 DIST imageio-2.19.5.gh.tar.gz 389832 BLAKE2B a4455f97d2607d215ba4797e076487f4648ae6b21bf7b5207df8f337b52319ba4dd415d6e351289b588a049c800e8c541fcdaefe064cb4c83de12e63c492cf83 SHA512 481f14116961927946a71a7448ecf38f9781172969ab4e35c05360d758f7273be22262d4cd774a76b2089be3b7f0af6cf0a67d40814504e7a65db7075428966c
+DIST imageio-2.20.0.gh.tar.gz 390281 BLAKE2B 745364f98e3835c428e89abbfbeeb657d10cd730cd61283e5859b10a6e48b63a5b9771860fce75aa8dd770ab77671979847b34bbffe17d215fac5ceb8eb2c7d1 SHA512 fc1c41559cc15b76bfacbf4866717c200889661787de4baa49d69fab189ff7d00e376afdeeaaf74b5581e1ffc96da2f02566dfa9c0953518b98a4c4b695ddf02
 EBUILD imageio-2.19.3.ebuild 1210 BLAKE2B 2a8b74196d15dfd56fc549f5a90bbaf46c335d0c8d471b025a47780e46b42285b87b6041b57dfe7266bfc13cc00191361d07780eb1f9b519bff57a5adc3eb517 SHA512 e9346ba2129ad538ac3bc59ddaec6069afcbacaf1bc0cae5d26997e670a111ad8892e8bcda84b58010882d9810896410d6b2577b2a5ff9ffb070b9dd13961e56
 EBUILD imageio-2.19.5.ebuild 1210 BLAKE2B 2a8b74196d15dfd56fc549f5a90bbaf46c335d0c8d471b025a47780e46b42285b87b6041b57dfe7266bfc13cc00191361d07780eb1f9b519bff57a5adc3eb517 SHA512 e9346ba2129ad538ac3bc59ddaec6069afcbacaf1bc0cae5d26997e670a111ad8892e8bcda84b58010882d9810896410d6b2577b2a5ff9ffb070b9dd13961e56
+EBUILD imageio-2.20.0.ebuild 1210 BLAKE2B 2a8b74196d15dfd56fc549f5a90bbaf46c335d0c8d471b025a47780e46b42285b87b6041b57dfe7266bfc13cc00191361d07780eb1f9b519bff57a5adc3eb517 SHA512 e9346ba2129ad538ac3bc59ddaec6069afcbacaf1bc0cae5d26997e670a111ad8892e8bcda84b58010882d9810896410d6b2577b2a5ff9ffb070b9dd13961e56
 MISC metadata.xml 959 BLAKE2B 284b4b8fdf53cc63b6d46d1afd03abf322f8a91ad5feac3828c30198a9e0baa1514f34b91385dbc00830b306e4f78eac5d2bf4be8e377fe98cfb7e5c8db896be SHA512 0a72e91831dec56af50fa96fc6ed74b19fdc15e68255d19fb09c542eea85cfcdaa5a382608add10a63d3e421783225829d20d9b31c26883f7640b6214f2c20e3
diff --git a/dev-python/imageio/imageio-2.20.0.ebuild b/dev-python/imageio/imageio-2.20.0.ebuild
new file mode 100644
index 000000000000..6770d9759db9
--- /dev/null
+++ b/dev-python/imageio/imageio-2.20.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..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python library for reading and writing image data"
+HOMEPAGE="
+	https://imageio.readthedocs.io/en/stable/
+	https://github.com/imageio/imageio/
+	https://pypi.org/project/imageio/
+"
+SRC_URI="
+	https://github.com/imageio/imageio/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+# over 50% of tests rely on Internet
+PROPERTIES="test_network"
+RESTRICT="test"
+
+RDEPEND="
+	>=dev-python/numpy-1.20.0[${PYTHON_USEDEP}]
+	>=dev-python/pillow-8.3.2[${PYTHON_USEDEP}]
+	media-libs/freeimage
+"
+# requests for fsspec[github]
+BDEPEND="
+	test? (
+		dev-python/fsspec[${PYTHON_USEDEP}]
+		dev-python/imageio-ffmpeg[${PYTHON_USEDEP}]
+		dev-python/psutil[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/tifffile[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# Fails because of system installed freeimage
+	tests/test_core.py::test_findlib2
+	# Tries to download ffmpeg binary ?!
+	tests/test_ffmpeg.py::test_get_exe_installed
+)
diff --git a/dev-python/iminuit/Manifest b/dev-python/iminuit/Manifest
index 8af71e004374..2c61128f53c4 100644
--- a/dev-python/iminuit/Manifest
+++ b/dev-python/iminuit/Manifest
@@ -3,9 +3,11 @@ DIST iminuit-2.12.0.tar.gz 420687 BLAKE2B 9d3761bd756f58a7c36a61f161e4667f8efbb6
 DIST iminuit-2.12.1.tar.gz 420488 BLAKE2B 8910017f27d683b5129a506c7536def9b70b3dac27153985023f81bc94fb767c33f0a9fb4c8ac6911634839fd3870ac3bb63ddbf0cd8925b68778983c341354b SHA512 2b54ebb3c66eb508e848fbedae32aac32a82d794da899d10848d683b7a97b7882014e77b1e98be3563b0e96957208072f048e8df23a8c14f5e3b472eae5b5f23
 DIST iminuit-2.12.2.tar.gz 420639 BLAKE2B b158dd0916d5de229a1af16c402d8f51fd01cb9ed8e894677c2cb941fb587ac10ec94ce6787fb76291315c4e91cbf6c1492e65b821580a395385b2f50a38cdfd SHA512 620cfe19862ca6559ea5b2bc3f04a3212d8041e6de97056a17fe1e2a9dfe37d1c2128ae4bf6b2a5b796ce48719eeaa0d31dd025a0f469f401b1d9858685b3c82
 DIST iminuit-2.13.0.tar.gz 422872 BLAKE2B 756c43cfa89037ee80c274e0e4e9a70fe8fbbc3dd6508964361221740f8b159657d944c2c1fe32056ce0118489ad427c074f822ec6e8c9b809cc04cf34e9be45 SHA512 4a7d4eab7ea996069fce439eeaf9459d86d35d8cb95efb3893601f30cabab28c56da8ada7ae4ae1b9d0b8ce41f8d4ecc36e0a98a5e67ca1f739b40dda61cfd54
+DIST iminuit-2.14.0.tar.gz 427380 BLAKE2B 1ed6119bb6ee3ed91a6f40064959c138d12526d534520104cede88f14f298ff25f51d3e17515b3d3b78b7cbb4361a6cb704e24dc02930ad9414c42fed96c830c SHA512 8370c62a02e99e4eaf19153fabb6dc1dbd5db50fed94df73be28bbdc3b5f2d27cb1e770e5d6a031cbf780799363c69da0fb78e12a7f8cdc832e6120e4e78bd0b
 EBUILD iminuit-2.11.2.ebuild 905 BLAKE2B 2479a6ab793907917ba57ab1aab34e4701e53001450c1e2e3f3aa68eea555adb0650ecea26aa5ddb3ae12787ec6d32caba93af6dd44918f93353ba9029fb6fc1 SHA512 82e97833ccd58ca8675a2d6f06848d960c0797c0ec18e3a26880d473d49f0e99be1e6417888171178f4f0f9dc711eeede872b1294234be6bb5dfeb1bc9b7295a
 EBUILD iminuit-2.12.0.ebuild 905 BLAKE2B 2479a6ab793907917ba57ab1aab34e4701e53001450c1e2e3f3aa68eea555adb0650ecea26aa5ddb3ae12787ec6d32caba93af6dd44918f93353ba9029fb6fc1 SHA512 82e97833ccd58ca8675a2d6f06848d960c0797c0ec18e3a26880d473d49f0e99be1e6417888171178f4f0f9dc711eeede872b1294234be6bb5dfeb1bc9b7295a
 EBUILD iminuit-2.12.1.ebuild 905 BLAKE2B 2479a6ab793907917ba57ab1aab34e4701e53001450c1e2e3f3aa68eea555adb0650ecea26aa5ddb3ae12787ec6d32caba93af6dd44918f93353ba9029fb6fc1 SHA512 82e97833ccd58ca8675a2d6f06848d960c0797c0ec18e3a26880d473d49f0e99be1e6417888171178f4f0f9dc711eeede872b1294234be6bb5dfeb1bc9b7295a
 EBUILD iminuit-2.12.2.ebuild 905 BLAKE2B 2479a6ab793907917ba57ab1aab34e4701e53001450c1e2e3f3aa68eea555adb0650ecea26aa5ddb3ae12787ec6d32caba93af6dd44918f93353ba9029fb6fc1 SHA512 82e97833ccd58ca8675a2d6f06848d960c0797c0ec18e3a26880d473d49f0e99be1e6417888171178f4f0f9dc711eeede872b1294234be6bb5dfeb1bc9b7295a
 EBUILD iminuit-2.13.0.ebuild 905 BLAKE2B 2479a6ab793907917ba57ab1aab34e4701e53001450c1e2e3f3aa68eea555adb0650ecea26aa5ddb3ae12787ec6d32caba93af6dd44918f93353ba9029fb6fc1 SHA512 82e97833ccd58ca8675a2d6f06848d960c0797c0ec18e3a26880d473d49f0e99be1e6417888171178f4f0f9dc711eeede872b1294234be6bb5dfeb1bc9b7295a
+EBUILD iminuit-2.14.0.ebuild 947 BLAKE2B 64138831db5efb5453737bdeaca90664dc9cd497bdc806d54210bfc72f6fdfdfa6dd49c797960c827e7bffcf1fe572435d14fe82097d4ebbe9720ee9a704ddc8 SHA512 a34755ca69e87235dae1ea6d3a9e8f4e0a1c8e64cbb736b216dff8c12a79d502d932908e0327a6da9794876f36d4b0d2129887dbc226aea8077e4ad7f7323978
 MISC metadata.xml 494 BLAKE2B c97d7fad530773c29b5e723843f13c8305aa1f011e678ad4e9625181ca633c1dfaa3847cb7b3aa09433b6ce665cbf4eb39fde7f80ead402292bc75bb8442beba SHA512 04413a2cbdc7f6843f89560a519ccdb00bcfcf0c9254e9fff7a8901ed992cd7121ba052191399fd60f76f35e495f84c2297acd0a9a1898d4fbcadb7a60841d99
diff --git a/dev-python/iminuit/iminuit-2.14.0.ebuild b/dev-python/iminuit/iminuit-2.14.0.ebuild
new file mode 100644
index 000000000000..8f9a4ea554d7
--- /dev/null
+++ b/dev-python/iminuit/iminuit-2.14.0.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..10} )
+
+# forced implicitly
+CMAKE_MAKEFILE_GENERATOR=emake
+inherit cmake distutils-r1 virtualx
+
+DESCRIPTION="Minuit numerical function minimization in Python"
+HOMEPAGE="https://github.com/scikit-hep/iminuit/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT LGPL-2.1"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	dev-python/numpy[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	test? (
+		dev-python/ipython[${PYTHON_USEDEP}]
+		dev-python/ipywidgets[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		dev-python/scipy[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	epytest -p no:pytest-describe || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/meson-python/Manifest b/dev-python/meson-python/Manifest
index db841a64abd2..51c710833737 100644
--- a/dev-python/meson-python/Manifest
+++ b/dev-python/meson-python/Manifest
@@ -2,6 +2,8 @@ AUX meson-python-0.5.0-defaults.patch 819 BLAKE2B 1d6be7b3878b52aad4c0e0cf571a25
 AUX meson-python-0.7.0-defaults.patch 506 BLAKE2B 404c8d4803f4e6ca5244dc27c84f2c0440999e3fff87febeb12d1d304c7ed9f9358f6b958b5975d171995960bbf7681003180765d2bdb88e694e52c518a8381d SHA512 43b9825b9facdcf72f0b4b80a72aac8544ec1cedb14a79c53dbe37b190af170584acbb0d281d89ddeb199ea5ba720eb0de04c5294a3e7197019c58d7ee14d786
 DIST meson-python-0.6.0.gh.tar.gz 26783 BLAKE2B d5c5b95d5d609487a0efee1ce05b133794705cdb16f2d05d6e08b9201541e31f61a832c7770b4b5ad675f8dd91860c30c67769ce8fc0af2c48e65b0aad187ddb SHA512 25042ea030d2ad323c67daa0a520db936a4a4efa0de1c9f631c47fac22d797e01d1f1707ed407e2931164a35b3916e19a774ee16ab1d45fc91e41c75add57fa1
 DIST meson-python-0.7.0.gh.tar.gz 28959 BLAKE2B 6b60855d19c7dbbc4c8aca474ad55d4ce2a5db553ba86d2831adea7138d540433733d3b8e4077bf7314a6e6b68cd15b538b336afecaff3b262ae6d2157d8d5f0 SHA512 df529a3d31c67199cf72700734ea62b0de4f8eb03b437af9b53968e37c0350cbe60ba7385f8c3026d66fe2050df4c59912bf65e4a6e62ce19bace52fdcfef2e7
+DIST meson-python-0.8.0.gh.tar.gz 29367 BLAKE2B bf501ef73baa5481f5367b642cefca5a8b8655b4d74776aea21f0be4608c3e42d765f17ffdd037f39e7fc9c48d162293f93af61a30533e1823a66de5151ec1f9 SHA512 1709cdf3b357970566b25958cead88be2062e35ee8576275d0ca2571eca1f6a0211986b2693af0944026f2693511729b9d5cb30279952c65a287fa510c19186d
 EBUILD meson-python-0.6.0-r1.ebuild 1048 BLAKE2B 2c6fa715c72007b7ef19ecc532cc740387da9d05241fc7acd14b094b65086eb863b64470da496c938d945ebc6359f1123cc68ca52a064ca91c01e617ef3740aa SHA512 6c1d80399018626a7bc4b68f6a5dac46a8a5e8f8119603938da653d4793aa1856c62e3089d0960022b1784fd66079f680575486f5e6f8d4bfcfb180d66926764
 EBUILD meson-python-0.7.0.ebuild 930 BLAKE2B 3a8bb2c10bac4e8c27cf776e30efc8bde7ac52414d0bf79c97ee25cc9e311b5d1d46a98404a7c9621d897746936ac441e5b65380604468bbf493ed4bb4c9ec20 SHA512 e9a7a0501148d8529d9e28a286edab0663738be1fc43240c0230eaee868b209fbeccbb5098519aa0f9feb5a44fb34ded1e1d37b79948d586c6fd92a55e5ea152
+EBUILD meson-python-0.8.0.ebuild 930 BLAKE2B 3a8bb2c10bac4e8c27cf776e30efc8bde7ac52414d0bf79c97ee25cc9e311b5d1d46a98404a7c9621d897746936ac441e5b65380604468bbf493ed4bb4c9ec20 SHA512 e9a7a0501148d8529d9e28a286edab0663738be1fc43240c0230eaee868b209fbeccbb5098519aa0f9feb5a44fb34ded1e1d37b79948d586c6fd92a55e5ea152
 MISC metadata.xml 352 BLAKE2B 581fd656bf2da3af0cb7a9f50ef99effc9c2fc54c5012a363a3aaf4cb5cb1715c8626aed86ea176ebbbc22ece33e8b0f76d5c818b4533f99b3bac5b92f75fff1 SHA512 7e57debaea115565ade7e8ab87af065c4580506225df1a203c92fea877a9b918ebfce6fd172412bf318be07a8a4548be492318e5626b31688ed2714f00594d54
diff --git a/dev-python/meson-python/meson-python-0.8.0.ebuild b/dev-python/meson-python/meson-python-0.8.0.ebuild
new file mode 100644
index 000000000000..70f7d41728e8
--- /dev/null
+++ b/dev-python/meson-python/meson-python-0.8.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=standalone
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Meson PEP 517 Python build backend"
+HOMEPAGE="
+	https://pypi.org/project/meson-python/
+	https://github.com/FFY00/meson-python/
+"
+SRC_URI="
+	https://github.com/FFY00/meson-python/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-python/pyproject-metadata-0.5.0[${PYTHON_USEDEP}]
+	>=dev-python/tomli-1.0.0[${PYTHON_USEDEP}]
+	>=dev-util/meson-0.60.0[${PYTHON_USEDEP}]
+	dev-util/patchelf
+"
+BDEPEND="
+	test? (
+		dev-python/GitPython[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.7.0-defaults.patch
+)
+
+distutils_enable_sphinx docs \
+	dev-python/furo \
+	dev-python/sphinx-autodoc-typehints
+distutils_enable_tests pytest
diff --git a/dev-python/pandas/Manifest b/dev-python/pandas/Manifest
index b6bf11d7d585..ea8f18ee47d3 100644
--- a/dev-python/pandas/Manifest
+++ b/dev-python/pandas/Manifest
@@ -1,6 +1,3 @@
-AUX pandas-1.4.0-distutils-hack-assertion.patch 439 BLAKE2B 6753d2a86071109b586a0ea957acb2db1d394bed2a6ad0ede53d7ae4bce81e034ba8e929611aae701cc51ab8d9ef95c8c2d608ad3f9def16aed6fc5ae237fb68 SHA512 04a3644dbc5d07859fea162877a528124b8b0af8288464dc86c394675006710f73653af58ad188d3d628c356c66c201190dbc6d3e77c9d9d0a3b2f4c758e014b
-DIST pandas-1.4.2.tar.gz 4940242 BLAKE2B b44c9e46458b4e2919b2d215c8678601ef0976118197172ddc74fa712cf07b02cdb09b79940e90bf6907a45e7e3c63615292f7141a4fb8ed4ae22a36decd1e39 SHA512 6406241e30e9ed386610dd90bbb7407cfe3e94ff20c8fd1241aa75288894666f06e59f7c74b5f916080a3745254ba22ec9dad1195f040b613639b5712aced571
 DIST pandas-1.4.3.tar.gz 4941520 BLAKE2B b134f7c04c2478b7105214ed62e9adcaed98ffb4179a785f7887850d66702bf0f185d60a3da6de6226742529008bac614b494453dca929e477960ff3b43ef93d SHA512 d8d7575ce2b813361641d4e438844e03ed79179f5dcc56f2e4923bfeceab6f825a9bcc419e9492ee5e0272ea7c9bb9eeab6a0e242a880a87999df2a492436d8e
-EBUILD pandas-1.4.2.ebuild 6549 BLAKE2B 06dc9e22e7147b81d555cc60a7bd7d8d0d7ed2895ecf951a9fc433a35013a48c7ff4808739656ed3ad57414f8f3525e6e1b13a334132cccec836a3522673218d SHA512 6378a9d969373d46e215459ae300cfd5d9d394177ae76dfc350ed2006892c470854175b0eff4d7a694c09a4b605de6040c3eeb08ba7592e147dfbc7e58d66478
-EBUILD pandas-1.4.3.ebuild 6416 BLAKE2B 7ebd11b80db4c4ba4c64709d0d6c3b5b56b87d3c56fe6c87294bdac7dd7dbddf7b4d0043597d4b1a2c483aa5bef430a16de1069b8a0044b1c2a2048c9ed0b4d5 SHA512 f413dc2898c357ac6da50dba0fb6124fcee8bb70d22f88ced34382ac5ed15ef0fb0199c526156f00d2f1c0daaf02ae4763d9dccdb60ec0151a15c4d80ba89e65
+EBUILD pandas-1.4.3.ebuild 6415 BLAKE2B 301b741131740c4590bc92aceb84dae270a1324523116eecb2e62c247ab81c1728998d75f15b6990a6f72fb1c50be7b23bd3a45fe1a32289d736f3f70f799280 SHA512 bf4a88fe60608cfa29b709681b708a0097c21effb4574f34ff56e3778e71e128c6ce0f40df2dc2af81b6062c3ec38ed548d3eacd0a841e03ccf95e65b9899c73
 MISC metadata.xml 918 BLAKE2B 09b6ef472cbceaade61bfec8780ba3659838cd73f0a19b277d731db75655ac7e65d396f9fa74c19a2d5e03269c541dfe2af59296c048e77744f00bdb55295d4d SHA512 0b1fd089b0ce35a4e3408cd7224a249d427571a638961a8d63dee73b386d03b5a22e4ff085e2e548749f9fc03e9beb18317010d0b67f608dafe305bb4a87ddb2
diff --git a/dev-python/pandas/files/pandas-1.4.0-distutils-hack-assertion.patch b/dev-python/pandas/files/pandas-1.4.0-distutils-hack-assertion.patch
deleted file mode 100644
index 4842de94311f..000000000000
--- a/dev-python/pandas/files/pandas-1.4.0-distutils-hack-assertion.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/pandas/util/_print_versions.py b/pandas/util/_print_versions.py
-index 289900c473..91d518d1ab 100644
---- a/pandas/util/_print_versions.py
-+++ b/pandas/util/_print_versions.py
-@@ -60,8 +60,8 @@ def _get_dependency_info() -> dict[str, JSONSerializable]:
-         "pytz",
-         "dateutil",
-         # install / build,
--        "pip",
-         "setuptools",
-+        "pip",
-         "Cython",
-         # test
-         "pytest",
diff --git a/dev-python/pandas/pandas-1.4.2.ebuild b/dev-python/pandas/pandas-1.4.2.ebuild
deleted file mode 100644
index f362265d293d..000000000000
--- a/dev-python/pandas/pandas-1.4.2.ebuild
+++ /dev/null
@@ -1,201 +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.24[${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() {
-	local PATCHES=(
-		# https://github.com/pandas-dev/pandas/issues/44980
-		"${FILESDIR}"/pandas-1.4.0-distutils-hack-assertion.patch
-	)
-
-	# 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
-
-		# 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.4.3.ebuild b/dev-python/pandas/pandas-1.4.3.ebuild
index 8e958bbaf138..c3b39bbb5a05 100644
--- a/dev-python/pandas/pandas-1.4.3.ebuild
+++ b/dev-python/pandas/pandas-1.4.3.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/pygame_sdl2/Manifest b/dev-python/pygame_sdl2/Manifest
index 23cc4c177f94..766fd50a01df 100644
--- a/dev-python/pygame_sdl2/Manifest
+++ b/dev-python/pygame_sdl2/Manifest
@@ -1,3 +1,3 @@
 DIST pygame_sdl2-2.1.0-for-renpy-7.3.5.tar.gz 2678274 BLAKE2B 537e63a7e4755f6fea20f4ceec065272b83879958a0a794780b8976877aa083a2a9bc1b8b4a4592accaeb59dbeeac480d75965291ddbff324aea5c90d7dbcfc0 SHA512 b58a57d70efdfcea066735e3681047bec4fc89a9b75e423f5f889cd29f89a25bd0b96fcbca17578958b677e44858aafc9c6b17aad54dae640640bb7eb54cddbd
-EBUILD pygame_sdl2-7.3.5-r2.ebuild 932 BLAKE2B 8953eb98d8032c79b4c46b7c0c8262d07f29457c7e8006e85295e9be33b2e499940029fb9260c00392dffddb058039e42d92bde06de3c8fab46bc9e4ed0703a2 SHA512 aa4ad5a5ce673e894b966ce778f362d6e6b53a2e6ec8695054afb229d917ae143f8eb6908bd7fe2c649a0efe25a37d4e6d34cc720ee75a63a2b6e6c1cc1fa42a
+EBUILD pygame_sdl2-7.3.5-r2.ebuild 945 BLAKE2B 4517cdaf4b9617e8ce37193729335bd483070daf4e442d45707ac6e0780831505e1256ce1d2b5dfa9691720da6800f93da496c34f7a9f3622ebc9b22feb3907f SHA512 78093e382d812f10333535daa56e9fab0c9021ba5d8c70ed83b615e1a5df255e8635f21a4cb8bdd5b0a08b731b5aa6b298f41e95fae4445a2e70e0f70c70f922
 MISC metadata.xml 382 BLAKE2B 0456a0211bf9f5497ae588dcb47ed34d99f08b7600d135a4591e10c8ce8a7349c816c53ea4e800070afd065821aabf22a70e7482402947f2d1801c3250d62d12 SHA512 dd3d1bfe08a30dedf0da22a02e2a3f3e8d38ebd59b2c122b26486b6891ac7459a06368fc55bbce6b243880367110b1b908bd796a17feededf3b1d8b4c9363278
diff --git a/dev-python/pygame_sdl2/pygame_sdl2-7.3.5-r2.ebuild b/dev-python/pygame_sdl2/pygame_sdl2-7.3.5-r2.ebuild
index ba75fbfeece8..cd005d4ae4be 100644
--- a/dev-python/pygame_sdl2/pygame_sdl2-7.3.5-r2.ebuild
+++ b/dev-python/pygame_sdl2/pygame_sdl2-7.3.5-r2.ebuild
@@ -1,9 +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,8,9} )
+PYTHON_COMPAT=( python3_{8..11} )
 inherit distutils-r1
 
 PYSDL="${PN}-2.1.0"
@@ -21,12 +21,13 @@ BDEPEND="
 	dev-python/cython[${PYTHON_USEDEP}]"
 DEPEND="
 	dev-python/numpy[${PYTHON_USEDEP}]
+	media-libs/libjpeg-turbo:=
 	media-libs/libpng:0=
 	media-libs/libsdl2:=[video]
 	media-libs/sdl2-image:=[png,jpeg]
 	>=media-libs/sdl2-mixer-2.0.2:=
 	media-libs/sdl2-ttf:=
-	virtual/jpeg:0"
+"
 RDEPEND="${DEPEND}"
 
 S=${WORKDIR}/${PYSDL}-for-renpy-${PV}
diff --git a/dev-python/sphinx-autoapi/Manifest b/dev-python/sphinx-autoapi/Manifest
index 931d9c5cdd91..b28bee97dae3 100644
--- a/dev-python/sphinx-autoapi/Manifest
+++ b/dev-python/sphinx-autoapi/Manifest
@@ -1,3 +1,5 @@
 DIST sphinx-autoapi-1.8.4.tar.gz 83541 BLAKE2B 05d706fda6da4aea55e535a995ef01dc54269fa8e452c51c9bf2cec2e596ccec20191b8cb3c0cde1b93daa4f5d85074a293c9fd449d99d3c494ba20c6cee2df8 SHA512 10b4d87e1046ad372a3491006cd4bece8334fc398025f98654781c83ee200045d707f3293a031f8cf0abe5d20a111e7ded864f2b6deffe5222b331ca8c9b688b
+DIST sphinx-autoapi-1.9.0.gh.tar.gz 84730 BLAKE2B 31547c0dee076736d65867d9856e713581c440d2b1f01b7ebcbe09b31a7bf2979346bcbe18d6064fd5656b7d7dab9149c67fe79f0db7e5757c2581370c11a8cd SHA512 f098f474d9821c974c2ede77de30f3317c87cb87ec00b7a1c021add1d07a1ed59fa3b4165edf2b7f5165004ba9c717394962154098bc89b52989d0e604c542f1
 EBUILD sphinx-autoapi-1.8.4.ebuild 979 BLAKE2B 5e32cd651f8490e4b15680b97a54a6fc357a2ccd492fe281ab04a2d14b58f3afb5618c3fa7f6460818aa62ba82341506d10ecebb72bdbd085fed361d0f6c0e1f SHA512 41ffe1a37865cb21bfb4aca259d21ade63ed64c24d9092aefc155346ac1fccd86010f9c12934c6f53fbb93bf38f7b4fd1624dcc5712987e7d5bb9664a5afe3f3
+EBUILD sphinx-autoapi-1.9.0.ebuild 1069 BLAKE2B 2e641b588ece7f2139ff2dba072c4b8b5226c849255f252769fb51757737fb30276d1e09a2859053cacf96ade68e9bbc35149c15b6af251d93511dfb9128d0f2 SHA512 3b20ab49dadd26ffd02eed6b64bdfe07cef9e7a7c9ac285c3b062c78eaeeead6ff9b341f7f7189f397386b7c7332066f4d370be86d9d8826d5946f73064e6867
 MISC metadata.xml 769 BLAKE2B 6f85e487a2d2def289bb54a6addc2338bb8af85b323ec1c95851945f9c407ec22bfadd8079ac8b6e00cfbc85caa0e2b09d82329f1f87a365fc44b69c7bcd9a20 SHA512 68f02a5f98234c2a5cb15aa04ce90077b154a7e3a7a69dc0a1d0a6b5c7b42c60624878a7e2fff1576c8b586fc15e7ef042942274d4e8473835bb3d8bfdbd8393
diff --git a/dev-python/sphinx-autoapi/sphinx-autoapi-1.9.0.ebuild b/dev-python/sphinx-autoapi/sphinx-autoapi-1.9.0.ebuild
new file mode 100644
index 000000000000..3a7bbebfd20c
--- /dev/null
+++ b/dev-python/sphinx-autoapi/sphinx-autoapi-1.9.0.ebuild
@@ -0,0 +1,41 @@
+# 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="A new approach to API documentation in Sphinx"
+HOMEPAGE="
+	https://sphinx-autoapi.readthedocs.io/
+	https://github.com/readthedocs/sphinx-autoapi/
+	https://pypi.org/project/sphinx-autoapi/
+"
+SRC_URI="
+	https://github.com/readthedocs/sphinx-autoapi/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/astroid[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/sphinx[${PYTHON_USEDEP}]
+	dev-python/unidecode[${PYTHON_USEDEP}]
+"
+
+DOCS=( README.rst CHANGELOG.rst )
+
+# Test requires pypi download w/ internet: https://github.com/readthedocs/sphinx-autoapi/issues/329
+EPYTEST_DESELECT=(
+	tests/test_integration.py::TestExtensionErrors::test_extension_setup_errors[dotnetexample-override_conf2-AutoAPI
+)
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs --no-autodoc
diff --git a/dev-python/stapler/Manifest b/dev-python/stapler/Manifest
index 07a67233e2d5..18bc2b2aa098 100644
--- a/dev-python/stapler/Manifest
+++ b/dev-python/stapler/Manifest
@@ -1,3 +1,3 @@
 DIST stapler-1.0.0_p20220330.tar.gz 43659 BLAKE2B 10c24868d51086b37dd2d517aa84e3c3fc0b6becc7a29ebf496646bdd65494eb0c43488f725241d7bd7b3083ce5703538db3e05de9976a2e5029731fc2e645d2 SHA512 acd2dfec0dfab46b2cf6b440cba6c0db5399be2ba2194ca12530c311c6c5a8028614164af45b850061e7d22cbec33458ceff7757f1b104c722228dc2d02cae0a
-EBUILD stapler-1.0.0_p20220330.ebuild 673 BLAKE2B e9d5b49dc5448440aef3e808d65f2798689dad337a109c77162010b743da3d73065c0005a37988bb197bc32783f5aeb28776e620f723b3a36d417c0a8e5740cb SHA512 9fbd50fb7199553c8f307fc1811bf78bb738e16e76b6414777bdf802483de148a4c0ee2b36d9fc0075b1403d3b69ccd649502f1c3e6553c1e498bf6fbfa7c50c
+EBUILD stapler-1.0.0_p20220330.ebuild 772 BLAKE2B 2aa6b23c568e71eefa094778df9b4682b584626c1a123a6e45abde791a712a8a2779e846b6234881b5fba15c6587a183ae53593e0718969b083f3d72f92e315f SHA512 a3ee15f9f513044c3f0aca35e1cd9aa7caee4b3fd8d8c979becfc67a978945e93580dd52e4104670c7042a82f11643a3e63bfe97385260dfc2619089a78a3ad2
 MISC metadata.xml 398 BLAKE2B 3c566702150e77dd0ba58f667336f57c0347422496edeb4fdd53e0f131cb966d15781a5d5b5e13211b2385e410a1d12c064c3ffe66056395b6eeeccdcca1cc72 SHA512 802c118d28a07f7fba6558aaa8f60aef0ebf137395af566e273ba1d218712d1835c74f82c5160f12d120d8776cbaf4fe7d09827a84c1a5e234fef307e0835a18
diff --git a/dev-python/stapler/stapler-1.0.0_p20220330.ebuild b/dev-python/stapler/stapler-1.0.0_p20220330.ebuild
index bcfda6105f88..4f7a695bcf35 100644
--- a/dev-python/stapler/stapler-1.0.0_p20220330.ebuild
+++ b/dev-python/stapler/stapler-1.0.0_p20220330.ebuild
@@ -23,3 +23,8 @@ DEPEND="test? ( dev-python/PyPDF2[${PYTHON_USEDEP}] )"
 RDEPEND="dev-python/PyPDF2[${PYTHON_USEDEP}]"
 
 distutils_enable_tests unittest
+
+src_prepare() {
+	default
+	sed -i -e 's/^from PyPDF2.pdf/from PyPDF2/' staplelib/tests.py || die
+}
diff --git a/dev-python/urllib3/Manifest b/dev-python/urllib3/Manifest
index 1bc9dec6faaf..e794667230ea 100644
--- a/dev-python/urllib3/Manifest
+++ b/dev-python/urllib3/Manifest
@@ -1,3 +1,5 @@
 DIST urllib3-1.26.10.tar.gz 297854 BLAKE2B 2523bc197ed9720e2bd011ffa46a46605cab902d66b245cb5229e15e90ac5bac990851d6cb9b6aa2dd5682da2639af7cd8e3c8c27f1210e5ca0c7c10498babd3 SHA512 76c1cc9420c267986c7775a9d9eadfd08e980643c2da16602f755e11a274ffbbf1813f30245fb0d84ee3a99bb3aa33b98893f285cabec8dd4aee1304420cb15b
+DIST urllib3-1.26.11.tar.gz 299255 BLAKE2B bf4d5f0b9f8a95c825b9f8fd963a1dc46688123641c3198812dedc11155f445f75ca321e3e283b649bc30cda8de497d0fb88298d6ad41660d91b8843121e50a2 SHA512 d2cc0f57469b640147f2087e2844a7c2c45e5a374ad0f28c1639d9a38ff6d6760f65b9b3187409cee29782d854468a1e4bc1b20d96e010fdd1fd4213bf1cd924
 EBUILD urllib3-1.26.10.ebuild 2307 BLAKE2B 3f7465fe5eb0d5babf0f63795bf1e529c94c74b7db3083d0827071f8a3f96968ba294ecfe8056fbaec34522956be80849568ff013e48a02d787d50190d45fe1f SHA512 8b3574e934e7598b20e8be3409aca9ee7ce969b95adfa2ac6f70521ae8b49595597ce66c4c94b9fcb88e808dee1fb8b04b843f59a04885bcf07372020c92488c
+EBUILD urllib3-1.26.11.ebuild 2315 BLAKE2B ec115b8e76fca07a4b2c8405a97187ff99cb69647275300a0ceb884709ea311010b7f605db8076969e2c8db5682b3c5a8cda0d04e197ad97b698c1579e9e7c9e SHA512 ddef2fb641fa2cd8b4e1679716b8b914eeba0f7f0f38e10e7106bfe6487eb7d9bf93fe50142fc627bf8cb9f3b79297684276f92bfdcf71ffc1d56f40f4ee00e5
 MISC metadata.xml 531 BLAKE2B 3ddfea4b8817c827437a79abae8cf4e9cda95addb1c6505ef13018587720bba0cf0788041c0b4cc8b25f319e7cb1c94117ae25b3cbb567f24373e8e89bedaa7b SHA512 7e7191f0338c4c47f01bdceb3d2c6ed94de2241e77fb3be6cbf3ecf8a0682730392a9ee5adf24304d9a322acc06bd84f4f90f1dddcb258cb2e9ba0de9952b693
diff --git a/dev-python/urllib3/urllib3-1.26.11.ebuild b/dev-python/urllib3/urllib3-1.26.11.ebuild
new file mode 100644
index 000000000000..47fa4076e5a4
--- /dev/null
+++ b/dev-python/urllib3/urllib3-1.26.11.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
+EAPI=7
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+PYTHON_REQ_USE="ssl(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="HTTP library with thread-safe connection pooling, file post, and more"
+HOMEPAGE="
+	https://github.com/urllib3/urllib3/
+	https://pypi.org/project/urllib3/
+"
+SRC_URI="mirror://pypi/${PN: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 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="brotli test"
+RESTRICT="!test? ( test )"
+
+# dev-python/{pyopenssl,cryptography,idna,certifi} are optional runtime
+# dependencies. Do not add them to RDEPEND. They should be unnecessary with
+# modern versions of python (>= 3.2).
+RDEPEND="
+	>=dev-python/PySocks-1.5.8[${PYTHON_USEDEP}]
+	<dev-python/PySocks-2.0[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	brotli? ( dev-python/brotlicffi[${PYTHON_USEDEP}] )
+"
+BDEPEND="
+	test? (
+		$(python_gen_cond_dep "
+			${RDEPEND}
+			dev-python/brotlicffi[\${PYTHON_USEDEP}]
+			dev-python/mock[\${PYTHON_USEDEP}]
+			dev-python/pytest[\${PYTHON_USEDEP}]
+			dev-python/pytest-freezegun[\${PYTHON_USEDEP}]
+			>=dev-python/trustme-0.5.3[\${PYTHON_USEDEP}]
+			>=www-servers/tornado-4.2.1[\${PYTHON_USEDEP}]
+		" python3_{8..11})
+	)
+"
+
+src_prepare() {
+	distutils-r1_src_prepare
+
+	# unbundle urllib3
+	rm src/urllib3/packages/six.py || die
+	find -name '*.py' -exec sed -i \
+		-e 's:\([.]*\|urllib3\.\)\?packages\.six:six:g' \
+		-e 's:from \([.]*\|urllib3\.\)\?packages import six:import six:g' \
+		{} + || die
+}
+
+python_test() {
+	local -x CI=1
+	# FIXME: get tornado ported
+	# please keep in sync with BDEPEND!
+	if ! has "${EPYTHON}" python3.{8..11}; then
+		einfo "Skipping tests on ${EPYTHON}"
+		return
+	fi
+
+	local EPYTEST_DESELECT=(
+		# unstable (relies on warning count)
+		test/with_dummyserver/test_proxy_poolmanager.py::TestHTTPProxyManager::test_proxy_verified_warning
+	)
+	has "${EPYTHON}" python3.{8..10} && EPYTEST_DESELECT+=(
+		test/contrib/test_pyopenssl.py::TestPyOpenSSLHelpers::test_get_subj_alt_name
+	)
+
+	epytest
+}
diff --git a/dev-python/virtualenv/Manifest b/dev-python/virtualenv/Manifest
index a58ec9976c07..38923fa8ebfc 100644
--- a/dev-python/virtualenv/Manifest
+++ b/dev-python/virtualenv/Manifest
@@ -1,7 +1,9 @@
 DIST virtualenv-20.14.1.tar.gz 12216889 BLAKE2B 7d06b47629dcf4a60299b9b0a192478b20ef820b8a7516569e50b57b2df383781e7e14fd4beda14a3425164997e69c8ed922edb593f86eb3bd85e4ee3a9f2ac1 SHA512 149e78787db23eabd4238baa172bf023ddcf87d59284fdd090269acfa15991aab182f9e168851f88ef810d5c50dd7cdce69d132c46ebedb10080d65a308e63a1
 DIST virtualenv-20.15.0.tar.gz 13523195 BLAKE2B c5d4b1fd78998ccdc7a041d11e0fcb569bfd00151975170260e245726eee03b4ef1cf758d43175312e69e4b482f9ec17b4e93e6854c3bfeafa2304eef2688a20 SHA512 2e3cddae926f89ef986a85ddf592b38d53401212e974b65243b9f47290b653798ab2405920c28d3a7961aeb726f25ed6401e19661f1e9ce7afd195e87a0524ab
 DIST virtualenv-20.15.1.tar.gz 13523736 BLAKE2B 4f8d491fae7c0c28ae349845c4c5ddd27e53b9007a427c8a36e66a427269b519829f1c351f028b63fe38b49e934f4e209bd2cf2e07363171f732c6b0a052a3bc SHA512 244e3b091c8b049edbb07d808633fd44b3327200e1d38394814794773d05723ef535721ee163b382d23bc16572d55657b5c2544efd83494753746cc85116696a
+DIST virtualenv-20.16.0.tar.gz 12217565 BLAKE2B 534d665b56191c2e804306677b6771d3d0fa6104c476f8f17fbf40c2f8a3b7ccf6ffa9f8dec4d8de515f610f2ffc7b5d67bc99d82be4c0cc73990e5664a1d1e3 SHA512 f34827ec0e1b7325ee23b53b5fa2c36c1377d3fe7265b7187cf43592f74b37d66747abf69f0f33850212bf3aa69c98147cfffc37b311b98a1127f7ac5d9c69e4
 EBUILD virtualenv-20.14.1-r1.ebuild 4636 BLAKE2B df586e00a1dfe68aa3eb6f1757ced244836475eb4795dfc5044f78ea612f15226fa50186d7441cf01f4b7eb3f58fe166e49dc46cd9f71e8ec1c400ee7857338c SHA512 4e307ce1dc6b604f71423942f8adc2277fb96ca94584922982cbbae801ea22fb55e2b5b4766c783f1ad39606a366539fafdbc939dffb8e4cc946f640f690d0b5
 EBUILD virtualenv-20.15.0.ebuild 4644 BLAKE2B 360e3be683b1a652b43d4776d4dd20ad0525982be0b4fcf4f36c23c5b65e8b2fb239433233821395f9e90eb6dad5a4918b47ab33d8e93b83a1054c0910a7d530 SHA512 240ee0635b462bc050cad1f239135e76acd3823fae25f44c2a9f786072c53d4e801ec300c421e4dbdf8ba79a93c2164b43e3a37a2e8a95eb7c26b9be64da82d3
 EBUILD virtualenv-20.15.1.ebuild 4644 BLAKE2B 360e3be683b1a652b43d4776d4dd20ad0525982be0b4fcf4f36c23c5b65e8b2fb239433233821395f9e90eb6dad5a4918b47ab33d8e93b83a1054c0910a7d530 SHA512 240ee0635b462bc050cad1f239135e76acd3823fae25f44c2a9f786072c53d4e801ec300c421e4dbdf8ba79a93c2164b43e3a37a2e8a95eb7c26b9be64da82d3
+EBUILD virtualenv-20.16.0.ebuild 4831 BLAKE2B 2b51a3445b2ebf8570a8af6a4a49e746854c44f3060bdad926dc20e657aca800aff09b345faf25e23bf991d7b7fbbc3f8bb9fe73b6645186a798fe38b42825e8 SHA512 cb68375357095304a6f52c6a0fea22b54c7531e4091f709a9363c202dab2804c7c018b343a7a938c97ac728124d229946280a34946c5077839b12974ed43fd79
 MISC metadata.xml 406 BLAKE2B 97fee04c2662c5c36b6e16538284def46eb2454424770f42edf2567ed804ca15c4e969c714c57573f897b0946246577ab6e35204ed1f3f1735713d8ab5d24667 SHA512 356d42db463b63a3b3a55c1e98eb661de0a10aa6a5fde4f8b3f888ec73020c6679e86efd8dbb0b3e4a5a720af95e658612ba460fe548e081a90beec75fb9c1b2
diff --git a/dev-python/virtualenv/virtualenv-20.16.0.ebuild b/dev-python/virtualenv/virtualenv-20.16.0.ebuild
new file mode 100644
index 000000000000..8018e0d0a409
--- /dev/null
+++ b/dev-python/virtualenv/virtualenv-20.16.0.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.1[${PYTHON_USEDEP}]
+	>=dev-python/filelock-3[${PYTHON_USEDEP}]
+	>=dev-python/platformdirs-2[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-41[${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-20.0.2[${PYTHON_USEDEP}]
+		>=dev-python/pytest-freezegun-0.4.1[${PYTHON_USEDEP}]
+		>=dev-python/pytest-mock-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/pytest-timeout-1.3.4[${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-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index b5ca73648c97..aad7919a5140 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/minitest/Manifest b/dev-ruby/minitest/Manifest
index f9241bc855a7..779522633484 100644
--- a/dev-ruby/minitest/Manifest
+++ b/dev-ruby/minitest/Manifest
@@ -3,7 +3,7 @@ DIST minitest-5.14.4.gem 86016 BLAKE2B 1f7b8c72b41e1f4e47852021dd99df411a427ac8b
 DIST minitest-5.15.0.gem 87040 BLAKE2B 71e7a7952c25fd37067a449867d74a2f18a8a42d1fbd72f24d6db226c54a18e9a21958654d4176176804bedd09ef9d1d3be68f79e29312c3f85d0930d3d68d7b SHA512 5e97a7aa616966ffc60e10cdc0ba123a7e793f10283ec3b6bf36066177036788cb950ad566fbac49e613b93f08b9846534f463017cde966b4890c3a34a2286be
 DIST minitest-5.16.2.gem 93184 BLAKE2B 005af875bf38e3744bf9de90ec6e964487908a817c19094dcee658963ab2c8882bb1cc4e0b19124b83af9f5da019a8d9e611ba21856f50deca8d9eb1757640cb SHA512 714dc201e9a8a45eefa080ee1a45fa66acb2de0cf624e7c6233e7e1745c35ef9e1a8d24236ecf33f440c05c03f09e017c6ff1e077473b22e3abe5d1ff3126989
 EBUILD minitest-5.13.0.ebuild 720 BLAKE2B c0dfaa029354a66dde23b3cb3fb1655e88cbd2d1fd8bf97bda8573e003aef8980e95ca1b38da252687c465dcc8309d62f5ac5ca7a5656971a559c9208dfa8ef8 SHA512 09c38e025fe40616270f14f05a7716b3a1c703d2d504dc3ff612f38403874f54e927835fb769b8c80c01c27c03f2f4ca7e6bf72f72feffbd585cdd6009ea257f
-EBUILD minitest-5.14.4.ebuild 730 BLAKE2B 95d6eb6686da0bb467605da3c83ce730d06fba876042b42d5b5c4e8a1cf23ffe5c66b7632fc136fa16b988030978e80cff314bdae6b0e23207869e0abed9cb6e SHA512 23a8178eada541a191c8eaf98576791ca284b43ad2738ac838a4c84dd82f38b8c6b596e1b00e838a00ab8f592ce6400645ef083e839a0a326fb95048d5800742
+EBUILD minitest-5.14.4.ebuild 728 BLAKE2B 01717fed1808748addec67939fa6b17bb6e5add0822e1d3036d0efd4471f8b782a33e558a59690808d7c3b6b00a789bad78e982fd0c4cab858db2f0f0240a7d9 SHA512 f3e37860b4994cacfa5e4f9f54227a4f2eee118bcdf3c36074e3638522ee53d2147d7e6b83cc248685600b3508b02034570b78f50e834d68a2a17f3a8554b15e
 EBUILD minitest-5.15.0.ebuild 761 BLAKE2B 3b8b86a9826aaa1a2439ff70a0762175321236d94201699fda644878bd4186b149d929762010938233aec8f35d75ccba0948a0ae563bbdfb8d88f6be8cf0d971 SHA512 3e7c7244504052f7235801ff5b8be1843385bc536656d9d4756c3888d0d5a6883f944295942d9c61a7ca6bc562583c8419b689f05bb62278f4928c0939963039
 EBUILD minitest-5.16.2.ebuild 774 BLAKE2B f89999b511cf70efe1d9629d0dae15a71d2444a6d102821aad142ff148d50ace0eb1fa9418ef26ee123f39aaf869ab1f781182f3438a4306939f78279a51c973 SHA512 dc971935e750e17880ac8b0edbded90db194904be0fcf0f65592ad20a04c6623488c6c2cbfd6c22c27f8821b8f57bf08896f87b672f0b12c7ad54078ae9fdde3
 MISC metadata.xml 345 BLAKE2B aa5fc9309fc2803a64737c45818f713867ae504409b879c1481125131fb661a1c71f99d3facb5c7253561b62c32ea4d27c9344bfa0c6ad66a15eb1daea81ff42 SHA512 df9736bf7588243c9d1ff886c8b428237cf96f239fccbfe6561d60b910a07f70750db6576d3aa4597746d18fcce8a708f1aa9be4f9f2796823d1a4e154c6fb4a
diff --git a/dev-ruby/minitest/minitest-5.14.4.ebuild b/dev-ruby/minitest/minitest-5.14.4.ebuild
index f21a8c2b0a58..5d3d7abca18f 100644
--- a/dev-ruby/minitest/minitest-5.14.4.ebuild
+++ b/dev-ruby/minitest/minitest-5.14.4.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/seattlerb/minitest"
 
 LICENSE="MIT"
 SLOT="5"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 
 each_ruby_test() {
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 1a68f1f4337f..479b5e544afa 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/maturin/Manifest b/dev-util/maturin/Manifest
index 80cb6873ff5d..7fb27a2f0350 100644
--- a/dev-util/maturin/Manifest
+++ b/dev-util/maturin/Manifest
@@ -24,6 +24,7 @@ DIST bstr-0.2.17.crate 330350 BLAKE2B 90c3a48d78b73d7e36a3da9fda0beae6e91ce534d1
 DIST bumpalo-3.10.0.crate 78915 BLAKE2B 94515190837765b47feaf94946c7e4da5b84e6faf7975bd5452bd9388d34e51c84315b80bc15b37c7f4ea8b4aaa0112707cdfc82d0651eeb8b63d2e7bd247660 SHA512 60c686534588524250ea7cb43510dba69d24999769b719127ee07f6015530ac2c5778d9b93477ab075bfc15c13e3ef9adc29ac24059067ac32e109347cd509f8
 DIST byteorder-1.4.3.crate 22512 BLAKE2B d39c546ba7346df315297fc53da4bfc77ecb1f38567ddb788549ee31cae2719a8bc0b7d1f1705abb3cff033aa57af004987d90748f5a31765273b3223a011c0d SHA512 8c8000eb8ecf40351c9ce36a3a8acd7a02f81786d1b11aab85adfeffa0f2267ed74df29b2ca5d1d38128484d1d3cad2b673aa0d0441dcd0620dfd3934bb888fa
 DIST bytes-1.1.0.crate 49640 BLAKE2B b3140dd49dc222cd0405e405da9629038eb7d71dd4c22c8d6419ade041dc1118aa46df38f3426a36a44d8e5591c368ae32a89e71850dca7e810bbfff4441c37d SHA512 d34441ea146ccaf55da4d5c645f8ffbd008eeb3204dafd5961771abc85df52751dfd1af3975fb5c91eb83d9a43da4f3589bc3aa07c8d715906d8158f3092af2d
+DIST bytes-1.2.0.crate 54688 BLAKE2B 7691bdd170be8b7bf77b52078d547c1d007fbd97c5465672cfb558bcc8934377313de06e7dcc7d6ecd3f9e7c9fcb232c8a80b933591f7c160fa07600872b80ec SHA512 91ecb2ffab68ed7ee91112ab1462a036e627470e75077d00ea163e9f91a920404f502fb55c4ba7d7941f799a6077990170a15f69a4df3cd8cb73dfb677eab7fa
 DIST bytesize-1.1.0.crate 9370 BLAKE2B 38fcddbdb862e82a076b7ae1339b48c776f704d25be78935d08637351ade725e86e00e07e62868e76a1a2db894f223e1f8309f8b362a46405ec6c06f6e421a96 SHA512 36f35cf53c468cf011b231d3fc5d00c5224fa3d917854e347daeaaae53ae7ee36c4d8ba26788460d56c922c9ffb0eeebc60655fef7366ae42e221950d03f6715
 DIST bzip2-0.4.3.crate 34195 BLAKE2B 946ff5824531de8b82241fa042638cd33e708c4b517fa40c99e49f77ac7fd7aabe614e4b560ed8f5484ef8fd06bf19041cb20b7a622f4f1dea9ba26c5b821c5e SHA512 2d4622c336f204ab28970ccb369ba55829bfea426bfe96f15da376f2375c441a9bfb03c46f5da210990f23115740250cc15e9036309034b39a1c960dca542da2
 DIST bzip2-sys-0.1.11+1.0.8.crate 633444 BLAKE2B 01578c512443134fc786669bea4f2ec4b9c457b9936c907315299d8b67ed78045d458c83ccc119f0fad511529fb5af5feff5fa2d983fdae832d2fcc1b343e102 SHA512 d0a86b9f03acb1e4e309d5739dc2e88cab582757d467a433afe0017017f0e5d2c0282529e3a117160958ed170d8d695ecae739805888305df0e35e4dc440582b
@@ -33,10 +34,13 @@ DIST cache-padded-1.2.0.crate 9125 BLAKE2B d50b506aca9cfad3117be593c33bba4a52400
 DIST camino-1.0.9.crate 29357 BLAKE2B 7d855e08bed677242235197765a9f1f82e2743a0c439fa7ce4febc3b4595a5f9f66b23469d6cd610f4caf4a7bd1dbb1db4a7b6211ce43f08b4fb85a131e69d6d SHA512 5aca5f7a0639c97f5d5898fbbff9fa7ace9603047596941c62c611abb125525cbe5a4672057f4bbaecd7e34d907191ec5800415fba6aa0e6de9f52faee6f5363
 DIST cargo-options-0.1.4.crate 5025 BLAKE2B 270254b16d7d05cd03781ed17fc79f49f6e11a749d8db0b9ac50eb5a214fedd0c501a1bc075e1020ab48ad59b7ae8217a94cba36954bdf9eeb4cd81f9bfebd84 SHA512 a259e849edb121b4b1bd14e6e6ce5ce88643d6917c2d017c215a162a75445ea50a39682f36043625b29e073ac2f87dac2f46e37d040f7b89546b7a79bf6ae197
 DIST cargo-options-0.3.0.crate 5936 BLAKE2B d3badb4e4101217b2c6422f7210ecaf6ccf824168ec31d7ffd99f7f41a3c4baabbc1036dea41a7a8e0c77e31db3cd530b1fa76bb4b57ef6702e59cb3cc3e3670 SHA512 ee08db46378f7867a75ef4e314c3368a230e212e5330ee6f9a91d86636558d590726d85d4f393f339c17b0569b062b5a75ed664e475f93e5226e4adc6a82df74
+DIST cargo-options-0.3.1.crate 6294 BLAKE2B c5d0c10450bee5bcb1ce40b998150572a27ed70076870a5beca7471b3a728426a2a28ef8de4aa472103df80cadd43e0edd567c1e2268b656468f5f4b59b7c7c9 SHA512 8e710ccd23bcc3570bf05f7234eb76f8cbd5241b3a53daaa2634f2d56ae5e25488b4807d06ca65822f7fd368171eb83a8e005c396b817bf9330892be8a65d6e9
 DIST cargo-platform-0.1.2.crate 11645 BLAKE2B 7770acb90e299f71c60bbadceaf894a3100916b7f7458f9c949b683b39157d3e1ec17d850f16dfb04017b01d7734d41872d48cf9f4e1ea7414439cd7031c2330 SHA512 c716bf3a4e0942160dbf7be114d1621e1fccc23511e7b0a2b99852b99a851910bfcf8640c2d0d0a03d5a324e1a59fb5d4264ca81bca24e3f1a1ca653bdf2956f
 DIST cargo-xwin-0.10.0.crate 24775 BLAKE2B 61349985b2189654d52e78c388aec2a978b6813e66cc90c098d88a5e26d57ab64b0d807730c67b315503d78fac2cd631230ff7f6a4af296acad2606bb7998543 SHA512 2a020f473d4cdcbdaa0f408c691d5dabc39453a5589ef0d903aa1679734d10681602ce8899c9c771024c763761a990ccfdf2202070cbd51b1e3d8e985b387467
+DIST cargo-xwin-0.10.2.crate 24964 BLAKE2B b499bfd7c269f96b72c63d6b809df2bfab1df5375f36274b6d82a0b74e2e85fe7272ae208cba23f6d668cbf74ca5f5ba2670e421f37b58f5dc9c8afea0e1dd85 SHA512 f8e3c9aab75f96e63460710165bc8c7f4c01c7efa13288967a54057c940937f62715e709222d39823530944f785e9fb7291e3a060d591c6635d7bfdd6c2ba164
 DIST cargo-xwin-0.8.7.crate 25282 BLAKE2B f38bcdcec890cbeb3a7f1d73bdcdfcc0e3c497adea64926899b5aac075687ad36f52a29983e6d580a28bd0fd4ff9e14f2b88eaa0efb5df7b04db0f74f952ea98 SHA512 8c86564c8f88ee7238d28c2c3dd680a301e6fba65bfccd11364b0d603a5446d4e850048cbed475912fb4be3e4c677f8cadc6201d0a6a6541e8034873fb657702
 DIST cargo-zigbuild-0.11.1.crate 23595 BLAKE2B e7b6e8e7a69046d10093ef564b9da0f8035c215339ea21793dddf8af1c3de026012b91a6cd2537842258a2e16a9978a565fae37fcee1a1853b77ed55782c1ac9 SHA512 05a86eb168d8b3e3a88f27c7b2d04a3c84f6f319fe3953a86238f43e1ede3b9d9256e0bc8f258be9e6fa7a61afe3dc1aaee41a232b31923a80e34d50151bc2a6
+DIST cargo-zigbuild-0.11.3.crate 24044 BLAKE2B c71a683f78f6320d34e2626f7089836a28a1670e7c9c4be54be0e77b50389c15b08b38d4e7af004cae442dddc2e4296820a89d7694724f7905436d1963da14b3 SHA512 727cf3eef7f21229cddad38df83a42b6f7e6d267ef6023e2ca3e70cca69609b37aa5172b6d8fd709a62a5f38a492ab651779d8521a022147552c01b584f4d271
 DIST cargo-zigbuild-0.9.0.crate 24926 BLAKE2B 91b2bfe9a59f1749da54ec73602af29420fc4dfd885c845463a08b493c724261e241b3f5006e2790b45a1a0297dd8a2db33111a60033280c71a34700b135ae77 SHA512 8eeff655568676a88cf3b058131511d1b58d7967d75dccefb0464633df1e178dc15e6e8fde20935d13e899a86815bcace3acdce2b3e85533804a29905be1d777
 DIST cargo_metadata-0.14.2.crate 17469 BLAKE2B 4e64bff7710c51d95944faac60b4881b5a43d5edd07ef87c8f4b9826e63dd708719cab27542fdf82cfe869d8781c1a6918a050aa0de71086316bd2f480aad947 SHA512 16e6bb3ddcfd4c6d48ba3415780518428f771c393ffe10ce15e1f3c026a6f3bf40ea9f25214049841b1d7d51f2208ed032961a75cb641c5afc52e02cb84d3262
 DIST cargo_metadata-0.15.0.crate 17634 BLAKE2B cb6dceaaaf4f4a4bd339b429c4e45730ee018f947a560a468682bd4e9a09949a625b96f713d5b2270a6609622c1992def8145850a7d82619cc5120c3be304f5d SHA512 cbeddbccc8f7578b34976ead3076c8db66d20d5681affa81ed583ad8c84ebb5d6a3b8a40e3c42fd1667aacc9d0829f928e210f3f451e636a2b5732cae17cae1b
@@ -50,12 +54,14 @@ DIST charset-0.1.3.crate 14330 BLAKE2B 928771e37cc4f86f49cf09b671cc016cb66227579
 DIST chunked_transfer-1.4.0.crate 9238 BLAKE2B b29737023c78041fa1166d56bb5fb7be2e502b06c56b0fe127c1ec2eaaf3ebdbf9bfdc8645d7234dc17703706529406072b90fb06a15df482b1065044d3dd4c4 SHA512 b3891bc1b101677c2ae6bbac19e74f5ad0aee7b499b0a339b78fa0af7150b2ae0b2151d640bd2a7c4d052a12cf935d16e04db3d37d0048ec1d79a9ff01f13389
 DIST cipher-0.2.5.crate 13099 BLAKE2B a728a53007340dcc55da52cc170e5b801c8ad20c4e159d31200d5ab7f8bf4407af9a60713b4385ef0d65c06cc81692cfbd7339cb7449367d1eaf7c529ca34373 SHA512 e55627f5424d9b566dfb0787eebb1fb17ae98b4016c9091e87040ed37b36e0256b7681958a0d90aaf06c125c71123270bf986128ca1e0dc125f3162a868848b9
 DIST cipher-0.3.0.crate 12756 BLAKE2B a572b0140512b7512d496f2706cdfaedb680d47a283e3db8b4be97418585ed988929a3beed44012e8a9d9728cbc21f00b78bcbe376bbf57614d54ea07e4daf4c SHA512 8f0094c7786160730825cff21ca838f52801783f1f4f66755b0771595963b8b99fc926265ff502c66b94a2e6703d592d42bbed96ebf8d3a690bd5e731f0f5c4f
+DIST clap-3.2.15.crate 213317 BLAKE2B 382e7effda5fad6d1edd4d6afc04cd35bb791e7fad0f2b24660073dfb2d2ddafc105b4a4d16265bcd21986a463e65170e12baac407cfee467839341f8fcb5f10 SHA512 0811a833f5ecc6ab1f29edfe2cdc42dd47a31f768bf04f6b51cf360122881a5eabf3886491f9ee6ef35492abad88d444e7ed75c08d6d360dd5ea4aea8312b62e
 DIST clap-3.2.4.crate 208372 BLAKE2B 5cbf38ab3a7022ad02efeb535675a6813bc0cc81e966be0968d50a044053dc6436eab105d45f45df205d903592d6ede4cb49528d05233c2b6d01ebb4310e518a SHA512 88998d5121a558ceefed5ed70a53f7760cc8f017d2f0c8c26c42e467ba1765d75f036600c4d764f8161c50744768bb3d9d21df6836deac043e5b5d61d516eeb0
 DIST clap-3.2.8.crate 208903 BLAKE2B 93598ddd7fe489b2072160b5880822dd4cf5ee7762946ac927b53fdee0f715267d9f7f6ad60e9e45f0dc93b16ddffa71414f7c46c755906f7a70fd1869a12990 SHA512 1cf2c86038c46af697ff23b7ffb9025f96d4fa025106e08bf9f85679e4a10c80ee4ccac0b8a6899e9923916e32c0572310385f21dac62afe4920dfa4fab813ba
 DIST clap_complete-3.2.1.crate 31543 BLAKE2B 3e4e83f52d056736851bf8db7376943f0f43955d8e7d32e66f7c1e2b8ee1cc7ec24740c1c1bc7aba2ac3159aba70a3ea07bb154bf551d2f08b1463521b2bedc4 SHA512 75a42ce30a5661a75763373381477862157161b01c0972c80c01d6610f3fd9f20ac167aa55921557e574d2d895b614ba5c780780562b46aaa31fdb487ac11127
 DIST clap_complete-3.2.3.crate 31481 BLAKE2B 1668b7b4d8a368b17d6fb2254a6db4228d1957ce5824a649b09bea1a9e303945ec3a4984541d494b32ecdd7037d6ad371866d531f600f3cab76e88db82d01c09 SHA512 52ac37202b088094414f8148d87cbb37de931c7514d43aef8fe8ce82406884bb8d2a287f03a6e4fda1db28a62e98decc46f6a8d007e5399317e7f2da07a45de1
 DIST clap_complete_fig-3.2.1.crate 10106 BLAKE2B 74a9d4c3027afbdd61294e7ded25317b6b4b1d78a12b1f16d03ef2860c262c6dcf5f65670f752fa490eefd9da1d0b934c1989120f6e4bdd7cb966016028098d7 SHA512 cd2aa876ef54de086dd68f1c389a0e2f2ef3b8cc7b6ad56e231ac34e87936eec906ac1b6ca552f9a7bda272084ce6468c543e7d4359bab5b3e3bf7e84ef268fb
 DIST clap_complete_fig-3.2.4.crate 10205 BLAKE2B 372d1a26d4535efbe7e1d7e39f43938a742f2d88213c01e73098eaf5a35a91e58748b491b4a566bca76f2dbbd983f489f774f67961496932c50c26570ca6651a SHA512 ca5e00895e334e447a12c66108b284fe835eab101ca7c3b014d827247c7ab1d56ca06de3bf82a3cf9213b3011786dd97fbea31ef23772041d2d53ad3ab2375aa
+DIST clap_derive-3.2.15.crate 28218 BLAKE2B fab12b77b78edf58e3779c986d2c0b9f5e22a2c7d39ca5cfaf5210100a005a430157b4df19c726b68e3d55fd8ea825e4079fc01add760e43ba5903bf31e6cccc SHA512 75572a3215df81f6256fa520fdec95c2242a3ba17119e5b39292c8470195204322bb58b2b7b770622865e2345c1a4ebadf19bedf09f47b9958033d5506466d74
 DIST clap_derive-3.2.4.crate 27646 BLAKE2B 3ca6cd0b3b5d35bf3eba6aef4235dfb94c977fee1a5f11506272432b85917193b688de97daa134fe2e85c7a5c736dd67a0f09a17343dea3a4796c55ddc97133f SHA512 f2c2fed1656ac7a81b86e2cf8b4925864476b687b935b1c2b69bec9466403d4f80d98f19cb16cfafdd98ea0289a1256f4b500c954085bd8be584f4f24804a5b1
 DIST clap_derive-3.2.7.crate 27649 BLAKE2B f8e27a1902302946cf46beb03f3cc7779fd90c3902f38a442c722346e89309be3a150ffd24c932ed9ad67f50cea5215359f993e423ed62ee4ab1cece16c4114f SHA512 ac6a7004281c99306dfb6ab75e8a66c300c0b6ef5db84098eb76369d2e9939b59ba2e4a175abe2cd9c243d61e19fb5948cfe30d72adb60d53304306340f5cedc
 DIST clap_lex-0.2.2.crate 9657 BLAKE2B 74f6ed5c674664f0b81eb6d61427c0bd4bb2a2e7159aa00c2839a32e360f41fdf388c1455b52658a97900bb1b8d729bdd4f00cc5313e3115234e65a0704ed3fd SHA512 ea1d37bfb29412409db06c1991413dfbb83e393d74c3cdeca80ff317a423f41891510f6ed471f7cb7dd97288393726b14645287ae59cdf7be41f3a1bc9a3991e
@@ -71,13 +77,18 @@ DIST cpufeatures-0.2.2.crate 10655 BLAKE2B 7e068032f818af691ce1bbeacc1e79af17284
 DIST crc32fast-1.3.2.crate 38661 BLAKE2B ce3762b03d24d5367d89738991c060f4b3af7840e0a7ac7fc17d01ed438caf964bbaefad0fc4d0c438dafa5a578429ddd353c71197f8b54b1ec441395f2f7ee0 SHA512 a683943e252afdb1b9d626a07533ed11cf7a63af603c19640056c5d2b9c884ad9aff33ac54c0853ffca2f6cf94b0730eae6c05abf3e53e55e709d180c8152357
 DIST crossbeam-channel-0.5.4.crate 88237 BLAKE2B ffcab003305b80586a9b61c6309dcf6f4ced483856c4501753cddd23fb0fa9a71b7870b676ccba78119cc29f03974ff4731cef9a92840c0b38ae944f0b3825b5 SHA512 39b17dbaefc15d7faafca4ae6b060665471d384956aca7439fc407ed2632bd458e473efb62b74629b42a5f3d237e13503d2084cac6f6b3f42b9e03aa1fde0982
 DIST crossbeam-channel-0.5.5.crate 90326 BLAKE2B 0dfbb516facd1b8b7ad7259a434839a4fc279f61389edbbd4241aab771f03daea6a897f9ed039d43b65f736400b160b6c053cb01544f5636ae2260eb96f3802c SHA512 c38bfc10bb1fcfaf067679165eb31b54b4ef05bf6e8e3465f856e3fc717d4f521b2eb98bd441a738eb7fac34472b7b9a030873c3595a267f19b26908713e2218
+DIST crossbeam-channel-0.5.6.crate 90292 BLAKE2B 7da87ab15c384754d2493dd1a30e83550cd4b2b749b7f0c24de131f054e3a2e521e1bb4ba10094378c8f4c7bdf19218e35b10562c50b4ad1d2871bf6f821e488 SHA512 de6a42ffede95750a13e3b9af6ab26cbc498125860cd8e4d227c7361bd831e558254a48bdef5cf901585a915003071b0efa321f2011f282218c364780f62f44a
 DIST crossbeam-deque-0.8.1.crate 20852 BLAKE2B 0e7a2616b82c5e501c0f74935adfea3ee09db5475408be83db8f1b6faab4cd5509de2e029bdf6df90435e474ef91f3fc8d482ce3a72966b2a3bec5967666bdc4 SHA512 44a4fe1d4ab7457e2b0950be787b76b15e1bb0b1c108d032381ce3fe99bf7bf76f3d1718085660083d813e2639e66fdd3635d9186e85a9eb7267063b117eaca4
+DIST crossbeam-deque-0.8.2.crate 21237 BLAKE2B f00948fe90806fcbf1585c0404250dc84bca2cf27733bf7f2a0aa957e618f916162f41124333329a5b1e84909cbae3d93fb3b4461ab23e9dd97672c7d520d5b7 SHA512 a50a878d843d6eb1b5b92321ce6bfb87a23d3c16e820b1ff55472f0bd3d29b41d09ea95e1b9ccb2790f6687c043dd9ada1cd5124705e24292ccbd8fae1f243b3
+DIST crossbeam-epoch-0.9.10.crate 46918 BLAKE2B 86f33064dde615408435cd4cd8ffc878ccd7aca997440eb85705aaf71209288f2d7cd4a8a2ee8261d30d5d4e10addad1852ecce32826850fbca883430f4f0e26 SHA512 c8e103daf27a06798e4cc89c6263c08117ba7cef322421b7f91e6a96137c2fa2371ce9cf31e8d1a752be85f4feea90d4da21f1921a0a0c618c1f66ef67a5bf03
 DIST crossbeam-epoch-0.9.8.crate 46012 BLAKE2B 181df06d1a9925ad1b3e2df70f290fc9c75682037d68c4d3727b3e5bc0f92eaf01c2f8ec239b77f524bc4af53d014cb3c4d49dc82922fa9e65baebee68904a6b SHA512 c102e7ce9e927424f6c7c20f5eef5dee3457ef6ae3b81ab26e7dd4c787dc525610f1dcd85c3b06773b263c0835a717ce39bf35b927cea03abea62bc0a0a15624
 DIST crossbeam-epoch-0.9.9.crate 46185 BLAKE2B 1baff196581d02bd7adb32a7e05976dc2c2ab1a289a59d0b0050a22c010e73e6fb01a0005f837c5b7b4836896584fe83587ce39fc6918f6659c1256c5ce3a5d8 SHA512 d32003cf7bac8690c3d8a2cd9393bf06f2a5da8b6371aff68de28be379a86b5b183b67fa6cf397b1a164379e0b095f4c9e6bc7803e229b3867d2c69cdc235085
 DIST crossbeam-utils-0.8.10.crate 40672 BLAKE2B fbc65ab8a68d66f27cfc8495652ec5ff31a3b8c4de41464bf3a9f673249c2fd5ba4bff7ec8c7b838d5903328346214f91fe075bbe7a05a9b11055b7b17376ac6 SHA512 e0ac772262677e7228e4f2e06099ca788f4906f40fe5dbfb0891431c993c7e4d755d3ad93f55570ae06c1f06df14801edb3ba4f28271c4e83c80dbba2fffe24c
+DIST crossbeam-utils-0.8.11.crate 40887 BLAKE2B 6cf3c4e28243515f06193ef746b18129f62832abde8153503571052f4965b38ce510b09d18e51e0f563bfc14818af13463d1e2d63716b98a91b55461f5186b25 SHA512 eeb19480ca1860953507606f6649756974f65a05883c695fa371ff6d80a9fd0b94872aad5168955b4771b38f50314364236cb39363bcafe9750b687ff92a5ed5
 DIST crossbeam-utils-0.8.8.crate 39681 BLAKE2B 2b3e64bfcaa044a9351c1cc8e9ea53fd68fd0bb9875ae523e0cd309a85ad23b340267bdb742d363b5d99fc065ed74f6cbb3ad1e33dec7d14d99ec458875e7e10 SHA512 ab960afdb82863160a3fa1c21c64b35b3112725bd72fc8e0724175937f4b23d0628253032229501938cd86a8e406a59c06cb44e8bdf34619de781a84ebb46ea0
 DIST crypto-common-0.1.3.crate 8556 BLAKE2B 980c3d820633b62d3aa08e00b4737dc44ed08db3c2cae4f14aa4ad769b6a84d5eca03ed3d8a4d35cacfc051ba9cf23826bc098400996a80cd5a264abae873d0b SHA512 d32fa67b9baafc32ce6f4d97d54deb7f1b4453849bf549384689b0ce8d417407d11f405793e7765ea47dfa86c8d6df5661bd17793c145351731c39f8124d1a2f
 DIST crypto-common-0.1.4.crate 8595 BLAKE2B 8ce07261a619dd1817e20c3764bc54353383670612588fa1143aadca77ee2f7521888a8c2bdab14cb70817228cac65df6ff005e67dceb401a931bcc066be2413 SHA512 911232c9d28227f4f6e96a958f71ef4d32dabe7469b9ad323ae399451d807fbb5ff3b6571c480f1509f91082fc79e606791d77316af41567cf20470bcdcc8359
+DIST crypto-common-0.1.6.crate 8760 BLAKE2B f2422bfb89c15d47a8f91c8f6695e05eb56990a922e3cdf3d426044736f9932324c0d899a151a6df4d6683e6a6b21659c657d3988734014c02cd854bb4b924e7 SHA512 471dbc43f517089d2cfe0868e29510c6ca579875b3bb5d013c70796db969b609b6c4bb35c9a07b9a2917012dc5708b717d48e317a20038adbe7e7039bf3ada6f
 DIST crypto-mac-0.10.1.crate 9531 BLAKE2B 6a26505762d8d466275fe7674de1c4f95686b7a5fe107442361c892ba3123213e3f7cfb8d5516219e84c44496ef342ab534ebca724732e509d33fb9300027ef4 SHA512 39b7d966ef2df4f01a6b6f43838ec30c9df4a51106ee42d8d349f2d826722834ad5f7875bf68d7359799015d53ed45942d71a10f701fd080e264b21a89879dfe
 DIST crypto-mac-0.11.1.crate 9551 BLAKE2B 81140107f394d969d85b77050447e7d4dbfe7b2df8164293fe9a2cca04c1ed3cd245988482a232103c2ed9d35601ec6332669bd8598d903d305935dfc09af887 SHA512 3090a7a3fdb7d94b2b14841e37733d863f2e4d24d7da3c63df1726612abdd1c1df7179bba4e344eb63a94053e59a93b0988ecd1e2e5a5db0e18a4b602be4aaa9
 DIST data-encoding-2.3.2.crate 19159 BLAKE2B 43208abc26b243537e9a2556bc3ec5db53ff1aa0cc9c0111728d51b4fce6c6b4314ba445bbb9ac7d813bea57ab600a3a671c5167257f0c344e5e3b149a01f6dd SHA512 b62d0c9a937df59f3c84d4c27bafdac9088370a250d3b85e259258cb0843ee32ccd0a9fb1a01ecc5929dcb22e36bf82f7c1edbc9981acec70f5a1a01f00731c4
@@ -103,6 +114,7 @@ DIST enumflags2-0.6.4.crate 10713 BLAKE2B 86219df31b9c8a60470f676a365f0f0890892b
 DIST enumflags2_derive-0.6.4.crate 3659 BLAKE2B b49a73fe2977e8f62af37c367f1452979cdc0575b532d086e612b84495113041221bd508cbf2b72e3179d929a2eabad59b9913db98b21491186a1f1bcf571a9a SHA512 a8a166ed48c77a3d23c1b1afe4dec1812c2a440736cb6c6059e46b90a0a216c81cb45ae6e439ed5b3dcd656faf1bb6dace4e46b908dd02321b4a59351240911b
 DIST env_logger-0.7.1.crate 32281 BLAKE2B 6f1894c64f301ca4b687270c911dbe230f674662aa0561b97c4d2537886e404664b5773d4e223e2018047c222a951232c3cb52ec5bddbfb6665e34c3e7ea52f5 SHA512 604060d2ee83ab337a2d20d6784d1b7541534d2fd9e1662fc5c709fa681672a9db5e34d00face864b56ae321962e644ebe29fbb6d68a0d556419cf5d71c6149f
 DIST fastrand-1.7.0.crate 11265 BLAKE2B 318f6c903a0ad0d0eac39638aceb162739868efd61dc0b54f6aac4c96b7b1283c8d463b48b36f9ea1fee640a2081a0eda39238cd53cdcc24efc4d17b4a3a09d4 SHA512 6a1a8cd4f6f9bfff07a4ca18ef84839e4427ca9bf9b6733bb15b1b70cf2439820d6a770ae9f3e5e10166a6144449e37e6f3f6ed9acb761688207fd7c53d2c673
+DIST fastrand-1.8.0.crate 11369 BLAKE2B 93e911ffcec559e30b2fefa44c4d74d1ffa9b8ef1904ace608b8576210bcd41a2b4c7adffc00cd3bb40996110d07316cf8068f4754a879c6cb47e3d41304d406 SHA512 82cbc2b29b97fa3fa2c9372d3e8c390586a7b39f6c7d8c45f9b779bdfdaa2e8a3b44bc7bfcb3367c18120726facc753c9827cf63a8fb4ddc2667509b16333cb1
 DIST fat-macho-0.4.5.crate 19395 BLAKE2B 647db9fb4dae829942976a53a251b64dcb4b418eef79f0783dae15a3c0c87a965390d3a2bec0fb5d66543ea258708541444ec04ef29332f53e43526359a163d3 SHA512 fbbb56f10ff74483258c02052f44c25c06ac4c79cbf0172af124b2634b283e22ad8b82ed7ecf563cb99ba2b93e656f5c8d6eeb98f09b893638928fe27b22b533
 DIST filetime-0.2.16.crate 14502 BLAKE2B c19a6a72ca4f6a34f9de39d9acbae694326a7a8c1a3aed50ca749e09905470a26c5c61986759d9fa83b9740354796d0dd3d3781c1d4c2cf1d8da5cfb630f045f SHA512 4c6277f43b2de6432769353615406af824295742e5604b40c2673acc2010b349fcbba201e7273756857938256f1693a515f3b9145f34405a56cd23af4dd30222
 DIST filetime-0.2.17.crate 14484 BLAKE2B c181cf4c3ddc5831c006917e7432620a62a0ca7aa379ea7f1aab9b99a8cf725055e8510f7f63ae5add770dc8f91c824d3b4e9e86ec0f3e7faa4e9a647c431a8b SHA512 3f7cc4e64381f4076ae04bbc0adbe2ecb024719f1f2fcc2ef537b0285261e03b8af7655d2db72358185dcce109df060d4a4a4015b3168fae0f6a952878860087
@@ -125,11 +137,14 @@ DIST futures-util-0.3.21.crate 153768 BLAKE2B b3bc5632bbc7616d33f74361d68f83e0cb
 DIST generic-array-0.14.5.crate 28915 BLAKE2B 0a8c7f20ec91d218fad8a9a87b0700564744ccbdc2f1eb84bc363fd55e86a5ad68c68e446b100752238d45abd7c005f1994bc26e079270d42635c6e296e96f29 SHA512 30c86b24222503245b494c5f88cdf8115ba08c73df55930bb01bafcea22560f4d20e38c348c3896d6e1ef03209cc1571745881b4a77fd28f66b0cc435f5249a2
 DIST getrandom-0.2.7.crate 28854 BLAKE2B 30c054361c9b1d9f95bc505e27e98d8cbb685f37c91437948d9d26f22028e0797a7c704d88912c1648b3704bfe10623a8c5e130e81746c8f85848b831771db80 SHA512 01803e609848662ad8650cf451dfc2c37580da0b7b5e0d4cc764da6ded253cf49ae42a433b1c53e89773bde00c1ccc136394e58ed4548e7b5c0ca7e202e857e1
 DIST gimli-0.26.1.crate 716168 BLAKE2B c138e890457e8724295cc8996f8e60f1f4d3eed46c865dc7ff2379c65e8d470080953eee70718867b73524f57d54d4a91b5d5ba74d79bd3da38084a880f3fed6 SHA512 c341354e13a78c4afeb651a0ed651f60d188957216ba51079512531ab1273b1b79c86c57e904b87064015f8e7efe4280d9edd4acf90e25fb29f8813a4c7bf9a9
+DIST gimli-0.26.2.crate 717340 BLAKE2B 6460346625fad7ed202f387d45900867e785026e08efbf6542bb5c7b6ec2bc8ddfdaf825e872d2c339c3b72f8ddaba546efa94243a602bd8c9470c6e808a8f30 SHA512 10baa5fb5fe13eeab2ed9ac8e02ae7607b42df80b9f39b14027d052ac7f6f11e4dec451bd73c3640ff8ef174e280c1640110720b2bc4220229d27bbb31079029
 DIST glob-0.3.0.crate 18724 BLAKE2B 1f1dd380e7d668a0c2cff9134279ebda958b4bccdd4a65ff01f9665b45ec4cce8ffbd47eb46e52cf516c5fd5803561e6bcb60cdee21ddfbb8601a95d45500620 SHA512 87098ffdbc518442995c422120cef71f83069c8f88a1970ecec5105b0f284ddd92bcee929f5c230d5b90ae1ead7e1214c3eea26f4a8b26715a00c1ab8b09bc46
 DIST globset-0.4.9.crate 22929 BLAKE2B 91dfaeb99a3f6f40a5a025ad8527c91770545487324e191801eedb6f916739b5efe687d84a43eb8b712cd181d98d3ab17b839f30c19e0da041b4c34d9286089f SHA512 66841495098b028b8d294c0832276b8864760df3a16b93b57222037c351591ac7773a99a65b85a20c438fbfc04c56ea4901188cb18ed470d3481eeef29eab708
 DIST goblin-0.5.2.crate 158017 BLAKE2B b590ffbbc10430f470410a784934a8c14525055ee922074ba7ef19dd1a3326e9b42fee3c20b2e1d6257719df7574397f188373abd29ac7ef6125fb0c4cdd0b1a SHA512 e061cdef41c0c6896c8e9842b33090c4bb2b8760e27f73b2a4d680c5e68aab272d977f5cfea4fd528af5d42366f5047623d64e41f9a6b42203dff2521b3c68f8
+DIST goblin-0.5.3.crate 158162 BLAKE2B 5138b382e5cbf2a56d6725e00a7e2dd8b34675a6766923775267348c4a2bd6edbaece964b19e69335417f16e16eeca5b438da2854e1b6c723d4e6add3852d972 SHA512 07ddd9344c2d521a05068b2d1af85b79c6d47f86f71306c3e31dcbf2f72592f8a70ff29b423910ed5211bdc54fabfd9a751582ef594a6dc794d7a3b4e3720c50
 DIST hashbrown-0.11.2.crate 85713 BLAKE2B 402f9f1bdcb92631206f9b72923ee35e28db8623e87469c0f1496664bc7185077013ab3c8aea68268241e5b2504f10cddc613a350abd4291050deda6c112e559 SHA512 c21ca68fd49bbb741901f59fed04cc124b8da99e2a4dfc26e2e5e1140637872b344612a01691bd30cc771575c571be15f756c84dde225441699cd2322af2ad6c
 DIST hashbrown-0.12.2.crate 102346 BLAKE2B 99f11b141b2a3da959e8bb072b3f9d6e768eb464e9e04d151021193dad2fa0f03a5261cc3b894cb2fb4080d7cdd4a747e6c095b1a6420d515c44d74a2fca7d70 SHA512 5adbb650a40c2f9267a9c729cf377001b07eb91824470d7da459860534683b6f40fa8f14bb997a8f3df64eda561d1ba658e95b6c35502de7a76225bea8c56d46
+DIST hashbrown-0.12.3.crate 102968 BLAKE2B 492072f27eaec45abd2c5d7405c614c0c6a8221425e901bb6174bfa1688ee524408a618650126d6c683b7285b9bf0a21dcdbff7347e4d8f97bf7111defa1b7e5 SHA512 b3700fcd659a21a6b9b3777c18b37a83bf25542b4e8f2b963779a122f5d22e1742c064cfc03e649583e7dd5c6e90ca8407f8c51a0e8755f6a108682853022f76
 DIST heck-0.4.0.crate 11161 BLAKE2B 13b8bc39cf3ab90e71433e3c7b3e5f1c19404bec58dc4298dca05d94d5c14c2fc97350de737cb78aa45196b1241aa8f1ccf3a11ca309da5fe0f6a657673412b3 SHA512 33bdbf4ff9ecc4f4d74cf06590e056f4d96bf0d990d5381b9da5b65682b2495ed74e27b45419c2afa986c1f6200909d5175b137ae73ced5cc8ac869e4e1bce8f
 DIST hermit-abi-0.1.19.crate 9979 BLAKE2B 801e8052b85341cca388ada9db4b06bb1bd7b64474185b2ad06c0256b9e597639bd3dd4ba0053ea010f922e53969a4ab47b90d451fd9b94c8f2324055d151ea1 SHA512 1c877fcd562b15d2de9c151fd6c5f3ea4bf48abcb799e6139a180ffad5d64b632f0000d5707bbd92ff23a0e5f349157b9e0f5be8b50f03680b0fa47315dbb78a
 DIST hkdf-0.10.0.crate 13966 BLAKE2B d808517dbee7340d10baa994dae118135ff3907b204ec6f92ecbeac8796946969e1ef54532594bec0669834dfe2b80108ecb30b9d8906202182e5e30f8995b64 SHA512 c75ea5b79953d28a793ddef5eabae8754ba74b5e57bd7953be6e4e8f9ebbc3b62d29e06b1e15eb101b849d51f91df61f45766d4ccecffddad33c39ec5d5668ef
@@ -148,6 +163,7 @@ DIST instant-0.1.12.crate 6128 BLAKE2B 728923f757c1ee4e4a7afb90e460eed8139206896
 DIST itertools-0.10.3.crate 118661 BLAKE2B 0095d6e7f14ddda69605d09f74e8cc881eec1a1d234f705e667d7f9e738ef157b7ddee066855cbcad7f134bf79b99a4a4c77bff3371397a567cd34d98b68bf97 SHA512 9d17357eb68159edf4f4ccd2eb9895672c7fb633803166d5e24ee12350639eaf66f1c822910518185cd1f1ca5d9c3e228dd37525e6c337ba3fc7ce967f9bfc85
 DIST itoa-1.0.2.crate 11112 BLAKE2B e277db8e2f506d4d20b6888b609d9726d594e1cb2c9f21df60a8cf8dcbad1808d8c1bdb0b7857ce7734b92c0f23fb1ec56f8564e779f27eea953d0ffbfcd3f84 SHA512 44a732a102d60b58e72fe76c43a1d185fa12ff08d04eeacf03234368552f84d3de87a2ea0a6e7a56b8cfa74cb6f6697005afcee26f45afe0c2fc7dce5da3b593
 DIST js-sys-0.3.58.crate 78794 BLAKE2B d664fda1e19a7ebb621596cd4773e7ebe86b3749ec8e0e45477d170aa472a80a75bd0ca7f6ca47c9aace5e3962451039b1bf44615ac77ee4db21f46d673943e5 SHA512 74656493c36d9110aae99f58cf1f72a1c89bd971c574ceef8194f68387bcefaa5e93aee736b41a1de1c192113257bd544948dd79a227b5451d13ba2319b58a15
+DIST js-sys-0.3.59.crate 78849 BLAKE2B 2dd42294717ddf922f4d329b3da1acefe1e34c5d9c735132752bab183ea186a879a8218d201238146c20374e724f9219d2c28dca8c530105a18eca81ba86fe39 SHA512 317a0cbce8ccad741dfac48a09e326460bda68a58225bd8d2eb50ff50a7355016c399660e996b328bdbb77d12bc5107d4c2908b11441183f3b3d2f45eedbfd00
 DIST keyring-1.1.2.crate 30205 BLAKE2B c2f3c48daa6c06b0de4c9f459d563d70b483764e53237e6b868aca4d4d08835ad92df3c2f928c8ec571f54e96173148a530f463ed55e5e5a8a63a975b7b496ed SHA512 aeee8dde066f3f49a4089aa778be6934758fecf7877c3bf285d84b2a97f47f504c7d4bb7903f9af32e479895e6842a7ff84399e520e7d80050c896839aa2628f
 DIST keyring-1.2.0.crate 31708 BLAKE2B 428f1913b8e7c6a5d823ee5151061eb2667e973a03de0e6ee451ef5311d22c916512de822db2c7bb8caa85f5e8497eb73f53c74429ceef42d7021cbd3e4c1531 SHA512 7e60985ec62959d74cee0a0d7f4b641d73145fa51353d11bcf577a25cad96b4dfa07c6f3f0466e2fd6a5445037a1b805a3062e78cf1d165be93478c697776e2b
 DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
@@ -163,6 +179,7 @@ DIST matchers-0.1.0.crate 6948 BLAKE2B ec3a5d01d2fedbb4dbf5bb185afbb9401410463a6
 DIST matches-0.1.9.crate 2246 BLAKE2B de155202636c6a03ed68cdb21e8ef96e19b45be040a82943d2d7e5192c0ab5c253ab6d65f0b30b2689e21da79cba684af5be6e63c48266681aceba356f6eea41 SHA512 6a2809687d30ff04ea97bf9d1610d746e097699a4c3625ffd1b7b1e4a9673ece9d559058c9f760b99d6ab509024f7b338e7cfa6fe767499c983efa98bfb98305
 DIST maturin-0.12.20.tar.gz 303609 BLAKE2B f509401b4b32a6700e08b72ec9ae49d5593df9b55e26ce3f44d62c9755429ef785a60442b540fe05159ed0ea6fae72c3230dcf517cef7e5085184ce99d0d0032 SHA512 e221711509d6c3997df49e934e73f41df3c7cdd975db9fd13a22fc9d6a2f2bb9aed33763c70f8516665918537a032e113b55d69936f65e72bb2ac5e46b45be89
 DIST maturin-0.13.0.gh.tar.gz 307447 BLAKE2B 6e6be3f69dcf95724cbeca1e816b6d28bdaddcaa118064386cf270e5b44ec9772aa324104d00614b68df35d6e7e2f161652ebe4f6019270c7d949394acfff447 SHA512 836c9e7450a7203db59391876ea52a7fe7c64e3803beb49a5152832aaafee6dd7ce7e6d751772c9ccbb075f5cc7b7299719c7ebf63a0d2abd27070b78268efd8
+DIST maturin-0.13.1.gh.tar.gz 317514 BLAKE2B d554d6fac430acb9300f66065cbe7a6fb22c8384cc4c9ac26b575de7ffb3581e5ed8ca0c90228816eeffb990ad4d79e11e31a152347c69cb5844bc16aa123cb8 SHA512 e1958cce932b8da7a11c31ec3dda91d187568b31bb306afc4adf46dafc22d23576fd1018fd889abde52f2bb492aab7a393aa0cf0552722bf0a0dcabca0ac759b
 DIST memchr-2.5.0.crate 65812 BLAKE2B 57966413a1f933dcb2d2d4ccb29c247070f65a83299b2a9f5aa83f5a48a5c5f1c4c7c632fa63bd19f9508e9291e7258db2f16e2813a56fd84e0856f70f1e67ab SHA512 444a163b484c233e78c0e2e4d51f01ce2da93d7d29f516a95e4b0866b20bdfd3f34137653abed53eb70387991ee3e2b5937d8d4360a85bbcb50a93005a75defa
 DIST memoffset-0.6.5.crate 7686 BLAKE2B 9a797388702389076c426052c3d54dc62802d5db8bc5c9c83990429f2ffaec4fab4c7dd3f09cd0704d1ea555e87976563bb43408ba54b5e66ce7e406d4604009 SHA512 11bdd9185b99dfee8e659e051b09ee301c7142a372a8117864745a5085c015436d2efbb1478192886f09cbc562529e209d2e3325d94938a64bc75b1d91d2bf3f
 DIST mime-0.3.16.crate 15206 BLAKE2B 9a599ca82fd0dd6d3d2dea68a47b8441b1024d016ee1fb23cc6431b39ead20c9b3fe1ff3397af79c2c1b2cd277c440d4fff69f6b28c550ddbe15f680923c834b SHA512 cb1d691610cb82720e553247336fc5eab63407ad37febf2eb50aaa4e329cca70959ecd8bb8c7af5753acec2c8e86fc9a0f8ad9ad2de93fe9295ce84033d6054c
@@ -207,6 +224,7 @@ DIST openssl-src-111.22.0+1.1.1q.crate 5103224 BLAKE2B 3d437377cc0a320e852721af6
 DIST openssl-sys-0.9.74.crate 59808 BLAKE2B e616a0194828afe67d617e4032ed354385935ff7aa40eb495781b38b134226d5c5cfc5f9405e6273c96622245b6d4771a71b7b9512e3be7feba9a2ce88b66ecd SHA512 18015ce4dc8f15f3c371d393f4654db11b6e5ecaadbdf6cd9f020ee9aee29f3fa12a8dd74d432d8e8b5889162491b722f855b02fbf0892c8f2003bc4e692254e
 DIST openssl-sys-0.9.75.crate 60028 BLAKE2B 1e4b3733d3309a1157c16a236728aeaf48b1b0ea448643416747343fbb96af86c8035ae0cf4170038b4521c88842f42a2379fd733f92fc9742e7c2d837eccecc SHA512 14985af6224bf1b6aae0fbd22c09e6b8ce7b9a6ace0970b1b45fc0e8c700e6a4bcb6b1883e3c78dbeafa02a18d4a84f537a952460d3f0baac3135d1f994af13a
 DIST os_str_bytes-6.1.0.crate 21150 BLAKE2B a3bea67d5dfdc3bdf535b8576a49b3b76aac6fb5e0c9b672910756cf2d8062694b973f4d38365e7e17237efe0429ef942adb0416f8a9fbeb18bac68e1ec250a4 SHA512 b15a901533380be745e3d3ee34d36e192bcf32c8ca66b0aeb77da66b931773b9bd818bd5485c142f8733e7af7d41958957d9ed8f8c6e405b89be69df625364f5
+DIST os_str_bytes-6.2.0.crate 21037 BLAKE2B 0ba546e68579a9221a84a66a6be0ddb5a27d78b70ca307bd514648e2a39a60265f85082f47c07ad64801c865ef613cce5f3b65e828bd594ac45fc6b00e0828d3 SHA512 aecfd7ad0433ffe532d72c6c269eefb7e7097cc1acdfe91511ecdaa7ad4db5d97026268bd216c70bf4fe17f23bc02b1fbbe95a28b8fedda3f812b3ce78723c75
 DIST os_type-2.4.0.crate 8022 BLAKE2B f37d9f43bfb242f1df0f2a5928923265a3ee44b29ffb119475098fcc7ff46340ba70bbc51e00b6e0b29c4f63aa50531f3f825db82ada46b19c429b3aaa52c7fe SHA512 2860d1798e146e4e476c2bd76085e031cd999188a42519ce86ca7bd168a2eb1907d690e15176beff21966135e68ef0cb45b05ee143e74240c2f8d3c1a5c35bf8
 DIST parking-2.0.0.crate 9714 BLAKE2B e3ecd48e90289fe173b1419ad3f68350dd05359461c5842e52304e20fef9b5e089803e0c0a8e85b249a546f61cf8624367e6ec164ef7638850b451d325851075 SHA512 21c5723dc0281ade1c2cd6a1c2215ba70eb47a721a4a594ef1e54061bc79579ffe9c31f06e534fd847f936ed265cd65a59dfa9e38880f8bd42c6e8ac70a13f93
 DIST parking_lot-0.12.0.crate 39761 BLAKE2B 227ae508bebea21bd06c7a9c1651879ce3f5cd308019c8733f6b88e75a57b57d19b7bbc5dfed5ef1bff57ec0f116606ab699cfa6017b6e00078e7e4717cd58a6 SHA512 efa1ebe2f3849a9c6ac484c7e1cdd279640539468bd4d4da6c4c97ae34e86fa3a42818ee4839dea512635fbbd836829dbadd81dc05208614c820d1374139673f
@@ -214,6 +232,7 @@ DIST parking_lot-0.12.1.crate 40967 BLAKE2B 940a112a066e3cbd15e2f6df89bfff37e4ec
 DIST parking_lot_core-0.9.3.crate 32256 BLAKE2B 79a1924a983b948a5c2b0c074452a7b2b61abda973d3bc8040d9153d34b378f0ee330e36aa813f49544319c479665d6328be71481f2e1e41bc94abb9bfbd12a0 SHA512 fa30db0fc73b268ab8395adb8bda35d12dc15363b247a95b7c4bb848ff9b8dbfb971a20f320b4feff3317d5b533c59b62152e4c652c1809a422c5671310b30df
 DIST path-slash-0.1.4.crate 5771 BLAKE2B cb4ef02743efb500d37669eaf83b276c9b47d79d460366d8a210fa89e15a145e36aa3a7892ace4093730e3e56e7fdc744b6f0928395ba0054f9f3530b09225ea SHA512 c0d14ce827e80c4efbfcf1abd67459c3327686b2c8644b0af16909bbb9a8952c14e91c1b68b988396f99c85edb4bb57dff9bed1d3a4f53e77edd9bf3d80284f3
 DIST path-slash-0.1.5.crate 5944 BLAKE2B f299b120de39134cdb3ed18f5176fd020f26d864298e2547326e2c805b8f62685971597a19494dbdbd5d815366eb39240fac7fd4a4a71372a70edd9c085cb5ca SHA512 286d472f657907cadf2d7c8f921abfb72c0aa8cf6e60f89d705acf2af5791db1a2f68e5032e90835c374c1dffdec01dd25fc0923e85ac3c189dac4e6904d2216
+DIST path-slash-0.2.0.crate 7913 BLAKE2B 11280c53fdf6a6c42b3901c6ef77df59bd04737852d09a892d4fbec651f0e706b130adf52cebc1a79a5f83db256204bbd4d802112d7b825442fe1699c291e2e1 SHA512 2147449a6790ecb5be5d7fd6f839ac86e48b1506a8d7101f30e6d5957d8701029785ee159ba49bdfe201c257999812aeb0aa0406cc6e21ce7ac7d514b74ae1c9
 DIST percent-encoding-2.1.0.crate 9748 BLAKE2B f3ff35ac683724b15e40c85e0fb8ececb07b61beeea82b7020f02d27df05a8a3535f157b3cd688533e414d6541de7de8640ef4756706d8061af0fec94ba04ab3 SHA512 98af4dfa7c6a3cf0d5aa929c436f9eb1ba1b576a944513f1284e6df2ad06be7cab9eba145d888d50af88f8c970bacc702b323041bec6d4fa1dc34095186c628a
 DIST pin-project-lite-0.2.9.crate 27713 BLAKE2B d6985b5add432fb6287d1b0c9fb0cc91a195f82c5a748a9ea430e4ba884717ec7b16d730b5ea62de5b2bfead1771da2d115b3776e12e605f70f2538f374a28fa SHA512 cef0b77233adca712db1183f780732ea577cf1b27c2643de221d54c837c75ce749f907e24a967be7474812c7682cba613a3fc5d553a9578a1b80569da0e562e4
 DIST pin-utils-0.1.0.crate 7580 BLAKE2B 457e1287202f16d1873b24bf4f1de1828300128c4ba3131758e64f9784d36d47365f22d85493c3a85d854f0d8dbb4c6cef3a0f5b064014dc03943e58b7ba9178 SHA512 828422b8440cc82ac6b0743e0112fa7540d437aed457564999092b1462cd7672cd6b1f0201b67075431aeedd3d9c5127468a3dd028744109944f7f023c82fd70
@@ -230,6 +249,7 @@ DIST proc-macro-error-attr-1.0.4.crate 7971 BLAKE2B 98e2925881c2be186e22c2c43969
 DIST proc-macro2-1.0.38.crate 41687 BLAKE2B 226f76a1c264d6e74b72fe1f1a10fa8ab1405b618d0412863cc7e04509f682435dcc2703bf196e4fb1628219630d882d2be64926da19903b36d052113dfa60d8 SHA512 f360b00b4b1e05df52ca1714df34c719778f7bb6ed54fab04a84811acd0a29f7c4d4871fad7d988f0c042fe0fc326d7b1fedc731c55fd32c7257dd1895203080
 DIST proc-macro2-1.0.39.crate 41663 BLAKE2B f7d83709efa289ccf12500389c7a4f4f0e32aa686f2d9c47f0da2a5381981e70e45f1b689023891c2543ce633c593a68a629c6414fbb3c2266e4cd99b8660048 SHA512 cd1572831493f83eb51985eed06d8ef5c0ea96ce4231d5ce3be5af9db97e7dd24400332d3b80e0e9c808091fc11889340dd86d8783ff3d9681dc53b876f49a0e
 DIST proc-macro2-1.0.40.crate 40559 BLAKE2B d83cf7283393a82ca65263afc375d123bd2f48b719c9eab6859c52dc0c2b9b4b5af3090a0ebd0fedf0e1095f0bafbc443016f751a0485dc654bcd80a6f71e326 SHA512 bb179524bd41e36735010a7ec53e096359ffc3688ab97806a45ed9cfb17e8688ce352bbb8cd3bd4e15a4299e8500603c86591b17cfa31bca03f299f6f6347992
+DIST proc-macro2-1.0.42.crate 41464 BLAKE2B 8734bf01e8490cf208e873710a19d06631ec326aeacc244be568c689eb7e214fa298ffded01643c1e92ebd04fca866e383d0ad254e04f2e8d961c2e449aaa41a SHA512 fbf005ed4e94d6cbcd7467ccc3f0a1a59982d8bacfd379112bba6bf411905c95213666b061c1d38315962f79b640244d5a1f81ae92ceb0d77fe128610227798c
 DIST pyo3-0.16.5.crate 363266 BLAKE2B 3162d9a3da37b5579a91dbd42d3e200c480b5e3fb3a2ec208735045cb78a8418f6810a72ec24452f24d00961c72a58ccac4f5ca9a567c92c0a82ca37173de442 SHA512 068019c76b1fc3de2e100c6cdf084df24587094aac3479cb1d906f7fc95ab6296cfe4d0d211a1c5696261be5e0e0e96776f5bc5535faf8243432f93e4d2537f9
 DIST pyo3-build-config-0.16.0.crate 23471 BLAKE2B 4c5cfc692ec3851d74e6d25ff3e18248f96c03731cbdfc1d7661a56dc9394802c16a3a16a2142b91758c91d1bd66550765061f7994accd73835a1703a8105c2c SHA512 b60fcc760d5ee5468b4d308106ac6be105c34b23612b2db5e95f0da50fdbae253cee2dfe185e0bfe8c25c2469e9ec6bd31823731ddd67004423652585c5b25ac
 DIST pyo3-build-config-0.16.5.crate 28880 BLAKE2B b821818831e410dc75df12f9f9625986ceea97d00f3160fc8cbf7315f003f94bad425bcfb3db73cca07ec62de47b763196e019e37d16beed9d5cf7386c05ca6c SHA512 91a9eb743b05808ccb5816a631e381167b16707515a68bbc43c04dee333c2537fd03ca1ae4a02b26738c79baa695b5dfa603753eee58e9002ac6b33320d275c6
@@ -250,6 +270,7 @@ DIST rand_core-0.6.3.crate 21938 BLAKE2B 7c73e2da6d423c68dbbca31f6528bdb3f42fa39
 DIST rayon-1.5.3.crate 167246 BLAKE2B bb312c9879fea3cedecb70bff78616eb7fc761e2201d5576d86074f4926dee6266ff6f917cc97a63b6e6daffc33f5d693a5c73daa49724643b93f3b9ac77d8dd SHA512 47909226951c4d6b774880dd308e2633b1582e41e7730ac8af902895578e6f29a9b1bc47debbd9618c5a45f317b4f264480392c8982aa33576deeb9d5f8ffb82
 DIST rayon-core-1.9.3.crate 65300 BLAKE2B de5700c9def379f6a27ee0ac0667f741913c28ba4d98e95d7ae964c32f13967b4ca160d219b53394985ff4557a11a6ab3c242333e2a6d3790801bdffef3f9153 SHA512 4b852f083766e7e414132840cc8dfef148e15db47967eeedc2ddbff9a4372521c296dd4f66e0b6990f49a8ce88ebed9d44e7ad674df42f96b99b24469b1852a5
 DIST redox_syscall-0.2.13.crate 23759 BLAKE2B b59c3e923b7bddc84285377eca86e649c21ee7dd61924245d43c6554124adf689f9b92841ca64876b34797249698511b322f6e8e639d71e45e1ae9da5f8b7834 SHA512 6551f503ba52c4edc0cb4a418ff212188ddc7be80dcb39eaf3bfb82faa9a76cdf359f604d6b32be6c6a335b54180c9399a0e32670333a5a08351957308486100
+DIST redox_syscall-0.2.15.crate 24007 BLAKE2B 755a3ebbfbcd1b561aa485f8dcbaa9679151308961f25beaff974ce39c4c135a5b77c6347865b265b59560db599a448f84fa618828868ac400e03e326d9351eb SHA512 1f9dfff4050c70912d3a8c1f21c2928ec87ec43860eb67e8cb090339f9254e2cc73fc17267d7b532974bc89dee55b40190db6db691277188790ae5f0210acbf6
 DIST redox_users-0.4.3.crate 15353 BLAKE2B 5e3b4e902566620cee8856c092cac193366ddcd2f5aef787b1d485353a0da11486ae1359dc60f3c87a198cb68f93ef99ac7551cc2315412b93b10ffb10540633 SHA512 0d3366e23cf93e1b0e025a29025eaebfcd1145bd158e2663b94fd952dc2d8a25566819e3a03c4136ca16a6408d37396e2ead0814c3f0c2bb10334dfd0b838fda
 DIST regex-1.5.6.crate 238593 BLAKE2B d2b200d9d3d8924e7dd7a1f96c769a5bdf01d9bcd358ffb90692c526a81ac6f1a5db8ab0c343b96868ef9d71e78633373744468fe97d281676c84ac795352745 SHA512 43ad2ebe14f43d69c62f563a4fd53b5657f0f2cc130a0e6353a13073027640ff891e9f9b40ea85858507047bddb2e023d668c9bf57f2ba0ae045b74b5f0d2a1f
 DIST regex-1.6.0.crate 239329 BLAKE2B 646405e681ce572ebe2dc51a3339f0f8204143f9b2b8f8e74a4c80379c43c3581363ad347610a384d5ee831cf1425f74ddd944a658b1da2461e8068c5521af69 SHA512 b4861c9cc13d6fb224f67057fd3522f04576591b3d7ae0d3581dce42ca2b2bff96860cf2a7f4dfab00e46a1d29e6473f6723c4aeb02e34ed6d5f205b66f07876
@@ -260,6 +281,7 @@ DIST remove_dir_all-0.5.3.crate 9184 BLAKE2B ab7ef94e0230ddc9b363f038254a180881b
 DIST rfc2047-decoder-0.1.2.crate 6023 BLAKE2B 75d98aadeaed734cca80e21fe8d94e8a4a87f6eabc7cfee63052c51d257058f5589d87c757d2e40f223ef8c4bdd6f5c8335160f67e8f5367b80807ca8c7486c3 SHA512 302893aba05b32dc8262fa9b034fee2f760a09f7af860f99e2e5463bb7f3ee8f9b984d8f9b41b0acbd0703b38373ed7722923b85dee766d7c5f25571b2d842e6
 DIST ring-0.16.20.crate 5082615 BLAKE2B 6011eb7148c2d2ab410e564a06604f4350e07ea030e4d7dcb30574b977f0b0c7e53e09f6e6dbb2d068cdf110262876c48dfaeeef1b691932a056fe149916d934 SHA512 d97d1b08eb796d4c107426ff2c015ab1f221612500c8a57fca8e3f064e8c0f5ae2a5e6071d013313cd9f4be8fed4ba03beae84bd446f56b2b2ca5d483c328191
 DIST rpassword-6.0.1.crate 11505 BLAKE2B e637ad3199e65e8ea44eec0ab7115073a68acdadd4c39e2f583c52989912487145c43cf91f7066b1aacbcb52f74e244139cb81a0525281d2059eacfb92c47a2d SHA512 280487f364bd0ab28abe0264e7698fe188e763cc9bb4a67f904d534f8f60c8b7e1baf22854492d67385d37e87051caabed7b5a219103be950eb04cb595352c1c
+DIST rpassword-7.0.0.crate 11645 BLAKE2B 5d9a92d6f64495e1d8e2161480971bb490e457642e58b14466db9bea86c6074d52fca5f02a4c595cd2c870903921cbb42d333f97779aa2f0eb8d7b5f30eb64c4 SHA512 45ca3c34b95cf2fdc7052b6a2bbca61f95933f46502b6728d608fd6a7e4c03a7c8e89c5278b6bf0df658fa2864af4c735550544828e3b4b38790347ee9c9085d
 DIST rustc-demangle-0.1.21.crate 27920 BLAKE2B 73ada923b9b293c5a9893f86fda0586139afbb7d56894cabbd70612d1fb0330a9e491d5143fe3498a0c8d3e1a3f8e63c14b20865926e4c831915592486ae32d0 SHA512 4031b26863a726cc6d3398b48682e0f0f9e5665abf20a5d35343a904ebd7c0d3752dcdd3a049b2bfa3e2a303214dc39a2980700bcc64464f7029be3c7f34727c
 DIST rustc_version-0.4.0.crate 12175 BLAKE2B 6fda2ce03eab45d7193fa0d70175cc7ffb56b7be85fb1314092bdcfd3948ea145420569ace3a47218a4a2a6e44a818862cea6dd8cfb945475496f63b591c29da SHA512 f66da7c6efe431db06cd01180d84ba67fcd38f8cd6ef693762957c00ccc2211f23c08079d7f184776e08f28d2d6ca3bdb5f5016f7de245c6193d4722891ba1db
 DIST rustls-0.20.6.crate 259289 BLAKE2B 36359bc14e87853752fe55a327bcd15a26cdb053b6e7b5d5a1e83ef940d1c2cf4c2acc899eeec35d01b9360a8814396938f2a1faacdf44bf38ce137ffd3238a5 SHA512 04a7922b3456b53d88904af925bbc3b4cc6f0b45256af46e1ebaac2446b73e2645f3b6a3a40ea9ff783acedfa2cc5ab94feaf3513a337d4e06564ab9008d2178
@@ -279,8 +301,10 @@ DIST semver-1.0.10.crate 30912 BLAKE2B e0addb727cfec75ac00d0941bec66433f549c5e73
 DIST semver-1.0.12.crate 29615 BLAKE2B d0a8e7d148859c402c6a84ed8e261e738879079c5f755a80af6a210696ca157f1153d61596bf40f83d75bb69f27c045791ed141a32441e5d8c906aea495bab69 SHA512 d9c0984e59c8abee49418f785fdf5f7110dad8b4c84368723b7682bde3b9f97eac458f4a7ae2969548757b6d989bfb45909ec4a26b191ef304995628c7c78440
 DIST serde-1.0.137.crate 76182 BLAKE2B dffef53be259eeb051a375e532c3748219f8219413af0615debdbbce61c5ca17be13b06c0bbbd7a85a696b4bc76ae8e252d880b01ecf540b758fc10f11415b21 SHA512 28223488e18826f83a7e90029aebc0722e0cd238a2c0c021e5a162d0f5deaa494713fad10f7ac79c8e14de856af931b6d83cb3efcfd0885837fc71e35ee38a2b
 DIST serde-1.0.138.crate 76271 BLAKE2B 9e5021cbb5e4bdc82f8bdb3f079a24cb7909acad498fcd7e38b03bc75e2675dfd99658507b3208f5b1fde69f79c29f546b16a4b1be17da0e4b155acd92dd6b6a SHA512 e303d863d5ebdef27c38047427789ab6d3c4e1034d3e2bdd4048c09ef0da0e5f5b2cb25d00e1d47269fcc345458cc496af4e1a0ba64a3d627205337144a1c854
+DIST serde-1.0.140.crate 76408 BLAKE2B cd89def1aef2c850c62e8efd8ed03da9e725a0e80c78de1a8b053d8a9c7d089509b9e5855b2c8b7f383cd58167125b91b9d243a6e11bb2e9fd6cb68403187311 SHA512 cdccc3ce607b327785821d8a4bf088b78380a622aa32efe7b1cf6f7554a03f7a407f500fae733bfeb170093e08ced50e81d7009ed502d1e5b4f021609fcb750b
 DIST serde_derive-1.0.137.crate 54831 BLAKE2B 19a0324c18bd00da4feabcf83dd78de2ff7a1905abb82d5600c6128a8351f5ccc37df21e0135601167a51ea1e6691bd22957c2bbd9da637653c7673dbb808d24 SHA512 ee47d3bad717ae16118c43e6f308a0e264bde80caab8f8649bef96ed3f7aa0f9b6a479311df22ecdc7bbcdade65f7b03b79100f8b86caf02f9a0bc77ce01035a
 DIST serde_derive-1.0.138.crate 54841 BLAKE2B 14a21c6492862aa2f7ef82c5668e2aada623c700b2450b547529cb69906d65c557af8414cdda1c4b962b0ffbec48d80b2732cc7ebea5d573860115f5d72a9d02 SHA512 c1dafc5d6ae273b2572eda1e986259393b96b4d37dc21622888546435d63af9117cf0ad4b13d260367a2bfe5cc194481fce624fba27df516e2567428410ef64c
+DIST serde_derive-1.0.140.crate 54851 BLAKE2B a4a104c6a143e4f5951bb94d3ed8cd4c882a4508d786ad802db4de4c84fe932bdcd45d7882f75e5e4c4ff8cafca4188e39d62d71b65ff6ac0bb14ced9f73781e SHA512 209d66ad4cd11d899aba6554cebd517fcf1a8621c9bc0103cef51558f954d1995bd16fe6fc09ca5a242820ae4764ca774fbcfd99b07ecaf609d680fab66e2aeb
 DIST serde_json-1.0.81.crate 144480 BLAKE2B 3c95d56e65c6673ebe9ef0aa41ba184c5246cbcfb0dd9edf8e87ca6cab736d195ce8b6349846806ba7047854d579517d2d19bbfa932c90b700f06e54cf49b131 SHA512 9f224b2182db2fdddfe1878d05d857c52a60a38f9b4fdfc87c09c20efc8b6ec2419bc60e4b18a0852ed080b09332773eac372f8356af5ac0ddf3da8212345cb8
 DIST serde_json-1.0.82.crate 144514 BLAKE2B dd4b5ee1b93f04be09b1c204f8484091d608acc3966ed4c8252a1d46003dd154666e2731e761828dda4123da5c45bda653f453454c5c7c11977aef05bd0e9e9a SHA512 39e4cb0d8b22c9beae6decb87b9692581698c6309b2e9fd78e5e199a200da563e7459d34435b7890e274e13357195392cab69d73d3ee2ff537c1667de32f92c3
 DIST serde_repr-0.1.8.crate 10327 BLAKE2B 2df93b708e840c7cf4528a9d15c13ae94a9b3660c5937cf405fc3ae3a1c32fc2c2c743503e7a63e27a999b5a7d550cfee182dc4c7db77377ce91f131a71f601d SHA512 6554814bc6cac332c8d5cc94241c224d8ca532719703b1fad19963db5f4793db7e2a5d195df6a1a534d1edafbb4223a63bae55dc928cafb3fbe69dce76d8547e
@@ -289,6 +313,7 @@ DIST sha2-0.9.9.crate 22247 BLAKE2B 4ac2c92325ad92881f41e777010516870fd001617c2d
 DIST sharded-slab-0.1.4.crate 52479 BLAKE2B 766d81761909006ac740cce13e8361734c3c7072cd07c8c8f611f09772e16f11aa93cabdc5273b9446f5da391b26b7e7d619be523488d8b3558c64c18f20d591 SHA512 123a9ddb126d1adf41a30a632604264d66a06bacc497db6373e9dd36164197f8321f2fc826a16247674f0f69d9f6e30aca37810f787693c4a5c2cee8c5887c55
 DIST shlex-1.1.0.crate 5199 BLAKE2B 325536bab9c9707566a099a161e7bc8448c7369cd9d7b2f144ed71543d551038ef1fd764376491e8076ccdcc928b5c4e177764a68584267a91386b8d542264c3 SHA512 e51892298dd79dc7cf04d7e6f0a03e4850a57b15cd75e6e3b56e2a0b15d4cb85ee8afcc14e3727d193c8b91baec8c2864a9c800834ee4d18a1be584f17591752
 DIST slab-0.4.6.crate 16067 BLAKE2B 0aa3d8914479baf2409ce83644f8eca93f49b426333f1b82392b779fd79cdc04a0a33bc1aa5e34e8248df9ebd88e742b3e870716adf1787bcb7aa5b9caee307c SHA512 788837db210be63579eccf12d96fcaa3280c7515bedebe3040a71ed27d013430815ebc74acc06280daf22c0b16871bad210981d32615c26cb1da344b4b0d9488
+DIST slab-0.4.7.crate 16647 BLAKE2B f567cc822e7b84f64a0b0372c22a0463d260871455a33df025808a0476dcbbd4e051a117d8896d96d6d3d0655b7c296cd691ca22edc54486440f4e2e0f5d1e1b SHA512 659a9ca3323fc2cd236f6cb9eb6feeae8a1f5fa046fa239a34cd7a5ab8a7eadb9e5977e8d5cc41e9138900dd7c75ebc0601480771c5fdd2e084ee76619b82521
 DIST smallvec-1.8.0.crate 27992 BLAKE2B d02897eb4d3901805be86cafd5d3dc6768b31c2ee4d0a9d7eb455e2a21be2864ea83589f4ffde102dbbafb66e3c197707af770b5ef184b8e244d992189644b84 SHA512 17687cfa6aaf95a1df063adc3a412a7c41918a0d003eaac90f7d9e859fb8fa1d652eedee17a4cb3aaae9b33a2043f89e796519e3a7a3992b292f04049bf80b0c
 DIST smallvec-1.9.0.crate 28396 BLAKE2B b04100f0a8db9e7c34a425e665242772c9857c5a4c5f34468a3f1b14f669d5cd21de2d54dc5295a22f52032370e8e989fc61cea3f4e6574ccca5be639c645e74 SHA512 e7158393d4257564eeb8fa53a630fdfc13edb33f3c555e41606edcfdbe9189e5c59c25d255dd21d02d4abad1ab2931e21744ec6c2f91ad4db66f87e748a45e56
 DIST smawk-0.3.1.crate 12840 BLAKE2B 937471e3ec3431f174264ce41e7a9c8ac781f5ce3638afe6219173730f5a0d0cec2b482ca72eeee34d5765c75db1707433b2c5b5004cd6d6fa4809f606b26813 SHA512 d6a050e873da5c90de3ff9fd02166de3be4c03931de9cac5307e6c16a71b8db1db6e8309eaa38ad408b20e0cc98eb4133595ad7aea96f62ebdcea579a643b65f
@@ -327,12 +352,14 @@ DIST tracing-core-0.1.28.crate 57723 BLAKE2B 718974afb0412e93f60fd8795fce82f1395
 DIST tracing-serde-0.1.3.crate 7329 BLAKE2B 55d924fc3acfd496abca8b42bf3fa4a2511340cf2ebb060fb31bc0b5d81dcbbaa299daef3cddc3647625afd124b9c83efc1ef104f55dc6d4cd4d91e0e667c160 SHA512 3822ac747df404c33573ad2a5c722f9708066a72c2893dbf507563ef29bebcab79cec17515fa87c0fa64be8a08073c38ab57ccc463c74df8caf3df69c72e131b
 DIST tracing-subscriber-0.3.11.crate 184827 BLAKE2B 83686c5affeb40a84e95c161b121dcdd533b782151896b86752f4d9a922683847dc350482a7436fee23a23cbadbb9522dcb7966993e877fb84fa8e6deda050e2 SHA512 5d45d5108742aece42bfe7d6f6ed71b0bee81c3e3e3a3117489ec5d4d4ee9c23c157077ad5020b74b019d212fb2a46623e93dc57a7f6bc0a1a853981ea097493
 DIST tracing-subscriber-0.3.14.crate 187439 BLAKE2B ae0450b38327cc97386bc60be241bc98dd93047630c524ed477d60a8c927074931dcb1ee849920e9485fe11e5447e20b59aba6158c0cfa61d3e578b583483f47 SHA512 5dcd61db59681fbbf42986d6d128345b4e76d48ce0aa471ba63ee83dd47f59b7204e03664465836ae1755f9d4180f996ba7d4f92728a11d367ce05852feec5f1
+DIST tracing-subscriber-0.3.15.crate 187713 BLAKE2B 981e45c25d93c9cb5e5deee33d88216fdc0c6466d713552bff8679793b3d3caa6d0720c21ee4b66582ec5006a356ba39d287703d7debddf191cb6c577f39ee18 SHA512 69953ebad629f3a2175d6cb0bf4c607f299b6188d9e58e9556583eec1044dbf8b8f9010a18dcc5e26eb10cd86e242fa8a0aee33d6913dd64f05cc6077a3e8479
 DIST twox-hash-1.6.3.crate 21842 BLAKE2B 67c261b2b0a93293717a4e2e07dc11df2abde09da6fe713b9d04917ace73de1b59b8d4fd9449ab46cb7cf496fad1e440effdfa1fae6f5cae4ca78af8cd019c42 SHA512 f7ce63e6e5ca79ce9330caf40b32578a5d2088c5d8ed371604268760d6e212d447d9e3a95378378a283024155bccdaea47597902c488a94c5d5f79770baec8fc
 DIST typenum-1.15.0.crate 40741 BLAKE2B 5752d80396d0a37b0069b98ace9efe96d94ccaf41b33b8149c8b8c6a767537dbffe64251bbf61f3812465ecbc8cb45544f177dc97ac9735d84454282e4d1ed66 SHA512 a3c1ceac85e1aed98d0829449c35f4f36db860218b955b4e5f8f01da1d27ee6213f3c60e2b25c3745dcd67369049da5de737a9473fa9402db99cf7cddeb42288
 DIST unicase-2.6.0.crate 23478 BLAKE2B 6e580108ac81b1cbee70e5bd331f43b12f266dae4f4f758bb8f5f073bd1af61943ee0de34cc27769525b19da8c24f8dea4941d0f5454594ab0cc8b78071ff053 SHA512 7e76a5f344e32c56cf87223585d87a56c79627b52bba0b29eb6de82de874b2964accededa8e9b5741f57944b6750fba5c61e679a50d4fd5a5646f431e2f4f188
 DIST unicode-bidi-0.3.8.crate 36575 BLAKE2B c0442dd47a8ee81f575b28e34c9781ccf507b53ea96d1d4df2e8117231e8e67579031e4244a2dacfd6f4c24ec01fbbd4da7c9ab72ad50af51ef56d7d813b6444 SHA512 810b5be48159ecbca542c715496f279518285c3b09f7c39451986f94e6c259fab1057512a2148bf99ba9abf76e861a24456b547cc2273f0b45ed5d3ce9dfe3d5
 DIST unicode-ident-1.0.0.crate 34224 BLAKE2B 62100357db87b74e44166a70a1d0f911281fc7410571554e9e89c94f3529920d1d43a8cdf3a3bf163c8acb8e9f575e83a024cb94217b84ecddc582751486954e SHA512 ccdad29fc63f71c507cdf276b02a5bb7fad44dffa123bf04d5b1495eb9c26bd7ec42ad6e11717eb10dc6499693047952c6b766c40d7b0696bd011779649d5fc9
 DIST unicode-ident-1.0.1.crate 33770 BLAKE2B e028e9f1d6c01a7a37c8f9ecd6b1d99041b45674bc7699066bb7479822cb8d5a1b4083db1117d9d44ab05096d8a37a9bd5d93dfe8cc5db6bb58950b4f5d5c8e8 SHA512 505650712a51c6f309c97bf72029de1eede33c71b84de9733f5f987859a61225e3d07d369b85a89797d870ea436f30b5b5046306f3d5fd672551a4b30c43e428
+DIST unicode-ident-1.0.2.crate 34951 BLAKE2B f03f7a040142785675a800672bb363dcf7aae266eebf50425436100249442f27b18837f9e297d93b59a9254c349e13222f8af892a9c0fbf2bac676df8a1b0e1e SHA512 60d78668b762eb842c15ee554c0c1175393702c805f1a874957d49104e9152ad2d0316966553fb14cb520aa858a84da223bf426d55e4ac23de3324a3bebc301c
 DIST unicode-linebreak-0.1.2.crate 69293 BLAKE2B 825dc2a29d86314cff3492cac71add2cd48948284d9e9b684580186f4c021c8ce1e288d21cc47493eb19a158385ec602f0cd5608a7618e38667c1cc7445a302d SHA512 170db67d6d74df913dffc921986b92df8a2ba68776ddb17c8ffca51d0d4bee597a5460591e7ba593c1eaec8b6227956f4e0f9b11d217aed4ee85cf46f1be5277
 DIST unicode-normalization-0.1.19.crate 107353 BLAKE2B 4c69d50efcae131eb4b91d385a64b49412a11ba913b3c0364cd04ad107d59e31adbda74d34ed13a065d9a7825d79fb740e82a4dc66b7813a9837af4352ac9e16 SHA512 7459e9d2867308cac80a98d8dd0b0cce797e2830ea5ff55b878f7a37a6f5e1f0bc14340e1a29955298d660ba2be57754a1478d74851b1b90576dd5bc4231729f
 DIST unicode-normalization-0.1.21.crate 121745 BLAKE2B e67a472d39b72be66f5f8e5b924157232dcd73edb2ecc1bf4f1aa078ea3b9860838afcb1710297367fd8c95f3c1331c91a520ac46c39b94f58a633919f124c95 SHA512 2994104d3393a117cf3eafc147ec9599c870b3bd4fbd096980534c8aeb48c6ba05bcf3f9804e3f2a0148940186dfb27871b23a991360bf8253a5a644f3cdcb12
@@ -341,6 +368,7 @@ DIST unicode-xid-0.2.3.crate 15174 BLAKE2B 5cfb2a094047106a45eaeb77ebc1ae2e17ca5
 DIST unindent-0.1.9.crate 8392 BLAKE2B 601f1779806037f48448ce03483779b731bafb003859f489b806b1b4fd5ca136d7a77b62f49926c0b4315e89830fc6382381aeb56da85b4acb4754ad4924b90f SHA512 bcf5a74ee92c034e975dabc83cbb1859100b3ac04439a360a109651d95eb4f29e4a0c113fbd67b9fef2a3b27d10f29dc84bfb648ea4c3dec64b7dab8d14e57ea
 DIST untrusted-0.7.1.crate 7924 BLAKE2B e0152791e781a4805120e3437b7e0219db3aa0282af4faaf2cfb15718421ff26abc56021c546f6aebb411f5abd27020273ba0f785e012a4b0089e96c2db4faa6 SHA512 5ebe3266912e4e78fdfdd13f9fcc07e9cf489d19d5e9ff346486f47aa58a0aca35278d561612c49eb3cab5a6759ac974d3b92bfabc399e1bc0808428dc347be0
 DIST ureq-2.4.0.crate 91872 BLAKE2B 07a4fc5f4c285931ee31f869e1a0b96a82ac1bf61a779f156f8b0945ed96e6698a6c168498d3e2f0bbb648ccc3357fd17da73861b0b8a42550fc4f7f1f8c31fb SHA512 3d7093e6ac7cbc70f55a095590e9a92eba747421317fd7dbcb8096e36764925a3d1a02665567079f23ba765e63fc085d8b398283cd4941008286d8bf0d134050
+DIST ureq-2.5.0.crate 98026 BLAKE2B 040f787676193282122a937543cf494099506dbf8be15d9cb8bc8052f1cd3369f50c25263f3e67ee9174d610f01bf2fc48c34f771161d433ffb18f7ae83745cb SHA512 dafeb7118eea167f525dc217d270cb39b2bead5e4bc73f244272fe7aa72d8a7fd0dcf800494765dd368d5e00fcbc8dd1efa08de359aebd1f09b948889b9f87b7
 DIST url-2.2.2.crate 68555 BLAKE2B f8e59f784b6c2e16bacfba36ad68670a6af17c16ea3b0866b5aa98e5bf4686cf1b1aac9b1f0a0ea3b89a01e044a2ca37830416f42d147158ea8e88f23fd28ac2 SHA512 f9b6ad99d69ff303283b3fd9e98945fbd6cb411a3d141badcbb3a0566723a451375e6dd5d5357e3eb7a1b5b1ee5756a2347c43817db2de6fe35b9004b090e077
 DIST uuid-0.8.2.crate 37909 BLAKE2B e6ede5f8ae05572d4c55909eb3fe6946de6f10ad9bf71bd357739bc01201bf93f59ccbb3dabcbfd7b3e54b0c98c3b52d21f1bf1877b7283c6df623e9b2b3f33f SHA512 5a1f5ead9a920b9bbc120c02049c24b62ec215765e486d3a15c5015ef49fa506206efb737e6f6555cf6e2eddddfe55f0ca1d7dcfa9aa8bcf3e0ef570a54fa2d8
 DIST uuid-1.1.2.crate 49511 BLAKE2B ea25eeae5181b977fcf9a462cbfd4fc5175b0dd16dc19aaf0d6c250a7eec312a6c617aa320c4ec9f452c200ca3aa803146a45cbb91053f500b100eeb14d8c7bc SHA512 de1d1019d224c248e19cbf8a8539dc55937b23f74c5a8b11a445f8b7c155d35caa2001d6c710f4a4a8c034446162ef32c0e3be9f3d43631477c6f3d350acf7d0
@@ -352,11 +380,17 @@ DIST waker-fn-1.1.0.crate 7114 BLAKE2B e510eec0490f0caca3930000cecccde209ad387d1
 DIST walkdir-2.3.2.crate 23516 BLAKE2B 473f2b51aafd6ac17e5c3da8d545d179b31486b3a65ab39fbd8bd7fbb2ebcc24bebf01781200a26a68f0b1cb464f5763a919aead3b03eba5a7e1be6efec5500b SHA512 6c44071354faf37720ec4117ded34c8d530489542ee107ac26a7a56ef4a882b9003e22e84f1d61f6078643521343e35aa1f7b57c838779e78e5937a667bf82da
 DIST wasi-0.11.0+wasi-snapshot-preview1.crate 28131 BLAKE2B fe501889f25d65e2d032f885cc50c4f8bf7dd70fd5cbc438de349838370d8699e9627b0a4fc76030ea9fe6d508f41d0c9928a875fdbc47e73bfb17241cf7b155 SHA512 043500ab28cd9cb779475255da5d109ebab7fccca72b64873dc28d77bc5a157ba8d96b9e8f05223b5b36c7089bb7b4ba87657fc69bac16b78972f897294a865f
 DIST wasm-bindgen-0.2.81.crate 165467 BLAKE2B 4b02ad703362d89c280bff92552a632b6cc50a586db4a476fa4f476118b94a89707712c1f6ff65c49a4d6001e9c9e16922a35e36b315b8f544e261ceb43dd5a4 SHA512 dd9a9902789dc8c7c3a8107c52018783b505efcc534c94c95ce55ad735c51489c928f767c319d97f78868a58d4aff7a71b2d1513350c30adb9122401b493906b
+DIST wasm-bindgen-0.2.82.crate 166376 BLAKE2B d42f24970c6d24331633230bb6d09338531b501c449b2297c9bfa52344c97cf9b965d70ebe81267e95105712d51e03b16c33de4d2ca43b57036845edd28bb983 SHA512 406b8c0388d6e6c5bc45158819fb57ee05d30a48c776c3e40490512f5f14c04f4da59d2a74d4ae00cbcc16146b0c921f554aebdc79ca9159c24c5dfd7e514b99
 DIST wasm-bindgen-backend-0.2.81.crate 25737 BLAKE2B dbfbd09a4d5a1c585fbd8cf8a29dd375c887e77fb5759c74bfbf0dbf012a0340df06f063e1a4908a80a2ff8298689cfb92ef67707e5d2e163abe155523c2029c SHA512 0d3b14b530adb2a32ad3ea169f0555973a25232613ff4269600dc1e86a6d75e4717be2388f132b6bab9a12625f645f644f59dc30a0b4ff3f20c20106083bcfa3
+DIST wasm-bindgen-backend-0.2.82.crate 25764 BLAKE2B 29b7e2c49c9912bb84cdad7b803b9929a9e9a0d4fb65a04170a43241ebc49e40324bc1d59d6b71c2744632f245ade26518511f95a06b2969c75f476e721fef5e SHA512 07b3b45959c768b4aa9b12c287774036650e067998c18132a6ac56df735e0e647e998ee00cad8c27bff43efdb6d7d7a1778356dffc4c138af3b32e602b62e179
 DIST wasm-bindgen-macro-0.2.81.crate 11796 BLAKE2B 3fb6a60ca59279d3921dd65f7e7d4d91a457e31524671d465c5ce8fb31db7f28f49d80fc0161c2faa9f5a7dbad4c44584f0fed6177e8908de2a421951c62479d SHA512 f1164f7a4413685ec34e22c462b4a4cbaa79eba47079d90b7e15304db222afcc8e966f3bc994a231f21e29ba68a844b3e6622f840e0c335d09201c1dfa046ea3
+DIST wasm-bindgen-macro-0.2.82.crate 11808 BLAKE2B 47b0ec5347e7baea0c417178372f5c9099808be917068f33d0129aaa5d1ce33b6b12e99c09a3248c28d2c355b21dea321f8857020cf0e9a3bdf2f7315663be1c SHA512 718f37425ab7c1e5e98149142f2dab98f1810d0af1c3047272421fa9f4081e1735c3a30b6a45f934d7d622d6f86fdd0cd4e1b7ac57803e20257da5fc28ee1ac9
 DIST wasm-bindgen-macro-support-0.2.81.crate 17855 BLAKE2B 2afb7807913ba01d99ea93030461842b7eeb405f4be0f0d671e1d430b6cc0aa111518c9549b71c8a94dda418c149050fc9d0613e10cdc7fd0dce354d87b8c4c0 SHA512 1fac5ac8b546e4fe55484649d7e2a39537b49797e20a2859a17ac98cc8c25cb3d91dca09e94c33651b9963efed6045ddd79bf646489bbd11065c62e66a59cda4
+DIST wasm-bindgen-macro-support-0.2.82.crate 18529 BLAKE2B 677a339688f1df3da57dc57cda094d9e25fe2049d6a3734fb6ee340356289aa4df469b20944e3db1958a05af0ada4a1adae16d3713654b497491ff34dfe60daf SHA512 18c72aa0e5e324e646d8d6ab5da29f068d9c3b0e0c8f54eace2ff0b36b85625d017bcb69e0e958845171b2a7fff3122b22b9815a08ec93bf32c7b44b62d9f94a
 DIST wasm-bindgen-shared-0.2.81.crate 7194 BLAKE2B bc31b0e75cafc2dcd207ffcf44b9ae84de4e5bebebe471404736352e9aaa1c2da45e22892a548c05cda24750be028dcaf66e6529d1ff2f833986ab2085b74fb9 SHA512 5ca631a720623e42caf737d3f8faa4961a051eb71b6b0854e4f697f753889cd58df980962d39650acce7712449ae50cf86effa542bd85e451cdb86767aa7ab34
+DIST wasm-bindgen-shared-0.2.82.crate 7197 BLAKE2B a53647d302dc781ee4bb58dfde00d167800b62bc836903192edeae576c403c3bd9bd03021121572ab06970e3707cdb64a420e9f095564a84aa6415f708b8435c SHA512 58ef55f039f1e47047886d7ef617f20db616dd7790c74bca625a87b9e32600d82a9322730b9acf29a8cd22a82930c6ea6eb7e76b54cc653c9ce8cf2b43ca646a
 DIST web-sys-0.3.58.crate 696212 BLAKE2B a76b29a2a1b46239e1e6b134004bf43bd127466d9920077196e59b3ff419e059f433f94a68c24f3a6361d4f751ad3b69c6bfa67cacec0f0a2a58c87f319cd475 SHA512 58215a0d34bf0478514affa8d85f46017ab565b1dafd36f98a1d0f93e04f909b8b09348c06a189700111b5a8bee2049640a3a3a1433c4939e60bb12f32092b05
+DIST web-sys-0.3.59.crate 697461 BLAKE2B 07d404e9e6bd8a825b700e55282fa78de97f61de63cdf3b9b82b1c5cb8043acd1722b5e2887c6bda7bcd20c92be54f3041a036000d0915a1c423092a3ff9d48f SHA512 795810c407722771732a2237a02ade8685b6257cc9843515fcf621c3f79fcedc7c64c30dd74e611d5b218fa785f904e596d8d6beb90de9097ea49e18273633df
 DIST webpki-0.22.0.crate 58663 BLAKE2B 4fff91a8ce3d46a9daa9e39c50755f79574c91faddead2f6c879f6e9bc2189b76c4951cbc36e607e099ab8a870b422e1afcd4bcbecc14e96555c26c8cbefeb84 SHA512 7c2916d47f2232587e3ccaa8fefc8b576addaf84b55166011032e471f91ce54a79d2fca7fcc1144552c254f5baead708fba2b0ce76a1c34286838a8744b0f570
 DIST webpki-roots-0.22.3.crate 242291 BLAKE2B 70509e4fe7e1df706c66dee61200dd73372ed37ad9dd08db81687bfca6d2baffa4a9588054a827cae3c7e55a0aa31de220c5cb205467bc2891188cef1949b776 SHA512 4015b9f98127324efd8219a3a1f3e7f3bc7d67023838fa924a52df8815ff80a5caca351e12219b24be594fe55448ea06b5e040c19b4d14156a115fe5c70c245f
 DIST webpki-roots-0.22.4.crate 250591 BLAKE2B 2fa664941519531df1f5fc1f51fa8224085d3a6f8e11b551bb66088a7e82445914aff1bbc9924f7abc9da87619349620c0189353296ca2012c1c0ccefd6ba086 SHA512 d6a07d073f21284e6fa42e164f41edca352acfb2ef93a1c663d8b18c8b80e1d013d7ef524755bb02e6d3d5177ce6e22a8bfb76be306fe70c7c4875e82ac46e00
@@ -384,4 +418,5 @@ DIST zvariant-2.10.0.crate 64374 BLAKE2B 65f5ec09b812217b2d96f57fcaca7fba97545dc
 DIST zvariant_derive-2.10.0.crate 8746 BLAKE2B 8408e6689f6f849d37d0ade5549dbac25a01a8ef6de5692290f24462e0984128fb5b1d72e87e94e4c422896d68f9acaa382ca6af57f47f470448894a85071b1a SHA512 ba06d0761de8e20839246517d89494e5728fd654cf95eec193a4ca4cdb90090542bbfd7ed0ffbc9fc44edda38c5270139f54e63cb88d09f6c26b39199ea1deec
 EBUILD maturin-0.12.20.ebuild 8472 BLAKE2B a4c605e6946af255031a7375d6bb0c82ee779d65529a0b3bc1fdc44dad4f5d08a87c029750106a13a4e676eddc3be7fb21075c5634d0370a4ff10b1fa3537dd4 SHA512 f42663d3d1ffd376cf0454342f74fc437a8937dc56eb9c3cdf61f967796d458d5916beaddfca87ee52230e54b9f70b410bbdc8c5d971979ad4f1e75da7e0861f
 EBUILD maturin-0.13.0.ebuild 8826 BLAKE2B af8f1b31f58953f27e6d9504b0e2e5cc9359c44a085a79f2aeb920c86574a516cb6309c873c7cd1b0ef72f58d7b94e59241a92f6e4b382af81d15a847c01c1c4 SHA512 568ab96ffba357a1305f7fc5d79cdc7f40e4e826d8330812e232195009a60a00a3e8a7b484701f7282fe539115f0c3419707f2bd58a21557ed4823d0e051a503
+EBUILD maturin-0.13.1.ebuild 8878 BLAKE2B 6d08ce0b8b53e41efed30f9c837895f981fd37fa5d256fcb7dca052634c611e8c3696faa8d5d31dd9201717d776e4c4175d302183721f5f6487be02bcfe07dfd SHA512 592b2d7ebf0aa2acdadbc8dbeb369dc6e8121bad3a5b93f49d042996d5fc7d4f31ccec830147adb40c9836cf7d59f59fa19cbef757d3e345de1c43d613fef167
 MISC metadata.xml 581 BLAKE2B 9fd4c9b9ef68199ef36af2d3799e3c16f819e89a2858bbfefbedb35575f5018c44ccf6b851f1bd367adefec1e8e6dc4a817bd431037b2ee8d1c01e3638d81541 SHA512 93e477343b707475d8b5bd043575a047e7247998e62daaed232216a9a3bfaa9dcae0ac02ec8489e847018495b31f9ef1811d528498e0e129dde99b06712ef7f7
diff --git a/dev-util/maturin/maturin-0.13.1.ebuild b/dev-util/maturin/maturin-0.13.1.ebuild
new file mode 100644
index 000000000000..1d9dbacce256
--- /dev/null
+++ b/dev-util/maturin/maturin-0.13.1.ebuild
@@ -0,0 +1,434 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CRATES="
+	addr2line-0.17.0
+	adler-1.0.2
+	aes-0.7.5
+	aho-corasick-0.7.18
+	anyhow-1.0.58
+	async-io-1.7.0
+	atty-0.2.14
+	autocfg-1.1.0
+	backtrace-0.3.66
+	base64-0.13.0
+	bitflags-1.3.2
+	block-buffer-0.10.2
+	block-buffer-0.9.0
+	block-modes-0.8.1
+	block-padding-0.2.1
+	bstr-0.2.17
+	bumpalo-3.10.0
+	byteorder-1.4.3
+	bytes-1.2.0
+	bytesize-1.1.0
+	bzip2-0.4.3
+	bzip2-sys-0.1.11+1.0.8
+	cab-0.4.1
+	cache-padded-1.2.0
+	camino-1.0.9
+	cargo-options-0.3.1
+	cargo-platform-0.1.2
+	cargo-xwin-0.10.2
+	cargo-zigbuild-0.11.3
+	cargo_metadata-0.15.0
+	cbindgen-0.24.3
+	cc-1.0.73
+	cfb-0.7.3
+	cfg-if-1.0.0
+	charset-0.1.3
+	chunked_transfer-1.4.0
+	cipher-0.3.0
+	clap-3.2.15
+	clap_complete-3.2.3
+	clap_complete_fig-3.2.4
+	clap_derive-3.2.15
+	clap_lex-0.2.4
+	cli-table-0.4.7
+	combine-4.6.4
+	concurrent-queue-1.2.2
+	configparser-3.0.0
+	console-0.15.0
+	core-foundation-0.9.3
+	core-foundation-sys-0.8.3
+	cpufeatures-0.2.2
+	crc32fast-1.3.2
+	crossbeam-channel-0.5.6
+	crossbeam-deque-0.8.2
+	crossbeam-epoch-0.9.10
+	crossbeam-utils-0.8.11
+	crypto-common-0.1.6
+	crypto-mac-0.11.1
+	data-encoding-2.3.2
+	derivative-2.2.0
+	dialoguer-0.10.1
+	digest-0.10.3
+	digest-0.9.0
+	dirs-4.0.0
+	dirs-sys-0.3.7
+	dunce-1.0.2
+	either-1.7.0
+	encode_unicode-0.3.6
+	encoding-0.2.33
+	encoding-index-japanese-1.20141219.5
+	encoding-index-korean-1.20141219.5
+	encoding-index-simpchinese-1.20141219.5
+	encoding-index-singlebyte-1.20141219.5
+	encoding-index-tradchinese-1.20141219.5
+	encoding_index_tests-0.1.4
+	encoding_rs-0.8.31
+	enumflags2-0.6.4
+	enumflags2_derive-0.6.4
+	env_logger-0.7.1
+	fastrand-1.8.0
+	fat-macho-0.4.5
+	filetime-0.2.17
+	flate2-1.0.24
+	fnv-1.0.7
+	foreign-types-0.3.2
+	foreign-types-shared-0.1.1
+	form_urlencoded-1.0.1
+	fs-err-2.7.0
+	futures-0.3.21
+	futures-channel-0.3.21
+	futures-core-0.3.21
+	futures-executor-0.3.21
+	futures-io-0.3.21
+	futures-lite-1.12.0
+	futures-macro-0.3.21
+	futures-sink-0.3.21
+	futures-task-0.3.21
+	futures-util-0.3.21
+	generic-array-0.14.5
+	getrandom-0.2.7
+	gimli-0.26.2
+	glob-0.3.0
+	globset-0.4.9
+	goblin-0.5.3
+	hashbrown-0.12.3
+	heck-0.4.0
+	hermit-abi-0.1.19
+	hkdf-0.11.0
+	hmac-0.11.0
+	human-panic-1.0.3
+	humantime-1.3.0
+	idna-0.2.3
+	ignore-0.4.18
+	indexmap-1.9.1
+	indicatif-0.17.0-rc.6
+	indoc-1.0.6
+	instant-0.1.12
+	itertools-0.10.3
+	itoa-1.0.2
+	js-sys-0.3.59
+	keyring-1.2.0
+	lazy_static-1.4.0
+	lddtree-0.2.9
+	libc-0.2.126
+	lock_api-0.4.7
+	log-0.4.17
+	lzxd-0.1.4
+	mailparse-0.13.8
+	matchers-0.1.0
+	matches-0.1.9
+	memchr-2.5.0
+	memoffset-0.6.5
+	mime-0.3.16
+	mime_guess-2.0.4
+	minijinja-0.17.0
+	miniz_oxide-0.5.3
+	msi-0.5.0
+	multipart-0.18.0
+	native-tls-0.2.10
+	nb-connect-1.2.0
+	nix-0.22.3
+	num-0.4.0
+	num-bigint-0.4.3
+	num-complex-0.4.2
+	num-integer-0.1.45
+	num-iter-0.1.43
+	num-rational-0.4.1
+	num-traits-0.2.15
+	num_cpus-1.13.1
+	num_threads-0.1.6
+	number_prefix-0.4.0
+	object-0.29.0
+	once_cell-1.13.0
+	opaque-debug-0.3.0
+	openssl-0.10.41
+	openssl-macros-0.1.0
+	openssl-probe-0.1.5
+	openssl-src-111.22.0+1.1.1q
+	openssl-sys-0.9.75
+	os_str_bytes-6.2.0
+	os_type-2.4.0
+	parking-2.0.0
+	parking_lot-0.12.1
+	parking_lot_core-0.9.3
+	path-slash-0.2.0
+	percent-encoding-2.1.0
+	pin-project-lite-0.2.9
+	pin-utils-0.1.0
+	pkg-config-0.3.25
+	plain-0.2.3
+	platform-info-0.2.0
+	polling-2.2.0
+	ppv-lite86-0.2.16
+	pretty_env_logger-0.4.0
+	proc-macro-crate-0.1.5
+	proc-macro-crate-1.1.3
+	proc-macro-error-1.0.4
+	proc-macro-error-attr-1.0.4
+	proc-macro2-1.0.42
+	pyproject-toml-0.3.1
+	python-pkginfo-0.5.4
+	quick-error-1.2.3
+	quote-1.0.20
+	quoted_printable-0.4.5
+	rand-0.8.5
+	rand_chacha-0.3.1
+	rand_core-0.6.3
+	rayon-1.5.3
+	rayon-core-1.9.3
+	redox_syscall-0.2.15
+	redox_users-0.4.3
+	regex-1.6.0
+	regex-automata-0.1.10
+	regex-syntax-0.6.27
+	remove_dir_all-0.5.3
+	rfc2047-decoder-0.1.2
+	ring-0.16.20
+	rpassword-7.0.0
+	rustc-demangle-0.1.21
+	rustc_version-0.4.0
+	rustls-0.20.6
+	ryu-1.0.10
+	same-file-1.0.6
+	schannel-0.1.20
+	scoped-tls-1.0.0
+	scopeguard-1.1.0
+	scroll-0.11.0
+	scroll_derive-0.11.0
+	sct-0.7.0
+	secret-service-2.0.2
+	security-framework-2.6.1
+	security-framework-sys-2.6.1
+	semver-1.0.12
+	serde-1.0.140
+	serde_derive-1.0.140
+	serde_json-1.0.82
+	serde_repr-0.1.8
+	sha2-0.10.2
+	sha2-0.9.9
+	sharded-slab-0.1.4
+	shlex-1.1.0
+	slab-0.4.7
+	smallvec-1.9.0
+	smawk-0.3.1
+	socket2-0.4.4
+	socks-0.3.4
+	spin-0.5.2
+	static_assertions-1.1.0
+	strsim-0.10.0
+	subtle-2.4.1
+	syn-1.0.98
+	tar-0.4.38
+	target-lexicon-0.12.4
+	tempfile-3.3.0
+	termcolor-1.1.3
+	terminal_size-0.1.17
+	textwrap-0.15.0
+	thiserror-1.0.31
+	thiserror-impl-1.0.31
+	thread_local-1.1.4
+	time-0.3.11
+	time-macros-0.2.4
+	tinyvec-1.6.0
+	tinyvec_macros-0.1.0
+	toml-0.5.9
+	toml_edit-0.14.4
+	tracing-0.1.35
+	tracing-attributes-0.1.22
+	tracing-core-0.1.28
+	tracing-serde-0.1.3
+	tracing-subscriber-0.3.15
+	twox-hash-1.6.3
+	typenum-1.15.0
+	unicase-2.6.0
+	unicode-bidi-0.3.8
+	unicode-ident-1.0.2
+	unicode-linebreak-0.1.2
+	unicode-normalization-0.1.21
+	unicode-width-0.1.9
+	untrusted-0.7.1
+	ureq-2.5.0
+	url-2.2.2
+	uuid-0.8.2
+	uuid-1.1.2
+	valuable-0.1.0
+	vcpkg-0.2.15
+	version_check-0.9.4
+	waker-fn-1.1.0
+	walkdir-2.3.2
+	wasi-0.11.0+wasi-snapshot-preview1
+	wasm-bindgen-0.2.82
+	wasm-bindgen-backend-0.2.82
+	wasm-bindgen-macro-0.2.82
+	wasm-bindgen-macro-support-0.2.82
+	wasm-bindgen-shared-0.2.82
+	web-sys-0.3.59
+	webpki-0.22.0
+	webpki-roots-0.22.4
+	wepoll-ffi-0.1.2
+	which-4.2.5
+	winapi-0.3.9
+	winapi-i686-pc-windows-gnu-0.4.0
+	winapi-util-0.1.5
+	winapi-x86_64-pc-windows-gnu-0.4.0
+	windows-sys-0.36.1
+	windows_aarch64_msvc-0.36.1
+	windows_i686_gnu-0.36.1
+	windows_i686_msvc-0.36.1
+	windows_x86_64_gnu-0.36.1
+	windows_x86_64_msvc-0.36.1
+	xattr-0.2.3
+	xwin-0.2.5
+	zbus-1.9.3
+	zbus_macros-1.9.3
+	zip-0.6.2
+	zvariant-2.10.0
+	zvariant_derive-2.10.0"
+CRATES_TEST="
+	libc-0.2.119
+	libc-0.2.125
+	once_cell-1.10.0
+	once_cell-1.11.0
+	once_cell-1.12.0
+	once_cell-1.9.0
+	parking_lot-0.12.0
+	proc-macro2-1.0.38
+	proc-macro2-1.0.39
+	pyo3-0.16.5
+	pyo3-build-config-0.16.0
+	pyo3-build-config-0.16.5
+	pyo3-ffi-0.16.0
+	pyo3-ffi-0.16.5
+	pyo3-macros-0.16.5
+	pyo3-macros-backend-0.16.5
+	python3-dll-a-0.2.3
+	quote-1.0.18
+	redox_syscall-0.2.13
+	smallvec-1.8.0
+	syn-1.0.94
+	syn-1.0.95
+	target-lexicon-0.12.3
+	unicode-ident-1.0.0
+	unicode-xid-0.2.3
+	unindent-0.1.9"
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+inherit cargo distutils-r1 flag-o-matic
+
+DESCRIPTION="Build and publish crates with pyo3, rust-cpython and cffi bindings"
+HOMEPAGE="https://maturin.rs/"
+SRC_URI="
+	https://github.com/PyO3/maturin/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz
+	$(cargo_crate_uris)
+	test? ( $(cargo_crate_uris ${CRATES_TEST}) )"
+
+LICENSE="
+	0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions
+	BSD CC0-1.0 ISC MIT MPL-2.0 openssl unicode
+	doc? ( CC-BY-4.0 OFL-1.1 )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/tomli[${PYTHON_USEDEP}]
+	' 3.{8..10} pypy3)"
+BDEPEND="
+	>=dev-python/setuptools-rust-1.4[${PYTHON_USEDEP}]
+	doc? ( app-text/mdbook )
+	test? (
+		${RDEPEND}
+		$(python_gen_cond_dep '
+			dev-python/cffi[${PYTHON_USEDEP}]
+		' 'python*')
+		dev-python/boltons[${PYTHON_USEDEP}]
+		dev-python/virtualenv[${PYTHON_USEDEP}]
+	)"
+
+QA_FLAGS_IGNORED=".*/${PN}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.12.8-zig-tests.patch
+)
+
+src_prepare() {
+	distutils-r1_src_prepare
+
+	# used to prevent use of network during tests
+	cat > "${T}"/pip.conf <<-EOF || die
+		[install]
+		no-index = yes
+		no-dependencies = yes
+	EOF
+
+	# TODO: package-agnostic way to handle IUSE=debug with setuptools-rust?
+	use !debug || sed -i "s/^cargo_args = \[/&'--profile','dev',/" setup.py || die
+
+	filter-lto # undefined references with ring crate
+
+	# ensure rustls is disabled on arches where ring crate is problematic,
+	# add as needed and keep in sync with src_configure below (bug #859577)
+	if use ppc || use ppc64 || use s390; then
+		sed -i '/^if platform.machine/s/^if/if True or/' setup.py || die
+	fi
+}
+
+src_configure() {
+	if use ppc || use ppc64 || use s390; then
+		local myfeatures=( upload log human-panic ) # sync with setup.py
+		cargo_src_configure --no-default-features
+	fi
+}
+
+python_compile_all() {
+	use !doc || mdbook build -d html guide || die
+}
+
+src_test() {
+	mv test-crates{,.orig} || die
+	distutils-r1_src_test
+}
+
+python_test() {
+	local -x PIP_CONFIG_FILE=${T}/pip.conf
+	local -x VIRTUALENV_SYSTEM_SITE_PACKAGES=1
+
+	local skip=(
+		--skip locked_doesnt_build_without_cargo_lock
+		# move below when >=rust-1.62 is stable, xfail "pass" with 1.60-1.61
+		--skip pyo3_no_extension_module
+	)
+	[[ ${EPYTHON} == pypy3 ]] && skip+=(
+		# test enables pyo3's auto-initialize that is incompatible with pypy
+		--skip integration_pyo3_bin
+		# wants the missing libpypy*-c.so
+#		--skip pyo3_no_extension_module
+	)
+
+	cp -r test-crates{.orig,} || die
+	cargo_src_test -- "${skip[@]}"
+	rm -r test-crates || die
+}
+
+python_install_all() {
+	dodoc Changelog.md Readme.md
+	use doc && dodoc -r guide/html
+}
diff --git a/dev-util/pkgcheck/Manifest b/dev-util/pkgcheck/Manifest
index b388eb4e0bd5..c2e81f8504e1 100644
--- a/dev-util/pkgcheck/Manifest
+++ b/dev-util/pkgcheck/Manifest
@@ -2,7 +2,7 @@ DIST pkgcheck-0.10.10.tar.gz 464957 BLAKE2B ce8abb3a4f40b6c8512dc6ff2def4d32a262
 DIST pkgcheck-0.10.11.tar.gz 474106 BLAKE2B 2a3e330d54e421a48e5cd89044b9af37334bf461f47487b8dd62e7fd1c766d162766d0a6c1319c50c3fd6965b56377536743903c265782b2fbef050d4f805d3a SHA512 b47814822599417d0f7030ac444fd4b2bab1f1bea21abc2a4fe1dd679185afd7d5f823aefff1b6830036de5c7db6232c0b6fc6d33f9c2535d88a711e6d49132c
 DIST pkgcheck-0.10.9.tar.gz 460614 BLAKE2B 5b581cf5acd6cf46d72bb3c928a93a20e3b2f552d447617eaf2b9ac50cd7956f9a43fa7b17932b27fa8dafc6d49e41cb8553e4a9059b0ef5fd769713deb6fb12 SHA512 cc800f89944353dec5a4293968a16c132e573b309b6074d4f950b993dab7ea8c51decf3921bd34d3b04520c932a932d27e6e969c8dcf86d20fd6917265d474b6
 EBUILD pkgcheck-0.10.10.ebuild 1649 BLAKE2B 25d79b07250a18e0d65d6ea13a5fd29bf9118515288fd46d3b64e4962020cfc2a5348d9b11a9d3fe0fe460e9ad773dad9bd209fecd1153044fbf8ac8aa3ffc5a SHA512 e2759e639f8748a2ec6c7162caceaaadb39d4a306b7342e87f96cf2a817578704081a2f568459aba97d5f898eb0be2654f681e02d447515bdd29fc7d49e3d1e2
-EBUILD pkgcheck-0.10.11.ebuild 1669 BLAKE2B cf255719619e55ce6917440c8ae34bae3dae072e645ab6e3d8aa14e693d02904f73eb1076b02c9ec9a9a6d2a7d2df467cc731bba03cb93badbb8ba740050eae6 SHA512 a75e68f46b66e3651f13d0905ced6e5390b0caf25c49aa4924b65421fb1234aab2f63ee66b4d7abbe9636c8f220dfa61be159cc345ef53f5600ba0fee4600444
+EBUILD pkgcheck-0.10.11.ebuild 1662 BLAKE2B bfcc3a9ea44177f4c3218ab5573755aef10ab557040eb1bff327f49612c94143ae82738063736ace8d5c6e6185afb08cacf732bb57a6a12a1f3302493e1882c1 SHA512 dae557083f86e33bce1caef47aa2e6a3432efce70c6fa924acb8c48a1881401f2fc4e0c77a8d6b87bd65a48a841657b328b2eee25020c48470d0500568424a28
 EBUILD pkgcheck-0.10.9-r1.ebuild 1678 BLAKE2B d9a03fb937f53979d8c8d160c10077c524c264016a8a734e2588950f72462fda520345d44b0cea2e9d7a6572dea2b17282e76739c0f8066e0dd51ec5ddca85f5 SHA512 a0f051ad46cff98d1cdeee340aee2696cdccbb64b9b07475537f6a65321aab4fdd73dd65be4a834278579a69d2352d057b7911a6c0ddf6f65fd8e599178c2ca2
 EBUILD pkgcheck-9999.ebuild 1667 BLAKE2B d242ef9df56e715a337e824bc0ea8fa506874b6187562eab83f6c7d6a2a956d9956ca10a0103759cd475681e9f2f247a3d4561f6aab326cec00e99301ebe10fe SHA512 c922ea247014211152ad96a087242bbc27a974ac750abeb378b9ca75fadf3f194447aa825f94027e927614ef6755b12b257c9b30bf02f8d7f3ca72e5e7a039fe
 MISC metadata.xml 375 BLAKE2B 1825ff9b67eab9b36e31170190a21b6b522799a75d06479ea6d8f7683bc38b33c3efa73f5983b50f1a8242f1827872fc11cafbe2a36c77f3c17c42e524e69a6f SHA512 80b76597ff006bdb146e0ac5629d1a1c4fabff90d25b0bcf10b93558f39fd184084fd71f7daefec55b08e1600723c161b2a61653bb68a9ef6c307373deca6664
diff --git a/dev-util/pkgcheck/pkgcheck-0.10.11.ebuild b/dev-util/pkgcheck/pkgcheck-0.10.11.ebuild
index 3392619076d0..dcd8e78062e2 100644
--- a/dev-util/pkgcheck/pkgcheck-0.10.11.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-0.10.11.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/pkgcore/pkgcheck.git"
 	inherit git-r3
 else
-	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"
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 fi
 
diff --git a/dev-util/wayland-scanner/Manifest b/dev-util/wayland-scanner/Manifest
index d210a33dc7ce..b55f4cfec333 100644
--- a/dev-util/wayland-scanner/Manifest
+++ b/dev-util/wayland-scanner/Manifest
@@ -1,6 +1,6 @@
 DIST wayland-1.20.0.tar.xz 225188 BLAKE2B d607610ad8b30b6b3bbfc3945679f698030f271766cfb72425f98f170a96469fb085fb9a746a866b8562d7f452c844e61ad57f634dcf365474c7d050b76022e9 SHA512 e8a1f410994b947f850799bdd0d95a2429d8467f853e62a0ab3915a4e9fe130f8aa977e03715114ab740c6ec546edea63d275ce7f927d4f3029ea126e6a7d215
 DIST wayland-1.21.0.tar.xz 225936 BLAKE2B 2b43eb1517d476bb2b4daed1083373655b57d047968fdb93dbbbbe4235af12e25557627e30b5c3d2575bac4beaf1e0a0b8ef10a3c673538d9097501f33c05836 SHA512 5575216d30fdf5c63caa6bcad071e15f2a4f3acb12df776806073f65db37a50b5b5b3cc7957c5497636f4ac01893e2eaab26e453ded44b287acde01762f5fdc3
 EBUILD wayland-scanner-1.20.0.ebuild 992 BLAKE2B 47a95fe8fa62d143e48f397e255fcb5ba868c86a8253e58b354b453994718f7c362df9e2858d58ca3772309aa5f101e66508e622806090c84fe370469129d231 SHA512 316c93ac9e9f64e8a38639c905aa6ba622a0730d1e517734e748946750407651808cf4e9636fb0b58910c6fbbd3c2f18dd94cec656322e1582fdb8b8ce361502
-EBUILD wayland-scanner-1.21.0.ebuild 1030 BLAKE2B 69772afc5b2457fb4c2a3aa983a1b84776b94a03b220bc5d37dd76791188fb210d94c5299933737aa9e8d27c3cf7ef679c99bbff2f1daa7e9300241e9ca35041 SHA512 3e38ef866c22d8e8c4d125489577e4a72ef6e658b849714d7e79ef0c6092a86d66a6fda20b0043e83e52b30c96fbfd3eef6bb32a27918357d44f77c9ebda2349
+EBUILD wayland-scanner-1.21.0.ebuild 1028 BLAKE2B 5c3d2fdc9a499138f810f23f1a16f22daeb8cd4c2f2f95702e061d328b0bbcee16d4c3d1ffde2a0ff6261b6e1732b10d3346c71474c25a2f0fd5810b89b28b7c SHA512 df62c20ce5e1c708be0f948a79080df4e685606219ec5b0abc0d889fd3cfe5271fea9c9776f94b1ce1f60361d5a410b40a188dd736fcf24b2b0f2d5ed83c4d01
 EBUILD wayland-scanner-9999.ebuild 1030 BLAKE2B 69772afc5b2457fb4c2a3aa983a1b84776b94a03b220bc5d37dd76791188fb210d94c5299933737aa9e8d27c3cf7ef679c99bbff2f1daa7e9300241e9ca35041 SHA512 3e38ef866c22d8e8c4d125489577e4a72ef6e658b849714d7e79ef0c6092a86d66a6fda20b0043e83e52b30c96fbfd3eef6bb32a27918357d44f77c9ebda2349
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/dev-util/wayland-scanner/wayland-scanner-1.21.0.ebuild b/dev-util/wayland-scanner/wayland-scanner-1.21.0.ebuild
index a71f5f47ad48..93c27251878a 100644
--- a/dev-util/wayland-scanner/wayland-scanner-1.21.0.ebuild
+++ b/dev-util/wayland-scanner/wayland-scanner-1.21.0.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://gitlab.freedesktop.org/wayland/wayland/-/releases/${PV}/downloads/wayland-${PV}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 	S="${WORKDIR}/wayland-${PV}"
 fi
 inherit meson
diff --git a/gui-apps/Manifest.gz b/gui-apps/Manifest.gz
index d48892a43269..be2c6c9a30f0 100644
--- a/gui-apps/Manifest.gz
+++ b/gui-apps/Manifest.gz
diff --git a/gui-apps/nm-tray/Manifest b/gui-apps/nm-tray/Manifest
index 987fe075a009..793ec7b348d4 100644
--- a/gui-apps/nm-tray/Manifest
+++ b/gui-apps/nm-tray/Manifest
@@ -1,4 +1,3 @@
-AUX nm-tray-0.4.3-missing-include-qmetaenum.patch 565 BLAKE2B 7542d3f95acb8157216d3526df0ee37c24b58316e1a044212ac5355c4030992e6169cf645fe283d00c4d52dd87739889b318b4e3692698628ed500b7453460f5 SHA512 0a11ec9013d1730ce593a17393ed32a76b072480c577bca6219fece1a1a77b1ebe50ef692d6cee93b9ab8fd8f3d83beb5f79cd3e4653218f8cf833f7dd21824b
 DIST nm-tray-0.5.0.tar.gz 53854 BLAKE2B e83c31606905909a62df57b2e744ff133a5cff91673ff229bd53ca1cca17840989efb6d813053700562dc8b434a6676a9310ff4d50b39fde7daf580986a19cad SHA512 ba118f7fd07a60af5ed6b7b53cf771f339c89f9bef02aeb2f59bfbddd3e896bdc31aa506437e33cb8fe2ef921c595b76527d61cefd202e9e1f5197762b69ab51
 EBUILD nm-tray-0.5.0.ebuild 702 BLAKE2B 20d30362da00607c020065b5b1dbb67ff8a55df24e59d02cdaa35e33b246d0ed973b94f1621e55a4e41a83b0623af782f4b96099ec3127fadb6d2f460e398567 SHA512 d56022932669ea269b9ca323c157e9964cd6348e0beb9c70d6b4c433f0e3d6322271821d66cfb497268f32b351903e6e2583cee11d776256127c996b2c5b803b
 MISC metadata.xml 245 BLAKE2B 4988fa1366a9b8a3769e503545339cdd493a0bdc362ca9237b158b94549de1f061477546b00fd3b21dc9325812423f7207071e22e3234d5c0b88c755197557d2 SHA512 e00be68ab9ad3acfce3d2d48721c47cf50e2c6358c9ceb45a2a23fc5303826ea26b9205ce4f230121c2e40c9c467367f2dc57863680899b21e8005034aa9118c
diff --git a/gui-apps/nm-tray/files/nm-tray-0.4.3-missing-include-qmetaenum.patch b/gui-apps/nm-tray/files/nm-tray-0.4.3-missing-include-qmetaenum.patch
deleted file mode 100644
index 6d319efa55b9..000000000000
--- a/gui-apps/nm-tray/files/nm-tray-0.4.3-missing-include-qmetaenum.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 4563dabee3cbee13bc9d23a4a5d0ddda1526b43f Mon Sep 17 00:00:00 2001
-From: Palo Kisa <palo.kisa@gmail.com>
-Date: Tue, 1 Oct 2019 12:03:43 +0200
-Subject: [PATCH] nmmodel: Add include for used class
-
----
- src/nmmodel.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/nmmodel.cpp b/src/nmmodel.cpp
-index d779801..ac70307 100644
---- a/src/nmmodel.cpp
-+++ b/src/nmmodel.cpp
-@@ -45,6 +45,7 @@ COPYRIGHT_HEADER*/
- #include <NetworkManagerQt/ConnectionSettings>
- #include <QDBusPendingCallWatcher>
- #include <QInputDialog>
-+#include <QMetaEnum>
- 
- namespace
- {
diff --git a/gui-libs/Manifest.gz b/gui-libs/Manifest.gz
index f89fd5727ea8..62b3efae136e 100644
--- a/gui-libs/Manifest.gz
+++ b/gui-libs/Manifest.gz
diff --git a/gui-libs/display-manager-init/Manifest b/gui-libs/display-manager-init/Manifest
index 38c5ea2fbd0d..7b37b1d57f16 100644
--- a/gui-libs/display-manager-init/Manifest
+++ b/gui-libs/display-manager-init/Manifest
@@ -5,5 +5,5 @@ AUX display-manager.initd-r2 6237 BLAKE2B a0bf7c7563419f14867568c111a7d3456eadf5
 AUX startDM-r1 778 BLAKE2B 134345da401d5d75cb4e3cf79189a2594e508d4afe748bc209e8a93ea754169b205b114fcdb830ed95908788d0bf9cf071cd50de0c37df7fe5b83827f406d766 SHA512 e0cbb1f0ca6d6d3ae3f963bb5508e5b58e03682aba3f35cb2c1819c17e2d94ee240a5dc603f9fd93d22ecca060d131e46c0a0a25685aa8deac280294ff76b8c9
 AUX xdm.initd 200 BLAKE2B ec997b7080037a7197a6f75728d9075c846168115d705015afc6518e1e72d815cdf87c2e9e3f3ad950034599e548d015e530cb7821f83b9d289337908455c17a SHA512 4552215cc2cdffa3298a9136e2a22f600f55958d7f74b2d06bbf48568d8034ef24deea27ad9f8d6d100516b0efb4e2688c1f454dc556120f759b1da7fecd877c
 EBUILD display-manager-init-1.0-r3.ebuild 1678 BLAKE2B 7f273bc6a60add881ca14152682cc73397034a6d704a02ad91512746a5765b8910137a157fe650ef8cd2a9925fceee8bc60d7278a316853b87a3eaa611f19432 SHA512 3a1d038ce0a6788ebb21fdd76d8fe0f8a24cede8595d54b0030254a0e7ffae90966185840981626e31ae68322096d36f56c5e6011fc15f95da19d28a9a38e5ee
-EBUILD display-manager-init-1.0-r4.ebuild 1686 BLAKE2B 8dc15d6047aa11ba16b880dcef9d5645dafbdc6565afee3c6b37a223e742fba7f48c87d498b6e3766933af9129783c9aabe8b234181fbe5dbd93ac1b684d7eaf SHA512 fe22f792ca828aa39193fe47803f9c446329009270ea2c610134a290fa8cc603eeb52cfd625be7e0cf3474d591deaae6f1464fb1fea678561d2174464e4fc18f
+EBUILD display-manager-init-1.0-r4.ebuild 1684 BLAKE2B d535cf76a19ceaf0b2d5a104ea7050d172469efca2068995d014a39b247cde2c61abe3330ebf45cb39ac3b80b25fc73917652cfcb726d599a924ffa42ddbcd6a SHA512 77358783e25744b090283070b1d891684b6c7564f7b9e07c4a7eec63b48c15c17f50598316a53816ce13f04e3e70dd529282e77b8fb1b8074d30fe6e5ff5e457
 MISC metadata.xml 259 BLAKE2B cc7abf54ed4398a2cfb77310c63f5fae3e432488b0c7466f8148c5d009d38aa4ca78eef78712f0b7b6aca6710aab1dfe3c07440f36179fde03f8a97a49b3c080 SHA512 6f50c5d3c735db431156906312a7c1dab3723d8c9e51d15148b92d97a998221c6838eb926f36c6b924c9fc8a6a64ba904e36482ff5164867c482502aa638462f
diff --git a/gui-libs/display-manager-init/display-manager-init-1.0-r4.ebuild b/gui-libs/display-manager-init/display-manager-init-1.0-r4.ebuild
index 7ae3482802fa..918fd07e959f 100644
--- a/gui-libs/display-manager-init/display-manager-init-1.0-r4.ebuild
+++ b/gui-libs/display-manager-init/display-manager-init-1.0-r4.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Project:X11"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 
 S="${WORKDIR}"
 
diff --git a/media-fonts/Manifest.gz b/media-fonts/Manifest.gz
index 8a4a40f6c8ae..5ef71e143843 100644
--- a/media-fonts/Manifest.gz
+++ b/media-fonts/Manifest.gz
diff --git a/media-fonts/encodings/Manifest b/media-fonts/encodings/Manifest
index af91b73f3c14..19908777aa12 100644
--- a/media-fonts/encodings/Manifest
+++ b/media-fonts/encodings/Manifest
@@ -1,5 +1,5 @@
 DIST encodings-1.0.5.tar.bz2 713817 BLAKE2B 43e466c27fdf485e9704debb89c69a3c3eaecf84453362d86b53aa9c33d10b8f97f348ef35f8b430be101e8281ecce5d5f49a052929fc7cd37d94a7590645193 SHA512 920e49f0b3545f181a1574ca3280ac9adef1e68fe27566c195dd7013f728d355c0d759132789357fcf8fa7391fcbe1e17edf2bd85aa5611df5a4d99740011008
 DIST encodings-1.0.6.tar.xz 312720 BLAKE2B 4649d8d12fcfcbb7de9e8bd8aa7e77514835a56990123549137b4bbe5615c1e9fcddccb13b6442d8a525efd147926801a5029cb10126462b29e31e3354da3683 SHA512 2d52486996939401121bc858ba23031f70eef857760db8da4c84f083e981868e4bc7a8c2ab6d59274a0cf95f592a0dbfad47bce6c9299bb45d115b48abc39134
 EBUILD encodings-1.0.5-r1.ebuild 663 BLAKE2B d62b20760ba7f5db43696a531a08bad66f4f075f33dc64018425d04a0c522f949270066fc838e26b741e0fb1b24510fc03a721a3b5d13a92f509f776f93452e8 SHA512 4ef30bbe181a8c9e9c7d4782c9316e4d817691c2a5a8ade2906431616e8cd4fee81acd0dac104e912e09929f386dbe12cff1b0fcb9f7eff3e43fda5f7505fce2
-EBUILD encodings-1.0.6.ebuild 696 BLAKE2B d795b126965f610db0fe8f37498609f17fe71ce736e0c487094139cb7b29cf940997217554d6edda74e7880a28e85e4080476c3c6c915aa889999849682baec7 SHA512 d4c49a83d11c962c24602868e2fd1be4c00e14a08f7dbc9cc4dcbd83a48f2821b3e6080e0b7f20c686715a9979656d2317858d06430a10000d6757acc99cc396
+EBUILD encodings-1.0.6.ebuild 694 BLAKE2B e334c8e849f4e87ce050952a78676a804d2263e07e0337774ce9deaa1cf5bcec13acfa8c7aeba167f855cb67c89a1f170009b68f55eccfaaa374eb26d182c7a4 SHA512 26e4928f6bcdbccddf96d97143f0075b86f4fa7c365baeee3b355471777383dbb4e8a83453abfd4c1122a1824387ba990d5338db2d8d0d0f810da7674035cdb6
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/media-fonts/encodings/encodings-1.0.6.ebuild b/media-fonts/encodings/encodings-1.0.6.ebuild
index ba0a1658be2f..798b462ba0da 100644
--- a/media-fonts/encodings/encodings-1.0.6.ebuild
+++ b/media-fonts/encodings/encodings-1.0.6.ebuild
@@ -10,7 +10,7 @@ inherit font xorg-3
 
 DESCRIPTION="X.Org font encodings"
 
-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"
 
 BDEPEND="x11-apps/mkfontscale
 	>=media-fonts/font-util-1.1.1-r1"
diff --git a/media-fonts/font-util/Manifest b/media-fonts/font-util/Manifest
index a6fa0110c5d8..14c4a91ef05a 100644
--- a/media-fonts/font-util/Manifest
+++ b/media-fonts/font-util/Manifest
@@ -1,5 +1,5 @@
 DIST font-util-1.3.2.tar.bz2 158480 BLAKE2B 490aa54fdbf0e7060a17261e6ac06d30ef374c0ef40ae7473680c192898305c86617667c59f334d54e3ba3eb2464e925a12a5ad4bc74c73f6a62b0500d7c0da0 SHA512 7cac529b12ae71185b89c72c1569b9826f52eeaecc1c76010338e7c42c4078ae339f18220b580bbd68fb5dc09df6ecf169a47c32e6104d8ee53bd443fa21d167
 DIST font-util-1.3.3.tar.xz 142544 BLAKE2B b893159496fb242c33facda98597e200b41d05fbc28c9c1cf04f5214788f421472562a79ad24cffddad72ebf38f751858712a5c7c2904370ea77f501f78ccc77 SHA512 5e1cb8af44fe0bea72b1a6a4e455f50ca49b7531c2f4b605800c0b2b7578b9826ccf17fa195c505ab1d6339fd4ad697c01ba3b9777616f354ab62b23434d47c9
 EBUILD font-util-1.3.2-r1.ebuild 656 BLAKE2B c9f960473fd093553a3fa24a85be7330ca006046295a12ca7318829e3c39fbd4ae4e94608db58a0b612cff92882fea108b411aa5fef2bb57bf77d3c239ff569f SHA512 47a28efdeb978c1ff1377eea887076d5a2c1202ea8ca0e061a9e0b69b5f35091a14ef627c495ffa3d77f74f8c966bb92411945d97d75e43c2e4c19bc098ed32b
-EBUILD font-util-1.3.3.ebuild 689 BLAKE2B 295a9e28e1570bf7b1b1775b3c94ea73870996d8d9a9fedf5ca42eeb85cbca9d53a3e420d15c806c8782a8ff2871ff33839c66aef5c203f0f8a53b269d948676 SHA512 3e0f0cc2fb6ed521ce834e48cf2b354634494b5229096effaf2f84a3b1dd3982847e7601c5f885c198c4955ec86e71bcd0fddb4d056c98f4a464427c0096e77c
+EBUILD font-util-1.3.3.ebuild 687 BLAKE2B 1e9d2a6038d5ee20e1a978dddf435e6695a16b9e8a347ae073daad81810253e1734905c5d34d7877e1314793e3cd4c5b94c28c0d1de9a4c236d7197d976326ad SHA512 08674cc6277e25e47c2b285a19e0d225f58de618921e755c5ff7639ad7a68e99a10d93f71a5bcf956f3878b87632fa1d31d0c9794d7f823ae8cc228f3942b207
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/media-fonts/font-util/font-util-1.3.3.ebuild b/media-fonts/font-util/font-util-1.3.3.ebuild
index 180d08a20707..79b759466255 100644
--- a/media-fonts/font-util/font-util-1.3.3.ebuild
+++ b/media-fonts/font-util/font-util-1.3.3.ebuild
@@ -10,7 +10,7 @@ EGIT_REPO_URI="https://anongit.freedesktop.org/git/xorg/font/util.git"
 DESCRIPTION="X.Org font utilities"
 HOMEPAGE="https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/util"
 
-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"
 
 XORG_CONFIGURE_OPTIONS=(
 	--with-fontrootdir="${EPREFIX}"/usr/share/fonts
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 1f408df6f6f3..03c9e4003189 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/libepoxy/Manifest b/media-libs/libepoxy/Manifest
index 751aca8d7265..705ca4ca835c 100644
--- a/media-libs/libepoxy/Manifest
+++ b/media-libs/libepoxy/Manifest
@@ -1,6 +1,6 @@
 AUX libepoxy-1.5.10-use-opengl.pc-without-x.patch 590 BLAKE2B cef810cccd2133045a60bb5d6e812f048402f1ad65b3befaca34b14950df60b5b7fa732de09eec1a998782ecf846d6863432713b62a29ee6b6ed25b1c2e1cd77 SHA512 567e3f838e62fb607e3cb4f15a5694ffe2407f575acfc1198b15f042fdaef333a05cd3dda28204fad8224967da13c62d87d2ea073c38f1f239d9e0ac7d520dd7
 DIST libepoxy-1.5.10.tar.gz 332078 BLAKE2B d56b45a8fc38901fdb23c50b569a667fce8ca289103a8d7ca19f96a76c75d3c2ff9d6959ed2ed47bd64806add95dafe42dc85dfc5bc60af14b5500b70070e008 SHA512 6786f31c6e2865e68a90eb912900a86bf56fd3df4d78a477356886ac3b6ef52ac887b9c7a77aa027525f868ae9e88b12e5927ba56069c2e115acd631fca3abee
-EBUILD libepoxy-1.5.10-r1.ebuild 1144 BLAKE2B 0b703da689f81eb822d90fc5d1e63f59101270890699cb092253d81960b43c6f0cde1227585738b2c63885cac34a58b95a0a04ded2183f193a1159df1617aa8e SHA512 3fc05fd42d2918abdc782c16367f2d6b7cb7a5884b66a6d93201a9e79742b78abda4bfe4bf5345e1265f0b6f1d5087430b0fc673fe54c44d2a3099f504385220
+EBUILD libepoxy-1.5.10-r1.ebuild 1142 BLAKE2B 2cd6b225f078890628fb496f21e918b7dbaa853a4c5b39cab0b38f455396aa4dba18c178cb8cef25110ea51a2f266b2e6375c9e52304d444e88533f8090abc3e SHA512 c203f00be150d37779f5fe44c87afa9f95308e3759a42b75e1312c604446cfc69e8921b4fe722cbe0bdabb7ffdd75b421c358260c0c15c60c6954b6e80afeebb
 EBUILD libepoxy-1.5.10.ebuild 1063 BLAKE2B e2cac5cdf0595fd42a33dedf9a04863839187903a36cfb2ea4c414ff0b656b90e73f73db5efcf0029dab2f71cc5f1c000ed75a712bc456ffc42fec9dca0370b5 SHA512 0e4ef5e9214a06e07c3b623f8050a4c8d0617017a1196eb9734e4855a2352650f9496b1f91fcfaf25c317493952c2a5945ab52a27ab1f8ae0a0c01f112de9352
 EBUILD libepoxy-9999.ebuild 1144 BLAKE2B 0b703da689f81eb822d90fc5d1e63f59101270890699cb092253d81960b43c6f0cde1227585738b2c63885cac34a58b95a0a04ded2183f193a1159df1617aa8e SHA512 3fc05fd42d2918abdc782c16367f2d6b7cb7a5884b66a6d93201a9e79742b78abda4bfe4bf5345e1265f0b6f1d5087430b0fc673fe54c44d2a3099f504385220
 MISC metadata.xml 376 BLAKE2B 980a035e0ac8a5a3126ee27c032e8f14353ca5e7f2920769b74a23aa827a1110ff8f55a49a1f3072889ea1fed9f76f39bb3c2fddc6f6e2e736773c961ea4be3b SHA512 d1b9e9349929118e39201157b34e7955b32301ceaea877025fdf929d1039af536618eec5a9b0c638622c390201cd4d3106d981f884cf0c1c6469534fa65797af
diff --git a/media-libs/libepoxy/libepoxy-1.5.10-r1.ebuild b/media-libs/libepoxy/libepoxy-1.5.10-r1.ebuild
index bd71baf5f2e5..e8328735b69c 100644
--- a/media-libs/libepoxy/libepoxy-1.5.10-r1.ebuild
+++ b/media-libs/libepoxy/libepoxy-1.5.10-r1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} = 9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/anholt/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 fi
 
 DESCRIPTION="Library for handling OpenGL function pointer management"
diff --git a/media-libs/mesa-amber/Manifest b/media-libs/mesa-amber/Manifest
index ea28ad045bfd..a5384cc70061 100644
--- a/media-libs/mesa-amber/Manifest
+++ b/media-libs/mesa-amber/Manifest
@@ -1,3 +1,3 @@
 DIST mesa-21.3.9.tar.xz 16607716 BLAKE2B 79669f9492c505b1729c526adf5a8261737b6088bdf01db654a0dca8ba22600ec985b574edfeee3a28c76e6e0f815782362973876e1d75b58f4417f45df70add SHA512 4cec6f4f50f444fcd327f7c40f8899c2f265e348e121455262b540b1f890a1468bbea59965af0876c548fa97aa0a05a1b23fa6ca7d308bd60328cfdeab757684
-EBUILD mesa-amber-21.3.9.ebuild 5065 BLAKE2B 87d399d883c134ef9c8092d026a2c33612458cf7c08b4dd62fd1c4591b6ea7c8b1de6e75b0657bbecfd3427e3bcac098ac620e301213efd3195102f0c2a155fe SHA512 f4496def2b22aaf9b60c43643ffd33e04e274bd55eff11a0a5f0028cf5376783f0c2b27e19586a31866ba5250c9d7978ab3922e28b7617d07d87d46ecfb255e7
+EBUILD mesa-amber-21.3.9.ebuild 5063 BLAKE2B 6784d4e99bbbd887fdac01b8083200643a6068ca5cb816d68208696358324e4e3f014a835e5926870ecb6c6494b01f337af02818b6e4c2a6650271e319d9791d SHA512 3143013026ff2533fa5c0d27ad2c7376f47951d57d4655e48fa612d85bdcee9675c8d88c94d11e382a52f95dc42bc6afa34956b38d67f6ae42f387256ef7fbba
 MISC metadata.xml 613 BLAKE2B ac069a22588af5a3fe4e3efdfd529f324b08632160b08b05696481639aaf0a927670a7b931c8d348c239ce9a7f185cda7d1c0e8f646989f482f64e1a2a3cb1f7 SHA512 f1d38903835b522f0fd40eeffee5f4eac783f25ce3f1f173baa5f3fd60f4104242753cfc63b54d3d27bb19bb952b83e7cf424b1a83c3085327fcade44b1848f9
diff --git a/media-libs/mesa-amber/mesa-amber-21.3.9.ebuild b/media-libs/mesa-amber/mesa-amber-21.3.9.ebuild
index 4d776506cd8f..c5b457417e29 100644
--- a/media-libs/mesa-amber/mesa-amber-21.3.9.ebuild
+++ b/media-libs/mesa-amber/mesa-amber-21.3.9.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://archive.mesa3d.org/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="MIT"
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 748075aa30fb..ed36cef6172e 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -3,6 +3,6 @@ DIST mesa-22.1.2.tar.xz 15992280 BLAKE2B bb2929e6c7dd0384b8e58b2a0ab6f91eabec9b2
 DIST mesa-22.1.3.tar.xz 16016520 BLAKE2B 3f9838022914b4ecc8882bc648bdd99a81aab2c6ebd4d9a3ce74655d6ec718d09abc6424bdb4b84a5430dcc51113d67bfd3368af4a3f390d3c574733b8ade4b0 SHA512 e7348839eb37de89c90d21277a7cbb42ee673ad6c656177853f6d35db99556dbac29867712222342d902b4fa67df5687c9d543bad99c81bcd0ecfb7f08f37480
 EBUILD mesa-22.0.5.ebuild 12064 BLAKE2B 51531f4eda83c55fc660e0e0af4ecd56dd27f3a63e4e9edd682c2b59dba3fc9b5d807ba83e58ba72027238c39a8230746aaa8e274181998233b76e0059d6a7b4 SHA512 e07146df6d58f19f336dd9f791d1216394c9ceec2a8d91c78c9948af5071e13bea02c856b8c1f6237595530b471b01640a1abfccbfc658edd7675e2578efca12
 EBUILD mesa-22.1.2.ebuild 12083 BLAKE2B 0098256a7a32c52540258dcc1d531a701ad531891d2f6f4ca2f4cf0c1cdc364c4a8fb6487a6b8f0b6efe46d6fd06ff951e194ae4d64ab0b51d58140d95d1ac93 SHA512 b1f9f47fc0cf720a7be0193c7c11e0ec63dd3408aa284690ced9b58761c94520961b2bcb2b00ec0cf7e2b0d66b0d41b77b886069fd605ab08cfc0cee8ed6c3a9
-EBUILD mesa-22.1.3.ebuild 12083 BLAKE2B 0098256a7a32c52540258dcc1d531a701ad531891d2f6f4ca2f4cf0c1cdc364c4a8fb6487a6b8f0b6efe46d6fd06ff951e194ae4d64ab0b51d58140d95d1ac93 SHA512 b1f9f47fc0cf720a7be0193c7c11e0ec63dd3408aa284690ced9b58761c94520961b2bcb2b00ec0cf7e2b0d66b0d41b77b886069fd605ab08cfc0cee8ed6c3a9
+EBUILD mesa-22.1.3.ebuild 12081 BLAKE2B f9828aabd49e42d535be46a3b7d67b44de3e37587534b6d72b55cac4c48729c87829a0e642ed755eb08de2d824506bd2deb7e23d34f1f93dbdd2ffe8ecb5c6a0 SHA512 3ef778f79efc8c3f46920e11ec948ab512392873e54c44790baeeefe2bf786a12782640e5344d527ed1ecda7c9b5474a5f0cb9a2ed954229df07f8a375546962
 EBUILD mesa-9999.ebuild 12192 BLAKE2B f7ab540bfcced9776a26c8ed0e313106f766c923c514e7db78f26ade09594480ea5528093736f95b0d5c03137cdde9963b11947f7a7973205c168e7e68ac6500 SHA512 8fcf0c89f6e9dc99e9de9f09f45338c5f14fdc6f516fbe20727fcd77030b5efd99d60c9ad4465410cf4da27f068c6805637c010309df89221ec409093406bb39
 MISC metadata.xml 1638 BLAKE2B 693f9dccb9933167cf5910541eff88b872bed49915574ffdf1776e430ef1e42f2a5a4aef5767a65927250a5e884c444fdf1340665a1f88105c1337ae8677dd59 SHA512 e304809d792e03ff480bd00f83358a6e33ad688cf45dd41fd5526a080bce6316148d838fc8d880f776501fb56524798a7e8a0a3b28105402ae3151ce7dda1909
diff --git a/media-libs/mesa/mesa-22.1.3.ebuild b/media-libs/mesa/mesa-22.1.3.ebuild
index b0927a3c4385..65661c795a21 100644
--- a/media-libs/mesa/mesa-22.1.3.ebuild
+++ b/media-libs/mesa/mesa-22.1.3.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://archive.mesa3d.org/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="MIT"
diff --git a/media-libs/speex/Manifest b/media-libs/speex/Manifest
index cc4627d66d89..0da319af107a 100644
--- a/media-libs/speex/Manifest
+++ b/media-libs/speex/Manifest
@@ -2,5 +2,5 @@ AUX speex-1.2.0-configure.patch 920 BLAKE2B 57b43aee0c57d6f0bf29202573d8f5caa65d
 DIST speex-1.2.0.tar.gz 1047080 BLAKE2B 928e044e1195d4d977497cd1275a07323df233ee85e3ec188f362720f96303c2fc2002c1147c2ac93ca03570ff98428d983eb7d00439c9cdbe131041d9aa2697 SHA512 7fe10838c7d1bafcbe42295b82b79262420dba793b8a4388e2f73a3007850b5572face1b5308d9f4e8d7dfc9cb1c016cbad88cd65b2892667986107ed946836b
 DIST speex-1.2.1.tar.gz 1043278 BLAKE2B 60afa7eb9ff87ebb1b69e2716b7fa6727b49f6c06ed6eb6fe81236c65dc4128769618dd1f4df31af56a00e9b766c4050c1b3e415c8f972d64d1fb9e7a537a650 SHA512 52e00300df82e1c7fb527b245af02b99a1f37faef74d004b7cd981052f1aa22a412cb18f5c7a5618df4c958f727c97eb7385beec99d68548d5b02e76192d4e0a
 EBUILD speex-1.2.0-r2.ebuild 1657 BLAKE2B 7407dcd29594f92febda5106ad352eb9b7999df220cc5463652ca649e4904fdeefb3920c17da533d22f16599423a40d9ec1e6ad7177f8fcaca5c5e4dd0a27bcd SHA512 f2c068f11364b821dcdaf3b512e398c6688bee064bee51ead40477c2fbe495bb95527d3e1163b1b7f9a0494e0c9752f1a5b6b7d33a870d3eb8aa69f606ade064
-EBUILD speex-1.2.1.ebuild 1668 BLAKE2B 78b301d63d2e3882ccb94b61bef33bf0f986084a25ced20457b2c111e7e9a9d552413c90a6ea572743a7d2cccf5cdd398b77eb14b2ee8a0726aa6910165aff03 SHA512 8cbbc17886364f15175cf36a2a8806d1f7f7f9d9a1b6ff5f50525d37acf455c6e39d5420dba26512a2d16ef071affd9ada56dbfc2afd41dbe9abb82684825567
+EBUILD speex-1.2.1.ebuild 1664 BLAKE2B 7fd6ef7778cb2b96f9da0ce34d3fbab570e57f03e606aed1779884b724de01ccaf799c39a1a9017525a2a856764f25f9c2b6965581ebbf996f31e32b1417b561 SHA512 b9c35a29156f67212da7ccf4079086535c94f38aae9294ce967c1451def1ed129b2a74fb3d8863d1ddad3baab351d8ec065f71fc60d1e3c48a65b904d6c67494
 MISC metadata.xml 496 BLAKE2B 596366a2be9ae01438cc46b116d3a280c1498270c1f06ce64f76a38e84f068f210d87bb87a447b3f4cbb7d3783c2d8d60ade5e487e5900ee04b98de70272b6b5 SHA512 bf5453fc3eeeaa740965f864e5d8f13aa969b6111b47ee1f2d382158457c996e9979fadb08ba6c3ea96257c2ad8b954fbb1ece0f8b7b70b4bb4f12c9aa1cf84b
diff --git a/media-libs/speex/speex-1.2.1.ebuild b/media-libs/speex/speex-1.2.1.ebuild
index 3a18b628ee4d..6bd0527aef26 100644
--- a/media-libs/speex/speex-1.2.1.ebuild
+++ b/media-libs/speex/speex-1.2.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://downloads.xiph.org/releases/speex/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
 IUSE="cpu_flags_arm_v4 cpu_flags_arm_v5 cpu_flags_arm_v6 cpu_flags_x86_sse utils +vbr"
 
 RDEPEND="
diff --git a/media-libs/speexdsp/Manifest b/media-libs/speexdsp/Manifest
index 0bff22fc112b..1cf6e1421ef2 100644
--- a/media-libs/speexdsp/Manifest
+++ b/media-libs/speexdsp/Manifest
@@ -2,5 +2,5 @@ AUX speexdsp-1.2.0-configure.patch 1092 BLAKE2B a4629cb00d1920133db30cf1cbdaade5
 DIST speexdsp-1.2.0.tar.gz 919621 BLAKE2B 70c7d07f4b23abbb70cfb212a6541288c71f57fffd5fe22ddd94901a7d01fa403a69b7884e3a4a2267ffd45a7e053b1ae7c7fd662e57053a06d4a7efb7889610 SHA512 e357cd5377415ea66c862302c7cf8bf6a10063cacd903f0846478975b87974cf5bdf00e2c6759d8f4f453c4c869cf284e9dc948a84a83d7b2ab96bd5405c05ec
 DIST speexdsp-1.2.1.tar.gz 922584 BLAKE2B 9105967eaee3ea8fcba2df1739d92a520407e086d3f4645763d8c7f26adff4f6c46b653e873b3e5ca04fce2ee5f765f8f7a242172d7cc4873fe15c3295a5913b SHA512 41b5f37b48db5cb8c5a0f6437a4a8266d2627a5b7c1088de8549fe0bf0bb3105b7df8024fe207eef194096e0726ea73e2b53e0a4293d8db8e133baa0f8a3bad3
 EBUILD speexdsp-1.2.0.ebuild 1390 BLAKE2B d28752619e08468a02d6948c27aad632a7cde38fc837a8ff5c5fb3f061f126ff7ffa6c0c2d8c27cca73cbf419e07fa66364e6271c2b004f4b0bd6cf0542f50c6 SHA512 80b71a1871eda2e0d3bd1545730728155ee709af052b5feafd669ea648d418c84be21f060457b3ef6684ab0ee935acb7e3cf1f5988476e33de8e83c6cec5c897
-EBUILD speexdsp-1.2.1.ebuild 1346 BLAKE2B 43f62de85f9e3ce0c1eedf5aedce4166121591a90841bf13f3a438495665cb59ad03aee15de804de0f196d3a00ed63bd8115cdcab01bd6c75167ea1dca094e6f SHA512 0c706a1d191b939948fb923d338f86c31cfdd3bade30fb0a8cef814217e723cbc1b0a399128229001fbd749555308aa44d57460b7a28f2e9448607b52acbed29
+EBUILD speexdsp-1.2.1.ebuild 1342 BLAKE2B fe5a38d929d743abfa8dd09f82a954505d98377d71ddfeae5902e0aca126a33806684cc448faf73ae32c10a60ca967a231fd35e7de8ee4f7a66569f1a002cacb SHA512 681fe95d850e2dfe133a080bc3689fafe34eb3cf3e0a1c2fd9d842a1f54d2b91e3a3c0354b394c7fff2dcc62cecf5324368735b5d35f643c1be141f4f7e4d2ef
 MISC metadata.xml 343 BLAKE2B 374a2c5ab50a02673ee9929021f54bb82b932188b88a36cc023cf263647299ebb0a279c2cc723e2c3d4f27dba635b6090a1c7675ba3792bc4a22706a5c97406f SHA512 d0c180268fe692dd8d97debafc8495e0837459ad2845993aa22c675d3777a4aa64d15fba1d2e4674a81a324ee52c1bda751d2c4a5a1547cd56ab5bc0375da8c3
diff --git a/media-libs/speexdsp/speexdsp-1.2.1.ebuild b/media-libs/speexdsp/speexdsp-1.2.1.ebuild
index a4bbc967554b..9bf521e3c288 100644
--- a/media-libs/speexdsp/speexdsp-1.2.1.ebuild
+++ b/media-libs/speexdsp/speexdsp-1.2.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://downloads.xiph.org/releases/speex/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
 IUSE="cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_arm_neon"
 
 BDEPEND="virtual/pkgconfig"
diff --git a/media-libs/waffle/Manifest b/media-libs/waffle/Manifest
index 5317e2a98b33..68b3c6ef9fe5 100644
--- a/media-libs/waffle/Manifest
+++ b/media-libs/waffle/Manifest
@@ -1,5 +1,5 @@
 DIST waffle-v1.7.0.tar.bz2 302120 BLAKE2B 8ebfc78182ff86447d88d92edd6452dae28c1515de5f9639c402203bfb5a135bc493040941420161690a4812a202552266bceb89eee948d0c7aeae55d5b8d3d5 SHA512 ee7b8419e309387fa6d610174ba5dddda97525cef41c9600772b902eddfc4570e940437596d7fb50ee9dc2f5945e723236b61463975d2b9cc0faa150696d24c2
 EBUILD waffle-1.7.0-r1.ebuild 1617 BLAKE2B 76bfbd6a39f365c3e29631a7101322261e56cc3b284ba21b862dc1262009de1588a22be27941e69c74bb5a63a2ba9bb45f0bbc08c9988b7a6bc4f5b0446bfb68 SHA512 4f2c0f90cc06214379ef5a3d95fd352bbebae532c0fd005a3c06a05ded84b3f2905d53d9c2242b57b2fd8b1d05145b9520a738945348ee95c8f94504eca37d97
-EBUILD waffle-1.7.0-r2.ebuild 1609 BLAKE2B 75ed4e25c0946e27fe242c2780fad24798abee77a1a17d915dd39ee1ae427dbfef4b43a1cfea566a14175cb92c07e4583a373fdd40be949246bbe60031838598 SHA512 4342070b5f68bbb227f95a0d4ca6d23891a779255096a8e7150856c4a15e3a33e2bcc802ec741b0b88d937e6278131d920e6bf5fb05b480fdc94faf118b9c630
+EBUILD waffle-1.7.0-r2.ebuild 1607 BLAKE2B 32417ea085b8a52e7b4f8653e642e12411059a7cd95deb852fc27f08890cff837a3442cbbd4465ece5dcc678c00bee2dc8790a73146e04742f215b3b2da7fb42 SHA512 82faf8d7c5320ec0a0700519725ba2b3dce7cf32cefb1f41c77f57e60acd55aeeb59d32359f875c12120bc6d014d9b6fb902d036dcb610acfad6c33c7302f9ba
 EBUILD waffle-9999.ebuild 1609 BLAKE2B 75ed4e25c0946e27fe242c2780fad24798abee77a1a17d915dd39ee1ae427dbfef4b43a1cfea566a14175cb92c07e4583a373fdd40be949246bbe60031838598 SHA512 4342070b5f68bbb227f95a0d4ca6d23891a779255096a8e7150856c4a15e3a33e2bcc802ec741b0b88d937e6278131d920e6bf5fb05b480fdc94faf118b9c630
 MISC metadata.xml 417 BLAKE2B 93ea54a57c011a3488ec75dbb8b93bce0bd568dfc4438cf7c80b3c622513a9be4b3e809e9794646571f9f21afd1572d0b16915dbda35d7345d4ef6afcec4dca8 SHA512 1652ef53bd20fd9c526b77db60affc226920b007c1b1b2bbeb90c0606ae2d4e199cb352a3322e2953ae0b1472e671da516ea3c0fdfcc9aa26cc5a1c348590da6
diff --git a/media-libs/waffle/waffle-1.7.0-r2.ebuild b/media-libs/waffle/waffle-1.7.0-r2.ebuild
index a4611e934598..c480c84fbf0b 100644
--- a/media-libs/waffle/waffle-1.7.0-r2.ebuild
+++ b/media-libs/waffle/waffle-1.7.0-r2.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} = *9999* ]]; then
 	GIT_ECLASS="git-r3"
 else
 	SRC_URI="https://gitlab.freedesktop.org/mesa/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.bz2"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 	S="${WORKDIR}"/${PN}-v${PV}
 fi
 inherit meson-multilib multilib ${GIT_ECLASS}
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index d4cfad2c9726..86e33a19a4a3 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/mixxx/Manifest b/media-sound/mixxx/Manifest
index bff084718e4d..7b2d64773d0b 100644
--- a/media-sound/mixxx/Manifest
+++ b/media-sound/mixxx/Manifest
@@ -28,7 +28,7 @@ DIST mixxx-manual-2.3-tr.pdf 34062405 BLAKE2B 69b5f76b4e74aa0d48636ae3914a6f40e0
 DIST mixxx-manual-2.3-zh-CN.pdf 34165133 BLAKE2B 58e717082ace6824532392a282cd1452c279410c547fabc333b6adccaf47fb8e4bbac0c612f9679c8d85317e9b706e5fe10b7c1fc11a4325a14c5b3faafdda46 SHA512 995fb6c9bf1f729eaa08cd5b2003f21c76274f8f3046bd85b771cb86c429fa65cc50f0f4a36396e654a4378125157777b2f0f04a9343b20aa3aef76281395aec
 DIST mixxx-manual-2.3-zh-TW.pdf 34135938 BLAKE2B b5747b2156d686bb84166beb2c1552e0d998f3c402793444631c1f146c93fd8f6addb5fc34c0f59b16b2866994b8f64ee5670ab26c683d51b0c36d3f247dcf70 SHA512 55a5c3d5064c021f73a48dab5fb93094bc0f9220a1790518b043a21900dc6792a2fc01ee5c6def6338a3df09bcbb7441e1c8b2f23aac2aad2b2a5974babb8a9f
 EBUILD mixxx-2.3.2.ebuild 3859 BLAKE2B f16bb13d68f53b6d5bfb32a6d70a554e1cdf8319ba1b119bb6cefc9f21af6e0c6e6557d334231eaf76161fab76e125121f6c4ad6425479a7df4b319944dfa990 SHA512 3636ffdb17755ddfd2da4fae0165dfa2c975bec20dbe91b8881b5cee6866ac682bd60be1bbbb1aec3b11a09bac6ff2b50a51a83c764529a3668a8728165c731f
-EBUILD mixxx-2.3.3.ebuild 3860 BLAKE2B 62f47b115b649765f18f5ab5f909b51a982ee93514a40bbbfd437c1060209fedb92176031b42ad68479cb614cdbc97bba4e4a996a4d7a6b2bb8bcd6264e7d9f2 SHA512 f21e40393df8eaac5a63127de839eb720bea799e889837c9fae88ae9eae7dd4c8214abc3edeeec79cae9e026429f1b56cf6c2bdce1b17cfab3b0205535dff364
+EBUILD mixxx-2.3.3.ebuild 3859 BLAKE2B 86b190d0b43fe573bb07a4126a93f2232123769cb1343dce64f728abe41ab3b6fbc8336e16b89eb87961d5058500d751709b27dbe6440682872822a33e75891e SHA512 c21c3e7e8f49f033079ec4d2a81f9b0af5befd68cd8ea19d6935ada67145bb86882a1a5272f39e54a4ccc0f93dabde837873c97bc33e0c624d5efd9757a531cb
 EBUILD mixxx-2.3.9999.ebuild 3767 BLAKE2B 9d4019cfb3ed76d1aa389d36f3280094a6cd6096b6a68bf7403a63821c1ae2a5372060861dd73089ea8e8956d82b63ff0ffd3cf7b81cbde491bfa3252a934111 SHA512 0d6b5a23a461b397039ae539aa85f28354c1489b5bde9b0d47a489644f2a40610044c45da264144567855f4276c96afe2f2daed2bfe9959f7bcef7f2d543e881
 EBUILD mixxx-9999.ebuild 2838 BLAKE2B 7b3371f5562b4c546547eb7aa0ad038045d19239d6e39bb9ac57498badc53ae6eb94f3dd1e48727412d27ba4b699e6b704c871761169aa609d75ecabb7430354 SHA512 46fb3746bbe94aa837654304c86651b8b27f9bee806ad292ba7957ca4c07efffe3d6aab40ce513b2b25e2bcf31a3afd18ec7550875c0e5fab2ba5794c2d24467
 MISC metadata.xml 903 BLAKE2B 1fd2e01da4d96a257d0ba595e67005e5233503f54ea17c81f65d105a61dc42f84df601cc112ff0a5e99393cbc53a0130b890d96a47cc2b88b59cbe7b9779654d SHA512 7e9dfd69240a57efbdaceb4dcfe71549d7a8c2edba5c81f956407e101cb62a0c51cf231e1e68c029783340189139309dde4fa3e995a231856ea094df09288cd8
diff --git a/media-sound/mixxx/mixxx-2.3.3.ebuild b/media-sound/mixxx/mixxx-2.3.3.ebuild
index 2ba471bcba51..ee90b8144308 100644
--- a/media-sound/mixxx/mixxx-2.3.3.ebuild
+++ b/media-sound/mixxx/mixxx-2.3.3.ebuild
@@ -16,7 +16,7 @@ if [[ "${PV}" == *9999 ]] ; then
 else
 	SRC_URI="https://github.com/mixxxdj/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
 	#S="${WORKDIR}/${PN}-release-${PV}"
-	KEYWORDS="amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/media-sound/qmmp/Manifest b/media-sound/qmmp/Manifest
index bc656cc97178..c8adfed0113f 100644
--- a/media-sound/qmmp/Manifest
+++ b/media-sound/qmmp/Manifest
@@ -4,6 +4,6 @@ DIST qmmp-1.6.0.tar.bz2 1364512 BLAKE2B 3af905fa8af1a23f04d3df30856f881184a5150d
 DIST qmmp-1.6.1.tar.bz2 1353769 BLAKE2B d12f91166cec051caf604ec27dc563d4cf2a52511eabfc0dee0b0679373e7c5fa0f0faac2b4d25420f33485caf90545c7f0098f1e3814f92d46d82b253410afd SHA512 efaf44002c21544514301b5ec1210507fe3cdeb4c6b8d14fb8a573d32db5bb73a9d6d36d00d9d61592261b69fa4260417e3c65183f13299234bd82dda43536c5
 EBUILD qmmp-1.5.4.ebuild 4110 BLAKE2B 7b193d02974a783fe90f39c8a698420517a64bfd616092873ad64799427c83deb633d128477fd62c7478afd6ed156f47888e57b3d8f6b050c0e198474c361fe8 SHA512 a58932662dbe4b47de5def1597b8d717ee428830248b1d394451660c873978bf880fa0199e43a717c1332020cdb18a2b5126131fae016b18ebb67cb354d7861e
 EBUILD qmmp-1.6.0.ebuild 4143 BLAKE2B df7217bd71bb94f256b23cd2f07cf2bb35f6c1b6d75d8ab032e6c5aadf9a5ca51a97edf84e512e0b2e66c20b6dafcf86617ec92e34d26c0a44578a2bd3aec47f SHA512 2fc2ec9fe2c4ed6221e3efd3083f5b0efff67f64bdf1f7a579bb991a9eb6414437da5b36e9e902f1689ae1373978ed23b60bce109989b139a0af39bfb8770547
-EBUILD qmmp-1.6.1-r1.ebuild 4066 BLAKE2B 40aece200a34b2312ba8eb76d0fced8803410743a89351b549a0cedb89607aa26a57e05e97c6e3bcbabe790c8ea632cc0257f0b9759d8f1cfcb32274c0530cb3 SHA512 07ad68acd40ab4b3d6f31f490cda7290d12c2169ff20a17b3c5e456cff667a0eb0f1851c6fe2ad8ac8f5412d6c0523d45bf8d658649032a074789ae5cbc607eb
+EBUILD qmmp-1.6.1-r1.ebuild 4065 BLAKE2B 9caeb186a81c63b4bbc78c537c3ce98869a72f5bb7f1a166b36b24cd8c9f787c95018592e89bbde09436306ad715d181e427ec7e094865c25f719190f5b43153 SHA512 755627a5258962c586a26605268a80b7729b90b13cca4bffca8ac1dbc8f1e992951e9f607ae53f751bdf341da673c16a32bce093a8ea37ddaeb9a85761202e60
 EBUILD qmmp-9999.ebuild 4127 BLAKE2B 43dea953fb1b740053fd4a20a5fc145a5c117a36a6f6b49284ea5f8e0cb5d041fc4585877ce37f749c7511be405ef83306b985b62189d38e35e22a5e56a6a959 SHA512 862f30e26cfc586f473e5d8068f8cf96d35ca70b39d25df0ba1dcf2b68b6e92ed1cf203cf6707a8f3b63c989f92dd46ca304f8a2d4389e25332d1b38c7fe6edd
 MISC metadata.xml 1960 BLAKE2B e0e190870cdb4c77e5ea4fb604af1afd571406488baa04daa760db1316cba922533f7e37b184e4e7df7c91e82dc716ea33deeb21102596ad512a9aef70a523a8 SHA512 5e8da850cdce11da134a03e9dda51d52ced62dee1fc80873695fe69f0fa53ba9ff7b9ad38931753819e4522103f3fe2ec49ae3b8d973d914e41d0e942557898d
diff --git a/media-sound/qmmp/qmmp-1.6.1-r1.ebuild b/media-sound/qmmp/qmmp-1.6.1-r1.ebuild
index c5fd2d6fced5..6faaffda51d1 100644
--- a/media-sound/qmmp/qmmp-1.6.1-r1.ebuild
+++ b/media-sound/qmmp/qmmp-1.6.1-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="http://qmmp.ylsoftware.com"
 if [[ ${PV} != 9999 ]]; then
 	SRC_URI="http://qmmp.ylsoftware.com/files/${P}.tar.bz2
 		mirror://sourceforge/${PN}-dev/files/${P}.tar.bz2"
-	KEYWORDS="~amd64 x86"
+	KEYWORDS="amd64 x86"
 else
 	inherit subversion
 	QMMP_DEV_BRANCH="1.3"
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index e6f2a44bad4c..31b1104d7bc6 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 938e4b3a3007..53e0e507e958 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Tue, 26 Jul 2022 12:39:52 +0000
+Tue, 26 Jul 2022 18:39:53 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 3a5baa4ccabd..11113f8726fe 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 518604 BLAKE2B 771190ff87bcfe6702a19150591bf573a429c51546ab7bd3ae25f101a4ec657d93d6fb83f7cb3aa4055e581eab5fde9d88a73a604dc34f426cb30ebb4385af9b SHA512 0b5d0f14e5d6ec3ff896d9d472edea00620a08f552ffc5516b0264e609527cf65471ee37a5002559add52d5c1898b2b60d48c9e97e6d2451bd84bf24fd112ab4
-TIMESTAMP 2022-07-26T12:39:55Z
+TIMESTAMP 2022-07-26T18:39:56Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLf4JtfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLgNPxfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBZ8w//UGOL0MnD4ap/nCz4yCb9AgE1FrCumqpR4+8JKV1QXkgCAsZ7xwrB5lNC
-gq4p8wBrcPCYft7gMCF7fEANr09ik6d4Jzgl4q7C25QMzKqUlLiVceUouupsH5XV
-5AVKpPWChItcTGH0F3nO1wozQdpQFfItkSxOBoyHhvxiwQ+bbpCJb8g8vBBF4cVy
-aO7XxZztk7UxdHfaR+mJEABfgGes58OSFEvAdD6EpDvBo/w0/77xjUcflYyunMgL
-U6yYeOR9Om7RUtVfMb5HpdE9szMNGev8Ou3ldXD5lhmjgi1LDkn2YfmvJTNEsGY8
-gKdHfpB0Rg9Rub7A9QGSrjI4JPGKBg+6Adjd7ATTEpUmIGjs5U3Ml/29CUnWTy+D
-dcqZV+s1j9eFgWxbi0u9SUbO3drS175D2gftm47A9y1zC29CQjxsBXK0nUQxguAC
-v2QGAoFMYZHFyfOXgX38VkMKwRgIh3DQ+DlvvqxhqJcy9/4jOHtmxN+wKl4s5wEn
-T0UZ26DBVsi0ytA81EdCd3GiI8wDnkF9HNWnMQxorPFMF8zWFTiaE0XdYulgJzQf
-tJDiklhV8R8uF2e05o5Az0uke0WURPQFytA8au3dRFZmaGDcr0myr3MgFS5xnXgf
-TMlDBBwEpTEKUfDyA9oV41d0CJhs9XTgB/XTfZXPAmbtLXkANB8=
-=wbbG
+klBjuw/+L5SbA3llhhrYaBfCgYcgLfCFZfSUhlPeoUBNps/bZnwsfrvmFKSrVBv4
+c6OUDFqtn6RNXBE0RYdnTvc79UTJBo1w65HNGtt+6KJfIj8g7uufGphaBO6XZhjC
+setKVL9N+QoGI93m1ELT9Q9rpnap0fmXiv3S532LNSBBeozstTucEaRUgAyIeK9w
+0e16DRymUJEjgDlHF26i0ma+dWvyudkGrAQQvLJ9Kkhib21C8Cz+MTiL5JHFbtCf
+CdPf1qRF90OlPxeBKyuZ8op4nqmTFAw2zWhwV/BBfCL9Gxbli8kjSbD1rf0yvhWR
+8DF0oR662buo9dmKjhOtps1HV0/uJclbOUs78pY1WlYaDesA6CWSQDH67NOW35kw
+jGvmyCNci+RXyTVHZxnM4eE5vKzY36GF4/bqwEKM0d1/R0vEIlg+qlWYZqtB3ofq
+uzU7pYMrGZCNICqrD+gS9OIBjSosBmiY07TuGy0nRewN6wjzwUMlOm4DBIHrd2hs
+XBNm8At2ZmUd8uJqUv4jPNelJrloHVLcYRFxC2WhrX2n644fXfgHZOVV19HPVSNT
+PUShWb1GPUTZHlqGPWuHIUVvb5LRKPfj7z01BZUf3E5h+kbxkxqV/55Vkltiqs3j
+NApOvnP5VStwPxMgOraY7CU9E2/EI9kk/khplkOY9cptKJilBvE=
+=xeCV
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 938e4b3a3007..53e0e507e958 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Tue, 26 Jul 2022 12:39:52 +0000
+Tue, 26 Jul 2022 18:39:53 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index e37f01be81d9..13f6e634f0f2 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-accessibility/Manifest.gz b/metadata/md5-cache/app-accessibility/Manifest.gz
index ff38e1da4be9..d86334d15c5e 100644
--- a/metadata/md5-cache/app-accessibility/Manifest.gz
+++ b/metadata/md5-cache/app-accessibility/Manifest.gz
diff --git a/metadata/md5-cache/app-accessibility/speech-tools-2.5.0-r1 b/metadata/md5-cache/app-accessibility/speech-tools-2.5.0-r1
index dcd150a99f67..dbc6e6f839e5 100644
--- a/metadata/md5-cache/app-accessibility/speech-tools-2.5.0-r1
+++ b/metadata/md5-cache/app-accessibility/speech-tools-2.5.0-r1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=http://www.cstr.ed.ac.uk/projects/speech_tools/
 INHERIT=autotools toolchain-funcs
 IUSE=nas openmp X
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86
 LICENSE=FESTIVAL HPND BSD rc regexp-UofT
 RDEPEND=media-libs/alsa-lib sys-libs/ncurses:= nas? ( media-libs/nas ) X? ( x11-libs/libX11 x11-libs/libXt )
 SLOT=0
 SRC_URI=http://www.festvox.org/packed/festival/2.5/speech_tools-2.5.0-release.tar.gz https://dev.gentoo.org/~neurogeek/speech-tools/speech_tools-2.1-r3-patches.tar.gz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=9f67ffcc23ee867a0dd4bef0d96138a3
+_md5_=8354ad68414fb389c2ed9839afaf4832
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index 3c5e6cffa98e..e2f85f5dbcdf 100644
--- a/metadata/md5-cache/app-admin/Manifest.gz
+++ b/metadata/md5-cache/app-admin/Manifest.gz
diff --git a/metadata/md5-cache/app-admin/awscli-1.25.37 b/metadata/md5-cache/app-admin/awscli-1.25.37
new file mode 100644
index 000000000000..d1f5f82805a8
--- /dev/null
+++ b/metadata/md5-cache/app-admin/awscli-1.25.37
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/pytest-forked[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/botocore-1.27.37[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/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !app-admin/awscli-bin >=dev-python/pytest-7.1.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 ) >=dev-python/gpep517-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.6.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=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
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/botocore-1.27.37[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/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !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 )
+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/aws-cli/archive/1.25.37.tar.gz -> aws-cli-1.25.37.gh.tar.gz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	17847def14400dd2ebac1ede4e941c5a	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=0fd6a2cdd4f5b854d8449e5fd0580e2b
diff --git a/metadata/md5-cache/app-containers/Manifest.gz b/metadata/md5-cache/app-containers/Manifest.gz
index 5782fdec6a8f..5ca25e1e884c 100644
--- a/metadata/md5-cache/app-containers/Manifest.gz
+++ b/metadata/md5-cache/app-containers/Manifest.gz
diff --git a/metadata/md5-cache/app-containers/cosign-1.10.0 b/metadata/md5-cache/app-containers/cosign-1.10.0
new file mode 100644
index 000000000000..45d9acef5860
--- /dev/null
+++ b/metadata/md5-cache/app-containers/cosign-1.10.0
@@ -0,0 +1,13 @@
+BDEPEND=>=dev-lang/go-1.16 app-arch/unzip
+DEFINED_PHASES=compile install unpack
+DESCRIPTION=container signing utility
+EAPI=8
+HOMEPAGE=https://sigstore.dev
+INHERIT=go-module
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RESTRICT=test strip
+SLOT=0
+SRC_URI=https://github.com/sigstore/cosign/archive/v1.10.0.tar.gz -> cosign-1.10.0.tar.gz https://dev.gentoo.org/~williamh/dist/cosign-1.10.0-deps.tar.xz
+_eclasses_=go-module	a13d34fe4e2996720e1ca6c53b9ea95a
+_md5_=080b0a613383997c06848804996c26c2
diff --git a/metadata/md5-cache/app-eselect/Manifest.gz b/metadata/md5-cache/app-eselect/Manifest.gz
index 0b27312b9b81..dcff09b8d823 100644
--- a/metadata/md5-cache/app-eselect/Manifest.gz
+++ b/metadata/md5-cache/app-eselect/Manifest.gz
diff --git a/metadata/md5-cache/app-eselect/eselect-java-0.4.3 b/metadata/md5-cache/app-eselect/eselect-java-0.4.3
deleted file mode 100644
index 90bc474eb40b..000000000000
--- a/metadata/md5-cache/app-eselect/eselect-java-0.4.3
+++ /dev/null
@@ -1,13 +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=postinst prepare
-DESCRIPTION=A set of eselect modules for Java
-EAPI=8
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Java
-INHERIT=autotools
-KEYWORDS=amd64 ~arm arm64 ppc64 ~riscv x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=!app-eselect/eselect-maven app-admin/eselect
-SLOT=0
-SRC_URI=https://gitweb.gentoo.org/proj/eselect-java.git/snapshot/eselect-java-0.4.3.tar.bz2
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=3673805ba5ceee0af105958dae31cd69
diff --git a/metadata/md5-cache/app-pda/Manifest.gz b/metadata/md5-cache/app-pda/Manifest.gz
index 49b8de0a5054..1228c1cf04a6 100644
--- a/metadata/md5-cache/app-pda/Manifest.gz
+++ b/metadata/md5-cache/app-pda/Manifest.gz
diff --git a/metadata/md5-cache/app-pda/ifuse-1.1.3-r1 b/metadata/md5-cache/app-pda/ifuse-1.1.3-r1
deleted file mode 100644
index 49de55376087..000000000000
--- a/metadata/md5-cache/app-pda/ifuse-1.1.3-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst
-DEPEND=>=app-pda/libimobiledevice-1.1.4:= >=app-pda/libplist-1.8:= sys-fs/fuse:0= virtual/pkgconfig
-DESCRIPTION=Mount Apple iPhone/iPod Touch file systems for backup purposes
-EAPI=6
-HOMEPAGE=http://www.libimobiledevice.org/
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2.1
-RDEPEND=>=app-pda/libimobiledevice-1.1.4:= >=app-pda/libplist-1.8:= sys-fs/fuse:0=
-SLOT=0
-SRC_URI=http://www.libimobiledevice.org/downloads/ifuse-1.1.3.tar.bz2
-_eclasses_=readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
-_md5_=bc12b9bd8c082e4b924b1abca343a9a2
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index fa15e2c2a205..48bb1ef6fd61 100644
--- a/metadata/md5-cache/app-text/Manifest.gz
+++ b/metadata/md5-cache/app-text/Manifest.gz
diff --git a/metadata/md5-cache/app-text/docbook-sgml-utils-0.6.14-r5 b/metadata/md5-cache/app-text/docbook-sgml-utils-0.6.14-r5
index 6f07966e553d..8d7d3e65b786 100644
--- a/metadata/md5-cache/app-text/docbook-sgml-utils-0.6.14-r5
+++ b/metadata/md5-cache/app-text/docbook-sgml-utils-0.6.14-r5
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://sourceware.org/docbook-tools/
 INHERIT=autotools prefix
 IUSE=jadetex
-KEYWORDS=amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=dev-lang/perl-5 app-text/docbook-dsssl-stylesheets app-text/docbook-xml-dtd:4.2 app-text/openjade app-text/xhtml1 dev-perl/SGMLSpm ~app-text/docbook-sgml-dtd-3.0 ~app-text/docbook-sgml-dtd-3.1 ~app-text/docbook-sgml-dtd-4.0 ~app-text/docbook-sgml-dtd-4.1 ~app-text/docbook-sgml-dtd-4.2 ~app-text/docbook-sgml-dtd-4.4 ~app-text/docbook-xml-simple-dtd-1.0 ~app-text/docbook-xml-simple-dtd-4.1.2.4 sys-apps/which jadetex? ( dev-texlive/texlive-formatsextra ) || ( www-client/lynx www-client/links www-client/elinks virtual/w3m )
 SLOT=0
 SRC_URI=https://sourceware.org/pub/docbook-tools/new-trials/SOURCES/docbook-utils-0.6.14.tar.gz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=581849de404ccb4fb70c0f2b19c38730
+_md5_=2e030a06bbbe9b8592864a2da678e4c7
diff --git a/metadata/md5-cache/app-text/iso-codes-4.11.0 b/metadata/md5-cache/app-text/iso-codes-4.11.0
new file mode 100644
index 000000000000..bc552a160da5
--- /dev/null
+++ b/metadata/md5-cache/app-text/iso-codes-4.11.0
@@ -0,0 +1,13 @@
+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/gettext
+DEFINED_PHASES=prepare setup
+DESCRIPTION=ISO language, territory, currency, script codes and their translations
+EAPI=8
+HOMEPAGE=https://salsa.debian.org/iso-codes-team/iso-codes
+INHERIT=python-any-r1
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
+LICENSE=LGPL-2.1+
+RESTRICT=binchecks strip
+SLOT=0
+SRC_URI=https://salsa.debian.org/iso-codes-team/iso-codes/-/archive/v4.11.0/iso-codes-v4.11.0.tar.gz
+_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=6357a144ea8acee33b4964800ad397ff
diff --git a/metadata/md5-cache/app-text/xpdf-4.03 b/metadata/md5-cache/app-text/xpdf-4.03
deleted file mode 100644
index b266f7b585a4..000000000000
--- a/metadata/md5-cache/app-text/xpdf-4.03
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=icons? ( gnome-base/librsvg ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=cups? ( dev-qt/qtprintsupport:5[cups] net-print/cups ) fontconfig? ( media-libs/fontconfig ) libpaper? ( app-text/libpaper ) utils? ( png? ( media-libs/libpng:0 ) ) dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 media-libs/freetype sys-libs/zlib dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=The PDF viewer and tools
-EAPI=7
-HOMEPAGE=https://www.xpdfreader.com
-INHERIT=cmake desktop xdg
-IUSE=cmyk cups +fontconfig i18n icons +libpaper metric opi png +textselect utils
-KEYWORDS=amd64 x86
-LICENSE=|| ( GPL-2 GPL-3 ) i18n? ( BSD )
-RDEPEND=cups? ( dev-qt/qtprintsupport:5[cups] net-print/cups ) fontconfig? ( media-libs/fontconfig ) libpaper? ( app-text/libpaper ) utils? ( png? ( media-libs/libpng:0 ) ) dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 media-libs/freetype sys-libs/zlib dev-qt/qtsvg:5 media-fonts/urw-fonts
-SLOT=0
-SRC_URI=https://dl.xpdfreader.com/xpdf-4.03.tar.gz i18n? ( https://dl.xpdfreader.com/xpdf-arabic.tar.gz https://dl.xpdfreader.com/xpdf-chinese-simplified.tar.gz -> xpdf-chinese-simplified-20201222.tar.gz https://dl.xpdfreader.com/xpdf-chinese-traditional.tar.gz -> xpdf-chinese-traditional-20201222.tar.gz https://dl.xpdfreader.com/xpdf-cyrillic.tar.gz https://dl.xpdfreader.com/xpdf-greek.tar.gz https://dl.xpdfreader.com/xpdf-hebrew.tar.gz https://dl.xpdfreader.com/xpdf-japanese.tar.gz -> xpdf-japanese-20201222.tar.gz https://dl.xpdfreader.com/xpdf-korean.tar.gz -> xpdf-korean-20201222.tar.gz https://dl.xpdfreader.com/xpdf-latin2.tar.gz https://dl.xpdfreader.com/xpdf-thai.tar.gz https://dl.xpdfreader.com/xpdf-turkish.tar.gz )
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=7d71f7c3c90307ad420dc9a1285a76d0
diff --git a/metadata/md5-cache/app-text/xpdf-4.04 b/metadata/md5-cache/app-text/xpdf-4.04
index 16cfabe72488..e298e979b85d 100644
--- a/metadata/md5-cache/app-text/xpdf-4.04
+++ b/metadata/md5-cache/app-text/xpdf-4.04
@@ -12,4 +12,4 @@ RDEPEND=cups? ( dev-qt/qtprintsupport:5[cups] net-print/cups ) fontconfig? ( med
 SLOT=0
 SRC_URI=https://dl.xpdfreader.com/xpdf-4.04.tar.gz i18n? ( https://dl.xpdfreader.com/xpdf-arabic.tar.gz https://dl.xpdfreader.com/xpdf-chinese-simplified.tar.gz -> xpdf-chinese-simplified-20201222.tar.gz https://dl.xpdfreader.com/xpdf-chinese-traditional.tar.gz -> xpdf-chinese-traditional-20201222.tar.gz https://dl.xpdfreader.com/xpdf-cyrillic.tar.gz https://dl.xpdfreader.com/xpdf-greek.tar.gz https://dl.xpdfreader.com/xpdf-hebrew.tar.gz https://dl.xpdfreader.com/xpdf-japanese.tar.gz -> xpdf-japanese-20201222.tar.gz https://dl.xpdfreader.com/xpdf-korean.tar.gz -> xpdf-korean-20201222.tar.gz https://dl.xpdfreader.com/xpdf-latin2.tar.gz https://dl.xpdfreader.com/xpdf-thai.tar.gz https://dl.xpdfreader.com/xpdf-turkish.tar.gz ) verify-sig? ( https://dl.xpdfreader.com/xpdf-4.04.tar.gz.sig )
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	desktop	22952d8f27cac191d75529d4c38e6bfa	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=326f05d1a9cf8d676738a66ef981751c
+_md5_=c87d69e30575ad8f8b5a6591db5e2b9c
diff --git a/metadata/md5-cache/dev-cpp/Manifest.gz b/metadata/md5-cache/dev-cpp/Manifest.gz
index 8253a5e0cbc8..e19aa24568fe 100644
--- a/metadata/md5-cache/dev-cpp/Manifest.gz
+++ b/metadata/md5-cache/dev-cpp/Manifest.gz
diff --git a/metadata/md5-cache/dev-cpp/json11-1.0.0 b/metadata/md5-cache/dev-cpp/json11-1.0.0
index 32f4f77984ce..546871b8e835 100644
--- a/metadata/md5-cache/dev-cpp/json11-1.0.0
+++ b/metadata/md5-cache/dev-cpp/json11-1.0.0
@@ -4,9 +4,9 @@ DESCRIPTION=A tiny JSON library for C++11
 EAPI=8
 HOMEPAGE=https://github.com/dropbox/json11
 INHERIT=cmake
-KEYWORDS=amd64
+KEYWORDS=amd64 ~x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/dropbox/json11/archive/refs/tags/v1.0.0.tar.gz -> json11-1.0.0.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=a58a7dc54b2ebd30e045c76b3d64e962
+_md5_=4105e73dc4ec3adb798f6922d09c0539
diff --git a/metadata/md5-cache/dev-embedded/Manifest.gz b/metadata/md5-cache/dev-embedded/Manifest.gz
index 0e8b9baf96b6..eaaae36aec10 100644
--- a/metadata/md5-cache/dev-embedded/Manifest.gz
+++ b/metadata/md5-cache/dev-embedded/Manifest.gz
diff --git a/metadata/md5-cache/dev-embedded/esptool-4.1 b/metadata/md5-cache/dev-embedded/esptool-4.1
index 9c723b6d03f5..4d4c8887f9b3 100644
--- a/metadata/md5-cache/dev-embedded/esptool-4.1
+++ b/metadata/md5-cache/dev-embedded/esptool-4.1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/espressif/esptool
 INHERIT=distutils-r1
 IUSE=test 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=python_single_target_python3_8? ( dev-python/bitstring[python_targets_python3_8(-)] dev-python/cryptography[python_targets_python3_8(-)] >=dev-python/ecdsa-0.16.0[python_targets_python3_8(-)] dev-python/pyserial[python_targets_python3_8(-)] dev-python/reedsolomon[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/bitstring[python_targets_python3_9(-)] dev-python/cryptography[python_targets_python3_9(-)] >=dev-python/ecdsa-0.16.0[python_targets_python3_9(-)] dev-python/pyserial[python_targets_python3_9(-)] dev-python/reedsolomon[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/bitstring[python_targets_python3_10(-)] dev-python/cryptography[python_targets_python3_10(-)] >=dev-python/ecdsa-0.16.0[python_targets_python3_10(-)] dev-python/pyserial[python_targets_python3_10(-)] dev-python/reedsolomon[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 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/espressif/esptool/archive/v4.1.tar.gz -> esptool-4.1.tar.gz
 _eclasses_=distutils-r1	17847def14400dd2ebac1ede4e941c5a	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=30b9e854e70d97ec04f35a07663de6ee
+_md5_=220dfc5489f6adb68b081cc2b210cd19
diff --git a/metadata/md5-cache/dev-games/Manifest.gz b/metadata/md5-cache/dev-games/Manifest.gz
index b522eb12c398..a0d56255bca8 100644
--- a/metadata/md5-cache/dev-games/Manifest.gz
+++ b/metadata/md5-cache/dev-games/Manifest.gz
diff --git a/metadata/md5-cache/dev-games/aseprite-1.2.35 b/metadata/md5-cache/dev-games/aseprite-1.2.35
index 13101690394c..f4d1b2a7ec02 100644
--- a/metadata/md5-cache/dev-games/aseprite-1.2.35
+++ b/metadata/md5-cache/dev-games/aseprite-1.2.35
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.aseprite.org
 INHERIT=cmake desktop ninja-utils toolchain-funcs xdg-utils
 IUSE=kde test webp
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=Aseprite-EULA
 RDEPEND=app-arch/libarchive:= app-text/cmark:= dev-cpp/json11 dev-libs/tinyxml media-libs/freetype media-libs/giflib:= media-libs/harfbuzz:= media-libs/libjpeg-turbo:= media-libs/libpng:= net-misc/curl sys-libs/zlib:= virtual/opengl x11-libs/libX11 x11-libs/libXcursor x11-libs/libxcb:= kde? ( dev-qt/qtcore:5 dev-qt/qtgui:5 kde-frameworks/kio:5 ) webp? ( media-libs/libwebp:= )
 RESTRICT=bindist mirror !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/aseprite/aseprite/releases/download/v1.2.35/Aseprite-v1.2.35-Source.zip https://github.com/google/skia/archive/3338e90707323d2cd3a150276acb9f39933deee2.tar.gz -> skia-m102-3338e90707323d2cd3a150276acb9f39933deee2.gh.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	desktop	22952d8f27cac191d75529d4c38e6bfa	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=46c6f7da66e22bc855400dfd6c469cb2
+_md5_=102a88fc7cdfba02773badc70fa7148f
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index 77a0b7bf1ec8..934ca8c8f3c1 100644
--- a/metadata/md5-cache/dev-java/Manifest.gz
+++ b/metadata/md5-cache/dev-java/Manifest.gz
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-10.0.23 b/metadata/md5-cache/dev-java/tomcat-servlet-api-10.0.23
new file mode 100644
index 000000000000..02eabe2ce839
--- /dev/null
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-10.0.23
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=Tomcat's Servlet API 5.0/JSP API 3.0/EL API 4.0 implementation
+EAPI=8
+HOMEPAGE=https://tomcat.apache.org/
+INHERIT=java-pkg-2 java-pkg-simple
+IUSE=source
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=5.0
+SRC_URI=mirror://apache/tomcat/tomcat-10/v10.0.23/src/apache-tomcat-10.0.23-src.tar.gz
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	cc510ad15292e222d436a547adffe6a9	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
+_md5_=20c597a2ec9e94512f2443ad2ebefdf3
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index 0fce52ce819c..39f94987ddcc 100644
--- a/metadata/md5-cache/dev-lang/Manifest.gz
+++ b/metadata/md5-cache/dev-lang/Manifest.gz
diff --git a/metadata/md5-cache/dev-lang/python-3.11.0_beta5 b/metadata/md5-cache/dev-lang/python-3.11.0_beta5
new file mode 100644
index 000000000000..fcb3c4785026
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/python-3.11.0_beta5
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/autoconf-archive virtual/awk virtual/pkgconfig verify-sig? ( sec-keys/openpgp-keys-python ) !sys-devel/gcc[libffi(-)] 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 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 examples gdbm hardened libedit lto +ncurses pgo +readline +sqlite +ssl test tk wininst 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 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.0b5.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.11.0b5.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.11.0/Python-3.11.0b5.tar.xz.asc )
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=f307f2bd5dd3412b65112c15eb402498
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 130f52fe43e7..f0853e633d50 100644
--- a/metadata/md5-cache/dev-libs/Manifest.gz
+++ b/metadata/md5-cache/dev-libs/Manifest.gz
diff --git a/metadata/md5-cache/dev-libs/tree-sitter-bash-0.19.0 b/metadata/md5-cache/dev-libs/tree-sitter-bash-0.19.0
index 3aa103ba7585..1db1e0d79c99 100644
--- a/metadata/md5-cache/dev-libs/tree-sitter-bash-0.19.0
+++ b/metadata/md5-cache/dev-libs/tree-sitter-bash-0.19.0
@@ -4,9 +4,9 @@ DESCRIPTION=Bash grammar for Tree-sitter
 EAPI=8
 HOMEPAGE=https://github.com/tree-sitter/tree-sitter-bash
 INHERIT=tree-sitter-grammar
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/tree-sitter/tree-sitter-bash/archive/v0.19.0.tar.gz -> tree-sitter-bash-0.19.0.tar.gz
 _eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961	tree-sitter-grammar	a3a9088088917825fa24975b21938a86
-_md5_=ae0e429027a80d3c58c50a79ffc9d63b
+_md5_=bd079f8013044174b29fdf71aa8350cb
diff --git a/metadata/md5-cache/dev-libs/wayland-1.21.0 b/metadata/md5-cache/dev-libs/wayland-1.21.0
index f480bf3a9dd6..74cccee6b23a 100644
--- a/metadata/md5-cache/dev-libs/wayland-1.21.0
+++ b/metadata/md5-cache/dev-libs/wayland-1.21.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://wayland.freedesktop.org/ https://gitlab.freedesktop.org/wayland/wayland
 INHERIT=meson-multilib
 IUSE=doc test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86
 LICENSE=MIT
 RDEPEND=>=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(-)?]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://gitlab.freedesktop.org/wayland/wayland/-/releases/1.21.0/downloads/wayland-1.21.0.tar.xz
 _eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=ff2e6fa5b180a4d560478d78c881f006
+_md5_=b2dca29fa8f39bb92653990e3c8b937e
diff --git a/metadata/md5-cache/dev-libs/wayland-protocols-1.26 b/metadata/md5-cache/dev-libs/wayland-protocols-1.26
index 6b1a59e2d645..54909c2ea0be 100644
--- a/metadata/md5-cache/dev-libs/wayland-protocols-1.26
+++ b/metadata/md5-cache/dev-libs/wayland-protocols-1.26
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://wayland.freedesktop.org/
 INHERIT=meson
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86
 LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://wayland.freedesktop.org/releases/wayland-protocols-1.26.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=bacf8e5e50f8625897acfe6b839f0ba5
+_md5_=0b4e01895216fc1f4cfb8dcf5a762860
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 8c1c9f8c3e89..6ac3e1fa2185 100644
--- a/metadata/md5-cache/dev-python/Manifest.gz
+++ b/metadata/md5-cache/dev-python/Manifest.gz
diff --git a/metadata/md5-cache/dev-python/aesara-2.7.9 b/metadata/md5-cache/dev-python/aesara-2.7.9
new file mode 100644
index 000000000000..259b12ee24c4
--- /dev/null
+++ b/metadata/md5-cache/dev-python/aesara-2.7.9
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( >=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/cons[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/etuples[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/logical-unification[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/minikanren[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/filelock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/numpy-1.23[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/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-45[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.1.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 ) >=dev-python/gpep517-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.6.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=Library for operating on mathematical expressions with multi-dimensional arrays
+EAPI=8
+HOMEPAGE=https://github.com/aesara-devs/aesara/ https://pypi.org/project/aesara/
+INHERIT=distutils-r1 multiprocessing optfeature
+IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
+LICENSE=BSD
+RDEPEND=dev-python/cons[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/etuples[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/logical-unification[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/minikanren[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/filelock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/numpy-1.23[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/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-45[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/typing-extensions[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/aesara-devs/aesara/archive/rel-2.7.9.tar.gz -> aesara-rel-2.7.9.gh.tar.gz
+_eclasses_=distutils-r1	17847def14400dd2ebac1ede4e941c5a	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=6345b61d2507c90410ba7056cc81c5cc
diff --git a/metadata/md5-cache/dev-python/aws-sam-translator-1.48.0 b/metadata/md5-cache/dev-python/aws-sam-translator-1.48.0
new file mode 100644
index 000000000000..c3a0abafd3d6
--- /dev/null
+++ b/metadata/md5-cache/dev-python/aws-sam-translator-1.48.0
@@ -0,0 +1,16 @@
+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-2.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/six-1.11[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.2[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-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.6.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-2.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/six-1.11[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.48.0.tar.gz -> aws-sam-translator-1.48.0.gh.tar.gz
+_eclasses_=distutils-r1	17847def14400dd2ebac1ede4e941c5a	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=2fef27e5d6d21c380720e33c134457e5
diff --git a/metadata/md5-cache/dev-python/boto3-1.24.37 b/metadata/md5-cache/dev-python/boto3-1.24.37
new file mode 100644
index 000000000000..9e9b69c77205
--- /dev/null
+++ b/metadata/md5-cache/dev-python/boto3-1.24.37
@@ -0,0 +1,16 @@
+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.37[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.2[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-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.6.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.37[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.37.tar.gz -> boto3-1.24.37.gh.tar.gz
+_eclasses_=distutils-r1	17847def14400dd2ebac1ede4e941c5a	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=50e9b19da5bcce80f05fd9be69fe0ff8
diff --git a/metadata/md5-cache/dev-python/botocore-1.27.37 b/metadata/md5-cache/dev-python/botocore-1.27.37
new file mode 100644
index 000000000000..b96f2a99856e
--- /dev/null
+++ b/metadata/md5-cache/dev-python/botocore-1.27.37
@@ -0,0 +1,16 @@
+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.2[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-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.6.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.37.tar.gz -> botocore-1.27.37.gh.tar.gz
+_eclasses_=distutils-r1	17847def14400dd2ebac1ede4e941c5a	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=b81d1890717c7eec6242fb986ac35277
diff --git a/metadata/md5-cache/dev-python/braintree-4.16.0 b/metadata/md5-cache/dev-python/braintree-4.16.0
new file mode 100644
index 000000000000..00804ebfbbf5
--- /dev/null
+++ b/metadata/md5-cache/dev-python/braintree-4.16.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/requests-0.11.1[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/gpep517-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.6.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=Braintree Python Library
+EAPI=8
+HOMEPAGE=https://developer.paypal.com/braintree/docs/reference/overview/ https://github.com/braintree/braintree_python/ https://pypi.org/project/braintree/
+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/requests-0.11.1[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/braintree/braintree_python/archive/4.16.0.tar.gz -> braintree_python-4.16.0.gh.tar.gz
+_eclasses_=distutils-r1	17847def14400dd2ebac1ede4e941c5a	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=279fbe2badc61f0aae1f7e66ebb18da9
diff --git a/metadata/md5-cache/dev-python/dominate-2.7.0 b/metadata/md5-cache/dev-python/dominate-2.7.0
new file mode 100644
index 000000000000..5c56758cf4a4
--- /dev/null
+++ b/metadata/md5-cache/dev-python/dominate-2.7.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/pytest-7.1.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 ) >=dev-python/gpep517-6[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.6.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=Library for creating and manipulating HTML documents using an elegant DOM API
+EAPI=8
+HOMEPAGE=https://github.com/Knio/dominate/ https://pypi.org/project/dominate/
+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=GPL-3+
+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/d/dominate/dominate-2.7.0.tar.gz
+_eclasses_=distutils-r1	17847def14400dd2ebac1ede4e941c5a	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=7f99719c9732a87af1daf1146e845776
diff --git a/metadata/md5-cache/dev-python/flask-login-0.6.2 b/metadata/md5-cache/dev-python/flask-login-0.6.2
new file mode 100644
index 000000000000..33765bb1542a
--- /dev/null
+++ b/metadata/md5-cache/dev-python/flask-login-0.6.2
@@ -0,0 +1,17 @@
+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/flask-1.0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/werkzeug-1.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.2[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-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.6.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-python/asgiref[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/blinker[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/semantic_version[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] )
+DESCRIPTION=Login session support for Flask
+EAPI=8
+HOMEPAGE=https://github.com/maxcountryman/flask-login/ https://pypi.org/project/Flask-Login/
+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 ~sparc ~x86
+LICENSE=BSD
+RDEPEND=>=dev-python/flask-1.0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/werkzeug-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 )
+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/maxcountryman/flask-login/archive/0.6.2.tar.gz -> flask-login-0.6.2.gh.tar.gz
+_eclasses_=distutils-r1	17847def14400dd2ebac1ede4e941c5a	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=c3c9d3582a2faf72990b5fd278e7c4af
diff --git a/metadata/md5-cache/dev-python/hypothesis-6.53.0 b/metadata/md5-cache/dev-python/hypothesis-6.53.0
new file mode 100644
index 000000000000..db0525c73e93
--- /dev/null
+++ b/metadata/md5-cache/dev-python/hypothesis-6.53.0
@@ -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(-)?] 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.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=[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-6[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.6.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
+HOMEPAGE=https://github.com/HypothesisWorks/hypothesis/ https://pypi.org/project/hypothesis/
+INHERIT=distutils-r1 multiprocessing optfeature
+IUSE=cli 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 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=MPL-2.0
+RDEPEND=>=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(-)?] ) ) 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] )
+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/HypothesisWorks/hypothesis/archive/hypothesis-python-6.53.0.tar.gz -> hypothesis-6.53.0.gh.tar.gz
+_eclasses_=distutils-r1	17847def14400dd2ebac1ede4e941c5a	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=f2ad4a02a4a15b7c57e327b8c93b6043
diff --git a/metadata/md5-cache/dev-python/imageio-2.20.0 b/metadata/md5-cache/dev-python/imageio-2.20.0
new file mode 100644
index 000000000000..761595c801e5
--- /dev/null
+++ b/metadata/md5-cache/dev-python/imageio-2.20.0
@@ -0,0 +1,17 @@
+BDEPEND=test? ( dev-python/fsspec[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/imageio-ffmpeg[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/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tifffile[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/numpy-1.20.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pillow-8.3.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] media-libs/freeimage >=dev-python/pytest-7.1.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 ) >=dev-python/gpep517-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.6.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=Python library for reading and writing image data
+EAPI=8
+HOMEPAGE=https://imageio.readthedocs.io/en/stable/ https://github.com/imageio/imageio/ https://pypi.org/project/imageio/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+PROPERTIES=test_network
+RDEPEND=>=dev-python/numpy-1.20.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pillow-8.3.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] media-libs/freeimage python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) 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=https://github.com/imageio/imageio/archive/v2.20.0.tar.gz -> imageio-2.20.0.gh.tar.gz
+_eclasses_=distutils-r1	17847def14400dd2ebac1ede4e941c5a	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=1be6ddbf12ba1226d0caea4060f90b37
diff --git a/metadata/md5-cache/dev-python/iminuit-2.14.0 b/metadata/md5-cache/dev-python/iminuit-2.14.0
new file mode 100644
index 000000000000..95fef505708e
--- /dev/null
+++ b/metadata/md5-cache/dev-python/iminuit-2.14.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/cython[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/ipywidgets[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/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) sys-devel/make >=dev-util/cmake-3.20.5 python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) 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-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.6.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(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Minuit numerical function minimization in Python
+EAPI=8
+HOMEPAGE=https://github.com/scikit-hep/iminuit/
+INHERIT=cmake distutils-r1 virtualx
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 test
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT LGPL-2.1
+RDEPEND=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? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/i/iminuit/iminuit-2.14.0.tar.gz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	distutils-r1	17847def14400dd2ebac1ede4e941c5a	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=433c9c5e0f889c31c8e6dca1753d4a36
diff --git a/metadata/md5-cache/dev-python/meson-python-0.8.0 b/metadata/md5-cache/dev-python/meson-python-0.8.0
new file mode 100644
index 000000000000..fc813192fe36
--- /dev/null
+++ b/metadata/md5-cache/dev-python/meson-python-0.8.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/GitPython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( >=dev-lang/python-3.10.4:3.10 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_10(-)] dev-python/furo[python_targets_python3_10(-)] dev-python/sphinx-autodoc-typehints[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/furo[python_targets_python3_9(-)] dev-python/sphinx-autodoc-typehints[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/furo[python_targets_python3_8(-)] dev-python/sphinx-autodoc-typehints[python_targets_python3_8(-)] ) ) ) test? ( >=dev-python/pyproject-metadata-0.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/tomli-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-util/meson-0.60.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-util/patchelf >=dev-python/pytest-7.1.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 ) >=dev-python/gpep517-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Meson PEP 517 Python build backend
+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
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=>=dev-python/pyproject-metadata-0.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/tomli-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-util/meson-0.60.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] 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 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/FFY00/meson-python/archive/0.8.0.tar.gz -> meson-python-0.8.0.gh.tar.gz
+_eclasses_=distutils-r1	17847def14400dd2ebac1ede4e941c5a	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=0a2c4a49e62cff139cda6b810b76b2a4
diff --git a/metadata/md5-cache/dev-python/pandas-1.4.2 b/metadata/md5-cache/dev-python/pandas-1.4.2
deleted file mode 100644
index 9bc7cef4fae5..000000000000
--- a/metadata/md5-cache/dev-python/pandas-1.4.2
+++ /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-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.6.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.24[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.2/pandas-1.4.2.tar.gz
-_eclasses_=distutils-r1	17847def14400dd2ebac1ede4e941c5a	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=34e0bd2c1be96520bfc3919bfd865dca
diff --git a/metadata/md5-cache/dev-python/pandas-1.4.3 b/metadata/md5-cache/dev-python/pandas-1.4.3
index cda9b938c526..acd82ae2c6ab 100644
--- a/metadata/md5-cache/dev-python/pandas-1.4.3
+++ b/metadata/md5-cache/dev-python/pandas-1.4.3
@@ -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.4.3/pandas-1.4.3.tar.gz
 _eclasses_=distutils-r1	17847def14400dd2ebac1ede4e941c5a	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=8a3dafedf6e51707b246e2c8e9f27824
+_md5_=b3fdb4883d748ff3bc1ecbeeb82a88e4
diff --git a/metadata/md5-cache/dev-python/pygame_sdl2-7.3.5-r2 b/metadata/md5-cache/dev-python/pygame_sdl2-7.3.5-r2
index 1ee53ba7dd0b..4eb912cf072f 100644
--- a/metadata/md5-cache/dev-python/pygame_sdl2-7.3.5-r2
+++ b/metadata/md5-cache/dev-python/pygame_sdl2-7.3.5-r2
@@ -1,16 +1,16 @@
-BDEPEND=dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+BDEPEND=dev-python/cython[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-42.0.2[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/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] media-libs/libpng:0= media-libs/libsdl2:=[video] media-libs/sdl2-image:=[png,jpeg] >=media-libs/sdl2-mixer-2.0.2:= media-libs/sdl2-ttf:= virtual/jpeg:0
+DEPEND=dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] media-libs/libjpeg-turbo:= media-libs/libpng:0= media-libs/libsdl2:=[video] media-libs/sdl2-image:=[png,jpeg] >=media-libs/sdl2-mixer-2.0.2:= media-libs/sdl2-ttf:=
 DESCRIPTION=Reimplementation of portions of the pygame API using SDL2
-EAPI=7
+EAPI=8
 HOMEPAGE=https://github.com/renpy/pygame_sdl2
 INHERIT=distutils-r1
-IUSE=python_targets_python3_8 python_targets_python3_9
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=amd64 x86
 LICENSE=LGPL-2.1 ZLIB
-RDEPEND=dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] media-libs/libpng:0= media-libs/libsdl2:=[video] media-libs/sdl2-image:=[png,jpeg] >=media-libs/sdl2-mixer-2.0.2:= media-libs/sdl2-ttf:= virtual/jpeg: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 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] media-libs/libjpeg-turbo:= media-libs/libpng:0= media-libs/libsdl2:=[video] media-libs/sdl2-image:=[png,jpeg] >=media-libs/sdl2-mixer-2.0.2:= media-libs/sdl2-ttf:= python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) 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://www.renpy.org/dl/7.3.5/pygame_sdl2-2.1.0-for-renpy-7.3.5.tar.gz
-_eclasses_=distutils-r1	17847def14400dd2ebac1ede4e941c5a	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=79925b8218cb2081a96c2e348d852237
+_eclasses_=distutils-r1	17847def14400dd2ebac1ede4e941c5a	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=b409d9a555e14a615886d29bd1e1e21d
diff --git a/metadata/md5-cache/dev-python/sphinx-autoapi-1.9.0 b/metadata/md5-cache/dev-python/sphinx-autoapi-1.9.0
new file mode 100644
index 000000000000..3b8be6152a4c
--- /dev/null
+++ b/metadata/md5-cache/dev-python/sphinx-autoapi-1.9.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/astroid[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/sphinx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/unidecode[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( >=dev-python/sphinx-4.5.0-r1 ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) 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-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.6.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 new approach to API documentation in Sphinx
+EAPI=8
+HOMEPAGE=https://sphinx-autoapi.readthedocs.io/ https://github.com/readthedocs/sphinx-autoapi/ https://pypi.org/project/sphinx-autoapi/
+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 ~x86
+LICENSE=MIT
+RDEPEND=dev-python/astroid[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/sphinx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/unidecode[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/readthedocs/sphinx-autoapi/archive/v1.9.0.tar.gz -> sphinx-autoapi-1.9.0.gh.tar.gz
+_eclasses_=distutils-r1	17847def14400dd2ebac1ede4e941c5a	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=1e79c841ba9d178a5a8ba26f48063567
diff --git a/metadata/md5-cache/dev-python/stapler-1.0.0_p20220330 b/metadata/md5-cache/dev-python/stapler-1.0.0_p20220330
index 57c6946a5f38..ba643db4b31d 100644
--- a/metadata/md5-cache/dev-python/stapler-1.0.0_p20220330
+++ b/metadata/md5-cache/dev-python/stapler-1.0.0_p20220330
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/hellerbarde/stapler/archive/382f1edc62296e071093a5419811a2fca9d78d93.tar.gz -> stapler-1.0.0_p20220330.tar.gz
 _eclasses_=distutils-r1	17847def14400dd2ebac1ede4e941c5a	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=aaab37eb312f12fc1d8ac6cb6daaedea
+_md5_=f4cb5399a9b69c092d7b9bcee28d61a3
diff --git a/metadata/md5-cache/dev-python/urllib3-1.26.11 b/metadata/md5-cache/dev-python/urllib3-1.26.11
new file mode 100644
index 000000000000..f993e48ad4d2
--- /dev/null
+++ b/metadata/md5-cache/dev-python/urllib3-1.26.11
@@ -0,0 +1,16 @@
+BDEPEND=test? ( python_targets_python3_8? ( >=dev-python/PySocks-1.5.8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/PySocks-2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] brotli? ( dev-python/brotlicffi[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) dev-python/brotlicffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-freezegun[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/trustme-0.5.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=www-servers/tornado-4.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-python/PySocks-1.5.8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/PySocks-2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] brotli? ( dev-python/brotlicffi[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) dev-python/brotlicffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-freezegun[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/trustme-0.5.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=www-servers/tornado-4.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-python/PySocks-1.5.8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/PySocks-2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] brotli? ( dev-python/brotlicffi[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) dev-python/brotlicffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-freezegun[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/trustme-0.5.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=www-servers/tornado-4.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( >=dev-python/PySocks-1.5.8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/PySocks-2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] brotli? ( dev-python/brotlicffi[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) dev-python/brotlicffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-freezegun[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/trustme-0.5.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=www-servers/tornado-4.2.1[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=[ssl(+)] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[ssl(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[ssl(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[ssl(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[ssl(+)] ) >=dev-python/gpep517-6[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.6.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=HTTP library with thread-safe connection pooling, file post, and more
+EAPI=7
+HOMEPAGE=https://github.com/urllib3/urllib3/ https://pypi.org/project/urllib3/
+INHERIT=distutils-r1
+IUSE=brotli 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-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=>=dev-python/PySocks-1.5.8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/PySocks-2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] brotli? ( dev-python/brotlicffi[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=[ssl(+)] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[ssl(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[ssl(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[ssl(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[ssl(+)] )
+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/urllib3/urllib3-1.26.11.tar.gz
+_eclasses_=distutils-r1	17847def14400dd2ebac1ede4e941c5a	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=f7cc8df3abf9500f022f7a1fa290ce35
diff --git a/metadata/md5-cache/dev-python/virtualenv-20.16.0 b/metadata/md5-cache/dev-python/virtualenv-20.16.0
new file mode 100644
index 000000000000..2f6a0cca8880
--- /dev/null
+++ b/metadata/md5-cache/dev-python/virtualenv-20.16.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/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-20.0.2[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.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-mock-2.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-timeout-1.3.4[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.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/filelock-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/platformdirs-2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-41[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.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 ) >=dev-python/gpep517-6[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.6.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.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/filelock-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/platformdirs-2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-41[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.0.tar.gz
+_eclasses_=distutils-r1	17847def14400dd2ebac1ede4e941c5a	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=2c79afa18613e4190ea445819fb245b7
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index 1b2209c8a921..72dcf822cb17 100644
--- a/metadata/md5-cache/dev-ruby/Manifest.gz
+++ b/metadata/md5-cache/dev-ruby/Manifest.gz
diff --git a/metadata/md5-cache/dev-ruby/minitest-5.14.4 b/metadata/md5-cache/dev-ruby/minitest-5.14.4
index b238457e3f13..2ddd62a0d01f 100644
--- a/metadata/md5-cache/dev-ruby/minitest-5.14.4
+++ b/metadata/md5-cache/dev-ruby/minitest-5.14.4
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://github.com/seattlerb/minitest
 INHERIT=ruby-fakegem
 IUSE=doc test ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=https://rubygems.org/gems/minitest-5.14.4.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	55326c3bb01904e05d55c73c84c85d07	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=4e0e4c3888dc158fd32aeab18e16e07f
+_md5_=64c32c941ad6aadaeca1c3b8a8df061a
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 118444f824b3..da916047da91 100644
--- a/metadata/md5-cache/dev-util/Manifest.gz
+++ b/metadata/md5-cache/dev-util/Manifest.gz
diff --git a/metadata/md5-cache/dev-util/maturin-0.13.1 b/metadata/md5-cache/dev-util/maturin-0.13.1
new file mode 100644
index 000000000000..733ae902c3fe
--- /dev/null
+++ b/metadata/md5-cache/dev-util/maturin-0.13.1
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-python/setuptools-rust-1.4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] doc? ( app-text/mdbook ) test? ( 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_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/boltons[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/virtualenv[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=virtual/rust-1.53 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-6[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.6.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
+DESCRIPTION=Build and publish crates with pyo3, rust-cpython and cffi bindings
+EAPI=8
+HOMEPAGE=https://maturin.rs/
+INHERIT=cargo distutils-r1 flag-o-matic
+IUSE=doc test debug python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
+LICENSE=0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD CC0-1.0 ISC MIT MPL-2.0 openssl unicode doc? ( CC-BY-4.0 OFL-1.1 )
+RDEPEND=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=https://github.com/PyO3/maturin/archive/refs/tags/v0.13.1.tar.gz -> maturin-0.13.1.gh.tar.gz https://crates.io/api/v1/crates/addr2line/0.17.0/download -> addr2line-0.17.0.crate https://crates.io/api/v1/crates/adler/1.0.2/download -> adler-1.0.2.crate https://crates.io/api/v1/crates/aes/0.7.5/download -> aes-0.7.5.crate https://crates.io/api/v1/crates/aho-corasick/0.7.18/download -> aho-corasick-0.7.18.crate https://crates.io/api/v1/crates/anyhow/1.0.58/download -> anyhow-1.0.58.crate https://crates.io/api/v1/crates/async-io/1.7.0/download -> async-io-1.7.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.1.0/download -> autocfg-1.1.0.crate https://crates.io/api/v1/crates/backtrace/0.3.66/download -> backtrace-0.3.66.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.3.2/download -> bitflags-1.3.2.crate https://crates.io/api/v1/crates/block-buffer/0.10.2/download -> block-buffer-0.10.2.crate https://crates.io/api/v1/crates/block-buffer/0.9.0/download -> block-buffer-0.9.0.crate https://crates.io/api/v1/crates/block-modes/0.8.1/download -> block-modes-0.8.1.crate https://crates.io/api/v1/crates/block-padding/0.2.1/download -> block-padding-0.2.1.crate https://crates.io/api/v1/crates/bstr/0.2.17/download -> bstr-0.2.17.crate https://crates.io/api/v1/crates/bumpalo/3.10.0/download -> bumpalo-3.10.0.crate https://crates.io/api/v1/crates/byteorder/1.4.3/download -> byteorder-1.4.3.crate https://crates.io/api/v1/crates/bytes/1.2.0/download -> bytes-1.2.0.crate https://crates.io/api/v1/crates/bytesize/1.1.0/download -> bytesize-1.1.0.crate https://crates.io/api/v1/crates/bzip2/0.4.3/download -> bzip2-0.4.3.crate https://crates.io/api/v1/crates/bzip2-sys/0.1.11+1.0.8/download -> bzip2-sys-0.1.11+1.0.8.crate https://crates.io/api/v1/crates/cab/0.4.1/download -> cab-0.4.1.crate https://crates.io/api/v1/crates/cache-padded/1.2.0/download -> cache-padded-1.2.0.crate https://crates.io/api/v1/crates/camino/1.0.9/download -> camino-1.0.9.crate https://crates.io/api/v1/crates/cargo-options/0.3.1/download -> cargo-options-0.3.1.crate https://crates.io/api/v1/crates/cargo-platform/0.1.2/download -> cargo-platform-0.1.2.crate https://crates.io/api/v1/crates/cargo-xwin/0.10.2/download -> cargo-xwin-0.10.2.crate https://crates.io/api/v1/crates/cargo-zigbuild/0.11.3/download -> cargo-zigbuild-0.11.3.crate https://crates.io/api/v1/crates/cargo_metadata/0.15.0/download -> cargo_metadata-0.15.0.crate https://crates.io/api/v1/crates/cbindgen/0.24.3/download -> cbindgen-0.24.3.crate https://crates.io/api/v1/crates/cc/1.0.73/download -> cc-1.0.73.crate https://crates.io/api/v1/crates/cfb/0.7.3/download -> cfb-0.7.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/charset/0.1.3/download -> charset-0.1.3.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/cipher/0.3.0/download -> cipher-0.3.0.crate https://crates.io/api/v1/crates/clap/3.2.15/download -> clap-3.2.15.crate https://crates.io/api/v1/crates/clap_complete/3.2.3/download -> clap_complete-3.2.3.crate https://crates.io/api/v1/crates/clap_complete_fig/3.2.4/download -> clap_complete_fig-3.2.4.crate https://crates.io/api/v1/crates/clap_derive/3.2.15/download -> clap_derive-3.2.15.crate https://crates.io/api/v1/crates/clap_lex/0.2.4/download -> clap_lex-0.2.4.crate https://crates.io/api/v1/crates/cli-table/0.4.7/download -> cli-table-0.4.7.crate https://crates.io/api/v1/crates/combine/4.6.4/download -> combine-4.6.4.crate https://crates.io/api/v1/crates/concurrent-queue/1.2.2/download -> concurrent-queue-1.2.2.crate https://crates.io/api/v1/crates/configparser/3.0.0/download -> configparser-3.0.0.crate https://crates.io/api/v1/crates/console/0.15.0/download -> console-0.15.0.crate https://crates.io/api/v1/crates/core-foundation/0.9.3/download -> core-foundation-0.9.3.crate https://crates.io/api/v1/crates/core-foundation-sys/0.8.3/download -> core-foundation-sys-0.8.3.crate https://crates.io/api/v1/crates/cpufeatures/0.2.2/download -> cpufeatures-0.2.2.crate https://crates.io/api/v1/crates/crc32fast/1.3.2/download -> crc32fast-1.3.2.crate https://crates.io/api/v1/crates/crossbeam-channel/0.5.6/download -> crossbeam-channel-0.5.6.crate https://crates.io/api/v1/crates/crossbeam-deque/0.8.2/download -> crossbeam-deque-0.8.2.crate https://crates.io/api/v1/crates/crossbeam-epoch/0.9.10/download -> crossbeam-epoch-0.9.10.crate https://crates.io/api/v1/crates/crossbeam-utils/0.8.11/download -> crossbeam-utils-0.8.11.crate https://crates.io/api/v1/crates/crypto-common/0.1.6/download -> crypto-common-0.1.6.crate https://crates.io/api/v1/crates/crypto-mac/0.11.1/download -> crypto-mac-0.11.1.crate https://crates.io/api/v1/crates/data-encoding/2.3.2/download -> data-encoding-2.3.2.crate https://crates.io/api/v1/crates/derivative/2.2.0/download -> derivative-2.2.0.crate https://crates.io/api/v1/crates/dialoguer/0.10.1/download -> dialoguer-0.10.1.crate https://crates.io/api/v1/crates/digest/0.10.3/download -> digest-0.10.3.crate https://crates.io/api/v1/crates/digest/0.9.0/download -> digest-0.9.0.crate https://crates.io/api/v1/crates/dirs/4.0.0/download -> dirs-4.0.0.crate https://crates.io/api/v1/crates/dirs-sys/0.3.7/download -> dirs-sys-0.3.7.crate https://crates.io/api/v1/crates/dunce/1.0.2/download -> dunce-1.0.2.crate https://crates.io/api/v1/crates/either/1.7.0/download -> either-1.7.0.crate https://crates.io/api/v1/crates/encode_unicode/0.3.6/download -> encode_unicode-0.3.6.crate https://crates.io/api/v1/crates/encoding/0.2.33/download -> encoding-0.2.33.crate https://crates.io/api/v1/crates/encoding-index-japanese/1.20141219.5/download -> encoding-index-japanese-1.20141219.5.crate https://crates.io/api/v1/crates/encoding-index-korean/1.20141219.5/download -> encoding-index-korean-1.20141219.5.crate https://crates.io/api/v1/crates/encoding-index-simpchinese/1.20141219.5/download -> encoding-index-simpchinese-1.20141219.5.crate https://crates.io/api/v1/crates/encoding-index-singlebyte/1.20141219.5/download -> encoding-index-singlebyte-1.20141219.5.crate https://crates.io/api/v1/crates/encoding-index-tradchinese/1.20141219.5/download -> encoding-index-tradchinese-1.20141219.5.crate https://crates.io/api/v1/crates/encoding_index_tests/0.1.4/download -> encoding_index_tests-0.1.4.crate https://crates.io/api/v1/crates/encoding_rs/0.8.31/download -> encoding_rs-0.8.31.crate https://crates.io/api/v1/crates/enumflags2/0.6.4/download -> enumflags2-0.6.4.crate https://crates.io/api/v1/crates/enumflags2_derive/0.6.4/download -> enumflags2_derive-0.6.4.crate https://crates.io/api/v1/crates/env_logger/0.7.1/download -> env_logger-0.7.1.crate https://crates.io/api/v1/crates/fastrand/1.8.0/download -> fastrand-1.8.0.crate https://crates.io/api/v1/crates/fat-macho/0.4.5/download -> fat-macho-0.4.5.crate https://crates.io/api/v1/crates/filetime/0.2.17/download -> filetime-0.2.17.crate https://crates.io/api/v1/crates/flate2/1.0.24/download -> flate2-1.0.24.crate https://crates.io/api/v1/crates/fnv/1.0.7/download -> fnv-1.0.7.crate https://crates.io/api/v1/crates/foreign-types/0.3.2/download -> foreign-types-0.3.2.crate https://crates.io/api/v1/crates/foreign-types-shared/0.1.1/download -> foreign-types-shared-0.1.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/fs-err/2.7.0/download -> fs-err-2.7.0.crate https://crates.io/api/v1/crates/futures/0.3.21/download -> futures-0.3.21.crate https://crates.io/api/v1/crates/futures-channel/0.3.21/download -> futures-channel-0.3.21.crate https://crates.io/api/v1/crates/futures-core/0.3.21/download -> futures-core-0.3.21.crate https://crates.io/api/v1/crates/futures-executor/0.3.21/download -> futures-executor-0.3.21.crate https://crates.io/api/v1/crates/futures-io/0.3.21/download -> futures-io-0.3.21.crate https://crates.io/api/v1/crates/futures-lite/1.12.0/download -> futures-lite-1.12.0.crate https://crates.io/api/v1/crates/futures-macro/0.3.21/download -> futures-macro-0.3.21.crate https://crates.io/api/v1/crates/futures-sink/0.3.21/download -> futures-sink-0.3.21.crate https://crates.io/api/v1/crates/futures-task/0.3.21/download -> futures-task-0.3.21.crate https://crates.io/api/v1/crates/futures-util/0.3.21/download -> futures-util-0.3.21.crate https://crates.io/api/v1/crates/generic-array/0.14.5/download -> generic-array-0.14.5.crate https://crates.io/api/v1/crates/getrandom/0.2.7/download -> getrandom-0.2.7.crate https://crates.io/api/v1/crates/gimli/0.26.2/download -> gimli-0.26.2.crate https://crates.io/api/v1/crates/glob/0.3.0/download -> glob-0.3.0.crate https://crates.io/api/v1/crates/globset/0.4.9/download -> globset-0.4.9.crate https://crates.io/api/v1/crates/goblin/0.5.3/download -> goblin-0.5.3.crate https://crates.io/api/v1/crates/hashbrown/0.12.3/download -> hashbrown-0.12.3.crate https://crates.io/api/v1/crates/heck/0.4.0/download -> heck-0.4.0.crate https://crates.io/api/v1/crates/hermit-abi/0.1.19/download -> hermit-abi-0.1.19.crate https://crates.io/api/v1/crates/hkdf/0.11.0/download -> hkdf-0.11.0.crate https://crates.io/api/v1/crates/hmac/0.11.0/download -> hmac-0.11.0.crate https://crates.io/api/v1/crates/human-panic/1.0.3/download -> human-panic-1.0.3.crate https://crates.io/api/v1/crates/humantime/1.3.0/download -> humantime-1.3.0.crate https://crates.io/api/v1/crates/idna/0.2.3/download -> idna-0.2.3.crate https://crates.io/api/v1/crates/ignore/0.4.18/download -> ignore-0.4.18.crate https://crates.io/api/v1/crates/indexmap/1.9.1/download -> indexmap-1.9.1.crate https://crates.io/api/v1/crates/indicatif/0.17.0-rc.6/download -> indicatif-0.17.0-rc.6.crate https://crates.io/api/v1/crates/indoc/1.0.6/download -> indoc-1.0.6.crate https://crates.io/api/v1/crates/instant/0.1.12/download -> instant-0.1.12.crate https://crates.io/api/v1/crates/itertools/0.10.3/download -> itertools-0.10.3.crate https://crates.io/api/v1/crates/itoa/1.0.2/download -> itoa-1.0.2.crate https://crates.io/api/v1/crates/js-sys/0.3.59/download -> js-sys-0.3.59.crate https://crates.io/api/v1/crates/keyring/1.2.0/download -> keyring-1.2.0.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/lddtree/0.2.9/download -> lddtree-0.2.9.crate https://crates.io/api/v1/crates/libc/0.2.126/download -> libc-0.2.126.crate https://crates.io/api/v1/crates/lock_api/0.4.7/download -> lock_api-0.4.7.crate https://crates.io/api/v1/crates/log/0.4.17/download -> log-0.4.17.crate https://crates.io/api/v1/crates/lzxd/0.1.4/download -> lzxd-0.1.4.crate https://crates.io/api/v1/crates/mailparse/0.13.8/download -> mailparse-0.13.8.crate https://crates.io/api/v1/crates/matchers/0.1.0/download -> matchers-0.1.0.crate https://crates.io/api/v1/crates/matches/0.1.9/download -> matches-0.1.9.crate https://crates.io/api/v1/crates/memchr/2.5.0/download -> memchr-2.5.0.crate https://crates.io/api/v1/crates/memoffset/0.6.5/download -> memoffset-0.6.5.crate https://crates.io/api/v1/crates/mime/0.3.16/download -> mime-0.3.16.crate https://crates.io/api/v1/crates/mime_guess/2.0.4/download -> mime_guess-2.0.4.crate https://crates.io/api/v1/crates/minijinja/0.17.0/download -> minijinja-0.17.0.crate https://crates.io/api/v1/crates/miniz_oxide/0.5.3/download -> miniz_oxide-0.5.3.crate https://crates.io/api/v1/crates/msi/0.5.0/download -> msi-0.5.0.crate https://crates.io/api/v1/crates/multipart/0.18.0/download -> multipart-0.18.0.crate https://crates.io/api/v1/crates/native-tls/0.2.10/download -> native-tls-0.2.10.crate https://crates.io/api/v1/crates/nb-connect/1.2.0/download -> nb-connect-1.2.0.crate https://crates.io/api/v1/crates/nix/0.22.3/download -> nix-0.22.3.crate https://crates.io/api/v1/crates/num/0.4.0/download -> num-0.4.0.crate https://crates.io/api/v1/crates/num-bigint/0.4.3/download -> num-bigint-0.4.3.crate https://crates.io/api/v1/crates/num-complex/0.4.2/download -> num-complex-0.4.2.crate https://crates.io/api/v1/crates/num-integer/0.1.45/download -> num-integer-0.1.45.crate https://crates.io/api/v1/crates/num-iter/0.1.43/download -> num-iter-0.1.43.crate https://crates.io/api/v1/crates/num-rational/0.4.1/download -> num-rational-0.4.1.crate https://crates.io/api/v1/crates/num-traits/0.2.15/download -> num-traits-0.2.15.crate https://crates.io/api/v1/crates/num_cpus/1.13.1/download -> num_cpus-1.13.1.crate https://crates.io/api/v1/crates/num_threads/0.1.6/download -> num_threads-0.1.6.crate https://crates.io/api/v1/crates/number_prefix/0.4.0/download -> number_prefix-0.4.0.crate https://crates.io/api/v1/crates/object/0.29.0/download -> object-0.29.0.crate https://crates.io/api/v1/crates/once_cell/1.13.0/download -> once_cell-1.13.0.crate https://crates.io/api/v1/crates/opaque-debug/0.3.0/download -> opaque-debug-0.3.0.crate https://crates.io/api/v1/crates/openssl/0.10.41/download -> openssl-0.10.41.crate https://crates.io/api/v1/crates/openssl-macros/0.1.0/download -> openssl-macros-0.1.0.crate https://crates.io/api/v1/crates/openssl-probe/0.1.5/download -> openssl-probe-0.1.5.crate https://crates.io/api/v1/crates/openssl-src/111.22.0+1.1.1q/download -> openssl-src-111.22.0+1.1.1q.crate https://crates.io/api/v1/crates/openssl-sys/0.9.75/download -> openssl-sys-0.9.75.crate https://crates.io/api/v1/crates/os_str_bytes/6.2.0/download -> os_str_bytes-6.2.0.crate https://crates.io/api/v1/crates/os_type/2.4.0/download -> os_type-2.4.0.crate https://crates.io/api/v1/crates/parking/2.0.0/download -> parking-2.0.0.crate https://crates.io/api/v1/crates/parking_lot/0.12.1/download -> parking_lot-0.12.1.crate https://crates.io/api/v1/crates/parking_lot_core/0.9.3/download -> parking_lot_core-0.9.3.crate https://crates.io/api/v1/crates/path-slash/0.2.0/download -> path-slash-0.2.0.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/pin-project-lite/0.2.9/download -> pin-project-lite-0.2.9.crate https://crates.io/api/v1/crates/pin-utils/0.1.0/download -> pin-utils-0.1.0.crate https://crates.io/api/v1/crates/pkg-config/0.3.25/download -> pkg-config-0.3.25.crate https://crates.io/api/v1/crates/plain/0.2.3/download -> plain-0.2.3.crate https://crates.io/api/v1/crates/platform-info/0.2.0/download -> platform-info-0.2.0.crate https://crates.io/api/v1/crates/polling/2.2.0/download -> polling-2.2.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/pretty_env_logger/0.4.0/download -> pretty_env_logger-0.4.0.crate https://crates.io/api/v1/crates/proc-macro-crate/0.1.5/download -> proc-macro-crate-0.1.5.crate https://crates.io/api/v1/crates/proc-macro-crate/1.1.3/download -> proc-macro-crate-1.1.3.crate https://crates.io/api/v1/crates/proc-macro-error/1.0.4/download -> proc-macro-error-1.0.4.crate https://crates.io/api/v1/crates/proc-macro-error-attr/1.0.4/download -> proc-macro-error-attr-1.0.4.crate https://crates.io/api/v1/crates/proc-macro2/1.0.42/download -> proc-macro2-1.0.42.crate https://crates.io/api/v1/crates/pyproject-toml/0.3.1/download -> pyproject-toml-0.3.1.crate https://crates.io/api/v1/crates/python-pkginfo/0.5.4/download -> python-pkginfo-0.5.4.crate https://crates.io/api/v1/crates/quick-error/1.2.3/download -> quick-error-1.2.3.crate https://crates.io/api/v1/crates/quote/1.0.20/download -> quote-1.0.20.crate https://crates.io/api/v1/crates/quoted_printable/0.4.5/download -> quoted_printable-0.4.5.crate https://crates.io/api/v1/crates/rand/0.8.5/download -> rand-0.8.5.crate https://crates.io/api/v1/crates/rand_chacha/0.3.1/download -> rand_chacha-0.3.1.crate https://crates.io/api/v1/crates/rand_core/0.6.3/download -> rand_core-0.6.3.crate https://crates.io/api/v1/crates/rayon/1.5.3/download -> rayon-1.5.3.crate https://crates.io/api/v1/crates/rayon-core/1.9.3/download -> rayon-core-1.9.3.crate https://crates.io/api/v1/crates/redox_syscall/0.2.15/download -> redox_syscall-0.2.15.crate https://crates.io/api/v1/crates/redox_users/0.4.3/download -> redox_users-0.4.3.crate https://crates.io/api/v1/crates/regex/1.6.0/download -> regex-1.6.0.crate https://crates.io/api/v1/crates/regex-automata/0.1.10/download -> regex-automata-0.1.10.crate https://crates.io/api/v1/crates/regex-syntax/0.6.27/download -> regex-syntax-0.6.27.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/rfc2047-decoder/0.1.2/download -> rfc2047-decoder-0.1.2.crate https://crates.io/api/v1/crates/ring/0.16.20/download -> ring-0.16.20.crate https://crates.io/api/v1/crates/rpassword/7.0.0/download -> rpassword-7.0.0.crate https://crates.io/api/v1/crates/rustc-demangle/0.1.21/download -> rustc-demangle-0.1.21.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/rustls/0.20.6/download -> rustls-0.20.6.crate https://crates.io/api/v1/crates/ryu/1.0.10/download -> ryu-1.0.10.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/schannel/0.1.20/download -> schannel-0.1.20.crate https://crates.io/api/v1/crates/scoped-tls/1.0.0/download -> scoped-tls-1.0.0.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/scroll/0.11.0/download -> scroll-0.11.0.crate https://crates.io/api/v1/crates/scroll_derive/0.11.0/download -> scroll_derive-0.11.0.crate https://crates.io/api/v1/crates/sct/0.7.0/download -> sct-0.7.0.crate https://crates.io/api/v1/crates/secret-service/2.0.2/download -> secret-service-2.0.2.crate https://crates.io/api/v1/crates/security-framework/2.6.1/download -> security-framework-2.6.1.crate https://crates.io/api/v1/crates/security-framework-sys/2.6.1/download -> security-framework-sys-2.6.1.crate https://crates.io/api/v1/crates/semver/1.0.12/download -> semver-1.0.12.crate https://crates.io/api/v1/crates/serde/1.0.140/download -> serde-1.0.140.crate https://crates.io/api/v1/crates/serde_derive/1.0.140/download -> serde_derive-1.0.140.crate https://crates.io/api/v1/crates/serde_json/1.0.82/download -> serde_json-1.0.82.crate https://crates.io/api/v1/crates/serde_repr/0.1.8/download -> serde_repr-0.1.8.crate https://crates.io/api/v1/crates/sha2/0.10.2/download -> sha2-0.10.2.crate https://crates.io/api/v1/crates/sha2/0.9.9/download -> sha2-0.9.9.crate https://crates.io/api/v1/crates/sharded-slab/0.1.4/download -> sharded-slab-0.1.4.crate https://crates.io/api/v1/crates/shlex/1.1.0/download -> shlex-1.1.0.crate https://crates.io/api/v1/crates/slab/0.4.7/download -> slab-0.4.7.crate https://crates.io/api/v1/crates/smallvec/1.9.0/download -> smallvec-1.9.0.crate https://crates.io/api/v1/crates/smawk/0.3.1/download -> smawk-0.3.1.crate https://crates.io/api/v1/crates/socket2/0.4.4/download -> socket2-0.4.4.crate https://crates.io/api/v1/crates/socks/0.3.4/download -> socks-0.3.4.crate https://crates.io/api/v1/crates/spin/0.5.2/download -> spin-0.5.2.crate https://crates.io/api/v1/crates/static_assertions/1.1.0/download -> static_assertions-1.1.0.crate https://crates.io/api/v1/crates/strsim/0.10.0/download -> strsim-0.10.0.crate https://crates.io/api/v1/crates/subtle/2.4.1/download -> subtle-2.4.1.crate https://crates.io/api/v1/crates/syn/1.0.98/download -> syn-1.0.98.crate https://crates.io/api/v1/crates/tar/0.4.38/download -> tar-0.4.38.crate https://crates.io/api/v1/crates/target-lexicon/0.12.4/download -> target-lexicon-0.12.4.crate https://crates.io/api/v1/crates/tempfile/3.3.0/download -> tempfile-3.3.0.crate https://crates.io/api/v1/crates/termcolor/1.1.3/download -> termcolor-1.1.3.crate https://crates.io/api/v1/crates/terminal_size/0.1.17/download -> terminal_size-0.1.17.crate https://crates.io/api/v1/crates/textwrap/0.15.0/download -> textwrap-0.15.0.crate https://crates.io/api/v1/crates/thiserror/1.0.31/download -> thiserror-1.0.31.crate https://crates.io/api/v1/crates/thiserror-impl/1.0.31/download -> thiserror-impl-1.0.31.crate https://crates.io/api/v1/crates/thread_local/1.1.4/download -> thread_local-1.1.4.crate https://crates.io/api/v1/crates/time/0.3.11/download -> time-0.3.11.crate https://crates.io/api/v1/crates/time-macros/0.2.4/download -> time-macros-0.2.4.crate https://crates.io/api/v1/crates/tinyvec/1.6.0/download -> tinyvec-1.6.0.crate https://crates.io/api/v1/crates/tinyvec_macros/0.1.0/download -> tinyvec_macros-0.1.0.crate https://crates.io/api/v1/crates/toml/0.5.9/download -> toml-0.5.9.crate https://crates.io/api/v1/crates/toml_edit/0.14.4/download -> toml_edit-0.14.4.crate https://crates.io/api/v1/crates/tracing/0.1.35/download -> tracing-0.1.35.crate https://crates.io/api/v1/crates/tracing-attributes/0.1.22/download -> tracing-attributes-0.1.22.crate https://crates.io/api/v1/crates/tracing-core/0.1.28/download -> tracing-core-0.1.28.crate https://crates.io/api/v1/crates/tracing-serde/0.1.3/download -> tracing-serde-0.1.3.crate https://crates.io/api/v1/crates/tracing-subscriber/0.3.15/download -> tracing-subscriber-0.3.15.crate https://crates.io/api/v1/crates/twox-hash/1.6.3/download -> twox-hash-1.6.3.crate https://crates.io/api/v1/crates/typenum/1.15.0/download -> typenum-1.15.0.crate https://crates.io/api/v1/crates/unicase/2.6.0/download -> unicase-2.6.0.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.8/download -> unicode-bidi-0.3.8.crate https://crates.io/api/v1/crates/unicode-ident/1.0.2/download -> unicode-ident-1.0.2.crate https://crates.io/api/v1/crates/unicode-linebreak/0.1.2/download -> unicode-linebreak-0.1.2.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.21/download -> unicode-normalization-0.1.21.crate https://crates.io/api/v1/crates/unicode-width/0.1.9/download -> unicode-width-0.1.9.crate https://crates.io/api/v1/crates/untrusted/0.7.1/download -> untrusted-0.7.1.crate https://crates.io/api/v1/crates/ureq/2.5.0/download -> ureq-2.5.0.crate https://crates.io/api/v1/crates/url/2.2.2/download -> url-2.2.2.crate https://crates.io/api/v1/crates/uuid/0.8.2/download -> uuid-0.8.2.crate https://crates.io/api/v1/crates/uuid/1.1.2/download -> uuid-1.1.2.crate https://crates.io/api/v1/crates/valuable/0.1.0/download -> valuable-0.1.0.crate https://crates.io/api/v1/crates/vcpkg/0.2.15/download -> vcpkg-0.2.15.crate https://crates.io/api/v1/crates/version_check/0.9.4/download -> version_check-0.9.4.crate https://crates.io/api/v1/crates/waker-fn/1.1.0/download -> waker-fn-1.1.0.crate https://crates.io/api/v1/crates/walkdir/2.3.2/download -> walkdir-2.3.2.crate https://crates.io/api/v1/crates/wasi/0.11.0+wasi-snapshot-preview1/download -> wasi-0.11.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasm-bindgen/0.2.82/download -> wasm-bindgen-0.2.82.crate https://crates.io/api/v1/crates/wasm-bindgen-backend/0.2.82/download -> wasm-bindgen-backend-0.2.82.crate https://crates.io/api/v1/crates/wasm-bindgen-macro/0.2.82/download -> wasm-bindgen-macro-0.2.82.crate https://crates.io/api/v1/crates/wasm-bindgen-macro-support/0.2.82/download -> wasm-bindgen-macro-support-0.2.82.crate https://crates.io/api/v1/crates/wasm-bindgen-shared/0.2.82/download -> wasm-bindgen-shared-0.2.82.crate https://crates.io/api/v1/crates/web-sys/0.3.59/download -> web-sys-0.3.59.crate https://crates.io/api/v1/crates/webpki/0.22.0/download -> webpki-0.22.0.crate https://crates.io/api/v1/crates/webpki-roots/0.22.4/download -> webpki-roots-0.22.4.crate https://crates.io/api/v1/crates/wepoll-ffi/0.1.2/download -> wepoll-ffi-0.1.2.crate https://crates.io/api/v1/crates/which/4.2.5/download -> which-4.2.5.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.5/download -> winapi-util-0.1.5.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/windows-sys/0.36.1/download -> windows-sys-0.36.1.crate https://crates.io/api/v1/crates/windows_aarch64_msvc/0.36.1/download -> windows_aarch64_msvc-0.36.1.crate https://crates.io/api/v1/crates/windows_i686_gnu/0.36.1/download -> windows_i686_gnu-0.36.1.crate https://crates.io/api/v1/crates/windows_i686_msvc/0.36.1/download -> windows_i686_msvc-0.36.1.crate https://crates.io/api/v1/crates/windows_x86_64_gnu/0.36.1/download -> windows_x86_64_gnu-0.36.1.crate https://crates.io/api/v1/crates/windows_x86_64_msvc/0.36.1/download -> windows_x86_64_msvc-0.36.1.crate https://crates.io/api/v1/crates/xattr/0.2.3/download -> xattr-0.2.3.crate https://crates.io/api/v1/crates/xwin/0.2.5/download -> xwin-0.2.5.crate https://crates.io/api/v1/crates/zbus/1.9.3/download -> zbus-1.9.3.crate https://crates.io/api/v1/crates/zbus_macros/1.9.3/download -> zbus_macros-1.9.3.crate https://crates.io/api/v1/crates/zip/0.6.2/download -> zip-0.6.2.crate https://crates.io/api/v1/crates/zvariant/2.10.0/download -> zvariant-2.10.0.crate https://crates.io/api/v1/crates/zvariant_derive/2.10.0/download -> zvariant_derive-2.10.0.crate test? ( https://crates.io/api/v1/crates/libc/0.2.119/download -> libc-0.2.119.crate https://crates.io/api/v1/crates/libc/0.2.125/download -> libc-0.2.125.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/once_cell/1.11.0/download -> once_cell-1.11.0.crate https://crates.io/api/v1/crates/once_cell/1.12.0/download -> once_cell-1.12.0.crate https://crates.io/api/v1/crates/once_cell/1.9.0/download -> once_cell-1.9.0.crate https://crates.io/api/v1/crates/parking_lot/0.12.0/download -> parking_lot-0.12.0.crate https://crates.io/api/v1/crates/proc-macro2/1.0.38/download -> proc-macro2-1.0.38.crate https://crates.io/api/v1/crates/proc-macro2/1.0.39/download -> proc-macro2-1.0.39.crate https://crates.io/api/v1/crates/pyo3/0.16.5/download -> pyo3-0.16.5.crate https://crates.io/api/v1/crates/pyo3-build-config/0.16.0/download -> pyo3-build-config-0.16.0.crate https://crates.io/api/v1/crates/pyo3-build-config/0.16.5/download -> pyo3-build-config-0.16.5.crate https://crates.io/api/v1/crates/pyo3-ffi/0.16.0/download -> pyo3-ffi-0.16.0.crate https://crates.io/api/v1/crates/pyo3-ffi/0.16.5/download -> pyo3-ffi-0.16.5.crate https://crates.io/api/v1/crates/pyo3-macros/0.16.5/download -> pyo3-macros-0.16.5.crate https://crates.io/api/v1/crates/pyo3-macros-backend/0.16.5/download -> pyo3-macros-backend-0.16.5.crate https://crates.io/api/v1/crates/python3-dll-a/0.2.3/download -> python3-dll-a-0.2.3.crate https://crates.io/api/v1/crates/quote/1.0.18/download -> quote-1.0.18.crate https://crates.io/api/v1/crates/redox_syscall/0.2.13/download -> redox_syscall-0.2.13.crate https://crates.io/api/v1/crates/smallvec/1.8.0/download -> smallvec-1.8.0.crate https://crates.io/api/v1/crates/syn/1.0.94/download -> syn-1.0.94.crate https://crates.io/api/v1/crates/syn/1.0.95/download -> syn-1.0.95.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/unicode-ident/1.0.0/download -> unicode-ident-1.0.0.crate https://crates.io/api/v1/crates/unicode-xid/0.2.3/download -> unicode-xid-0.2.3.crate https://crates.io/api/v1/crates/unindent/0.1.9/download -> unindent-0.1.9.crate )
+_eclasses_=cargo	52a92ed3815080c5f2caac1905687b1c	distutils-r1	17847def14400dd2ebac1ede4e941c5a	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=94b87949514311648b5f5b4e28f7b628
diff --git a/metadata/md5-cache/dev-util/pkgcheck-0.10.11 b/metadata/md5-cache/dev-util/pkgcheck-0.10.11
index ff7651a25abb..7f4fc1aad59f 100644
--- a/metadata/md5-cache/dev-util/pkgcheck-0.10.11
+++ b/metadata/md5-cache/dev-util/pkgcheck-0.10.11
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/pkgcore/pkgcheck
 INHERIT=distutils-r1 optfeature
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-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=BSD MIT
 RDEPEND=>=dev-python/snakeoil-0.9.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=sys-apps/pkgcore-0.12.11[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-libs/tree-sitter dev-libs/tree-sitter-bash dev-python/chardet[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/lazy-object-proxy[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/pathspec[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/tree-sitter-0.19.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 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pkgcheck/pkgcheck-0.10.11.tar.gz
 _eclasses_=distutils-r1	17847def14400dd2ebac1ede4e941c5a	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=9ced0b40901a62cf5f218491c2e01f98
+_md5_=b52615aa1c48e24a6ac618001fd4f63a
diff --git a/metadata/md5-cache/dev-util/wayland-scanner-1.21.0 b/metadata/md5-cache/dev-util/wayland-scanner-1.21.0
index 309db5a37fad..3fad6f867e6b 100644
--- a/metadata/md5-cache/dev-util/wayland-scanner-1.21.0
+++ b/metadata/md5-cache/dev-util/wayland-scanner-1.21.0
@@ -5,10 +5,10 @@ DESCRIPTION=wayland-scanner tool
 EAPI=8
 HOMEPAGE=https://wayland.freedesktop.org/ https://gitlab.freedesktop.org/wayland/wayland
 INHERIT=meson
-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=!<dev-libs/wayland-1.21.0 >=dev-libs/expat-2.1.0-r3
 SLOT=0
 SRC_URI=https://gitlab.freedesktop.org/wayland/wayland/-/releases/1.21.0/downloads/wayland-1.21.0.tar.xz
 _eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=df1d785ca5904aae93961e3445d52066
+_md5_=d9a32e98a6b0acf7fdc47c914dd2c499
diff --git a/metadata/md5-cache/gui-libs/Manifest.gz b/metadata/md5-cache/gui-libs/Manifest.gz
index ba1ebadc5721..090f701cadbd 100644
--- a/metadata/md5-cache/gui-libs/Manifest.gz
+++ b/metadata/md5-cache/gui-libs/Manifest.gz
diff --git a/metadata/md5-cache/gui-libs/display-manager-init-1.0-r4 b/metadata/md5-cache/gui-libs/display-manager-init-1.0-r4
index c1d7700b5f85..43e880023ebc 100644
--- a/metadata/md5-cache/gui-libs/display-manager-init-1.0-r4
+++ b/metadata/md5-cache/gui-libs/display-manager-init-1.0-r4
@@ -2,8 +2,8 @@ DEFINED_PHASES=install preinst
 DESCRIPTION=RC init files for starting display and login managers
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:X11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=sys-apps/gentoo-functions !<=sys-apps/sysvinit-2.98 !<=x11-apps/xinit-1.4.1 !<=x11-base/xorg-server-1.20.10 !=x11-base/xorg-server-1.20.10-r2
 SLOT=0
-_md5_=f6cafbc606a4a5dbc534d255a5bb5ce6
+_md5_=591a7dbd7bc8230a44853539c73fdbf4
diff --git a/metadata/md5-cache/media-fonts/Manifest.gz b/metadata/md5-cache/media-fonts/Manifest.gz
index 13d8163b69ae..9ade0363462c 100644
--- a/metadata/md5-cache/media-fonts/Manifest.gz
+++ b/metadata/md5-cache/media-fonts/Manifest.gz
diff --git a/metadata/md5-cache/media-fonts/encodings-1.0.6 b/metadata/md5-cache/media-fonts/encodings-1.0.6
index 1ab312895d06..101bfdd4e919 100644
--- a/metadata/md5-cache/media-fonts/encodings-1.0.6
+++ b/metadata/md5-cache/media-fonts/encodings-1.0.6
@@ -4,9 +4,9 @@ DESCRIPTION=X.Org font encodings
 EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/encodings
 INHERIT=font xorg-3
-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=MIT
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/encodings-1.0.6.tar.xz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	font	d31f12a0f6e13d56dc3062e76ae58a61	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961	xorg-3	38a663574d97f06b6b729046865c8fb6
-_md5_=1f1175f39167e83c20df84f4b8629ea9
+_md5_=a7196a25c533a7484871a98d13953889
diff --git a/metadata/md5-cache/media-fonts/font-util-1.3.3 b/metadata/md5-cache/media-fonts/font-util-1.3.3
index 523a96ad2f77..8e1dcce5c7d0 100644
--- a/metadata/md5-cache/media-fonts/font-util-1.3.3
+++ b/metadata/md5-cache/media-fonts/font-util-1.3.3
@@ -4,9 +4,9 @@ DESCRIPTION=X.Org font utilities
 EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/util
 INHERIT=xorg-3
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-util-1.3.3.tar.xz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961	xorg-3	38a663574d97f06b6b729046865c8fb6
-_md5_=ace7c438a4e148ee39276e25c12659b4
+_md5_=31b83029519a504a76321333ff69be57
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index fdbd747407c6..7283c89aabcc 100644
--- a/metadata/md5-cache/media-libs/Manifest.gz
+++ b/metadata/md5-cache/media-libs/Manifest.gz
diff --git a/metadata/md5-cache/media-libs/libepoxy-1.5.10-r1 b/metadata/md5-cache/media-libs/libepoxy-1.5.10-r1
index 1307822d2958..247bfc0b1e62 100644
--- a/metadata/md5-cache/media-libs/libepoxy-1.5.10-r1
+++ b/metadata/md5-cache/media-libs/libepoxy-1.5.10-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/anholt/libepoxy
 INHERIT=meson-multilib python-any-r1 virtualx
 IUSE=+egl test +X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86
 LICENSE=MIT
 RDEPEND=egl? ( media-libs/mesa[egl(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/anholt/libepoxy/archive/1.5.10.tar.gz -> libepoxy-1.5.10.tar.gz
 _eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=eb7182e3cf2b78b898fb7461c6e16cd7
+_md5_=b39864c6f5f0e34b606246d4a3177ee4
diff --git a/metadata/md5-cache/media-libs/mesa-22.1.3 b/metadata/md5-cache/media-libs/mesa-22.1.3
index caeffcbb44fb..f1ce65582a48 100644
--- a/metadata/md5-cache/media-libs/mesa-22.1.3
+++ b/metadata/md5-cache/media-libs/mesa-22.1.3
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.mesa3d.org/ https://mesa.freedesktop.org/
 INHERIT=llvm meson-multilib python-any-r1 linux-info
 IUSE=video_cards_r300 video_cards_r600 video_cards_radeon video_cards_radeonsi video_cards_freedreno video_cards_intel video_cards_lima video_cards_nouveau video_cards_panfrost video_cards_v3d video_cards_vc4 video_cards_virgl video_cards_vivante video_cards_vmware cpu_flags_x86_sse2 d3d9 debug gles1 +gles2 +llvm lm-sensors opencl osmesa selinux test unwind vaapi valgrind vdpau vulkan vulkan-overlay wayland +X xa xvmc zink +zstd abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=>=dev-libs/expat-2.1.0-r3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libglvnd-1.3.2[X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r600? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_radeon? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) lm-sensors? ( sys-apps/lm-sensors:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( >=virtual/opencl-3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libclc virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=x11-libs/libva-1.7.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xvmc? ( >=x11-libs/libXvMC-1.0.8:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) selinux? ( sys-libs/libselinux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.18.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=x11-libs/libdrm-2.4.110[video_cards_freedreno?,video_cards_intel?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] vulkan-overlay? ( dev-util/glslang:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxshmfence-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXxf86vm-1.1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.13:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zink? ( media-libs/vulkan-loader:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.110[video_cards_amdgpu] ) llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-15:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-15:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-15:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:14[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: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(-)?] sys-devel/clang:12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) <sys-devel/clang-15:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) !opencl? ( video_cards_r600? ( || ( sys-devel/llvm:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm: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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-15:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm: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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-15:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm: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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-15:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:14[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: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(-)?] sys-devel/llvm:12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) <sys-devel/llvm-15:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) )
 REQUIRED_USE=d3d9? ( || ( video_cards_intel video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) ) vulkan? ( video_cards_radeonsi? ( llvm ) ) vulkan-overlay? ( vulkan ) video_cards_radeon? ( x86? ( llvm ) amd64? ( llvm ) ) video_cards_r300? ( x86? ( llvm ) amd64? ( llvm ) ) video_cards_radeonsi? ( llvm ) xa? ( X ) xvmc? ( X ) zink? ( vulkan )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://archive.mesa3d.org/mesa-22.1.3.tar.xz
 _eclasses_=linux-info	dcbf4f67bc38bee48e9d69a4344e8059	llvm	6f88d422e49b917bf254b2594f3d903c	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=1b69bc6d3ed78844cd3428455fe993cb
+_md5_=5aa220996b4ea0ce8ed82b056e93afc0
diff --git a/metadata/md5-cache/media-libs/mesa-amber-21.3.9 b/metadata/md5-cache/media-libs/mesa-amber-21.3.9
index ab6d156486a1..1208c184b3fb 100644
--- a/metadata/md5-cache/media-libs/mesa-amber-21.3.9
+++ b/metadata/md5-cache/media-libs/mesa-amber-21.3.9
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://www.mesa3d.org/ https://mesa.freedesktop.org/
 INHERIT=meson-multilib python-any-r1 linux-info
 IUSE=video_cards_r100 video_cards_r200 video_cards_radeon video_cards_i915 video_cards_i965 video_cards_intel video_cards_nouveau cpu_flags_x86_sse2 debug gles1 +gles2 selinux test valgrind wayland +X +zstd abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=!<=media-libs/mesa-21.3.8 !media-libs/mesa:amber media-libs/mesa[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/expat-2.1.0-r3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libglvnd-1.3.2[X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] selinux? ( sys-libs/libselinux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.18.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/wayland-protocols-1.8 ) >=x11-libs/libdrm-2.4.107[video_cards_nouveau?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] video_cards_intel? ( !video_cards_i965? ( >=x11-libs/libdrm-2.4.107[video_cards_intel] ) ) video_cards_i915? ( >=x11-libs/libdrm-2.4.107[video_cards_intel] ) X? ( >=x11-libs/libX11-1.6.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxshmfence-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXxf86vm-1.1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.13:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.107[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.107[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.107[video_cards_radeon] )
 RESTRICT=!test? ( test )
 SLOT=amber
 SRC_URI=https://archive.mesa3d.org/mesa-21.3.9.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=e6b3ee5f421ef2aa602686a75c4ebda2
+_md5_=1fcfdc179a1fe39b4becc5caeafc2f71
diff --git a/metadata/md5-cache/media-libs/speex-1.2.1 b/metadata/md5-cache/media-libs/speex-1.2.1
index d9c6c513db3c..0bf745dfcbbf 100644
--- a/metadata/md5-cache/media-libs/speex-1.2.1
+++ b/metadata/md5-cache/media-libs/speex-1.2.1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://www.speex.org/
 INHERIT=autotools flag-o-matic multilib-minimal
 IUSE=cpu_flags_arm_v4 cpu_flags_arm_v5 cpu_flags_arm_v6 cpu_flags_x86_sse utils +vbr abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris
 LICENSE=BSD
 RDEPEND=utils? ( media-libs/libogg:= media-libs/speexdsp[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://downloads.xiph.org/releases/speex/speex-1.2.1.tar.gz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=9e56a74d7f542cfc2ed27269cca54d9e
+_md5_=0a029f8c4a3dbdcf0174fd832f0aabb8
diff --git a/metadata/md5-cache/media-libs/speexdsp-1.2.1 b/metadata/md5-cache/media-libs/speexdsp-1.2.1
index bac0d76adedb..40946e2ad5e8 100644
--- a/metadata/md5-cache/media-libs/speexdsp-1.2.1
+++ b/metadata/md5-cache/media-libs/speexdsp-1.2.1
@@ -5,9 +5,9 @@ EAPI=8
 HOMEPAGE=https://www.speex.org/
 INHERIT=autotools flag-o-matic multilib-minimal
 IUSE=cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_arm_neon abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://downloads.xiph.org/releases/speex/speexdsp-1.2.1.tar.gz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=6f192c9064d23ef38d6361888dae8e98
+_md5_=a0b75f2d9edaf96b29b9f7ef72ec0a55
diff --git a/metadata/md5-cache/media-libs/waffle-1.7.0-r2 b/metadata/md5-cache/media-libs/waffle-1.7.0-r2
index 38411a534fdc..a3694ffde93f 100644
--- a/metadata/md5-cache/media-libs/waffle-1.7.0-r2
+++ b/metadata/md5-cache/media-libs/waffle-1.7.0-r2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=http://www.waffle-gl.org/ https://gitlab.freedesktop.org/mesa/waffle
 INHERIT=meson-multilib multilib
 IUSE=doc +egl +gbm wayland X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86
 LICENSE=BSD-2
 RDEPEND=>=media-libs/mesa-9.1.6[egl(+)?,gbm(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.9.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gbm? ( >=virtual/libudev-208:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://gitlab.freedesktop.org/mesa/waffle/-/archive/v1.7.0/waffle-v1.7.0.tar.bz2
 _eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=a5d5907607fde0c771e8474095611e33
+_md5_=00544bc49e7a23a9f1f2bf6743d20efc
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index 4fcf9b9d4bf2..c79e82db783a 100644
--- a/metadata/md5-cache/media-sound/Manifest.gz
+++ b/metadata/md5-cache/media-sound/Manifest.gz
diff --git a/metadata/md5-cache/media-sound/mixxx-2.3.3 b/metadata/md5-cache/media-sound/mixxx-2.3.3
index fdd90f50fcb0..2948801b069f 100644
--- a/metadata/md5-cache/media-sound/mixxx-2.3.3
+++ b/metadata/md5-cache/media-sound/mixxx-2.3.3
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://www.mixxx.org/
 INHERIT=cmake xdg udev
 IUSE=aac ffmpeg hid keyfinder lv2 modplug mp3 mp4 opus qtkeychain shout wavpack l10n_ca l10n_cs l10n_de l10n_en l10n_es l10n_fi l10n_fr l10n_gl l10n_id l10n_it l10n_ja l10n_kn l10n_nl l10n_pl l10n_pt l10n_ro l10n_ru l10n_sl l10n_sq l10n_sr l10n_tr l10n_zh-CN l10n_zh-TW
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=dev-db/sqlite dev-libs/glib:2 dev-libs/protobuf:0= dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtscript:5[scripttools] dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 media-libs/chromaprint media-libs/flac media-libs/libebur128 media-libs/libid3tag:= media-libs/libogg media-libs/libsndfile media-libs/libsoundtouch media-libs/libvorbis media-libs/portaudio[alsa] media-libs/portmidi media-libs/rubberband media-libs/taglib media-libs/vamp-plugin-sdk media-sound/lame sci-libs/fftw:3.0= sys-power/upower virtual/glu virtual/libusb:1 virtual/opengl virtual/udev x11-libs/libX11 aac? ( media-libs/faad2 media-libs/libmp4v2:0 ) ffmpeg? ( media-video/ffmpeg:0= ) hid? ( dev-libs/hidapi ) keyfinder? ( media-libs/libkeyfinder ) lv2? ( media-libs/lilv ) modplug? ( media-libs/libmodplug ) mp3? ( media-libs/libmad ) mp4? ( media-libs/libmp4v2:= ) opus? ( media-libs/opusfile ) qtkeychain? ( dev-libs/qtkeychain ) wavpack? ( media-sound/wavpack )
 SLOT=0
 SRC_URI=https://github.com/mixxxdj/mixxx/archive/refs/tags/2.3.3.tar.gz -> mixxx-2.3.3.tar.gz l10n_ca? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-ca.pdf ) l10n_cs? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-cs.pdf ) l10n_de? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-de.pdf ) l10n_en? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-en.pdf ) l10n_es? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-es.pdf ) l10n_fi? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-fi.pdf ) l10n_fr? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-fr.pdf ) l10n_gl? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-gl.pdf ) l10n_id? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-id.pdf ) l10n_it? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-it.pdf ) l10n_ja? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-ja-JP.pdf ) l10n_kn? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-kn.pdf ) l10n_nl? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-nl.pdf ) l10n_pl? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-pl.pdf ) l10n_pt? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-pt.pdf ) l10n_ro? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-ro.pdf ) l10n_ru? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-ru.pdf ) l10n_sl? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-sl.pdf ) l10n_sq? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-sq.pdf ) l10n_sr? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-sr.pdf ) l10n_tr? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-tr.pdf ) l10n_zh-CN? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-zh-CN.pdf ) l10n_zh-TW? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-zh-TW.pdf ) https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-en.pdf
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	1542e649be915f43f6908a9e93909961	udev	f3a0a3964e2028a140c181f00eea9712	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=5d9fbf28072bbea99dba237aed56e8b0
+_md5_=658071b53057654c11f4a646041b214a
diff --git a/metadata/md5-cache/media-sound/qmmp-1.6.1-r1 b/metadata/md5-cache/media-sound/qmmp-1.6.1-r1
index 5f22e1926c11..5475458907c9 100644
--- a/metadata/md5-cache/media-sound/qmmp-1.6.1-r1
+++ b/metadata/md5-cache/media-sound/qmmp-1.6.1-r1
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=http://qmmp.ylsoftware.com
 INHERIT=cmake xdg
 IUSE=aac +alsa analyzer archive bs2b cdda cover crossfade cue curl +dbus enca ffmpeg flac game gnome jack ladspa lyrics +mad midi mms mplayer musepack notifier opus oss pipewire projectm pulseaudio qsui qtmedia scrobbler shout sid sndfile soxr stereo tray udisks +vorbis wavpack xmp
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsql:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-libs/taglib x11-libs/libX11 aac? ( media-libs/faad2 ) alsa? ( media-libs/alsa-lib ) archive? ( app-arch/libarchive ) bs2b? ( media-libs/libbs2b ) cdda? ( dev-libs/libcdio:= dev-libs/libcdio-paranoia ) curl? ( net-misc/curl ) dbus? ( dev-qt/qtdbus:5 ) enca? ( app-i18n/enca ) ffmpeg? ( media-video/ffmpeg:= ) flac? ( media-libs/flac ) game? ( media-libs/game-music-emu ) jack? ( media-libs/libsamplerate virtual/jack ) ladspa? ( media-plugins/cmt-plugins ) mad? ( media-libs/libmad:= media-sound/mpg123:= ) midi? ( media-sound/wildmidi ) mms? ( media-libs/libmms ) mplayer? ( media-video/mplayer ) musepack? ( >=media-sound/musepack-tools-444 ) opus? ( media-libs/opusfile ) pipewire? ( media-video/pipewire ) projectm? ( dev-qt/qtgui:5[-gles2-only] dev-qt/qtopengl:5 media-libs/libprojectm:= ) pulseaudio? ( >=media-sound/pulseaudio-0.9.9 ) qtmedia? ( dev-qt/qtmultimedia:5 ) scrobbler? ( net-misc/curl ) shout? ( media-libs/libshout ) sid? ( >=media-libs/libsidplayfp-1.1.0 ) sndfile? ( media-libs/libsndfile ) soxr? ( media-libs/soxr ) udisks? ( sys-fs/udisks:2 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) xmp? ( media-libs/libxmp )
 REQUIRED_USE=gnome? ( dbus ) shout? ( soxr vorbis ) udisks? ( dbus )
 SLOT=0
 SRC_URI=http://qmmp.ylsoftware.com/files/qmmp-1.6.1.tar.bz2 mirror://sourceforge/qmmp-dev/files/qmmp-1.6.1.tar.bz2
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=7c17a4b0852000408f7a933f8cd3a296
+_md5_=d3aa5a090028f71a9ecc2cb012a2b623
diff --git a/metadata/md5-cache/net-dns/Manifest.gz b/metadata/md5-cache/net-dns/Manifest.gz
index 8b5a0eb882e3..8f735957d99e 100644
--- a/metadata/md5-cache/net-dns/Manifest.gz
+++ b/metadata/md5-cache/net-dns/Manifest.gz
diff --git a/metadata/md5-cache/net-dns/libidn-1.41 b/metadata/md5-cache/net-dns/libidn-1.41
index e15a20989427..8985a8ebc142 100644
--- a/metadata/md5-cache/net-dns/libidn-1.41
+++ b/metadata/md5-cache/net-dns/libidn-1.41
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://www.gnu.org/software/libidn/
 INHERIT=elisp-common libtool multilib-minimal verify-sig
 IUSE=emacs nls 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=GPL-2 GPL-3 LGPL-3
 RDEPEND=nls? ( >=virtual/libintl-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0/12
 SRC_URI=mirror://gnu/libidn/libidn-1.41.tar.gz verify-sig? ( mirror://gnu/libidn/libidn-1.41.tar.gz.sig )
 _eclasses_=elisp-common	e7aaa047873789f549ea3df2f04b2145	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16
-_md5_=2e1e1fa52b9ee24932c707ad03ba6456
+_md5_=8187b6796bb5d997d34be89540ca7e49
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index e2f80556520a..f58f4b074371 100644
--- a/metadata/md5-cache/net-misc/Manifest.gz
+++ b/metadata/md5-cache/net-misc/Manifest.gz
diff --git a/metadata/md5-cache/net-misc/nextcloud-client-3.5.2 b/metadata/md5-cache/net-misc/nextcloud-client-3.5.2
index 85a912191366..e844d15a28ba 100644
--- a/metadata/md5-cache/net-misc/nextcloud-client-3.5.2
+++ b/metadata/md5-cache/net-misc/nextcloud-client-3.5.2
@@ -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 )
+BDEPEND=dev-qt/linguist-tools:5 dolphin? ( kde-frameworks/extra-cmake-modules ) >=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 postinst postrm preinst prepare test
-DEPEND=>=dev-db/sqlite-3.34:3 >=dev-libs/openssl-1.1.0:0= dev-libs/qtkeychain:=[qt5(+)] dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtquickcontrols2:5 dev-qt/qtsvg:5 dev-qt/qtwebsockets:5 dev-qt/qtwidgets:5 sys-libs/zlib dolphin? ( kde-frameworks/kcoreaddons:5 kde-frameworks/kio:5 ) nautilus? ( dev-python/nautilus-python ) webengine? ( dev-qt/qtwebengine:5[widgets] ) dev-qt/linguist-tools:5 dev-qt/qtconcurrent:5 dev-qt/qtxml:5 || ( gnome-base/librsvg media-gfx/inkscape ) doc? ( dev-python/sphinx dev-tex/latexmk dev-texlive/texlive-latexextra virtual/latex-base ) dolphin? ( kde-frameworks/extra-cmake-modules ) test? ( dev-util/cmocka dev-qt/qttest:5 )
+DEPEND=>=dev-db/sqlite-3.34:3 >=dev-libs/openssl-1.1.0:0= dev-libs/qtkeychain:=[qt5(+)] dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtquickcontrols2:5 dev-qt/qtsvg:5 dev-qt/qtwebsockets:5 dev-qt/qtwidgets:5 sys-libs/zlib dolphin? ( kde-frameworks/kcoreaddons:5 kde-frameworks/kio:5 ) nautilus? ( dev-python/nautilus-python ) webengine? ( dev-qt/qtwebengine:5[widgets] ) dev-qt/qtconcurrent:5 dev-qt/qtxml:5 || ( gnome-base/librsvg media-gfx/inkscape ) doc? ( dev-python/sphinx dev-tex/latexmk dev-texlive/texlive-latexextra virtual/latex-base ) test? ( dev-qt/qttest:5 dev-util/cmocka )
 DESCRIPTION=Desktop Syncing Client for Nextcloud
 EAPI=8
 HOMEPAGE=https://github.com/nextcloud/desktop
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/nextcloud/desktop/archive/v3.5.2.tar.gz -> nextcloud-client-3.5.2.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=e8f9e4a3c148897ad39744b221d55ab0
+_md5_=d0c5e4eed983b80fd74784786ef0f700
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index d7b03d3b4c09..a43926fa297c 100644
--- a/metadata/md5-cache/sci-libs/Manifest.gz
+++ b/metadata/md5-cache/sci-libs/Manifest.gz
diff --git a/metadata/md5-cache/sci-libs/opencascade-7.6.2-r1 b/metadata/md5-cache/sci-libs/opencascade-7.6.2-r1
index d25046d80a52..e39431e787db 100644
--- a/metadata/md5-cache/sci-libs/opencascade-7.6.2-r1
+++ b/metadata/md5-cache/sci-libs/opencascade-7.6.2-r1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.opencascade.com
 INHERIT=cmake
 IUSE=doc eigen examples ffmpeg freeimage gles2 json optimize tbb vtk
-KEYWORDS=~amd64 ~arm64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~riscv ~x86
 LICENSE=|| ( Open-CASCADE-LGPL-2.1-Exception-1.0 LGPL-2.1 )
 RDEPEND=!app-eselect/eselect-opencascade dev-lang/tcl:= dev-lang/tk:= dev-tcltk/itcl dev-tcltk/itk dev-tcltk/tix media-libs/fontconfig media-libs/freetype:2 media-libs/ftgl virtual/glu virtual/opengl x11-libs/libXmu examples? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtquickcontrols2:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 ) ffmpeg? ( <media-video/ffmpeg-5:= ) freeimage? ( media-libs/freeimage ) tbb? ( dev-cpp/tbb:= ) vtk? ( sci-libs/vtk:=[rendering] )
 REQUIRED_USE=?? ( optimize tbb )
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0/7.6
 SRC_URI=https://git.dev.opencascade.org/gitweb/?p=occt.git;a=snapshot;h=refs/tags/V7_6_2;sf=tgz -> opencascade-7.6.2.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=03396254464a2bf39a11c3e6f451da10
+_md5_=8bcb8f12afb86b39fa2775e4077c5661
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index 4dbd996f0d31..a5b1dcf6497d 100644
--- a/metadata/md5-cache/sys-apps/Manifest.gz
+++ b/metadata/md5-cache/sys-apps/Manifest.gz
diff --git a/metadata/md5-cache/sys-apps/pmount-0.9.99_alpha-r6 b/metadata/md5-cache/sys-apps/pmount-0.9.99_alpha-r6
deleted file mode 100644
index 17f9f6d85463..000000000000
--- a/metadata/md5-cache/sys-apps/pmount-0.9.99_alpha-r6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare test
-DEPEND=acct-group/plugdev >=sys-apps/util-linux-2.17.2 crypt? ( >=sys-fs/cryptsetup-1.0.6-r2 ) dev-util/intltool sys-devel/gettext
-DESCRIPTION=Policy based mounter that gives the ability to mount removable devices as a user
-EAPI=7
-HOMEPAGE=https://launchpad.net/pmount
-INHERIT=bash-completion-r1
-IUSE=crypt
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 sparc x86
-LICENSE=GPL-2
-RDEPEND=acct-group/plugdev >=sys-apps/util-linux-2.17.2 crypt? ( >=sys-fs/cryptsetup-1.0.6-r2 )
-SLOT=0
-SRC_URI=mirror://debian/pool/main/p/pmount/pmount_0.9.99-alpha.orig.tar.bz2
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=5069638ed04ffac970df383585f2b9e2
diff --git a/metadata/md5-cache/sys-apps/pmount-0.9.99_alpha-r7 b/metadata/md5-cache/sys-apps/pmount-0.9.99_alpha-r7
index 5dedcf5301c1..00e154c1e163 100644
--- a/metadata/md5-cache/sys-apps/pmount-0.9.99_alpha-r7
+++ b/metadata/md5-cache/sys-apps/pmount-0.9.99_alpha-r7
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://launchpad.net/pmount
 INHERIT=bash-completion-r1
 IUSE=crypt
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ppc ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=acct-group/plugdev >=sys-apps/util-linux-2.17.2 crypt? ( >=sys-fs/cryptsetup-1.0.6-r2 )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/p/pmount/pmount_0.9.99-alpha.orig.tar.bz2
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=3a8d9ca38fcc26d6c3b08ef2019cfe4b
+_md5_=404bae343e162914a6d1092375839c98
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index 0e0b544a2873..b353de4ed904 100644
--- a/metadata/md5-cache/sys-kernel/Manifest.gz
+++ b/metadata/md5-cache/sys-kernel/Manifest.gz
diff --git a/metadata/md5-cache/sys-kernel/genkernel-4.2.6-r5 b/metadata/md5-cache/sys-kernel/genkernel-4.2.6-r5
index d5888ecf6ba6..ae62f8fabbe9 100644
--- a/metadata/md5-cache/sys-kernel/genkernel-4.2.6-r5
+++ b/metadata/md5-cache/sys-kernel/genkernel-4.2.6-r5
@@ -4,11 +4,11 @@ EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Genkernel https://gitweb.gentoo.org/proj/genkernel.git/
 INHERIT=bash-completion-r1 python-single-r1
 IUSE=ibm +firmware 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
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc 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 ) app-arch/cpio >=app-misc/pax-utils-1.2.2 app-portage/elt-patches dev-util/gperf sys-apps/sandbox sys-devel/autoconf sys-devel/autoconf-archive sys-devel/automake sys-devel/libtool virtual/pkgconfig elibc_glibc? ( sys-libs/glibc[static-libs(+)] ) firmware? ( sys-kernel/linux-firmware )
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~whissi/dist/genkernel/genkernel-4.2.6.tar.xz https://github.com/g2p/bcache-tools/archive/399021549984ad27bf4a13ae85e458833fe003d7.tar.gz -> bcache-tools-1.0.8_p20141204.tar.gz https://boostorg.jfrog.io/artifactory/main/release/1.79.0/source/boost_1_79_0.tar.bz2 https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v5.15.tar.xz https://www.busybox.net/downloads/busybox-1.34.1.tar.bz2 mirror://gnu/coreutils/coreutils-8.32.tar.xz https://www.kernel.org/pub/linux/utils/cryptsetup/v2.4/cryptsetup-2.4.1.tar.xz https://people.redhat.com/~heinzm/sw/dmraid/src/dmraid-1.0.0.rc16-3.tar.bz2 https://matt.ucc.asn.au/dropbear/releases/dropbear-2020.81.tar.bz2 https://dev.gentoo.org/~blueness/eudev/eudev-3.2.10.tar.gz https://github.com/libexpat/libexpat/releases/download/R_2_4_1/expat-2.4.1.tar.xz https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v1.46.4/e2fsprogs-1.46.4.tar.xz https://github.com/libfuse/libfuse/releases/download/fuse-2.9.9/fuse-2.9.9.tar.gz mirror://gnupg/gnupg/gnupg-1.4.23.tar.bz2 https://github.com/gentoo/hwids/archive/hwids-20210613.tar.gz https://github.com/open-iscsi/open-iscsi/archive/2.0.878.tar.gz -> open-iscsi-2.0.878.tar.gz https://s3.amazonaws.com/json-c_releases/releases/json-c-0.13.1.tar.gz https://www.kernel.org/pub/linux/utils/kernel/kmod/kmod-29.tar.xz https://releases.pagure.org/libaio/libaio-0.3.112.tar.gz mirror://gnupg/libgcrypt/libgcrypt-1.9.4.tar.bz2 mirror://gnupg/libgpg-error/libgpg-error-1.43.tar.bz2 https://github.com/besser82/libxcrypt/archive/v4.4.26.tar.gz -> libxcrypt-4.4.26.tar.gz https://mirrors.kernel.org/sourceware/lvm2/LVM2.2.02.188.tgz https://www.oberhumer.com/opensource/lzo/download/lzo-2.10.tar.gz https://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-4.1.tar.xz http://ftp.rpm.org/popt/releases/popt-1.x/popt-1.18.tar.gz https://github.com/strace/strace/releases/download/v5.14/strace-5.14.tar.xz https://github.com/jthornber/thin-provisioning-tools/archive/v0.9.0.tar.gz -> thin-provisioning-tools-0.9.0.tar.gz https://github.com/rpodgorny/unionfs-fuse/archive/v2.0.tar.gz -> unionfs-fuse-2.0.tar.gz https://www.kernel.org/pub/linux/utils/util-linux/v2.37/util-linux-2.37.2.tar.xz https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/xfsprogs-5.13.0.tar.xz https://tukaani.org/xz/xz-5.2.5.tar.gz https://zlib.net/zlib-1.2.11.tar.gz https://github.com/facebook/zstd/archive/v1.5.0.tar.gz -> zstd-1.5.0.tar.gz https://gitweb.gentoo.org/proj/genkernel.git/patch/?id=8c9de489290dc470e30f8c7d0aaa3456eb124537 -> genkernel-4.2.6-s390x.patch
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=9a5d79557a8999fdb02a5cd8256d8b04
+_md5_=b57ebb0f22138904b791eedda564f645
diff --git a/metadata/md5-cache/www-servers/Manifest.gz b/metadata/md5-cache/www-servers/Manifest.gz
index 040193d6402d..be9325c25ecb 100644
--- a/metadata/md5-cache/www-servers/Manifest.gz
+++ b/metadata/md5-cache/www-servers/Manifest.gz
diff --git a/metadata/md5-cache/www-servers/tomcat-10.0.23 b/metadata/md5-cache/www-servers/tomcat-10.0.23
new file mode 100644
index 000000000000..9ca32b899dc6
--- /dev/null
+++ b/metadata/md5-cache/www-servers/tomcat-10.0.23
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack
+DEPEND=dev-java/eclipse-ecj:4.15 dev-java/glassfish-xmlrpc-api:0 dev-java/jakartaee-migration:0 ~dev-java/tomcat-servlet-api-10.0.23:5.0 dev-java/wsdl4j:0 app-admin/pwgen dev-java/ant-core >=virtual/jdk-1.8:* test? ( dev-java/ant-junit:0 dev-java/easymock:3.2 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
+DESCRIPTION=Tomcat Servlet-5.0/JSP-3.0/EL-4.0/WebSocket-2.0/JASIC-2.0 Container
+EAPI=8
+HOMEPAGE=https://tomcat.apache.org/
+INHERIT=java-pkg-2 java-ant-2 prefix
+IUSE=extra-webapps doc source test
+KEYWORDS=~amd64 ~amd64-linux
+LICENSE=Apache-2.0
+RDEPEND=dev-java/eclipse-ecj:4.15 dev-java/glassfish-xmlrpc-api:0 dev-java/jakartaee-migration:0 ~dev-java/tomcat-servlet-api-10.0.23:5.0 dev-java/wsdl4j:0 acct-group/tomcat acct-user/tomcat virtual/jre >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=test !test? ( test )
+SLOT=10
+SRC_URI=mirror://apache/tomcat/tomcat-10/v10.0.23/src/apache-tomcat-10.0.23-src.tar.gz https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/6.2.0/biz.aQute.bnd-6.2.0.jar https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/6.2.0/biz.aQute.bndlib-6.2.0.jar
+_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	multilib	5ca4e49abed8e3a2f7b56920eadee157	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=6c0b034a8a7ac21052ec8d535344acd6
diff --git a/metadata/md5-cache/www-servers/varnish-6.5.2 b/metadata/md5-cache/www-servers/varnish-6.5.2
deleted file mode 100644
index b5806b01a678..000000000000
--- a/metadata/md5-cache/www-servers/varnish-6.5.2
+++ /dev/null
@@ -1,17 +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
-DEPEND=sys-libs/readline:0= dev-libs/libpcre[jit?] jemalloc? ( dev-libs/jemalloc ) sys-libs/ncurses:0= dev-python/docutils dev-python/sphinx virtual/pkgconfig
-DESCRIPTION=Varnish is a state-of-the-art, high-performance HTTP accelerator
-EAPI=7
-HOMEPAGE=https://varnish-cache.org/
-INHERIT=autotools systemd python-r1
-IUSE=jemalloc jit static-libs python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~ppc ~ppc64 x86
-LICENSE=BSD-2 GPL-2
-RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) sys-libs/readline:0= dev-libs/libpcre[jit?] jemalloc? ( dev-libs/jemalloc ) sys-libs/ncurses:0= acct-user/varnish acct-group/varnish sys-devel/gcc
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=test
-SLOT=0/2
-SRC_URI=http://varnish-cache.org/_downloads/varnish-6.5.2.tgz
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=8d6e9c71576cb4c4664571d282d76a63
diff --git a/metadata/md5-cache/www-servers/varnish-6.6.1 b/metadata/md5-cache/www-servers/varnish-6.6.1
deleted file mode 100644
index 578228ee8131..000000000000
--- a/metadata/md5-cache/www-servers/varnish-6.6.1
+++ /dev/null
@@ -1,17 +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
-DEPEND=sys-libs/readline:0= dev-libs/libpcre[jit?] jemalloc? ( dev-libs/jemalloc ) sys-libs/ncurses:0= dev-python/docutils dev-python/sphinx virtual/pkgconfig
-DESCRIPTION=Varnish is a state-of-the-art, high-performance HTTP accelerator
-EAPI=7
-HOMEPAGE=https://varnish-cache.org/
-INHERIT=autotools systemd python-r1
-IUSE=jemalloc jit static-libs python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~ppc ~ppc64 x86
-LICENSE=BSD-2 GPL-2
-RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) sys-libs/readline:0= dev-libs/libpcre[jit?] jemalloc? ( dev-libs/jemalloc ) sys-libs/ncurses:0= acct-user/varnish acct-group/varnish sys-devel/gcc
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=test
-SLOT=0/2
-SRC_URI=http://varnish-cache.org/_downloads/varnish-6.6.1.tgz
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=636d74cb8aca143dca0cc73d67f7bd7b
diff --git a/metadata/md5-cache/x11-apps/Manifest.gz b/metadata/md5-cache/x11-apps/Manifest.gz
index 1122c6dc0fa5..7915cbf680bb 100644
--- a/metadata/md5-cache/x11-apps/Manifest.gz
+++ b/metadata/md5-cache/x11-apps/Manifest.gz
diff --git a/metadata/md5-cache/x11-apps/mesa-progs-8.5.0 b/metadata/md5-cache/x11-apps/mesa-progs-8.5.0
index 63b636c36933..ea3dd72983cd 100644
--- a/metadata/md5-cache/x11-apps/mesa-progs-8.5.0
+++ b/metadata/md5-cache/x11-apps/mesa-progs-8.5.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://www.mesa3d.org/ https://mesa.freedesktop.org/ https://gitlab.freedesktop.org/mesa/demos
 INHERIT=meson-multilib
 IUSE=gles2 wayland X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2
 RDEPEND=media-libs/mesa[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,egl(+),gles2?,wayland?,X?] wayland? ( dev-libs/wayland[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
 SRC_URI=https://mesa.freedesktop.org/archive/demos/mesa-demos-8.5.0.tar.bz2 https://mesa.freedesktop.org/archive/demos/8.5.0/mesa-demos-8.5.0.tar.bz2
 _eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=50a4c8ee454f17974dcb5da19417c64a
+_md5_=a32e58a063eff8c1b43f3839fc286427
diff --git a/metadata/md5-cache/x11-apps/xclipboard-1.1.4 b/metadata/md5-cache/x11-apps/xclipboard-1.1.4
index ce8c010a66b9..efe8e66b9e7a 100644
--- a/metadata/md5-cache/x11-apps/xclipboard-1.1.4
+++ b/metadata/md5-cache/x11-apps/xclipboard-1.1.4
@@ -5,10 +5,10 @@ DESCRIPTION=interchange between cut buffer and selection
 EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/xclipboard
 INHERIT=xorg-3
-KEYWORDS=~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+KEYWORDS=amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc x86
 LICENSE=MIT
 RDEPEND=x11-libs/libXaw x11-libs/libxkbfile x11-libs/libXmu >=x11-libs/libXt-1.1 x11-libs/libX11
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/app/xclipboard-1.1.4.tar.xz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961	xorg-3	38a663574d97f06b6b729046865c8fb6
-_md5_=d6332c9399284b61c9d6c2e6b7b77572
+_md5_=09cb8464385667aba1ab1e995b8c5074
diff --git a/metadata/md5-cache/x11-apps/xcmsdb-1.0.6 b/metadata/md5-cache/x11-apps/xcmsdb-1.0.6
index 3472eec4abb9..f4ec59d5835c 100644
--- a/metadata/md5-cache/x11-apps/xcmsdb-1.0.6
+++ b/metadata/md5-cache/x11-apps/xcmsdb-1.0.6
@@ -5,10 +5,10 @@ DESCRIPTION=Device Color Characterization utility for X Color Management System
 EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/xcmsdb
 INHERIT=xorg-3
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86
 LICENSE=MIT
 RDEPEND=x11-libs/libX11
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/app/xcmsdb-1.0.6.tar.xz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961	xorg-3	38a663574d97f06b6b729046865c8fb6
-_md5_=ffb7b8b794d746794b4beb9e5c313c5d
+_md5_=fb53efb0be916837b59dc9816d96a993
diff --git a/metadata/md5-cache/x11-apps/xconsole-1.0.8 b/metadata/md5-cache/x11-apps/xconsole-1.0.8
index 0009692850dc..52416e763200 100644
--- a/metadata/md5-cache/x11-apps/xconsole-1.0.8
+++ b/metadata/md5-cache/x11-apps/xconsole-1.0.8
@@ -5,10 +5,10 @@ DESCRIPTION=monitor system console messages with X
 EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/xconsole
 INHERIT=xorg-3
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86
 LICENSE=MIT
 RDEPEND=x11-libs/libXaw x11-libs/libXmu x11-libs/libXt x11-libs/libX11
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/app/xconsole-1.0.8.tar.xz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961	xorg-3	38a663574d97f06b6b729046865c8fb6
-_md5_=e7e8ad17ed5bceb6904dd315d98b87f9
+_md5_=56fe4dee189806f069907e04728864de
diff --git a/metadata/md5-cache/x11-apps/xev-1.2.5 b/metadata/md5-cache/x11-apps/xev-1.2.5
index 79518903e71a..25047da7f7cc 100644
--- a/metadata/md5-cache/x11-apps/xev-1.2.5
+++ b/metadata/md5-cache/x11-apps/xev-1.2.5
@@ -5,10 +5,10 @@ DESCRIPTION=Print contents of X events
 EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/xev
 INHERIT=xorg-3
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-winnt
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x86-winnt
 LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXrandr
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/app/xev-1.2.5.tar.xz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961	xorg-3	38a663574d97f06b6b729046865c8fb6
-_md5_=7d29bda1efa17788a0d27429a10515dd
+_md5_=fec739bc0b0b30fe013c5e52f61ad05d
diff --git a/metadata/md5-cache/x11-apps/xfontsel-1.1.0 b/metadata/md5-cache/x11-apps/xfontsel-1.1.0
index dfe5d1688d7c..fadefc8b0b3c 100644
--- a/metadata/md5-cache/x11-apps/xfontsel-1.1.0
+++ b/metadata/md5-cache/x11-apps/xfontsel-1.1.0
@@ -5,10 +5,10 @@ DESCRIPTION=point and click selection of X11 font names
 EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/xfontsel
 INHERIT=xorg-3
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=MIT
 RDEPEND=x11-libs/libXaw x11-libs/libXmu x11-libs/libXt x11-libs/libX11
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/app/xfontsel-1.1.0.tar.xz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961	xorg-3	38a663574d97f06b6b729046865c8fb6
-_md5_=f737a9d177eb95bef656227bf76a1e10
+_md5_=6cbf2dc43c68708f7229ecc2d6d36aa5
diff --git a/metadata/md5-cache/x11-apps/xkbutils-1.0.5 b/metadata/md5-cache/x11-apps/xkbutils-1.0.5
index 07e6629882e8..6d8c33cf8075 100644
--- a/metadata/md5-cache/x11-apps/xkbutils-1.0.5
+++ b/metadata/md5-cache/x11-apps/xkbutils-1.0.5
@@ -5,10 +5,10 @@ DESCRIPTION=X.Org xkbutils application
 EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/xkbutils
 INHERIT=xorg-3
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86
 LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXt x11-libs/libXaw
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/app/xkbutils-1.0.5.tar.xz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961	xorg-3	38a663574d97f06b6b729046865c8fb6
-_md5_=7b44ca4ad557e37a1bd0bd5dcdad6f97
+_md5_=daf9efda183b3c70fa6e9187e0659e8c
diff --git a/metadata/md5-cache/x11-apps/xmag-1.0.7 b/metadata/md5-cache/x11-apps/xmag-1.0.7
index 6a453097a46a..a385ccee9e60 100644
--- a/metadata/md5-cache/x11-apps/xmag-1.0.7
+++ b/metadata/md5-cache/x11-apps/xmag-1.0.7
@@ -5,10 +5,10 @@ DESCRIPTION=X.Org xmag application
 EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/xmag
 INHERIT=xorg-3
-KEYWORDS=~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+KEYWORDS=amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc x86
 LICENSE=MIT
 RDEPEND=x11-libs/libXaw x11-libs/libXmu x11-libs/libXt x11-libs/libX11
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/app/xmag-1.0.7.tar.xz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961	xorg-3	38a663574d97f06b6b729046865c8fb6
-_md5_=c295cd673bfd30063a0f4c596847b12e
+_md5_=4d54f162302dd8e6a32458131ea86a04
diff --git a/metadata/md5-cache/x11-apps/xmessage-1.0.6 b/metadata/md5-cache/x11-apps/xmessage-1.0.6
index 9dc4e6b6e463..cc69cb7dd59e 100644
--- a/metadata/md5-cache/x11-apps/xmessage-1.0.6
+++ b/metadata/md5-cache/x11-apps/xmessage-1.0.6
@@ -5,10 +5,10 @@ DESCRIPTION=display a message or query in a window (X-based /bin/echo)
 EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/xmessage
 INHERIT=xorg-3
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=x11-libs/libXaw x11-libs/libXt
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/app/xmessage-1.0.6.tar.xz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961	xorg-3	38a663574d97f06b6b729046865c8fb6
-_md5_=bb29e6344b0830034428c8bef9aa1798
+_md5_=7bc184c0582c31ba961eda0df3c75d08
diff --git a/metadata/md5-cache/x11-apps/xmodmap-1.0.11 b/metadata/md5-cache/x11-apps/xmodmap-1.0.11
index d15efc011c89..aea935041336 100644
--- a/metadata/md5-cache/x11-apps/xmodmap-1.0.11
+++ b/metadata/md5-cache/x11-apps/xmodmap-1.0.11
@@ -5,10 +5,10 @@ DESCRIPTION=utility for modifying keymaps and pointer button mappings in X
 EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/xmodmap
 INHERIT=xorg-3
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=x11-libs/libX11
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/app/xmodmap-1.0.11.tar.xz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961	xorg-3	38a663574d97f06b6b729046865c8fb6
-_md5_=97e8c38999936d3658054ac46b6c30a9
+_md5_=f5263c5a1726e3d91cf1bc98667e1d2f
diff --git a/metadata/md5-cache/x11-apps/xpr-1.1.0 b/metadata/md5-cache/x11-apps/xpr-1.1.0
index 6740caf931f7..d8f3c5f8b0ba 100644
--- a/metadata/md5-cache/x11-apps/xpr-1.1.0
+++ b/metadata/md5-cache/x11-apps/xpr-1.1.0
@@ -5,10 +5,10 @@ DESCRIPTION=X.Org xpr application
 EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/xpr
 INHERIT=xorg-3
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86
 LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXmu
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/app/xpr-1.1.0.tar.xz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961	xorg-3	38a663574d97f06b6b729046865c8fb6
-_md5_=e2b04fc1fdadc1bc3a2fe44fe5812e3b
+_md5_=7898dfa7da5f113a0e30c85d7b7d0181
diff --git a/metadata/md5-cache/x11-apps/xrefresh-1.0.7 b/metadata/md5-cache/x11-apps/xrefresh-1.0.7
index c1ddeb7c37f8..59f5ca5ba8cf 100644
--- a/metadata/md5-cache/x11-apps/xrefresh-1.0.7
+++ b/metadata/md5-cache/x11-apps/xrefresh-1.0.7
@@ -5,10 +5,10 @@ DESCRIPTION=refresh all or part of an X screen
 EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/xrefresh
 INHERIT=xorg-3
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86
 LICENSE=MIT
 RDEPEND=x11-libs/libX11
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/app/xrefresh-1.0.7.tar.xz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961	xorg-3	38a663574d97f06b6b729046865c8fb6
-_md5_=5dbbf57fc16fa92ab104f56dd4604a09
+_md5_=fde65e29eb1cf9c0fd0fd2afb7c1812a
diff --git a/metadata/md5-cache/x11-apps/xwud-1.0.6 b/metadata/md5-cache/x11-apps/xwud-1.0.6
index 7d27fd5304fa..e0a16a5f748a 100644
--- a/metadata/md5-cache/x11-apps/xwud-1.0.6
+++ b/metadata/md5-cache/x11-apps/xwud-1.0.6
@@ -5,10 +5,10 @@ DESCRIPTION=image displayer for X
 EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/xwud
 INHERIT=xorg-3
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86
 LICENSE=MIT
 RDEPEND=x11-libs/libX11
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/app/xwud-1.0.6.tar.xz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961	xorg-3	38a663574d97f06b6b729046865c8fb6
-_md5_=a8058e04e86b3c41db5dfe8fcd0c6431
+_md5_=515d9576781a9bf40defc19ad39d68f4
diff --git a/metadata/md5-cache/x11-base/Manifest.gz b/metadata/md5-cache/x11-base/Manifest.gz
index 52786c2634ac..ebbb2f742d43 100644
--- a/metadata/md5-cache/x11-base/Manifest.gz
+++ b/metadata/md5-cache/x11-base/Manifest.gz
diff --git a/metadata/md5-cache/x11-base/xcb-proto-1.15.2 b/metadata/md5-cache/x11-base/xcb-proto-1.15.2
index 951c1c168584..4287c26297d7 100644
--- a/metadata/md5-cache/x11-base/xcb-proto-1.15.2
+++ b/metadata/md5-cache/x11-base/xcb-proto-1.15.2
@@ -5,11 +5,11 @@ EAPI=7
 HOMEPAGE=https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/proto/xcbproto
 INHERIT=python-r1 xorg-3
 IUSE=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=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 )
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/proto/xcb-proto-1.15.2.tar.xz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	xorg-3	38a663574d97f06b6b729046865c8fb6
-_md5_=13bdfd870831420a5421e686ae0f4d65
+_md5_=04377200d9bf65b9e8d1122b5ea78c96
diff --git a/metadata/md5-cache/x11-drivers/Manifest.gz b/metadata/md5-cache/x11-drivers/Manifest.gz
index 910ebacb2cd8..f170fd016de0 100644
--- a/metadata/md5-cache/x11-drivers/Manifest.gz
+++ b/metadata/md5-cache/x11-drivers/Manifest.gz
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-synaptics-1.9.2 b/metadata/md5-cache/x11-drivers/xf86-input-synaptics-1.9.2
index dccfce2a0a5a..f4e1def85dc8 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-synaptics-1.9.2
+++ b/metadata/md5-cache/x11-drivers/xf86-input-synaptics-1.9.2
@@ -5,10 +5,10 @@ DESCRIPTION=Driver for Synaptics touchpads
 EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/driver/xf86-input-synaptics
 INHERIT=linux-info xorg-3
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 x86
 LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.14 x11-libs/libX11 >=x11-libs/libXi-1.2 >=x11-libs/libXtst-1.1.0 kernel_linux? ( >=dev-libs/libevdev-0.4 ) x11-base/xorg-server:= >=x11-base/xorg-server-1.20[xorg]
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/driver/xf86-input-synaptics-1.9.2.tar.xz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961	xorg-3	38a663574d97f06b6b729046865c8fb6
-_md5_=cfae61685d5a78f733d95b33ca1a43e5
+_md5_=bfa25366e310909d722fd587c7594283
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-mga-2.0.1 b/metadata/md5-cache/x11-drivers/xf86-video-mga-2.0.1
index 1dcb10233f2f..cdf2eb9aee7b 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-mga-2.0.1
+++ b/metadata/md5-cache/x11-drivers/xf86-video-mga-2.0.1
@@ -5,10 +5,10 @@ DESCRIPTION=Matrox video driver
 EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/driver/xf86-video-mga
 INHERIT=xorg-3
-KEYWORDS=~alpha ~amd64 ~ia64 ~loong ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~ia64 ~loong ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=x11-base/xorg-server:= >=x11-base/xorg-server-1.20[xorg] >=x11-libs/libpciaccess-0.14
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/driver/xf86-video-mga-2.0.1.tar.xz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961	xorg-3	38a663574d97f06b6b729046865c8fb6
-_md5_=a56cb4eda7bcd3cbd44eb6e5b3a19b10
+_md5_=c4b7f1318a42b7e076c8d05c6a454595
diff --git a/metadata/md5-cache/x11-libs/Manifest.gz b/metadata/md5-cache/x11-libs/Manifest.gz
index e80c2d7f2ec7..e8bc78b364fd 100644
--- a/metadata/md5-cache/x11-libs/Manifest.gz
+++ b/metadata/md5-cache/x11-libs/Manifest.gz
diff --git a/metadata/md5-cache/x11-libs/libX11-1.8.1 b/metadata/md5-cache/x11-libs/libX11-1.8.1
index 86c137b6886a..ac2a0635ec73 100644
--- a/metadata/md5-cache/x11-libs/libX11-1.8.1
+++ b/metadata/md5-cache/x11-libs/libX11-1.8.1
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/lib/libX11
 INHERIT=toolchain-funcs xorg-3
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 doc
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=MIT
 RDEPEND=>=x11-libs/libxcb-1.11.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-misc/compose-tables !<xfce-base/xfce4-settings-4.16.3
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/lib/libX11-1.8.1.tar.xz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	xorg-3	38a663574d97f06b6b729046865c8fb6
-_md5_=a2b475681fac1fcc1fcf5f00580c2d21
+_md5_=f324698fa2d35a8536b119340b34d51d
diff --git a/metadata/md5-cache/x11-libs/libdrm-2.4.112 b/metadata/md5-cache/x11-libs/libdrm-2.4.112
index 28084fcfdee0..4a2e8e76104f 100644
--- a/metadata/md5-cache/x11-libs/libdrm-2.4.112
+++ b/metadata/md5-cache/x11-libs/libdrm-2.4.112
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://dri.freedesktop.org/ https://gitlab.freedesktop.org/mesa/drm
 INHERIT=python-any-r1 meson-multilib
 IUSE=video_cards_amdgpu video_cards_exynos video_cards_freedreno video_cards_intel video_cards_nouveau video_cards_omap video_cards_radeon video_cards_tegra video_cards_vc4 video_cards_vivante video_cards_vmware valgrind abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://dri.freedesktop.org/libdrm/libdrm-2.4.112.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=2fabe0d3c5013566db5262ff33bd33fe
+_md5_=5008f576a9f332b8fed171a54fb93d19
diff --git a/metadata/md5-cache/x11-libs/libxcb-1.15-r1 b/metadata/md5-cache/x11-libs/libxcb-1.15-r1
index de7e8c3a8443..2a0e994179fc 100644
--- a/metadata/md5-cache/x11-libs/libxcb-1.15-r1
+++ b/metadata/md5-cache/x11-libs/libxcb-1.15-r1
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/lib/libxcb
 INHERIT=python-any-r1 xorg-3
 IUSE=doc selinux test +xkb abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 doc
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=>=x11-libs/libXau-1.0.7-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXdmcp-1.1.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=!test? ( test )
 SLOT=0/1.12
 SRC_URI=https://www.x.org/releases/individual/lib/libxcb-1.15.tar.xz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	xorg-3	38a663574d97f06b6b729046865c8fb6
-_md5_=bdf9ade348fe4de0855d71a9de87a8ed
+_md5_=a728dfee378d04eca6ab7b36e6f20455
diff --git a/metadata/md5-cache/x11-libs/libxcvt-0.1.2 b/metadata/md5-cache/x11-libs/libxcvt-0.1.2
index d47c488742b5..e6b15daeb67f 100644
--- a/metadata/md5-cache/x11-libs/libxcvt-0.1.2
+++ b/metadata/md5-cache/x11-libs/libxcvt-0.1.2
@@ -4,10 +4,10 @@ DESCRIPTION=X.Org xcvt library and cvt program
 EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/lib/libxcvt
 INHERIT=xorg-3 meson
-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=!<x11-base/xorg-server-1.20.11-r3
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/lib/libxcvt-0.1.2.tar.xz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961	xorg-3	38a663574d97f06b6b729046865c8fb6
-_md5_=e01c0d72dcc7088b38556fd596631beb
+_md5_=43e012f606be77f516b99161a17b39b7
diff --git a/metadata/md5-cache/x11-libs/xcb-util-cursor-0.1.3-r4 b/metadata/md5-cache/x11-libs/xcb-util-cursor-0.1.3-r4
index e31ad197eadc..2a13842d9e22 100644
--- a/metadata/md5-cache/x11-libs/xcb-util-cursor-0.1.3-r4
+++ b/metadata/md5-cache/x11-libs/xcb-util-cursor-0.1.3-r4
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/lib/libxcb-cursor
 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 ~sparc-solaris ~x64-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris
 LICENSE=MIT
 RDEPEND=>=x11-libs/libxcb-1.9.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/xcb-util-image-0.3.9-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/xcb-util-renderutil-0.3.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(-)?]
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/xcb/xcb-util-cursor-0.1.3.tar.bz2
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	xorg-3	38a663574d97f06b6b729046865c8fb6
-_md5_=902e2a568af0f0a7f1fb18ef136a597a
+_md5_=ec629ff6695fd9db58373037557077fb
diff --git a/metadata/md5-cache/x11-misc/Manifest.gz b/metadata/md5-cache/x11-misc/Manifest.gz
index 9b9320ebf545..2c372542269d 100644
--- a/metadata/md5-cache/x11-misc/Manifest.gz
+++ b/metadata/md5-cache/x11-misc/Manifest.gz
diff --git a/metadata/md5-cache/x11-misc/compose-tables-1.8.1 b/metadata/md5-cache/x11-misc/compose-tables-1.8.1
index f84c90f1e8db..84a33f360b4e 100644
--- a/metadata/md5-cache/x11-misc/compose-tables-1.8.1
+++ b/metadata/md5-cache/x11-misc/compose-tables-1.8.1
@@ -5,10 +5,10 @@ DESCRIPTION=X.Org Compose Key tables from libX11
 EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/util/compose-tables
 INHERIT=xorg-3
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=MIT
 RDEPEND=!<x11-libs/libX11-1.7.0
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/lib/libX11-1.8.1.tar.xz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	xorg-3	38a663574d97f06b6b729046865c8fb6
-_md5_=f5dd1b069b42221ab4c4c0f0ea229e49
+_md5_=33c8e5ca8129a4da680bdb71c7788b57
diff --git a/metadata/md5-cache/x11-themes/Manifest.gz b/metadata/md5-cache/x11-themes/Manifest.gz
index e953ed0ee586..900561c6c3c5 100644
--- a/metadata/md5-cache/x11-themes/Manifest.gz
+++ b/metadata/md5-cache/x11-themes/Manifest.gz
diff --git a/metadata/md5-cache/x11-themes/gentoo-xcursors-0.3.2-r2 b/metadata/md5-cache/x11-themes/gentoo-xcursors-0.3.2-r2
index 143df05e1b53..9e65cee32af6 100644
--- a/metadata/md5-cache/x11-themes/gentoo-xcursors-0.3.2-r2
+++ b/metadata/md5-cache/x11-themes/gentoo-xcursors-0.3.2-r2
@@ -2,8 +2,8 @@ DEFINED_PHASES=install postinst
 DESCRIPTION=A high quality set of animated mouse cursors
 EAPI=8
 HOMEPAGE=https://schlomp.space/tastytea/gentoo-xcursors
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://schlomp.space/tastytea/gentoo-xcursors/archive/0.3.2.tar.gz -> gentoo-xcursors-0.3.2.tar.gz
-_md5_=041a52667e8d833eeeddaf9e6e7b574e
+_md5_=c8954314e4611401be16b110b0c49ea7
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index e0e086dccb0e..728a337e9b44 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 13864 BLAKE2B 373887a06bb63946485d0b9e08e52b3b3c3fbeda530b58fbe19569ccedfd0a8f7c63f073261fcef68edcbf9331108cf543382117b2f60c464926fff49fff9e18 SHA512 b3adafe44390700af75c3b98d6b21ba11902c1f2033fb07a8064382a68a6b6c023b73b318e0a8159e5911175172732771aae9261f870aee90bb5b6e69de3f24d
-TIMESTAMP 2022-07-26T12:39:55Z
+TIMESTAMP 2022-07-26T18:39:56Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLf4JtfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLgNPxfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDFDA/5AdP/nabWHbkLcGSZmG26k36pKXXkPVr/eOmREfPmvMK7V+z4aaSa85jW
-JC6wiCXyEgTpBs8L4yFB/jeOy1xp0/a/0SFOBfcR4U7HZbeszcctfsTQyOazR/Yd
-aHTWROGQxAOGkauk1Mf1GTPN47joulsOC/W/zoZ1eAoPfCPRoZTRXUsz9f5ZtdMi
-z9ZXh8Gvooh6/FHxsCl+7M0uZbDxvp7kA8umv2j3ZcpljwEZB5MXB5470JaTMB/j
-CXv/Jnkb+dzY16UbDD+J61g93kUqpFo02sHER+f+eTrdN65vWjPf6KeHDUjnkkTf
-Q4MGuHV14i1DZ8Cq64tKrHeiH/ZJq090t0WJr0XetptPhJ4SEChJ6sGc+QHhjQJ9
-ggyF6DIXwofsvUaNl6wTPbBdNJ4tRrOqxE8VhB4KaXj9/BaPm5+4hoIGB+1NuR3N
-DA5/n9JpWiY6UieN/akZ8ZaiAik2PcJMfy6yHDWae3fGaWXhX+Ee6pfzyTO6yEbz
-etiqxnJJ/Kb93WJeaEWrKE8iz7NfEB9pd52YCQd2cu4Nl01bNFWI37DJ8fWcxWQl
-GQ9J+ESKAmf96AqY3hnJWJe7ytdDWeVHu13j0nbvpXtaZfHnR1DOxHceOlQKXPTA
-jCjgz47t68LnIVq/Vut8vCB9Gu47iGWF0blEeI4Fh7c4VSeNh3E=
-=RZWM
+klBaTg//So6X3xD6UvuX+oD5XnabSmaW3vT9i28c8iUUavhIOeMm/M52jgjOmg/J
+QeYrDngtNjbQp3zuETFA+Eq/QbFer8Hktw/7OY9H7cxOKH1XUC65VJ7m54MW0bEB
+9MGF3E30uwryXN/kBZz7tOBTK1o47MgkBwJqNlGiPI2af9aBFr/zDLCYqismevIB
+5U3g7GldpxnwlUQG6Hi94ZAoPveKgBp70tWNSXIIooKw7rNDVqCAtCtzrR06Sus6
+nvO950/+GIP5h2ln0dqHpJYSUkFJXrO6XMahPjYP/27oCeSCce6YM9Nui0ZZNvry
+Fefo/57cb3xBfWJdn55uqT5zUl3w3wtNkGeuO6hAEZZm+HfGes4kLF8FctRXktcx
+T/xSNs9/j276FxvPI8MXNC0/28kkMqe7q1worhxWPNtxX33RaavxUjBKxtktIbaw
+ztelPIW3FJkVo5GAAjtF4pEC9otqMuYBWyEolhcy76gqqw09+6okbJrP02Am5a+N
+Y2oHUgG6wBEn54uQQtu9Qn4I1VDTo2O3mSLlUmQIv5HsaiuVsoa4VE6S1Dk7DgNH
+6RUuTMkt0DYyIKuP/ugUFPzHevU01qEE+y2mabz4E5tOydC61mMca/ZFXZybxgfY
+KA85QEAohe/v6J+avSmyYaEh0pOSfqdqrHbyxXEWV4KOa3upQmo=
+=4dXf
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 938e4b3a3007..53e0e507e958 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Tue, 26 Jul 2022 12:39:52 +0000
+Tue, 26 Jul 2022 18:39:53 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 3c30646c34c6..6fa9048f2ff7 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Tue Jul 26 12:39:52 PM UTC 2022
+Tue Jul 26 06:39:53 PM UTC 2022
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index b807571d5052..5e87d61eb814 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Tue, 26 Jul 2022 12:45:01 +0000
+Tue, 26 Jul 2022 18:45:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index aab01d051a6f..7180d7340e70 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-4b1c6eda6e605d70cd9ddbaa46abd212e34b5273 1658837693 2022-07-26T12:14:53+00:00
+6d2f7a4beb99df90112c9d51a68c5ecb982ec16d 1658858550 2022-07-26T18:02:30+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 7a95f3200037..c009ebe77884 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1658839201 Tue 26 Jul 2022 12:40:01 PM UTC
+1658860802 Tue 26 Jul 2022 06:40:02 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 938e4b3a3007..53e0e507e958 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Tue, 26 Jul 2022 12:39:52 +0000
+Tue, 26 Jul 2022 18:39:53 +0000
diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index 05854418bbcd..f427e8e28081 100644
--- a/net-dns/Manifest.gz
+++ b/net-dns/Manifest.gz
diff --git a/net-dns/libidn/Manifest b/net-dns/libidn/Manifest
index faba9ca4446f..f65e84fdafc4 100644
--- a/net-dns/libidn/Manifest
+++ b/net-dns/libidn/Manifest
@@ -7,5 +7,5 @@ DIST libidn-1.41.tar.gz 2664011 BLAKE2B 6c632c2010f024792fd55d3c8e6f68e81152fa74
 DIST libidn-1.41.tar.gz.sig 228 BLAKE2B 004aa8871afa7cbb45206d8ddcc7ade21ea165aae2b00fc0c1d22cf05079bb399c8df628dc43bc0eb93c82524b96c71ad694c38234fdc2a4df09dc5192ca57bb SHA512 5d1dca4493cf4af420ba326b867e50e618432ce2808dde60a5325e1c64a6408dcb09d9b104c64d34e2726b9903c06b112ffc040fb6bb3818ae4ddf1551228c1c
 EBUILD libidn-1.38-r1.ebuild 2754 BLAKE2B 60a05c67696e524fa72dacc65f87dad0f6e12b644f8d4768edc08c4c890f07b462d95693c8eb06d549b08f2410f93929bbea9a99cc77038a7785be1a75a23be2 SHA512 a0fca0f8eef6ab0548cc44f5d4c967d351c3ebd1ddd7a2378a48f5c0354e6c9b8b389eaf6280b2c7ea15c8b52e5b589897746459a738c2fca9a3557fd8f1e584
 EBUILD libidn-1.40.ebuild 2361 BLAKE2B 467ee579c351de9daa97dbb1fb0ee0bb94c865b94f13197fccd1f37e37e697c956dd391d859d2e5dfbd70a8e0adca554131231d559cd82c0cb60917657d52974 SHA512 48c181756b1274e478753501210ad16f5f0f7e03655cfb8d229f4e9dd8be9a97ec4ab05928ad2264b7f7cdefb89674c814542e4c7936fa51100370d17df683f7
-EBUILD libidn-1.41.ebuild 2359 BLAKE2B c8dd29f5b77e6ef5221709e7f38612d59a5b35e61199f1d39e9f868d573f81c6abf0400c6f506f556342510132d2ca1683484704d4db41831cd80af5bb9174d2 SHA512 041f0921c67962d468d0fb5e5853b65d794bbc5ac3ad6e0e259b0f9c715b1fec8566d5ff6ee9f99ec2b2563c8d6b10d2bcdcbad6731ee87a475524d57acbaca6
+EBUILD libidn-1.41.ebuild 2354 BLAKE2B 3f81ba7a4612e935a9a88a74e66943ceb51d3f8dbd0b3143776f2380315552fd2583c4b7f4176f7a0285e10bd3164e2aaefdbf6f0559bb3b4abe0e33ac125151 SHA512 459c57f473e9ec224e45608c3e6eae6449f59f0f261fb938425352aea9c1639a5f1cb6b1df6db67d6d16f09e70157d9469694cba4d129322c63287c6823e9371
 MISC metadata.xml 426 BLAKE2B a3889b6550cebbe1169df18abe906a9f3afb6a1074984ca152e6b069f721f1313834ac05014392912a635af02c49b2f828561eaa647e41148dffc7a9e4db5dbc SHA512 9ea65dc9e949ce6218a73c3ef4c54ff2801cbe740910129f1265e6c48b1c78dcf50653c5baf9b3a5d44983f595295b09a096ee5e2fee0fff646c6f8ccc26765c
diff --git a/net-dns/libidn/libidn-1.41.ebuild b/net-dns/libidn/libidn-1.41.ebuild
index 2ba0b9e0d7a6..649305566f62 100644
--- a/net-dns/libidn/libidn-1.41.ebuild
+++ b/net-dns/libidn/libidn-1.41.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/libidn/${P}.tar.gz
 
 LICENSE="GPL-2 GPL-3 LGPL-3"
 SLOT="0/12"
-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="emacs nls"
 
 DEPEND="nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )"
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 479f1d9f9e89..c73b0e4123c7 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/nextcloud-client/Manifest b/net-misc/nextcloud-client/Manifest
index ca51450dec0a..f66e4b813b37 100644
--- a/net-misc/nextcloud-client/Manifest
+++ b/net-misc/nextcloud-client/Manifest
@@ -1,3 +1,3 @@
 DIST nextcloud-client-3.5.2.tar.gz 15433543 BLAKE2B 082031ac34a644f0db09679ef34237ee8fc9def88ff4659ad4a71e3ac611b3be3f9a0750deda25cd0ef34aca7e9d3c60fe7d3fc5a4d747eef46978e2fe84b742 SHA512 2892c277466869e3872a68049541c3d5afe94ca4dde1e97ea13ac615adedba198946763b5ff5dcb4694a9cec1946e35d1d6b6fd950d26b23cd6ddd94181f4b83
-EBUILD nextcloud-client-3.5.2.ebuild 2355 BLAKE2B b5c9f8a5929edba0b29082d4407797b1186e829896a2e59aef958be261e4c7332dd3fe1e836b32884bdd6070a90a62a5252a953191b8d635090973462ac9cf69 SHA512 f020af2c04bd42c2a6979e390a904aad28f4164bde2f4693df68512802af8e5dea55ed2e6ba0b41748d9934b95b2a5e1f536242589a5b6d57f2c920bea8473ec
+EBUILD nextcloud-client-3.5.2.ebuild 2325 BLAKE2B 210232aa19801f2eba06f956ebf725eaa7eef552167b6a4253354362f29f763d1633740683d7b05bc2fef46ed803688a77b896a7198c81724bdc23ea01132de7 SHA512 250fa76d1da6da6ba842c3e448747c8682bcc533ccb3063d659527900cbdd1d81ff184ee1e007c84cac6241a20d8e8e2ca84b4224cb4b0be02d79e1f25d7a6ea
 MISC metadata.xml 712 BLAKE2B 423b16fa8879b0bc21d8ff1c692e5e592f571b5d69dcdd35fe79dae08b770c0d5beb2cbf71af2e7410d1dfd6917d15bac0482a84a40ce602ab03ab0f59940355 SHA512 2cfeff27549192c2aaa9c64369545e75b3a056c123d7647c96505dd410490230027401961e95ef88c93b0485393bd54aa11ddc922bcaf2782f9e68a2d8d17b32
diff --git a/net-misc/nextcloud-client/nextcloud-client-3.5.2.ebuild b/net-misc/nextcloud-client/nextcloud-client-3.5.2.ebuild
index fcca8e8efa4d..d44483e6593b 100644
--- a/net-misc/nextcloud-client/nextcloud-client-3.5.2.ebuild
+++ b/net-misc/nextcloud-client/nextcloud-client-3.5.2.ebuild
@@ -8,6 +8,7 @@ inherit cmake virtualx xdg
 DESCRIPTION="Desktop Syncing Client for Nextcloud"
 HOMEPAGE="https://github.com/nextcloud/desktop"
 SRC_URI="https://github.com/nextcloud/desktop/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/desktop-${PV/_/-}"
 
 LICENSE="CC-BY-3.0 GPL-2"
 SLOT="0"
@@ -15,7 +16,7 @@ KEYWORDS="amd64 ~arm64 x86"
 IUSE="doc dolphin nautilus test webengine"
 RESTRICT="!test? ( test )"
 
-COMMON_DEPEND="
+RDEPEND="
 	>=dev-db/sqlite-3.34:3
 	>=dev-libs/openssl-1.1.0:0=
 	dev-libs/qtkeychain:=[qt5(+)]
@@ -36,9 +37,7 @@ COMMON_DEPEND="
 	nautilus? ( dev-python/nautilus-python )
 	webengine? ( dev-qt/qtwebengine:5[widgets] )
 "
-DEPEND="
-	${COMMON_DEPEND}
-	dev-qt/linguist-tools:5
+DEPEND="${RDEPEND}
 	dev-qt/qtconcurrent:5
 	dev-qt/qtxml:5
 	|| ( gnome-base/librsvg media-gfx/inkscape )
@@ -48,15 +47,15 @@ DEPEND="
 		dev-texlive/texlive-latexextra
 		virtual/latex-base
 	)
-	dolphin? ( kde-frameworks/extra-cmake-modules )
 	test? (
-		dev-util/cmocka
 		dev-qt/qttest:5
+		dev-util/cmocka
 	)
 "
-RDEPEND="${COMMON_DEPEND}"
-
-S="${WORKDIR}/desktop-${PV/_/-}"
+BDEPEND="
+	dev-qt/linguist-tools:5
+	dolphin? ( kde-frameworks/extra-cmake-modules )
+"
 
 src_prepare() {
 	# We do not package libcloudproviders
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index a4b6db955408..eee799d43f85 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/opencascade/Manifest b/sci-libs/opencascade/Manifest
index 2030d8988935..f0f17e7ada1e 100644
--- a/sci-libs/opencascade/Manifest
+++ b/sci-libs/opencascade/Manifest
@@ -15,5 +15,5 @@ DIST opencascade-7.6.2.tar.gz 48207505 BLAKE2B 62d0015fdd6321036c4be02214730da46
 EBUILD opencascade-7.5.2-r6.ebuild 4937 BLAKE2B 7e864ea1414609e1475b222628d880142496e3e0cb0d5d1dbc850d92a484a17f2c7287b3d214ee9bf6d11ea11a2bbb427b8d28ccd6efafbc4b94de5747f56b1e SHA512 f689e21037b0aef011b2e9946d498eeaf52161e286a4112976c534f043e5aeab50a18fe67f49599a990d89c660cc37df4fde638657faa7e258774efad56d4ec2
 EBUILD opencascade-7.5.3-r8.ebuild 4970 BLAKE2B dec350db72a38f08fd6ceea88994219b504637cd2f62f4a5eae147c7c79617ccb1213e25ec9d2b77acde5e70e87b82ae4fd9667bd2d1c572031878e5214da002 SHA512 aa50be18383db9144e7bf791e08a3b6e2b5bae3ea194db7480429bfb62a6cc8697aecba29b3539c2ae4ff9093750fc1e56c253b0df65ace5e4c385f1b2db5025
 EBUILD opencascade-7.6.1-r2.ebuild 4676 BLAKE2B 5bda6fc2f7848ec7a0656a1b76c1a6dfd63490c50c3ca10619daff3a3428a3b6f9ef489b9da00bef1ac47021dc8e9363e71aee7759e435e1a9007400f8c4dc51 SHA512 67a2480662dcecf1e3413e80c37d2f5c79f560cf1a5e346a0cc574321b0319938d8b00ecc4c2db27b7e3147fbd8c4f1ea64ec66dfa290a0dd6bb5fe61f0a309a
-EBUILD opencascade-7.6.2-r1.ebuild 4695 BLAKE2B 33d27519fa153a40499d8963c44382c424151b8b84e04e96ddd5b0e224fb6da5bfe9022a8c95591a67d62056998b310ce243be8fd6d818de5a8008f91ec6af61 SHA512 e14048fef6b3e3889eb5b74d16c0e7fc7c6819dbde1f38d9564367aaee114c3c9ec6435b782ad8e7d153d82928157f850b4e48bdbde1a018aa0df471889ddecf
+EBUILD opencascade-7.6.2-r1.ebuild 4694 BLAKE2B 587eca1709ce95ecaccdc573420e71f8e158466d04ed1f421b2aa4879831865f1210ad394c519c39fa75b9e4208066ba5f9620dbbb38ab9c21b7c00b31d25e7c SHA512 1f53e149b69b2ee9c8c801dc7d026155fdbafd080f65349d24c0c364620676940cc4627e5c80f12d9593cca39b386921bd5758a9ee298b89c4b8c66df28b511d
 MISC metadata.xml 1102 BLAKE2B 8569899b7ab437a4115ced11d3421f063d99233ed81bb5360228e580b20af2ee9753b41a8b3cb1291550160fa627058d915fde0e23514dcbed0f9cddc961ae11 SHA512 e9a38c41beec8eb54d6b9232447df3bc05635318f8dc727ddebc5f13be4d58b8d10576ddbb07a9fef41ba2adeb7ba1abcb4e10087b4711c4ff348d873c4916a8
diff --git a/sci-libs/opencascade/opencascade-7.6.2-r1.ebuild b/sci-libs/opencascade/opencascade-7.6.2-r1.ebuild
index 7773a90fb9f2..30553c491ea0 100644
--- a/sci-libs/opencascade/opencascade-7.6.2-r1.ebuild
+++ b/sci-libs/opencascade/opencascade-7.6.2-r1.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/occt-V${MY_PV}"
 
 LICENSE="|| ( Open-CASCADE-LGPL-2.1-Exception-1.0 LGPL-2.1 )"
 SLOT="0/${MY_SLOT}"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~riscv ~x86"
 IUSE="doc eigen examples ffmpeg freeimage gles2 json optimize tbb vtk"
 
 REQUIRED_USE="?? ( optimize tbb )"
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index fee854ff90d8..2c0fae512413 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/pmount/Manifest b/sys-apps/pmount/Manifest
index 400a46867a31..14ef6169d818 100644
--- a/sys-apps/pmount/Manifest
+++ b/sys-apps/pmount/Manifest
@@ -5,6 +5,5 @@ AUX pmount-0.9.99_alpha-locale-regex.patch 753 BLAKE2B a79805f883143f6beea9597ab
 AUX pmount-0.9.99_alpha-missing-includes.patch 1522 BLAKE2B d1adc8c74fb67010df912eaa650f6d06fb0dab513edbcce403834b9679cb95c56681f6785bc1a8bdc306335c49339384e912de51550d062ef595733bda77bd97 SHA512 5457a641e5a40c90119d25d835757d7f4ed127cc36838715ddb6d957b83b3dddb5fb0357cfef7fe0b4b6133249476fc585a8d78cda1057debf9576c316df8ddc
 AUX pmount.bash-completion 2935 BLAKE2B 8d89d6098764dbbbddcdc45e3aaac377eb71ead5ca0ea3f44b9eda1dbe1573e3cde154d51b9486903c6fe104948af1ad29031837375953239956651efff7dfad SHA512 b57a37afc2a124c6a4f19924a367d03b315e93575d0b152acde06e43c7dcd1b3d5df46c02d2e5ceef35911edb4f96d1d4113fb6d7cd1e9531fd9840c3729f924
 DIST pmount_0.9.99-alpha.orig.tar.bz2 364282 BLAKE2B a023d75623374186fb2de07bf1a41b01b2fc2570f9560b8bddec04441ffd083c6a0ece32b53db4e6067d181269f74cb7044f2c60bffece4b0e4c8dba9f1611b5 SHA512 12105674f099afb82302c0960f4f50a4bc75382071940e897d9c65b57a0f4de1fafdaa2a4c05f0fa5cba55453ae0c21376b9891353cad1afa88e5fbd9f63d5e9
-EBUILD pmount-0.9.99_alpha-r6.ebuild 2091 BLAKE2B 1765473acb740cad9ec5d9fd44f31b2742b82ff375156824cc7fb34b921b767cfa5887558e7ffedf04df3cd3afbfae78f3ff7a4ee4898768a38fad659fc4bd5c SHA512 93ea2e28487a0fd771afc81f0d413dbeaeb63d3337b849976b035efb4e3666f148cce9d9fd871991e2e4073c47910c23a962677919bec161b4e3ce31d638fc63
-EBUILD pmount-0.9.99_alpha-r7.ebuild 2272 BLAKE2B ccf336c0d83f9b5e15beb4ba1fdb7f0b2e7a4c0c3b6ef8f57c16236b3e31ec47fa3437f7fe6e2bfe23378b6a636a372639c56fcb676fde69d8303a39ac288561 SHA512 9bf83ab72e7ab850427726d1c69c7a19b08d811fc2310eab619833909b2cbe49b6d3e53a0ca9ff9b6bc51c259e6cce30c55b4d8b1e33b2ead650dd6e4e77a42b
-MISC metadata.xml 435 BLAKE2B 66040336d89bbeae61ac4385f1744bff6cd3f0275efae4c57df0dc6a9a74a0594a046e25092b21273b83cd80ee86f29963702063ee3b9ef73a3f6d6ff9fd7289 SHA512 c1f52d17d0922fe6809259d0394453110c796e94114e348a70e32e5af134a843c7a4b2bb61ca67361a2dc1e8e7c41822cffe7118590b63eeb7afcd285816d341
+EBUILD pmount-0.9.99_alpha-r7.ebuild 2268 BLAKE2B 37a7f6aa3c8ab73ac39b3c226644db0a34c1af064ed9a9049741d5569b1b33709783c79cbf07f44bcae1587b7382333c68063b311c9d28f098e1a5a081a553ff SHA512 0c134102d72173ae0d2f0d3916eb2c8b2b900edb602e5f022ffed4be5f342ec49f30796abe246b69f2088fbcca71c53d95faa397be81a625a21ba0dfb597ad33
+MISC metadata.xml 327 BLAKE2B fbd0a551a83863265076b78637b77639b843e7298626ff5ac3d8f7aca6a954e4148e45715a7b83a45f1e3fec3d3ef1a60023b4d5b2c3a475eb91d780dbeebc31 SHA512 3a28a12ce5955d5a3a389f6a934df94ba3438d887075f17d5c5ca19752d3d9a580f4b31b203bf2fffd78afa136a879f338ea4af7c90c344a10acdcae0847f5ba
diff --git a/sys-apps/pmount/metadata.xml b/sys-apps/pmount/metadata.xml
index d68bf71a665d..f3723215f16a 100644
--- a/sys-apps/pmount/metadata.xml
+++ b/sys-apps/pmount/metadata.xml
@@ -5,10 +5,6 @@
 		<email>slashbeast@gentoo.org</email>
 		<name>Piotr Karbowski</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>mgorny@gentoo.org</email>
-		<name>Michał Górny</name>
-	</maintainer>
 	<upstream>
 		<remote-id type="launchpad">pmount</remote-id>
 	</upstream>
diff --git a/sys-apps/pmount/pmount-0.9.99_alpha-r6.ebuild b/sys-apps/pmount/pmount-0.9.99_alpha-r6.ebuild
deleted file mode 100644
index 1d336844462f..000000000000
--- a/sys-apps/pmount/pmount-0.9.99_alpha-r6.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit bash-completion-r1
-
-DESCRIPTION="Policy based mounter that gives the ability to mount removable devices as a user"
-HOMEPAGE="https://launchpad.net/pmount"
-SRC_URI="mirror://debian/pool/main/p/${PN}/${PN}_${PV/_/-}.orig.tar.bz2"
-S=${WORKDIR}/${P/_/-}
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 sparc x86"
-IUSE="crypt"
-
-RDEPEND="
-	acct-group/plugdev
-	>=sys-apps/util-linux-2.17.2
-	crypt? ( >=sys-fs/cryptsetup-1.0.6-r2 )"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	sys-devel/gettext"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.9.19-testsuite-missing-dir.patch
-	"${FILESDIR}"/${P}-locale-regex.patch
-	"${FILESDIR}"/${P}-exfat-support.patch
-	"${FILESDIR}"/${P}-limits-musl.patch
-)
-
-src_prepare() {
-	# Restore default value from pmount <= 0.9.23 wrt #393633
-	sed -i -e '/^not_physically_logged_allow/s:=.*:= yes:' etc/pmount.conf || die
-
-	cat <<-EOF > po/POTFILES.skip || die
-	src/conffile.c
-	src/configuration.c
-	src/loop.c
-	EOF
-
-	default
-}
-
-src_configure() {
-	econf --disable-hal
-}
-
-src_test() {
-	local testdir=${S}/tests/check_fstab
-
-	ln -s a "${testdir}/b" &&
-		ln -s d "${testdir}/c" &&
-		ln -s c "${testdir}/e" ||
-		die "Unable to create fake symlinks required for testsuite"
-
-	emake check
-}
-
-src_install() {
-	# Must be run SETUID+SETGID, bug #250106
-	exeinto /usr/bin
-	exeopts -m 6710 -g plugdev
-	doexe src/{p,pu}mount
-
-	dodoc AUTHORS ChangeLog TODO
-	doman man/{{p,pu}mount.1,pmount.conf.5}
-
-	insinto /etc
-	doins etc/pmount.{allow,conf}
-
-	keepdir /media #501772
-
-	newbashcomp "${FILESDIR}/${PN}.bash-completion" "${PN}"
-	bashcomp_alias pmount pumount
-}
-
-pkg_postinst() {
-	elog
-	elog "This package has been installed setuid and setgid."
-
-	elog "The permissions are as such that only users that belong to the plugdev"
-	elog "group are allowed to run this. But if a script run by root mounts a"
-	elog "device, members of the plugdev group will have access to it."
-	elog
-	elog "Please add your user to the plugdev group to be able to mount USB drives"
-}
diff --git a/sys-apps/pmount/pmount-0.9.99_alpha-r7.ebuild b/sys-apps/pmount/pmount-0.9.99_alpha-r7.ebuild
index 4c0c1dc4be63..88f83decef22 100644
--- a/sys-apps/pmount/pmount-0.9.99_alpha-r7.ebuild
+++ b/sys-apps/pmount/pmount-0.9.99_alpha-r7.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}"/${P/_/-}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ppc ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="crypt"
 
 # cryptsetup is executed at runtime only, no libraries used AFAICT
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index b58ed1a7d04c..2137a5404c2b 100644
--- a/sys-kernel/Manifest.gz
+++ b/sys-kernel/Manifest.gz
diff --git a/sys-kernel/genkernel/Manifest b/sys-kernel/genkernel/Manifest
index c38dbe7cb5cf..f0d70e3f575f 100644
--- a/sys-kernel/genkernel/Manifest
+++ b/sys-kernel/genkernel/Manifest
@@ -75,6 +75,6 @@ EBUILD genkernel-4.2.5.ebuild 11468 BLAKE2B 44a9a5e824574e14f036b2964b325367f3ab
 EBUILD genkernel-4.2.6-r2.ebuild 11619 BLAKE2B 4eaed74c7fc68d45137723f604ad97b2591a114bfe48064be4400ecf88224e15f2de97465275177e8df2ceedf37df6fcede6c6f6b77b997c101a48533200b413 SHA512 105524dd26614ffa33ed38cf5a45350d5fb3b22b9fcf84ba92840af0c7a85ef71b9bc8ffe29bdbb28e583a32de40f5d7768d8ac28155d51473afb56740b1042c
 EBUILD genkernel-4.2.6-r3.ebuild 11667 BLAKE2B 8970c3817c942a224ba67b01fc34d99ff1b22f32939d58bb87d8f6451a4c7b4a33b9170996702fede6c5609fc862ef3ba6d39ba006d1261442eb30967d926c29 SHA512 cb2addc25a0bb808b0edabdb0f3d3b43f947e54b8d3843e7b90259e74311b3875b83e11a26f8372494f28acf1aa2dcd563f9b13cccdecec466bfbed161a8cbb8
 EBUILD genkernel-4.2.6-r4.ebuild 11711 BLAKE2B c3a54d2354ce25e8787dd50dd46f973294c590686c79d691b62b9a47dcc09be6ca1ab9b643e0e0c5bb2b11e1c4e6124e38402b5869ae8eb11511816204401109 SHA512 593e8c5d5b5b69aefdce8a6db91c7b5cdb90828014985c8cf235936d5d5bfa9ac4e40460e3fabb6772183494b2059748d32f12af19fa9c8ecfcf3ec7e349448a
-EBUILD genkernel-4.2.6-r5.ebuild 11906 BLAKE2B ea712d7abada9fe09fa2a3580411ae92061b3883971891741ce08de6a79bf3c5e0aa312f89fa9d46930c61d9de0200729cfc04d6eb123b377b2d8890dfc5ff96 SHA512 65b8d3efe432a1dcd28a0cec3a232f2f854650bf14be34397ec2c06192f51b3215d4654250e5d237afc8a572413c3e8486c91aa1c54723e25835b26c3d14dbb7
+EBUILD genkernel-4.2.6-r5.ebuild 11902 BLAKE2B 125c90e1ebf0595532b5b58378d29305f91a2a6527663a166b8cf9de8070d2b7d09bae2542934af4cc02c53e950b71f1c77e676761acf4dc2447e1ffda6c55bc SHA512 d77fea850e225d16f6a4e13d52546c1af6829c78cf5719cbd6b2e72c14ffbdf93bf85e44e055eb5e6455a6cead654305837ace9e0a67d46856d27ba52e0784a9
 EBUILD genkernel-9999.ebuild 11679 BLAKE2B 7fa6e85abbf9872158f186c1d1d849f1eadb37697c3d27dc9c12d74e48e0781dd587f8a75e21b2f45b0f7a5c137274e34aea16b7bffc60284d8c4adf303c28d1 SHA512 68614f253f0b5c852f720bfc095235625445979719a4d71b5b638768a98ee5e6dee12f75115d045104045e05af7f56b495fba4e8acaaf30d39551755f7482a33
 MISC metadata.xml 473 BLAKE2B 7d2bf14ca0bd4ba5bf05d0ac1529c0c8eae3655a4f52eba56ddb6865e8a44978366b3abad6f334c99b5ad30332113761ea0b7afd76a9eb274c536a7c23aa3983 SHA512 49c916ec4e0690ba17dbaf363acacf3cfaa69f180e0d48644eb742875c55cb409f51123f1e055ecfcffda0f18604208cc61fd2372c2b1aaa6d949dec9edc80a5
diff --git a/sys-kernel/genkernel/genkernel-4.2.6-r5.ebuild b/sys-kernel/genkernel/genkernel-4.2.6-r5.ebuild
index 9157c6dc9b6c..614f8a7ea768 100644
--- a/sys-kernel/genkernel/genkernel-4.2.6-r5.ebuild
+++ b/sys-kernel/genkernel/genkernel-4.2.6-r5.ebuild
@@ -91,7 +91,7 @@ else
 	SRC_URI="https://dev.gentoo.org/~whissi/dist/genkernel/${P}.tar.xz
 		${COMMON_URI}"
 	SRC_URI+=" https://gitweb.gentoo.org/proj/genkernel.git/patch/?id=8c9de489290dc470e30f8c7d0aaa3456eb124537 -> ${P}-s390x.patch"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 fi
 
 DESCRIPTION="Gentoo automatic kernel building scripts"
diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index 73110bf21ba3..a3a61da9e03e 100644
--- a/www-servers/Manifest.gz
+++ b/www-servers/Manifest.gz
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 028945d9287b..729c79926b40 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -10,6 +10,7 @@ AUX tomcat-instance-manager-r2.bash 6999 BLAKE2B f1c771678bd8b894ecf242d5a8fb22f
 AUX tomcat-r1.init 3200 BLAKE2B eb913d32bb8c1883e58551a25ff9516337d947c6fd2c7b449601a89a4518286d61dbca76417265289782a7a08540d8e78a3ea1cd1427d43d87e24813261c0fee SHA512 3d32e2ad998adfbaea5fe0ffcbbe6659dcb530a110faed5f2712ae2fd767353b1fc3f1ac83a24d43138c1bfc55949e645833a428ab982be14415887fc46d9fab
 AUX tomcat.conf 1811 BLAKE2B a92606e113172c6f0f73e18ab8ad8796f38bd8c741bb2fd1f6c43d7682728729d0198d4150e42282c7e732750231b7cdbfb51de9b24f2ba780a22700965113c5 SHA512 0747dd2fdad6c68123425adce39f625d34924ae3e7c9d5a00361565a593047d7a4d01dee64c1ef831e5ad79b51750babaf642b0588d4b5948bbed441d53d654d
 DIST apache-tomcat-10.0.22-src.tar.gz 6115322 BLAKE2B 6a9d2e6896fa266b4d75627f85ffa4f132c3cf30db24a331ef2d279e4c618aa817981a963c54148cbcd01af0d502ecf2c4c0f4debdb301f202ea748ea2572a66 SHA512 2d26828a1c44876feb4746186090866784f2a136d8120eb3dc106af7cc4cb95e94c6cbb51a3d4a14ea7159cd3351f4bd475153864e43d7e192296b5382c93a83
+DIST apache-tomcat-10.0.23-src.tar.gz 6136614 BLAKE2B 4eaf963187b9a754ed459d7f85e6f7d329927b949bb4a390a602cdc6651aa037aeec559c511ddb9880b6ec4d7cd97b96d82da341509370e412e1b21b799d8c2e SHA512 19ec026bae75318e9ffbe2e619ad2e12ec116382ea88a1064696275afb3fd13e6f08efe497dde79689bfc828f76e27d114ad3a9284b79c8d956a6a85bdac6360
 DIST apache-tomcat-7.0.109-src.tar.gz 5314401 BLAKE2B 56583caea6879bf8ca5cc02a886de3d7af413032f88d367653e709dc1c8f590e78620c788317bbff4b6e65dd3e242cc26863164ac8e7c87334a22636f3ed0703 SHA512 ecf9c0bee0e3e1aa24f299fe633705c5a2f6aa264d9e4968cfc96aa5d0a425c2b0ff07765a8b6c67221766733bdfaed6e6c6377a8d0870d889e7063ce90a46ce
 DIST apache-tomcat-8.5.81-src.tar.gz 5988747 BLAKE2B 569e1564cf6f5419aaa0d66a2497852021a244af1a858ad943b45e1c36939011a78edd83c717f346e4327278b95b95535e5c57bdd71af5662e052abc02528f49 SHA512 a9261e2a92e122f0f7f547d0b4e083d6c15cdb4d1ad750bdb3c9e3a597a1c4c1bb0f5dd7ad92f41ce18d15ac7fee47acc2cdd59e588b872f173467864120e581
 DIST apache-tomcat-9.0.64-src.tar.gz 6174208 BLAKE2B 3ec55872dc73279202faae10b4825ca8cd4f5d2763c43778445b2f1aee27ed1cd765e7345276735359e3a40779eaf2ef8f9120eaca8d38af07cbbcd0584078b4 SHA512 7e01a979d41f7d73204b7a7ae5a85b0094626bf64bcfa3a52f1fc46989369d504b6dd49718084ee0a10af775cab488aae1e18ce05eb2b527800e2a693c7b6386
@@ -17,6 +18,7 @@ DIST apache-tomcat-9.0.65-src.tar.gz 6195265 BLAKE2B 13ca956b58e9f1831700f67d1fa
 DIST biz.aQute.bnd-6.2.0.jar 16669843 BLAKE2B 290aec26cb4e2248488038e6cb0919728ca0cc802b16de3f390d549d135bc1177053b75e500b9f74e47c996d20b231404d57965a3f412662730cc4c938d90a4f SHA512 ad51dc9a04fc117cd01b604559989dd7c7db776761ef6000eccdcfdab825dedc615297af60c778044e46867972a74840d90eebea9b0ff826bdbd10f4d2ec5d6f
 DIST biz.aQute.bndlib-6.2.0.jar 3156015 BLAKE2B 922b9bc78e47968bad73a26f4df475d84d8a2bca3773473b1f8c147737e652728df4e90a49d09a20943f418a91fd5acfe18e51137e85850796d95b7415bcf684 SHA512 7b7b366467b71c6dd67b3d7a7bc63d476c4aca479153bbc1506435168b0b4c792152fb5b44e2b1f916cd67f482d15956d2c38182fdfaf9679dff65b1b109a16a
 EBUILD tomcat-10.0.22.ebuild 6258 BLAKE2B 438a3004bf5f4206f8aee6b0267f9597e56981ad4a698f181e135df2cc3576f7e695be10815fce7a15207646e991ecfcfc69de13ce8325cb285e0eb75cce38d8 SHA512 d5c7815169e200036d326f8b2901342a00fe88992409eb53c956393640f791bf4e5f8030bf0389d36be9fc04ae5c2a9a3c6a22e7bca4cad2a6b080d127f0f3a7
+EBUILD tomcat-10.0.23.ebuild 6259 BLAKE2B 98aafd111b5567ed267889bef4752a77837046621215aac65425868370d22198502c2398b8633d056345529d9a488bfcb1ffd8cb02667ae9c411f1b4b888a58b SHA512 b6202ca76aea59086cc906ca4af6df31dc907e6239f9684d737b979f7e158deec7e9e24c4d33dd2c145bc6b2c60b5ec01e9288aa4c71db95c64e768f7814fa6b
 EBUILD tomcat-7.0.109-r1.ebuild 4151 BLAKE2B 2dd58aae5be3d975b4cee4852a61e97d670f7b312d0e8f6dad1f6faaaab617c1d1270f7d574b2c740432fd34818aa618c04fb488b38b29493e9ae7336a6c7fba SHA512 8f92e1f5f08be910962366c1b812b5f0386c983137fc41e20d812232ca156a2daa9062c89ad00ce093f583c67953efa3d70d24b002d814db8298e8d03827fbf3
 EBUILD tomcat-8.5.81.ebuild 4749 BLAKE2B 07355b40016620c842b4b582ea11ca987bc04b4b89c65ed6228d0d94a37518d5cfe0da98589cec5985aa6d62fa701f9932c1bde8683734c1985bea6f7f181656 SHA512 2c5edb87d504df16582030f7340df7a27f845b12c95f0b342aaf5a2c88fae025ec1c8582d18312d9cf1d15cb8a0973e7f2763986690a3c3b59223832ea368cfe
 EBUILD tomcat-9.0.64.ebuild 5822 BLAKE2B 9ec1e8f21e7a6b07adf51e10dec445291e86260d33b2c014848c301e1593becc7a32a73c25c60ee19570c2ec8b6ead7005f9052b3b2e503b80d38e88e03baa73 SHA512 f5de64b7838ebeff771bb1c8f6aa3ddc0ad1a929faee65aa483ef79ae8aaecf6056b633f1ae0e4f169f09422b55b9053aefaa2caab94ab2d359a932e3d49dd16
diff --git a/www-servers/tomcat/tomcat-10.0.23.ebuild b/www-servers/tomcat/tomcat-10.0.23.ebuild
new file mode 100644
index 000000000000..17405e3e5eda
--- /dev/null
+++ b/www-servers/tomcat/tomcat-10.0.23.ebuild
@@ -0,0 +1,198 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2 prefix
+
+MY_P="apache-${PN}-${PV}-src"
+
+# Currently we bundle binary versions of bnd.jar and bndlib.jar
+# See bugs #203080 and #676116
+BND_VERSION="6.2.0"
+BND="biz.aQute.bnd-${BND_VERSION}.jar"
+BNDLIB="biz.aQute.bndlib-${BND_VERSION}.jar"
+
+DESCRIPTION="Tomcat Servlet-5.0/JSP-3.0/EL-4.0/WebSocket-2.0/JASIC-2.0 Container"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/${PN}/tomcat-10/v${PV}/src/${MY_P}.tar.gz
+	https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/${BND_VERSION}/${BND}
+	https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/${BND_VERSION}/${BNDLIB}"
+
+LICENSE="Apache-2.0"
+SLOT="10"
+KEYWORDS="~amd64 ~amd64-linux"
+IUSE="extra-webapps"
+
+RESTRICT="test" # can we run them on a production system?
+
+# though it could work with 4.22 and upstream uses 4.20,
+# we still use 4.15 because 4.20+ is currently built with java 11
+# and it would force Tomcat to use at least java 11 too
+ECJ_SLOT="4.15"
+SAPI_SLOT="5.0"
+
+COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
+	dev-java/glassfish-xmlrpc-api:0
+	dev-java/jakartaee-migration:0
+	~dev-java/tomcat-servlet-api-${PV}:${SAPI_SLOT}
+	dev-java/wsdl4j:0"
+RDEPEND="${COMMON_DEP}
+	acct-group/tomcat
+	acct-user/tomcat
+	virtual/jre"
+DEPEND="${COMMON_DEP}
+	app-admin/pwgen
+	dev-java/ant-core
+	>=virtual/jdk-1.8:*
+	test? (
+		dev-java/ant-junit:0
+		dev-java/easymock:3.2
+	)"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=(
+	"${FILESDIR}/${PN}-9.0.50-insufficient-ecj.patch"
+)
+
+BND_HOME="${S}/tomcat-build-libs/bnd"
+BNDLIB_HOME="${S}/tomcat-build-libs/bndlib"
+BND_JAR="${BND_HOME}/${BND}"
+BNDLIB_JAR="${BNDLIB_HOME}/${BND_LIB}"
+
+src_unpack() {
+	unpack ${MY_P}.tar.gz
+
+	mkdir -p "${BND_HOME}" "${BNDLIB_HOME}" || die "Failed to create dir"
+	ln -s "${DISTDIR}/${BND}" "${BND_HOME}/" || die "Failed to symlink bnd-*.jar"
+	ln -s "${DISTDIR}/${BND}" "${BNDLIB_HOME}/" || die "Failed to symlink bndlib-*.jar"
+}
+
+src_prepare() {
+	default
+
+	find -name '*.jar' -type f -delete -print || die
+
+	# Remove bundled servlet-api
+	rm -rv java/jakarta/{el,servlet} || die
+
+	eapply "${FILESDIR}/${PN}-10.0.20-build.xml.patch"
+
+	local vm_version="$(java-config -g PROVIDES_VERSION)"
+	[[ "${vm_version}" == "1.8" ]] && eapply "${FILESDIR}/${PN}-10.0.16-build.xml-strip-html5.patch"
+
+	# For use of catalina.sh in netbeans
+	sed -i -e "/^# ----- Execute The Requested Command/ a\
+		CLASSPATH=\`java-config --with-dependencies --classpath ${PN}-${SLOT}\`" \
+		bin/catalina.sh || die
+
+	java-pkg-2_src_prepare
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+EANT_BUILD_TARGET="deploy"
+EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},jakartaee-migration,tomcat-servlet-api-${SAPI_SLOT},wsdl4j"
+EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
+EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
+EANT_NEEDS_TOOLS="true"
+EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false -Dbnd.jar=${BND_JAR} -Dbndlib.jar=${BNDLIB_JAR}"
+
+# revisions of the scripts
+IM_REV="-r2"
+INIT_REV="-r1"
+
+src_configure() {
+	java-ant-2_src_configure
+
+	eapply "${FILESDIR}/${PN}-9.0.37-fix-build-rewrite.patch"
+}
+
+src_compile() {
+	EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar):$(java-pkg_getjars --build-only glassfish-xmlrpc-api)"
+	LC_ALL=C java-pkg-2_src_compile
+}
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	local dest="/usr/share/${PN}-${SLOT}"
+
+	java-pkg_jarinto "${dest}"/bin
+	java-pkg_dojar output/build/bin/*.jar
+	exeinto "${dest}"/bin
+	doexe output/build/bin/*.sh
+
+	java-pkg_jarinto "${dest}"/lib
+	java-pkg_dojar output/build/lib/*.jar
+
+	dodoc RELEASE-NOTES RUNNING.txt
+	use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
+	use source && java-pkg_dosrc java/*
+
+	### Webapps ###
+
+	# add missing docBase
+	local apps="host-manager manager"
+	for app in ${apps}; do
+		sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
+			output/build/webapps/${app}/META-INF/context.xml || die
+	done
+
+	insinto "${dest}"/webapps
+	doins -r output/build/webapps/{host-manager,manager,ROOT}
+	use extra-webapps && doins -r output/build/webapps/{docs,examples}
+
+	### Config ###
+
+	# create "logs" directory in $CATALINA_BASE
+	# and set correct perms, see #458890
+	dodir "${dest}"/logs
+	fperms 0750 "${dest}"/logs
+
+	# replace the default pw with a random one, see #92281
+	local randpw="$(pwgen -s -B 15 1)"
+	sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
+
+	# prepend gentoo.classpath to common.loader, see #453212
+	sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
+
+	insinto "${dest}"
+	doins -r output/build/conf
+
+	### rc ###
+
+	cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
+	eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
+	sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
+
+	insinto "${dest}"/gentoo
+	doins "${T}"/tomcat.conf
+	exeinto "${dest}"/gentoo
+	newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
+	newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
+}
+
+pkg_postinst() {
+	elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
+	elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
+	elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
+
+	elog "To manage Tomcat instances, run:"
+	elog "  ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
+
+	ewarn "Please note that since version 10 the primary package for all implemented APIs"
+	ewarn "has changed from javax.* to jakarta.*. This will almost certainly require code"
+	ewarn "changes to enable applications to migrate from Tomcat 9 and earlier to Tomcat 10 and later."
+
+	ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
+	ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
+
+	einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat and"
+	einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information."
+}
diff --git a/www-servers/varnish/Manifest b/www-servers/varnish/Manifest
index 16a4cf722f24..3223f9988920 100644
--- a/www-servers/varnish/Manifest
+++ b/www-servers/varnish/Manifest
@@ -7,10 +7,6 @@ AUX varnishlog.confd 82 BLAKE2B 31a9d78501d3738a573684677cde67a08e81fbcc8f735141
 AUX varnishlog.initd 707 BLAKE2B 90e75e267a2ad8688ace41d4eff20e8601e0b20abc9b73e669d1b0e8ded99294ce655a1ca67b972ce7b8ad439424ba3bff22841eaee2e1f0a21bff19302f5d31 SHA512 c67a7898f40849989edcbe74e1a418e196f48e178ca30126bc13db226e4f4c2c2ba74d9d0650ef68ed88732917fc06b80ef1f62c2d9d2c14a89f26fd25aed0f7
 AUX varnishncsa.confd 84 BLAKE2B fbb338ec2163562d7679a7371cda3cd297449186bfcaa668e3924d944dc78eae8d8bf5c60230202fee4093119ccc74d67ad8f3e6774091c6c2b5c9b184d4b5eb SHA512 a5426ff66b89d2afb6273f05e4117b3eec5ce0162a624d52c92b418960f72e58bd01224165613221af76ec241bd98e1eb985b2ef7b83a5b615e9ece67234dcc8
 AUX varnishncsa.initd 716 BLAKE2B 33fd6b044ab50aef629fa4501eb4a78bd3d690db52b86a33d1d4e87c1da28088b9f25ce917d16a9ed777b1d6e1ece5a916af0c4ff293db82b94d264fd5baafa9 SHA512 1d0c781675ecba5adce02c37a02c431c4b44d64310a0945bff4f6f57f7d0c87cb7dda874311e44d667317d5beda113b62f4ba49c81534a0c078314b3fa15a512
-DIST varnish-6.5.2.tgz 3464372 BLAKE2B 68a7bca159ed9539126f66d21450c87780b49b66a2d45a5abc7db6fe9d68c8526aa059546fb1d865de753736793e700611f4f110edb1c649f4e9753c4dfedacc SHA512 31673eaa95e5d3413cd3a4a6fb324c1f0ad2efb22b75409fc0e02c61446787eb167bd530ee5b0a199da4fc76cc36f3603984d86781f856cc6a4aac48260fe4ef
-DIST varnish-6.6.1.tgz 3518308 BLAKE2B 6a88165394c0578427de20588ac2c17f502242bf94f30e9284f7bc2c271b77c3d6511a9dfb8d1cb6d75e1fc4563360fb0bec762aa17481fa598cb5e9d9527705 SHA512 af3ee1743af2ede2d3efbb73e5aa9b42c7bbd5f86163ec338c8afd1989c3e51ff3e1b40bed6b72224b5d339a74f22d6e5f3c3faf2fedee8ab4715307ed5d871b
 DIST varnish-7.1.0.tgz 3787588 BLAKE2B 1a019b140c467063861460b529c253361975826cee797c304c7c096645c315b67ad20400467ecf11711abae5354134ac29a934793691283e12e3fbe29921943b SHA512 ad9ce0cdc759976fcb7044914d28863edd197167f583fab2d1bc57f4e5b86c224b7c948faf1f7364a2a16bde9c415375d011462bdc43026c5f7a60e65bd21f73
-EBUILD varnish-6.5.2.ebuild 2243 BLAKE2B 2b1e7f9685f8a6a186db6d6df4a6ed15b9b343e65c14cc9afec774bc1c9ae424dc205e17c0de64f5c2a5a285b353049eec0bb044ca28b11f6acaf008296c9409 SHA512 26f158e94c4d3567c6ffe85f6e20694a9711d6a6a456413727290ee0aaf1ca0ce2b6f610bd19a2ba32cff8543f03342f0bb5c9bed5360fc7b6cf7636732afc3c
-EBUILD varnish-6.6.1.ebuild 2379 BLAKE2B ce581f92c3be51eb6d032daa06fb1a84dcdc523efd0726ae26e876445fad09cefb51a78c627f8900c8de03bdbfe1c7ead4189bae02be425958851069d43ba8a2 SHA512 4dd59ccac111c157db93bc648ad67a0bd4b67693aac1fc18772cf08a0ef22f03d3a70b3a8c19f6c187f3e2f4329faf08c7a03cc0cb00f7e755b7f60d8d0f2514
 EBUILD varnish-7.1.0.ebuild 2234 BLAKE2B 751a1ee4b19575d5965b507f20318b6fd203030cf0dd6a19090ee4989871bff9bd5f2a1fc6af5f0d4e36dccb57603bf446bd45ac0e82411a4dfdc4c6679ae5b8 SHA512 6c10b0d06a27c735c886de7545e0df562ba17b0880c710ca9ea569c1eef61893e4d1808639e21633d6a6962b5e8538ac8318beb6f0e917e27752a09760839ebf
 MISC metadata.xml 1155 BLAKE2B 84875f3204cf314d1cb22e323ae8edb4e439e11d165c019bdf959925236ee4df671a9dbfd5a98d4c8841f8ec19cf8e602b703052d9a864d7e3c652ffe40054f0 SHA512 34bad8011b4530abc02f35b1bacb3d632ea5d57da41162a246d5601d766f192448efb31445536e02485fa195ab5f5eb564b4a1886632d0fd32626184d1173db7
diff --git a/www-servers/varnish/varnish-6.5.2.ebuild b/www-servers/varnish/varnish-6.5.2.ebuild
deleted file mode 100644
index 159da1164758..000000000000
--- a/www-servers/varnish/varnish-6.5.2.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit autotools systemd python-r1
-
-DESCRIPTION="Varnish is a state-of-the-art, high-performance HTTP accelerator"
-HOMEPAGE="https://varnish-cache.org/"
-SRC_URI="http://varnish-cache.org/_downloads/${P}.tgz"
-
-LICENSE="BSD-2 GPL-2"
-SLOT="0/2"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE="jemalloc jit static-libs"
-
-CDEPEND="
-	sys-libs/readline:0=
-	dev-libs/libpcre[jit?]
-	jemalloc? ( dev-libs/jemalloc )
-	sys-libs/ncurses:0="
-
-#varnish compiles stuff at run time
-RDEPEND="
-	${PYTHON_DEPS}
-	${CDEPEND}
-	acct-user/varnish
-	acct-group/varnish
-	sys-devel/gcc"
-
-DEPEND="
-	${CDEPEND}
-	dev-python/docutils
-	dev-python/sphinx
-	virtual/pkgconfig"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT="test" #315725
-
-PATCHES=(
-	"${FILESDIR}/varnish-6.5.1-autoconf-2.70.patch" #751190
-)
-
-src_prepare() {
-	# Remove -Werror bug #528354
-	sed -i -e 's/-Werror\([^=]\)/\1/g' configure.ac
-
-	# Upstream doesn't put varnish.m4 in the m4/ directory
-	# We link because the Makefiles look for the file in
-	# the original location
-	ln -sf ../varnish.m4 m4/varnish.m4
-
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		$(use_enable jit pcre-jit)
-		$(use_with jemalloc)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	python_replicate_script "${D}/usr/share/varnish/vmodtool.py"
-
-	newinitd "${FILESDIR}"/varnishlog.initd varnishlog
-	newconfd "${FILESDIR}"/varnishlog.confd varnishlog
-
-	newinitd "${FILESDIR}"/varnishncsa.initd varnishncsa
-	newconfd "${FILESDIR}"/varnishncsa.confd varnishncsa
-
-	newinitd "${FILESDIR}"/varnishd.initd-r4 varnishd
-	newconfd "${FILESDIR}"/varnishd.confd-r4 varnishd
-
-	insinto /etc/logrotate.d/
-	newins "${FILESDIR}/varnishd.logrotate-r2" varnishd
-
-	diropts -m750
-
-	keepdir /var/lib/varnish
-	keepdir /var/log/varnish
-
-	systemd_dounit "${FILESDIR}/${PN}d.service"
-
-	insinto /etc/varnish/
-	doins lib/libvmod_std/vmod_std.vcc
-	doins etc/example.vcl
-
-	dodoc README.rst
-	dodoc doc/changes.rst
-
-	fowners root:varnish /etc/varnish/
-	fowners varnish:varnish /var/lib/varnish/
-	fperms 0750 /var/lib/varnish/ /etc/varnish/
-}
diff --git a/www-servers/varnish/varnish-6.6.1.ebuild b/www-servers/varnish/varnish-6.6.1.ebuild
deleted file mode 100644
index 490d4d852608..000000000000
--- a/www-servers/varnish/varnish-6.6.1.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit autotools systemd python-r1
-
-DESCRIPTION="Varnish is a state-of-the-art, high-performance HTTP accelerator"
-HOMEPAGE="https://varnish-cache.org/"
-SRC_URI="http://varnish-cache.org/_downloads/${P}.tgz"
-
-LICENSE="BSD-2 GPL-2"
-SLOT="0/2"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE="jemalloc jit static-libs"
-
-CDEPEND="
-	sys-libs/readline:0=
-	dev-libs/libpcre[jit?]
-	jemalloc? ( dev-libs/jemalloc )
-	sys-libs/ncurses:0="
-
-#varnish compiles stuff at run time
-RDEPEND="
-	${PYTHON_DEPS}
-	${CDEPEND}
-	acct-user/varnish
-	acct-group/varnish
-	sys-devel/gcc"
-
-DEPEND="
-	${CDEPEND}
-	dev-python/docutils
-	dev-python/sphinx
-	virtual/pkgconfig"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT="test" #315725
-
-src_prepare() {
-	# Remove -Werror bug #528354
-	sed -i -e 's/-Werror\([^=]\)/\1/g' configure.ac
-
-	# Upstream doesn't put varnish.m4 in the m4/ directory
-	# We link because the Makefiles look for the file in
-	# the original location
-	ln -sf ../varnish.m4 m4/varnish.m4
-
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		$(use_enable jit pcre-jit)
-		$(use_with jemalloc)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	python_replicate_script "${D}/usr/share/varnish/vmodtool.py"
-
-	newinitd "${FILESDIR}"/varnishlog.initd varnishlog
-	newconfd "${FILESDIR}"/varnishlog.confd varnishlog
-
-	newinitd "${FILESDIR}"/varnishncsa.initd varnishncsa
-	newconfd "${FILESDIR}"/varnishncsa.confd varnishncsa
-
-	newinitd "${FILESDIR}"/varnishd.initd-r4 varnishd
-	newconfd "${FILESDIR}"/varnishd.confd-r4 varnishd
-
-	insinto /etc/logrotate.d/
-	newins "${FILESDIR}/varnishd.logrotate-r2" varnishd
-
-	diropts -m750
-
-	keepdir /var/lib/varnish
-	keepdir /var/log/varnish
-
-	systemd_dounit "${FILESDIR}/${PN}d.service"
-
-	insinto /etc/varnish/
-	doins vmod/vmod_vtc.vcc
-	doins vmod/vmod_directors.vcc
-	doins vmod/vmod_blob.vcc
-	doins vmod/vmod_proxy.vcc
-	doins vmod/vmod_debug.vcc
-	doins vmod/vmod_std.vcc
-	doins vmod/vmod_unix.vcc
-	doins vmod/vmod_cookie.vcc
-	doins vmod/vmod_purge.vcc
-	doins etc/example.vcl
-
-	dodoc README.rst
-	dodoc doc/changes.rst
-
-	fowners root:varnish /etc/varnish/
-	fowners varnish:varnish /var/lib/varnish/
-	fperms 0750 /var/lib/varnish/ /etc/varnish/
-}
diff --git a/x11-apps/Manifest.gz b/x11-apps/Manifest.gz
index a3e6bffbdc25..815ee5ed3b41 100644
--- a/x11-apps/Manifest.gz
+++ b/x11-apps/Manifest.gz
diff --git a/x11-apps/mesa-progs/Manifest b/x11-apps/mesa-progs/Manifest
index e9e33e908912..a7533fc0c8d4 100644
--- a/x11-apps/mesa-progs/Manifest
+++ b/x11-apps/mesa-progs/Manifest
@@ -4,6 +4,6 @@ AUX mesa-progs-8.4.0-improve-printing.patch 11963 BLAKE2B ad2dd57bf0959da6253d0e
 DIST mesa-demos-8.4.0.tar.bz2 10073259 BLAKE2B d251e705c6e3d2fe959161d736401fd06ba267a9c389341098373670b6f44ca7cdb451d96e94e3b22f006b696a9b19e38096423f6438544539f46beda91c03f4 SHA512 b72d03cad36e0535ff18dcfb222ec4200064b9264f6da51a6e5f03b0dd912abe188bc1d600b6698de3ce6f63b28d2ce01565886ca8e7079edc4967fbf2fb0957
 DIST mesa-demos-8.5.0.tar.bz2 10367517 BLAKE2B 60e9edfcfe6d28f73964b81ae4e016fdbeb45d9d6d91de71bf736c86fa6181749f2e12729c8c716f6e6f5d4e39075de131877d1f09c3e511a4338b0f44ddb6a6 SHA512 df6a7f09638ca389d6e8bc569e599dcc59c9aa280bcfb95976d83e5cd3edfe74bb3a31f0953956dc16faa540ee5b09990e3377e1341d836fc527e50ace6e60b8
 EBUILD mesa-progs-8.4.0-r1.ebuild 1913 BLAKE2B 835635568c965741f3ad48e4921011ac4aabd0b5032a05ee7e53894942dccac78f9bdb5767b9ce09182b0f7819899f4163c55b6d91b1a69c15d2bdb700462584 SHA512 0bba7f77b310f3a0511acb711aeec47b69ffe29b35bc35e374dc918247820121ba17dd2bc3d7ede88cc2cb0c744a653284aa9e3d0a691157326a46b8ba051aa7
-EBUILD mesa-progs-8.5.0.ebuild 1803 BLAKE2B c543e47eed51edabec98ce14490901003738fc853a8ef83d85023cf3e95b76ff698cae0b677b271f8a47ac3ed1aaced2bb33d887d87ee3a3cd5907bfbf703d91 SHA512 a48d3c9a8ee6b0efab638120b447df5b35eae83336c132347fa1439a1fd0a1fab2e7914a112809b83ad83f7b867a11ddb0a4bb51fe067d71e93a65d170b0531d
+EBUILD mesa-progs-8.5.0.ebuild 1801 BLAKE2B c7f0a33f5c1051dd3d6e98f6007ddbc5547e4b05a3c902d874a22b2c5d499920989599c4047befff20048e0bb36cfed9e040ca3360794bbc9b372196f9356357 SHA512 f0ec2f6b8270efeebf5b41304187cb0d76ff07a9b56b355406c39435106b148a614a815ffb21142a11e500ec820f2a102bbc694f09b2401cce3098bd88fdf62a
 EBUILD mesa-progs-9999.ebuild 1802 BLAKE2B e000a568251ea02ac0abdbdc8102f05b7eee49633699c07dde71d6783d29b656fbda85b80aa60456692dbdb262a077636cc2d95ac80457c14f5ddb60844ed4b4 SHA512 4ce30ae2375e523dcf5ce89340bbd6ed7dd440d590ea8608b4bf5692e2108bda2afbe2730edffebe2a7c33c9befa995d53294ddbf1e5268fbc2a42b131f59a03
 MISC metadata.xml 476 BLAKE2B 2f40a2161f77a5ac55a486f6570c4fca5b85f6c28189f22c8e8a373ffb0fe69329a83babb777a53d4f73c87e3ae1ba54cd3e0fcac25b62ce19e55505ce6d602d SHA512 f6c0f2910974cfb42cf748287bed94281cc7753c2632dd4fa4dc6baa0c261d1c408f792c259c4d66251a6449698aa9dcae8690b9f5aea687f73868571d9a48a6
diff --git a/x11-apps/mesa-progs/mesa-progs-8.5.0.ebuild b/x11-apps/mesa-progs/mesa-progs-8.5.0.ebuild
index 0de99d7b802b..01d7aaee06a4 100644
--- a/x11-apps/mesa-progs/mesa-progs-8.5.0.ebuild
+++ b/x11-apps/mesa-progs/mesa-progs-8.5.0.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} = 9999* ]]; then
 else
 	SRC_URI="https://mesa.freedesktop.org/archive/demos/${MY_P}.tar.bz2
 		https://mesa.freedesktop.org/archive/demos/${PV}/${MY_P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 	S="${WORKDIR}/${MY_P}"
 fi
 LICENSE="LGPL-2"
diff --git a/x11-apps/xclipboard/Manifest b/x11-apps/xclipboard/Manifest
index d5dc9dc50c7a..8cbd94acdd73 100644
--- a/x11-apps/xclipboard/Manifest
+++ b/x11-apps/xclipboard/Manifest
@@ -1,5 +1,5 @@
 DIST xclipboard-1.1.3.tar.bz2 132406 BLAKE2B 5e2e77a297c32884cadc4bf6e4503a958218b11083c747a575bb05dd8218fd0759edcab5c8d12055f5b0a1875e8a2cfb6b2062795580358521b619ecca8d70d8 SHA512 84a51d11851756422eb23e67b2721d2bcb2ac248fa32c0837423b6169144dff76717c22611ad3c93633e09a44dc70c847a2470d3988eff0b24d77e252a4e147e
 DIST xclipboard-1.1.4.tar.xz 128912 BLAKE2B f90906d3abb2de0915113d651d5bd4c4cf2a75c4b15c681a7609cd9aa46ce9d3157cdfa5f60ad76ce6a56396d51ae726645b1b43d53125161f362cc3520b6a66 SHA512 efa7800e0c4fb0242362c4263d80182d591bded07d1064a36b157b6202b15b0c82f083658ced2b82392eca905fb57c04a537d67e75c1237a1667ed2ce0cb09fe
 EBUILD xclipboard-1.1.3.ebuild 374 BLAKE2B 6e40ffedc8a81c49ce8953941548802716fdc79953f5fb76cdc434183d8fabb1652e680ac28d5aa307b0a482d302dff85be5cd86f1358b530452dab805a69236 SHA512 29687d418e81b54e582f6ed87d7595bf92f841bc917447d597f7d540e163191a0069cce24aa84b8b342c0f51223a18f8d747eef87abb35e7a12bb4a52d1053bc
-EBUILD xclipboard-1.1.4.ebuild 426 BLAKE2B 46a561e7bba9d8dcd9b63bc222fd79118a671fcd8353a8edf336600a26b04c95bb2843fe0712cd72d128ba8fa516d34788459f25252687851dd5741879967c0d SHA512 b918462d76833da704ed10688047c7096bd35fbf6eb7bd0dfed4027e58ab0df29090885a82c482530d48563e952bd088814f2eab1bf849f1e404c951cc5caa5e
+EBUILD xclipboard-1.1.4.ebuild 424 BLAKE2B 8455e1f9cc1946be636789ba8d63176946053dec58baeb1fb617c7e28f940269734a9c6768d40637a339562ab2e18dc9950ca5442f289fb985b8daf9807f5ce8 SHA512 51efb3eb645130333e73423d744a78dc1dc5b809dc847ac961ac3fae0116fb7c1f3dec21dbb199b771007a6ce4869268ccafef0a66f0a45ef9a1b495497217fe
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-apps/xclipboard/xclipboard-1.1.4.ebuild b/x11-apps/xclipboard/xclipboard-1.1.4.ebuild
index 81b3a6199fee..42fd5f047577 100644
--- a/x11-apps/xclipboard/xclipboard-1.1.4.ebuild
+++ b/x11-apps/xclipboard/xclipboard-1.1.4.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="interchange between cut buffer and selection"
 
-KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
 
 RDEPEND="
 	x11-libs/libXaw
diff --git a/x11-apps/xcmsdb/Manifest b/x11-apps/xcmsdb/Manifest
index 0e95b309b251..e50c983d5f15 100644
--- a/x11-apps/xcmsdb/Manifest
+++ b/x11-apps/xcmsdb/Manifest
@@ -1,5 +1,5 @@
 DIST xcmsdb-1.0.5.tar.bz2 145419 BLAKE2B 41269ca270e4b11838f54669900a074dfbbc7339af84db8638498e220eb7abac2fe055ca003dba326babf368d26137eabc0f0bae9f69233d9c91f7e727c3ba30 SHA512 e47bfce87d7531e7809c300e01120c3e8d6001130d9a6c9f6de5bc19651d8712d273a6f54452223bd8c4bff4612b5ecae8db45eddb022da945ed6e14c9c84ae4
 DIST xcmsdb-1.0.6.tar.xz 136708 BLAKE2B 847a29251d781cf616a7b74abb9130da08d2dd56d42db61923c9e82848bff12ff7c5f8ba3c9635b2a572116bb19ce0637432ea9c6fdaf5b76d7f7ae8e176be64 SHA512 e47d9498ce496effbc44a66e70af91d9fe65c344a17916fd4990a4c84fa8879aa09b6695aeb6ef595f475c16a13c7c31d4c48449234564de7de38d7436764fae
 EBUILD xcmsdb-1.0.5-r1.ebuild 364 BLAKE2B a7567526578b0c7e2476ed93af48df0960622b4c3c9e8dc7a3d08cd4da1ca03e6a1e2475926a5bd06ca5ac20e47fb41ab23af28928a4ffa7683ca83dee0aab6f SHA512 4ecb316d2dfac00c201b31606ed7fb17207fab7201cb951027178f847a1d095bbeb252ee1025a38b42de57992bc4393be5c67a7bae4ea2496031bd75a0f20b2f
-EBUILD xcmsdb-1.0.6.ebuild 396 BLAKE2B 54bc1ae72e6d415efa8a6bf07d22480b56804c3c2e44b8d4b7d48db6b694a1d89af5d16c1424f396169c00e20747fe96d308a3ca20aa40014950418aa130fe1e SHA512 42aab51691d20865bc810c8817bca8c849a90dbe7a7bb6715a51daf98cf9228519415d5a963d2e45e31767a49f29f1d43ce98749195483bd21399d094d638cff
+EBUILD xcmsdb-1.0.6.ebuild 394 BLAKE2B 3b146644dcb31fc8b741edea6d7ac44fa8fb6def95ed804348d779c12d681eb487caf8f21110bd647a7577fba2b6a3040e3eb83f91699cb37a3c037c5f1d3b3d SHA512 528d402c5f92f0aebac910140ce24ff58f0d641b88a483e185aa7ed53cd3834bdcdb141e78b1672ffb3287109c0c2c19352954c349494221b21e8b243caa3bee
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-apps/xcmsdb/xcmsdb-1.0.6.ebuild b/x11-apps/xcmsdb/xcmsdb-1.0.6.ebuild
index bab254e72f70..3d7ef7f2b413 100644
--- a/x11-apps/xcmsdb/xcmsdb-1.0.6.ebuild
+++ b/x11-apps/xcmsdb/xcmsdb-1.0.6.ebuild
@@ -7,7 +7,7 @@ XORG_TARBALL_SUFFIX="xz"
 inherit xorg-3
 
 DESCRIPTION="Device Color Characterization utility for X Color Management System"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="x11-libs/libX11"
 DEPEND="${RDEPEND}
diff --git a/x11-apps/xconsole/Manifest b/x11-apps/xconsole/Manifest
index 30015ba75bae..a7202ebde3e4 100644
--- a/x11-apps/xconsole/Manifest
+++ b/x11-apps/xconsole/Manifest
@@ -1,5 +1,5 @@
 DIST xconsole-1.0.7.tar.bz2 134832 BLAKE2B 20f9729d0aad2aceb1c7197b2ae45f65088dc39fb5980eb41a39935fb180ee7181c560ef180b0413b28adf36882a13fbdbd454d8b6dbb0cc06f69632f903b546 SHA512 89f391058ea99904587bd1dac9e31fa3ff06cf63b899abe6c06e4897bbc9919500dd4773873b1a452de4f54cc6999bd496022b6d8df9d4147804448abbdca2f9
 DIST xconsole-1.0.8.tar.xz 129336 BLAKE2B 3c00072944594b02d5cbc88e8243198502a1a418e4f0c3e86badf659a62bada126323af1b21517368fd6a6204397714cb8769b7a1702fe9b8d884c057cc429ee SHA512 93fd8527abed4faaf0f6a3804ab08dbcb926b0aaf67fd814c003b6b1102e2f643be5362a020c7028ae928925ffd423df6eb456d4ed48cf30a4c5f00a7ce648fa
 EBUILD xconsole-1.0.7.ebuild 371 BLAKE2B 5909ea5f555dcee4736c71fabda1a34ec3a93b16e1a7aad111371eae8dbcde98474f465323d6dd5c031526a3dc30f240438c9b27a9281750be8af3dbe7c83cb3 SHA512 6b4fd7597cd7ba96439d6fc2edc1775135eb8779089221c9914f91d5ff08df4d9d89de1ea709561d8b71af7dda8f2ed941a6c25825d63e443eff826986e58dba
-EBUILD xconsole-1.0.8.ebuild 426 BLAKE2B 28d53085f9bff98aad080a3b71506f5b5cbb8026ce08ac9acc72e2a9717324102c7df02c9c0f22576c86b253906cf179aa5675e1493e1d96efed29bfa29885d5 SHA512 24026bb6ea6bc774e687d2990e82d197498b4115d80e1f36d239c2d83dabfcdc1fdbf2a346a75fbd82366402bfbce68bed724162b7a1f3eb9b287310515c84fb
+EBUILD xconsole-1.0.8.ebuild 424 BLAKE2B 15c7bc3cb7442fb301db18f92199cc45aa7392cc06c33071e02347a8bb28aeed739c4ff038fd605ad222f7fa31a04ba5f49aa288d9eeb78dfea001fe8eeb4f51 SHA512 178da854c2059c1ca682cf3734f81f67162548dda28e35d7b6075d196881794185c116936ac5cb92e868d040aa227d03c9ae39864ca8bff651be754c7053d358
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-apps/xconsole/xconsole-1.0.8.ebuild b/x11-apps/xconsole/xconsole-1.0.8.ebuild
index 50e7b833e274..6de2cda0b2e7 100644
--- a/x11-apps/xconsole/xconsole-1.0.8.ebuild
+++ b/x11-apps/xconsole/xconsole-1.0.8.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="monitor system console messages with X"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	x11-libs/libXaw
diff --git a/x11-apps/xev/Manifest b/x11-apps/xev/Manifest
index b26ce5e00f74..efa5db3b60c6 100644
--- a/x11-apps/xev/Manifest
+++ b/x11-apps/xev/Manifest
@@ -1,5 +1,5 @@
 DIST xev-1.2.4.tar.bz2 136792 BLAKE2B 46b38d7295f8a11509598758ece9d880f9c3d303064de5cb6ef12aa9d0b066e78aefd3aa5e0c94ea4af7633936209474be362f9e38c0994eefe798662c2e4c6c SHA512 383472ddbfad639ba46a69080ecdd11a514a0578fd32c463fae18da02e0265c944589eebf12a858994f5fd601c02a0d51517e9b3ff61c6afe740d374f02781ca
 DIST xev-1.2.5.tar.xz 128848 BLAKE2B 468e8b21ffba9473bf04160f053a4300df61280083cdad0d94f2d309abeab96611031cb6d054ab011c4b18c01f63d2e5cd0ab24c5c42ba3e337999716e57851b SHA512 9fbfb78c9547974c2256a678948bf4a694a40b1c2bd5c5dec5f365a713e6d938c6039f055a9629f49de27f02f3d7cb912f07c035df129798a4b2ddc20febe66a
 EBUILD xev-1.2.4.ebuild 387 BLAKE2B 3a2a6e9b12c54a896403d34e070597110fc36ee6507ac28418ec7a10e0697f44dd33aceba1cb53e29d68813d5e53db7f2397aa5ada63f9ac41984ab984ef82f8 SHA512 9a20b20bae3fd657bf7ea16152a09fc37b547346706aaa2bda9fbb2d5e785ba18e15766cdd1ba0194624d4b4ea21e162a0f36cec166f9763e1450b60e99fcdaa
-EBUILD xev-1.2.5.ebuild 413 BLAKE2B 9d315beae91fad236e8c68140229dd9eb12c2e503d336c5558e84e789fb34ed3269473629b420ce0bd3cfb77f35ee36725fa80d24fcaa588256de2b2904ca771 SHA512 ce3a00e8052a2f3a422656e7256dfe8f0079886dd9ef3c3f05bd782f972522aab388bbe824724c2508c391b825ea2d27f346d5a7fc3b0fecd0c8150eab5e08e4
+EBUILD xev-1.2.5.ebuild 411 BLAKE2B a478903cf7290087c9b016155e18a6957f50660b889fb11979ffef8f4a763b0352bfed08cdc837c5479345b98776d9560d43a1d6634b4c433ef36cc3d5f284c6 SHA512 f7f96c15c05c299185fb7a1e9764d48b9cf1cd6a78a114276f50a9e1254f8507d13f1f220c426f494cb726dd47506281e307989d19a2ce031cf5b8f71c11013a
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-apps/xev/xev-1.2.5.ebuild b/x11-apps/xev/xev-1.2.5.ebuild
index f810e16b46bd..2ac79831aabd 100644
--- a/x11-apps/xev/xev-1.2.5.ebuild
+++ b/x11-apps/xev/xev-1.2.5.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="Print contents of X events"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-winnt"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x86-winnt"
 
 RDEPEND="
 	x11-libs/libX11
diff --git a/x11-apps/xfontsel/Manifest b/x11-apps/xfontsel/Manifest
index 6dc10305390a..6f23129aa001 100644
--- a/x11-apps/xfontsel/Manifest
+++ b/x11-apps/xfontsel/Manifest
@@ -1,5 +1,5 @@
 DIST xfontsel-1.0.6.tar.bz2 146469 BLAKE2B 9773430e51e63d23086403f91fd78f6ed2e7f3abf144fda5bba171d05145026d233474e9d055b31bd498a861994c4f59af52a8101fc1e10b891ea879cb2f0bb9 SHA512 2f6bc51549a302404cdaf9a5a825add383953fcbb2a0c7076691cefd4dd7e4a3c772c047be74101c8486f75d03ce0bd3e65ede14e91732cf2a932810441c9099
 DIST xfontsel-1.1.0.tar.xz 139560 BLAKE2B e4cb8f25b64e1feb68cdf7ae7982c8e8e6086fb6ad31019b115986220cd9f347edbe738d8d43d0650fd783ef96d2e93a247e462611b0fb33a3aa0a6dc2d2529e SHA512 be67d223668431c9b5dd2ef74032d2f087be5f8f0ccc427bc7ee43e7ce42214edddb07d8c3d6d6de93ea35314392d384f1ab1ae5c48b2cfbce418610e3945a52
 EBUILD xfontsel-1.0.6.ebuild 401 BLAKE2B ba8740496a607caa61135c5f6dab8ac592570c3a459eb62bd95e3193c000bcf8697720975e838926d9e00cc4ee3a45c6b6759424f931e7a654ee907bf69a3099 SHA512 1651e4ec5a34d950811a3bf9c9374b4b7be45324d6f6efd4d00eae96be44ef8a613fc69082a4d7c70152f38465dec48683e08f0e2fa01f1f1c04e1da16cbd919
-EBUILD xfontsel-1.1.0.ebuild 453 BLAKE2B f3b6e06d089cb0140c57e54fbd443fc7bf0b740f3e5fe28604219701005abaf7ad232274e0552136c334c5357085d32e87ed2c5a5d440766873ffef4f2fe0d31 SHA512 abc54849fc3bd9ce1a4924af91c01c0bd299f70ebee1cba4f0f94b86f154cf4844a202047fc4f864c2285a2b40787e3b36079f39e83c1512426c8fda0e2751eb
+EBUILD xfontsel-1.1.0.ebuild 451 BLAKE2B 65a41357ba463065cc47b3744e75b7c0451532505f89fe07e5bbe3693598c79b9f0f783bbcaa371ab4ceb2414617da9f0a95c69100b9b2b5c2f64bfc73aad4ea SHA512 53e6c61d4a8ab9611b0bd00b4e3736f86c2035aa204fbd837f4a3c129045275c73e4486fc758987915e66be0934e1e6b265fe0a83e821b03527cc7071ea7a803
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-apps/xfontsel/xfontsel-1.1.0.ebuild b/x11-apps/xfontsel/xfontsel-1.1.0.ebuild
index af4791bf525b..3021c5b72538 100644
--- a/x11-apps/xfontsel/xfontsel-1.1.0.ebuild
+++ b/x11-apps/xfontsel/xfontsel-1.1.0.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="point and click selection of X11 font names"
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 RDEPEND="
 	x11-libs/libXaw
diff --git a/x11-apps/xkbutils/Manifest b/x11-apps/xkbutils/Manifest
index 5918d8dbef5e..9d7cb0f3a125 100644
--- a/x11-apps/xkbutils/Manifest
+++ b/x11-apps/xkbutils/Manifest
@@ -1,5 +1,5 @@
 DIST xkbutils-1.0.4.tar.bz2 131269 BLAKE2B 20e51a33b280bf4eaf6dfb3b2986ffdb09d1bb4fe3dd3689de5256204cc0e90808367b0afc054e2b5a6746b3b125bc0d20337761e1714c069f3c300a65fddb06 SHA512 5bb6cb52ac02a4ec18332559853815585ca86e00e8c6452483af10c4db75811fe00952575dbbad5b7d03b9d6498830fb45d617b1b3c5c1cea8445f1131856a4d
 DIST xkbutils-1.0.5.tar.xz 129344 BLAKE2B ac2572b31638120dd5c5e92497f9cde4b43df7ab0f13882f5f1fbac71084dc112a1f9e34d10adf5a4eb83b1b1636ab2388ae8675be5ac1048a3913ac7b0d7f53 SHA512 0d8d460f5e015e9034292688437511068dab61216c2493f2981cfb63aaa012976ac9435c1586a22c0940fbfcb779b48dce9b85832303fe2b854aa945b814ac77
 EBUILD xkbutils-1.0.4-r1.ebuild 357 BLAKE2B 91ad87fa648ae3520b0a140b7c9cdc29ae09f78e06deb88d4a3f261d146824c2016316e528f91386f2b0149f388707536f439684a6cbea1d05137fd3880e2b5c SHA512 795a2f878e3795267bd150bdbdb8a27dac5b169e1c2103250eff0f94cde0b5e6142b0a5fb81963e2b6f50f36c42187bad9c406947ddb2748cfde7831d417cf13
-EBUILD xkbutils-1.0.5.ebuild 391 BLAKE2B 7990d42365200c7b5d53e93876117c897b1e91de16462a763108637f790c1abd496968b4874a521255412df19bc49118a10dac73468c620cb063dcba42d402cf SHA512 02f8f641df4070e0c38127ad3bf69903be6c88dffbf168442138b9765a5c84d09feadc6883404675d4a463a75b109d659f916a02784c86eab498a86ec6072721
+EBUILD xkbutils-1.0.5.ebuild 389 BLAKE2B 20f6a7db1f0955402f79376f925138b3ecb936653f89c569ac9e705024ebe958f4139ee8e424f540dad7c36836c47c98d7dcd5f05c3ec04da53aa1dd5375b6ad SHA512 d572d1d8cf9eade5e71efe7a4c5312b03f90efbd51efd5cb5a4ebbe9d6165a1d8e8a39eab17f9458baa75b8c3a4a3cd5a27989455a7d523b639d30e34f473428
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-apps/xkbutils/xkbutils-1.0.5.ebuild b/x11-apps/xkbutils/xkbutils-1.0.5.ebuild
index b8f8e582f850..6ba1613e4640 100644
--- a/x11-apps/xkbutils/xkbutils-1.0.5.ebuild
+++ b/x11-apps/xkbutils/xkbutils-1.0.5.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org xkbutils application"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	x11-libs/libX11
diff --git a/x11-apps/xmag/Manifest b/x11-apps/xmag/Manifest
index 6444c25ae66d..0e637c623864 100644
--- a/x11-apps/xmag/Manifest
+++ b/x11-apps/xmag/Manifest
@@ -1,5 +1,5 @@
 DIST xmag-1.0.6.tar.bz2 143112 BLAKE2B f53d7f564c71100e5903c19ee86aae3405cbc56258c89a5ad3d5e583649e1c2a862fef875c6de18c462e103da2afcd4fcfc9927188e7a4e8b980c7d80b2c4c64 SHA512 98f3c8e0c58f31cd4f1736ba9c5cd68dba3b2e2de6191988de8ae3e91b1d310803461840189ad56be45ee57c9ca05a2c63544a49b02ce6f79f2ebc14c59613de
 DIST xmag-1.0.7.tar.xz 137660 BLAKE2B aa809a5e36d5e05524ab78d2382e15b2294439927ee7b441d246134120cef360fc2eb32b0611874a4bc4b45613a8e0fcc0e6cd595fea3fbd5a919aba593d90d9 SHA512 d35ac5d977b9f3bd03fb919bf178f68bdbc6ef2a57915b407d836fce0582f5cb78d0b79043bb6f8d015464ca113deb09469c3b724aed03901a4c3fc4a9982984
 EBUILD xmag-1.0.6.ebuild 325 BLAKE2B cd8d45f91f7bf0bdb71d1e271706a0108c8792450975cf54c30b577624000c83a7e55e18089106bc2169cd1c79b30ff6e8cd21e14ab56a418aefac8d09a00981 SHA512 fecd2fcc9d1aa206ef66f34fd3b244ca2d10089f5c195446dd408f7b329078d681ef48ebc8717561dd0faadfd32ec1681ba40ec160dd0bf74ee0eba7b9436916
-EBUILD xmag-1.0.7.ebuild 377 BLAKE2B d644ba1fd5190d85d966ee9f7cff1ea9b1465eedb63417ab962b1d3b8c64bcf0b3164b9b916a34c6397c6af828e27a7aa5fc7d073315cc50b4bf628c1ced90a0 SHA512 81e1594d191a1f782ce104a9d0678e754a549ec181236aaa699b681a2bb30000a0c8fa190c560786fba679d74d93001dea2b2d0e2ea7266512db1d1caf391ade
+EBUILD xmag-1.0.7.ebuild 375 BLAKE2B c718ffaf8565215689ca77c6d3b84f1260d9f70b599ee82728a8b9711dbf4deaaebee0180bf5979314b4cabef3f6e5ff034626531c93b1027d878fce1efa6c93 SHA512 9036eee11b57e750e4d927cec03acda0ec570e5185599e553084b53fc64d876ecac877f705d03f9fefd62dec9e5c8c28ef796928e901e6f81d1449966a715496
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-apps/xmag/xmag-1.0.7.ebuild b/x11-apps/xmag/xmag-1.0.7.ebuild
index 9e5c389509ca..546eec70aa90 100644
--- a/x11-apps/xmag/xmag-1.0.7.ebuild
+++ b/x11-apps/xmag/xmag-1.0.7.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org xmag application"
 
-KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
 
 RDEPEND="
 	x11-libs/libXaw
diff --git a/x11-apps/xmessage/Manifest b/x11-apps/xmessage/Manifest
index 64c69d05c9b1..4cef2869f7e7 100644
--- a/x11-apps/xmessage/Manifest
+++ b/x11-apps/xmessage/Manifest
@@ -1,5 +1,5 @@
 DIST xmessage-1.0.5.tar.bz2 133393 BLAKE2B afa42e20ba995fa1086cd3cee5b90be8564c521f7bc12b544a787cc753782e1cfdbc5a94f5925f5bae1b630b7ac08fcaeee59e319f680d3be29c46d5421aa048 SHA512 a8423c3986b1576fa67800c315a605a527bb9a8f594ac269a736ae7b91eed0d4d83deb89148197dc3cd3f0e51894146958ce2979f78e97dcdb99c5326e34dabe
 DIST xmessage-1.0.6.tar.xz 126324 BLAKE2B f818af4d7a17c2da6e00fbc00622606153b74bccb809ccc42226a0be3d6f19840c3a20278fe2d73f4af1e624b37a4c086c81650ab9262a1692e6d3ab5d5b1764 SHA512 89deb7a81bd047027f99cb92cd16a47f94479c61a6f9fbac4638e6d642037b3e9bbac2313db59ac8c5544175947c693f6a210537c6df2b88dc3de1c67498cba8
 EBUILD xmessage-1.0.5-r1.ebuild 468 BLAKE2B 1852aa88e19d0042a7362de224baf8ad1d1c24525d1eb8bf1e490e9d79621c7ffa677b542a89ea90102e93427910da547bbd4d9c2269b9791b790a34dc32804a SHA512 5b05840df386b9b1ebdd5c2c69336cc2f14159d7bcf3de0722f14f5b64c3e296cc21f4c08783187ec265915b21801971010b7c2df5d5b6d1e51453f3e46c181c
-EBUILD xmessage-1.0.6.ebuild 523 BLAKE2B 779947e75b346a16ce85a21aff5ead5dbe37c4719a12a55f25377289196a2d080e5e9b5f4762e06037b4a82fcecdbf3deec3d77d453f758d1be87ab6a80b79e0 SHA512 238cb1a6a06744d04ddbd1fa9837dd8e154c779c566b3caaf1aaa39b8b9df720b95b95595f8c2890f9c9ba365bf395b9dc0261fd1a82cce15bf3c786c4094881
+EBUILD xmessage-1.0.6.ebuild 521 BLAKE2B 6c8ab619f3752cfe55f7df68ded83d6f79be07b3ec90941ee836f2a51914e201800ad8c19952a07b25ebce530a11a891292d42a7eb8890ed56614d39625558ba SHA512 c61b62db613b9db991b39db275702650ffc93f9f23e827e99560f5d45ad99dd639f79f2dd935005579bca0f43e285ace4c6c0560048b6f76258950a27f8d3fbf
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-apps/xmessage/xmessage-1.0.6.ebuild b/x11-apps/xmessage/xmessage-1.0.6.ebuild
index 624e321d264f..80c388e0f52b 100644
--- a/x11-apps/xmessage/xmessage-1.0.6.ebuild
+++ b/x11-apps/xmessage/xmessage-1.0.6.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="display a message or query in a window (X-based /bin/echo)"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	x11-libs/libXaw
diff --git a/x11-apps/xmodmap/Manifest b/x11-apps/xmodmap/Manifest
index 92e174e14c59..4076cfd1ea29 100644
--- a/x11-apps/xmodmap/Manifest
+++ b/x11-apps/xmodmap/Manifest
@@ -1,5 +1,5 @@
 DIST xmodmap-1.0.10.tar.bz2 145489 BLAKE2B 503e72882a1d6d5c916cb60b898156adbdccc3e90bda85b161ac7a57ee607605331be73bd779603cfab1013d065e28f3165cce2ef50d71579330ab0361078a22 SHA512 324c7dcef843186088f16b3bc47485eb3c9b4331e56ce43b692deb4bb3d4f4f27512480e91a379cceac8383df920dc5e37cd825246b50b6343291cec48134c04
 DIST xmodmap-1.0.11.tar.xz 139532 BLAKE2B d50611e762b665b18c370ea49d981d7820f16e2e10450bbb2ebc76c867a3a4e75d68e7dacfb9e610849770afa95f4d757863953217aac8e13509b386bdb8131d SHA512 a78f916f048d2017f079733becc99232c087c360ece61ec6c4fa4b5b130b96a1b10c4ce1b64a15bdcab7ea05de3c7f16035503d5be6f8ce1a7612ce71d558510
 EBUILD xmodmap-1.0.10.ebuild 419 BLAKE2B 67b1ed4c7376fdc1ea97831987bdfa2d2836fd03a78aceede1071a843a202a802dfdd72ceb50bf1c889ee119952c7ebd9b90c38c58267ae92a139b0dcbfdf8e8 SHA512 301c12a54574befc3245365955bb02c7eabf6978c1912c80ccd6bb2bf933f9f76d2019c189fb9643979fb2f7caa6005c246c72d60dbca2fad80a42e2ebf89048
-EBUILD xmodmap-1.0.11.ebuild 464 BLAKE2B 3fa60e2468bddeff074ec64176a9291d725c28638baf599a224aaf7817326a3935f96570084bc6f212a0a8ca129d53ada65ad597be5e46fc4244c23e094ee2a1 SHA512 e1e1ea2acce1fbdc422d67081e2ea36b5ac44728ff082803c6973a530c75fb60b11e1eded400d9bd6979624efced53bdfa3fa749dd9f4aecce128463e7c2aa12
+EBUILD xmodmap-1.0.11.ebuild 462 BLAKE2B bfd133f170d36b1cd5ec5986d332eed71ea7d1900ab3c1cb76dc21f66a49ae4d4082f809b22362f1392042375202647018217005c8b7bd56e566f3acb26d2790 SHA512 9a02f05574302a82f8933b3f2e32335e812ea299ad3a42f1a2047b9190afd3a00affc80bb905d94c60b11dbb9496e181a78da2726479dd6b3759ed6a73266ef2
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-apps/xmodmap/xmodmap-1.0.11.ebuild b/x11-apps/xmodmap/xmodmap-1.0.11.ebuild
index fecaca0bd58d..b23178d52625 100644
--- a/x11-apps/xmodmap/xmodmap-1.0.11.ebuild
+++ b/x11-apps/xmodmap/xmodmap-1.0.11.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="utility for modifying keymaps and pointer button mappings in X"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="x11-libs/libX11"
 DEPEND="${RDEPEND}
diff --git a/x11-apps/xpr/Manifest b/x11-apps/xpr/Manifest
index 7ac187f15bb0..4620f0416591 100644
--- a/x11-apps/xpr/Manifest
+++ b/x11-apps/xpr/Manifest
@@ -1,5 +1,5 @@
 DIST xpr-1.0.5.tar.bz2 150714 BLAKE2B 89d20134a3a9a12e319d343ae20c3aac71d1d2d2cbbffe1ff71375211efb3a4b22c2d99099fb1621fba838778702cca8c088181218c5d2c5fcb6af706d23b359 SHA512 d5dfb936ec4ad0067d02654dec8e862fe337ff6a2c2f974b2b3a612a829c2e728a0d51e7aba00ed2a94dc96dc50cc69f2c59f522e0635013f5f4f5bb3f4ab967
 DIST xpr-1.1.0.tar.xz 140244 BLAKE2B b3525415b18615abe489466965fa414ee343d0ea2ebbad4e75e943a0e19fc29cb2a2cce4fde07c345d84f2c53eeb47c0162719d7322a93ddacfa80452153f45b SHA512 53eb896cf1844036a13b1018ffcecbc6a0a56eebe0d7cb6331dbe691207498d2c41f3791655b7fc081acfef2ed9904987f363b710bf0eeff6c8d33f819a951cb
 EBUILD xpr-1.0.5-r1.ebuild 337 BLAKE2B 79b9ee3cd7fbd51e01ada31a92e5fc9ace1bb404d67db3b977913422484a0d4b54a0cd79294527ecaa32c3a407581cdf2e87e681ce7022881c53b4fe7c5450a4 SHA512 385345d803a59c5fa6c7429b0c196b9cc981cd591c8095e260a3e216e506da2db2dc1a8c236a76928ebd144e61c1ab331e8a019e9ac4c314a5a44d9cabe898eb
-EBUILD xpr-1.1.0.ebuild 369 BLAKE2B beb98ece576a4d8462e4c770b93e89b323f00ccaa1358d133f1cc077e50b0426e8147223c34d73198f44e84f69ae11bec2c2441b49f71dd69fec4e42af114dc0 SHA512 78c099606ac574da999283656095215ed0c66148293f5e05cb3b0fbf43d6407cb8ce07c45bf4bd67e867fe46a00550a6a913b819284a22a1e1c3eba4bfdea751
+EBUILD xpr-1.1.0.ebuild 367 BLAKE2B f109292e73bedccfb95db2b6e346b736932b295274621d280a0dbcacae980acda0226c52fff92f35caad77a3a6ba081f91d1541f62a191b16da1875aa6b95557 SHA512 2d4fcbcc380ad1364696953e613a0aec320c94e12a3310308d25499d7fc0c749640947f005ec5349abc5f540188cf56bee4cd1f81804baf8389d3fa3f453b34f
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-apps/xpr/xpr-1.1.0.ebuild b/x11-apps/xpr/xpr-1.1.0.ebuild
index ca37c48d598a..dc1af5f2747f 100644
--- a/x11-apps/xpr/xpr-1.1.0.ebuild
+++ b/x11-apps/xpr/xpr-1.1.0.ebuild
@@ -7,7 +7,7 @@ XORG_TARBALL_SUFFIX="xz"
 inherit xorg-3
 
 DESCRIPTION="X.Org xpr application"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	x11-libs/libX11
diff --git a/x11-apps/xrefresh/Manifest b/x11-apps/xrefresh/Manifest
index cce5e428ec07..20e36083a366 100644
--- a/x11-apps/xrefresh/Manifest
+++ b/x11-apps/xrefresh/Manifest
@@ -1,5 +1,5 @@
 DIST xrefresh-1.0.6.tar.bz2 127494 BLAKE2B 587f5756bbd3095e77494288d4b9cca99992b342bb718e5cadefdfbf018710ce0f216f43b68814d0d0a681c87d855be4ecf199a314361278c3bfdd81e6073f69 SHA512 361e97fecfc2706d5eeab69df0d4dd4baa55b6783cfddabf51d8561b7c930d71ce6c217e0512c6564208d69b04f89c69ea8c0bfb2e4f6cc25b062b55e4db3674
 DIST xrefresh-1.0.7.tar.xz 121820 BLAKE2B c60ffec9e03b1d07b25228b9066b05a437160a48c182988781890f59271b835079af0dd071ce77b56768fffeb0203bb092fbf80c286272c82e56af2c867ae3e0 SHA512 8fcbb01aa368944ca536f050ab194b21bbd6b2a56265a7ed5807882e5c2f9660105283cdba0ea35b3e4a17a015586aeb82906e081da030332dfc49169a191c31
 EBUILD xrefresh-1.0.6-r1.ebuild 331 BLAKE2B f7f6cbfd2a77dbb8d077e6eb8925263917ae547ff40b859623b397b125265a2d4863541fc49d0e0ac0d0a5786ee55664a3a8175508d0ed732730bb5382864ee5 SHA512 b71f02718163a96f0f68549c1010a051c619f96a6b2fae38ac607edcc4f2b4b7cbc232bdb07324cd04ace972040438e65dd824d08f3785199b649f3450420721
-EBUILD xrefresh-1.0.7.ebuild 363 BLAKE2B 199c0aeb15cabe0036a15f0e1084223a60aa004d7f4138da6c81ada93d4b6e479b5e116705c38bcb9d86bd6be53cd8703d2ea69882027af3662341574e9dc071 SHA512 4ad26a5824d67373c0d871d8344e15d31fdf000b6a4fb1ae112e30736b1f069f007166754d50d47bdb8ce93519cb29570908a6cfe15eee71d07c877e278d8c29
+EBUILD xrefresh-1.0.7.ebuild 361 BLAKE2B 139f9b830a8845cbb3493ee1ede77ba2b48674580b8394f2acaff1275b4a5a6661e8b8a9bcc3fc4ed10a96cc741d2ddc5e9d6a185ce602ef2434c73e3c312966 SHA512 9653f63af4b595a4d3c5cb1904842d25e6d2c4e39786d7d5efdb547834747557fa70d386aff3df15df038b3047c2e9806cd19484b37c965629f2d0a3c8aef088
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-apps/xrefresh/xrefresh-1.0.7.ebuild b/x11-apps/xrefresh/xrefresh-1.0.7.ebuild
index 58d4971c8e0b..a4787b7325a9 100644
--- a/x11-apps/xrefresh/xrefresh-1.0.7.ebuild
+++ b/x11-apps/xrefresh/xrefresh-1.0.7.ebuild
@@ -7,7 +7,7 @@ XORG_TARBALL_SUFFIX="xz"
 inherit xorg-3
 
 DESCRIPTION="refresh all or part of an X screen"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="x11-libs/libX11"
 DEPEND="${RDEPEND}
diff --git a/x11-apps/xwud/Manifest b/x11-apps/xwud/Manifest
index 9fa370127f21..73b43d75cb19 100644
--- a/x11-apps/xwud/Manifest
+++ b/x11-apps/xwud/Manifest
@@ -1,5 +1,5 @@
 DIST xwud-1.0.5.tar.bz2 133376 BLAKE2B 27ce8251ae2a2a87393655e1824121dd54f75839a8066405299e9052bf2c55c6946cd686f285dca1d7339029d8ca8b94e4adb3efb485b42bd347db212b12858d SHA512 27a0ce7481978ae6cd94b0d94374af72185e270d68f2496620e148bb00945427c4827138d9efc48745e6382e3da3390ed0cdff7dbd02dcf9706e8ecccae97184
 DIST xwud-1.0.6.tar.xz 126696 BLAKE2B cd272963c7edc71d4d4a0863dacf39a3432f1b344fe90e698d167df1394b7d5f00e3481eaa97fa47d9dd4e18778193b15879fec73746517a4a6ac69b098c1ec3 SHA512 a7b964d9ef13e4726b2ef84dcc1040cdf510c8031c3e6e1dc1c711e65d9e56f1fc5921a7af3dbbd898b861c79e9da6242da23c2e73816e39152ae719052293e9
 EBUILD xwud-1.0.5-r1.ebuild 319 BLAKE2B 718d8d9bb40a81cb4f0a0e95d84e2a8ea2c6fe168c2cca9c32d33532ffcd48fa8f34418b69bd222f3d963908e15ff03f135e3f1627cac071f6a4a0b7556c5d9b SHA512 5a6728e1c179e1ff41535f26f530b300ae67b43bd56266dd1576d17ff1b18fc874aa2e3060827b4fe13ef283a29416cac41ec2b2244d88056a8fd6ddfcfce3a2
-EBUILD xwud-1.0.6.ebuild 351 BLAKE2B 76c8468fde9ab86f26a7ad9ea69bb3ecf15b3058ccf02b0b94249a73bdef5968893466749e0fe1ab2ccff340a5f1151eef458ba276aa2e7c7b17423a9c2d3725 SHA512 a080d21fdd46e17d95ddf614585b89e0eaa410c320b7fff98f31cae56eb8b892510c507b6bb1916506da1f455a15d66b15ddfc2e55a1eba81bae9ef8eaecc9e0
+EBUILD xwud-1.0.6.ebuild 349 BLAKE2B a21f0934eb49aba1a4d85cf61e7f21e2ebea4a40069e3545dec34989fd9609933c4a1af6e84dc8e2e5b39cae7d38a26a9428fa4fbc6019bd6367dca364545c82 SHA512 535ad2c75003748b161173117a59bf38ac1b3d8d717eeacfb8865fb146ed0ea2283ab154faba9d0d3270aea9108ff298fb3da69a9124763efaafb77ee6d51aee
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-apps/xwud/xwud-1.0.6.ebuild b/x11-apps/xwud/xwud-1.0.6.ebuild
index ad59e9402ee0..da676824a04b 100644
--- a/x11-apps/xwud/xwud-1.0.6.ebuild
+++ b/x11-apps/xwud/xwud-1.0.6.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="image displayer for X"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="x11-libs/libX11"
 DEPEND="${RDEPEND}
diff --git a/x11-base/Manifest.gz b/x11-base/Manifest.gz
index 6fa1bb721266..14c5e3ec6927 100644
--- a/x11-base/Manifest.gz
+++ b/x11-base/Manifest.gz
diff --git a/x11-base/xcb-proto/Manifest b/x11-base/xcb-proto/Manifest
index f6dcde211ef5..630b219d7724 100644
--- a/x11-base/xcb-proto/Manifest
+++ b/x11-base/xcb-proto/Manifest
@@ -1,5 +1,5 @@
 DIST xcb-proto-1.15.2.tar.xz 148108 BLAKE2B 0d6cc87ea0d2de594ba11b11255779e90d3c7507f0002453b3d1b2ac73fb604e5ee52e516bbcf76bce2a89027f8c8de6289d21aa2bb23d7d3e2ee77211b54946 SHA512 9d0b2f0a4dbbf2d64e32ff4658d1663e13d7e5f1bffc1e8d45be7b9dd5bab46e29fc1c2f6e66a7a569e374ba6756faf3c39b0b5e5560df6d7f8b68beec97659d
 DIST xcb-proto-1.15.tar.xz 146628 BLAKE2B d7f38f1a415a7c70af372c64726e089ee454ffb981c031e4b8e93f345a1ada9dc40fb4e8b59adf553af8b4d9b7ef52730c9df56a0c24e53f98b3403346c7e810 SHA512 a333ac7c39f17ff2567419d09a9a77210c943a4e88d79eb152d416ae26bf6fb14e2446f9817abc806edd7aa3733bd4de5852b5ae90a25cbcc9d40e59c211aa36
-EBUILD xcb-proto-1.15.2.ebuild 1212 BLAKE2B c5c1880bef3d50009d7dec6075282093f54e28bdcdf4dfc69e5cad8b2b476f464f35301cfa31f0ea1469b0cb9ad59149bb837b0d0315faa265e8b2302a6e2330 SHA512 c26abd6c262487baf6376fa4fe65803ddf8f1ca0db4f534f9dcb1e17ea10d566f53a7b4912711626b020cb32f05bfe2a2eab3529d8cf6b7ba12f586603fbb0a3
+EBUILD xcb-proto-1.15.2.ebuild 1210 BLAKE2B 91b398f0880925af488f15835f89918d4a372b5cdec85f6d883d468cc9aa04345e6234a54133f60f48b923d33488da5c985b462a30a3d6af90f6af66a15b43a3 SHA512 cb2c92c6ca33b6307b1cb5dd6bcee6b9237dc19c065313730bf70e840edca352248cb2184ea0f5ff289ae115e8dcf6ac7ec0c97fe2c02eb301bf8966da11754a
 EBUILD xcb-proto-1.15.ebuild 1274 BLAKE2B dacbfa8fd5b5db71b4820ddb6fc46d77099bce70f0df1415a30302a6447415cf4a96f1efcff27f22e460d6d8603ae171ed66aa26388bd33ba585982379bb9d59 SHA512 ee3bf836c669c92f76acebd8cd7bb29ebbd20ae940aa0ff52c99cd901091ff04311e9d0fcedbd1943dfc7dfb8d95dc8b237b0635933b03c7bcff5d3ca2b963a2
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-base/xcb-proto/xcb-proto-1.15.2.ebuild b/x11-base/xcb-proto/xcb-proto-1.15.2.ebuild
index 40e67119e4ae..f431b21c5fba 100644
--- a/x11-base/xcb-proto/xcb-proto-1.15.2.ebuild
+++ b/x11-base/xcb-proto/xcb-proto-1.15.2.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="X C-language Bindings protocol headers"
 HOMEPAGE="https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/proto/xcbproto"
 EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/proto/xcbproto.git"
 
-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"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 DEPEND=""
diff --git a/x11-drivers/Manifest.gz b/x11-drivers/Manifest.gz
index 62ea09bce75b..a7d08ab32f35 100644
--- a/x11-drivers/Manifest.gz
+++ b/x11-drivers/Manifest.gz
diff --git a/x11-drivers/xf86-input-synaptics/Manifest b/x11-drivers/xf86-input-synaptics/Manifest
index 0120d38588ef..b12a5ba60feb 100644
--- a/x11-drivers/xf86-input-synaptics/Manifest
+++ b/x11-drivers/xf86-input-synaptics/Manifest
@@ -1,5 +1,5 @@
 DIST xf86-input-synaptics-1.9.1.tar.bz2 503722 BLAKE2B 5ff2f792d187ff0f3fabb1ee194f4eae1397d993627ef3a74b1c838cd611fc2834c6453b57d0dc27d7a6e0bc69b717eb1cb76c87833dd1c66b1af5ac824e1d55 SHA512 978eddd456aa7361047bc3d72e5127b24b13de29b0dddb6a0acc9f9da93931baa2b22fb5d1e6be164f629a11e5d97d753b835426435396b45b1af5eb8d546c3f
 DIST xf86-input-synaptics-1.9.2.tar.xz 432380 BLAKE2B 7ba94565f454fff8ddaf33695a7a16526810bf2677ef01e9ae740fd00a95810b4d42fb0077fe93120ac72398ca18ade48c7b389ecbc37f2438beaa97a6a21db5 SHA512 6fd46505f22bba79f612fbd48dddd4818f7d874cc29caac71840744de27f1d224c68861e3a18d2a866b78178924d2f093f5260e27b221aa1fb17dbc09d66b649
 EBUILD xf86-input-synaptics-1.9.1.ebuild 858 BLAKE2B f484b206aa2599219c8105722b08e8523dc2a0045686777d1dc5a39eb8f0d4819411f2124f6d259eee4521fe405658bf65995cb3faa20f9b7c335b2e17ce6226 SHA512 273e65950a76d072c77b59fffc953f1e1027cb7c41a4b40e05a27ae11531371fd61a95b4563d08d837ba5973e76173ecfcf9070330de7e0bc62c2797d0b686de
-EBUILD xf86-input-synaptics-1.9.2.ebuild 906 BLAKE2B ccab0c4a4e27f81cce70e46c228f0d6c68aef020beebdc620926fa7a637da144579182875dc4163fdfea6a0c2f72c7bb58dfde386d01d18fc533b93239028203 SHA512 fcd701467fcbbd60619b03202cb0c6d51f67f957a11ccdd08e36d0c0b620bfe1a727b8f23f0f9a5b579abce06f27cbdf03df65faac017f832f08d21f2fd8fc00
+EBUILD xf86-input-synaptics-1.9.2.ebuild 904 BLAKE2B 32e92a97b0d2169dacd3d7e8b4f1778ab3dd71d4d18661fc266e0a5bc1c763075c754ae19f762d65915b34ff28523e32469c0496e5c4958f25d1fb89f89a2d7a SHA512 5b2e3fd417754b74a8a5fe38b9c2ecc305f74ddd55cc82809a086ff39b1f4f5fd7ffada2aa2d9b5cf833cf6bcb4787a2376e48de10fcf209be584c532ab42ab3
 MISC metadata.xml 235 BLAKE2B 5ed3cd35ac32a5cdd6ac490bafdbc1cd03fc8c6bdbc8194ba7f4a34151a24c4ade7a80705d92348d6d13a9579d18b19ec40a353bf014dc02f98980bfa03d3574 SHA512 3fe78f6dd92b87b30ed02aef15ed72ec5cb62f4c6568dd9b98dcb2f11a4b9ce93955e34c62112a310b4c4a51f87e0e31e31ae5af140e1054c127d3cd344d7267
diff --git a/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.9.2.ebuild b/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.9.2.ebuild
index 780964e36af6..adaf74531f3e 100644
--- a/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.9.2.ebuild
+++ b/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.9.2.ebuild
@@ -8,7 +8,7 @@ inherit linux-info xorg-3
 
 DESCRIPTION="Driver for Synaptics touchpads"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 x86"
 
 RDEPEND="
 	>=x11-base/xorg-server-1.14
diff --git a/x11-drivers/xf86-video-mga/Manifest b/x11-drivers/xf86-video-mga/Manifest
index 10ab4e77663d..21f44715b34b 100644
--- a/x11-drivers/xf86-video-mga/Manifest
+++ b/x11-drivers/xf86-video-mga/Manifest
@@ -1,5 +1,5 @@
 DIST xf86-video-mga-2.0.0.tar.bz2 452486 BLAKE2B e3c0d3d6ee3c1651f96fa2353d94d5f9f19ebf97b121a87749fdb8ba6d8d3bf7066c39c454910a2b1ad9d7e3d44dd3c31bbd432490855df4676bd4fcdafe71c9 SHA512 b92006486aef815ff4399f291d610c65d88c0b32a9dae97658c644715ff62b221b01495b5c7a2311745e26f699c1c1f753b81c7bf54cf75567af9f78ac015540
 DIST xf86-video-mga-2.0.1.tar.xz 403212 BLAKE2B 2d7f4422defb0b57fc7f9bb3c27274f51185eac45445f83f1c9bdba1bff3066f05728e9996f13f8cd2d8a7275602dfc5cef7435b54498700a8ce6efae568631c SHA512 d9a0abedb71f3354788c2f91b770bc00c4118cfa2c99072dea82c28f025bc87bb88ebaf969962a8f0e97e1ff7938aebd9c682b730b0e07d5174dd9e8dc2cdfb6
 EBUILD xf86-video-mga-2.0.0.ebuild 365 BLAKE2B 87f704100fd36ac5e3d8a2cc1920216ffb6e5976bfd970248563b030cf2c7bb93c11d3d6f958f719412722d3aef9f84304d50213047025d20707d911941ed152 SHA512 1fd3f39dfb6c1023e5d91757fdf345a85e6eb0d132ee195c7419e920ede08b99103cc1fd0904d78d616d421154c9e6657061a97957d94578a12352f19edba00d
-EBUILD xf86-video-mga-2.0.1.ebuild 369 BLAKE2B ed9c4dc0c4d48f9c0c7fca610e8cc1280e16ae923a675cbd8a806d99f82fc28f61baf4b4955c385d4b3a1bc97840da054244a299397ce5aa911c2e3545f17459 SHA512 4d0e4607e4d948731f3bb3e07c819428c84b742fa2888f8adeac1f1507ec98a618f3f1ec48770179d91fc29d82de3205ac5359fbd91dcc435a374a04165faeab
+EBUILD xf86-video-mga-2.0.1.ebuild 367 BLAKE2B 84402b6c4bd95f7fe5f28233e8593e9608f76c5054e842578aa3c59b37c399788ae5119c099720e1616835471f67b1845636e0b7e3fe1aa34dbd3c64d5ea1ab8 SHA512 acce414431f4215155d7050c773621f9c54572f25f9bdb9121a6d5fe247bf50d1a00f61d06eaba69b4c239060421563f26db2730d3d116f24c28cde903bc514e
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-drivers/xf86-video-mga/xf86-video-mga-2.0.1.ebuild b/x11-drivers/xf86-video-mga/xf86-video-mga-2.0.1.ebuild
index 25eaf396b06b..a83799d0f85e 100644
--- a/x11-drivers/xf86-video-mga/xf86-video-mga-2.0.1.ebuild
+++ b/x11-drivers/xf86-video-mga/xf86-video-mga-2.0.1.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="Matrox video driver"
 
-KEYWORDS="~alpha ~amd64 ~ia64 ~loong ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~ia64 ~loong ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 
 src_configure() {
 	local XORG_CONFIGURE_OPTIONS=(
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index 337f2f3aa2b6..1f68234ac266 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/libX11/Manifest b/x11-libs/libX11/Manifest
index 43db64b1eaed..ba73d92c3693 100644
--- a/x11-libs/libX11/Manifest
+++ b/x11-libs/libX11/Manifest
@@ -1,5 +1,5 @@
 DIST libX11-1.7.5.tar.xz 1853152 BLAKE2B 95ceccbfd37d8a749a533bdc03feba94236a47185a2cd7ad6592c534c17636906b735aa5800d810d13d3e342e3dbe281bb1f1f3ecab9d07e6a6a50f33beef8af SHA512 ef33e2f631226cab27657f46e1fd4cfc928f62f928d8297474e7b993017c8f92b60272eed6515990cdf3a9d34581837b7a3896e584f3546dd26f3790034df347
 DIST libX11-1.8.1.tar.xz 1818460 BLAKE2B 7602b4d8c65ea3160f81096b4e022b5462e49d96b36dee70fe06e972329dc9d70bbd462e2079da03ba5647d7a72bf03e29aab23c60bcc206c95d770655622226 SHA512 2e36d2c47519e0cb2697f588c0ccdf73fbe75c2163f0855c78f7052dc9e920bca081f9d5e39c707a14067f101faef74fc758c8862eeba675b1535b43119d533a
 EBUILD libX11-1.7.5.ebuild 938 BLAKE2B 6559a7c7633d55efa6774d3b0d100a289e060a32c53cff2fb1c7dcaeffa2119058eeb8aeb1b0ff1d13dfca02fe07086c9d42071233388ede0a5b5f9a74b5bff9 SHA512 340786682d8218feb524815a1813af189f21d5a4b100e3fb61c399afff7897298a34aff2bbe8f6efe96ca9899b89f1e5acc2515f21e9277aad7c423b319f2d32
-EBUILD libX11-1.8.1.ebuild 967 BLAKE2B df59e64b1b8b4a90d635954fe557f961e46003df8821af9e1dfda191213cdea81494e8955f89db729c75a49164114c7a0ff240f4872ac956c8f180a5291db423 SHA512 be72a96e40f6bddc5597a756b58e72ab23a326082af3b414409037f7c06c1a622b64736e8eb09182a4d3dff4b7c323c5ce9307e215a592cb3621427bd96b3301
+EBUILD libX11-1.8.1.ebuild 965 BLAKE2B 5321d65a2896cab7a4dd426064be60ee8df706012716253db4566ffe2d00168abadd7c4c80a72f99b9e496a5a7ef6544ee64b2cb5467e05d73a0d2bf29b9c3fc SHA512 fec36c6343a595892d224ae973e2482a538d0b420789c26d68b4e9d18bde5e6f4f357300d0f202971c93a8365840d705b78aff0d5cedb93efcefebc136f41b9b
 MISC metadata.xml 312 BLAKE2B 297d68d5585ee7fe053a0b9d1e4758d1c8538fbfa6037cddfefa84f5b757c1c768d4ab072f6198e19c1b9bf4d21120440db61e5a9690cc6cfd387ee9d2add736 SHA512 4b5fc7ba8a7c24241e7ab5dd68677ccba15f5e89a76482679f18139faea4ff1555759066041afbf51c65d1870ec0d999a772c340f1e934a6aba0135b8da28d18
diff --git a/x11-libs/libX11/libX11-1.8.1.ebuild b/x11-libs/libX11/libX11-1.8.1.ebuild
index b3cf1311675e..82eda42cf31b 100644
--- a/x11-libs/libX11/libX11-1.8.1.ebuild
+++ b/x11-libs/libX11/libX11-1.8.1.ebuild
@@ -11,7 +11,7 @@ inherit toolchain-funcs xorg-3
 # Note: please bump this with x11-misc/compose-tables
 DESCRIPTION="X.Org X11 library"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/x11-libs/libdrm/Manifest b/x11-libs/libdrm/Manifest
index 92234b9d7585..fbcb5706893a 100644
--- a/x11-libs/libdrm/Manifest
+++ b/x11-libs/libdrm/Manifest
@@ -1,6 +1,6 @@
 DIST libdrm-2.4.111.tar.xz 447388 BLAKE2B bd1fe6a1af3dbdd542ea9d3b887121d917c11ef9c3c0074bbe5d18ffd15050e2df63c744aa5e559e7f8a1f1e9561d3b2ba8b9a45ad72d7c1e6393b7eae99cf54 SHA512 17e92e9e4ded8031ac222764bed7e9ff430a1a377f5e435f6b62b4a7f45cb4c4b769b3b79fbcba11512c1ac973abf8cdcca8e0b9659ae095e915d3d5efcf5516
 DIST libdrm-2.4.112.tar.xz 451872 BLAKE2B a41cbd714e169edd8c6bc6bba5cec8a7a703f553665575c35f43909e2927ed3c1652ddba25b98e63974f0734ca26e818e6ee75613159eb68ea85ba45934df393 SHA512 df8a207d9cce220ee2cf67877eda65394733fbfd0ff85fdbadb2b20ba9bacc41421b32452506c8caecddaf8361564ca68cd6c74d4faf3b1569ab30a3243e4340
 EBUILD libdrm-2.4.111.ebuild 1942 BLAKE2B ce7a3fcd053b207c2c78f20667bf9264d7b5c0f75039fcc49f2b771660eb913307462c35b094ff2b309eaf4e0a658ce68fadce94cb091bb8e07ada1342c769bb SHA512 5f7a642ce1571333d431558af4824ce604463e41f5e031e54c24063f8dc0ed8083875bbdab6fd429e32cf3864726c89505b587546c64d3589c4d0de89456f486
-EBUILD libdrm-2.4.112.ebuild 1950 BLAKE2B d892aa28a9055968915a2eb329ca9ac49bbcaec0ae4f417f46d7fcf0641c2ee95086d8b09d3b433b0d07e452db95951f8c80e0ec8466fbdbbe03a60459a0652d SHA512 a2f387299e8d2446a63efb5f7c80061414143dfe8dde9216c7d6f3d9a6f50e1820f97f27fa7d5977d84b0f83e5119e06c0eddd2e290b773f730744160538fa2b
+EBUILD libdrm-2.4.112.ebuild 1948 BLAKE2B ec8a6f51451c264051108052530233c3b901f7533a57b6f9a2d4da49a0b30465f0cfec3a8ec3b10c3348815b1ea12917a3aa035b0fd02faa306a77ec2237984c SHA512 0e6bd3b2bcb0af34c4ff3779fb87e7a211619eb6032688ef51324c1804a9b5dd654947a3c9487c15ba44556a0f67de94b13422ed95e8e9e1b1ef5a4caeb55e11
 EBUILD libdrm-9999.ebuild 1950 BLAKE2B d892aa28a9055968915a2eb329ca9ac49bbcaec0ae4f417f46d7fcf0641c2ee95086d8b09d3b433b0d07e452db95951f8c80e0ec8466fbdbbe03a60459a0652d SHA512 a2f387299e8d2446a63efb5f7c80061414143dfe8dde9216c7d6f3d9a6f50e1820f97f27fa7d5977d84b0f83e5119e06c0eddd2e290b773f730744160538fa2b
 MISC metadata.xml 304 BLAKE2B e47f11b45b5c90804d5dfd27dbe2f2156099661ac7546152fb4e62046fd030838a0944d7dea35efd2f7b527eb88992c5049a40282dea58097b991c6bcd843693 SHA512 b798cffebaf330272494b6ef84c9c587a920e27ac0ae26336ff256de21768274cfcbe8feb61b7f63bff52294e460f945ada9ab9ddaeaea91d17bc1d6d41360da
diff --git a/x11-libs/libdrm/libdrm-2.4.112.ebuild b/x11-libs/libdrm/libdrm-2.4.112.ebuild
index a8ccddd22d1b..15deeee9e3a0 100644
--- a/x11-libs/libdrm/libdrm-2.4.112.ebuild
+++ b/x11-libs/libdrm/libdrm-2.4.112.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} = 9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="https://dri.freedesktop.org/libdrm/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 VIDEO_CARDS="amdgpu exynos freedreno intel nouveau omap radeon tegra vc4 vivante vmware"
diff --git a/x11-libs/libxcb/Manifest b/x11-libs/libxcb/Manifest
index d3aada6ce765..9994012a5cb6 100644
--- a/x11-libs/libxcb/Manifest
+++ b/x11-libs/libxcb/Manifest
@@ -1,4 +1,4 @@
 DIST libxcb-1.15.tar.xz 446492 BLAKE2B d50146ee9b822dfd0c24513110e1706cda05ce588f276005167a911d3097275f36be1ce755c42c2b2970e750f10b2b943f3e373b6e55865fba986e29811a3545 SHA512 f6c7d766b7cf9cab6abe948ee424cbae6951dbfe2f76fa58a109cdc05b0f0919dcc4e38176a22ff4b95fc1e38596115317e32ba33b24cae0035a4e30dbcbdad9
-EBUILD libxcb-1.15-r1.ebuild 1418 BLAKE2B 71e16e36934cf585735e6981cc27b65d6736ea2dcfafbf7689d71ea974b9945d7723c24e436d307d9b144c06dfd3f39d375692c0f0b243bafa524c454d06dc33 SHA512 e78c446596a8555cc6833b7337d321b4642ff3ac2388d5e40ce7354cc95b9c71556c8a664f98ec75f15df04fad07c95639655e1850eb0c4bdb2ef480d3a2de57
+EBUILD libxcb-1.15-r1.ebuild 1416 BLAKE2B e8e3d934d76daf9f05b22eb31dc47889411cb8fd18d0ed13eb0a93763365de929594bd7a583383bbbee4bda730c754071431720f1e5457d1534ea527dc0f2213 SHA512 3900ebd68f59a916fadc86d62b4c62106bc1bb39257c527e96be522dddad5e41eb338665344fc4f4359f29529677c031b7acba86bd9b135ab0a4b820372337b2
 EBUILD libxcb-1.15.ebuild 1419 BLAKE2B f3cbdfdb4e2e6033dc98dbad1a4a99bca3ced8d444044023bf9f0205d1ab6270c2cb4738aeec1c6654aa96fe9929ab7defd5ad6553b5419bb34b8a1fbeaba1da SHA512 bdac2c0d046ec98dc990a6312f867a413dbff5bde21563e0845bb8d79de5446ebd0f9c9a69ebc2248114920703de5d2af79ce8c292b85e26c4ccda8cf31107ee
 MISC metadata.xml 401 BLAKE2B 67d85ae2c4ac6eecb10245666173d96f896ec9eddc36c8d0890092cbd19c7dd685f327332235937afbb119fa6e69860920fc1e385fdc750d89c85b67a9fbaa20 SHA512 72981a4b87a9219573847178c3d50f9a182c0b0a82917d3d472be062a5bb5e21422bc1776a8988b0ff0a5248a6f5eabe3dee3aa51612b31a7da283fd870b58ab
diff --git a/x11-libs/libxcb/libxcb-1.15-r1.ebuild b/x11-libs/libxcb/libxcb-1.15-r1.ebuild
index f53663413b6f..bbe17eee9b4b 100644
--- a/x11-libs/libxcb/libxcb-1.15-r1.ebuild
+++ b/x11-libs/libxcb/libxcb-1.15-r1.ebuild
@@ -15,7 +15,7 @@ inherit python-any-r1 xorg-3
 DESCRIPTION="X C-language Bindings library"
 HOMEPAGE="https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/lib/libxcb"
 
-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="doc selinux test +xkb"
 RESTRICT="!test? ( test )"
 SLOT="0/1.12"
diff --git a/x11-libs/libxcvt/Manifest b/x11-libs/libxcvt/Manifest
index 70fe346d2398..c9c31030a7ac 100644
--- a/x11-libs/libxcvt/Manifest
+++ b/x11-libs/libxcvt/Manifest
@@ -1,6 +1,6 @@
 DIST libxcvt-0.1.1.tar.xz 9600 BLAKE2B 47628fc10d9d75207b7d09cb5b789e58fae485c95a5e3e95345c289f0eeb20859dff6384049e22532ddcb3c04a84ceca6557c3490e5cd8c6956c6ac6c81d6636 SHA512 50e9cd0283858823d4cfde75f06e23ffc42983272cb1f75408052fb5b76a4bb6f9de7d42d8ff9ec0dae6e95eefebc6273e03c919a92f237585db55eaf1a57005
 DIST libxcvt-0.1.2.tar.xz 9648 BLAKE2B 8a4803eb6790fd0ea1520fd31e335f7a363c3606e74837a959453be8819ce0d450af7bb651887a891aa657a5eeac3e4983041060fa5c87b1238c83354e425de7 SHA512 3f6b2baca712a4608780686932f8881255c07bb74b1a788f9b07d4e22975c038d75111cd6b452257882a0b2bad57eebb2002f80a3e435d2e2d16936597f039b0
 EBUILD libxcvt-0.1.1.ebuild 447 BLAKE2B 5aef8156e2edf6210a9348f78096f55bc7052e946df0f63cdf6345b2faef9bdde4e6957bd7a79063d5ea6d7139783cda8f8be5fe3486a58c52f7d6c2d2acb538 SHA512 10f5f3e0ae3a3f5d6d97734693c37f28caddc39c5c2995c0702de095ec255dafdef84b0f0ca097873589f13095449efd76bd885c3a7ce8092d098f2bcf4895f9
-EBUILD libxcvt-0.1.2.ebuild 455 BLAKE2B 914a44404e7dd3eff5efaf2e0ad19f3a55b6f411b55adce6656c21b9af6973a3b2ae37f392d6d6ee4ccd74ecf630da95a291f7cd558c7c4ffecfc34c662b52a7 SHA512 79d158e1d12b275ba7a2d9e98544e7976b28ddb84da256cd393930c665a197501e2b2fbc61c9d365de07c3537463cfba98e801f4d895e2c45ad1e6ab672bec4e
+EBUILD libxcvt-0.1.2.ebuild 453 BLAKE2B cc6140dc3aa4baaff1925bf051d5f254f65e66816dbd872a729aa1c7865ae061f099bcbbd538c2a1f9747dc8f67a0b2e9a09f89ec1e0c87dc7a65a5f232f9996 SHA512 9d59d55f712bc9b97cb6dfc3f8cee087d325d0da2dd13074f801c11754131e326336985bfa98d453540168e74aab5948f676632d3a04ab32fe091fe7c753de34
 EBUILD libxcvt-9999.ebuild 455 BLAKE2B 914a44404e7dd3eff5efaf2e0ad19f3a55b6f411b55adce6656c21b9af6973a3b2ae37f392d6d6ee4ccd74ecf630da95a291f7cd558c7c4ffecfc34c662b52a7 SHA512 79d158e1d12b275ba7a2d9e98544e7976b28ddb84da256cd393930c665a197501e2b2fbc61c9d365de07c3537463cfba98e801f4d895e2c45ad1e6ab672bec4e
 MISC metadata.xml 235 BLAKE2B 5ed3cd35ac32a5cdd6ac490bafdbc1cd03fc8c6bdbc8194ba7f4a34151a24c4ade7a80705d92348d6d13a9579d18b19ec40a353bf014dc02f98980bfa03d3574 SHA512 3fe78f6dd92b87b30ed02aef15ed72ec5cb62f4c6568dd9b98dcb2f11a4b9ce93955e34c62112a310b4c4a51f87e0e31e31ae5af140e1054c127d3cd344d7267
diff --git a/x11-libs/libxcvt/libxcvt-0.1.2.ebuild b/x11-libs/libxcvt/libxcvt-0.1.2.ebuild
index 920def423f8f..628dffd155f7 100644
--- a/x11-libs/libxcvt/libxcvt-0.1.2.ebuild
+++ b/x11-libs/libxcvt/libxcvt-0.1.2.ebuild
@@ -7,7 +7,7 @@ XORG_TARBALL_SUFFIX="xz"
 inherit xorg-3 meson
 
 if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 fi
 
 DESCRIPTION="X.Org xcvt library and cvt program"
diff --git a/x11-libs/xcb-util-cursor/Manifest b/x11-libs/xcb-util-cursor/Manifest
index e4baf0dbb9b2..a60a9aca670e 100644
--- a/x11-libs/xcb-util-cursor/Manifest
+++ b/x11-libs/xcb-util-cursor/Manifest
@@ -1,4 +1,4 @@
 DIST xcb-util-cursor-0.1.3.tar.bz2 295224 BLAKE2B 7a1a89c0f326f4ac0768110c4aa5a7818ddace1f231f6a0dcfacaf8b157a2d6aae53f5278a02cb945822d83eccb8a01ebb14ab98e8828d8f1d506e42f51431ba SHA512 be5eee7b268b18f356d6aae04820a7e1c51397dac9020d876df379e833200255b5194269541c245a9b4ac286edad4cfe44dae8e4fcfd16a4726dd7553c104c21
 EBUILD xcb-util-cursor-0.1.3-r3.ebuild 1045 BLAKE2B 93f1f3b11db5d69d42445f160c0e41540101f5e3c98368a35dcce1d0a164d410b17f8ded853a07ccbf995ec8c96dec7a137061ea643b8450e19ecf533d902800 SHA512 833070ad90a01aae0ee93a970157a9746b9b85e936b3085cec744d6ec8edb48a766fa972a7c6ac37db49fafd8bb2f5944d98f922c9d99247c7e630b4358aedaa
-EBUILD xcb-util-cursor-0.1.3-r4.ebuild 1032 BLAKE2B 6a9d23746eaa8a8c4b309c3c094daeeec373ee6378429d31438ddcd709a9c1a3a3b67d2a1c030d246273e863c72b1e4fd8f85ed89676e819feb2a359f6fbe623 SHA512 a3dbde0b1f6c319a67d669943bd90384bc02b8102c08d9ddd320315b72cf565d6ad4f42b2f5c1a3670cb24ea539121c2f63a2f3c7923e6d5774798ca6fce7c91
+EBUILD xcb-util-cursor-0.1.3-r4.ebuild 1030 BLAKE2B b70b8db4d10727c4881493cade16fa013d9b47d0cf396a0f53e2f5e9ff9a5022aaf0a18fb06d94aa12d6fe1664c737028af26c5961546bf4be0e11323554b27c SHA512 d94a2442f3508b842b399b9f6b42a5ef6ae03f0fbf1da2e9a5ea1acc15db9e198a003e31607f8a97d3e1a15f8d392538b581cb654b0d8962ed2a8f4d64f119bd
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.3-r4.ebuild b/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.3-r4.ebuild
index 60cd1a1dc7c5..29e9f82793d7 100644
--- a/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.3-r4.ebuild
+++ b/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.3-r4.ebuild
@@ -9,7 +9,7 @@ inherit xorg-3
 DESCRIPTION="X C-language Bindings sample implementations"
 HOMEPAGE="https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/lib/libxcb-cursor"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris"
 
 RDEPEND=">=x11-libs/libxcb-1.9.1:=[${MULTILIB_USEDEP}]
 	>=x11-libs/xcb-util-image-0.3.9-r1[${MULTILIB_USEDEP}]
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 919c5aba60e3..5bab502a13ff 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/compose-tables/Manifest b/x11-misc/compose-tables/Manifest
index aecf0793e1ad..4d901f0fb638 100644
--- a/x11-misc/compose-tables/Manifest
+++ b/x11-misc/compose-tables/Manifest
@@ -1,5 +1,5 @@
 DIST libX11-1.7.5.tar.xz 1853152 BLAKE2B 95ceccbfd37d8a749a533bdc03feba94236a47185a2cd7ad6592c534c17636906b735aa5800d810d13d3e342e3dbe281bb1f1f3ecab9d07e6a6a50f33beef8af SHA512 ef33e2f631226cab27657f46e1fd4cfc928f62f928d8297474e7b993017c8f92b60272eed6515990cdf3a9d34581837b7a3896e584f3546dd26f3790034df347
 DIST libX11-1.8.1.tar.xz 1818460 BLAKE2B 7602b4d8c65ea3160f81096b4e022b5462e49d96b36dee70fe06e972329dc9d70bbd462e2079da03ba5647d7a72bf03e29aab23c60bcc206c95d770655622226 SHA512 2e36d2c47519e0cb2697f588c0ccdf73fbe75c2163f0855c78f7052dc9e920bca081f9d5e39c707a14067f101faef74fc758c8862eeba675b1535b43119d533a
 EBUILD compose-tables-1.7.5.ebuild 943 BLAKE2B 859cec003f23b043e2271eab3aa31a01ee8ff66a7a78749ced99ff98d09eeb085497fe799138d5efa2a30f83f1097305a90ffa7caccf47bffbdfed72faa29e48 SHA512 2355bba44c7af1937aea4cc68248a96e38f9fd6188d85da7a755e344f4e3add63ae19db03409703b103ebb5045401b621a4258866ead6c79fbd1fb78f9e1e9a4
-EBUILD compose-tables-1.8.1.ebuild 958 BLAKE2B 10ca97660777f3ccce45c6f669885e43d970267cce91174caf69a7629e4af791b8a5b6bd311c98786542548eae52655319e2cca7a54788d14b9b53bb49f37fb5 SHA512 d2266d1488116a1d916b967b77676fe40f1ac619e469554075fbb0349b30aab0d98c431626d738ac48fa2771ac45b1fb881cde7a4d1708d0a1e1d36a688b24b5
+EBUILD compose-tables-1.8.1.ebuild 956 BLAKE2B facd605d74e22bb662df9bf8850ca8992014b4e1622f6eec3805a93ae68faf7c7165a19c9ca08976eb286039ce4e19d8e0359b6c138c1debcb70c5e42283ab2d SHA512 a751161544a86f01e53040060821ee540d61e0da2a88db86b73c6382de5dc60393de7fbe59a0bbbc0b586a1b0768b045518e3ffa4c14d50f1e54a6959ae29f14
 MISC metadata.xml 312 BLAKE2B 297d68d5585ee7fe053a0b9d1e4758d1c8538fbfa6037cddfefa84f5b757c1c768d4ab072f6198e19c1b9bf4d21120440db61e5a9690cc6cfd387ee9d2add736 SHA512 4b5fc7ba8a7c24241e7ab5dd68677ccba15f5e89a76482679f18139faea4ff1555759066041afbf51c65d1870ec0d999a772c340f1e934a6aba0135b8da28d18
diff --git a/x11-misc/compose-tables/compose-tables-1.8.1.ebuild b/x11-misc/compose-tables/compose-tables-1.8.1.ebuild
index 64f043d5d3e9..2cc2a5abaff7 100644
--- a/x11-misc/compose-tables/compose-tables-1.8.1.ebuild
+++ b/x11-misc/compose-tables/compose-tables-1.8.1.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="X.Org Compose Key tables from libX11"
 SRC_URI="${XORG_BASE_INDIVIDUAL_URI}/lib/libX11-${PV}.tar.${XORG_TARBALL_SUFFIX}"
 S="${WORKDIR}/libX11-${PV}/"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 # Only needed by configure
 DEPEND="
diff --git a/x11-themes/Manifest.gz b/x11-themes/Manifest.gz
index 7e16cf8d903d..5aedb94829bb 100644
--- a/x11-themes/Manifest.gz
+++ b/x11-themes/Manifest.gz
diff --git a/x11-themes/gentoo-xcursors/Manifest b/x11-themes/gentoo-xcursors/Manifest
index 4a89feedbcc1..14364b362b05 100644
--- a/x11-themes/gentoo-xcursors/Manifest
+++ b/x11-themes/gentoo-xcursors/Manifest
@@ -1,4 +1,4 @@
 DIST gentoo-xcursors-0.3.2.tar.gz 2035025 BLAKE2B 520dbb3f8fe77bc915bb60c81f2abf4fce1ee6fb349ae5064ff5d2fa10c0af7ba2dd00dc0b36f992c96169214c4ebd28dceb1ba069e638e5efab7088ba804fe6 SHA512 5ccbd2e8be7bda4da0578c5a08d967dded9dc4c9163eb96f629c0eaa548f2e46e85f7301de44d5be707cc63a988b925c9c222863da5bac9095dc5170ca9c4aea
 EBUILD gentoo-xcursors-0.3.2-r1.ebuild 1440 BLAKE2B a9b4bf070791fdec7be4d8966b63893807d8cea13eb2f6c0c542869185ec1b74cd00315d5423683b44e4edbe47fe75f48364da8e4048991e8104b951e144c964 SHA512 095534b14414735d5490862eb8224c48b06a729c691d040745cde1787bf99474d9653f148aad2bb2f57501919fedc757d0db018c605ce52578cb771422957c91
-EBUILD gentoo-xcursors-0.3.2-r2.ebuild 980 BLAKE2B a1516f0b6b39f1c653997260efff0602c0d3fbdaf8d159226e37f314ca8ff2fb729099c375c1aff28920ba4e4634cd80f355c078d20ff276d446b98090fb6414 SHA512 e7bf61d40f1b34c7b592a6a1976f41810728bf769f7d1665dc88f684d18213b166d9b1437c094d46d4ce70f0073712789d7579787a252af98947296c9a84e067
+EBUILD gentoo-xcursors-0.3.2-r2.ebuild 978 BLAKE2B 842ca140a8df11a290eb4138512c5ae6e41fc3ec80dda3cfa03b94754d57f1fd77954857f9760d8504a1d9eefe9719f5ab5bb9e371f49a7dc02d2a8891ca4594 SHA512 57e0c5806d184d32aa611f33a30bd05d9c26f74775e4636d4ce1c99475012ab95304b2cd9cd0020c9e225b7a277630099e255aa07b879f8cc8082a3adc62d815
 MISC metadata.xml 625 BLAKE2B a8b1dcb3b123b3ac1131ef60c143b3adf94d1459c6cd00a5d4e56e83f7701f6842838802cea3c7f53cb4105ba0b20a828fd8ee06fa0a93e0ccc3764c2ef53525 SHA512 b80de950edb24625458aeabf9dabb3567306f202f63dc0cdab77b30d80652f833412aab92f3d7e314486d6bcbc823e36fc2718c30293e1e8d704c58593258787
diff --git a/x11-themes/gentoo-xcursors/gentoo-xcursors-0.3.2-r2.ebuild b/x11-themes/gentoo-xcursors/gentoo-xcursors-0.3.2-r2.ebuild
index cf2458d831ec..e76461648e2d 100644
--- a/x11-themes/gentoo-xcursors/gentoo-xcursors-0.3.2-r2.ebuild
+++ b/x11-themes/gentoo-xcursors/gentoo-xcursors-0.3.2-r2.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}/${PN}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
 
 src_install() {
 	insinto /usr/share/icons
author	V3n3RiX <venerix@koprulu.sector>	2022-07-26 20:59:46 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2022-07-26 20:59:46 +0100
commit	1d4cc2fdaa7a04ed1fe39b6cf1d892bd83bd8030 (patch)
tree	15bcf4c47e609ca1bd3dc164c91a9cfbe566dd3f
parent	1503b28e7a30c164cab750c27268f704b8a5cec6 (diff)