gentoo auto-resync : 27:09:2022 - 09:09:50

229 files changed, 3314 insertions, 3272 deletions

diff --git a/Manifest b/Manifest
index b8608c7b7c90..158e72cbd531 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29605 BLAKE2B 9458b090f6ab6eb832ee6b472ddb8af8d57e35d2577d61cab723557ef4fef28cb59d860f096d60480e2f75261194b491cdc8408a83ba3618d735833a72ed6d60 SHA512 f4eba10138594e5cdda82c65d6d071b4b2efe82296cff8b54f4ba399d618387c457dea91d2b8863af0355381da05baddec0a973915090c27c5b861e2663d6b7d
-TIMESTAMP 2022-09-27T01:09:41Z
+MANIFEST Manifest.files.gz 29603 BLAKE2B 7e2cb22294629e0844078c04a4bcea86b46a8ead5257893a0eecd99af52002b085f1beb391f9e3efbc73d84d17d8be8cd97193ca78c07db568bd538cc48bf13c SHA512 90eebd2268ed9650ccc3190674a0622588df85b6f4d3ee74b60062fad79ca2b22ddcaf15d4bab70d27a5f64bd62f7ffb6b2b051177f04280f528b0c0ece732ed
+TIMESTAMP 2022-09-27T07:09:41Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmMyTVVfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmMyobVfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBvkhAAqKcOB+GsBgZdnaOxaoYC0eAPH44TMeq7jR0Xeqo9HelqnfsizdpFFy1r
-S2Vpx4ewE/lj2TRfrC0gL7J9htih+FFGrpuotjIAqANbUxU4h0a0C7FSTjeyvMMq
-6Auuv6ZatoYhJz3eh+gB+5YCrtaz8c/m8RyOWCQrgoYtsmIV8THRX6UOGjFH1/HJ
-hvUdhonTcmMlPDRpyDqYc6IAtuKY4OynheEbacJUzzWnxRkkzipWzQKeGntvYOlo
-qAmhUeB1zLYeGlDw2tJ98b9AoGGK+AMlCUoo2yM8uCPoo7lPh16SERKBWkn2wsNd
-mRn02FiTextqpj7691N/5Ud6DxCpUNqrSRwSqB5j9TUphDR44dzwvDWoBc7iOYUI
-p4pCJjouYwiST+ZND4pae6/RfK/s8y+ywt4pBQMnpoMVmcMPof4OydhhkgSM7m/b
-XE38yBfC5WWvPBQm/LBjrvqx4UFEYGsFIYWeVSaA4fflcKvEFWQROvGl7MC3Ph/K
-jgmUY46+KSzswZaXQFBJ3oqNDG74PVKufIrHyt7fm8z4PunhGLkcUABLcV2JZP+v
-P9/hfImAe/4fJBHg2n3aod+C6C0JUd9uzU7aKKFIAFUnQxjiEwDwcjSNl/ooDyGb
-Fvg0q3hbmplrQFSqFNUIi24A8gUC47t0P7q/A6sBmfl7Zny1tUs=
-=iCgg
+klAY8BAAlMXFA/aVeK2v/TP0GZk2aeAMjJQmOcw+tfDNy0xn6FiuetegxxcK9W3C
+uReFErl9tZOTpn7NqFO79O+rCqTXmXF9fgNkIQ9+FNXEz4DgfuM07hYiAbaPCrm3
+VhmKh2uUEpU0rKqxz2lm9jzTG+luIylRT32fgTQpNi3Vi9vGAHnzWqFu19jvBgi+
+5vOHjEO/P4grw4nzA18zrBVMd0qwrzYByYx0IkBmOwPTk/z3E2cCLlEUGrBOrJ/C
+n/leYa//Mn00Hi3sHl0630QcZeGgWT3252koy+APlpmmYJp1yuU+0qC7pE+IAZWV
+sXPtf0ab3gl+HTw42kmy8bhVq6HUhckyl1aPjuoNkRHGLgC4ZApXH9h1DzqQxu1i
+egKQlDrorNs7qff4kSAyhfHTCUNHCpd3ZnpPC+6VARTJ3k9mPX/7MXvPOCQzlluF
+ywmr9Fr4NAfdYnYxcWMHEcEBwHJGWx33XicTcPzdkuLbJJCdT2dl2Orqc8CyGdIq
+0J/9z1y3d9QpUJvcyNI1I4TdYMS14pWoOcFjWH0ioDhqWK0j2G/dqM55uy61sBQV
+d8TCadxBGbZkYH3c870/+AE/OmwUoVOPt4WGuBAbzRO+iqbFSdfADpZMUBLGLZ8Q
+wjdPYA/sjAvJuB49Vkmo01P/tJhaENYdHoCjLuY+z84gLGzNXTY=
+=/5eW
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index a4f3c5136702..fc32baeb269b 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 55c0e2669383..b51022ff1669 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index ef5f2c392b2c..c8253ee7b347 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -11,6 +11,7 @@ DIST aws-cli-1.25.76.gh.tar.gz 2270850 BLAKE2B 5c642f9cff01884a7a54c619ff8a174b8
 DIST aws-cli-1.25.79.gh.tar.gz 2272740 BLAKE2B f7b411a17d13ab9e2f19c46827d63d47079b6563dd11fd0ecc200256974e1fb45787bd6f92b90248b406622eca163c5a0ed027a7f20de695699b074178316cbd SHA512 3b7986cb43e0c1124e11a70d6d4bfc932919aef4a40f41bbeed27d19659e0de0c69ef8426078d3b3193bbfe43de07fc7df460898426822ca885d6c3497f7c2d1
 DIST aws-cli-1.25.80.gh.tar.gz 2272910 BLAKE2B c7735b405a00a32d67b86bc56cdbbebceaf195ea00ab4250bb6ff091778b67d678a8529bbe8e6ef51a7f0f740a575d2a201dd2cd930c6046247eca469a2b4821 SHA512 10cba4c1e7c562b70d685c185af5dc727128882f5e3ed72dc5ed172b9e201f9b3431bf642f0d556855d5db336e5f7c2ddc0517d414a25e96f6bbfa98cae36f49
 DIST aws-cli-1.25.81.gh.tar.gz 2273195 BLAKE2B 3bf3ca742b08c0bf4367ae1bfabcf8c2626010d60cc11ff66250753f62609eba80053c1d8696cc3184ba9f947f995a8bb95489b01f60a3fa7e1a8cbb4961652c SHA512 4f10de492a56b158d88671c149d4ed4171fbbde8fe84de15a446e31a7d8003a4562439eabd369cb80dcf91987caab6aef05e5b3f5684aeea47ba0d323883c53c
+DIST aws-cli-1.25.82.gh.tar.gz 2273453 BLAKE2B 11c307a78df654634a7ae75cc8a7ce7d37697aa9ce792a3ad2b1a250291f2ff3574bea13219c072f223e4f27b7e5df757b49971374a5962f19b57ae00f77cd44 SHA512 90737a8cc9aac60970e705c5637672b74e89278926196c1363252038401e12bcb31672c878d2a3b6f213f5a5aac308e5b170e90342f6d270793aead3c8485eaf
 EBUILD awscli-1.25.56.ebuild 1841 BLAKE2B 8e87e521eb4464071ec89abd904be4b8056e6be8ed6a4b9aee005c952d5ef4da7e0468e0827e99cf1e460068fa9cff9b974cce96c0e0b87798e5a15f602ec600 SHA512 244149f5d56a3d1f5b4e8fdc3c2a15a4c6357998237cb5a8dc39e66af7aac968d61ba7a5873a10548af57bd08058b18ef3a97b335b42270fa896ecf7bc502f79
 EBUILD awscli-1.25.61.ebuild 1843 BLAKE2B 66c1d54d4e61960ab8a897b3b33818dd6266aa1b0bdd52126942546e1eff2a234bbb2f884a21643fac176af1bd26bf068211f788079dcce78177a5dddc6d05f6 SHA512 fac1bd2328e655695a83ea34d19371c2f632386e4a1a12b0ccb05ab3521b932e28bf4deac0aec9c83bbbec17338d2077e841bd0f93315a0c97286ebe21b3d020
 EBUILD awscli-1.25.64.ebuild 1858 BLAKE2B 46c882fef4c264e87ed8b0f6eb7ca14d5d352bbe14173f73f2705a73ad8665ce0e42c83e043010da16267a444c7ba7b92198867698407f2eea244693c41ed142 SHA512 805599b5cc4f26ff5eb666d0ca1cb4dd27afcfe8ba3b29d6ce54da89347752c4dbbed39f7b6ab5c7f8f7aed8f145eafa62293431f02ca55209fc603a87b19272
@@ -24,4 +25,5 @@ EBUILD awscli-1.25.76.ebuild 1858 BLAKE2B 46c882fef4c264e87ed8b0f6eb7ca14d5d352b
 EBUILD awscli-1.25.79.ebuild 1858 BLAKE2B 1ee53dfc682ba96eb15476dd37b44e1e0833eee35faf61ccad6f24f402a9eb18590e19cad2faa40e11490c13db91f2609859cdd4bcc5caae36a89cecea3143dd SHA512 8370816db2c51b0e6146a031ea1100b47fede8d1ceb82104206f0a55ffbe995a1792d6872913e0d72497b4726f763816ba77c6215441c993554d3065a5f9d3f6
 EBUILD awscli-1.25.80.ebuild 1858 BLAKE2B 1ee53dfc682ba96eb15476dd37b44e1e0833eee35faf61ccad6f24f402a9eb18590e19cad2faa40e11490c13db91f2609859cdd4bcc5caae36a89cecea3143dd SHA512 8370816db2c51b0e6146a031ea1100b47fede8d1ceb82104206f0a55ffbe995a1792d6872913e0d72497b4726f763816ba77c6215441c993554d3065a5f9d3f6
 EBUILD awscli-1.25.81.ebuild 1858 BLAKE2B 1ee53dfc682ba96eb15476dd37b44e1e0833eee35faf61ccad6f24f402a9eb18590e19cad2faa40e11490c13db91f2609859cdd4bcc5caae36a89cecea3143dd SHA512 8370816db2c51b0e6146a031ea1100b47fede8d1ceb82104206f0a55ffbe995a1792d6872913e0d72497b4726f763816ba77c6215441c993554d3065a5f9d3f6
+EBUILD awscli-1.25.82.ebuild 1858 BLAKE2B 1ee53dfc682ba96eb15476dd37b44e1e0833eee35faf61ccad6f24f402a9eb18590e19cad2faa40e11490c13db91f2609859cdd4bcc5caae36a89cecea3143dd SHA512 8370816db2c51b0e6146a031ea1100b47fede8d1ceb82104206f0a55ffbe995a1792d6872913e0d72497b4726f763816ba77c6215441c993554d3065a5f9d3f6
 MISC metadata.xml 334 BLAKE2B 84c9f50e6c0d015aad36a7f625cddf90cf1137a8c2d445cc641cd4890d64261187c10fde59ee1a6c19b98cfdb6ff534c66ae7a7a48a00ec62d6984c9a1891750 SHA512 a845de531df2cd75abf23cdbfa613e586855b95ac4e96566ef193708d7ecf2ec7f7db72fd31b8af0ac4ccd57e51da9c6d129d426bfdc6c4feb57d7df8647f160
diff --git a/app-admin/awscli/awscli-1.25.82.ebuild b/app-admin/awscli/awscli-1.25.82.ebuild
new file mode 100644
index 000000000000..511be374181c
--- /dev/null
+++ b/app-admin/awscli/awscli-1.25.82.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..11} )
+
+inherit bash-completion-r1 distutils-r1 multiprocessing
+
+MY_P=aws-cli-${PV}
+DESCRIPTION="Universal Command Line Environment for AWS"
+HOMEPAGE="
+	https://github.com/aws/aws-cli/
+	https://pypi.org/project/awscli/
+"
+SRC_URI="
+	https://github.com/aws/aws-cli/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+
+# botocore is x.(y+2).(z-1)
+BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(( $(ver_cut 3-) - 1 ))"
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	dev-python/colorama[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/rsa[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	!app-admin/awscli-bin
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-forked[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+	# strip overzealous upper bounds on requirements
+	sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# integration tests require AWS credentials and Internet access
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)" --forked
+}
+
+python_install_all() {
+	newbashcomp bin/aws_bash_completer aws
+
+	insinto /usr/share/zsh/site-functions
+	newins bin/aws_zsh_completer.sh _aws
+
+	distutils-r1_python_install_all
+
+	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
+}
diff --git a/app-admin/drush/Manifest b/app-admin/drush/Manifest
index 4a204ac4b134..0bc4b51b6282 100644
--- a/app-admin/drush/Manifest
+++ b/app-admin/drush/Manifest
@@ -1,5 +1,8 @@
 AUX array-syntax.patch 2166 BLAKE2B 40c40456ea5f2deacb4f83f74abdb58300a1fd03f93544e05d0e4e58ec266422d5b2cffa0652b49022a6096801d8506779e2da5f11cabfbc2e15fb36f1a78fe1 SHA512 8fb8e243b885a40490b0e55a12e65639879e6adae60f2784e6c960338c9e842bb480d9d18d83c1dd834b8114c37c59a4709881936895faf0c3262878de62414a
+AUX drush-6.7.0-gzip-mime.patch 775 BLAKE2B 6ed1f540ecff96f798c6dedb97da136b8f43e46bc5696f8aeedaab2419641880d161562ea04b44cc565bb76a693bf1ac9183d1efefbe1d744977381b45be8a3d SHA512 67002c5653301823b9b8efee4c0c00ef0dda9ca05f516eb13d5a9b82dc5837c28c59fea038f881c90e0313bbcd30ff434d58a1736b00c6be73b8da3c46a9291d
+AUX drush-6.7.0-php8.0.patch 3341 BLAKE2B 681c7bef6f7007e52767c4429015791a8ceb1bbc3ca80c7a8a924e880b811433e67485e5211368dbf89f2f03400f960e06395d64fb67d6fbcb8d85a1c0ce08d1 SHA512 73d74911945a1e74c2ef361e0f1cf89656356062fdcb4c1f36ac9a07d7f62bd29488283fcbffbb2f41700a9a89f6273d8203052fbcadada48bb2002a098a64d4
 AUX update-bash-completion-script-for-2.1.patch 1332 BLAKE2B a54fa2cab268542a37f1020012cf7744106966419d2ba8415a2e2ead882feb3f3dc9bd9b1ab17f8592e5d021855f5361b05304efcc810362224935069ef1b897 SHA512 2e19a6be652684c1b1a2a9d6605c1404272391950408cd6ae964b2bdd9f95b1e59deec5111c1eaa563a92837ea394fcb2315a3032b2ab02996509b98eb7d1cf0
 DIST drush-6.7.0.tar.gz 511581 BLAKE2B d3a589e3de35afe120d790f96ffa7e88b530da1e1d04815b1dea2f05cd081ad7dc6f4b39fa6f19b5620b9913b952ab289ec538f1b7c0c0f298d3cd0129eb7026 SHA512 203870190dd8987ad3da71f7625476c1f94bc75513447a740fd8c16268fb9705bcbc3b2bffc49a44045998e3fa49fd5ee9d4c0634a1fb39605ba8e10b7373fa5
 EBUILD drush-6.7.0-r3.ebuild 1662 BLAKE2B 0751cb188decdb40fdadb7262e76f64dd4714969280d6c86fffa244da69548a231f80410db736fe02d9642d6e3af2f865c708d2c6a7d8596e6d11688a4897546 SHA512 9d679410746ed141b629e4aea2af3ef847062740dc8a7825bc0803f42f117f362309e8741f0dea904ae0d115ac6adc8e5cd0488dd71b90ebc6650f04fbf78820
+EBUILD drush-6.7.0-r4.ebuild 1733 BLAKE2B 97f38bdd2d65cef49d74f05fda5d3aa235cd0caf75665c0fbd1b6b759a10413c4e2a2dc40b710007e1b257d692c7791fe67a596e9837e28315cfc7811e22260a SHA512 a3fe8e7f3eeaae6d8e93d9851b5343d06ba4452e5e2f1e8c79fce8240315b8638101e6c80cd72edc05989a7caf53b1387431804c26314b39c5d145b43c7a0605
 MISC metadata.xml 532 BLAKE2B c6ca539149d500608519aa982f4a3ef7f8e15b472d5140b8569371df6585c9f80ea57d7802fee00267bfe76290f2b9836be20250472bd261500fd5de84b974f7 SHA512 ec95e30855e93d1d04eac73b3dcf538c2ab38fbeb44acb7f3f7f3c3c04af9a5adba7dc96181cc02f136ffd901e22aab362dadef70aa9f84b0dde78a70bd36716
diff --git a/app-admin/drush/drush-6.7.0-r4.ebuild b/app-admin/drush/drush-6.7.0-r4.ebuild
new file mode 100644
index 000000000000..06b318dd0663
--- /dev/null
+++ b/app-admin/drush/drush-6.7.0-r4.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit bash-completion-r1
+
+DESCRIPTION="Command line shell and scripting interface for Drupal"
+HOMEPAGE="https://github.com/drush-ops/drush"
+SRC_URI="https://github.com/drush-ops/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="dev-lang/php[cli,ctype,json(+),simplexml]
+	dev-php/PEAR-Console_Table"
+
+PATCHES=(
+	"${FILESDIR}/update-bash-completion-script-for-2.1.patch"
+	"${FILESDIR}/array-syntax.patch"
+	"${FILESDIR}/${P}-php8.0.patch"
+	"${FILESDIR}/${P}-gzip-mime.patch"
+)
+
+src_prepare() {
+	default
+
+	# dodoc compresses all of the documentation, so we fix the filenames
+	# in a few places.
+	#
+	# First, the README location in bootstrap.inc.
+	sed -i -e \
+		"s!/share/doc/drush!/share/doc/${PF}!" \
+		-e "s!README\.md!\0.bz2!g" \
+		includes/bootstrap.inc || die
+
+	# Next, the list of documentation in docs.drush.inc. Note that
+	# html files don't get compressed.
+	sed -i \
+		-e "s!\.bashrc'!.bashrc.bz2'!" \
+		-e "s!\.inc'!.inc.bz2'!" \
+		-e "s!\.ini'!.ini.bz2'!" \
+		-e "s!\.md'!.md.bz2'!" \
+		-e "s!\.php'!.php.bz2'!" \
+		-e "s!\.script'!.script.bz2'!" \
+		-e "s!\.txt'!.txt.bz2'!" \
+		commands/core/docs.drush.inc || die
+}
+
+src_install() {
+	# Always install the examples; they're referenced within the source
+	# code and too difficult to exorcise.
+	dodoc -r README.md docs examples
+
+	insinto /usr/share/drush
+	doins -r classes commands includes lib misc
+	doins drush_logo-black.png drush.info drush.php
+
+	exeinto /usr/share/drush
+	doexe drush
+	dosym ../share/drush/drush /usr/bin/drush
+
+	keepdir /etc/drush
+	newbashcomp drush.complete.sh drush
+}
diff --git a/app-admin/drush/files/drush-6.7.0-gzip-mime.patch b/app-admin/drush/files/drush-6.7.0-gzip-mime.patch
new file mode 100644
index 000000000000..53601c80fbda
--- /dev/null
+++ b/app-admin/drush/files/drush-6.7.0-gzip-mime.patch
@@ -0,0 +1,25 @@
+From 48a16a67ec072428339cc165743fedab6264edfe Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Mon, 26 Sep 2022 20:01:41 -0400
+Subject: [PATCH 1/4] includes/drush.inc: support application/gzip MIME type.
+
+This type is actually registered, as opposed to application/x-gzip.
+---
+ includes/drush.inc | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/includes/drush.inc b/includes/drush.inc
+index f869b37..a748a0c 100644
+--- a/includes/drush.inc
++++ b/includes/drush.inc
+@@ -930,6 +930,7 @@ function drush_file_is_tarball($path) {
+   $content_type = drush_mime_content_type($path);
+   $supported = array(
+     'application/x-bzip2',
++    'application/gzip',
+     'application/x-gzip',
+     'application/x-tar',
+     'application/x-zip',
+-- 
+2.35.1
+
diff --git a/app-admin/drush/files/drush-6.7.0-php8.0.patch b/app-admin/drush/files/drush-6.7.0-php8.0.patch
new file mode 100644
index 000000000000..33a4ee7ba98b
--- /dev/null
+++ b/app-admin/drush/files/drush-6.7.0-php8.0.patch
@@ -0,0 +1,87 @@
+From 7be49f4d78111372fc58d91132daf6c4230b08ba Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Mon, 26 Sep 2022 19:08:09 -0400
+Subject: [PATCH 1/3] includes/drush.inc: replace create_function() with
+ function(){...}
+
+---
+ includes/drush.inc | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/includes/drush.inc b/includes/drush.inc
+index a748a0c..7b8dda3 100644
+--- a/includes/drush.inc
++++ b/includes/drush.inc
+@@ -987,9 +987,9 @@ function drush_tarball_extract($path, $destination = FALSE, $listing = FALSE, $t
+       // Remove the header line.
+       array_shift($output);
+       // Remove the prefix verb from each line.
+-      $output = array_map(create_function('$str', 'return substr($str, strpos($str, ":") + 3 + ' . strlen($destination) . ');'), $output);
++      $output = array_map(function($str){ return substr($str, strpos($str, ":") + 3 + strlen($destination)) ; }, $output);
+       // Remove any remaining blank lines.
+-      $return = array_filter($output, create_function('$str', 'return $str != "";'));
++      $return = array_filter($output, function($str){return $str != "";});
+     }
+   }
+   // Otherwise we have a possibly-compressed Tar file.
+-- 
+2.35.1
+
+From f118117814ef690ec71f484dc3c4906f82d9c726 Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Mon, 26 Sep 2022 19:32:13 -0400
+Subject: [PATCH 2/3] includes/backend.inc: replace usage of each().
+
+---
+ includes/backend.inc | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/includes/backend.inc b/includes/backend.inc
+index d004850..0ca010d 100644
+--- a/includes/backend.inc
++++ b/includes/backend.inc
+@@ -355,8 +355,8 @@ function _drush_backend_proc_open($cmds, $process_limit, $context = NULL) {
+     if (count($cmds) && (count($open_processes) < $process_limit)) {
+       // Pop the site and command (key / value) from the cmds array
+       end($cmds);
+-      list($site, $cmd) = each($cmds);
+-      unset($cmds[$site]);
++      $site = key($cmds);
++      $cmd = array_pop($cmds);
+ 
+       if (is_array($cmd)) {
+         $c = $cmd['cmd'];
+-- 
+2.35.1
+
+From 7d718639b68bd09c262005cff133d24ffdf800f1 Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Mon, 26 Sep 2022 19:36:29 -0400
+Subject: [PATCH 3/3] includes/environment.inc: default fifth parameter in
+ error handler.
+
+The fifth parameter was removed in php-8.0:
+
+  https://www.php.net/manual/en/function.set-error-handler.php
+
+We now default it to the empty array in drush_error_handler().
+---
+ includes/environment.inc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/includes/environment.inc b/includes/environment.inc
+index 7837104..8f2f414 100644
+--- a/includes/environment.inc
++++ b/includes/environment.inc
+@@ -24,7 +24,7 @@ define('CONSOLE_TABLE_BASE_URL', 'https://github.com/RobLoach/Console_Table/arch
+  * Log PHP errors to the Drush log. This is in effect until Drupal's error
+  * handler takes over.
+  */
+-function drush_error_handler($errno, $message, $filename, $line, $context) {
++function drush_error_handler($errno, $message, $filename, $line, $context=[]) {
+   // E_DEPRECATED was added in PHP 5.3. Drupal 6 will not fix all the
+   // deprecated errors, but suppresses them. So we suppress them as well.
+   if (defined('E_DEPRECATED')) {
+-- 
+2.35.1
+
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index fcb2ef8efae7..4ca81d35e0e9 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index 3a6b72adba0e..9b0a034e0486 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -17,9 +17,7 @@ DIST qemu-7.0.0-docs.tar.xz 5101176 BLAKE2B 827d4af2b3fd229d146b47253d12a8bfd606
 DIST qemu-7.0.0.tar.xz 125117636 BLAKE2B ceda6d9f1a585298bd49fed61e8bb35f0064ad8388a9f979c8bd68a38bfe1a47c5bb055e5f74f970c2c440957042b9de4a861524120040c56e4cd8b56c5cfb68 SHA512 44ecd10c018a3763e1bc87d1d35b98890d0d5636acd69fe9b5cadf5024d5af6a31684d60cbe1c3370e02986434c1fb0ad99224e0e6f6fe7eda169992508157b1
 DIST qemu-7.1.0-docs.tar.xz 2016780 BLAKE2B 1b84361fe58d504ab740a0b805a25d02f497ca776e7251a99f0e98e3720d1a2029b7a171f9d79dd128ba17a82c72d497e09baa1a4b2f192ba390f0f3b1950792 SHA512 7a328303b8af0ab63aa1f0fe07a121d3ca459d00fca817412e645416af795930dbea0a3e60f4ca006a74d1672e84fa4e626e4d83918e0b685b601043d0d8159e
 DIST qemu-7.1.0.tar.xz 121833004 BLAKE2B e05f91ce4993c7591a2df08b5fb017f8b8ec2141ab7bfd55d14730ea6b793ac1091de539992058392a5522d4e58beee92a87752707be58e3619b8213ef9f35bf SHA512 c60c5ff8ec99b7552e485768908920658fdd8035ff7a6fa370fb6881957dc8b7e5f18ff1a8f49bd6aa22909ede2a7c084986d8244f12074ccd33ebe40a0c411f
-EBUILD qemu-7.0.0-r1.ebuild 25887 BLAKE2B b8448330e5bf16d19d0651a4ecf9c26f6693358c0ae598ab35fab3cb65d97f6ac723c511050435c33cc51f8798f77d03b43b886bb8b89ddeb47a43e7009be7c7 SHA512 33d0626618fc2ef49f0b695ed8c334494c7950ea50f5878416e807dd5860ff578861ba4f0164989defc297f0b180b8218db8db78757516c1250139d00336350f
-EBUILD qemu-7.0.0-r2.ebuild 26353 BLAKE2B bccfeba202a1058b355d3e1bbd62e577ee8311b793be1340827ce45fb22ce9e8e34c6495e80914716342b98aa2a5344c1a2af4da5647963bc33fedbb780ef0d1 SHA512 f93f8dcbd17d982b6314f2c7729b86cda21b7068d369cd8e910101a7fce30b9cb0767fedf07d77484d88c31ce126a05e6704684554f8577d42cd495a86b6a724
-EBUILD qemu-7.0.0-r3.ebuild 27287 BLAKE2B 8a9df3cc54a28216bb8084d5556668e6d82b120368932805c7d4e96bfcb554910f581377a9a706a1970c58b066dc3c5dd6bd1ca73ed1f25ac24f926aed6aece6 SHA512 c23862e9e56074bcbba26b29016d03d8dc966a07a9aab241f9e226089afe7a57ad148204eb85a84a3138effbae304a15e63e71fbd590eb64bd80a79dd800ed41
-EBUILD qemu-7.1.0.ebuild 28128 BLAKE2B 0cfcc926cee49d45d75ca23f62bcd5167fda37e2a61e52e1f5292dfa1fc424c39425b8eca0b7a28c4b1c7f9635aaaef68a85e1246e2447124971f66b25afbb21 SHA512 d9c9bb504c86558d6af8e57a97e38fc360b97e6107841707400edbb98f527ef99b04625c471818d27dbe3e75f11fb15957cfac03aec8a58d1f30772cb1c7477e
-EBUILD qemu-9999.ebuild 28117 BLAKE2B 80b963605190cce84f90c0e555dd51c80b021ea53ad7d413f3c541b475a3cd80ff772ff6c7b7d1b6e89aac17facb950bd1430b44e2fd343a66fb68e774db3bec SHA512 5713966a08dfabf954198a0b977dad2647fefddb6a912e635279cc43fd0d831ddd548624e18d562c41e273e98240486bb66b16c9faf0fc6a0046cd6abd8374a7
+EBUILD qemu-7.0.0-r3.ebuild 27290 BLAKE2B 985947dc90817bed2c5e0878158604577b6ac3f7f605fd6372aa5b480851a6c94ea44e73aa301b7c1a5b8fa59f2281e57f99a84e5b10bc07beff0a3096b48a22 SHA512 8cc6ae4e2bde1b458d1682624fb46a56c1837592545638e63907c4067e67c39a609e85941381a33a80013d5e82c202644c6a9c5202091e344eabe3f8f6eb0c5b
+EBUILD qemu-7.1.0.ebuild 28398 BLAKE2B d30f2cc82cbd0ddc1716b9dc746c0985ac103becc0c83bb9b70121d76345f8d6284d48340576523faf4cb86433efffe4b4876e9007b9ad5858c931cc45c383ec SHA512 f6451dd5332022fe0706fe659330054edd32917b5c395357e96aa6b26861139d40e8fbf60e309a131ef4e02b769eae87e4684d20ef6d50efe6a6f49704b498e9
+EBUILD qemu-9999.ebuild 28120 BLAKE2B 4df729698bd0468af07072a051297df247211c4593919c0fc8590633eab862e7d07d1dbf39191b221d03a04921ad5d93bc70a3763766bc04316900dcc179428b SHA512 888fb99037d0a5965428d1e04f643e04374cf078839a2918cda3b2a43b5f41115ccefbc2bc8d12d44e5291daff76bb8ba0ae7feb4ba21a7dc84c36df8dfebd65
 MISC metadata.xml 4672 BLAKE2B ea2319ecc6717e4f10667f70928eac2b59eb27bb117957c266984a4d5bdf84604128086956a651c1880d314efde56ce81a67c364f7944f5342b6a322b5e3e73e SHA512 27f357299abc6a82112dab17c81b825459ce4c7afd96381b4cba13d79861f80e7d452d574795cab240e7ca56154128a2597ac9957aa24ef81d7dc9092312ac79
diff --git a/app-emulation/qemu/qemu-7.0.0-r1.ebuild b/app-emulation/qemu/qemu-7.0.0-r1.ebuild
deleted file mode 100644
index 36a66123268a..000000000000
--- a/app-emulation/qemu/qemu-7.0.0-r1.ebuild
+++ /dev/null
@@ -1,915 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8,9,10} )
-PYTHON_REQ_USE="ncurses,readline"
-
-FIRMWARE_ABI_VERSION="7.0.0"
-
-inherit linux-info toolchain-funcs python-r1 udev fcaps readme.gentoo-r1 \
-		pax-utils xdg-utils
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="https://gitlab.com/qemu-project/qemu.git/"
-	EGIT_SUBMODULES=(
-		meson
-		tests/fp/berkeley-softfloat-3
-		tests/fp/berkeley-testfloat-3
-		ui/keycodemapdb
-	)
-	inherit git-r3
-	SRC_URI=""
-else
-	MY_P="${PN}-${PV/_rc/-rc}"
-	SRC_URI="https://download.qemu.org/${MY_P}.tar.xz"
-	KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ppc64 ~riscv x86"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
-HOMEPAGE="https://www.qemu.org https://www.linux-kvm.org"
-
-LICENSE="GPL-2 LGPL-2 BSD-2"
-SLOT="0"
-
-IUSE="accessibility +aio alsa bpf bzip2 capstone +caps +curl debug +doc
-	+fdt fuse glusterfs +gnutls gtk infiniband iscsi io-uring
-	jack jemalloc +jpeg
-	lzo multipath
-	ncurses nfs nls numa opengl +oss pam +pin-upstream-blobs
-	plugins +png pulseaudio python rbd sasl +seccomp sdl sdl-image selinux
-	+slirp
-	smartcard snappy spice ssh static static-user systemtap test udev usb
-	usbredir vde +vhost-net vhost-user-fs virgl virtfs +vnc vte xattr xen
-	zstd"
-
-COMMON_TARGETS="
-	aarch64
-	alpha
-	arm
-	cris
-	hppa
-	i386
-	m68k
-	microblaze
-	microblazeel
-	mips
-	mips64
-	mips64el
-	mipsel
-	nios2
-	or1k
-	ppc
-	ppc64
-	riscv32
-	riscv64
-	s390x
-	sh4
-	sh4eb
-	sparc
-	sparc64
-	x86_64
-	xtensa
-	xtensaeb
-"
-IUSE_SOFTMMU_TARGETS="
-	${COMMON_TARGETS}
-	avr
-	rx
-	tricore
-"
-IUSE_USER_TARGETS="
-	${COMMON_TARGETS}
-	aarch64_be
-	armeb
-	hexagon
-	mipsn32
-	mipsn32el
-	ppc64le
-	sparc32plus
-"
-
-use_softmmu_targets=$(printf ' qemu_softmmu_targets_%s' ${IUSE_SOFTMMU_TARGETS})
-use_user_targets=$(printf ' qemu_user_targets_%s' ${IUSE_USER_TARGETS})
-IUSE+=" ${use_softmmu_targets} ${use_user_targets}"
-
-RESTRICT="!test? ( test )"
-# Allow no targets to be built so that people can get a tools-only build.
-# Block USE flag configurations known to not work.
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	qemu_softmmu_targets_arm? ( fdt )
-	qemu_softmmu_targets_microblaze? ( fdt )
-	qemu_softmmu_targets_mips64el? ( fdt )
-	qemu_softmmu_targets_ppc64? ( fdt )
-	qemu_softmmu_targets_ppc? ( fdt )
-	qemu_softmmu_targets_riscv32? ( fdt )
-	qemu_softmmu_targets_riscv64? ( fdt )
-	qemu_softmmu_targets_x86_64? ( fdt )
-	sdl-image? ( sdl )
-	static? ( static-user !alsa !gtk !jack !opengl !pam !pulseaudio !plugins !rbd !snappy !udev )
-	static-user? ( !plugins )
-	vhost-user-fs? ( caps seccomp )
-	virgl? ( opengl )
-	virtfs? ( caps xattr )
-	vnc? ( gnutls )
-	vte? ( gtk )
-	multipath? ( udev )
-	plugins? ( !static !static-user )
-"
-
-# Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...)
-# and user/softmmu targets (qemu-*, qemu-system-*).
-#
-# Yep, you need both libcap and libcap-ng since virtfs only uses libcap.
-#
-# The attr lib isn't always linked in (although the USE flag is always
-# respected).  This is because qemu supports using the C library's API
-# when available rather than always using the external library.
-ALL_DEPEND="
-	>=dev-libs/glib-2.0[static-libs(+)]
-	sys-libs/zlib[static-libs(+)]
-	python? ( ${PYTHON_DEPS} )
-	systemtap? ( dev-util/systemtap )
-	xattr? ( sys-apps/attr[static-libs(+)] )"
-
-# Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...)
-# softmmu targets (qemu-system-*).
-SOFTMMU_TOOLS_DEPEND="
-	>=x11-libs/pixman-0.28.0[static-libs(+)]
-	accessibility? (
-		app-accessibility/brltty[api]
-		app-accessibility/brltty[static-libs(+)]
-	)
-	aio? ( dev-libs/libaio[static-libs(+)] )
-	alsa? ( >=media-libs/alsa-lib-1.0.13 )
-	bpf? ( dev-libs/libbpf:= )
-	bzip2? ( app-arch/bzip2[static-libs(+)] )
-	capstone? ( dev-libs/capstone:= )
-	caps? ( sys-libs/libcap-ng[static-libs(+)] )
-	curl? ( >=net-misc/curl-7.15.4[static-libs(+)] )
-	fdt? ( >=sys-apps/dtc-1.5.1[static-libs(+)] )
-	fuse? ( >=sys-fs/fuse-3.1:3[static-libs(+)] )
-	glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] )
-	gnutls? (
-		dev-libs/nettle:=[static-libs(+)]
-		>=net-libs/gnutls-3.0:=[static-libs(+)]
-	)
-	gtk? (
-		x11-libs/gtk+:3
-		vte? ( x11-libs/vte:2.91 )
-	)
-	infiniband? ( sys-cluster/rdma-core[static-libs(+)] )
-	iscsi? ( net-libs/libiscsi )
-	io-uring? ( sys-libs/liburing:=[static-libs(+)] )
-	jack? ( virtual/jack )
-	jemalloc? ( dev-libs/jemalloc )
-	jpeg? ( virtual/jpeg:0=[static-libs(+)] )
-	lzo? ( dev-libs/lzo:2[static-libs(+)] )
-	multipath? ( sys-fs/multipath-tools )
-	ncurses? (
-		sys-libs/ncurses:=[unicode(+)]
-		sys-libs/ncurses:=[static-libs(+)]
-	)
-	nfs? ( >=net-fs/libnfs-1.9.3:=[static-libs(+)] )
-	numa? ( sys-process/numactl[static-libs(+)] )
-	opengl? (
-		virtual/opengl
-		media-libs/libepoxy[static-libs(+)]
-		media-libs/mesa[static-libs(+)]
-		media-libs/mesa[egl(+),gbm(+)]
-	)
-	pam? ( sys-libs/pam )
-	png? ( media-libs/libpng:0=[static-libs(+)] )
-	pulseaudio? ( media-sound/pulseaudio )
-	rbd? ( sys-cluster/ceph )
-	sasl? ( dev-libs/cyrus-sasl[static-libs(+)] )
-	sdl? (
-		media-libs/libsdl2[video]
-		media-libs/libsdl2[static-libs(+)]
-	)
-	sdl-image? ( media-libs/sdl2-image[static-libs(+)] )
-	seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] )
-	slirp? ( net-libs/libslirp[static-libs(+)] )
-	smartcard? ( >=app-emulation/libcacard-2.5.0[static-libs(+)] )
-	snappy? ( app-arch/snappy:= )
-	spice? (
-		>=app-emulation/spice-protocol-0.12.3
-		>=app-emulation/spice-0.12.0[static-libs(+)]
-	)
-	ssh? ( >=net-libs/libssh-0.8.6[static-libs(+)] )
-	udev? ( virtual/libudev:= )
-	usb? ( >=virtual/libusb-1-r2[static-libs(+)] )
-	usbredir? ( >=sys-apps/usbredir-0.6[static-libs(+)] )
-	vde? ( net-misc/vde[static-libs(+)] )
-	virgl? ( media-libs/virglrenderer[static-libs(+)] )
-	virtfs? ( sys-libs/libcap )
-	xen? ( app-emulation/xen-tools:= )
-	zstd? ( >=app-arch/zstd-1.4.0[static-libs(+)] )
-"
-
-EDK2_OVMF_VERSION="202105"
-SEABIOS_VERSION="1.14.0"
-
-X86_FIRMWARE_DEPEND="
-	pin-upstream-blobs? (
-		~sys-firmware/edk2-ovmf-${EDK2_OVMF_VERSION}[binary]
-		~sys-firmware/ipxe-1.21.1[binary,qemu]
-		~sys-firmware/seabios-${SEABIOS_VERSION}[binary,seavgabios]
-		~sys-firmware/sgabios-0.1_pre10[binary]
-	)
-	!pin-upstream-blobs? (
-		>=sys-firmware/edk2-ovmf-${EDK2_OVMF_VERSION}
-		sys-firmware/ipxe[qemu]
-		>=sys-firmware/seabios-${SEABIOS_VERSION}[seavgabios]
-		sys-firmware/sgabios
-	)"
-PPC_FIRMWARE_DEPEND="
-	pin-upstream-blobs? (
-		~sys-firmware/seabios-${SEABIOS_VERSION}[binary,seavgabios]
-	)
-	!pin-upstream-blobs? (
-		>=sys-firmware/seabios-${SEABIOS_VERSION}[seavgabios]
-	)
-"
-
-BDEPEND="
-	$(python_gen_impl_dep)
-	dev-lang/perl
-	sys-apps/texinfo
-	virtual/pkgconfig
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
-	)
-	gtk? ( nls? ( sys-devel/gettext ) )
-	test? (
-		dev-libs/glib[utils]
-		sys-devel/bc
-	)
-"
-CDEPEND="
-	!static? (
-		${ALL_DEPEND//\[static-libs(+)]}
-		${SOFTMMU_TOOLS_DEPEND//\[static-libs(+)]}
-	)
-	qemu_softmmu_targets_i386? ( ${X86_FIRMWARE_DEPEND} )
-	qemu_softmmu_targets_x86_64? ( ${X86_FIRMWARE_DEPEND} )
-	qemu_softmmu_targets_ppc? ( ${PPC_FIRMWARE_DEPEND} )
-	qemu_softmmu_targets_ppc64? ( ${PPC_FIRMWARE_DEPEND} )
-"
-DEPEND="${CDEPEND}
-	kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 )
-	static? (
-		${ALL_DEPEND}
-		${SOFTMMU_TOOLS_DEPEND}
-	)
-	static-user? ( ${ALL_DEPEND} )"
-RDEPEND="${CDEPEND}
-	acct-group/kvm
-	selinux? (
-		sec-policy/selinux-qemu
-		sys-libs/libselinux
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.11.1-capstone_include_path.patch
-	"${FILESDIR}"/${PN}-5.2.0-disable-keymap.patch
-	"${FILESDIR}"/${PN}-6.0.0-make.patch
-	"${FILESDIR}"/${PN}-6.1.0-strings.patch
-	"${FILESDIR}"/${PN}-7.0.0-also-build-virtfs-proxy-helper.patch
-	"${FILESDIR}"/${PN}-7.0.0-have-user-meson.patch
-)
-
-QA_PREBUILT="
-	usr/share/qemu/hppa-firmware.img
-	usr/share/qemu/openbios-ppc
-	usr/share/qemu/openbios-sparc64
-	usr/share/qemu/openbios-sparc32
-	usr/share/qemu/opensbi-riscv64-generic-fw_dynamic.elf
-	usr/share/qemu/opensbi-riscv32-generic-fw_dynamic.elf
-	usr/share/qemu/palcode-clipper
-	usr/share/qemu/s390-ccw.img
-	usr/share/qemu/s390-netboot.img
-	usr/share/qemu/u-boot.e500
-"
-
-QA_WX_LOAD="usr/bin/qemu-i386
-	usr/bin/qemu-x86_64
-	usr/bin/qemu-alpha
-	usr/bin/qemu-arm
-	usr/bin/qemu-cris
-	usr/bin/qemu-m68k
-	usr/bin/qemu-microblaze
-	usr/bin/qemu-microblazeel
-	usr/bin/qemu-mips
-	usr/bin/qemu-mipsel
-	usr/bin/qemu-or1k
-	usr/bin/qemu-ppc
-	usr/bin/qemu-ppc64
-	usr/bin/qemu-sh4
-	usr/bin/qemu-sh4eb
-	usr/bin/qemu-sparc
-	usr/bin/qemu-sparc64
-	usr/bin/qemu-armeb
-	usr/bin/qemu-sparc32plus
-	usr/bin/qemu-s390x
-	usr/bin/qemu-unicore32
-"
-
-DOC_CONTENTS="If you don't have kvm compiled into the kernel, make sure you have the
-kernel module loaded before running kvm. The easiest way to ensure that the
-kernel module is loaded is to load it on boot.
-	For AMD CPUs the module is called 'kvm-amd'.
-	For Intel CPUs the module is called 'kvm-intel'.
-Please review /etc/conf.d/modules for how to load these.
-
-Make sure your user is in the 'kvm' group. Just run
-	$ gpasswd -a <USER> kvm
-then have <USER> re-login.
-
-For brand new installs, the default permissions on /dev/kvm might not let
-you access it.  You can tell udev to reset ownership/perms:
-	$ udevadm trigger -c add /dev/kvm
-
-If you want to register binfmt handlers for qemu user targets:
-For openrc:
-	# rc-update add qemu-binfmt
-For systemd:
-	# ln -s /usr/share/qemu/binfmt.d/qemu.conf /etc/binfmt.d/qemu.conf"
-
-pkg_pretend() {
-	if use kernel_linux && kernel_is lt 2 6 25; then
-		eerror "This version of KVM requires a host kernel of 2.6.25 or higher."
-	elif use kernel_linux; then
-		if ! linux_config_exists; then
-			eerror "Unable to check your kernel for KVM support"
-		else
-			CONFIG_CHECK="~KVM ~TUN ~BRIDGE"
-			ERROR_KVM="You must enable KVM in your kernel to continue"
-			ERROR_KVM_AMD="If you have an AMD CPU, you must enable KVM_AMD in"
-			ERROR_KVM_AMD+=" your kernel configuration."
-			ERROR_KVM_INTEL="If you have an Intel CPU, you must enable"
-			ERROR_KVM_INTEL+=" KVM_INTEL in your kernel configuration."
-			ERROR_TUN="You will need the Universal TUN/TAP driver compiled"
-			ERROR_TUN+=" into your kernel or loaded as a module to use the"
-			ERROR_TUN+=" virtual network device if using -net tap."
-			ERROR_BRIDGE="You will also need support for 802.1d"
-			ERROR_BRIDGE+=" Ethernet Bridging for some network configurations."
-			use vhost-net && CONFIG_CHECK+=" ~VHOST_NET"
-			ERROR_VHOST_NET="You must enable VHOST_NET to have vhost-net"
-			ERROR_VHOST_NET+=" support"
-
-			if use amd64 || use x86 || use amd64-linux || use x86-linux; then
-				if grep -q AuthenticAMD /proc/cpuinfo; then
-					CONFIG_CHECK+=" ~KVM_AMD"
-				elif grep -q GenuineIntel /proc/cpuinfo; then
-					CONFIG_CHECK+=" ~KVM_INTEL"
-				fi
-			fi
-
-			use python && CONFIG_CHECK+=" ~DEBUG_FS"
-			ERROR_DEBUG_FS="debugFS support required for kvm_stat"
-
-			# Now do the actual checks setup above
-			check_extra_config
-		fi
-	fi
-
-	if grep -qs '/usr/bin/qemu-kvm' "${EROOT}"/etc/libvirt/qemu/*.xml; then
-		eerror "The kvm/qemu-kvm wrappers no longer exist, but your libvirt"
-		eerror "instances are still pointing to it.  Please update your"
-		eerror "configs in /etc/libvirt/qemu/ to use the -enable-kvm flag"
-		eerror "and the right system binary (e.g. qemu-system-x86_64)."
-		die "update your virt configs to not use qemu-kvm"
-	fi
-}
-
-# Sanity check to make sure target lists are kept up-to-date.
-check_targets() {
-	local var=$1 mak=$2
-	local detected sorted
-
-	pushd "${S}"/configs/targets/ >/dev/null || die
-
-	# Force C locale until glibc is updated. #564936
-	detected=$(echo $(printf '%s\n' *-${mak}.mak | sed "s:-${mak}.mak::" | LC_COLLATE=C sort -u))
-	sorted=$(echo $(printf '%s\n' ${!var} | LC_COLLATE=C sort -u))
-	if [[ ${sorted} != "${detected}" ]] ; then
-		eerror "The ebuild needs to be kept in sync."
-		eerror "${var}: ${sorted}"
-		eerror "$(printf '%-*s' ${#var} configure): ${detected}"
-		die "sync ${var} to the list of targets"
-	fi
-
-	popd >/dev/null
-}
-
-src_prepare() {
-	check_targets IUSE_SOFTMMU_TARGETS softmmu
-	check_targets IUSE_USER_TARGETS linux-user
-
-	default
-
-	# Use correct toolchain to fix cross-compiling
-	tc-export AR AS LD NM OBJCOPY PKG_CONFIG RANLIB STRINGS
-	export WINDRES=${CHOST}-windres
-
-	# Verbose builds
-	MAKEOPTS+=" V=1"
-
-	# Remove bundled copy of libfdt
-	rm -r dtc || die
-}
-
-##
-# configures qemu based on the build directory and the build type
-# we are using.
-#
-qemu_src_configure() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	local buildtype=$1
-	local builddir="${S}/${buildtype}-build"
-
-	mkdir "${builddir}"
-
-	local conf_opts=(
-		--prefix=/usr
-		--sysconfdir=/etc
-		--bindir=/usr/bin
-		--libdir=/usr/$(get_libdir)
-		--datadir=/usr/share
-		--docdir=/usr/share/doc/${PF}/html
-		--mandir=/usr/share/man
-		--localstatedir=/var
-		--disable-bsd-user
-		--disable-containers # bug #732972
-		--disable-guest-agent
-		--disable-strip
-		--with-git-submodules=ignore
-
-		# bug #746752: TCG interpreter has a few limitations:
-		# - it does not support FPU
-		# - it's generally slower on non-self-modifying code
-		# It's advantage is support for host architectures
-		# where native codegeneration is not implemented.
-		# Gentoo has qemu keyworded only on targets with
-		# native code generation available. Avoid the interpreter.
-		--disable-tcg-interpreter
-
-		--disable-werror
-		# We support gnutls/nettle for crypto operations.  It is possible
-		# to use gcrypt when gnutls/nettle are disabled (but not when they
-		# are enabled), but it's not really worth the hassle.  Disable it
-		# all the time to avoid automatically detecting it. #568856
-		--disable-gcrypt
-		--python="${PYTHON}"
-		--cc="$(tc-getCC)"
-		--cxx="$(tc-getCXX)"
-		--host-cc="$(tc-getBUILD_CC)"
-		$(use_enable alsa)
-		$(use_enable debug debug-info)
-		$(use_enable debug debug-tcg)
-		$(use_enable jack)
-		$(use_enable nls gettext)
-		$(use_enable oss)
-		$(use_enable plugins)
-		$(use_enable pulseaudio pa)
-		$(use_enable selinux)
-		$(use_enable xattr attr)
-	)
-
-	# Disable options not used by user targets. This simplifies building
-	# static user targets (USE=static-user) considerably.
-	conf_notuser() {
-		if [[ ${buildtype} == "user" ]] ; then
-			echo "--disable-${2:-$1}"
-		else
-			use_enable "$@"
-		fi
-	}
-	# Enable option only for softmmu build, but not 'user' or 'tools'
-	conf_softmmu() {
-		if [[ ${buildtype} == "softmmu" ]] ; then
-			use_enable "$@"
-		else
-			echo "--disable-${2:-$1}"
-		fi
-	}
-	# Enable option only for tools build, but not 'user' or 'softmmu'
-	conf_tools() {
-		if [[ ${buildtype} == "tools" ]] ; then
-			use_enable "$@"
-		else
-			echo "--disable-${2:-$1}"
-		fi
-	}
-	# Special case for the malloc flag, because the --disable flag does
-	# not exist and trying like above will break configuring.
-	conf_malloc() {
-		if [[ ! ${buildtype} == "user" ]] ; then
-			usex "${1}" "--enable-malloc=${1}" ""
-		fi
-	}
-	conf_opts+=(
-		$(conf_notuser accessibility brlapi)
-		$(conf_notuser aio linux-aio)
-		$(conf_softmmu bpf)
-		$(conf_notuser bzip2)
-		$(conf_notuser capstone)
-		$(conf_notuser caps cap-ng)
-		$(conf_notuser curl)
-		$(conf_tools doc docs)
-		$(conf_notuser fdt)
-		$(conf_notuser fuse)
-		$(conf_notuser glusterfs)
-		$(conf_notuser gnutls)
-		$(conf_notuser gnutls nettle)
-		$(conf_notuser gtk)
-		$(conf_notuser infiniband rdma)
-		$(conf_notuser iscsi libiscsi)
-		$(conf_notuser io-uring linux-io-uring)
-		$(conf_malloc jemalloc)
-		$(conf_notuser jpeg vnc-jpeg)
-		$(conf_notuser kernel_linux kvm)
-		$(conf_notuser lzo)
-		$(conf_notuser multipath mpath)
-		$(conf_notuser ncurses curses)
-		$(conf_notuser nfs libnfs)
-		$(conf_notuser numa)
-		$(conf_notuser opengl)
-		$(conf_notuser pam auth-pam)
-		$(conf_notuser png vnc-png)
-		$(conf_notuser rbd)
-		$(conf_notuser sasl vnc-sasl)
-		$(conf_notuser sdl)
-		$(conf_softmmu sdl-image)
-		$(conf_notuser seccomp)
-		$(conf_notuser slirp slirp system)
-		$(conf_notuser smartcard)
-		$(conf_notuser snappy)
-		$(conf_notuser spice)
-		$(conf_notuser ssh libssh)
-		$(conf_notuser udev libudev)
-		$(conf_notuser usb libusb)
-		$(conf_notuser usbredir usb-redir)
-		$(conf_notuser vde)
-		$(conf_notuser vhost-net)
-		$(conf_notuser vhost-user-fs)
-		$(conf_tools vhost-user-fs virtiofsd)
-		$(conf_notuser virgl virglrenderer)
-		$(conf_softmmu virtfs)
-		$(conf_notuser vnc)
-		$(conf_notuser vte)
-		$(conf_notuser xen)
-		$(conf_notuser xen xen-pci-passthrough)
-		# use prebuilt keymaps, bug #759604
-		--disable-xkbcommon
-		$(conf_notuser zstd)
-	)
-
-	if [[ ! ${buildtype} == "user" ]] ; then
-		# audio options
-		local audio_opts=(
-			# Note: backend order matters here: #716202
-			# We iterate from higher-level to lower level.
-			$(usex pulseaudio pa "")
-			$(usev jack)
-			$(usev sdl)
-			$(usev alsa)
-			$(usev oss)
-		)
-		conf_opts+=(
-			--audio-drv-list=$(IFS=,; echo "${audio_opts[*]}")
-		)
-	fi
-
-	case ${buildtype} in
-	user)
-		conf_opts+=(
-			--enable-linux-user
-			--disable-system
-			--disable-blobs
-			--disable-tools
-		)
-		local static_flag="static-user"
-		;;
-	softmmu)
-		conf_opts+=(
-			--disable-linux-user
-			--enable-system
-			--disable-tools
-		)
-		local static_flag="static"
-		;;
-	tools)
-		conf_opts+=(
-			--disable-linux-user
-			--disable-system
-			--disable-blobs
-			--enable-tools
-		)
-		local static_flag="static"
-		;;
-	esac
-
-	local targets="${buildtype}_targets"
-	[[ -n ${targets} ]] && conf_opts+=( --target-list="${!targets}" )
-
-	# Add support for SystemTAP
-	use systemtap && conf_opts+=( --enable-trace-backend=dtrace )
-
-	# We always want to attempt to build with PIE support as it results
-	# in a more secure binary. But it doesn't work with static or if
-	# the current GCC doesn't have PIE support.
-	if use ${static_flag}; then
-		conf_opts+=( --static --disable-pie )
-	else
-		tc-enables-pie && conf_opts+=( --enable-pie )
-	fi
-
-	# Meson will not use a cross-file unless cross_prefix is set.
-	tc-is-cross-compiler && conf_opts+=( --cross-prefix="${CHOST}-" )
-
-	# Plumb through equivalent of EXTRA_ECONF to allow experiments
-	# like bug #747928.
-	conf_opts+=( ${EXTRA_CONF_QEMU} )
-
-	echo "../configure ${conf_opts[*]}"
-	cd "${builddir}"
-	../configure "${conf_opts[@]}" || die "configure failed"
-}
-
-src_configure() {
-	local target
-
-	python_setup
-
-	softmmu_targets= softmmu_bins=()
-	user_targets= user_bins=()
-
-	for target in ${IUSE_SOFTMMU_TARGETS} ; do
-		if use "qemu_softmmu_targets_${target}"; then
-			softmmu_targets+=",${target}-softmmu"
-			softmmu_bins+=( "qemu-system-${target}" )
-		fi
-	done
-
-	for target in ${IUSE_USER_TARGETS} ; do
-		if use "qemu_user_targets_${target}"; then
-			user_targets+=",${target}-linux-user"
-			user_bins+=( "qemu-${target}" )
-		fi
-	done
-
-	softmmu_targets=${softmmu_targets#,}
-	user_targets=${user_targets#,}
-
-	[[ -n ${softmmu_targets} ]] && qemu_src_configure "softmmu"
-	[[ -n ${user_targets}    ]] && qemu_src_configure "user"
-	qemu_src_configure "tools"
-}
-
-src_compile() {
-	if [[ -n ${user_targets} ]]; then
-		cd "${S}/user-build"
-		default
-	fi
-
-	if [[ -n ${softmmu_targets} ]]; then
-		cd "${S}/softmmu-build"
-		default
-	fi
-
-	cd "${S}/tools-build"
-	default
-}
-
-src_test() {
-	if [[ -n ${softmmu_targets} ]]; then
-		cd "${S}/softmmu-build"
-		pax-mark m */qemu-system-* #515550
-		emake check
-	fi
-}
-
-qemu_python_install() {
-	python_domodule "${S}/python/qemu"
-
-	python_doscript "${S}/scripts/kvm/vmxcap"
-	python_doscript "${S}/scripts/qmp/qmp-shell"
-	python_doscript "${S}/scripts/qmp/qemu-ga-client"
-}
-
-# Generate binfmt support files.
-#   - /etc/init.d/qemu-binfmt script which registers the user handlers (openrc)
-#   - /usr/share/qemu/binfmt.d/qemu.conf (for use with systemd-binfmt)
-generate_initd() {
-	local out="${T}/qemu-binfmt"
-	local out_systemd="${T}/qemu.conf"
-	local d="${T}/binfmt.d"
-
-	einfo "Generating qemu binfmt scripts and configuration files"
-
-	# Generate the debian fragments first.
-	mkdir -p "${d}"
-	"${S}"/scripts/qemu-binfmt-conf.sh \
-		--debian \
-		--exportdir "${d}" \
-		--qemu-path "${EPREFIX}/usr/bin" \
-		|| die
-	# Then turn the fragments into a shell script we can source.
-	sed -E -i \
-		-e 's:^([^ ]+) (.*)$:\1="\2":' \
-		"${d}"/* || die
-
-	# Generate the init.d script by assembling the fragments from above.
-	local f qcpu package interpreter magic mask
-	cat "${FILESDIR}"/qemu-binfmt.initd.head >"${out}" || die
-	for f in "${d}"/qemu-* ; do
-		source "${f}"
-
-		# Normalize the cpu logic like we do in the init.d for the native cpu.
-		qcpu=${package#qemu-}
-		case ${qcpu} in
-		arm*)   qcpu="arm";;
-		mips*)  qcpu="mips";;
-		ppc*)   qcpu="ppc";;
-		s390*)  qcpu="s390";;
-		sh*)    qcpu="sh";;
-		sparc*) qcpu="sparc";;
-		esac
-
-		# we use 'printf' here to be portable across 'sh'
-		# implementations: #679168
-		cat <<EOF >>"${out}"
-	if [ "\${cpu}" != "${qcpu}" -a -x "${interpreter}" ] ; then
-		printf '%s\n' ':${package}:M::${magic}:${mask}:${interpreter}:'"\${QEMU_BINFMT_FLAGS}" >/proc/sys/fs/binfmt_misc/register
-	fi
-EOF
-
-		echo ":${package}:M::${magic}:${mask}:${interpreter}:OC" >>"${out_systemd}"
-
-	done
-	cat "${FILESDIR}"/qemu-binfmt.initd.tail >>"${out}" || die
-}
-
-src_install() {
-	if [[ -n ${user_targets} ]]; then
-		cd "${S}/user-build"
-		emake DESTDIR="${ED}" install
-
-		# Install binfmt handler init script for user targets.
-		generate_initd
-		doinitd "${T}/qemu-binfmt"
-
-		# Install binfmt/qemu.conf.
-		insinto "/usr/share/qemu/binfmt.d"
-		doins "${T}/qemu.conf"
-	fi
-
-	if [[ -n ${softmmu_targets} ]]; then
-		cd "${S}/softmmu-build"
-		emake DESTDIR="${ED}" install
-
-		# This might not exist if the test failed. #512010
-		[[ -e check-report.html ]] && dodoc check-report.html
-
-		if use kernel_linux; then
-			udev_newrules "${FILESDIR}"/65-kvm.rules-r2 65-kvm.rules
-		fi
-
-		if use python; then
-			python_foreach_impl qemu_python_install
-		fi
-	fi
-
-	cd "${S}/tools-build"
-	emake DESTDIR="${ED}" install
-
-	# Disable mprotect on the qemu binaries as they use JITs to be fast #459348
-	pushd "${ED}"/usr/bin >/dev/null
-	pax-mark mr "${softmmu_bins[@]}" "${user_bins[@]}" # bug 575594
-	popd >/dev/null
-
-	# Install config file example for qemu-bridge-helper
-	insinto "/etc/qemu"
-	doins "${FILESDIR}/bridge.conf"
-
-	cd "${S}"
-	dodoc MAINTAINERS docs/specs/pci-ids.txt
-	newdoc pc-bios/README README.pc-bios
-
-	# Disallow stripping of prebuilt firmware files.
-	dostrip -x ${QA_PREBUILT}
-
-	if [[ -n ${softmmu_targets} ]]; then
-		# Remove SeaBIOS since we're using the SeaBIOS packaged one
-		rm "${ED}/usr/share/qemu/bios.bin"
-		rm "${ED}/usr/share/qemu/bios-256k.bin"
-		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
-			dosym ../seabios/bios.bin /usr/share/qemu/bios.bin
-			dosym ../seabios/bios-256k.bin /usr/share/qemu/bios-256k.bin
-		fi
-
-		# Remove vgabios since we're using the seavgabios packaged one
-		rm "${ED}/usr/share/qemu/vgabios.bin"
-		rm "${ED}/usr/share/qemu/vgabios-cirrus.bin"
-		rm "${ED}/usr/share/qemu/vgabios-qxl.bin"
-		rm "${ED}/usr/share/qemu/vgabios-stdvga.bin"
-		rm "${ED}/usr/share/qemu/vgabios-virtio.bin"
-		rm "${ED}/usr/share/qemu/vgabios-vmware.bin"
-		# PPC/PPC64 loads vgabios-stdvga
-		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386 || use qemu_softmmu_targets_ppc || use qemu_softmmu_targets_ppc64; then
-			dosym ../seavgabios/vgabios-isavga.bin /usr/share/qemu/vgabios.bin
-			dosym ../seavgabios/vgabios-cirrus.bin /usr/share/qemu/vgabios-cirrus.bin
-			dosym ../seavgabios/vgabios-qxl.bin /usr/share/qemu/vgabios-qxl.bin
-			dosym ../seavgabios/vgabios-stdvga.bin /usr/share/qemu/vgabios-stdvga.bin
-			dosym ../seavgabios/vgabios-virtio.bin /usr/share/qemu/vgabios-virtio.bin
-			dosym ../seavgabios/vgabios-vmware.bin /usr/share/qemu/vgabios-vmware.bin
-		fi
-
-		# Remove sgabios since we're using the sgabios packaged one
-		rm "${ED}/usr/share/qemu/sgabios.bin"
-		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
-			dosym ../sgabios/sgabios.bin /usr/share/qemu/sgabios.bin
-		fi
-
-		# Remove iPXE since we're using the iPXE packaged one
-		rm "${ED}"/usr/share/qemu/pxe-*.rom
-		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
-			dosym ../ipxe/8086100e.rom /usr/share/qemu/pxe-e1000.rom
-			dosym ../ipxe/80861209.rom /usr/share/qemu/pxe-eepro100.rom
-			dosym ../ipxe/10500940.rom /usr/share/qemu/pxe-ne2k_pci.rom
-			dosym ../ipxe/10222000.rom /usr/share/qemu/pxe-pcnet.rom
-			dosym ../ipxe/10ec8139.rom /usr/share/qemu/pxe-rtl8139.rom
-			dosym ../ipxe/1af41000.rom /usr/share/qemu/pxe-virtio.rom
-		fi
-	fi
-
-	DISABLE_AUTOFORMATTING=true
-	readme.gentoo_create_doc
-}
-
-firmware_abi_change() {
-	local pv
-	for pv in ${REPLACING_VERSIONS}; do
-		if ver_test ${pv} -lt ${FIRMWARE_ABI_VERSION}; then
-			return 0
-		fi
-	done
-	return 1
-}
-
-pkg_postinst() {
-	if [[ -n ${softmmu_targets} ]] && use kernel_linux; then
-		udev_reload
-	fi
-
-	xdg_icon_cache_update
-
-	[[ -z ${EPREFIX} ]] && [[ -f ${EROOT}/usr/libexec/qemu-bridge-helper ]] && \
-		fcaps cap_net_admin "${EROOT}"/usr/libexec/qemu-bridge-helper
-
-	DISABLE_AUTOFORMATTING=true
-	readme.gentoo_print_elog
-
-	if use pin-upstream-blobs && firmware_abi_change; then
-		ewarn "This version of qemu pins new versions of firmware blobs:"
-		ewarn "	$(best_version sys-firmware/edk2-ovmf)"
-		ewarn "	$(best_version sys-firmware/ipxe)"
-		ewarn "	$(best_version sys-firmware/seabios)"
-		ewarn "	$(best_version sys-firmware/sgabios)"
-		ewarn "This might break resume of hibernated guests (started with a different"
-		ewarn "firmware version) and live migration to/from qemu versions with different"
-		ewarn "firmware. Please (cold) restart all running guests. For functional"
-		ewarn "guest migration ensure that all"
-		ewarn "hosts run at least"
-		ewarn "	app-emulation/qemu-${FIRMWARE_ABI_VERSION}."
-	fi
-}
-
-pkg_info() {
-	echo "Using:"
-	echo "  $(best_version app-emulation/spice-protocol)"
-	echo "  $(best_version sys-firmware/edk2-ovmf)"
-	if has_version 'sys-firmware/edk2-ovmf[binary]'; then
-		echo "    USE=binary"
-	else
-		echo "    USE=''"
-	fi
-	echo "  $(best_version sys-firmware/ipxe)"
-	echo "  $(best_version sys-firmware/seabios)"
-	if has_version 'sys-firmware/seabios[binary]'; then
-		echo "    USE=binary"
-	else
-		echo "    USE=''"
-	fi
-	echo "  $(best_version sys-firmware/sgabios)"
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/app-emulation/qemu/qemu-7.0.0-r2.ebuild b/app-emulation/qemu/qemu-7.0.0-r2.ebuild
deleted file mode 100644
index 32f9865afe5c..000000000000
--- a/app-emulation/qemu/qemu-7.0.0-r2.ebuild
+++ /dev/null
@@ -1,923 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8,9,10} )
-PYTHON_REQ_USE="ncurses,readline"
-
-FIRMWARE_ABI_VERSION="7.0.0"
-
-inherit linux-info toolchain-funcs python-r1 udev fcaps readme.gentoo-r1 \
-		pax-utils xdg-utils
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://gitlab.com/qemu-project/qemu.git/"
-	EGIT_SUBMODULES=(
-		meson
-		tests/fp/berkeley-softfloat-3
-		tests/fp/berkeley-testfloat-3
-		ui/keycodemapdb
-	)
-	inherit git-r3
-	SRC_URI=""
-else
-	MY_P="${PN}-${PV/_rc/-rc}"
-	SRC_URI="https://download.qemu.org/${MY_P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
-HOMEPAGE="https://www.qemu.org https://www.linux-kvm.org"
-
-LICENSE="GPL-2 LGPL-2 BSD-2"
-SLOT="0"
-
-IUSE="accessibility +aio alsa bpf bzip2 capstone +caps +curl debug +doc
-	+fdt fuse glusterfs +gnutls gtk infiniband iscsi io-uring
-	jack jemalloc +jpeg
-	lzo multipath
-	ncurses nfs nls numa opengl +oss pam +pin-upstream-blobs
-	plugins +png pulseaudio python rbd sasl +seccomp sdl sdl-image selinux
-	+slirp
-	smartcard snappy spice ssh static static-user systemtap test udev usb
-	usbredir vde +vhost-net vhost-user-fs virgl virtfs +vnc vte xattr xen
-	zstd"
-
-COMMON_TARGETS="
-	aarch64
-	alpha
-	arm
-	cris
-	hppa
-	i386
-	m68k
-	microblaze
-	microblazeel
-	mips
-	mips64
-	mips64el
-	mipsel
-	nios2
-	or1k
-	ppc
-	ppc64
-	riscv32
-	riscv64
-	s390x
-	sh4
-	sh4eb
-	sparc
-	sparc64
-	x86_64
-	xtensa
-	xtensaeb
-"
-IUSE_SOFTMMU_TARGETS="
-	${COMMON_TARGETS}
-	avr
-	rx
-	tricore
-"
-IUSE_USER_TARGETS="
-	${COMMON_TARGETS}
-	aarch64_be
-	armeb
-	hexagon
-	mipsn32
-	mipsn32el
-	ppc64le
-	sparc32plus
-"
-
-use_softmmu_targets=$(printf ' qemu_softmmu_targets_%s' ${IUSE_SOFTMMU_TARGETS})
-use_user_targets=$(printf ' qemu_user_targets_%s' ${IUSE_USER_TARGETS})
-IUSE+=" ${use_softmmu_targets} ${use_user_targets}"
-
-RESTRICT="!test? ( test )"
-# Allow no targets to be built so that people can get a tools-only build.
-# Block USE flag configurations known to not work.
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	qemu_softmmu_targets_arm? ( fdt )
-	qemu_softmmu_targets_microblaze? ( fdt )
-	qemu_softmmu_targets_mips64el? ( fdt )
-	qemu_softmmu_targets_ppc64? ( fdt )
-	qemu_softmmu_targets_ppc? ( fdt )
-	qemu_softmmu_targets_riscv32? ( fdt )
-	qemu_softmmu_targets_riscv64? ( fdt )
-	qemu_softmmu_targets_x86_64? ( fdt )
-	sdl-image? ( sdl )
-	static? ( static-user !alsa !gtk !jack !opengl !pam !pulseaudio !plugins !rbd !snappy !udev )
-	static-user? ( !plugins )
-	vhost-user-fs? ( caps seccomp )
-	virgl? ( opengl )
-	virtfs? ( caps xattr )
-	vnc? ( gnutls )
-	vte? ( gtk )
-	multipath? ( udev )
-	plugins? ( !static !static-user )
-"
-
-# Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...)
-# and user/softmmu targets (qemu-*, qemu-system-*).
-#
-# Yep, you need both libcap and libcap-ng since virtfs only uses libcap.
-#
-# The attr lib isn't always linked in (although the USE flag is always
-# respected).  This is because qemu supports using the C library's API
-# when available rather than always using the external library.
-ALL_DEPEND="
-	>=dev-libs/glib-2.0[static-libs(+)]
-	sys-libs/zlib[static-libs(+)]
-	python? ( ${PYTHON_DEPS} )
-	systemtap? ( dev-util/systemtap )
-	xattr? ( sys-apps/attr[static-libs(+)] )"
-
-# Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...)
-# softmmu targets (qemu-system-*).
-SOFTMMU_TOOLS_DEPEND="
-	>=x11-libs/pixman-0.28.0[static-libs(+)]
-	accessibility? (
-		app-accessibility/brltty[api]
-		app-accessibility/brltty[static-libs(+)]
-	)
-	aio? ( dev-libs/libaio[static-libs(+)] )
-	alsa? ( >=media-libs/alsa-lib-1.0.13 )
-	bpf? ( dev-libs/libbpf:= )
-	bzip2? ( app-arch/bzip2[static-libs(+)] )
-	capstone? ( dev-libs/capstone:= )
-	caps? ( sys-libs/libcap-ng[static-libs(+)] )
-	curl? ( >=net-misc/curl-7.15.4[static-libs(+)] )
-	fdt? ( >=sys-apps/dtc-1.5.1[static-libs(+)] )
-	fuse? ( >=sys-fs/fuse-3.1:3[static-libs(+)] )
-	glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] )
-	gnutls? (
-		dev-libs/nettle:=[static-libs(+)]
-		>=net-libs/gnutls-3.0:=[static-libs(+)]
-	)
-	gtk? (
-		x11-libs/gtk+:3
-		vte? ( x11-libs/vte:2.91 )
-	)
-	infiniband? ( sys-cluster/rdma-core[static-libs(+)] )
-	iscsi? ( net-libs/libiscsi )
-	io-uring? ( sys-libs/liburing:=[static-libs(+)] )
-	jack? ( virtual/jack )
-	jemalloc? ( dev-libs/jemalloc )
-	jpeg? ( media-libs/libjpeg-turbo:=[static-libs(+)] )
-	lzo? ( dev-libs/lzo:2[static-libs(+)] )
-	multipath? ( sys-fs/multipath-tools )
-	ncurses? (
-		sys-libs/ncurses:=[unicode(+)]
-		sys-libs/ncurses:=[static-libs(+)]
-	)
-	nfs? ( >=net-fs/libnfs-1.9.3:=[static-libs(+)] )
-	numa? ( sys-process/numactl[static-libs(+)] )
-	opengl? (
-		virtual/opengl
-		media-libs/libepoxy[static-libs(+)]
-		media-libs/mesa[static-libs(+)]
-		media-libs/mesa[egl(+),gbm(+)]
-	)
-	pam? ( sys-libs/pam )
-	png? ( media-libs/libpng:0=[static-libs(+)] )
-	pulseaudio? ( media-sound/pulseaudio )
-	rbd? ( sys-cluster/ceph )
-	sasl? ( dev-libs/cyrus-sasl[static-libs(+)] )
-	sdl? (
-		media-libs/libsdl2[video]
-		media-libs/libsdl2[static-libs(+)]
-	)
-	sdl-image? ( media-libs/sdl2-image[static-libs(+)] )
-	seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] )
-	slirp? ( net-libs/libslirp[static-libs(+)] )
-	smartcard? ( >=app-emulation/libcacard-2.5.0[static-libs(+)] )
-	snappy? ( app-arch/snappy:= )
-	spice? (
-		>=app-emulation/spice-protocol-0.12.3
-		>=app-emulation/spice-0.12.0[static-libs(+)]
-	)
-	ssh? ( >=net-libs/libssh-0.8.6[static-libs(+)] )
-	udev? ( virtual/libudev:= )
-	usb? ( >=virtual/libusb-1-r2[static-libs(+)] )
-	usbredir? ( >=sys-apps/usbredir-0.6[static-libs(+)] )
-	vde? ( net-misc/vde[static-libs(+)] )
-	virgl? ( media-libs/virglrenderer[static-libs(+)] )
-	virtfs? ( sys-libs/libcap )
-	xen? ( app-emulation/xen-tools:= )
-	zstd? ( >=app-arch/zstd-1.4.0[static-libs(+)] )
-"
-
-EDK2_OVMF_VERSION="202105"
-SEABIOS_VERSION="1.14.0"
-
-X86_FIRMWARE_DEPEND="
-	pin-upstream-blobs? (
-		~sys-firmware/edk2-ovmf-${EDK2_OVMF_VERSION}[binary]
-		~sys-firmware/ipxe-1.21.1[binary,qemu]
-		~sys-firmware/seabios-${SEABIOS_VERSION}[binary,seavgabios]
-		~sys-firmware/sgabios-0.1_pre10[binary]
-	)
-	!pin-upstream-blobs? (
-		>=sys-firmware/edk2-ovmf-${EDK2_OVMF_VERSION}
-		sys-firmware/ipxe[qemu]
-		>=sys-firmware/seabios-${SEABIOS_VERSION}[seavgabios]
-		sys-firmware/sgabios
-	)"
-PPC_FIRMWARE_DEPEND="
-	pin-upstream-blobs? (
-		~sys-firmware/seabios-${SEABIOS_VERSION}[binary,seavgabios]
-	)
-	!pin-upstream-blobs? (
-		>=sys-firmware/seabios-${SEABIOS_VERSION}[seavgabios]
-	)
-"
-
-BDEPEND="
-	$(python_gen_impl_dep)
-	dev-lang/perl
-	sys-apps/texinfo
-	virtual/pkgconfig
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
-	)
-	gtk? ( nls? ( sys-devel/gettext ) )
-	test? (
-		dev-libs/glib[utils]
-		sys-devel/bc
-	)
-"
-CDEPEND="
-	!static? (
-		${ALL_DEPEND//\[static-libs(+)]}
-		${SOFTMMU_TOOLS_DEPEND//\[static-libs(+)]}
-	)
-	qemu_softmmu_targets_i386? ( ${X86_FIRMWARE_DEPEND} )
-	qemu_softmmu_targets_x86_64? ( ${X86_FIRMWARE_DEPEND} )
-	qemu_softmmu_targets_ppc? ( ${PPC_FIRMWARE_DEPEND} )
-	qemu_softmmu_targets_ppc64? ( ${PPC_FIRMWARE_DEPEND} )
-"
-DEPEND="${CDEPEND}
-	kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 )
-	static? (
-		${ALL_DEPEND}
-		${SOFTMMU_TOOLS_DEPEND}
-	)
-	static-user? ( ${ALL_DEPEND} )"
-RDEPEND="${CDEPEND}
-	acct-group/kvm
-	selinux? (
-		sec-policy/selinux-qemu
-		sys-libs/libselinux
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.11.1-capstone_include_path.patch
-	"${FILESDIR}"/${PN}-5.2.0-disable-keymap.patch
-	"${FILESDIR}"/${PN}-6.0.0-make.patch
-	"${FILESDIR}"/${PN}-6.1.0-strings.patch
-	"${FILESDIR}"/${PN}-7.0.0-also-build-virtfs-proxy-helper.patch
-	"${FILESDIR}"/${P}-virtio-scsi-fixes.patch
-	"${FILESDIR}"/${P}-pci-overflow-fortify-source-3.patch
-	"${FILESDIR}"/${PN}-7.0.0-have-user-meson.patch
-)
-
-QA_PREBUILT="
-	usr/share/qemu/hppa-firmware.img
-	usr/share/qemu/openbios-ppc
-	usr/share/qemu/openbios-sparc64
-	usr/share/qemu/openbios-sparc32
-	usr/share/qemu/opensbi-riscv64-generic-fw_dynamic.elf
-	usr/share/qemu/opensbi-riscv32-generic-fw_dynamic.elf
-	usr/share/qemu/palcode-clipper
-	usr/share/qemu/s390-ccw.img
-	usr/share/qemu/s390-netboot.img
-	usr/share/qemu/u-boot.e500
-"
-
-QA_WX_LOAD="usr/bin/qemu-i386
-	usr/bin/qemu-x86_64
-	usr/bin/qemu-alpha
-	usr/bin/qemu-arm
-	usr/bin/qemu-cris
-	usr/bin/qemu-m68k
-	usr/bin/qemu-microblaze
-	usr/bin/qemu-microblazeel
-	usr/bin/qemu-mips
-	usr/bin/qemu-mipsel
-	usr/bin/qemu-or1k
-	usr/bin/qemu-ppc
-	usr/bin/qemu-ppc64
-	usr/bin/qemu-sh4
-	usr/bin/qemu-sh4eb
-	usr/bin/qemu-sparc
-	usr/bin/qemu-sparc64
-	usr/bin/qemu-armeb
-	usr/bin/qemu-sparc32plus
-	usr/bin/qemu-s390x
-	usr/bin/qemu-unicore32
-"
-
-DOC_CONTENTS="If you don't have kvm compiled into the kernel, make sure you have the
-kernel module loaded before running kvm. The easiest way to ensure that the
-kernel module is loaded is to load it on boot.
-	For AMD CPUs the module is called 'kvm-amd'.
-	For Intel CPUs the module is called 'kvm-intel'.
-Please review /etc/conf.d/modules for how to load these.
-
-Make sure your user is in the 'kvm' group. Just run
-	$ gpasswd -a <USER> kvm
-then have <USER> re-login.
-
-For brand new installs, the default permissions on /dev/kvm might not let
-you access it.  You can tell udev to reset ownership/perms:
-	$ udevadm trigger -c add /dev/kvm
-
-If you want to register binfmt handlers for qemu user targets:
-For openrc:
-	# rc-update add qemu-binfmt
-For systemd:
-	# ln -s /usr/share/qemu/binfmt.d/qemu.conf /etc/binfmt.d/qemu.conf"
-
-pkg_pretend() {
-	if use kernel_linux && kernel_is lt 2 6 25; then
-		eerror "This version of KVM requires a host kernel of 2.6.25 or higher."
-	elif use kernel_linux; then
-		if ! linux_config_exists; then
-			eerror "Unable to check your kernel for KVM support"
-		else
-			CONFIG_CHECK="~KVM ~TUN ~BRIDGE"
-			ERROR_KVM="You must enable KVM in your kernel to continue"
-			ERROR_KVM_AMD="If you have an AMD CPU, you must enable KVM_AMD in"
-			ERROR_KVM_AMD+=" your kernel configuration."
-			ERROR_KVM_INTEL="If you have an Intel CPU, you must enable"
-			ERROR_KVM_INTEL+=" KVM_INTEL in your kernel configuration."
-			ERROR_TUN="You will need the Universal TUN/TAP driver compiled"
-			ERROR_TUN+=" into your kernel or loaded as a module to use the"
-			ERROR_TUN+=" virtual network device if using -net tap."
-			ERROR_BRIDGE="You will also need support for 802.1d"
-			ERROR_BRIDGE+=" Ethernet Bridging for some network configurations."
-			use vhost-net && CONFIG_CHECK+=" ~VHOST_NET"
-			ERROR_VHOST_NET="You must enable VHOST_NET to have vhost-net"
-			ERROR_VHOST_NET+=" support"
-
-			if use amd64 || use x86 || use amd64-linux || use x86-linux; then
-				if grep -q AuthenticAMD /proc/cpuinfo; then
-					CONFIG_CHECK+=" ~KVM_AMD"
-				elif grep -q GenuineIntel /proc/cpuinfo; then
-					CONFIG_CHECK+=" ~KVM_INTEL"
-				fi
-			fi
-
-			use python && CONFIG_CHECK+=" ~DEBUG_FS"
-			ERROR_DEBUG_FS="debugFS support required for kvm_stat"
-
-			# Now do the actual checks setup above
-			check_extra_config
-		fi
-	fi
-
-	if grep -qs '/usr/bin/qemu-kvm' "${EROOT}"/etc/libvirt/qemu/*.xml; then
-		eerror "The kvm/qemu-kvm wrappers no longer exist, but your libvirt"
-		eerror "instances are still pointing to it.  Please update your"
-		eerror "configs in /etc/libvirt/qemu/ to use the -enable-kvm flag"
-		eerror "and the right system binary (e.g. qemu-system-x86_64)."
-		die "update your virt configs to not use qemu-kvm"
-	fi
-}
-
-# Sanity check to make sure target lists are kept up-to-date.
-check_targets() {
-	local var=$1 mak=$2
-	local detected sorted
-
-	pushd "${S}"/configs/targets/ >/dev/null || die
-
-	# Force C locale until glibc is updated. #564936
-	detected=$(echo $(printf '%s\n' *-${mak}.mak | sed "s:-${mak}.mak::" | LC_COLLATE=C sort -u))
-	sorted=$(echo $(printf '%s\n' ${!var} | LC_COLLATE=C sort -u))
-	if [[ ${sorted} != "${detected}" ]] ; then
-		eerror "The ebuild needs to be kept in sync."
-		eerror "${var}: ${sorted}"
-		eerror "$(printf '%-*s' ${#var} configure): ${detected}"
-		die "sync ${var} to the list of targets"
-	fi
-
-	popd >/dev/null
-}
-
-src_prepare() {
-	check_targets IUSE_SOFTMMU_TARGETS softmmu
-	check_targets IUSE_USER_TARGETS linux-user
-
-	default
-
-	# Use correct toolchain to fix cross-compiling
-	tc-export AR AS LD NM OBJCOPY PKG_CONFIG RANLIB STRINGS
-	export WINDRES=${CHOST}-windres
-
-	# Verbose builds
-	MAKEOPTS+=" V=1"
-
-	# We already force -D_FORTIFY_SOURCE=2 (or 3) in our toolchain, but
-	# this setting (-U then -D..=2) will prevent us from trying out 3, so
-	# drop it. No change to level of protection b/c we patch our toolchain.
-	sed -i -e 's/-U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2//' configure || die
-
-	# Remove bundled copy of libfdt
-	rm -r dtc || die
-}
-
-##
-# configures qemu based on the build directory and the build type
-# we are using.
-#
-qemu_src_configure() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	local buildtype=$1
-	local builddir="${S}/${buildtype}-build"
-
-	mkdir "${builddir}" || die
-
-	local conf_opts=(
-		--prefix=/usr
-		--sysconfdir=/etc
-		--bindir=/usr/bin
-		--libdir=/usr/$(get_libdir)
-		--datadir=/usr/share
-		--docdir=/usr/share/doc/${PF}/html
-		--mandir=/usr/share/man
-		--localstatedir=/var
-		--disable-bsd-user
-		--disable-containers # bug #732972
-		--disable-guest-agent
-		--disable-strip
-		--with-git-submodules=ignore
-
-		# bug #746752: TCG interpreter has a few limitations:
-		# - it does not support FPU
-		# - it's generally slower on non-self-modifying code
-		# It's advantage is support for host architectures
-		# where native codegeneration is not implemented.
-		# Gentoo has qemu keyworded only on targets with
-		# native code generation available. Avoid the interpreter.
-		--disable-tcg-interpreter
-
-		--disable-werror
-		# We support gnutls/nettle for crypto operations.  It is possible
-		# to use gcrypt when gnutls/nettle are disabled (but not when they
-		# are enabled), but it's not really worth the hassle.  Disable it
-		# all the time to avoid automatically detecting it. #568856
-		--disable-gcrypt
-		--python="${PYTHON}"
-		--cc="$(tc-getCC)"
-		--cxx="$(tc-getCXX)"
-		--host-cc="$(tc-getBUILD_CC)"
-
-		$(use_enable alsa)
-		$(use_enable debug debug-info)
-		$(use_enable debug debug-tcg)
-		$(use_enable jack)
-		$(use_enable nls gettext)
-		$(use_enable oss)
-		$(use_enable plugins)
-		$(use_enable pulseaudio pa)
-		$(use_enable selinux)
-		$(use_enable xattr attr)
-	)
-
-	# Disable options not used by user targets. This simplifies building
-	# static user targets (USE=static-user) considerably.
-	conf_notuser() {
-		if [[ ${buildtype} == "user" ]] ; then
-			echo "--disable-${2:-$1}"
-		else
-			use_enable "$@"
-		fi
-	}
-	# Enable option only for softmmu build, but not 'user' or 'tools'
-	conf_softmmu() {
-		if [[ ${buildtype} == "softmmu" ]] ; then
-			use_enable "$@"
-		else
-			echo "--disable-${2:-$1}"
-		fi
-	}
-	# Enable option only for tools build, but not 'user' or 'softmmu'
-	conf_tools() {
-		if [[ ${buildtype} == "tools" ]] ; then
-			use_enable "$@"
-		else
-			echo "--disable-${2:-$1}"
-		fi
-	}
-	# Special case for the malloc flag, because the --disable flag does
-	# not exist and trying like above will break configuring.
-	conf_malloc() {
-		if [[ ! ${buildtype} == "user" ]] ; then
-			usex "${1}" "--enable-malloc=${1}" ""
-		fi
-	}
-	conf_opts+=(
-		$(conf_notuser accessibility brlapi)
-		$(conf_notuser aio linux-aio)
-		$(conf_softmmu bpf)
-		$(conf_notuser bzip2)
-		$(conf_notuser capstone)
-		$(conf_notuser caps cap-ng)
-		$(conf_notuser curl)
-		$(conf_tools doc docs)
-		$(conf_notuser fdt)
-		$(conf_notuser fuse)
-		$(conf_notuser glusterfs)
-		$(conf_notuser gnutls)
-		$(conf_notuser gnutls nettle)
-		$(conf_notuser gtk)
-		$(conf_notuser infiniband rdma)
-		$(conf_notuser iscsi libiscsi)
-		$(conf_notuser io-uring linux-io-uring)
-		$(conf_malloc jemalloc)
-		$(conf_notuser jpeg vnc-jpeg)
-		$(conf_notuser kernel_linux kvm)
-		$(conf_notuser lzo)
-		$(conf_notuser multipath mpath)
-		$(conf_notuser ncurses curses)
-		$(conf_notuser nfs libnfs)
-		$(conf_notuser numa)
-		$(conf_notuser opengl)
-		$(conf_notuser pam auth-pam)
-		$(conf_notuser png vnc-png)
-		$(conf_notuser rbd)
-		$(conf_notuser sasl vnc-sasl)
-		$(conf_notuser sdl)
-		$(conf_softmmu sdl-image)
-		$(conf_notuser seccomp)
-		$(conf_notuser slirp slirp system)
-		$(conf_notuser smartcard)
-		$(conf_notuser snappy)
-		$(conf_notuser spice)
-		$(conf_notuser ssh libssh)
-		$(conf_notuser udev libudev)
-		$(conf_notuser usb libusb)
-		$(conf_notuser usbredir usb-redir)
-		$(conf_notuser vde)
-		$(conf_notuser vhost-net)
-		$(conf_notuser vhost-user-fs)
-		$(conf_tools vhost-user-fs virtiofsd)
-		$(conf_notuser virgl virglrenderer)
-		$(conf_softmmu virtfs)
-		$(conf_notuser vnc)
-		$(conf_notuser vte)
-		$(conf_notuser xen)
-		$(conf_notuser xen xen-pci-passthrough)
-		# use prebuilt keymaps, bug #759604
-		--disable-xkbcommon
-		$(conf_notuser zstd)
-	)
-
-	if [[ ! ${buildtype} == "user" ]] ; then
-		# audio options
-		local audio_opts=(
-			# Note: backend order matters here: #716202
-			# We iterate from higher-level to lower level.
-			$(usex pulseaudio pa "")
-			$(usev jack)
-			$(usev sdl)
-			$(usev alsa)
-			$(usev oss)
-		)
-		conf_opts+=(
-			--audio-drv-list=$(IFS=,; echo "${audio_opts[*]}")
-		)
-	fi
-
-	case ${buildtype} in
-	user)
-		conf_opts+=(
-			--enable-linux-user
-			--disable-system
-			--disable-blobs
-			--disable-tools
-		)
-		local static_flag="static-user"
-		;;
-	softmmu)
-		conf_opts+=(
-			--disable-linux-user
-			--enable-system
-			--disable-tools
-		)
-		local static_flag="static"
-		;;
-	tools)
-		conf_opts+=(
-			--disable-linux-user
-			--disable-system
-			--disable-blobs
-			--enable-tools
-		)
-		local static_flag="static"
-		;;
-	esac
-
-	local targets="${buildtype}_targets"
-	[[ -n ${targets} ]] && conf_opts+=( --target-list="${!targets}" )
-
-	# Add support for SystemTAP
-	use systemtap && conf_opts+=( --enable-trace-backend=dtrace )
-
-	# We always want to attempt to build with PIE support as it results
-	# in a more secure binary. But it doesn't work with static or if
-	# the current GCC doesn't have PIE support.
-	if use ${static_flag}; then
-		conf_opts+=( --static --disable-pie )
-	else
-		tc-enables-pie && conf_opts+=( --enable-pie )
-	fi
-
-	# Meson will not use a cross-file unless cross_prefix is set.
-	tc-is-cross-compiler && conf_opts+=( --cross-prefix="${CHOST}-" )
-
-	# Plumb through equivalent of EXTRA_ECONF to allow experiments
-	# like bug #747928.
-	conf_opts+=( ${EXTRA_CONF_QEMU} )
-
-	echo "../configure ${conf_opts[*]}"
-	cd "${builddir}"
-	../configure "${conf_opts[@]}" || die "configure failed"
-}
-
-src_configure() {
-	local target
-
-	python_setup
-
-	softmmu_targets= softmmu_bins=()
-	user_targets= user_bins=()
-
-	for target in ${IUSE_SOFTMMU_TARGETS} ; do
-		if use "qemu_softmmu_targets_${target}"; then
-			softmmu_targets+=",${target}-softmmu"
-			softmmu_bins+=( "qemu-system-${target}" )
-		fi
-	done
-
-	for target in ${IUSE_USER_TARGETS} ; do
-		if use "qemu_user_targets_${target}"; then
-			user_targets+=",${target}-linux-user"
-			user_bins+=( "qemu-${target}" )
-		fi
-	done
-
-	softmmu_targets=${softmmu_targets#,}
-	user_targets=${user_targets#,}
-
-	[[ -n ${softmmu_targets} ]] && qemu_src_configure "softmmu"
-	[[ -n ${user_targets}    ]] && qemu_src_configure "user"
-	qemu_src_configure "tools"
-}
-
-src_compile() {
-	if [[ -n ${user_targets} ]]; then
-		cd "${S}/user-build" || die
-		default
-	fi
-
-	if [[ -n ${softmmu_targets} ]]; then
-		cd "${S}/softmmu-build" || die
-		default
-	fi
-
-	cd "${S}/tools-build" || die
-	default
-}
-
-src_test() {
-	if [[ -n ${softmmu_targets} ]]; then
-		cd "${S}/softmmu-build" || die
-		pax-mark m */qemu-system-* #515550
-		emake check
-	fi
-}
-
-qemu_python_install() {
-	python_domodule "${S}/python/qemu"
-
-	python_doscript "${S}/scripts/kvm/vmxcap"
-	python_doscript "${S}/scripts/qmp/qmp-shell"
-	python_doscript "${S}/scripts/qmp/qemu-ga-client"
-}
-
-# Generate binfmt support files.
-#   - /etc/init.d/qemu-binfmt script which registers the user handlers (openrc)
-#   - /usr/share/qemu/binfmt.d/qemu.conf (for use with systemd-binfmt)
-generate_initd() {
-	local out="${T}/qemu-binfmt"
-	local out_systemd="${T}/qemu.conf"
-	local d="${T}/binfmt.d"
-
-	einfo "Generating qemu binfmt scripts and configuration files"
-
-	# Generate the debian fragments first.
-	mkdir -p "${d}"
-	"${S}"/scripts/qemu-binfmt-conf.sh \
-		--debian \
-		--exportdir "${d}" \
-		--qemu-path "${EPREFIX}/usr/bin" \
-		|| die
-	# Then turn the fragments into a shell script we can source.
-	sed -E -i \
-		-e 's:^([^ ]+) (.*)$:\1="\2":' \
-		"${d}"/* || die
-
-	# Generate the init.d script by assembling the fragments from above.
-	local f qcpu package interpreter magic mask
-	cat "${FILESDIR}"/qemu-binfmt.initd.head >"${out}" || die
-	for f in "${d}"/qemu-* ; do
-		source "${f}"
-
-		# Normalize the cpu logic like we do in the init.d for the native cpu.
-		qcpu=${package#qemu-}
-		case ${qcpu} in
-		arm*)   qcpu="arm";;
-		mips*)  qcpu="mips";;
-		ppc*)   qcpu="ppc";;
-		s390*)  qcpu="s390";;
-		sh*)    qcpu="sh";;
-		sparc*) qcpu="sparc";;
-		esac
-
-		# we use 'printf' here to be portable across 'sh'
-		# implementations: #679168
-		cat <<EOF >>"${out}"
-	if [ "\${cpu}" != "${qcpu}" -a -x "${interpreter}" ] ; then
-		printf '%s\n' ':${package}:M::${magic}:${mask}:${interpreter}:'"\${QEMU_BINFMT_FLAGS}" >/proc/sys/fs/binfmt_misc/register
-	fi
-EOF
-
-		echo ":${package}:M::${magic}:${mask}:${interpreter}:OC" >>"${out_systemd}"
-
-	done
-	cat "${FILESDIR}"/qemu-binfmt.initd.tail >>"${out}" || die
-}
-
-src_install() {
-	if [[ -n ${user_targets} ]]; then
-		cd "${S}/user-build"
-		emake DESTDIR="${ED}" install
-
-		# Install binfmt handler init script for user targets.
-		generate_initd
-		doinitd "${T}/qemu-binfmt"
-
-		# Install binfmt/qemu.conf.
-		insinto "/usr/share/qemu/binfmt.d"
-		doins "${T}/qemu.conf"
-	fi
-
-	if [[ -n ${softmmu_targets} ]]; then
-		cd "${S}/softmmu-build"
-		emake DESTDIR="${ED}" install
-
-		# This might not exist if the test failed. #512010
-		[[ -e check-report.html ]] && dodoc check-report.html
-
-		if use kernel_linux; then
-			udev_newrules "${FILESDIR}"/65-kvm.rules-r2 65-kvm.rules
-		fi
-
-		if use python; then
-			python_foreach_impl qemu_python_install
-		fi
-	fi
-
-	cd "${S}/tools-build" || die
-	emake DESTDIR="${ED}" install
-
-	# Disable mprotect on the qemu binaries as they use JITs to be fast #459348
-	pushd "${ED}"/usr/bin >/dev/null || die
-	pax-mark mr "${softmmu_bins[@]}" "${user_bins[@]}" # bug 575594
-	popd >/dev/null || die
-
-	# Install config file example for qemu-bridge-helper
-	insinto "/etc/qemu"
-	doins "${FILESDIR}/bridge.conf"
-
-	cd "${S}" || die
-	dodoc MAINTAINERS docs/specs/pci-ids.txt
-	newdoc pc-bios/README README.pc-bios
-
-	# Disallow stripping of prebuilt firmware files.
-	dostrip -x ${QA_PREBUILT}
-
-	if [[ -n ${softmmu_targets} ]]; then
-		# Remove SeaBIOS since we're using the SeaBIOS packaged one
-		rm "${ED}/usr/share/qemu/bios.bin"
-		rm "${ED}/usr/share/qemu/bios-256k.bin"
-		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
-			dosym ../seabios/bios.bin /usr/share/qemu/bios.bin
-			dosym ../seabios/bios-256k.bin /usr/share/qemu/bios-256k.bin
-		fi
-
-		# Remove vgabios since we're using the seavgabios packaged one
-		rm "${ED}/usr/share/qemu/vgabios.bin"
-		rm "${ED}/usr/share/qemu/vgabios-cirrus.bin"
-		rm "${ED}/usr/share/qemu/vgabios-qxl.bin"
-		rm "${ED}/usr/share/qemu/vgabios-stdvga.bin"
-		rm "${ED}/usr/share/qemu/vgabios-virtio.bin"
-		rm "${ED}/usr/share/qemu/vgabios-vmware.bin"
-		# PPC/PPC64 loads vgabios-stdvga
-		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386 || use qemu_softmmu_targets_ppc || use qemu_softmmu_targets_ppc64; then
-			dosym ../seavgabios/vgabios-isavga.bin /usr/share/qemu/vgabios.bin
-			dosym ../seavgabios/vgabios-cirrus.bin /usr/share/qemu/vgabios-cirrus.bin
-			dosym ../seavgabios/vgabios-qxl.bin /usr/share/qemu/vgabios-qxl.bin
-			dosym ../seavgabios/vgabios-stdvga.bin /usr/share/qemu/vgabios-stdvga.bin
-			dosym ../seavgabios/vgabios-virtio.bin /usr/share/qemu/vgabios-virtio.bin
-			dosym ../seavgabios/vgabios-vmware.bin /usr/share/qemu/vgabios-vmware.bin
-		fi
-
-		# Remove sgabios since we're using the sgabios packaged one
-		rm "${ED}/usr/share/qemu/sgabios.bin"
-		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
-			dosym ../sgabios/sgabios.bin /usr/share/qemu/sgabios.bin
-		fi
-
-		# Remove iPXE since we're using the iPXE packaged one
-		rm "${ED}"/usr/share/qemu/pxe-*.rom
-		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
-			dosym ../ipxe/8086100e.rom /usr/share/qemu/pxe-e1000.rom
-			dosym ../ipxe/80861209.rom /usr/share/qemu/pxe-eepro100.rom
-			dosym ../ipxe/10500940.rom /usr/share/qemu/pxe-ne2k_pci.rom
-			dosym ../ipxe/10222000.rom /usr/share/qemu/pxe-pcnet.rom
-			dosym ../ipxe/10ec8139.rom /usr/share/qemu/pxe-rtl8139.rom
-			dosym ../ipxe/1af41000.rom /usr/share/qemu/pxe-virtio.rom
-		fi
-	fi
-
-	DISABLE_AUTOFORMATTING=true
-	readme.gentoo_create_doc
-}
-
-firmware_abi_change() {
-	local pv
-	for pv in ${REPLACING_VERSIONS}; do
-		if ver_test ${pv} -lt ${FIRMWARE_ABI_VERSION}; then
-			return 0
-		fi
-	done
-	return 1
-}
-
-pkg_postinst() {
-	if [[ -n ${softmmu_targets} ]] && use kernel_linux; then
-		udev_reload
-	fi
-
-	xdg_icon_cache_update
-
-	[[ -z ${EPREFIX} ]] && [[ -f ${EROOT}/usr/libexec/qemu-bridge-helper ]] && \
-		fcaps cap_net_admin "${EROOT}"/usr/libexec/qemu-bridge-helper
-
-	DISABLE_AUTOFORMATTING=true
-	readme.gentoo_print_elog
-
-	if use pin-upstream-blobs && firmware_abi_change; then
-		ewarn "This version of qemu pins new versions of firmware blobs:"
-		ewarn "	$(best_version sys-firmware/edk2-ovmf)"
-		ewarn "	$(best_version sys-firmware/ipxe)"
-		ewarn "	$(best_version sys-firmware/seabios)"
-		ewarn "	$(best_version sys-firmware/sgabios)"
-		ewarn "This might break resume of hibernated guests (started with a different"
-		ewarn "firmware version) and live migration to/from qemu versions with different"
-		ewarn "firmware. Please (cold) restart all running guests. For functional"
-		ewarn "guest migration ensure that all"
-		ewarn "hosts run at least"
-		ewarn "	app-emulation/qemu-${FIRMWARE_ABI_VERSION}."
-	fi
-}
-
-pkg_info() {
-	echo "Using:"
-	echo "  $(best_version app-emulation/spice-protocol)"
-	echo "  $(best_version sys-firmware/edk2-ovmf)"
-	if has_version 'sys-firmware/edk2-ovmf[binary]'; then
-		echo "    USE=binary"
-	else
-		echo "    USE=''"
-	fi
-	echo "  $(best_version sys-firmware/ipxe)"
-	echo "  $(best_version sys-firmware/seabios)"
-	if has_version 'sys-firmware/seabios[binary]'; then
-		echo "    USE=binary"
-	else
-		echo "    USE=''"
-	fi
-	echo "  $(best_version sys-firmware/sgabios)"
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/app-emulation/qemu/qemu-7.0.0-r3.ebuild b/app-emulation/qemu/qemu-7.0.0-r3.ebuild
index d484cdf35ab1..126f0338e5ba 100644
--- a/app-emulation/qemu/qemu-7.0.0-r3.ebuild
+++ b/app-emulation/qemu/qemu-7.0.0-r3.ebuild
@@ -14,7 +14,7 @@ QEMU_DOCS_VERSION=$(ver_cut 1-3)
 # bug #830088
 QEMU_DOCS_USEFLAG="+doc"
 
-PYTHON_COMPAT=( python3_{8,9,10} )
+PYTHON_COMPAT=( python3_{8,9,10,11} )
 PYTHON_REQ_USE="ncurses,readline"
 
 FIRMWARE_ABI_VERSION="7.0.0"
diff --git a/app-emulation/qemu/qemu-7.1.0.ebuild b/app-emulation/qemu/qemu-7.1.0.ebuild
index 0fd301c4946b..499aa3a68895 100644
--- a/app-emulation/qemu/qemu-7.1.0.ebuild
+++ b/app-emulation/qemu/qemu-7.1.0.ebuild
@@ -13,7 +13,7 @@ QEMU_DOCS_VERSION="${PV}"
 # bug #830088
 QEMU_DOC_USEFLAG="+doc"
 
-PYTHON_COMPAT=( python3_{8,9,10} )
+PYTHON_COMPAT=( python3_{8,9,10,11} )
 PYTHON_REQ_USE="ncurses,readline"
 
 FIRMWARE_ABI_VERSION="7.1.0"
@@ -41,7 +41,7 @@ else
 	fi
 
 	S="${WORKDIR}/${MY_P}"
-	#KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
 fi
 
 DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
@@ -590,8 +590,6 @@ qemu_src_configure() {
 		$(conf_notuser usbredir usb-redir)
 		$(conf_notuser vde)
 		$(conf_notuser vhost-net)
-		# $(conf_notuser vhost-user-fs)
-		# $(conf_tools vhost-user-fs virtiofsd)
 		$(conf_notuser virgl virglrenderer)
 		$(conf_softmmu virtfs)
 		$(conf_notuser vnc)
@@ -624,6 +622,7 @@ qemu_src_configure() {
 		conf_opts+=(
 			--enable-linux-user
 			--disable-system
+			--disable-blobs
 			--disable-tools
 		)
 		local static_flag="static-user"
@@ -632,7 +631,6 @@ qemu_src_configure() {
 		conf_opts+=(
 			--disable-linux-user
 			--enable-system
-			--disable-blobs
 			--disable-tools
 		)
 		local static_flag="static"
@@ -698,6 +696,11 @@ src_configure() {
 			softmmu_targets+=",${target}-softmmu"
 			softmmu_bins+=( "qemu-system-${target}" )
 
+			# Needed to rework vhost-user-fs handling thanks to https://gitlab.com/qemu-project/qemu/-/commit/5166dab
+			# The option was converted into being configurable by
+			# Kconfig's. So, to enable it, we insert the necessary
+			# options into each arch's softmmu target gentoo.mak file,
+			# then configure with --with-devices-${target}=gentoo.
 			if use vhost-user-fs; then
 				echo "CONFIG_VHOST_USER_FS=y for ${target}-softmmu" || die
 				echo "CONFIG_VIRTIO=y" >> "configs/devices/${target}-softmmu/gentoo.mak" || die
diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild
index 9ec29aa9430e..4d1ead785bc1 100644
--- a/app-emulation/qemu/qemu-9999.ebuild
+++ b/app-emulation/qemu/qemu-9999.ebuild
@@ -14,7 +14,7 @@ QEMU_DOCS_VERSION=$(ver_cut 1-3)
 # bug #830088
 QEMU_DOC_USEFLAG="+doc"
 
-PYTHON_COMPAT=( python3_{8,9,10} )
+PYTHON_COMPAT=( python3_{8,9,10,11} )
 PYTHON_REQ_USE="ncurses,readline"
 
 FIRMWARE_ABI_VERSION="7.1.0"
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 8f1c8cc35a76..5fcec7a022f7 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/wayland-utils/Manifest b/app-misc/wayland-utils/Manifest
index 1d2c77cdc709..57da0e48ab00 100644
--- a/app-misc/wayland-utils/Manifest
+++ b/app-misc/wayland-utils/Manifest
@@ -1,3 +1,5 @@
+DIST wayland-utils-1.1.0.tar.bz2 14071 BLAKE2B b2726205c8d123a4543aa316928fe2909917f70bbde4318376581c1ec97f658f0d5743a7df091799ef2adce4c962e83aefdc805e25cf1af5429520eddff2918c SHA512 5cd842c286c1960c1f604287826625c23c87306e9e31daba23a65402d4ae0abd0cec4a701c8fb65af2aea6adbcb018660e646939062c51628a65dde41ebd64bf
 DIST wayland-utils-wayland-utils-1.0.0.tar.gz 13188 BLAKE2B b05917c611a54e157e31c6e83b026c0960189c36d71361e12ec6dbc33872184fb2ea30cf04a0c57ba6a9b776e5aa51baf286f092eb8780fdd6f0462c8e36ae87 SHA512 0e5886fc74bf84396facb79bfc2fcc4fa7ababc39f861fc62d198656c65dec31150bc7fd27773dfa8add421f08ad0dd43a7d72c9e8f6f5733ac34fb8212658cc
 EBUILD wayland-utils-1.0.0.ebuild 588 BLAKE2B dd9eb30959b6d87b21153093669f97e8b123fba85909701b541280a38601612f675f9b0d98b7eb30c9a605287564707a3a65e06c2c4dbe4e548752659d6d2f7b SHA512 877c480d53e85f9fa97a3ef5519df4792a7cc3c9729a7af6cc8b5867d4eae8999b977402bb182fe1c8719fa33301ec634afb126418f55a7eaa4dc8362b0e946b
+EBUILD wayland-utils-1.1.0.ebuild 662 BLAKE2B 91b07a1e53ba17f25f98431f60682607c7890059243df607b711c67e9730a5baee6a680ba35d0d2be7011dfda9e7b4c825bee9e3792af723a1233df3359ad2ed SHA512 4f242830050f959503499c2b64484633ce439dd7cdb6995e75b735ebbef69ee269369994d07a1e4324b4376cfb3146ac9a0aea2cac4257c3502fcc1c31e5d9d0
 MISC metadata.xml 235 BLAKE2B 5ed3cd35ac32a5cdd6ac490bafdbc1cd03fc8c6bdbc8194ba7f4a34151a24c4ade7a80705d92348d6d13a9579d18b19ec40a353bf014dc02f98980bfa03d3574 SHA512 3fe78f6dd92b87b30ed02aef15ed72ec5cb62f4c6568dd9b98dcb2f11a4b9ce93955e34c62112a310b4c4a51f87e0e31e31ae5af140e1054c127d3cd344d7267
diff --git a/app-misc/wayland-utils/wayland-utils-1.1.0.ebuild b/app-misc/wayland-utils/wayland-utils-1.1.0.ebuild
new file mode 100644
index 000000000000..89f1a7935cc8
--- /dev/null
+++ b/app-misc/wayland-utils/wayland-utils-1.1.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson
+
+DESCRIPTION="Display information about supported Wayland protocols and current compositor"
+HOMEPAGE="https://gitlab.freedesktop.org/wayland/wayland-utils"
+SRC_URI="https://gitlab.freedesktop.org/wayland/${PN}/-/archive/${PV}/${P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-libs/wayland-1.20.0
+	x11-libs/libdrm
+"
+DEPEND="${RDEPEND}
+	dev-libs/wayland-protocols
+"
+BDEPEND="dev-util/wayland-scanner"
+
+src_configure() {
+	local emesonargs=(
+		-Ddrm=enabled
+	)
+	meson_src_configure
+}
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index 169fbcaa95ec..d3cb3be03bb9 100644
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
diff --git a/dev-cpp/rapidfuzz-cpp/Manifest b/dev-cpp/rapidfuzz-cpp/Manifest
index afac94827977..052bb731ae53 100644
--- a/dev-cpp/rapidfuzz-cpp/Manifest
+++ b/dev-cpp/rapidfuzz-cpp/Manifest
@@ -1,3 +1,5 @@
 DIST rapidfuzz-cpp-1.6.0.gh.tar.gz 250024 BLAKE2B 96d70680bb9b3c3e053b385845b543f69bb4215c6be92df6b7e61559cfa0f072833a13ceadf24f73531e848517864461cd696504584ea3a489d37e56c0a03c3b SHA512 ba319af67428a96df406b10b11eafa4c73762f0916d2ac4ac2860f1a25a97fc9e4e3a69c8633c8fed8ef76a0c4a8e073bc16048bde111782d0e8f00e396a4df9
+DIST rapidfuzz-cpp-1.7.0.gh.tar.gz 252646 BLAKE2B 5d79c07e26b6bb8e84d3280c3401bad60a3ca9846977a5bf9b13787ed7951c3805c71b7e6e2e03b14e2b988381484d969e1cc885c316bcb805b403e53332b31b SHA512 ed8af678a40161aa738bd3606b41fd54c1dba603c47fbdb1182527abd5667736e50f458af252e7bde954f263040cdbd662ad1c6be0a5caa5289f0a351dfd6d9e
 EBUILD rapidfuzz-cpp-1.6.0.ebuild 825 BLAKE2B b4323c2873210fe0bd3ed5fdd79d45fa552f2e9c48bea3144c98dc4a2e9cc52119b4b16926d08a8a12d0c92f89d2598662da22a4d4130192e5c40958e9000289 SHA512 bcb6ff63843c3e50ad6c80cee4b2c94a98c96946fee0970ca1997a1185c0587e5f87e88c6051803813791f1f9537f9e4927f3903e5974954b1485939c4198998
+EBUILD rapidfuzz-cpp-1.7.0.ebuild 825 BLAKE2B b4323c2873210fe0bd3ed5fdd79d45fa552f2e9c48bea3144c98dc4a2e9cc52119b4b16926d08a8a12d0c92f89d2598662da22a4d4130192e5c40958e9000289 SHA512 bcb6ff63843c3e50ad6c80cee4b2c94a98c96946fee0970ca1997a1185c0587e5f87e88c6051803813791f1f9537f9e4927f3903e5974954b1485939c4198998
 MISC metadata.xml 338 BLAKE2B 43c0cb99a03961ca48146b237a22fbf56c90312b7a39b57a3d01dd532f4f01891e713c802b372b4efb0af528198d8f2c0febae6ffec65da152e8e23f7a67b8a4 SHA512 a54d78c951d15319a2e467dc5d5692d9af5ef9e79c9c9135ee5e26853361ec6bcfebab8e82e3299314f9b7c8cd703365ff6d144e7e6876f486ca5f3a02a3b0f7
diff --git a/dev-cpp/rapidfuzz-cpp/rapidfuzz-cpp-1.7.0.ebuild b/dev-cpp/rapidfuzz-cpp/rapidfuzz-cpp-1.7.0.ebuild
new file mode 100644
index 000000000000..99e66055cc0f
--- /dev/null
+++ b/dev-cpp/rapidfuzz-cpp/rapidfuzz-cpp-1.7.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Rapid fuzzy string matching in C++"
+HOMEPAGE="https://github.com/maxbachmann/rapidfuzz-cpp/"
+SRC_URI="
+	https://github.com/maxbachmann/rapidfuzz-cpp/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	test? (
+		>=dev-cpp/catch-3
+	)
+"
+
+src_prepare() {
+	# apparently "C++ best practices" don't mind fetching random stuff
+	# at build time
+	sed -i -e '/aminya/,/^)/d' test/CMakeLists.txt || die
+	find -name 'CMakeLists.txt' -exec \
+		sed -i -e 's:project_warnings::' {} + || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DRAPIDFUZZ_BUILD_TESTING=$(usex test)
+	)
+	cmake_src_configure
+}
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 13156ef95819..f1101564bda5 100644
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
diff --git a/dev-db/lmdb++/Manifest b/dev-db/lmdb++/Manifest
index 0083af5918e5..47112d7af45f 100644
--- a/dev-db/lmdb++/Manifest
+++ b/dev-db/lmdb++/Manifest
@@ -1,6 +1,6 @@
 DIST lmdbxx-0.9.14.0.tar.gz 14732 BLAKE2B c6c1217dc7bd56051152cba594b7aa571a055e5c155f777639569abbe38360f808dcd2858ca124db97e37147aa4e90df68fd1a8d23137b5e6663df0c2f0a84be SHA512 8eff8c89e0cb9989d8a0cedfd483856aeb2fcf810d59cf8afca3086034711ff22f2bb88ba967ef745d36fdaa1b5e79fb75655af764cddcdb2ac59fc255da670d
 DIST lmdbxx-1.0.0.tar.gz 52441 BLAKE2B 203173132a9c84c2d6a53799f8acc92dac5bd075b69f7b25e8eee3341933ccdd868eb190cef07371469856e32fc42215c5395db61f141863f60a5d0a2b888790 SHA512 54f6c4863273b4de8aed6bc19f353c7a66d8ae633198e9784c55cea8e54460e4030ebe45e91a7c820aade084933f21cd4193ef8c04bb2aef11bf252281404171
 EBUILD lmdb++-0.9.14.0.ebuild 515 BLAKE2B 6abd2bf7fec941e1146a23097782aa18489efa990fbb7869c0152887ebc05b3d0df32a53ce1edc3d4a560b3b5f13218203184cee4946d116b9839dfa5c370518 SHA512 8a0395ae7a047ddba30373225039a40110a7d0f5b81e12aa52cb0d6b975453da57efe03db170fe4006ace29a0b99c584c837bef891ade9c0e0272a254656c558
-EBUILD lmdb++-1.0.0-r1.ebuild 663 BLAKE2B d81dc2edc9b3cd8c5a4b403f3d4bd364e7058f4579f3ecffb85995979df81131d358a57e4ba40f6a2389a8a4d9ec9542856bd3d29360d3c4f7e8222a63431181 SHA512 cf3ede13f7c984787185605495bb1971402fa79b7072e223d9ef729642af37918d335988792eaf069075c5720cd0be31ce4b28c1d96394b294e32dc70f7b6c36
+EBUILD lmdb++-1.0.0-r1.ebuild 670 BLAKE2B 50edd3e764d4c9cfc59d1aed0eef5db144fd44ba19af1d23e42a1a176efed086a006802ac94414b776377a18a55bb68e7ef1a81bedf1058150af90cdcd6c0241 SHA512 cdad15e36d75eb0dc0d12548be8acb8af0adbb71d2532338e47e337e07224594a1b65e9be18a8dffbd7d2d3fe6aa20c901777156890c2effc626bb045f6bc2ff
 EBUILD lmdb++-1.0.0.ebuild 663 BLAKE2B ae0e0d11402b7f722269d8d20c11fafad3d907cc723fa0ab59a9d5dd0ba696e8192aadcc9953bd8ea2ef1e6af7be2a35a8d2d19f06a9d499bd49c5f935564cfd SHA512 a53d1ee715f49ad455c95bd886de6fc6f8b7ef58077970460a8fcb433de033dbd5d4e920fdda59fcad239eb636c2428d9fcd42957fb5adaee8fed93e211c5782
 MISC metadata.xml 576 BLAKE2B d7a1fce0909d6fc48938bf8af3fdd44948d0442427d489154a81ff5ada1be20f6454601d2ec606808c647f4f317a76c6b3a611295210d1db16c1840bb8b60407 SHA512 26fa1a84ec1f5a83cdc01289364d5d613761b592b10ef7b0589c5ad2cd18dafe11afd16a25633a45eb30f1956421723b0f769647ead52aa249d163dee1fa0804
diff --git a/dev-db/lmdb++/lmdb++-1.0.0-r1.ebuild b/dev-db/lmdb++/lmdb++-1.0.0-r1.ebuild
index 1540d53602ed..a21ac43356ba 100644
--- a/dev-db/lmdb++/lmdb++-1.0.0-r1.ebuild
+++ b/dev-db/lmdb++/lmdb++-1.0.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/hoytech/lmdbxx/archive/${PV}.tar.gz -> ${MY_P}.tar.g
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index d2e046ba4f6c..977713db7482 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 ac9a0607f54f..0e5d9a920ed8 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -2,17 +2,21 @@ 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.23-src.tar.gz 6136614 BLAKE2B 4eaf963187b9a754ed459d7f85e6f7d329927b949bb4a390a602cdc6651aa037aeec559c511ddb9880b6ec4d7cd97b96d82da341509370e412e1b21b799d8c2e SHA512 19ec026bae75318e9ffbe2e619ad2e12ec116382ea88a1064696275afb3fd13e6f08efe497dde79689bfc828f76e27d114ad3a9284b79c8d956a6a85bdac6360
+DIST apache-tomcat-10.1.0-src.tar.gz 6060833 BLAKE2B 49f36131c1e809b298ac915e671b9f4df55b55c2ba34d21ee3fdeb8759ddaf53a6780b177e8049446079d91186c52669969f30762ddf776d9f8615e527d5a975 SHA512 08323eec0403473fa97f419d7911980c3dfe7b1607a64741bbe972a737dfa70ea04ea80ca9ab28bf72bdde9d24cf8f7161eeb8b194204c777d1628d00c78611c
 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
 DIST apache-tomcat-7.0.109-src.tar.gz 5314401 BLAKE2B 56583caea6879bf8ca5cc02a886de3d7af413032f88d367653e709dc1c8f590e78620c788317bbff4b6e65dd3e242cc26863164ac8e7c87334a22636f3ed0703 SHA512 ecf9c0bee0e3e1aa24f299fe633705c5a2f6aa264d9e4968cfc96aa5d0a425c2b0ff07765a8b6c67221766733bdfaed6e6c6377a8d0870d889e7063ce90a46ce
 DIST apache-tomcat-8.5.82-src.tar.gz 6011553 BLAKE2B ea34c0485877ace8c84144f0e75f370c0ac461b5b725d97a07e27014b7a14b1ab88fad4230d4fae60190d7bff3836f691615b57b9f085797477acc69560a57ce SHA512 3e0a0a808fb78493930ce8832731eba4ab3cc440387c3b5226ff6e4ac2faf5fd70eff1560d840d34f14a8acfd7e60fc8b7f638f3dbe0c0ed4569dc4271a9c3f2
 DIST apache-tomcat-9.0.65-src.tar.gz 6195265 BLAKE2B 13ca956b58e9f1831700f67d1fa8883f6471ab6b700b2af169bf284552658a4e9ad4130451b36976af4dd366cc987e228e0b0f98e688cccf577c626dfc78aae7 SHA512 3ff344370cc36f5bed389ed198054783a4f5bc86476a751cda280618457a06bae38c1e764b0c110c2f68efe2d34243a4e24596e8b90e8fbd171bf584a22fd3bc
+DIST apache-tomcat-9.0.67-src.tar.gz 6211392 BLAKE2B 273b921ce580be6fb76d8567e5b0aec01b936518875f8470c1cee4b159519f723e606680d9986f61fbbab79cea2d027195f3debe9af59dfac786b0d0566d7c02 SHA512 33319d70c50fde71d163f66dc388ed2d5855aa4f087f7e2259adc27cc7ed30ace079d81e52def43a904c88ac670bb0c71667938b931a214470d77679108914cc
 EBUILD tomcat-servlet-api-10.0.23.ebuild 3021 BLAKE2B 5a7b1fc041750ed25e2b2ebd91a46d422b8b84455814a95f0ecc4b13634e8df876a1cc95e4f6318380392feb80f8a748bfe21898e18169ddb05eea7a0f086c2f SHA512 da77418b28127f4d7e05f691f835e7eb01a59e2f33daf15ecc2f76ccbc1f136e7b446d14104d9cbc62f9d251f926dc698e8051b877c61f4adbce45c51b21822a
+EBUILD tomcat-servlet-api-10.1.0.ebuild 3023 BLAKE2B 53295a63ac3daab543803c970f5ad23177f7c4299c8cc0a75b770054c3effd23105669a2a5e7e5db6eba6fe2168d854a56452d82d80ef8c70d30413aaa3621de SHA512 f4033ad46e70449c756cba28521baee9772aa04255a2f4ad727b90675dcfb7f45976567ba8b94025ea9cc8644b7124939f8bae77d6de2dfde5e9c0c501a67608
 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
 EBUILD tomcat-servlet-api-7.0.109.ebuild 2986 BLAKE2B 8bafa3c18cef415f0eb5b20ecf07ea4209313321288b8aa25e13463509e12aa58d250e8dbe52b3801ebf409cf0f013e42ee5cfb9bc1e548971263f7639b09240 SHA512 c3991e127f68c4e0ef6e1dde9ffefbcbfc72479d6dff48c048f8d56adb505ab8959da75422e52eb02c1f5d235c0051474f0329de4013774594289b011223a263
 EBUILD tomcat-servlet-api-8.5.82.ebuild 3002 BLAKE2B c45468894337c7e25099a50e10280a0e08b4be3c6f058ff4b1ead323f5c9713dbb618b8c47e8106cb7f1a8ca84e75cb14191bf263ec2ccc9f25e8220bb92992f SHA512 f05643a5452a73dbb03d451f576404b75fe1cd615aca31855d741223b70ec081b914311b063e16ec28c2779d92edcfa264a354a75bcc59ec56670b1ff426f634
 EBUILD tomcat-servlet-api-9.0.65.ebuild 3009 BLAKE2B bfcd05fd52b9fe8828076b1727c38fb62f3019f271e95c17a6b5a4ead3f0704e2e3449216dba58bc27c399c9c242e48bc3dc9f7e4b4f5d6c7a242ad36cce243a SHA512 e6ddc9b3168c85061a67941dc8860933df8d6479a966cd627ef9d3eb9d5d5a9e925a950cc8c740604b1c7520a3e7faf47dab41f07223a8bc1250219053a7444a
+EBUILD tomcat-servlet-api-9.0.67.ebuild 3013 BLAKE2B 642b4fd0b2c0703f48dc9b0354dc9df887d149485ca538a9450ee2110cee17dc145be54538d27c21da079db942543cc7e7ffa4206cb3e2c8f755b2dbf0159012 SHA512 adb2ef89bfa5e7b111b0135ae318ea5989d0f5350ccaa23053108a1c53a17aa2b908eab00879c3e384edb22630dec79d582ed682ffd8fff6eba58470d77e977d
 MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.1.0.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.1.0.ebuild
new file mode 100644
index 000000000000..cb931c0af8c5
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.1.0.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 6.0/JSP API 3.1/EL API 5.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="6.0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=">=virtual/jdk-11:*"
+RDEPEND=">=virtual/jre-11:*"
+
+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-java/tomcat-servlet-api/tomcat-servlet-api-9.0.67.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.67.ebuild
new file mode 100644
index 000000000000..09fffd263372
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.67.ebuild
@@ -0,0 +1,99 @@
+# 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 4.0/JSP API 2.3/EL API 3.0 implementation"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/tomcat/tomcat-9/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="4.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 compila and package
+
+	mkdir -p ${SERVLET_API_SRC} ${SERVLET_API_RESOURCES} \
+		${EL_API_SRC} ${EL_API_RESOURCES} \
+		${JSP_API_SRC}/javax/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 javax/servlet "${S}/${SERVLET_API_SRC}/" || die "Failed to copy servlet-api sources"
+	mv "${S}/${SERVLET_API_SRC}/javax/servlet/jsp" "${S}/${JSP_API_SRC}/javax/servlet" || die "Failed to copy jsp-api sources"
+	cp --parents -R javax/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/javax ${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-libs/Manifest.gz b/dev-libs/Manifest.gz
index 811b8c8efe27..c00550fc5184 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/libatomic_ops/Manifest b/dev-libs/libatomic_ops/Manifest
index 628ba31fa922..f94e70c5e929 100644
--- a/dev-libs/libatomic_ops/Manifest
+++ b/dev-libs/libatomic_ops/Manifest
@@ -1,5 +1,3 @@
-DIST libatomic_ops-7.6.12.tar.gz 506313 BLAKE2B 8f80773390479a36e06447594c8558ed337eef5b18ae0b0779722647dcde49b61b23e656acbc935714245d80e40c5cde1c164f0524a97dcc53972051d5891239 SHA512 bbf98a38a80c8fe6b7eab773967edc55b8d48be32b36ed827fb835ee3dcd96d5ec1dc97149714e015e93a0a5b9fc03595797663fdb5a0f673869ea8bfe640df5
 DIST libatomic_ops-7.6.14.tar.gz 500006 BLAKE2B 02bf8448eb61119d5eea81d6a861238f5aae4c7740536f9c17c614d199db81eb7cb6e07d6edef1a76cae88bdd2b021fa0692f2b42842692ec853b2879c559d81 SHA512 da83886b4d766da64b27672eede40bd5787523a4c308ac7bd3f03ac831ae1a141ba21e5f5ada27bfcf811b9fb04d8a519331ea2573af036f8791958668dad851
-EBUILD libatomic_ops-7.6.12.ebuild 745 BLAKE2B 74160baf7648726668b3d23585aec1c9bc1cba67c2f655d2ddc0c072e15cc79ac01636ccb34be1bad214e02a51470f3de2b2d63df7404e8f7ac64db44ea46653 SHA512 2acc19dfc4012b63059f45429781150d3095a3cf56449ade61b3bb060ec5211d942ad95c89e9f47080a45c5df7d8b7c3960a9289ad71d1943b98f53138b8542d
 EBUILD libatomic_ops-7.6.14.ebuild 752 BLAKE2B d037039f0a5763cd06814dcdc961a8af434e393b591db957387657afdef49841c25ecfbd06f1fb5b6f0632e3e74b03a218f4e7f0b13bdc1fe606a9ba8a9c2d4f SHA512 36cc3615653a511e194c402de1e5762dac723388e761f37bc2e3bbdc87d2a46ab47d65fb8c638f8292b9ea5128fc05c4c7970b0d91095f20d65ebc08ba30bd9b
 MISC metadata.xml 476 BLAKE2B ebb64fe1d7008e89803b62789927ba37fcbafddb2758c0dbd26590335466cc3e35515e1a00cb3331db03041ca28354641b9fc3f37d29a4cc8bfb53507bb3d81c SHA512 28c2f2d8c5abcf72abd825be52584ca2c9e08674caddd28333e90ebfd3bae4f8d52100f2b887efdb0ccf6eff6314dcbf99282589db0c6dca7dd9a91dd5a0d066
diff --git a/dev-libs/libatomic_ops/libatomic_ops-7.6.12.ebuild b/dev-libs/libatomic_ops/libatomic_ops-7.6.12.ebuild
deleted file mode 100644
index 7989fafbcf0d..000000000000
--- a/dev-libs/libatomic_ops/libatomic_ops-7.6.12.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib-minimal
-
-DESCRIPTION="Implementation for atomic memory update operations"
-HOMEPAGE="https://github.com/ivmai/libatomic_ops/"
-SRC_URI="https://github.com/ivmai/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="MIT boehm-gc GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		--disable-static \
-		--enable-shared
-}
-
-multilib_src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/serd/Manifest b/dev-libs/serd/Manifest
index a4f95288a507..fd89b7f6e5db 100644
--- a/dev-libs/serd/Manifest
+++ b/dev-libs/serd/Manifest
@@ -1,5 +1,5 @@
 DIST serd-0.30.12.tar.bz2 594475 BLAKE2B acd065613494f05d1b2016c2097c1efbd1ebe3a5b901fac3a60d27140fee5c51ec17314df7ac2d3ad89d852dcb016dcf7255271f506f900445ce275335ed7d01 SHA512 c330648eb2c947a6d220f42d0af63fd2744da496301483e58be3cda387da166711d6acd5cee2df8cbb837ab450e1802b3f9a0a2973e5ad6d976b69b863aecb7f
 DIST serd-0.30.14.tar.xz 168728 BLAKE2B 42ed92e8eed3564c2625dd2f8e9bff55b65d1c8c993f13f2aa7ea0ab41a4c261b6b8fe9d4c61a915157616df1dba11d37f3813cd7bf7cd4571cb535895cb8f9c SHA512 d753bf60d4ff37220e64fda6a5dc6c69dc1a52ef435ab5b1e698f72dc5a7280ea764bb53b015753c3dc0910f252ca96c0ebafcb902a9956fcbf0a4480ce4e1dc
 EBUILD serd-0.30.12.ebuild 1219 BLAKE2B 39ef20fe4e43b1ce9d2a34bf5a7c4b3793baa8f59ad74a0e7207171b5b750453b7363b6965a37ebb8a337c7ff265c5a93fb4265d3d7188f0f020b7ed0b93d103 SHA512 7b1d3e599481fae0f128dc539e42c7ae9da119879dfefeb3707f1749f664a00333fb6ed5a11b083a34ede493f26c4e9ec08db22c88ff24d71490c3ac541a3707
-EBUILD serd-0.30.14-r1.ebuild 1116 BLAKE2B de2342d6b2f05e610169dbaa8d58c7c7cb9c64ef84fefdd019f90f77e818a31db17347cf2b3574490207de9761d6c8497534c37ffeb28902249448e5f93671ec SHA512 806d0336cea1185d623bc036d420e682fd8fda6b1f544969a9abf8cb3dabc8a1cba43bbb4177441ee9e0eac7492934dd5638704840345a1a4866c00932cd144b
+EBUILD serd-0.30.14-r1.ebuild 1111 BLAKE2B e764fb77bf0d5439abe9cc2ede0dc3e6be6a7cd6b578c95f4c0267e27a72c7ff526afcdf4e063bfd6b42914ebae5268956e1ea5a350b7ffac70ca5c9e5e1fce9 SHA512 4e7cfefca6f0a7abced6b3514f5fd20ee8bfbc18f181acff4acbd3ac2bfc59f93082dbaff2d032b9388eeb2d744c284b0b590894ccc15dd7e12206e80bfeb441
 MISC metadata.xml 739 BLAKE2B 09a901f48745f4516a7eec8d70fb78bde4c11c3c96b97118f23de06b2b9ddfcf6b32c35edc60cb02061158f72fe433102f7298708676f65f9c5bdca7851e1f91 SHA512 e387f00d2f73f6caa983c8abd7a6003b1bccc78276eeef427e137d89fdd76d18df7dc3f07bd7178d2745da7828670145cad6610e706f59f3a757f216c2f45b69
diff --git a/dev-libs/serd/serd-0.30.14-r1.ebuild b/dev-libs/serd/serd-0.30.14-r1.ebuild
index 2fe8c5383963..15749e984b0c 100644
--- a/dev-libs/serd/serd-0.30.14-r1.ebuild
+++ b/dev-libs/serd/serd-0.30.14-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://download.drobilla.net/${P}.tar.xz"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86"
 IUSE="doc static-libs test +tools"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/sord/Manifest b/dev-libs/sord/Manifest
index dad3142d3625..cb3faaa7cdbf 100644
--- a/dev-libs/sord/Manifest
+++ b/dev-libs/sord/Manifest
@@ -1,6 +1,6 @@
 DIST sord-0.16.10.tar.bz2 524630 BLAKE2B 6737d3495846529e6e4d14cbb2ac47ce4e67d04298381a119ba0107144deb56a53de9aa363397c2e302535f998c7c3ad44d340f52f70ac341ad6b635db608cb6 SHA512 715201eaf4a13a3635337cf8fa7c1a1f229f1d589f70cdf8f67183d90df29cd8b4af180650ce9cd0c651c712d11901bfdc6b51f9b8d7c6e70d8d8f30b1861281
 DIST sord-0.16.12.tar.xz 111328 BLAKE2B 9b89848440a994145a934e66e6fe7b844e82e926cb48d05223faef9357d315db981cd68b1174d7c47e5d63b97f8e15d8cc6b2b992a6bd790b8b117ebbb6c059a SHA512 d63cc1473d12676dac3724a096c85fd47745e456cf4b191fd9f8aaf8bb9399510c6878948fd045cc1942356e61dbefd8d88374c1ef6b327057e0bb8bfa03f926
 EBUILD sord-0.16.10.ebuild 1182 BLAKE2B d10ca88ecd72284b9f7ed35ab5cda8f7ddfef5a8d3532ceefa5f9672963a972b7897cb26360c0abb9422697bdbfefabc0ee8726979f4e357b3a22b3035d8a1ba SHA512 45e758a075e9c7c3ea59079653a9447fd4bcf6b3deacd67ed71c6cb7d637f204889a310a5bfb3428d5e6e0bb5740cb8bc395f05631d3368b52f123502963cd07
-EBUILD sord-0.16.12-r1.ebuild 1138 BLAKE2B a3d8e8c2a3c5908cabcef863c2732b31a11fcceb13c5e3920ab442d4cd7e9cf8db3f390ff4a14e1d540028d210aff162823af01e78b550381c37205dc867dc34 SHA512 36b28efdbfe168b1fbffdc9b02032ba97a9763508cf72db324071a469fa094b354730392d9be8112f0c1581bf4571005158074c6a31381bc6793a5fbc3750614
+EBUILD sord-0.16.12-r1.ebuild 1133 BLAKE2B 9307daf7c696e90941b0a326b4e9271348dea4f7799d7f6a741f654598dc89f1866214131d888b5f548b1b2967c362ff8ec0233b6e60068a370384c0d55042a2 SHA512 df528498d9ec46f3d8c662644a044ad1beb0ba935e99504ca0de954b7b6dd247c068042900c1a57701c536e223727677d1e1a16c54923cb6b516011e525dec91
 EBUILD sord-9999.ebuild 1138 BLAKE2B a3d8e8c2a3c5908cabcef863c2732b31a11fcceb13c5e3920ab442d4cd7e9cf8db3f390ff4a14e1d540028d210aff162823af01e78b550381c37205dc867dc34 SHA512 36b28efdbfe168b1fbffdc9b02032ba97a9763508cf72db324071a469fa094b354730392d9be8112f0c1581bf4571005158074c6a31381bc6793a5fbc3750614
 MISC metadata.xml 332 BLAKE2B 8b6ced42cb1806732db75f2163ec786301af6fe535da27127ea4fff4cd08c354b5881551574952e3d192fe2191331765f7a3356c2e48f9ad93b6341d467fa9c3 SHA512 96f38c83f6692b5598c94ee3e72a0ecd26706b532ada45420e5517f39be2f608eb1de7090e4d7df025404f6474739913fbefda39f5be227ffefd02da61a288ae
diff --git a/dev-libs/sord/sord-0.16.12-r1.ebuild b/dev-libs/sord/sord-0.16.12-r1.ebuild
index 02f84963e6bd..4422c2bf6e80 100644
--- a/dev-libs/sord/sord-0.16.12-r1.ebuild
+++ b/dev-libs/sord/sord-0.16.12-r1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/drobilla/sord.git"
 else
 	SRC_URI="http://download.drobilla.net/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86"
 fi
 
 DESCRIPTION="Library for storing RDF data in memory"
diff --git a/dev-python/Faker/Faker-15.0.0.ebuild b/dev-python/Faker/Faker-15.0.0.ebuild
new file mode 100644
index 000000000000..d8e24e8d32e7
--- /dev/null
+++ b/dev-python/Faker/Faker-15.0.0.ebuild
@@ -0,0 +1,34 @@
+# 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 Python package that generates fake data for you"
+HOMEPAGE="
+	https://github.com/joke2k/faker/
+	https://pypi.org/project/Faker/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
+	!dev-ruby/faker
+"
+BDEPEND="
+	test? (
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP},tiff]
+		dev-python/random2[${PYTHON_USEDEP}]
+		dev-python/validators[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/Faker/Manifest b/dev-python/Faker/Manifest
index 2c98d4680262..7c7aed8a17f9 100644
--- a/dev-python/Faker/Manifest
+++ b/dev-python/Faker/Manifest
@@ -2,8 +2,10 @@ DIST Faker-14.0.0.tar.gz 1536015 BLAKE2B e3d0f5745203ac441bb4f4a4deb4ebc9045f532
 DIST Faker-14.1.0.tar.gz 1598360 BLAKE2B 953dfd718b143e493ca2129f69ada12b6d5e5e3b04b5e2ebeedbd57855da1f8d7cb3bda3dfa1050debce4281d605ac4c10d74538422c5da41e72caaf10c2b2ad SHA512 50d0452d946e3899813ea1aa0b207451fc765e1ee3cc2196b13eb095a91a888e825064b63651b610240fe9e90158a318fca80dbcdbb7b5a70568bafa7653fb67
 DIST Faker-14.2.0.tar.gz 1599246 BLAKE2B ec618ac03fe68dae72b9cc0a4a42390157ea669151756c2c8dc722a0de19d2c1a2207d318b4ac270d1aeefab298445cb92e43e4ab1d524d80e8bb1600c71b71f SHA512 cebeecd78635bcbf18d8332cdfcb28d65214b06d01b6f4b4e95fed37f03d1a32b8fa2b1e0c8ccaa2a34fbbda805a58dfde8d4f84391a791f95177cf8bca9ba5b
 DIST Faker-14.2.1.tar.gz 1599112 BLAKE2B 23ab86f6cd5a00cd317a64130b8ce75a528735a845a097c19bff9d0367c0df015412ae0c82b6a6648bbe42b313170e7c334ebac5ecc6f9c9fd11917fc9be29a8 SHA512 f4ec29cacca87cd7d5778ce83a561b6932900de754a00d2d69432ff18566bc154da4ac04ff02a38dda22454409a727d7daf31253425ccd48c9e07e4eb9ca8395
+DIST Faker-15.0.0.tar.gz 1599358 BLAKE2B 1616cb798da131c26b187599a0769fabc40eafbddba48c3b80a94b62175519888f7f0edf40dcd31234bc96776270020aab7c1269aacd045805f2ee33b21f7d22 SHA512 17d1c78335263bd05c547aa66cfcba5130f11b7379754ad0f95230beb788bee4e07b8db4a907c8c029ebcedf519cf8cc4028bf31eb984820b5befd4570ee139b
 EBUILD Faker-14.0.0.ebuild 743 BLAKE2B 5018d7828a83837233d7e23c875e4c710665e4322e79329a49cc426d97b630627f9aa64df85f92449f06d1e11f772e8e84064b389b586b9ef5214d7200ffa305 SHA512 a8de56e0b42bedd66f8f9b5a512ff79d30b29e728c5d6227f6c9b4f11c22b284941f342ec8c531345e4a89af15aade1192941fa0f4400b2d3e2efb3bc9f7e724
 EBUILD Faker-14.1.0.ebuild 743 BLAKE2B 5018d7828a83837233d7e23c875e4c710665e4322e79329a49cc426d97b630627f9aa64df85f92449f06d1e11f772e8e84064b389b586b9ef5214d7200ffa305 SHA512 a8de56e0b42bedd66f8f9b5a512ff79d30b29e728c5d6227f6c9b4f11c22b284941f342ec8c531345e4a89af15aade1192941fa0f4400b2d3e2efb3bc9f7e724
 EBUILD Faker-14.2.0.ebuild 743 BLAKE2B 5018d7828a83837233d7e23c875e4c710665e4322e79329a49cc426d97b630627f9aa64df85f92449f06d1e11f772e8e84064b389b586b9ef5214d7200ffa305 SHA512 a8de56e0b42bedd66f8f9b5a512ff79d30b29e728c5d6227f6c9b4f11c22b284941f342ec8c531345e4a89af15aade1192941fa0f4400b2d3e2efb3bc9f7e724
 EBUILD Faker-14.2.1.ebuild 743 BLAKE2B 5018d7828a83837233d7e23c875e4c710665e4322e79329a49cc426d97b630627f9aa64df85f92449f06d1e11f772e8e84064b389b586b9ef5214d7200ffa305 SHA512 a8de56e0b42bedd66f8f9b5a512ff79d30b29e728c5d6227f6c9b4f11c22b284941f342ec8c531345e4a89af15aade1192941fa0f4400b2d3e2efb3bc9f7e724
+EBUILD Faker-15.0.0.ebuild 743 BLAKE2B 5018d7828a83837233d7e23c875e4c710665e4322e79329a49cc426d97b630627f9aa64df85f92449f06d1e11f772e8e84064b389b586b9ef5214d7200ffa305 SHA512 a8de56e0b42bedd66f8f9b5a512ff79d30b29e728c5d6227f6c9b4f11c22b284941f342ec8c531345e4a89af15aade1192941fa0f4400b2d3e2efb3bc9f7e724
 MISC metadata.xml 474 BLAKE2B 337c8b17b4ca092edc2e59bd61dd847e4b9f2bd7e0651d07dad5b3e3eb4f311de9e27e6cad1f6a4835f618446cfa4cdb95e578a8af11498cf7bed1ec697990ce SHA512 35f4a2a50ad5589ba50e619670d1f1eac423fec920bb9c07b3f8bd7d7f2a0bb4e88dde286b062339b30ba304bd1a834bf3318c0b0ad0552ce9eb45fa72e5f44e
diff --git a/dev-python/Levenshtein/Levenshtein-0.20.4.ebuild b/dev-python/Levenshtein/Levenshtein-0.20.4.ebuild
new file mode 100644
index 000000000000..e6bbbc1a531a
--- /dev/null
+++ b/dev-python/Levenshtein/Levenshtein-0.20.4.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# custom wrapper over setuptools
+DISTUTILS_USE_PEP517=standalone
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Functions for fast computation of Levenshtein distance, and edit operations"
+HOMEPAGE="
+	https://pypi.org/project/Levenshtein/
+	https://github.com/maxbachmann/Levenshtein/
+"
+SRC_URI="
+	https://github.com/maxbachmann/Levenshtein/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="
+	>=dev-cpp/rapidfuzz-cpp-1.7.0
+"
+RDEPEND="
+	<dev-python/rapidfuzz-3.0.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	>=dev-python/scikit-build-0.13.0[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/Levenshtein/Manifest b/dev-python/Levenshtein/Manifest
index d29e50e2d606..1777e248c829 100644
--- a/dev-python/Levenshtein/Manifest
+++ b/dev-python/Levenshtein/Manifest
@@ -1,5 +1,7 @@
 DIST Levenshtein-0.20.3.gh.tar.gz 33573 BLAKE2B 2ba0b35cd15da645dae3e18ce7d57da685cc273bb3902e645bf6a0826f212fab0b91a5765fa6b9768fd6d5cca728a3f0e384f18a90e29fed571b71e03171dccb SHA512 3adde94e7f195aaae3361296d4ec2e7694c6afb92abcde866d659a827bfdfc2ab1fb28d92332966abd7da8392590cd96415b7f593bde8375b35bbe845e9ddfe3
+DIST Levenshtein-0.20.4.gh.tar.gz 34419 BLAKE2B ff15ef1d11d326d39a45781e729cc111cd8482ac2a2558b5623971dd8d5ae76833fc28e71afb0eed2f40b6a0d9323aeee4a3a3a77a172742239b70e70f65c775 SHA512 fef0f19e67ec5caae6a3ba42bba916fafcdc47c6ef5e5487cfe0a246ad0d9e393233269f986e3391a6443f707e64a9022531fa1a653597a952794ef402644dbe
 DIST python-Levenshtein-0.12.2.tar.gz 50502 BLAKE2B d8992d30639e36aac1b85fada8f5273ed867aa3019208ffeb9972e999dad783d4ee16e1f6988c9306eb80f622b61fcf3a0a937b380c7a5acf50223268ed8de1d SHA512 97eac9d19121758af7620ad3963846e48434ceabb5376a83f28452015adf1a620620bfb53edb1c4f60b0fc8ec2b0faf35a105d7e2a0fc5df7a45fce81ba0dcdb
 EBUILD Levenshtein-0.12.2.ebuild 630 BLAKE2B a56ef0d6431d51516f69a6a00dabec4681aa3e999fecfd904d34fee2dc1d4e8fca5ef47af6d388b0dcb72a9a1664f4d8ccb4124496d6ddb1306c7194aba06d1a SHA512 12021fce00cc5bb951cdfaba190a14f512bab14cef53b430504400bfa99daa91faa04a819fef750c7e558b0a99698fc52c8f52294d4ce47069efdf30a2d9600a
 EBUILD Levenshtein-0.20.3.ebuild 840 BLAKE2B b1b57cc9e5899251cf2063b49e1841e7a96a90958c47bb92272acef797566321f203847971963fbc50fb38cccb1e723c58b9e5da63b9a7b900b53e74a60b6d3a SHA512 139af1c2ff5f4bdc3523b9121bd0217d20ca9e030be87123c9892e38af028480c928cb0d35130200f422ce66c8962997fb15b4de534648ffc752b229455b020a
+EBUILD Levenshtein-0.20.4.ebuild 840 BLAKE2B 9a20d78a5fb71c552ac57bd7448fb618b639c318947a9ce9c23c600687947ba185ec7df0cf96ec568e446f7c6c6e2045e1b948229cc354a1f096df581cc9f294 SHA512 bb203edba0f686c93392b8fb5eb26eb8019a3bda1cd19e8843a7cc3af0e97f1184f94147c869fa7928c1d445a5503a23f7f85465ebdc54fec77a8d2f7f432057
 MISC metadata.xml 378 BLAKE2B 59900a9f2532c274a220466ff9bd5db4a4830b221119a95a0fdf82928b90c64b458b16c26257b69093ac08346bafbe54189bdb873bb8f119753a4f2243973eb9 SHA512 26b3ddc5d3843122a47941cb1e388e41f6a3f98e3f8d2f5108f50240b5c9005edb2b1e2df55c9046d48a8b4e07941f8ccd4fdee129f4ac948a47a6207b73c7ba
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 4328cdc2d11b..b7337ea94b95 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 381f9bb61a9e..6d66cce2e219 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -11,6 +11,7 @@ DIST boto3-1.24.75.gh.tar.gz 537974 BLAKE2B 00fbaca566c9dc782fa03f11c050477c32a1
 DIST boto3-1.24.78.gh.tar.gz 538770 BLAKE2B ee690bceb7b04a8ef9bd4c3bea2abfa342ec7f5aa5cd60e03f2982f3dfb31a4f38847c687591677442abeb0a7197cb3e1125b3b1674223f165f31eb841968551 SHA512 002b366344be86bf1dccda41d4ae8d2421405de860dcc6e0a6b2889508026f91cfe7bbbfcaca55a59893233e1f7e756527dd0dcc2694f7fc8c9928601ae44fa4
 DIST boto3-1.24.79.gh.tar.gz 539152 BLAKE2B 6b700c7100b290d06f261fbf70e56e3242d28af9aa4ea88399123fc0acd504769f29c2979b73e6cf28dee6126f0308b90e6c8d9c684fb2d0f7c08440635c2116 SHA512 c9e1063850979d9b3bc9cee4a530d182b7f2562d1072a67e64990880fa31850ec3f3ef68876a7d430a990c489b80a03c116715064acb4ab4dad444a6ee97d717
 DIST boto3-1.24.80.gh.tar.gz 539716 BLAKE2B ccbbfa84e4e2274eb0275b9b2dcc0a4a78b139007829c4e3f880909f71e404be22c4461b687596bf12675c1212c6cf5b59c4383a042f60cb7919a10581fdc612 SHA512 aa3340e4bb9ae80f02fc70cf2be49d245e3dcc941b0b682c2827c1b8bb51d02e72ab7bf561e7d39397af8ca7ead7e115766fd4fd2eca18db2c551f55afb3e3b6
+DIST boto3-1.24.81.gh.tar.gz 540005 BLAKE2B 7c0425351aaa4ee854d6cb616880b653250475051f3a295686659f3c85b6c515b6e622af72f6e56f69ff23be4e4218f74cbe48f6377f0d17d321f1521ed1fe8f SHA512 a92a4d90254ecc5dd098d22c9628cf87e5d5341c7aaf8b704fbe6f6e693b7582b65179936a6745da4b14a629fb20d39b501748349e3a8640eb54f9298493f287
 EBUILD boto3-1.24.56.ebuild 1579 BLAKE2B 394d8a1bb7a1036ab4821bc789c9eea285f8a6a7c21e751d60c94a53d5fdd37119eab54bfd19bfe0856b7557df04340f50c7cebbe631234e8f582e7d62af13ec SHA512 beee3b634e3b1d66365beb2e97b9d09188fa795e00d9d05f2101de423128741ee1f8ad8ae4b0c35f1e6c6473ce73cc3acf47d9141029b4435d39a9803a5fe1b2
 EBUILD boto3-1.24.61.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
 EBUILD boto3-1.24.63.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
@@ -24,5 +25,6 @@ EBUILD boto3-1.24.75.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd536
 EBUILD boto3-1.24.78.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
 EBUILD boto3-1.24.79.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
 EBUILD boto3-1.24.80.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
+EBUILD boto3-1.24.81.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.81.ebuild b/dev-python/boto3/boto3-1.24.81.ebuild
new file mode 100644
index 000000000000..6edcc751d54b
--- /dev/null
+++ b/dev-python/boto3/boto3-1.24.81.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 e297099a151b..8961e0e52039 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -11,6 +11,7 @@ DIST botocore-1.27.75.gh.tar.gz 9628845 BLAKE2B dcce68d2d24e621d8d56d2f3417a5bbc
 DIST botocore-1.27.78.gh.tar.gz 9639497 BLAKE2B 38b3286227941216db66453201b73366ab28722f6f6e08388419b9db7bd4b25aad2c379cee6438ecc0c25fdbb732827117954454280e4aa367f1d579352f464d SHA512 bf182ac90c0d392a32f2d117145d2cbcf019ddbd3fed1205228a9b5721b08296f8948668c47b07feab6eb2ad2cf65f92a31d782c5ff3ecdf727466f7889c466d
 DIST botocore-1.27.79.gh.tar.gz 9640519 BLAKE2B 35c2960c2c3e92f78e6903b102dbefe26e5cca1b25610abb059c81382dc816dbfbb260db98a921886e9cd2aff6d172396d5853c0529a7558d86889857fae75a2 SHA512 2e0c110f55aa9dd74fcfd3da3f87d14cb5ea53f67b7c867f13a7649809cee9cf3a55631e2daffa94da7ca709e5ad49db708a7821ffff8ccf992ebfbf9d5bbae9
 DIST botocore-1.27.80.gh.tar.gz 9643079 BLAKE2B feec0b34c39b358eaff7f947fe83fc6dcd9926771b465c092e8071c334382d07d51a88fda775fc9fadae2544ac2f3e37c814bc9b8729730955b95d3efdf16b7b SHA512 f38ee5b252051a8208964387ff1550489c5900605d2aa5c69dc2d1229411015af1edaa51e9df4d56895c3fd2b4a56cca5179c1fd5aecbf5032ab80ce4c8f8b8e
+DIST botocore-1.27.81.gh.tar.gz 9663876 BLAKE2B 35da266dee35d717c0190378d4e73dbc018b9973a768476c4e675942e6f730901e7bcfbd2f700589877b1eb1fa85a20a29932c62d20a37a957045ea32cada7d1 SHA512 9ba40ddc75f812ce255ff668e9299313eaed44fb86b130a84ac624ace35ffd03bbb95fd88ce0848f8f8f9e0c48547e4433af6746f2063d57dd5d43d32bc7810e
 EBUILD botocore-1.27.56.ebuild 1610 BLAKE2B 19f47b6c38de4ffc3a0623bc006b257260abb255ab63d084bcea3552b403d504ddfbe7191494aa8dba8d19a445b55c9dc6c977bf5f0877dba72a3ca69cdbff43 SHA512 fcc38a1393610e2eb729cfbf3a9f579ca840a8e712fe2123235cec4aefc68c96b099821282a68de737bef5e2d1f1f4b00e64e1665985f718201909e1b56994bb
 EBUILD botocore-1.27.61.ebuild 1617 BLAKE2B d33413fa74479d5ca72e82609b4b1c57a33f6953d5acb82db1e2f9de7599190c69d8e633ac0da8417121a9959346723f509d5bb8945d1de63689046756ba303a SHA512 20aeccea53aa2e5d294739c9256fb590d21a89c216411383b1bc8c1ee25528ce4ac94fe3a210a1a6ff173b81c1d97b0972d611772963592a9c8be8039c12717a
 EBUILD botocore-1.27.63.ebuild 1808 BLAKE2B 720965dfc40c51389a8ca4ac210039f79bbe3047f583cb1bd4d52bdb9720cb2283a13a9f4337a62aca6869cd75d78dac6cc07436524e9720386177c733d686f3 SHA512 d3a3fbc0f957b58e8161ae3fffedb44462000077aa368dd2fb183bf6a084771bff4db46344a4d0b451833ea05d326b452155af92d190c313e1d982da7d72fc10
@@ -24,5 +25,6 @@ EBUILD botocore-1.27.75.ebuild 1808 BLAKE2B 720965dfc40c51389a8ca4ac210039f79bbe
 EBUILD botocore-1.27.78.ebuild 1808 BLAKE2B 720965dfc40c51389a8ca4ac210039f79bbe3047f583cb1bd4d52bdb9720cb2283a13a9f4337a62aca6869cd75d78dac6cc07436524e9720386177c733d686f3 SHA512 d3a3fbc0f957b58e8161ae3fffedb44462000077aa368dd2fb183bf6a084771bff4db46344a4d0b451833ea05d326b452155af92d190c313e1d982da7d72fc10
 EBUILD botocore-1.27.79.ebuild 1808 BLAKE2B 720965dfc40c51389a8ca4ac210039f79bbe3047f583cb1bd4d52bdb9720cb2283a13a9f4337a62aca6869cd75d78dac6cc07436524e9720386177c733d686f3 SHA512 d3a3fbc0f957b58e8161ae3fffedb44462000077aa368dd2fb183bf6a084771bff4db46344a4d0b451833ea05d326b452155af92d190c313e1d982da7d72fc10
 EBUILD botocore-1.27.80.ebuild 1808 BLAKE2B 720965dfc40c51389a8ca4ac210039f79bbe3047f583cb1bd4d52bdb9720cb2283a13a9f4337a62aca6869cd75d78dac6cc07436524e9720386177c733d686f3 SHA512 d3a3fbc0f957b58e8161ae3fffedb44462000077aa368dd2fb183bf6a084771bff4db46344a4d0b451833ea05d326b452155af92d190c313e1d982da7d72fc10
+EBUILD botocore-1.27.81.ebuild 1808 BLAKE2B 720965dfc40c51389a8ca4ac210039f79bbe3047f583cb1bd4d52bdb9720cb2283a13a9f4337a62aca6869cd75d78dac6cc07436524e9720386177c733d686f3 SHA512 d3a3fbc0f957b58e8161ae3fffedb44462000077aa368dd2fb183bf6a084771bff4db46344a4d0b451833ea05d326b452155af92d190c313e1d982da7d72fc10
 EBUILD botocore-9999.ebuild 1808 BLAKE2B 720965dfc40c51389a8ca4ac210039f79bbe3047f583cb1bd4d52bdb9720cb2283a13a9f4337a62aca6869cd75d78dac6cc07436524e9720386177c733d686f3 SHA512 d3a3fbc0f957b58e8161ae3fffedb44462000077aa368dd2fb183bf6a084771bff4db46344a4d0b451833ea05d326b452155af92d190c313e1d982da7d72fc10
 MISC metadata.xml 499 BLAKE2B e5aaa7da26f200c09adfdf38b68f656bbccbec627cb5d966b280ac2165334e7eec659c89075bcace748f58e2ec3e7d2998e54a688d56ecea2d30653c67dfd35a SHA512 103c554d5dbd967bf9b6e418b3913d9235e7e910d012160909ce0715134ed2e37b06e6a345395f9d16ce08d1cf51f3ce458bce93c6a978fd3dca6610f2acdbd0
diff --git a/dev-python/botocore/botocore-1.27.81.ebuild b/dev-python/botocore/botocore-1.27.81.ebuild
new file mode 100644
index 000000000000..d1a6948e70e5
--- /dev/null
+++ b/dev-python/botocore/botocore-1.27.81.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..11} )
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="
+	https://github.com/boto/botocore/
+	https://pypi.org/project/botocore/
+"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="
+		https://github.com/boto/botocore/archive/${PV}.tar.gz
+			-> ${P}.gh.tar.gz
+	"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	<dev-python/jmespath-2[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests pytest
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+
+	# unbundle deps
+	rm -r botocore/vendored || die
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# rely on bundled six
+		tests/functional/test_six_imports.py::test_no_bare_six_imports
+		tests/functional/test_six_threading.py::test_six_thread_safety
+		# fails on unrelated warnings
+		tests/unit/test_client.py::TestAutoGeneratedClient::test_BOTO_DISABLE_COMMONNAME
+		tests/unit/test_client.py::TestClientErrors::test_BOTO_DISABLE_COMMONNAME
+	)
+
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/ipykernel/Manifest b/dev-python/ipykernel/Manifest
index 0b1d318a2452..4276dbbcf0fb 100644
--- a/dev-python/ipykernel/Manifest
+++ b/dev-python/ipykernel/Manifest
@@ -1,7 +1,9 @@
 DIST ipykernel-6.15.1.tar.gz 133140 BLAKE2B 7d63b55f2b8d883234258106b8239cf77031336ce6e7e38234490a031fc4a56861788210fdb2acd0f895e4df43257b0339ef1592e12d33b441e4ba9061acbd08 SHA512 10f2390a4edafea89fcc049d5e07ef542418a3a7b076efec1f02bc0a787e01280624cc543bb60604478cae63b58a86d031b549a6f872c7a8530043d670dbdc0e
 DIST ipykernel-6.15.2.tar.gz 133297 BLAKE2B 05b92074dba2324a2bbbe58fb459f455e47236fcbed711b63c3bfd83978b1e80a7fe079c08fbfb031d9f182d2b24a265705f6540b6c87ee933b641beaee53f9d SHA512 14f1f819d67f16e9c5ea5705ce9c1827bd1ae44f742ca809c4402ef64b229e902f9a724c0609cbf225da595f4ed48cd14348f3c887d70bc18c4b017ec01de720
 DIST ipykernel-6.15.3.tar.gz 136470 BLAKE2B 45279a6cfc85c3c2bafe9913b78077a3212bc61b961824f449cdf6ed6a34fe777e0fef1585bc7e4062f4e73124efd24a1c6a16e4168a03d31420836105c3ba55 SHA512 52e9b20b4b9ce691a42a64f535b41b9567a9849c87c0c9903d0b14dc6a00c57ab42d93b6bca8d955be8a31354722268006ce8b576664eb8a4b7f6a3400164c1d
+DIST ipykernel-6.16.0.tar.gz 136212 BLAKE2B efb779c4585d5594dcf8beaf03f2cd0174aa3b22e184a4c5f54e0e9e97f5bcb81af27c19f503a8b8883720a4380bfb483a952858a75c5b08b19030cc84c0cbec SHA512 04c43c83d17f451b7139e3f7301b35598ff3644ac1542bed9eb2584a558ee202e66c3e36553f96484bb4ee5cc369cfe2ad2bf0054799ad29ffd0e065bdcade98
 EBUILD ipykernel-6.15.1.ebuild 2058 BLAKE2B 324e8d1609ee1eb272589138f8f22822a9fafbd836dbfbbfc2e710fb3e9cbb602564071c3e2f8904cf0a6f3c6770279517fd51152dfdddc7b13e001084020d85 SHA512 3f757852e4ca13da13ccdfa0615fe6342d3605ca447431eb35c80b44cb8cb36f57bef1bd12f0afbd2175dca461d0d23d8f9ccf194227634cf4fdfb0fb735aa79
 EBUILD ipykernel-6.15.2.ebuild 2066 BLAKE2B d8466cae0cda8e81d8e36232fcca1b592f3e5ac8f282197c4a38121606491818c1a160c71d3b28edbf30bdcb48358bb4c547280effd149b6d5c82b07ecec8071 SHA512 a76087332c10c6dfcbc63b6a2ed21b4746e2090d78844635e0c40d0fc568b25e61d169bd04411e9c095d79b930ce4be884e8a10209f38f9068c075e05e85ddf8
 EBUILD ipykernel-6.15.3.ebuild 2066 BLAKE2B d8466cae0cda8e81d8e36232fcca1b592f3e5ac8f282197c4a38121606491818c1a160c71d3b28edbf30bdcb48358bb4c547280effd149b6d5c82b07ecec8071 SHA512 a76087332c10c6dfcbc63b6a2ed21b4746e2090d78844635e0c40d0fc568b25e61d169bd04411e9c095d79b930ce4be884e8a10209f38f9068c075e05e85ddf8
+EBUILD ipykernel-6.16.0.ebuild 2107 BLAKE2B 1c64d458e4fbf2f3775c635a1a7e575a03a3b597ec02df0f545c2525a62a5d67ef16ee2c010d0de8b4899848197783977a466fdfdb449eaada78b5c134881e1f SHA512 f88cfc3f92a72f8b06b7ca89874c8ee650a2cfbe738fcb6e7d6a820cb7ddd5500f9442dd82c1d01bc5862ab84e9c7e49abb22625e7d346e61b6ea2ae883b799e
 MISC metadata.xml 527 BLAKE2B 4a24cb9d5b801bf94c71c47d0c90b04bc249fb41a794c7b688a5762f08545d1fcfe9e4976aa4f583ecb456458b5f6dfc394349633959444584c0abad0da4be42 SHA512 ed9f0ef12ec5de67a646783243555f1737604a84c78c57b9f7c65137cec8cbc396991411501927f92bd393daad2238c27363ecc9c115031450231c2a4fb2cbb9
diff --git a/dev-python/ipykernel/ipykernel-6.16.0.ebuild b/dev-python/ipykernel/ipykernel-6.16.0.ebuild
new file mode 100644
index 000000000000..d474b45cde71
--- /dev/null
+++ b/dev-python/ipykernel/ipykernel-6.16.0.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="IPython Kernel for Jupyter"
+HOMEPAGE="
+	https://github.com/ipython/ipykernel/
+	https://pypi.org/project/ipykernel/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/debugpy-1.0[${PYTHON_USEDEP}]
+	>=dev-python/ipython-7.23.1[${PYTHON_USEDEP}]
+	>=dev-python/jupyter_client-6.1.12[${PYTHON_USEDEP}]
+	>=dev-python/matplotlib-inline-0.1[${PYTHON_USEDEP}]
+	dev-python/nest_asyncio[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	>=dev-python/pyzmq-17[${PYTHON_USEDEP}]
+	>=dev-python/tornado-6.1[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-5.1.0[${PYTHON_USEDEP}]
+"
+# RDEPEND seems specifically needed in BDEPEND, at least jupyter
+# bug #816486
+BDEPEND="
+	${RDEPEND}
+	test? (
+		dev-python/flaky[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+		dev-python/ipyparallel[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# TODO
+	ipykernel/inprocess/tests/test_kernel.py::InProcessKernelTestCase::test_pylab
+	ipykernel/tests/test_debugger.py::test_attach_debug
+	ipykernel/tests/test_debugger.py::test_breakpoint_in_cell_with_leading_empty_lines
+	ipykernel/tests/test_debugger.py::test_rich_inspect_at_breakpoint
+	ipykernel/tests/test_debugger.py::test_rich_inspect_not_at_breakpoint
+	ipykernel/tests/test_debugger.py::test_set_breakpoints
+	ipykernel/tests/test_debugger.py::test_stop_on_breakpoint
+)
+
+src_prepare() {
+	sed -i -e 's:^TIMEOUT = .*:TIMEOUT = 120:' ipykernel/tests/*.py || die
+	distutils-r1_src_prepare
+}
+
+python_compile() {
+	distutils-r1_python_compile
+	# Use python3 in kernel.json configuration, bug #784764
+	sed -i -e '/python3.[0-9]\+/s//python3/' \
+		"${BUILD_DIR}/install${EPREFIX}/usr/share/jupyter/kernels/python3/kernel.json" || die
+}
diff --git a/dev-python/jaraco-classes/Manifest b/dev-python/jaraco-classes/Manifest
index 84ea6d658755..b59ce1e34faf 100644
--- a/dev-python/jaraco-classes/Manifest
+++ b/dev-python/jaraco-classes/Manifest
@@ -1,3 +1,5 @@
 DIST jaraco.classes-3.2.2.tar.gz 9266 BLAKE2B fa9bd77cf02e46617e4f5dc414ee081b60f3c3a4b220e75df366c8efb42a2eecccf688e6a43cd39deb1642df06554484fab9d9209d567dd0ffa53b5e94b913cc SHA512 56eaf8420f0319137ecae04c61e5a866909b83d3638343ea45ed3739524c8314bb6aac7ee9b5f899e2a1a5238c2caeaa971ed1cd0dbd28d9ac01ad6716549deb
+DIST jaraco.classes-3.2.3.tar.gz 9416 BLAKE2B 00de6548b746d2e6136572d2bcbc8a9c3e6f6570a02ee27e679e6bab7b9f4b8a327acf2b8854045b5348df8760763a7bc52fedb0b3504629ceced3dd3b4588ad SHA512 73fe80de5c50b553efee6aa51fff98e30e72dcb4167b6056628d3cbbb897e29abde4fa9da79a2b413830d8440055a43ea97ace4daa62853d874419cb36c43fee
 EBUILD jaraco-classes-3.2.2.ebuild 682 BLAKE2B b0fe322458f77ed2cfde2a6939e53cd7cd25f6ca255852c2760088ed08c641ea9154367e494e8be95b0c3b20ba01fd6b5b3851248bba146cecceb96f12d4d52d SHA512 e88f5545dd655cecf1e5e4d18722d8893dce8f25420c04be1f32f89bfd1561837dbad3c95f18228fdbba4f9db3e16e5d97ff2bb8c0f913cf2f5490686e4e4acd
+EBUILD jaraco-classes-3.2.3.ebuild 690 BLAKE2B 851cd2190b6e608bf24a4fe9c7eea77adbc44f94d74c3c4c103b2a9f26a970b421a10d1b7660f01fe018b84b792329df52a3d2864b49e010ee3df7ff1290646d SHA512 a3c48c531ec0b87efa19ccb2442d625f87721f33d20709e8a82f3ef314144b1427678bb4f4845db85245beeb220b2d0da577dcc877102e026d87d9223044523e
 MISC metadata.xml 578 BLAKE2B bba68eea8ac49fd7afab6d8a05c723c01ecc82b9392a97e26754edbe6400f0351539aad572d125398eaf0b53ed1d25d44e0348a6307a9c8893eacd20bd9f7386 SHA512 3c521b902ac46722c873ca7c696414c7dc66419ce0764de4c30924c92d135956822c3f86d6e17926fcc87e0c0f82f93443fcd2303aab248566cd047ec5202e36
diff --git a/dev-python/jaraco-classes/jaraco-classes-3.2.3.ebuild b/dev-python/jaraco-classes/jaraco-classes-3.2.3.ebuild
new file mode 100644
index 000000000000..78787bcd7b46
--- /dev/null
+++ b/dev-python/jaraco-classes/jaraco-classes-3.2.3.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+
+inherit distutils-r1
+
+MY_P="${P/-/.}"
+DESCRIPTION="Classes used by other projects by developer jaraco"
+HOMEPAGE="
+	https://github.com/jaraco/jaraco.classes/
+	https://pypi.org/project/jaraco.classes/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN/-/.}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/jaraco-functools/Manifest b/dev-python/jaraco-functools/Manifest
index 534a1ae952d5..e9f9dfca717b 100644
--- a/dev-python/jaraco-functools/Manifest
+++ b/dev-python/jaraco-functools/Manifest
@@ -1,3 +1,5 @@
 DIST jaraco.functools-3.5.1.tar.gz 14516 BLAKE2B d58ca0e51767278988f418a5b1b736dd56da2c0ed214fa9b9b2a8b5e4ae77fcdedd431e444d1d2c3359b52a648ec85d01b8b7a2db872bb27d9bf24484347b7a0 SHA512 4496c80eae72834e5bc214f40de91a6aa603ce296b3866e0b363014c2919843f515efe9b314f18667e6b09d183a0985760e47f3340aed42dfbdba01884896df5
+DIST jaraco.functools-3.5.2.tar.gz 14650 BLAKE2B 63db54c5f3dea7b0ce939ad51fc4c4f5831a620a37a47d416079d4c9ad30cb3d401567a8da036178122431cafd8dc18e4a9b59241cd1fc0b8bd1c057dfb8a034 SHA512 3f67d151f4f6553b3e560b0e6ab71cf726d6c8f36ef5e9f69b6325605547797e19a3f9eb1331cf332db498538953ccaeb75820528e6599fd7cf125abdc073e69
 EBUILD jaraco-functools-3.5.1.ebuild 1576 BLAKE2B 336a1679f662443c131639e84910f5dbbe5eab37349e0b77e55f9b3bf40931baaa09671a7a1e7687759093d91c0153587f37a1cc9a11d457284f5688616f5376 SHA512 9fb408c1e66711c7ba73e8d34ccc29c18f5329dcaf87d6f2a7dce7038339623429477444887cb09207d1f3f486ab280b9adfed61efe4844e6b2c91ce8852f90a
+EBUILD jaraco-functools-3.5.2.ebuild 1584 BLAKE2B 98ce14b5b093e6e56075e97717cffa9435c2583d3ab8b5fd9ef76d84f0d5f5c8a2a8d3bbf9e6ba16fa33aea6d30092380b70e383054d5f7a9483744ed1478c93 SHA512 d98856fd7baa11413f44c391f2d79fbbcad30f3f0ea0b59eb31ce35e2c9c97cd447f8dce452b84ac3c81454bda9c69cfd19ad65bb095590b25d78b59c6cedfd1
 MISC metadata.xml 676 BLAKE2B b437d010c92db7c16013c9e2dbdb0071c793900189cdd0ec1918abc587ea5fcff10f36b5822e0912797fd2baf3aab5e8a25cf30ad8bb7f3e8e65608a52cd41cc SHA512 95fbff54e3f761dc323dd6c590ad093d301f5438db7a46c90be8a22ab59e1531ea1785317c764e98e278629ff8cd4db976ff1e25d00de46fe741c65ff655201d
diff --git a/dev-python/jaraco-functools/jaraco-functools-3.5.2.ebuild b/dev-python/jaraco-functools/jaraco-functools-3.5.2.ebuild
new file mode 100644
index 000000000000..623bd91af000
--- /dev/null
+++ b/dev-python/jaraco-functools/jaraco-functools-3.5.2.ebuild
@@ -0,0 +1,57 @@
+# 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=flit
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+
+inherit distutils-r1
+
+MY_P=${P/-/.}
+DESCRIPTION="Additional functions used by other projects by developer jaraco"
+HOMEPAGE="
+	https://github.com/jaraco/jaraco.functools/
+	https://pypi.org/project/jaraco.functools/
+"
+SRC_URI="mirror://pypi/${PN::1}/${PN/-/.}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="
+	>=dev-python/more-itertools-0.12.0-r1[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/jaraco-classes[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_configure() {
+	grep -q 'build-backend = "setuptools' pyproject.toml ||
+		die "Upstream changed build-backend, recheck"
+	# write a custom pyproject.toml to ease setuptools bootstrap
+	cat > pyproject.toml <<-EOF || die
+		[build-system]
+		requires = ["flit_core >=3.2,<4"]
+		build-backend = "flit_core.buildapi"
+
+		[project]
+		name = "jaraco.functools"
+		version = "${PV}"
+		description = "Functools like those found in stdlib"
+	EOF
+}
+
+python_install() {
+	distutils-r1_python_install
+	# rename to workaround a bug in pkg_resources
+	# https://bugs.gentoo.org/834522
+	mv "${D}$(python_get_sitedir)"/jaraco{_,.}functools-${PV}.dist-info || die
+}
diff --git a/dev-python/jupyter_server/Manifest b/dev-python/jupyter_server/Manifest
index b18d120d87ae..be28fac2667a 100644
--- a/dev-python/jupyter_server/Manifest
+++ b/dev-python/jupyter_server/Manifest
@@ -1,3 +1,5 @@
 DIST jupyter_server-1.18.1.tar.gz 451117 BLAKE2B ac9088f8f5c5afa6455f41b4006c0d49286006574101b42dd8e28501c97dcf10d7ee534d54b8cf26a8f34c7d2ba446485ce273ce04e22c39a22e5346d55ea4f5 SHA512 7acf101f337af903318de263dcf78cf3b45b799bb6095bc79568fde7f3f56ca508d39a1d40ffe2a4ab0bdc0173f0ee2f4a7426f41e0855c1b7f9dfd86f7e6d73
+DIST jupyter_server-1.19.0.tar.gz 453227 BLAKE2B c411ea965bd1948cfff488be278e9d6d4374482f0017e8e6f0b557628f1b571735008db3217035344ee1d38bed45e9c74c16fb365899408e0565d31740ee1a78 SHA512 ba1316418662bf465f5252de97efa58ecea237b51dfd83b17643176f95382d47759b88a2a79945e6bbf688dcdb3f99d091a035ab0a8a04706c6e6ba0c8a7fcc8
 EBUILD jupyter_server-1.18.1.ebuild 2275 BLAKE2B 6249b549811fe6c9ab2713962068b4ce74f4a4427ced95919bda24ff9d86ffcb89016b00876ed6b627f34dd84121bddb1edb6c75bf8501df8711bde39f93d431 SHA512 47c26f3e524fc559162f27e05980965a6d5520ffd7a0ef7e6479afb2a312e2fabff2c06050d6ea20e283effe5af261b9fe9ca9c9d9c51e9afdc89e6452701528
+EBUILD jupyter_server-1.19.0.ebuild 2283 BLAKE2B 80c0a313006573fa093a6affab31a0d5beca7bc80b68ad5ba3fd3fa880b79d8102cdba23fdb83199d714eff9949f9abe4a119e2605076cfbb4c652fa6f5334ab SHA512 b18f75a8ac687e70e0dc65cef7239a10731a24f4630aa276ffb921c00eb8e766eed0b438fea2052f19982f74c0402de0ff6e8dfa986c5a3b2e5042ed26de73ac
 MISC metadata.xml 544 BLAKE2B ec5a0aea1d2ad6ce0e59972d2ef4ce62c03877d464dfdc34bcb94a7d01304c63761c6bc30ed973bba1f4100e25f70541bed4eea858deb44f359d0e373ae1ade0 SHA512 ffe7deb7349ce99890b902a225b73913185bfa860237dea8c1a508a6a5e84bbb74ca7a5c43253c9986f97fb3fd1e9f2bb63ca60f73953fcc851359df8adb5fbd
diff --git a/dev-python/jupyter_server/jupyter_server-1.19.0.ebuild b/dev-python/jupyter_server/jupyter_server-1.19.0.ebuild
new file mode 100644
index 000000000000..296736ccc44c
--- /dev/null
+++ b/dev-python/jupyter_server/jupyter_server-1.19.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=jupyter
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Core services, APIs, and REST endpoints to Jupyter web applications"
+HOMEPAGE="https://jupyter.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/anyio-3.1.0[${PYTHON_USEDEP}]
+	<dev-python/anyio-4[${PYTHON_USEDEP}]
+	dev-python/argon2-cffi[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	>=dev-python/jupyter_client-6.1.1[${PYTHON_USEDEP}]
+	>=dev-python/jupyter_core-4.7.0[${PYTHON_USEDEP}]
+	>=dev-python/nbconvert-6.4.4[${PYTHON_USEDEP}]
+	>=dev-python/nbformat-5.2.0[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	dev-python/prometheus_client[${PYTHON_USEDEP}]
+	>=dev-python/pyzmq-17[${PYTHON_USEDEP}]
+	dev-python/send2trash[${PYTHON_USEDEP}]
+	>=dev-python/terminado-0.8.3[${PYTHON_USEDEP}]
+	>=dev-python/tornado-6.1[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-5.1[${PYTHON_USEDEP}]
+	dev-python/websocket-client[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/ipykernel[${PYTHON_USEDEP}]
+		dev-python/pytest-console-scripts[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+		dev-python/pytest-tornasync[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	dev-python/pydata-sphinx-theme \
+	dev-python/myst_parser \
+	dev-python/ipython \
+	dev-python/sphinxemoji \
+	dev-python/sphinxcontrib-github-alt \
+	dev-python/sphinxcontrib-openapi
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# This fails if your terminal is zsh (and maybe other non-bash as well?)
+	tests/test_terminal.py::test_culling
+	tests/test_terminal.py::test_terminal_create_with_cwd
+	tests/test_terminal.py::test_terminal_create_with_relative_cwd
+)
+
+src_prepare() {
+	# disable npm use
+	sed -i -e '/\[tool\.jupyter-packaging\.builder\]/,+1d' pyproject.toml || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest \
+		-p pytest_tornasync.plugin \
+		-p jupyter_server.pytest_plugin \
+		-p pytest_console_scripts \
+		-p pytest_timeout
+}
diff --git a/dev-python/jupyterlab_server/Manifest b/dev-python/jupyterlab_server/Manifest
index 357a6401b0d2..79d82ba91717 100644
--- a/dev-python/jupyterlab_server/Manifest
+++ b/dev-python/jupyterlab_server/Manifest
@@ -1,7 +1,9 @@
 DIST jupyterlab_server-2.14.0.tar.gz 62704 BLAKE2B 93277a6880a9395622e6c0ec1da9522c5e30e7a8144c8629de89f45845964008f0a435ec84289efe56043c8ebb998ea65df1d09f3da72096f255fcafa29fab53 SHA512 21ecf749879663378d865bd06161fb3e331f3675038917e405df0cb77d4a4cec55340a35d6511676fa4d91ecaedcd1e7f8aec3a13ad3a39298d10911ab215cc6
 DIST jupyterlab_server-2.15.0.tar.gz 61443 BLAKE2B 48ead96f13caf747cc14f7d65dc6104822dcd0fe17315a2cee4111598b40f05119998f169aef90411e84fe24e8f09736c857325752cfa3f22047acb2a9e2e3c1 SHA512 27530b293ad7c171b280a4c165d7f983c85238c4cb0bc89bb2eda8493b2988f047045c842ba456df9d0bfef00b5ee28b061c537ef6293d726c3a4f3d6572727c
 DIST jupyterlab_server-2.15.1.tar.gz 62345 BLAKE2B 14d82bc9cc7566312c4f434b78f396bb822f150653e3be6f1e328d620d1d8b205a8dca8c0b4a1e84a52562e04f76cb63154fd1b58f45da3a4f787a32468595cc SHA512 b4fba8a09562a70a705170406b69cbfaad4fcee290ca74e7949155698af616e4ce650a75c06bfa613e1a307980a4769418587ccf33a964868053ded9a7648095
+DIST jupyterlab_server-2.15.2.tar.gz 62533 BLAKE2B 46df68a0f1500e1b4520817ee63042194e65e72fb9d63058bc18effad1668e19733e6a1d5edbd2ec6e07c4c932c2901d974f787455142404f8162d2a83205f68 SHA512 670b9cb3a982d832225a7e632dda57000044a5a4b86f4d0c308cc20c1ad8db09216ae3918af52209dd3bfb04d34c807fca7060208db239b52ef9f29b92943ead
 EBUILD jupyterlab_server-2.14.0.ebuild 1639 BLAKE2B 0d0e407d1cc7a23dc4695b1c02e26ee44245852312925557c26f982e158950cc874e8b71146b0099a1c174c176f609aa07a4c60701dc67a795b7c48b9f42f7c8 SHA512 3177bebf38b63510accbcad54965e0fb9ebb3cbaaa18c611d49c7b8fbca3ed44fd94d5412faf9d3eefd86a036b965a3e5976e26cc5ac83c5ba4b64e1cd84a422
 EBUILD jupyterlab_server-2.15.0.ebuild 1751 BLAKE2B 78194ccd23664839271fde49bcdba89d775028d078ef33a54796866dbf8050b23403839d7236f909a3e1fe68f930ea0bcbb9b9697b116f482977b8039fdb27d4 SHA512 65006064e30c9b8552f1c6df538bd0b779ff7922021fd83b87bf03d5794ee27cb91be970d3d2d6a8d68db8f5a374844f495e206af94e065a662189a4f07ca632
 EBUILD jupyterlab_server-2.15.1.ebuild 1751 BLAKE2B 78194ccd23664839271fde49bcdba89d775028d078ef33a54796866dbf8050b23403839d7236f909a3e1fe68f930ea0bcbb9b9697b116f482977b8039fdb27d4 SHA512 65006064e30c9b8552f1c6df538bd0b779ff7922021fd83b87bf03d5794ee27cb91be970d3d2d6a8d68db8f5a374844f495e206af94e065a662189a4f07ca632
+EBUILD jupyterlab_server-2.15.2.ebuild 1810 BLAKE2B df0c31905fd0be0353ce5ac7284c9d0134a29c6238e2afce8e05c97c46ced004f00bd5e23a14922e8a24cee2de3ed9a3a71d8dc159fc2dffe8f90aaf94ca71a4 SHA512 27d14c86d4a66f0cb430efd291d5d72ef24ce5be016ec0ec724675c4b696efc663be69488e5c61120a4306dd3cff312af4109fbba536300bea06c9a632be3665
 MISC metadata.xml 426 BLAKE2B 98083ff6255b6c5b4ebe7eb67f4e9716f52397646df275cce4cae2f78b0fbb5dda8d6240e1546b4bac6f13ef3f3f1e6f176b2062e066070d595e5cd93c02708e SHA512 9755e74547fb74a4720c9b755449d913dbfd949bad920ecd3903df91182236ad46712c358b3db8180ddf478a6cc6c2a57c6d1a939a9911ffc7ccb39672f5868e
diff --git a/dev-python/jupyterlab_server/jupyterlab_server-2.15.2.ebuild b/dev-python/jupyterlab_server/jupyterlab_server-2.15.2.ebuild
new file mode 100644
index 000000000000..15eb6bab4bf3
--- /dev/null
+++ b/dev-python/jupyterlab_server/jupyterlab_server-2.15.2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_USE_PEP517=hatchling
+
+inherit distutils-r1
+
+DESCRIPTION="Server components for JupyterLab and JupyterLab like applications"
+HOMEPAGE="
+	https://jupyter.org/
+	https://github.com/jupyterlab/jupyterlab_server/
+	https://pypi.org/project/jupyterlab-server/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-python/Babel[${PYTHON_USEDEP}]
+	>=dev-python/importlib_metadata-3.6[${PYTHON_USEDEP}]
+	>=dev-python/jinja-3.0.3[${PYTHON_USEDEP}]
+	dev-python/json5[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-3.0.1[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	>=dev-python/jupyter_server-1.8[${PYTHON_USEDEP}]
+	<dev-python/jupyter_server-2[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		dev-python/ipykernel[${PYTHON_USEDEP}]
+		dev-python/jupyter_server[${PYTHON_USEDEP}]
+		>=dev-python/openapi-core-0.14.2[${PYTHON_USEDEP}]
+		<dev-python/openapi-core-0.15[${PYTHON_USEDEP}]
+		dev-python/openapi-spec-validator[${PYTHON_USEDEP}]
+		dev-python/pytest-console-scripts[${PYTHON_USEDEP}]
+		dev-python/pytest-tornasync[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+		dev-python/ruamel-yaml[${PYTHON_USEDEP}]
+		dev-python/strict-rfc3339[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+# TODO: package autodoc_traits
+#distutils_enable_sphinx docs/source dev-python/pydata-sphinx-theme dev-python/myst_parser
+
+python_prepare_all() {
+	# This seems to not work for us, can only find english
+	rm tests/test_translation_api.py || die
+
+	# Do not depend on pytest-cov
+	sed -i -e '/addopts/d' pyproject.toml || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/mypy/Manifest b/dev-python/mypy/Manifest
index 97f182e557b0..dbf3b8e08fa8 100644
--- a/dev-python/mypy/Manifest
+++ b/dev-python/mypy/Manifest
@@ -1,3 +1,5 @@
 DIST mypy-0.971.gh.tar.gz 2808674 BLAKE2B 7f3b183a4c5342ddfc501b8091c078ac55803db86d43042220e18e3e616664ce91ddeb341b45b1d80c7686f8c2f3606af074a5dcb9c9eaacd6307578d3689981 SHA512 5088efbd74385b5a8c155ae6e756deed274bf3e597df13e57970a29c029c34c91453c45fc1d2d03b7d83cd786b8930a387a781e1b9cb72102c1f07263a346c6d
+DIST mypy-0.981.gh.tar.gz 2628442 BLAKE2B 484ba2da1e3c8988ce4bfa7681592b6ca4f409ca9078319428e11407fa2dec38deace41e77278bab835eee1e3690d8bf213c44ecb82ac5e9a5f759b030df93fe SHA512 8deb66e48b74c50027fd95533935fa6643beaa30b28d25c5783645f9efaedf6138379c262a91abbca62c6e269677f0ee1325fe93ea48d587f1aae8eec21eb15e
 EBUILD mypy-0.971.ebuild 1768 BLAKE2B c9adf0f3b1706821722be1c77370052585e7ee5aeabe44f0903c74e71163de44358ac985a0c251217bee8c657944370842c31a4e3042ce270cf12beacc0f2110 SHA512 fe5abaa26482495522c4c958d6ff71248a72edc7ac51b2fa2b4b3dd9ca4ef83d1f9e476120d7fda83a864117f0b4420eeece7bb505c87dd5f00b753c2790f945
+EBUILD mypy-0.981.ebuild 1776 BLAKE2B c4b1c7abb905623121763a2f44fbb8a422a9d1cb0c6c558e858ddaaa3b1d75aee0b947f74e003d1ada49a7611ae45e22832b4999e89f39ad39cb7957ac7ceab2 SHA512 dc244b629eb8f0aaa59a6e43a8b78850bc1d4e703dd672961a828c4cfbc03d93a5bcf5d6b2a455e8783d8fbb3fb9f626a694c70d1920445f393d90c9da805a27
 MISC metadata.xml 515 BLAKE2B 75827bbbeb70fd4b9295ab4689068d2d4b686b32d4059acde94fb0d08048e9e56ecaf3eec39dc5567b2753e2552353e273cdf2f4e27d077cc9b03320ee09c64b SHA512 c1c3c7a3651e61e0b63ab4462f0370cce9cbdce33e64c5e7a1fbefe8116d5d3d3b35bc4095d8a5ce28caf69b0644af3f13c9a27b683f2f981e52f8bfe4ac8615
diff --git a/dev-python/mypy/mypy-0.981.ebuild b/dev-python/mypy/mypy-0.981.ebuild
new file mode 100644
index 000000000000..75044659afd0
--- /dev/null
+++ b/dev-python/mypy/mypy-0.981.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="Optional static typing for Python"
+HOMEPAGE="
+	http://www.mypy-lang.org/
+	https://github.com/python/mypy/
+	https://pypi.org/project/mypy/
+"
+SRC_URI="
+	https://github.com/python/mypy/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+# stubgen collides with this package: https://bugs.gentoo.org/585594
+RDEPEND="
+	!dev-util/stubgen
+	>=dev-python/psutil-4[${PYTHON_USEDEP}]
+	>=dev-python/typed-ast-1.4.0[${PYTHON_USEDEP}]
+	<dev-python/typed-ast-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/typing-extensions-3.7.4[${PYTHON_USEDEP}]
+	>=dev-python/mypy_extensions-0.4.3[${PYTHON_USEDEP}]
+	<dev-python/mypy_extensions-0.5.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/tomli[${PYTHON_USEDEP}]
+	' 3.8 3.9 3.10)
+"
+BDEPEND="
+	test? (
+		>=dev-python/attrs-18.0[${PYTHON_USEDEP}]
+		>=dev-python/filelock-3.3.0[${PYTHON_USEDEP}]
+		>=dev-python/lxml-4.4.0[${PYTHON_USEDEP}]
+		>=dev-python/pytest-6.1.0[${PYTHON_USEDEP}]
+		>=dev-python/pytest-xdist-1.18[${PYTHON_USEDEP}]
+		>=dev-python/py-1.5.2[${PYTHON_USEDEP}]
+		>=dev-python/typed-ast-1.4.0[${PYTHON_USEDEP}]
+		>=dev-python/virtualenv-16.0.0[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	dev-python/furo
+distutils_enable_tests pytest
+
+# this requires packaging a lot of type stubs
+export MYPY_USE_MYPYC=0
+
+python_test() {
+	# Some mypy/test/testcmdline.py::PythonCmdlineSuite tests
+	# fail with high COLUMNS values
+	local -x COLUMNS=80
+	epytest -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/sentry-sdk/Manifest b/dev-python/sentry-sdk/Manifest
index bde10a8aa695..b73dc34ad42d 100644
--- a/dev-python/sentry-sdk/Manifest
+++ b/dev-python/sentry-sdk/Manifest
@@ -2,8 +2,10 @@ DIST sentry-sdk-1.9.5.gh.tar.gz 272096 BLAKE2B 179be647b92a74a1836f26add33e4b980
 DIST sentry-sdk-1.9.6.gh.tar.gz 270120 BLAKE2B d5918f4ed21f3ee50d76a780416c458b3f917a314a9dfbdbe4b4b63727fa3b7ead61d04546b6ebf57c262143ccc694811e6f888ca1d39155aa98f3225508ab94 SHA512 ad8717f456706edb31e01e8c19b8b81d98b15423d62b2dba8a86fc78a4756c8176b4a0758ebb599f84dd4e6e85258c47e350c8f55e80314a4a70631966c83de6
 DIST sentry-sdk-1.9.7.gh.tar.gz 270209 BLAKE2B d1671bb45efa8aa785dc33a5d27e1d44843000809a88c4b081bbaca31be9ece65c6b192cadd46df912e1e1ca8650c7246f9946adb85117e88d13446965e190ac SHA512 d5c9a32e2c4001892cd03357d3b0cfe4c789eb0f4a12f6431920624795d4ed70a4055351541e12d9ee0be6e0fa689190e53c05fac53a27dad30e9f9fbe0711c1
 DIST sentry-sdk-1.9.8.gh.tar.gz 271425 BLAKE2B 27135f4fee24d80a544d852261555d8a8498990f815bbe7438b67bbf5717ed4b6e92c8f3e6781929332cbaba75986538294cf4b97c5bbe845ab57a32333d1d6f SHA512 7c9136b4100537e327ccbc2a96967007a1d2de653098ffa3463cc135ca604e49bd066d6a85046c752f38bdfc2698298e46a5d26bbf1a31a19f1631cf92ad9c8d
+DIST sentry-sdk-1.9.9.gh.tar.gz 281232 BLAKE2B 8d1017644c2ae73c4e070f7b1b0a6807ab1d7a7655986bb9a4b457f72c98b3df0fd5f3af8722ea91e13911b1ce6d7234542af195a0b80ec5e9e939f5de3998f0 SHA512 613b504c9e0071657241c7724206d3e99f62fdc846cda98fa4830cf29eee24c8d2ae2abb265fab5d87f47d064d8aed60e105c2d2090fb24308e65b7e74e2974b
 EBUILD sentry-sdk-1.9.5.ebuild 3201 BLAKE2B 371fb9d17f8f843c34c17857d68818de5e04c40267a1009ccb98fc2bcabcb67d80d9da36bab08962224936bcfa1c230be10ab88758a0bc4713f4ec68ad28b2a0 SHA512 fb5f857923833a77c952da761c6b4b8ab88037c981f5468913c83d22ce119026814f57b9902e72b21ab21ddbf83b12e60e707c340ed91aa5a39b5269515e3dd8
 EBUILD sentry-sdk-1.9.6.ebuild 3205 BLAKE2B cc50ae93fdb72f81c15ac975cb7359056feba2eb1f67b77335892f784be8f859bc5125fc341f370eaa4b1b3526387fb12246046b1b0d9db52d364f796c440236 SHA512 e78cbc57645b20a02a691cca4849f9728d95eaa10fc55ac035111b50b24b1d8766875a66db0306256b446c2a47a797d2d890ed11ffc1246e6cea43e243b97379
 EBUILD sentry-sdk-1.9.7.ebuild 3205 BLAKE2B cc50ae93fdb72f81c15ac975cb7359056feba2eb1f67b77335892f784be8f859bc5125fc341f370eaa4b1b3526387fb12246046b1b0d9db52d364f796c440236 SHA512 e78cbc57645b20a02a691cca4849f9728d95eaa10fc55ac035111b50b24b1d8766875a66db0306256b446c2a47a797d2d890ed11ffc1246e6cea43e243b97379
 EBUILD sentry-sdk-1.9.8.ebuild 3205 BLAKE2B cc50ae93fdb72f81c15ac975cb7359056feba2eb1f67b77335892f784be8f859bc5125fc341f370eaa4b1b3526387fb12246046b1b0d9db52d364f796c440236 SHA512 e78cbc57645b20a02a691cca4849f9728d95eaa10fc55ac035111b50b24b1d8766875a66db0306256b446c2a47a797d2d890ed11ffc1246e6cea43e243b97379
+EBUILD sentry-sdk-1.9.9.ebuild 3205 BLAKE2B cc50ae93fdb72f81c15ac975cb7359056feba2eb1f67b77335892f784be8f859bc5125fc341f370eaa4b1b3526387fb12246046b1b0d9db52d364f796c440236 SHA512 e78cbc57645b20a02a691cca4849f9728d95eaa10fc55ac035111b50b24b1d8766875a66db0306256b446c2a47a797d2d890ed11ffc1246e6cea43e243b97379
 MISC metadata.xml 510 BLAKE2B e00011699ac2cc83f1923e1f6fa813ede7eab8c57f9ce9d9fca04e721b089db1c5f2bdffaa7b9856f56b433abd9189125e07ffd3f329e4fa8d098e28a4f2d7bd SHA512 bafb77a102d94fe050cb526b298fb8cfd56775cb4d07eda280f6356fbec6fbe5df5c9ebd459d9d4457cd027c2e0d7c349e053fa6070b52f0d2989f6ec600b87d
diff --git a/dev-python/sentry-sdk/sentry-sdk-1.9.9.ebuild b/dev-python/sentry-sdk/sentry-sdk-1.9.9.ebuild
new file mode 100644
index 000000000000..9d1e2042e8f2
--- /dev/null
+++ b/dev-python/sentry-sdk/sentry-sdk-1.9.9.ebuild
@@ -0,0 +1,96 @@
+# 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 client for Sentry"
+HOMEPAGE="
+	https://sentry.io/
+	https://github.com/getsentry/sentry-python/
+	https://pypi.org/project/sentry-sdk/
+"
+SRC_URI="
+	https://github.com/getsentry/sentry-python/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S="${WORKDIR}/sentry-python-${PV}"
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	dev-python/urllib3[${PYTHON_USEDEP}]
+	dev-python/certifi[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/asttokens[${PYTHON_USEDEP}]
+		dev-python/django[${PYTHON_USEDEP}]
+		dev-python/executing[${PYTHON_USEDEP}]
+		dev-python/fakeredis[${PYTHON_USEDEP}]
+		dev-python/flask-login[${PYTHON_USEDEP}]
+		dev-python/gevent[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+		dev-python/pyrsistent[${PYTHON_USEDEP}]
+		dev-python/pytest-aiohttp[${PYTHON_USEDEP}]
+		dev-python/pytest-django[${PYTHON_USEDEP}]
+		dev-python/pytest-forked[${PYTHON_USEDEP}]
+		dev-python/pytest-localserver[${PYTHON_USEDEP}]
+		dev-python/werkzeug[${PYTHON_USEDEP}]
+		dev-python/zope-event[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/eventlet[${PYTHON_USEDEP}]
+		' python3_{8..9})
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_IGNORE=(
+	# tests require Internet access
+	tests/integrations/httpx/test_httpx.py
+	tests/integrations/requests/test_requests.py
+	tests/integrations/stdlib/test_httplib.py
+	tests/integrations/flask/test_flask.py
+	tests/integrations/django/test_basic.py
+	# wtf is it supposed to do?!
+	tests/integrations/gcp/test_gcp.py
+	# broken by rq-1.10.1 (optional dep)
+	tests/integrations/rq/test_rq.py
+	# fastapi is not packaged
+	tests/integrations/asgi/test_fastapi.py
+	# TODO
+	tests/integrations/bottle
+	# requires python-multipart (TODO: package it)
+	tests/integrations/starlette
+)
+
+EPYTEST_DESELECT=(
+	# hangs
+	'tests/test_transport.py::test_transport_works'
+	# TODO
+	'tests/test_basics.py::test_auto_enabling_integrations_catches_import_error'
+	tests/test_client.py::test_databag_depth_stripping
+	tests/test_client.py::test_databag_string_stripping
+	tests/test_client.py::test_databag_breadth_stripping
+	tests/integrations/asgi/test_asgi.py::test_auto_session_tracking_with_aggregates
+	tests/integrations/asgi/test_asgi.py::test_websocket
+	tests/integrations/aiohttp/test_aiohttp.py::test_transaction_style
+	tests/integrations/aiohttp/test_aiohttp.py::test_traces_sampler_gets_request_object_in_sampling_context
+	# incompatible version?
+	tests/integrations/falcon/test_falcon.py
+	tests/integrations/sqlalchemy/test_sqlalchemy.py::test_too_large_event_truncated
+	# test_circular_references: apparently fragile
+	'tests/integrations/threading/test_threading.py::test_circular_references'
+	# test for new feature, fails with IndexError
+	tests/integrations/wsgi/test_wsgi.py::test_session_mode_defaults_to_request_mode_in_wsgi_handler
+	# TODO
+	tests/integrations/wsgi/test_wsgi.py::test_auto_session_tracking_with_aggregates
+	tests/integrations/wsgi/test_wsgi.py::test_profile_sent_when_profiling_enabled
+)
diff --git a/dev-python/sphinx-autodoc-typehints/Manifest b/dev-python/sphinx-autodoc-typehints/Manifest
index e4ffc705f25e..6789de2d9ab4 100644
--- a/dev-python/sphinx-autodoc-typehints/Manifest
+++ b/dev-python/sphinx-autodoc-typehints/Manifest
@@ -1,3 +1,5 @@
 DIST sphinx-autodoc-typehints-1.19.2.gh.tar.gz 26983 BLAKE2B 694edbf94bac05670adad992cfdc7e1146228af7b888a97c4f8e2394623ef3e42251ba0f3c22985517b2a251996cc41a305ea5497b2369363bc00d4bb3d24da7 SHA512 c35c7ed3f0698651be5ba4dd2232912d1f6d9d30e08153527df3fe16001266abc80cd1b11e3a41ccf92140c6baea98105e9bccd9466e65664dcf008f9a944634
+DIST sphinx-autodoc-typehints-1.19.3.gh.tar.gz 27694 BLAKE2B c1528fa4d4e055dab723bfc40baea591a201546abdccbb81e7dd9ada8620ea74d7371f9c47a8ef310f57934de95b5c295939fa9c095492e02606ca9828bf921d SHA512 fba1b5b39b9c8556ffa75e1a9d2427623bb8ee6f412b78c293c77b248b81d73f624beca9c155279147951510daed7cf5a5120e714efbcce4d62251f74f0924a4
 EBUILD sphinx-autodoc-typehints-1.19.2.ebuild 1066 BLAKE2B e43ac460f86ddb31256e3e303b3837f542d0b2b296eb3b917f877dfdd426b542b779d6ca0e4036e80d6689e8de3bda3c2259923400bdf6dc9a46faa6fa6ab012 SHA512 d841abad7e984d33a332262f92eade154363aec0f1fa9588381e6ab9c1c6f0e193f05ccc5d5f9755df52429f096238f2c1b51e2040ae24cca027a5d3fe8492c1
+EBUILD sphinx-autodoc-typehints-1.19.3.ebuild 1077 BLAKE2B 4e9ade2d098b25db13a49fd2f63cff7045af6a5ccd098d8d69f019d179a7feab1f9452c7bff6e80f4dd6a67c549b1eb7c5cfeb5084202e1519b277fe5520c5c4 SHA512 76d5fbd4b18a28db31758010d2917d3f69f5b1caf405c96f849cced5bcee225dd4580ee3c789b49b406eaa801be3d1aa13f809f532ea7f01572870385349dade
 MISC metadata.xml 807 BLAKE2B 368714db91017473456e0854b7e2024ac6d24b4ba3d5ae2a44697546c4f96185a44ecc9da8dc816d9661f5815d7d31751d2d87d599c748d06db3f1dde32a141c SHA512 04882668dfa68354aa8ee5860db11963153fb29d9c26b3367fcef63da4ebbccf049909946e73fd06250bf784dcb783b1bc70fb29b9aaa1fcb19be9fcf470ebbe
diff --git a/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.19.3.ebuild b/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.19.3.ebuild
new file mode 100644
index 000000000000..b61995da51f2
--- /dev/null
+++ b/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.19.3.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Type hints support for the Sphinx autodoc extension"
+HOMEPAGE="
+	https://github.com/tox-dev/sphinx-autodoc-typehints/
+	https://pypi.org/project/sphinx-autodoc-typehints/
+"
+SRC_URI="
+	https://github.com/tox-dev/sphinx-autodoc-typehints/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+SLOT="0"
+
+RDEPEND="
+	>=dev-python/sphinx-5.2.1[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/hatch-vcs[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/nptyping-2.3.1[${PYTHON_USEDEP}]
+		>=dev-python/sphobjinv-2.2.2[${PYTHON_USEDEP}]
+		>=dev-python/typing-extensions-4.3[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# this package is addicted to Internet
+	tests/test_sphinx_autodoc_typehints.py::test_format_annotation
+)
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/stack_data/Manifest b/dev-python/stack_data/Manifest
index f678f9628ad0..72d32e6ba8cc 100644
--- a/dev-python/stack_data/Manifest
+++ b/dev-python/stack_data/Manifest
@@ -2,6 +2,6 @@ DIST stack_data-0.4.0.tar.gz 41638 BLAKE2B 1395ce2ba5ce12af2ab4e9c3d4b42c2b5c14f
 DIST stack_data-0.5.0.tar.gz 43332 BLAKE2B b9583717633902b4618981ceeb53eca7b817b7985fd5401cc79fe35b194e77fdb57e1c5c51adde0b4e604f6df5424d27056b2528c356a808a4b4c9e1dee1c56a SHA512 82573d9b115daf23a04921027878d55cf9de897a01cb0089b082ec0e7a7b42461afe47dddf4d16adfe186259280b57d651857884ceaf9673d8c983c48f479684
 DIST stack_data-0.5.1.tar.gz 43435 BLAKE2B eeebca4d2d8e3c8795e05d4a058c4a7421a2669e28b476400d541c79d5d7ebb66dde16cd39e2586eafa2f653341c041351c2684440d879ed71b2adf83ea1b4d9 SHA512 b33e3bfd31d285fcdb8f6db8f3e59b6e99fcbc0b912c7be01e52b164554a5914bc8f1a7fb7e665a18fa2d164b248afeb3c6a287f8e27ab7fa44f69b75d93d375
 EBUILD stack_data-0.4.0.ebuild 825 BLAKE2B 575800f98c667835be726a01e4d2d0bdf0e7d6f26e4554bf33670fc7c6732fc147174ad15441bb6e3951a474478ad1b90aea7ba2184e02d9d5b53a58ded08a26 SHA512 b639c0422e76e42d661575378191eeba250e7f35ca96b5ae8c2b8ddecc0cfa530140c2336654e3d04344b45ebbb6875b9673733266df54e43ecd25149163d8a6
-EBUILD stack_data-0.5.0.ebuild 833 BLAKE2B eed18bbd3e49a5073e55b067a6da1501ac772d1926138e6d23f811ca4e6a432da534caca90e2a9214ad55abc7f210b3d8b385e39a27458ed9e1efdf7aae27911 SHA512 0a5c559e764428f8e4f85e31b15ed725c96d77df9de632e069e51e076f0d9063262522b67a86a0614f5609c863a8141a356c284445f6f03028ac025a6d1dadac
+EBUILD stack_data-0.5.0.ebuild 828 BLAKE2B 56771ea9e017a44d927514f780271d77d65bc039940dab5890e7711cc7350980fd6acf6a1f97b9c607f722baf6948d6c587dc2fb8bdd4acb72a1b78f46335398 SHA512 1c69f78bb924c13e06a2c654d7f44016c04fe5c344afcfc548c4bc73e1d19a927cb35c2452d8a7f262093a231e77cbf91ed942c6306be857ddfe30b49157e916
 EBUILD stack_data-0.5.1.ebuild 876 BLAKE2B f5bb2a12099ee1b20236148a4adb5b93f54971fc56e8ec6a7f8ee24f14735492a869f44760655b8a7f22404d6ef674b0e1903c425679313041467a9acf99104d SHA512 5740daa892dbccab5987211322d705fe8c944872eb150d04baeb17ca83d00fcde491597048b6e8827431f60466601b5160e5f4d7b36dac71f260f0ff92073d26
 MISC metadata.xml 375 BLAKE2B af41ba2f7058da9de0e1f8be741c3de7581d895246c1c941f0dc27ed2e708ac2cb64b5a6fcaea82ff79e7a8bd4e0b424500a373957019d9e62f53babeadc166b SHA512 be539ff023fbcdf96761cf06429efc4cc2d0d2ee38b3bdaadbd73665798c123591b9543ab4fd3ccca9c80820c71b010f8fd34646d2001a940df0a61fc4e0639b
diff --git a/dev-python/stack_data/stack_data-0.5.0.ebuild b/dev-python/stack_data/stack_data-0.5.0.ebuild
index 354f429fa75b..8f241c5d8d17 100644
--- a/dev-python/stack_data/stack_data-0.5.0.ebuild
+++ b/dev-python/stack_data/stack_data-0.5.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc ~x86"
 
 RDEPEND="
 	dev-python/asttokens[${PYTHON_USEDEP}]
diff --git a/dev-python/starlette/Manifest b/dev-python/starlette/Manifest
index c751edbf35b6..7f8b2c7c409a 100644
--- a/dev-python/starlette/Manifest
+++ b/dev-python/starlette/Manifest
@@ -1,7 +1,9 @@
 DIST starlette-0.18.0.gh.tar.gz 408097 BLAKE2B ddc85690d9eb962a8d82544a1667d17316025330c8fda0c79dc21422399bcff01ccf5baf85eda7941f40aac5845d18fdcefaa23ba8ba442d30f0b9e194f7287c SHA512 521d39c1eec818250da3f2dc24cd2fb08393b76e6314a9bd5f3e520bdfa4652ae4ace5876b7e7f3a7ddc5540160e1086997a40b86a1b1bfd694c6aa1abde9106
 DIST starlette-0.20.3.gh.tar.gz 417054 BLAKE2B 5564026142cb45075aa3ea3fabbc3e0eb39d4e2d776c6577d79b9c28522befaa92869e5f4211bc77235f6d25102f8d90e3811c972b74bb295abd0d186e29ceef SHA512 fa7f8de299ee452a52bf43ff6c39851fc7985775e1938b38cb564d5cb19705a84fbb173229a090295bca3be87b71214fdf7c80e3db0f870cf018510e1bd06b1b
 DIST starlette-0.20.4.gh.tar.gz 2819634 BLAKE2B 265ef6b88ebc5cee4361601198891cbab9e92e354942a06622bdac46dc63d2644557bef952730b455157ee83b15035016039f8a88f17e673487e9a3571d6180c SHA512 481a095ada3140164abae89026da36c90657d8ccabb0a6753094bf7fdf47ce6f789320ed15e94d15dedffaf302691e204cb541c26a4c779848aa6505dfe52b2f
+DIST starlette-0.21.0.gh.tar.gz 2830353 BLAKE2B 7ff818d4687757ec8699dcd0e2582af78211787b7a0f2110da045eb4f7a8760262cf144b0af7dc9f72140b5dae1e65f7a4207ee3b165db4091c5139ce0bfcc85 SHA512 c246862604ba807141313857321d898d996eaa771ccb197546d0928a75cbb69f0e485fe90d2c817e70323146077c487436516384e1401d815c59c0ac75845e2b
 EBUILD starlette-0.18.0.ebuild 1156 BLAKE2B 2c31219a2ec2d15ff2c2771e321aa36371d61f79eefb3bee6243bd22bbc27da479329cc36beaf4d4b231f7854808682c4885169660a5890b1aef7cd95175832e SHA512 f23e3ea3bbb5bb198c517195dee9bf6210b0dc714d5e86ffdb0831d15fd29b8be8a9be0b2700ac189bb37e1b2a61503893398f85f1026df71829c044a12a92e0
 EBUILD starlette-0.20.3.ebuild 1422 BLAKE2B e9ff6263f72feaf2bf66271d683b079c7dcee52214496ad024e4e99e41a9b7f5fcba743deec75a79139660ce19c0dd957c11e9917441e514be1bd23238d42d71 SHA512 8595dcda16195a945b80eb31b7a9b1761d60e0d1dfcf64fff43f7f872725c91e7eeba552093dc40bf83e49f59bacef74500e83c65b8a644e6ec927c9c9d126a8
 EBUILD starlette-0.20.4.ebuild 1422 BLAKE2B e9ff6263f72feaf2bf66271d683b079c7dcee52214496ad024e4e99e41a9b7f5fcba743deec75a79139660ce19c0dd957c11e9917441e514be1bd23238d42d71 SHA512 8595dcda16195a945b80eb31b7a9b1761d60e0d1dfcf64fff43f7f872725c91e7eeba552093dc40bf83e49f59bacef74500e83c65b8a644e6ec927c9c9d126a8
+EBUILD starlette-0.21.0.ebuild 1581 BLAKE2B 71ce80275533f416e2208f4e873b373fe6488b473eea9247b2777973b569b4dca08c3762ef29df30e584957ad464dbe3b61d6fa401408f5aab9202668ab1f53e SHA512 ec1f406083c3423c7b4fe4582f1c1a1338b91531c733017376d50d4ee58c9ec610bb25515a7e5355e365157f1f97a1708173876dcaf23873e552f821db5bb01a
 MISC metadata.xml 324 BLAKE2B cbdb5983f2620f296eed8d81541e6ffbb084fdbcb698e52a6d86a64122834184e71ac423c21fa81d395be5505cb497be9172cd28d8fc633b6d31b844c480f741 SHA512 02c4d176ccc9c1b12e94f25c0de9792b6dc087a5d897bff8a46b2053951afad28b5c40f181ece8209acb3a8db1ec9e21a29af06b55f66efbc0d8f325d6958123
diff --git a/dev-python/starlette/starlette-0.21.0.ebuild b/dev-python/starlette/starlette-0.21.0.ebuild
new file mode 100644
index 000000000000..b8f1200acd8f
--- /dev/null
+++ b/dev-python/starlette/starlette-0.21.0.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="The little ASGI framework that shines"
+HOMEPAGE="
+	https://www.starlette.io/
+	https://github.com/encode/starlette/
+	https://pypi.org/project/starlette/
+"
+SRC_URI="
+	https://github.com/encode/starlette/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# TODO: package python-multipart
+RDEPEND="
+	<dev-python/anyio-5[${PYTHON_USEDEP}]
+	>=dev-python/anyio-3.4.0[${PYTHON_USEDEP}]
+	>=dev-python/httpx-0.22.0[${PYTHON_USEDEP}]
+	dev-python/itsdangerous[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/typing-extensions-3.10.0[${PYTHON_USEDEP}]
+	' 3.8 3.9)
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+"
+# brotli needed for consistent test output
+BDEPEND="
+	test? (
+		|| (
+			dev-python/brotlicffi[${PYTHON_USEDEP}]
+			app-arch/brotli[python,${PYTHON_USEDEP}]
+		)
+		dev-python/trio[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_IGNORE=(
+	# Unpackaged 'databases' dependency
+	tests/test_database.py
+
+	# Unpackaged 'multipart' dependency
+	tests/test_formparsers.py
+)
+
+EPYTEST_DESELECT=(
+	# Unpackaged 'multipart' dependency
+	tests/test_requests.py::test_request_form_urlencoded
+)
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# fix accept-encoding, as new support was added with newer versions
+	sed -e '/accept-encoding/s/",/, br&/' -i tests/test_{websockets,requests}.py || die
+
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/trove-classifiers/Manifest b/dev-python/trove-classifiers/Manifest
index f0f5f518ee06..86e72c48185f 100644
--- a/dev-python/trove-classifiers/Manifest
+++ b/dev-python/trove-classifiers/Manifest
@@ -1,13 +1,5 @@
-DIST trove-classifiers-2022.6.23.gh.tar.gz 14950 BLAKE2B 7203b8edb6f8a8886371a60f3c273b02b7fe045230a3a0c89a7282a896e513535a47fe06834fd6e33b98c480695b69be524dea1402f463f3c82fc80ddf8ac320 SHA512 c2c186b5d13f626a43f29a1eff6ebf2f17f8240af554f27ffdf05b506d428dd59582e7357a85b62f94714e024ae98ea216487726526639371c24c6b46b96df4e
-DIST trove-classifiers-2022.6.26.gh.tar.gz 14966 BLAKE2B 360a8a01d710456a7edf2f56ce5ca4645e0f5e79db09087a888556e6555a15fd6f6b0aa3112bf0f6c2652759fce93e76357775ca57e53615dd99c4f1b929303d SHA512 1857d53e7731ada3ca811222bab2d0734da0e18fdf36dcada166bd15b1f397cf8575963d8432eb2d0de571646da6b0b18299af3bb7e44fb225586aa76f6de35f
-DIST trove-classifiers-2022.7.22.gh.tar.gz 14999 BLAKE2B ba6647b8ccb0a8a791d91c48094f3a748866c7f80f92b28903bd09084b7a216b2ba824657ba5f8ef8988edf242140c0b449804f58d3c1522e857670a1f01d455 SHA512 7d60a18a7ee11e21021f5ccc131e9ca28769083776898d931dd92131ea7edecd7ecad17a7a9d6d2d11e19ab8ff6a6fc2373ff9938fc26567e0f7c4a0e903d3c1
-DIST trove-classifiers-2022.8.24.gh.tar.gz 15015 BLAKE2B 92a787e3dc80a06fe77462b0b5b443f36f8955b428c80efabe1d835f711eaf14e4748314e51355540a1566f792e83510393cd883ad9d7b4e586a497d0c863ca2 SHA512 a668835fe29e2a5052b531e8dba0003366793dd23ba5337a612e8f6242c519434c18c45101b0d7f397c2c6d07e2f965fe82f90bd9735266f3e86f07b8180cc93
 DIST trove-classifiers-2022.8.31.gh.tar.gz 15020 BLAKE2B 3898164f5afe8c381894b7dfb07b0b2f5fb9f20b2b8b450bbde5651d71989cb39de674364e298e3fa67011a2f8f13c099bf92d67e4e79da33ac5e90e078af155 SHA512 bce304ca9d4b4b7a40272e69f4805de9798987baee2c14983fc809daa32b6c06479d1e24c64599228f3c6f3fa79709a2fee9b6661fdbcb40d539689e4fdd1595
-DIST trove-classifiers-2022.8.7.gh.tar.gz 14999 BLAKE2B e5ec3b122f357e61c62ef9d6bbb16addeeb59aad5d5bced9d7fa2325c545298c9e3fcf619c5b459b2734caa34f2e7281d1b0306b1832c9156223d94ba83a2206 SHA512 61b776e2c4cb79788a14c17cf10f3cafaa3364bce3927e0e328b2129b65efdac9948e54d74e4454df3a094b25e6eb23074b577c5eb5735cc1939342f5c5d06ce
-EBUILD trove-classifiers-2022.6.23.ebuild 659 BLAKE2B c50af928a84398969b7e57b00688ab13dda9ae3a476560222ba27590ded65d6a1eafbe79b2d1730a8fae8e714a7b39ea0b892808b46941e81a862cf02885ec82 SHA512 9081abb9b701b392d6528fc0242c79d72e145a2e6f620b965148e8bbdab7faad10034b23f8557ae16a08ef45b10ce9a9814e386ea0c5e8d6ed82daf710629d34
-EBUILD trove-classifiers-2022.6.26.ebuild 659 BLAKE2B c50af928a84398969b7e57b00688ab13dda9ae3a476560222ba27590ded65d6a1eafbe79b2d1730a8fae8e714a7b39ea0b892808b46941e81a862cf02885ec82 SHA512 9081abb9b701b392d6528fc0242c79d72e145a2e6f620b965148e8bbdab7faad10034b23f8557ae16a08ef45b10ce9a9814e386ea0c5e8d6ed82daf710629d34
-EBUILD trove-classifiers-2022.7.22.ebuild 659 BLAKE2B c50af928a84398969b7e57b00688ab13dda9ae3a476560222ba27590ded65d6a1eafbe79b2d1730a8fae8e714a7b39ea0b892808b46941e81a862cf02885ec82 SHA512 9081abb9b701b392d6528fc0242c79d72e145a2e6f620b965148e8bbdab7faad10034b23f8557ae16a08ef45b10ce9a9814e386ea0c5e8d6ed82daf710629d34
-EBUILD trove-classifiers-2022.8.24.ebuild 659 BLAKE2B c50af928a84398969b7e57b00688ab13dda9ae3a476560222ba27590ded65d6a1eafbe79b2d1730a8fae8e714a7b39ea0b892808b46941e81a862cf02885ec82 SHA512 9081abb9b701b392d6528fc0242c79d72e145a2e6f620b965148e8bbdab7faad10034b23f8557ae16a08ef45b10ce9a9814e386ea0c5e8d6ed82daf710629d34
+DIST trove-classifiers-2022.9.26.gh.tar.gz 15029 BLAKE2B f1a6dbee8dc03de54d4c5a9b61ab8493bf8ab8369d3ca99a1505459eaf4383f07246320d46a4aa2b75f2bae835932d28ed45ac983c47805dddd2c7ae3d86f647 SHA512 32fc05d993adb7c6056153c9250fcae519aae47f9b7b38a41c4bfec2f304d4bd1a7655d709ea387b887ec6a5a33b31b8dfa6edb112fb91453f8d4831d16baf98
 EBUILD trove-classifiers-2022.8.31.ebuild 659 BLAKE2B c50af928a84398969b7e57b00688ab13dda9ae3a476560222ba27590ded65d6a1eafbe79b2d1730a8fae8e714a7b39ea0b892808b46941e81a862cf02885ec82 SHA512 9081abb9b701b392d6528fc0242c79d72e145a2e6f620b965148e8bbdab7faad10034b23f8557ae16a08ef45b10ce9a9814e386ea0c5e8d6ed82daf710629d34
-EBUILD trove-classifiers-2022.8.7.ebuild 659 BLAKE2B c50af928a84398969b7e57b00688ab13dda9ae3a476560222ba27590ded65d6a1eafbe79b2d1730a8fae8e714a7b39ea0b892808b46941e81a862cf02885ec82 SHA512 9081abb9b701b392d6528fc0242c79d72e145a2e6f620b965148e8bbdab7faad10034b23f8557ae16a08ef45b10ce9a9814e386ea0c5e8d6ed82daf710629d34
+EBUILD trove-classifiers-2022.9.26.ebuild 659 BLAKE2B c50af928a84398969b7e57b00688ab13dda9ae3a476560222ba27590ded65d6a1eafbe79b2d1730a8fae8e714a7b39ea0b892808b46941e81a862cf02885ec82 SHA512 9081abb9b701b392d6528fc0242c79d72e145a2e6f620b965148e8bbdab7faad10034b23f8557ae16a08ef45b10ce9a9814e386ea0c5e8d6ed82daf710629d34
 MISC metadata.xml 361 BLAKE2B fd91e587a440e18c3030c6ae2992cda3d70ddb506eb78dfdff7b3e8b2d6456fd0cb13b56a7cb360bb80cdb38686d52938b5d6e9d873071e20a0802b11836181e SHA512 d34a508b050c6f1148e8ff6175b7f5f3dfa8aace0be8c02a01dae94b3824e7c1995deef16e5ad518e4260f51814dcab5f2afbc8b13126b1babe117746bf99ab7
diff --git a/dev-python/trove-classifiers/trove-classifiers-2022.6.26.ebuild b/dev-python/trove-classifiers/trove-classifiers-2022.6.26.ebuild
deleted file mode 100644
index 964617661415..000000000000
--- a/dev-python/trove-classifiers/trove-classifiers-2022.6.26.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Canonical source for classifiers on PyPI (pypi.org)"
-HOMEPAGE="
-	https://github.com/pypa/trove-classifiers/
-	https://pypi.org/project/trove-classifiers/
-"
-SRC_URI="
-	https://github.com/pypa/trove-classifiers/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-BDEPEND="
-	dev-python/calver[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	epytest
-	"${EPYTHON}" -m tests.lib || die
-}
diff --git a/dev-python/trove-classifiers/trove-classifiers-2022.7.22.ebuild b/dev-python/trove-classifiers/trove-classifiers-2022.7.22.ebuild
deleted file mode 100644
index 964617661415..000000000000
--- a/dev-python/trove-classifiers/trove-classifiers-2022.7.22.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Canonical source for classifiers on PyPI (pypi.org)"
-HOMEPAGE="
-	https://github.com/pypa/trove-classifiers/
-	https://pypi.org/project/trove-classifiers/
-"
-SRC_URI="
-	https://github.com/pypa/trove-classifiers/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-BDEPEND="
-	dev-python/calver[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	epytest
-	"${EPYTHON}" -m tests.lib || die
-}
diff --git a/dev-python/trove-classifiers/trove-classifiers-2022.8.24.ebuild b/dev-python/trove-classifiers/trove-classifiers-2022.8.24.ebuild
deleted file mode 100644
index 964617661415..000000000000
--- a/dev-python/trove-classifiers/trove-classifiers-2022.8.24.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Canonical source for classifiers on PyPI (pypi.org)"
-HOMEPAGE="
-	https://github.com/pypa/trove-classifiers/
-	https://pypi.org/project/trove-classifiers/
-"
-SRC_URI="
-	https://github.com/pypa/trove-classifiers/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-BDEPEND="
-	dev-python/calver[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	epytest
-	"${EPYTHON}" -m tests.lib || die
-}
diff --git a/dev-python/trove-classifiers/trove-classifiers-2022.8.7.ebuild b/dev-python/trove-classifiers/trove-classifiers-2022.8.7.ebuild
deleted file mode 100644
index 964617661415..000000000000
--- a/dev-python/trove-classifiers/trove-classifiers-2022.8.7.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Canonical source for classifiers on PyPI (pypi.org)"
-HOMEPAGE="
-	https://github.com/pypa/trove-classifiers/
-	https://pypi.org/project/trove-classifiers/
-"
-SRC_URI="
-	https://github.com/pypa/trove-classifiers/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-BDEPEND="
-	dev-python/calver[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	epytest
-	"${EPYTHON}" -m tests.lib || die
-}
diff --git a/dev-python/trove-classifiers/trove-classifiers-2022.6.23.ebuild b/dev-python/trove-classifiers/trove-classifiers-2022.9.26.ebuild
index 964617661415..964617661415 100644
--- a/dev-python/trove-classifiers/trove-classifiers-2022.6.23.ebuild
+++ b/dev-python/trove-classifiers/trove-classifiers-2022.9.26.ebuild
diff --git a/dev-python/yamlpath/Manifest b/dev-python/yamlpath/Manifest
index e5ce2eeb57e7..41cf0ad96967 100644
--- a/dev-python/yamlpath/Manifest
+++ b/dev-python/yamlpath/Manifest
@@ -1,5 +1,7 @@
 DIST yamlpath-3.6.4.gh.tar.gz 216016 BLAKE2B fc6537b7c80ecfb9f69c646970e43935374bb105df007c123cf837eb1de6827ac2cc443294b69500c966ea6bc5d7f56498aec13340238c7660118f17cc6685e5 SHA512 eb1ac0d5861818f4f4b57b07f9fa7f758846982abbb3ac4ec58a1adaca8ec36deba1e21ce3e13916e74a946512f4d66e341a9d45392ef7133d0293e5fd6f66c9
 DIST yamlpath-3.6.5.gh.tar.gz 216508 BLAKE2B df1d849840356eb75d9e19a5b53ec94ce140d7474be2fde19ab7f438229d347f247ee3c0f25cef4948f71d95d6935aebc0f8e58bc869083849820f9d641d7f22 SHA512 1d80514516eb573b0c644af7eaab7211714e271cc4334db5d965e2da58f06d26b3cdcb8c1412d03151a196e1b48aeb0c0d5038364a09907bb2af1efa71dd71f3
+DIST yamlpath-3.6.6.gh.tar.gz 222605 BLAKE2B b8e4345e68bb03b9aa48f31813ead149a1e547bab36deacfc255b6d8bb62148ed11bed6495e3e8db14b48859717ee87386e6d740c8b33dbf16bf4923bc19bbcf SHA512 3699cd2af82c77b29de60d0912dd5fc858a7b10ac960a8944dd0566073a7bdf5bccc6378d5aa6e52498482e51aa00cb2cae53f2a089308617d1358d744b5efcc
 EBUILD yamlpath-3.6.4.ebuild 1151 BLAKE2B 9cf93439ae4046e2b1b279804a7c434761048fe54de1142c1544e876cebf998ef1bd45f0b81a7f9cf8126cc68a1a8f97cba0a606ecc27542bd793a60b12583f1 SHA512 868e70308e51d795853c6aff2453626900e21f699f1a167fbe09490d02dc80ee67ef2caf193d2a1ae88dbfcf246796bfefda562d40e04c194ba3667d0bf9863a
 EBUILD yamlpath-3.6.5.ebuild 1156 BLAKE2B eb66fdcd37a5ebf94857f9b26ec435a39cb70d854ac015a9b121151765a41d4132de395aef370eed51a40992cd801900a503eb95c979d921f5bc87302a374c43 SHA512 03798242ce9f91e09eb4f38b2c11fb84248b8da886f32564f4a0c3c51565580d5b79eddec42701c80a201521b00a9e6094c3d4e6223ea6197d970aae08ea64f7
+EBUILD yamlpath-3.6.6.ebuild 1200 BLAKE2B c2768713f6ad90d0db96741fe8766be80d0a4dcaaa1fab4bc4460f5179a55e5fb7a244f7208406159794fe9050db7e701deec2b0d0db4132a202d9816a7f5146 SHA512 5cb129d6b31f3c184dbcca82bae8ac085350f4b92e93969baa880e254af69f8ef64ae1b65876b4128ebe2c6d7856443900ea19a9ca2e305f4f2c12b127be4478
 MISC metadata.xml 664 BLAKE2B cdf919f6a46dbc7ed8f2546509a623e0e784da711afaade20ec79b2861e8c83f54f755ce68ec2944bd0edb92f2e05b18a9c0ff93430c185574c41de2d789e03d SHA512 8020ca58f464e2aed71c01c29375b95dda238be6cdb94468a0abe50c7ce0270a42d723318f34cb4eb8728184cbe6769c7e666f43cffde37e6e9f42cab4d7292e
diff --git a/dev-python/yamlpath/yamlpath-3.6.6.ebuild b/dev-python/yamlpath/yamlpath-3.6.6.ebuild
new file mode 100644
index 000000000000..1517368d7013
--- /dev/null
+++ b/dev-python/yamlpath/yamlpath-3.6.6.ebuild
@@ -0,0 +1,52 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+inherit distutils-r1
+
+DESCRIPTION="Command-line processors for YAML/JSON/Compatible data"
+HOMEPAGE="https://github.com/wwkimball/yamlpath https://github.com/wwkimball/yamlpath/wiki"
+SRC_URI="
+	https://github.com/wwkimball/yamlpath/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-python/ruamel-yaml[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-console-scripts[${PYTHON_USEDEP}]
+		dev-ruby/hiera-eyaml
+	)
+"
+
+distutils_enable_tests --install pytest
+
+python_prepare_all() {
+	sed -e '/ruamel\.yaml/d' \
+		-e '/pytest-cov/d' \
+		-e "/find_packages/s/()/(exclude=\['tests'\])/" \
+		-i setup.py || die
+
+	touch yamlpath/patches/__init__.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	# install and optimize yamlpath/patches/aliasstyle.py
+	local sitedir=$(python_get_sitedir)
+	[[ -d ${D}${sitedir} ]] || die "${D}${sitedir}: No such directory"
+	insinto "${sitedir}/yamlpath"
+	doins -r "${S}/yamlpath/patches"
+	python_optimize "${D}${sitedir}"
+}
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 38a6d8b35886..cce87dd0457d 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/bingrep/Manifest b/dev-util/bingrep/Manifest
index a19c87393e8e..eb1b42a83179 100644
--- a/dev-util/bingrep/Manifest
+++ b/dev-util/bingrep/Manifest
@@ -1,84 +1,82 @@
 DIST aho-corasick-0.7.18.crate 112923 BLAKE2B 4f6947d1aacf89ccfab0592cdc55fa61ef09cea38231d3f758765dbce328a810c0b588be4ba96e81d64955379ee005722d22a7aec39caea6e72342245d7ca34f SHA512 7a23b16231a90d23ee60ad4c81bc225410599a4560d33d3a203138fc540c39cf1000100fed3aed40dcc371c3635656a3792545dca5dd1aefbde00d8774eebd00
-DIST anyhow-1.0.56.crate 44780 BLAKE2B 142a2c02e51dc6fa2709d349881aea404b14dbdfa379ddd6a99672df4977dcca0658897c9e9881e291fb56f5b522cf2a0e2da12afb7038d0929d05f436ff68a9 SHA512 9dc8233b87f8229676ad08903cc1507370588d63702c10bff3426d00ce10754744477d5ba3396c94e7128eeef12c647f8f042de8cc6d1943c2882785ac7ebab5
-DIST arrayref-0.3.6.crate 10035 BLAKE2B 88292fa4b3ad4fccd03772c2f0eca04cc13373fe094358bac57d7523c256d89f3087603e5bcb2a0b15d8b2ecd48e904a822b2cb800276a9c47ad6c6b660d9d34 SHA512 368341d00706c1250ff081b0d99c36c9af694a62ff4f4d8c837234340295771ca49c5439b24b6e1a4f2c3c5821764e98881dcb22d793f83de632fd5cb457671f
-DIST arrayvec-0.5.2.crate 27838 BLAKE2B 51e2eacae0ef148f3f52d21ae00794e540e7ce4c013fb496dd1347ad91ffbbca199381fffbb064225f829216f6c5e915edfa64833f91fabdd13c3f011d86491f SHA512 1896b5f64b4dbdcff8ad234bda4ea8129bcacf87839347304717e94ee9f369cf5f4371755e453ff7d72817edb8f7fdbc726d77cc4f28ed05148dc89c7714b004
+DIST anyhow-1.0.63.crate 43461 BLAKE2B 6e98a34c151493c032ce236ef1be389616ac6668974e40cc013316be76493ef3c5720555af27f26d301b558413ff27e7f59f7acb6a8d98609644d77986669798 SHA512 41ae7338ba0505cf43b6c8a36b54e5714de91dc2c9c8fe5ba4272fc72ee30c9fc205bc1a63d968ce68b68a556c5307597c91b036e25f71f93b3245303f636ec7
 DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9
 DIST autocfg-1.1.0.crate 13272 BLAKE2B 7724055c337d562103f191f4e36cab469e578f0c51cc24d33624dea155d108a07578703766341fd6a4cc1ef52acda406e7dba1650d59115f18261281e5b40203 SHA512 df972c09abbdc0b6cb6bb55b1e29c7fed706ece38a62613d9e275bac46a19574a7f96f0152cccb0239efea04ee90083a146b58b15307696c4c81878cd12de28f
-DIST base64-0.13.0.crate 62070 BLAKE2B b957f65cdb1e28baeca0cefc92fa98be797409b7dabd15e0e88db6cdfb89779b662cba9f2270fbf3b7b66948fdc46c118b8040a78ab72049c48a928fa802bee0 SHA512 991a72999839daa232f508c5b24e7d3225e8a26db8d1d0e747881b115af9e408b92374e163b31e0b0d324c1c2e57e8e38d66861b61eb0a1dba87bb5871940151
-DIST bingrep-0.10.0.tar.gz 620560 BLAKE2B 2fa48cdbf1b870e05dc98b64898c1d74844a69c1950fc139ac5e6d1c06f371075afa98596aa5287c24a6738c7fed9e7bee22696544bdb9d7dbcae31971db9208 SHA512 1b9aeabffe3c4619495b446ec9c9d5505126294502f2f62f09aeccd9fea91ef64478aa331373f0b1a65d56bf369ff2ea73a01bb0dc272cdc9c3fa244301e6ca1
+DIST bingrep-0.10.1.tar.gz 620969 BLAKE2B 123241e0899c466ae3eb61248fab3337947aab65409b101d9c9f03f89c984664682b5cee0ee502a81c031e982faa51790c833df8718d3364ebe207092b004a51 SHA512 7d687590274eb2856f4292e375066ec11ddaebd85cd16451f97100bb06401420b9cd1064f15573aafca6d0645b49545449d959af74e37644f5059016c8ecac21
 DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62
-DIST blake2b_simd-0.5.11.crate 34096 BLAKE2B 480fc200ce3fa3bb364ae05590fe26f59efb6f81fc2fcb7ae1593671677daa6f1b526d800099d002239e2ad435b919e9b32778021c0790954383079a49a90965 SHA512 4a7657db637869465637cb9a65cb82e7a119c554bd4d532aaf84f9cc77a494fda07d07db89c73e92e5bf4844bb1be53062fc61120e839e414e938e487e7f2257
 DIST bstr-0.2.17.crate 330350 BLAKE2B 90c3a48d78b73d7e36a3da9fda0beae6e91ce534d17198ea8ceee0b613d03297f9dd8bca30e1ec5da01d1da359a1da72b2c2771b77c82bebab5006cafd665192 SHA512 883eac8210d14f89517b4dd5e25d02c97cf31602ec74498b5e186112ba0f154d47de8d1c41a8f4e5503f3b53c064e2c976b60bbfd63fc28b186bc006e00f20c2
-DIST byteorder-1.4.3.crate 22512 BLAKE2B d39c546ba7346df315297fc53da4bfc77ecb1f38567ddb788549ee31cae2719a8bc0b7d1f1705abb3cff033aa57af004987d90748f5a31765273b3223a011c0d SHA512 8c8000eb8ecf40351c9ce36a3a8acd7a02f81786d1b11aab85adfeffa0f2267ed74df29b2ca5d1d38128484d1d3cad2b673aa0d0441dcd0620dfd3934bb888fa
 DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
-DIST clap-3.1.6.crate 202211 BLAKE2B 9fbd6d5ad8442118716e01c10ec9388644ef6e5621019a1245ae937324265b96d50aa70777d149daeea6f812ee05414623f938a056c38a201d9f6ee0b98bded5 SHA512 397c277eeb9acafc1098f6b6aa7e428cf7c7016356a99139dbff66dd6c6e12434b14a457679fd99ea50c1fb0b54b9b96bad65f1198025986835810484e542824
-DIST clap_derive-3.1.4.crate 25358 BLAKE2B 05f5d65b6ae800ca6172d659d57e08e8dfa0ee741b41f285efc5aac71e0517b302a5573fce4cb9143c02257002a46c6855d9a45eb62b7b400a7ce855ecdb1640 SHA512 f55dbe26eb049610896ef31a3562c4229d5602df5ba7d4c061f13d613c58edeae8f7a183741d1d0496d0453ddfa18507495b26f4a8f98d2d4284556f5ced3cfb
-DIST constant_time_eq-0.1.5.crate 4936 BLAKE2B 882dbf33f20954205fcc5b6e39863db8969d184b697fd51ef462f6890c1a754e3fae67bcc7db685d8cc26abe6e3871d3b80aa542489ba9551a0c95a49f7a6dc2 SHA512 a4e0155a7ad72babcfd418d832d362b3fca7333aaaf36c246b00e948983837c3c93378b86e37c5fa7626fe137e3b6d77276ccc61624a7f4ab914605905a88a01
+DIST clap-3.2.20.crate 214114 BLAKE2B b8bf14d5b60ac0a1156718e2993df45bd867519a195414de591ae92e009930121c674bd53ce8e5cad53659a1b9b72810a7cbbabc92d3552b2131cf3836083a4f SHA512 85a1aa5f777a172aca71459225d72282fc7f21122ad7ade496a4734ffdd140476fd73d67da900fe323dd6a72d09401536e318b9654674a9f4f61dab822fe54a9
+DIST clap_derive-3.2.18.crate 28208 BLAKE2B 05a23083a8e792858819d7eebf057257b1d49b0e8246d3f24c6f812456cbabfc75d9271c295a0d44539bd531ea6808ca7490e787c1fcae63bce045422d33d280 SHA512 d5349b3d5711bd4900173aa5210d7c4aebb0bf70128e11f26b362f5acb43687f6ce5ef73e4d614ce9c1d649d34b68ff15ab8b65fdf1898fd295ee4b4a7523497
+DIST clap_lex-0.2.4.crate 9652 BLAKE2B 5120b508dedf52507068c0c369a45ddfbe0369e5c05b65bc5a78c422b2a4bf488f9ef1e0bed4e335450f2c08b80148eb5f7efed678039b5a94b5bd666385939f SHA512 6c05e5fd850befd45be9005af7252385f2304aa28a107413bbe329d97aea835f7acfd0bd169c99f69f466ab93d6e1c35d73a4e48343457a06fe2d6be5bedde0f
 DIST cpp_demangle-0.3.5.crate 75313 BLAKE2B efabaeafdd730bcd85d7e22fec3ec014c0f15f0ab7d7eb939c9abaad5edc51696d4cdf6551dc933e76596eb792cb214644bbc4fbc4ff373fcd37af8b18bd6a0b SHA512 ef59cba0cb54cd12232fcd96dc5734b5997ad6ecaf4e86d7f6cccf56c4c18a6cffaa1f6eca46a8889f5a0fb3ea1774495364b698cfd27caccf99fbbaa08d3378
-DIST crossbeam-utils-0.8.8.crate 39681 BLAKE2B 2b3e64bfcaa044a9351c1cc8e9ea53fd68fd0bb9875ae523e0cd309a85ad23b340267bdb742d363b5d99fc065ed74f6cbb3ad1e33dec7d14d99ec458875e7e10 SHA512 ab960afdb82863160a3fa1c21c64b35b3112725bd72fc8e0724175937f4b23d0628253032229501938cd86a8e406a59c06cb44e8bdf34619de781a84ebb46ea0
 DIST csv-1.1.6.crate 886999 BLAKE2B b178d0419af671df570f37a4d054391bc883085b0cd3949de5e967aa4ca323fdadfd8c5d91eef1e8882ec112a1111cf255756eace3c7421e455ea2b6e01cb600 SHA512 81dd826f0ee85e7d335d844e9f9b4d2b66f7076c517d8050ee2e35721bfa4ecb8a906dcd9671b1c5381a968dcce0949202f1afe8eea535b6d215363d4f5be6fc
 DIST csv-core-0.1.10.crate 25668 BLAKE2B 8e9a56c26e75f4c4c9e90a21cc30c60cc3fff17515ac93bc858e8ec45e130df2ecabafa7c513b2d2815269fbbd98c418269dfb1bf1425d2fd32fe46823cee6c8 SHA512 2a269d050fbe5d9e0f5dcda2de1e84bfeb69538dde86040ad1ec7307a214eed813a1482acb5029a51f18126d384d5238355e021964e47811db971a0821bcc328
-DIST dirs-1.0.5.crate 12908 BLAKE2B 0a5c1428087adeca310d7db53850ca0ee4b27df34a7629f13ca0f3c69c019c0ca2339949022317ec55ca0be35aa721e0a9040d9c9d011e1516d99772ccf8f730 SHA512 12ebc3e92511373b11c2b7913b7bf74f8022344758057a2c71e36ec262e7ea6ac386bc75c323317406f1b25e965e047ddb308ff5017a1e607b48b978414e7416
-DIST encode_unicode-0.3.6.crate 45741 BLAKE2B e1e3792bc2bf9db7df33a516d0d755eef5eff1249aa9b2fd7f0dfcb155786c566fb619c9b2d73425a8625c8593988b117e9676c341f65e8795ddc838bf9881c4 SHA512 64193d6ac75f66d58ed864169b5d6228ede36dcf100614395e086bc8e847a3ddd287734d88e8ed50f38c679a99c80ec68449175a67d8ee03b02ec1cfa9d55e77
+DIST dirs-next-2.0.0.crate 11689 BLAKE2B f5022bc51dd50bad4ad0fd05b159a4117aca47afbea66dc42c8306ca58f3a550165afbcf9f5f721ef5ad8d357eaff305c6f6e42789354a910d5f1d05d3b7b7c6 SHA512 6ccb732da8ccf7bf35952c22a3b0caa8238319feb0a6cd3b0957e6be12548a2ce507c69cb6d3cbd2adfb37e13e6521c6229da5999edb0e47a292a41c3ea1a766
+DIST dirs-sys-next-0.1.2.crate 10681 BLAKE2B 71431533dbfd6016cc309c14a842ac8d43577abe768e69bd2caaf7d19d743f3ca95b9b0be1747077282089c64485f3d4e24bec8e56d4d883f25e494d328fbf3a SHA512 b3c40a8e93d4f9f4a890718076e14779aedd67a79da61b466788268c1eaea19aa493f043a7e410f5023a23d5509e639a6fc6681fbee30e252a601091cfffa2d5
+DIST encode_unicode-1.0.0.crate 56986 BLAKE2B 76e8915408c26bdc909e9ff2d59a1655344dcb4ca0e6accaf038434b7518f1b86554954fda8c7874285924c7d16cc81f62e68afcb8b0efc639407b558df1470b SHA512 c9a21d48ba9d50750789cb6fbe32afd903c583c9ef05a9741007dcdf64b1344735f71dd882ad71ab9e5f96f8839578ca53bca14d13d57b9e27b8cce2cd507359
 DIST env_logger-0.9.0.crate 33573 BLAKE2B b9c22205ee60ba97da0d338e1d40dda989f0d766d9ebc60e610b53db882a803769fb3c093348c031183856e16a5a948342e09551953f0b98cd73437bec658bee SHA512 d7db85d2f7d16f7f97b6714e01e342ab6b784c799ef26ee322ec85fcee28a549b6e49a49200ff78eceacd0c682e941f8538a497e2a2a196040769c2365feb566
 DIST fuchsia-cprng-0.1.1.crate 2950 BLAKE2B 8519407ab5d1f04d03cc946a07050db4dd7bc70e03894e35b9e66910a3be11224084a86ba45103fdec845e94b7ba4defbd7c5217b035a0796c0c4a94b9562cd7 SHA512 ea9f5beb0dfcb023c22cfc2b37ce52dfcf3a2cbbed0f79ffffc332878858386805c65dce8469a431002367562d857a6c064e075688540c27fcb4056a110059d2
-DIST getrandom-0.1.16.crate 25077 BLAKE2B 0cbe96c27e78100c181a064e5fe524efa9a7a267fe60f8336d2ae0125883acd5d575ff17d1d56607255d9b2c30cb9d962026fdea1a5c3c29a5e0760d27c3136a SHA512 c5450c522c07c7a38b326f9a9062bac7d089630219d577ea4b55abad4e0c31d17b7cde385fc43912dfa100b42334e7a52422c55fda8b738caae428c6f9addb53
-DIST goblin-0.5.1.crate 156923 BLAKE2B e71e22f276ebddc164ff326a2d819a3d208c3e449b0667b8b374a4810710eb5d8857280fcad2602b36b949bc634ecfc59ae01248626c2e5f6b21fa236345db22 SHA512 0bc3cf899adf42906664697503cb4633cd2af13a91a0eee85e353a6247b1874745f1f77fd1b4c5aea4bf78c6a94adb01bedb1c5b79604b06378d9a485c9fe346
-DIST hashbrown-0.11.2.crate 85713 BLAKE2B 402f9f1bdcb92631206f9b72923ee35e28db8623e87469c0f1496664bc7185077013ab3c8aea68268241e5b2504f10cddc613a350abd4291050deda6c112e559 SHA512 c21ca68fd49bbb741901f59fed04cc124b8da99e2a4dfc26e2e5e1140637872b344612a01691bd30cc771575c571be15f756c84dde225441699cd2322af2ad6c
+DIST getrandom-0.2.7.crate 28854 BLAKE2B 30c054361c9b1d9f95bc505e27e98d8cbb685f37c91437948d9d26f22028e0797a7c704d88912c1648b3704bfe10623a8c5e130e81746c8f85848b831771db80 SHA512 01803e609848662ad8650cf451dfc2c37580da0b7b5e0d4cc764da6ded253cf49ae42a433b1c53e89773bde00c1ccc136394e58ed4548e7b5c0ca7e202e857e1
+DIST goblin-0.5.4.crate 158387 BLAKE2B 192d0a3e0542439c07c78a598e2c865757e2182b4fb3a8d505f7a361430e451380e2b91dc55742b85f9be234d6a9c623da1079255ba7ab909541424342ab4560 SHA512 627df59babd5291aa6e37bdd529c3b837001c45d1f22f435bf50ba386e49a6bee93a428bc22d69efbd7182ba1b343985b6d2d8bf405e3c57e524206847d429fa
+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 hexplay-0.2.1.crate 10043 BLAKE2B 37251bd8ae4c5775b4671266b21441d9a21fa30dcfe95d6d0cec606bb114b5fde9ca25c8d1e5f316f1960b2e5e888c60bcd519811d7543b40a1fd0830ce01af0 SHA512 0c5097c05eb99f4cac11cba11143ade1446035d771104a676860773914f5d1cdbf921d56eb7ac15f00ba63233df03d6c64ae7823891ffc77bf268f6042671e5c
 DIST humantime-2.1.0.crate 16749 BLAKE2B e2ae8325b037fb175b9200cc5c1944ce579056c6662cce307beb6701894552362a25e371aad65f8fb9384945b48815ca74bb8b544a32e0a5845b7edd30b918c9 SHA512 3bf29ddd1391d82897c22baa0ff3ed58ef6d6959859f1f8ed54d324caba5b6fb4422e56790511ce82f902cd11467f93c8ab7fc7b0e0bdb719308a4d0a446ae0c
-DIST indexmap-1.8.0.crate 52583 BLAKE2B fce94d24af0ae74f8173dcdfd35bcc51a23451cdeebbcb10c92dda74312c1ec980e925020ba7bdfa9e4a54b72a619068ca7ae133eea66a4df8775595a3a3551a SHA512 6af44320a80c8256291cc6e3c90311ce67b7f69ce039d640bb3abbcb6057f16eb443a407060ba647d7b16f44214acf59b566772a4802ba5000f036f69ca82a43
+DIST indexmap-1.9.1.crate 54114 BLAKE2B 71e4968c85d5b3fac550590658f9fed72c754a9443221fc804efb97bd39b5fca7f894ee67f8d2c330bf212eb8a6b5c85879cd813ed56e3fc43a54f0bb689af5a SHA512 7eac99056123332ad38ef32eb65235c810e8b4d051d9b0ddd5582348c9cd3b162d36defe8e46a532e2066562f224e37fae94b52b4649ee9cfac7673b76a2513e
 DIST itoa-0.4.8.crate 11926 BLAKE2B e5a648b490908d0ffa3a0832342ad11264eb4357939bb39aad014aed3938bb60e82703b7e31929a458525061e9bc40539d33753bdbd722a03b6804e57dd1f70c SHA512 6911d269ff3ed7350e4f0dcfc6e9e0d70e25833e1e7cfcc57d5b8aff1f47b8be4f2e9baf1b92e5517cff63492be489b6d29b48dd9bb642e428acaa431216b68e
 DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
-DIST libc-0.2.121.crate 574702 BLAKE2B bae9215a7318e5b5b6d821d2320ce28e883d04af0bca40ede49b9c5d575d28307b07077b3d59be28347bffc4c69d6c9dd334733f0c519c16de704360f6fa8738 SHA512 aa1ee710b2a4008ead7118e85d7f2d29fab8aa0e1111436db8039a84737727b8d1a8a1cb72acd38abd2656d22a5025046d7be7d8154537f8a503017e0548e953
-DIST log-0.4.14.crate 34582 BLAKE2B ddfba35947ae1f5905cd9ecb9eb862a78af6f00ee8b8fe6258b369b140928fe677a02b1b3ca5bdec36ff2b16abd85a9f49688fd5f3d1ba2b2905e7f96b8a84c1 SHA512 796100167663d85a7bc4244cd305e9b3f0a1b1520764b63464698eb136318d0928c40c16f5d19d9f602a5bf769851275bbd48d66b088b0c37be7a6fb62def7cc
-DIST memchr-2.4.1.crate 64977 BLAKE2B 31479718c118093b684bed946eae0706d77d9d275bd49f5aeff4de490f479abd60c7dc462150eafffc6d6fc1da0853123b78be038826b775d2a41a4c39d93ab5 SHA512 d8912e3902a2126f86159bdc998532a2890b882cbb7d59b5a470fffcad4c32281e045f2fff48a235aa4189f1928866bf3d33b699d50866ad6b6c272bba7adb11
+DIST libc-0.2.132.crate 595317 BLAKE2B 1b1ae80e034d94468befcafd4bae4c41f29424cbf3770b827dd1d7099cd2364db62cf2e7343da5010e230a47fbd91d320b162f7b54fa3955fd195b6976c3fb45 SHA512 48340dd173ed4d487f6504f4c32cb3c13dac8ad4da95469c8dd79386a7564d258a9ca42ccf1b174154717bafc1d3551b87c8fe35f7e4e062c8e33da9259fec50
+DIST log-0.4.17.crate 38028 BLAKE2B b46be3719fc0a53e50b1f342762e188587e9f1ceb692c72473ce2663edfb8253742d30024e68c1444780ab7fc0e2d5b0601b8ea7228dc3405a9342a57548e605 SHA512 2477d88db42b1d92c30708d88823212e236f613b3465e85eb425f83f8d16fadfaf0352f06c2999a1852102edd2f6ffb10ecb539d8a3b6c48f552a25622ccffa2
+DIST memchr-2.5.0.crate 65812 BLAKE2B 57966413a1f933dcb2d2d4ccb29c247070f65a83299b2a9f5aa83f5a48a5c5f1c4c7c632fa63bd19f9508e9291e7258db2f16e2813a56fd84e0856f70f1e67ab SHA512 444a163b484c233e78c0e2e4d51f01ce2da93d7d29f516a95e4b0866b20bdfd3f34137653abed53eb70387991ee3e2b5937d8d4360a85bbcb50a93005a75defa
 DIST memrange-0.1.3.crate 14013 BLAKE2B 61a6dd89d36cc88bd79d225f1ebd37a906ffe6710e7f93467307b8f42c638642903ad3469fda94166a2d4ddbab59378787c04098748aa40f811947b12581b35e SHA512 343c006c52c6679099b41d0debb42e1241a1b4790ac3b606d90809bc4515dcea5e7759db97e486de191955fda7801ef70c1db5daf5348c219948d21e139c9811
 DIST metagoblin-0.6.0.crate 3052 BLAKE2B 0b8646ad26877367e35a9a8b5091af0fdb2d841e9cd10d94a6201e5dfd7ef7b7223972cbb086afbbc3d12a655de19c6bb5f112895a93bf4d18d8f2aaf0a1ee48 SHA512 cdcd96ad57e26b20162ebc4a1eff75eacf1bc3ba6603adb5c12ced6ff8286468ca6417a64c1bfd5c61b5ad1a67bebc0e55c997c2f22376a440a8a28230b5c677
-DIST os_str_bytes-6.0.0.crate 21046 BLAKE2B 9d2a9f47aac852ca2e27e63a22c7267e1a4affde2277d50e128b54f377758322f07ca7263478c39c91e11a2b32b0e7a5fc5ba1b31e0ee014b412a4151642e605 SHA512 d2d3741a1190092cf251e035d2c55a7d022d99512160ed4ddccccb44ca85f664f94f8a937a76eff88581b593e2ebaddab6e753009f3046a8a2ebf451418e41d8
+DIST once_cell-1.14.0.crate 31614 BLAKE2B b9ac8f889c86d4160ee026fca20b5135aa7bd60e8bfaf23946d003bcf0b666929a4da5859d874449d15b6ba0ec4c26e98273d020be50184b9d44ae90b8608175 SHA512 81531f06f32854e1794555e10ccd6ee2b6913bfefdd9eed52dd44a02e799fa6371cdf102cc67bc70d581a0cc4abb7dd16c9c12ede6df4ff38b20dc5908bad186
+DIST os_str_bytes-6.3.0.crate 22928 BLAKE2B 84e8197375742373bc7c7a3b459f8a9f97ffa0b8a2e517bee0d8ebb420a8509056cf56984612f44171c6b5e219b6ea91b14134fa6386b3cf3502b13ab92386c9 SHA512 34f861a15543933c9fcb560a835bd943231ffcef2c68126d8633f8e792d2d59a20765947feddb0c795a15329d74260d6c2bf74a1f10ee88f355f47240acbb42e
 DIST plain-0.2.3.crate 10664 BLAKE2B b0ea38fcf6d4f4e3ff91d572b5639f01eac4f19b2c451d27bca49d994a07c6f46118cd58a1b86b3d2a61b7ac9e17e8236f1cc98414738d8c86086d37e0fe4d35 SHA512 6909e4b4b4a0a49e6a226d7393b121ec04beb8a13b1652c23337eb09b3c2e5f202b53a7663dfe7828dcb32c3d18135b514e9a982967c188e127a63b6cbeda252
-DIST prettytable-rs-0.8.0.crate 29000 BLAKE2B b214efcb12d0fcad44763b75e89bcf21923cb3a09764314cbbdb7f8d7fc585550c86ce77e1d97b1cad65f5e72554dd07e354c97aadb415b87464e6b4868bbbe6 SHA512 67a4e7eec303b44e084d80f66ed3c07450fae3316c824da1043a7e348c6895cb30807dee83296e2143405fce8360d77117c8755e8450bac0a4981b6ed102ed35
+DIST prettytable-rs-0.9.0.crate 33646 BLAKE2B 6fa110eb2b49803870a9355a1d6eec4c0b2d337d31591151130e5d3841666a114572dd885f977cd427175c5b680e4883f71f8d985d7648861b94e7338c9b0c6b SHA512 eadedb87f40afd35b98ac515dcf5895777c71a10a98587c2cb48c61e76bd537e439971e5046e5b7bc5f619d5958c7881a7bab36810553a31a0cd28f88cc4694b
 DIST proc-macro-error-1.0.4.crate 25293 BLAKE2B ef918c5efaf2545ab38787c8d0c07315af00431139e4dff66346bf798e3a429f91d12a79776c150412fdda0b158a72badd5e1044ac4d6917f8482d4b5a7110b7 SHA512 8a47bc9d3e24e9561d1e384d8f5a633284c2cf9b5e6733c5f9d1dbfe1870ccc8e2152482852e50b551cecb68e009148585b910ffb0508a7b4875598eaf8657db
 DIST proc-macro-error-attr-1.0.4.crate 7971 BLAKE2B 98e2925881c2be186e22c2c439697e91d43f807eb61a5d13e3b0b4321ed50a74f3d699942c04b89b6fea0f156bb5d19ebcf22f9cd4b98a7e6917c437600ed823 SHA512 2606afa9ec78d7dad4500c98d3a5ecbd02c6b53ab829c742bed7f57b322a95238ab4e01cf268746815f1424fd9b02eddfa30e72f98c66106f57765f3d3116495
-DIST proc-macro2-1.0.36.crate 41411 BLAKE2B d7d99aed41080b65680736d92dd027e21c9e9e0b03601915c000f5dea8f2b2d9126b116af32f2fb04b4fa407775f0131423055d0b62fdbfe87fa4ba7ec098beb SHA512 f31b0f2356af2746321c4f808ac9af87d21a5657c103ed6bc1383855e40caf49246cc8ec1edff58eacf193424abfc2163148b7298e527714e65e602f14b2e50a
-DIST quote-1.0.16.crate 27566 BLAKE2B 3352f4ed2158cb8d29947d5435b7414ed223088887718f9d258f1f5d555034a4fbb79cbfb3cb772be4868be366853feabec777fba7f275ac36d8091eb3b371c7 SHA512 489f4dcaa8a8a2041b39fc8fc815fa7943c0a456881283398e4eb65f7b50f220a6e5493d60d1d5019a48b189ca217fd8c62056b552bf94b9329ec963cce01c74
+DIST proc-macro2-1.0.43.crate 41512 BLAKE2B da0577094cb0b8b419f3160bab6342f97865b01337be4cd7a344d4dea98fc2f8905dd05a56427792379f59565a25f8e16cfe4a37edb3bf77bf2e703f27953fdb SHA512 3139c668dbf593afeb77b970c77edc70f7b46b42d80f1d0e30773dedb14ab98c9eeca0dc953bc940610954860fbce663174ea6c270b8711db45aef4d57f3b910
+DIST quote-1.0.21.crate 28030 BLAKE2B 547344ba9272874f5fbb4bd27a69ef5be99823e10e1318afe71971b18f37e9c73d54168f16efb82c53a332e4874c80a82ea951fb2c85fad50cdfe783622b79fc SHA512 0728eb4df7e1f7c4d32ab08c901c2c969db8eb46b03bcec3e4956a4f6b360939d32abc6b6ebd7a31058e8e9b69c3d995a24cb484f93656f05b4ee963be1c74fc
 DIST rand-0.3.23.crate 11318 BLAKE2B 5ad9b187fcdfc515c606a73bd1e9aa3215e367659c35a013c9d4d0f80f9832331dfb971ca370a627c0a2afe2b8860514740e00b1d7572e221a557b5570cff6ff SHA512 a4f46fb7dfe39677dfc112eeb56fb3c28cec4cdaaf95f336f2a494f0b2b30fdf22ceb9ea956f90e13c7ffe711a68aef9fc1a80d9a911d93221ae263c243fb2c3
 DIST rand-0.4.6.crate 76401 BLAKE2B 5593ad2d7fb8214d917e2eb734f5eee548f48fd699c9fccc0de9c0c6ee49803a426492a25fda2ffcf844169e2bca00709d4dcd9ceede72a4667ec431f5502fda SHA512 a91c6da7188b426bf9cb832892ee2af87c4cd65fad505c34e9c63343da71efe8c0c67b75c405dca5345317b7940d1d0fc0b20be85afd6b3089203e5698d86f0a
 DIST rand_core-0.3.1.crate 15483 BLAKE2B 2e09b3b3306514c29bd7588498e79be7353de656d8cdeeb4dfc6a1ad092f15a861c2ac20591ff71f7f60d986de9a09c860de4a9f06799f04e736b31bc70a5fbe SHA512 5a7ae601124502bede760fd3179c2b28059ebc3b5983bfcb6b8fa62fb58df95cedc1aeb2734e792d894dfa4620801c13c29702f9cbee64243121575d4b6b9114
 DIST rand_core-0.4.2.crate 20243 BLAKE2B 22fee5e44127eee047ad8abcd9dd828befd0feee77ee9a0bcd4dd42174b1e650f2a19f1f3b39fde937e58c17afaabf7231e2aabf214c2eb22edf3f85b73f6eec SHA512 f7ae3b690e2cc1fbf2707ee04b752bc5472433f737ab581f9872f7c5660966bc6be45f0c5d2cd8771105df6d4a9d206c55f5cc6ffc1693b46e1ae03a2883b028
 DIST rdrand-0.4.0.crate 6456 BLAKE2B 330ee64d998a0358f95a3dce50b3e1bbda531a3b613db7e5ba4038a1cf7191b60be3a0f33416e05380c41040704ce52727928915e9d2f4565d39984d1c86fcd6 SHA512 6476275d124bee28747191471e8d8f321a3b1c148c1f2a7ece4175f5244a7de90afe5f99d2eba5244d886b92e38232398864bf90e6d434b09494533942c8d894
-DIST redox_syscall-0.1.57.crate 17087 BLAKE2B 88e3ffcfd752e757f8fadfd4edca367f9185f09e609c329bb36f179183cf103dc182aae701c14afb717d2b4c3d72ba307b49fc671cc97aa7c9d03df1a7a1835f SHA512 c6e187087060084b7173ed0d9d0e982e4259d4f76522112268c02ff20751382e3bc8e119da6153170f5c54bd5b9cb028910f2f85c1c842099205dccd44659184
-DIST redox_users-0.3.5.crate 12644 BLAKE2B 093141c98164163dc66378f2ccb48a5f478c5b40b69ad4ecb89fe8967e4a309974088ea5f7a2b184b625fc03348f2e75b0809d3683696e9b74d5c4a5ac6a4e8d SHA512 d90f1816205a4f2eca59397f6866e5cd965af652940f56930f8bfbe2b50eda75cf78b09200bb69416a35cbeead3cbd4de354805568be2feef1ae4d691b9a6a3c
-DIST regex-1.5.5.crate 238119 BLAKE2B 175cec668da4321930a070993feb1671e14348b78e8b432f9fa25afd764863ff233b0d1d8931951ff99a3b5bc2e18774f68a6c0a4e31125ffcdb990b5b1b009c SHA512 a5873edc75a64f03be77151c318bc90c7dff565f838d811f5973ebca2e86247efd58830b0a8ba41e372f5a72f5402d93873f8d34c36481fa4359874b2fa5d571
+DIST redox_syscall-0.2.16.crate 24012 BLAKE2B 9497a52044458b1435ea16e86ee072e379b6b11ee31602ea72d6b6072a4a99426f409c2e58108a4e9c36dc193fa49c83951e71f4fd4e158eafff18c594dc01ad SHA512 63b5d876baaf99f5cf737679bc6ac7a9e3d8a41aa93f5c59416ce7e3841e2513bff678773553cfe62fb452707f82acc384ea63aec932a31bf94679cd1caddd27
+DIST redox_users-0.4.3.crate 15353 BLAKE2B 5e3b4e902566620cee8856c092cac193366ddcd2f5aef787b1d485353a0da11486ae1359dc60f3c87a198cb68f93ef99ac7551cc2315412b93b10ffb10540633 SHA512 0d3366e23cf93e1b0e025a29025eaebfcd1145bd158e2663b94fd952dc2d8a25566819e3a03c4136ca16a6408d37396e2ead0814c3f0c2bb10334dfd0b838fda
+DIST regex-1.6.0.crate 239329 BLAKE2B 646405e681ce572ebe2dc51a3339f0f8204143f9b2b8f8e74a4c80379c43c3581363ad347610a384d5ee831cf1425f74ddd944a658b1da2461e8068c5521af69 SHA512 b4861c9cc13d6fb224f67057fd3522f04576591b3d7ae0d3581dce42ca2b2bff96860cf2a7f4dfab00e46a1d29e6473f6723c4aeb02e34ed6d5f205b66f07876
 DIST regex-automata-0.1.10.crate 114533 BLAKE2B 0e357229f6825f14339b1d7c40730b83e62bba12115d01ed20313320766e769a653a2fcd2c9d19af51a82c38e9e42c1a31d005e1f44f5b6fbb3ead7c9c74027f SHA512 56d64da361afce82c6cb49e70b99ce1fca3e1969c54bba5f9971db135f8544c65f49feb8827789947b3d1dcefc9c49a7a434a7ffe0d09c5900345a1733723c5f
-DIST regex-syntax-0.6.25.crate 293293 BLAKE2B d5ca0dbc26b03c6a1818026f9a69cd226ec934e7c64094d0ebe843052b648617ffae7aa3a074f8da46d03c46996d8b547d8916576342000bd9711089b3e57d73 SHA512 a3d31f82aadc6be1796f76c03152ff24f37fe42d6ce27fb98e2f55ab102f86502bc37ccd563f6e0eba61aab20d002184c618517b678b3b93cb8f0497cc046ca5
-DIST rust-argon2-0.8.3.crate 28313 BLAKE2B 2d3468c7b5dc027fbbf6ceb264d77f4ae9b03526e0634c645ffd32a4c87532f5a84c224c6c39a15c9e267d268b187ec65210a2edf7df8294913e4958fbc83352 SHA512 f336dd3f90e1a49be107b641f9e9d513b6f8098dbdd1ab8aa2bd1fae329ce6840ad11a902b599922bef45d96ffb556d52b57d61218271bdccb7c85f9fe1da033
+DIST regex-syntax-0.6.27.crate 297300 BLAKE2B 4ca1a2e23d04e29c5925085ea4ab7ebcc398dfe135eacaab1e686aa8be43a110a28e8bec05a6910183f9a6bb1fd0d635fcb1a60b5a6a03fed4d2cf937a542a5a SHA512 5cc705a5dda08cbdb4dbcf3fa98763cadcda13d9c3ba407b35f3e88d77935efc2704bb40b3fb5aad7dfbad0df43bcb4c4cad9732defb954e2228a0739f7c37c6
 DIST rustc-demangle-0.1.21.crate 27920 BLAKE2B 73ada923b9b293c5a9893f86fda0586139afbb7d56894cabbd70612d1fb0330a9e491d5143fe3498a0c8d3e1a3f8e63c14b20865926e4c831915592486ae32d0 SHA512 4031b26863a726cc6d3398b48682e0f0f9e5665abf20a5d35343a904ebd7c0d3752dcdd3a049b2bfa3e2a303214dc39a2980700bcc64464f7029be3c7f34727c
 DIST rustc-serialize-0.3.24.crate 45926 BLAKE2B 11dee8dac7eb007067ee0eb19d122bf45d912e6cefa95fd5ae3db7a4585a3f37e66b123c8c7bb761cc451b402cb9191dd5c974618331bb9aa9efbe9215115abc SHA512 60b40a0b41678287627cf5898e0ff6ac5668865f1ce5a482190ecd7539b59a955a73c675fedac76e68a5126efb92ff0cf1d1b4f24359a932463434bb76d9e884
-DIST ryu-1.0.9.crate 48391 BLAKE2B d5c1035ffd6340d846009953cb4303fb8c250a3a6ac60b51a2fec77a6cb3648524420064b7380fe31af33c57011f950f6f739a1f0114196675b3b5de4b54efc6 SHA512 4e7c2c7ec73da1ddb32e18d36b8159cb4047b9f4feeb975361e7ba68135e671e11419bb7786df789f5d08e5895231d2c98e36035b515f2c64ac40474d08905cb
+DIST rustversion-1.0.9.crate 17425 BLAKE2B 0d4bf497848b3fc0ce10cdb3f1cfd73965bba1c0aa49f24c0b4abb92c2dc133ff546b119a69d2f5843f68cf4d42e4f64e9c59e2879788f91208bd75a2b7c62e8 SHA512 b2c116585816ee3aff5b21ac72ef05520ebb01fc164519e43407685c223ad5f2d3ded663c643a1f0e8150d334383c7504b701ea2708a570e5d7e29d98e2e7c61
+DIST ryu-1.0.11.crate 47007 BLAKE2B d03e8df69c3b21c1b2e4ffa91ece794f141e9f9bce4e9ed1ebf394b1cb0f796147b86189885f0734df8f431b2d166d8f6ed6a261be398d6d088fd56046a85c2e SHA512 dd2642aab2d3017c31432436226d5350b894c8b88a09395eb7de6350964b3cc48451a829ce78b04a9e4e0480076fe1bddd0604f4e57700faa2d60cac6e361408
 DIST scroll-0.11.0.crate 27354 BLAKE2B 21c885468642a77d6871ccf2bb748972f33c8abd504b2c0232bad9ec21228c3ecc9bc267b44898fc1dc5ab3ec494a8c6e01dfc5bee0dbe93117231de9f056b37 SHA512 84a9b1eb8a10c2bb14b718984ebdbac4a02620a65d6ced24f5346a762d92cc22a69fd204de1ed97044076d098a5ff9b7e20f7f00deca2b1302eb0910934265af
 DIST scroll_derive-0.11.0.crate 5615 BLAKE2B 83b8b5d68b7496cf49f16b7a1450ff5927b9b9afa887fca80d2763e88f1be3fc4650e18a74944521867f4d920ec040bd91e7133132d97692cee4b93b9900fb1c SHA512 71cea55a78cceaea15147eb71f463c4a3cc6137a499a7712b61e1c3a340e72f5dd438e49433ba9e73e5a3e9d23515a0e81b2abd2ce1f426aabf1930f7d251ff4
-DIST serde-1.0.136.crate 76158 BLAKE2B 44603c8eede428dce4211350497a443385ff0ddb0b43799170411110fd8908a56e9df801c72695723f4fcff5eb33384bcf92ef58eecb9c4924d5d9cc30e2f6c9 SHA512 d043ccfd6a1dc9a114a1a95530a63ed9342688d31d3aadeec600a9a9d47aad328be35b6f80080400ea4bb3f820ddd18cc5ce1e6ea1db28e02752962061e71019
+DIST serde-1.0.144.crate 76387 BLAKE2B 7e66355c24e1116eec4a3ba4f9164570b6d4ab57196d39d19a0bca912c9d2acfb33d8e17e09bc07903984dad154034187d0ffcc8f9073b36336ac2b38ea012cf SHA512 d7388a40e4a5e0a65ec7b49193f2d53d758adcf26b98ca3bc6270351c7553add2f38a8434223a95826994c6d039dd91fc4f4020ce191410fe57bebd29e4938de
 DIST strsim-0.10.0.crate 11355 BLAKE2B bcb25ad0a7284e24e4f17ebe0ccb621bdc4118e499b50b094d98aa7e8fcc0b96716c9953c3516ce7ea78309d41d424892ded595259696a5bbffdcb07802b5c2f SHA512 78b318532addfcf5c1ccc1e14539e258aab9d3cd893cc45d82342549bde838c177d90f13c560671f8f32929af47d0b467db35e6876bd7697d8b3f9e055aeeac1
-DIST syn-1.0.89.crate 235966 BLAKE2B 8f0e5be9f04f5faeb080fc94d13df0926f03a15ff702a2a88e5eb3194215441882c6f2795506ea05cbafc66f6844de3dc61aef720495932f4675c34be0ef6ee0 SHA512 6b2a9411c015b2b0ed5c5e18cae67f357d1a735e184416c6f8533be191ba65c0963dc9341ba3829195c6616ce71d4a79cbc7768fdbaa98b798b8f67746c6ab4a
-DIST term-0.5.2.crate 37638 BLAKE2B 58a496673b9033416f40e29a0a53c0b8d50e413d3922d3685252c96fd880659961b4ee48281ece5b9d6d97e895d81839cdf886fb0a6945af25b873a905b09700 SHA512 421b04f067f66ddecb615d715c828c98d3fa351b3490ec76bfa02bf430039717da5a168c20033399d5544ded5aed35c2aa4c9e6ea5018211bfe615389d18f3d6
+DIST syn-1.0.99.crate 236084 BLAKE2B 852493506271ee364ecb6e907fca55f18af9dc7ec4b4737e43e104d04064a37a2a59b31f5f780621785e44606d43e74adca5cf24c9ac1a8e186955c6b3e43b85 SHA512 47a9ec4d5e6702709c1069d1804d29880a1c5bbbed5a91c44e80eec657c62ceb223d6fbd942deef591463664766ae1997d154525f4e7a212bb84151418f40d10
+DIST term-0.7.0.crate 37082 BLAKE2B cb7947c696f71fc68bab3b25cc6cbde74b92380fdde5447399b06de99534b0cb2160963792824ac74a350444ce41a4fa16d6a9792a68d84578a15ab37ab76ca2 SHA512 9de6e836f1fd205b3b58645ec880eaabfc0fd8991e3980ef90bc6184b370a14676edb688a2a75bce412dd8ebd97345aef742afe5b964250e2b6f84e6b15b486a
 DIST termcolor-0.3.6.crate 13548 BLAKE2B 4d7faffc3be9ffe4e6da0ea20e6b244c0d9e488ff1c97851dfce073622e68f041e1c77d3c49c769a5e6525c28dfcdd998b381a5abcaa5c4ea63b0acf0e28bf2d SHA512 cfb8e0172abad994da27b1474ab0de244db782ac9c7fcd877d9f1727eaa2fb95036638edbab6b69c3302d1b880eba14cc7282ae0ec78ada1d31a9ef682d4cc90
 DIST termcolor-1.1.3.crate 17242 BLAKE2B 5aef69c0004081bd3cc4d531d13d63627cc02313868c0faab62358d13abfa7b4ba82f142c2801d25a6ae46ecbc8b7bdbeaa21c9105ea3b8950ab6a38cdb88513 SHA512 5838fcbfd70f300cb4b62aab50565db52074c56b152ccc8ac1173e4676c0d5a636271bf5a645a77da6e1d4edbf0091af2cd4dd6d73b85c3d198c760898c06f3a
 DIST terminal_size-0.1.17.crate 9141 BLAKE2B 048d8e8e9dad08aecde12323681d428b9182afb737136cd6699e13d231f7882091c9167cb10a08e5151df912421a6f89132645627e42ccc73d07553cadb1c8cd SHA512 96ec1bc8abd597f01ae59da567036d5d40b422764a4da662e2030c3ef4ce80a983c8b6a4ef1f34d88e649e0b1ea27b206d56a31924bcd2d31ff7e5a2e96d4201
 DIST textwrap-0.15.0.crate 52998 BLAKE2B f6c3057ea6ffde88dd9824cd3159d398316d9d21f327d2af59239ff84d79f893a9d0e96dfbd883aab6c64b631dc99457018e38baf14d40789f02d633425ded86 SHA512 f44271c542c22f17a4e3a459255f95e6c02d999f7d6bc8414d3973fd4ac9353aa4ef436932a45340738126905463d776902715feaa9329371f8a14f14b5a7bfd
 DIST theban_interval_tree-0.7.1.crate 22912 BLAKE2B a7f1a90a8a1f76808f64c013a0603f8b5f2811623511bc636f453a44b2d446bfe1d3f1257c1e20c0901b44b79c76f55145783f3d092fac947e48c909b4c0e135 SHA512 62ec06e13430c5828337300e8d25010b5a262d6359f33c689ea211798e1ba6103d144838ebf77d718e25360763f47265764e49d3332cbb05e91f4be159337f5d
+DIST thiserror-1.0.33.crate 17252 BLAKE2B 234ba49ca99379cf666f6fdc1e4cccaf59c565b116275f423b3052924d29a61f56c8579e02b91273eb8b04c4dc87b5b2455d5cb27580a8cc08769236818a158d SHA512 7bc7cba1e9beb48d8938c5f6b75eb7b3c2966b87d7adb3a29c1f28db94643fd6b630b4e17f4dcd8f544d1656b5e8ea89fff292f3017e73f0a1fec96461602b18
+DIST thiserror-impl-1.0.33.crate 15429 BLAKE2B 2713d79ac5e04fa5ba3f759541910416d5acd266a564a3effb8aac2d6a17a43f19453417e097aca51728a126b2a4e75bb2e9846e8ba9945363b2f7c818ace339 SHA512 e8d057851992abf0de9310d525efdd55bec6876d0f95e05868b08e0585fdce5b0514ec38fa88f3a717575ed2abf1b0d24e7c19b0ad2d9e64d21925ae2711402a
 DIST time-0.1.44.crate 28885 BLAKE2B 5e2ca11af9da0847239a086330d0cd00fcb5b63862f9dfec46f72a065bb35ec2236a21ee1c56bf65e3117105e7815cafe67e3725b8575373e875dfcea401d967 SHA512 736a38637be0193a06fa35d42b4873b04a0a35d84cd2af85b7f653a1b67b95078577134bb187b777730e73cce67f437b45ff5c72b8e3f1f8e2ed3420ea0324cf
+DIST unicode-ident-1.0.3.crate 35031 BLAKE2B d8d20829b97e7f1b9710feb6773cc5c4d25de6509772491e6f508a489285e32ec3a14ae689a1f1cd01ff5e2d4301b98579155535e03e240c8605b5737c9c5de5 SHA512 7ebdcfd7131a0e7a834f7e973b9cf813495259e0a0606539623d3f9bb51f9c6414908e71281d6a77397021e48d41c400a704c65990aaa8ca8d0a6095d9b3ed47
 DIST unicode-width-0.1.9.crate 16745 BLAKE2B 38d4b92e47a284d6881a8073089be59a73d82b91efe5522f55be977f95f479890b6c02cd519544729f1b1e62eb21bcfff8c5f5382917f953603b760e39cf1ea7 SHA512 0f5ec46c57e3b5e50cb8430c89db8d9c129e80ca11a9c398b5312bfe95001e19ca3efbfeb01c3ac09c4ce7e26c6ee1f352f7e114ecef78cefd68c54d2d50f5f4
-DIST unicode-xid-0.2.2.crate 14955 BLAKE2B 6c6da49ac08dbd8b3248272224d6bff96b9cd1f36029b1937a58a0b929c3a48326053305ed49e73edd70f572f5abbc4817cedc899c69e3457805ad056669f6af SHA512 92ffd0dd34e3ca235ecf110b38c447d3ec1faa23d76c112457f28d432f92fa6b5f428bc5e1bfd278f361f55426dd96e19ecb0d3eff6cf250892f069c52bd89a8
 DIST version_check-0.9.4.crate 14895 BLAKE2B fa1fa4008af165bfc1fdbe560488afd9d232cfafee94104fbcc4cbc52f234849bff9ddfa88109a1ac682f6d9c1d86b0459893d223f64e65adc08966aaf93dc89 SHA512 b172dc9a3759a4a683ffc39b9a40b03b9974b626a088217de87090466cef695226557c226cf3e469b2b25ee7297b7eb0d7719878cab42457f80146a81943c0c8
 DIST wasi-0.10.0+wasi-snapshot-preview1.crate 26964 BLAKE2B 525db01649a5981ee82ad80a1a4bab9baffd235262452675619f36a1b454017a74593c53c129f8c30b865994bbe30ef19cebaad9d245ccf54b9b07ef70d5d8ec SHA512 88e2da617f50d9ebfb1e0c5857321fb86b5ee88ae8a8d199d3cc092e0f39688a2cb68503f7c6bb09dd6bc50a9a03597a1eb2e032150fbd0d0b8afa02ad771c88
-DIST wasi-0.9.0+wasi-snapshot-preview1.crate 31521 BLAKE2B 716bdd2ec46d0bc9911c5e5e29fc783840559931b2563d8619675fc11da9527ddbe653a0f1ce0b782ee0c5f7a3131aba2b0867d415f003aa9c2389357569e7dc SHA512 dbe641f796ee3a5daafcaafc911ecc6dff170340f477c2df7a61fb4858a85aefc2637c9e61973ecce66a987aa8e08a736273a4aad3ef47eaf61ed4268dbf9c47
+DIST wasi-0.11.0+wasi-snapshot-preview1.crate 28131 BLAKE2B fe501889f25d65e2d032f885cc50c4f8bf7dd70fd5cbc438de349838370d8699e9627b0a4fc76030ea9fe6d508f41d0c9928a875fdbc47e73bfb17241cf7b155 SHA512 043500ab28cd9cb779475255da5d109ebab7fccca72b64873dc28d77bc5a157ba8d96b9e8f05223b5b36c7089bb7b4ba87657fc69bac16b78972f897294a865f
 DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
 DIST winapi-util-0.1.5.crate 10164 BLAKE2B fc800aceae5249a858c806c3e969ef2545766099872d856ebee51c883d9acf1122278db9607d50ca53eac351502b700fd2463900932d342240f97f683d517963 SHA512 7baeb661f397c4693dfa001fdc774b323c51a7c55caad40f2de5112a1cefd1d6151e3df41fa4ee193460a5905917c83d2b1de5fa10b4bd014ad96690af95c0fd
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 DIST wincolor-0.1.6.crate 4799 BLAKE2B 37e72b9603d912b65dd59fe74f1158dd87783ef10511527e50795efc28711348a4c34ee27a2cb4ab523389f443c66ede77c471dd8c2e1bfadb6e8f22726e634e SHA512 d8d9e3a16918844d82cf1cddd7ffdd35cbeb8367b661108cc392d5ce636c270a27a307a4d0307553103356db2958114f269b5a007e4271dd1e6039d7c737e374
-EBUILD bingrep-0.10.0.ebuild 2033 BLAKE2B 03ba988900ecf567f01ab8380b4f1d47fdd826dc1050cb83d69facb896979e6ca0b4faa9278b6a0b6391d8680f3a38581ebc4d4672de4c9ea12d7257936b1c7e SHA512 ba6c2833a7378f04533d200712aa80ec337a0c29ff519bbab7f33bebc22dfaafe4c297f0f8a71cda2f7224b7fa71aedf1d083fb28e1a2578fef70f7472318bd6
+EBUILD bingrep-0.10.1.ebuild 2008 BLAKE2B 178e7f93cfcb71bcc9b6ff59b3c01bf5f633a73c76f545e725858b56c7f57140f7d512fa605d6bbaf80fc589993217a6fb2c4c83c3a0b6f952b4c7b349ff9f14 SHA512 7f749f2913b3c41a45fce4b9059864f455409d3607069e85d52fbf5686802475e65713fce1e191d93b4cc0de1b6d6a578c74ce51ba90083049b758763d86fb86
 MISC metadata.xml 722 BLAKE2B 474bb516ae1be4339a717982087aaf31d83c7a32bce6a371338b3d4c909f792c891f6147f3a5aff6365b5ef43c5ec1c9d65cf32086a7a4cbbccef4042aa21c5a SHA512 ed78a94161d18ebba7b0d146d2058fc8d32145455b3b478173de983b93f091fe2819f2024daaf63f02b24eb6f2651d18079f9212b6cc1a1a6a0baf79435f0b6b
diff --git a/dev-util/bingrep/bingrep-0.10.0.ebuild b/dev-util/bingrep/bingrep-0.10.1.ebuild
index 8fa558a0eca6..008322659186 100644
--- a/dev-util/bingrep/bingrep-0.10.0.ebuild
+++ b/dev-util/bingrep/bingrep-0.10.1.ebuild
@@ -5,81 +5,79 @@ EAPI=8
 
 CRATES="
 	aho-corasick-0.7.18
-	anyhow-1.0.56
-	arrayref-0.3.6
-	arrayvec-0.5.2
+	anyhow-1.0.63
 	atty-0.2.14
 	autocfg-1.1.0
-	base64-0.13.0
 	bitflags-1.3.2
-	blake2b_simd-0.5.11
 	bstr-0.2.17
-	byteorder-1.4.3
 	cfg-if-1.0.0
-	clap-3.1.6
-	clap_derive-3.1.4
-	constant_time_eq-0.1.5
+	clap-3.2.20
+	clap_derive-3.2.18
+	clap_lex-0.2.4
 	cpp_demangle-0.3.5
-	crossbeam-utils-0.8.8
 	csv-1.1.6
 	csv-core-0.1.10
-	dirs-1.0.5
-	encode_unicode-0.3.6
+	dirs-next-2.0.0
+	dirs-sys-next-0.1.2
+	encode_unicode-1.0.0
 	env_logger-0.9.0
 	fuchsia-cprng-0.1.1
-	getrandom-0.1.16
-	goblin-0.5.1
-	hashbrown-0.11.2
+	getrandom-0.2.7
+	goblin-0.5.4
+	hashbrown-0.12.3
 	heck-0.4.0
 	hermit-abi-0.1.19
 	hexplay-0.2.1
 	humantime-2.1.0
-	indexmap-1.8.0
+	indexmap-1.9.1
 	itoa-0.4.8
 	lazy_static-1.4.0
-	libc-0.2.121
-	log-0.4.14
-	memchr-2.4.1
+	libc-0.2.132
+	log-0.4.17
+	memchr-2.5.0
 	memrange-0.1.3
 	metagoblin-0.6.0
-	os_str_bytes-6.0.0
+	once_cell-1.14.0
+	os_str_bytes-6.3.0
 	plain-0.2.3
-	prettytable-rs-0.8.0
+	prettytable-rs-0.9.0
 	proc-macro-error-1.0.4
 	proc-macro-error-attr-1.0.4
-	proc-macro2-1.0.36
-	quote-1.0.16
+	proc-macro2-1.0.43
+	quote-1.0.21
 	rand-0.3.23
 	rand-0.4.6
 	rand_core-0.3.1
 	rand_core-0.4.2
 	rdrand-0.4.0
-	redox_syscall-0.1.57
-	redox_users-0.3.5
-	regex-1.5.5
+	redox_syscall-0.2.16
+	redox_users-0.4.3
+	regex-1.6.0
 	regex-automata-0.1.10
-	regex-syntax-0.6.25
-	rust-argon2-0.8.3
+	regex-syntax-0.6.27
 	rustc-demangle-0.1.21
 	rustc-serialize-0.3.24
-	ryu-1.0.9
+	rustversion-1.0.9
+	ryu-1.0.11
 	scroll-0.11.0
 	scroll_derive-0.11.0
-	serde-1.0.136
+	serde-1.0.144
 	strsim-0.10.0
-	syn-1.0.89
-	term-0.5.2
+	syn-1.0.99
+	term-0.7.0
 	termcolor-0.3.6
 	termcolor-1.1.3
 	terminal_size-0.1.17
 	textwrap-0.15.0
 	theban_interval_tree-0.7.1
+	thiserror-1.0.33
+	thiserror-impl-1.0.33
 	time-0.1.44
+	unicode-ident-1.0.3
 	unicode-width-0.1.9
-	unicode-xid-0.2.2
 	version_check-0.9.4
-	wasi-0.9.0+wasi-snapshot-preview1
 	wasi-0.10.0+wasi-snapshot-preview1
+	wasi-0.11.0+wasi-snapshot-preview1
 	winapi-0.3.9
 	winapi-i686-pc-windows-gnu-0.4.0
 	winapi-util-0.1.5
@@ -94,7 +92,7 @@ HOMEPAGE="https://github.com/m4b/bingrep"
 SRC_URI="https://github.com/m4b/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
 	$(cargo_crate_uris)"
 
-LICENSE="Apache-2.0 Apache-2.0-with-LLVM-exceptions Boost-1.0 BSD BSD-2 CC0-1.0 GPL-3 ISC MIT Unlicense"
+LICENSE="MIT Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD Boost-1.0 ISC MIT Unicode-DFS-2016 Unlicense"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc64 ~x86"
 
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 60f8df4d5008..49ff274de396 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/libopenmpt/Manifest b/media-libs/libopenmpt/Manifest
index a336ad4d7dcd..9fc907dcec9e 100644
--- a/media-libs/libopenmpt/Manifest
+++ b/media-libs/libopenmpt/Manifest
@@ -3,5 +3,5 @@ DIST libopenmpt-0.6.5+release.autotools.tar.gz 1549710 BLAKE2B f04c3df0322f336bd
 DIST libopenmpt-0.6.6+release.autotools.tar.gz 1554516 BLAKE2B 21e2fc4252431235608a52d3a321e26eae5d45f2328ff3e3604d84c537d72e07d72346c504901b000af04dfc52b1dd91c79f576be4331ea8685e534a174b61cd SHA512 b634c556f13dc51d1008f4216936a9b7cab25a6fb0d5218da0b692ec848de21905ed1981223ac9ecdebea9ce6c5376e91ff92e1655dd0be491fce0114e3230bf
 EBUILD libopenmpt-0.5.14.ebuild 1544 BLAKE2B ce1beb9e386a70e598f295b4caedab63a9bfb273e4d31a7b78047d68b176dc6b46bf673ca97a395bb30067629785ef9f9117502c3bb0f6a50c25d7045203f51c SHA512 9b834a31821d7fae8e409241b4acf5c298a539c815191cef68219ed6ce6a4edb1cf85f50254c6ea61d17898fbbb0f58ed5c40f4ca35c7cc5965aadadcaa4a5d9
 EBUILD libopenmpt-0.6.5.ebuild 1558 BLAKE2B 5439004083f8803f2069b28be2417aeed10dea5538b348404c4f99d1444910019f0b9d5b4343b4b9475e4362a39a5a4a72ba690ce25399c35893244c5b29c77c SHA512 05c29e814c27b47f617eaa1f90a8d6a8866efa1b9f21ee175e84b813c5c406adf230aa1c034aad630b2e3e6728a2f30939bb61039eb9a333b1884faa0246c6ad
-EBUILD libopenmpt-0.6.6.ebuild 1558 BLAKE2B 5439004083f8803f2069b28be2417aeed10dea5538b348404c4f99d1444910019f0b9d5b4343b4b9475e4362a39a5a4a72ba690ce25399c35893244c5b29c77c SHA512 05c29e814c27b47f617eaa1f90a8d6a8866efa1b9f21ee175e84b813c5c406adf230aa1c034aad630b2e3e6728a2f30939bb61039eb9a333b1884faa0246c6ad
+EBUILD libopenmpt-0.6.6.ebuild 1555 BLAKE2B b00786bf8deaf11abc1315d9d257e3bb1cff42ddec8f5ba06c545b257bfe569c194e69f7389a462b0c4ff74e6c572eac0fa3d317a55ff4cd1413217be128c731 SHA512 fb7d8067796c9e5d1e1a09b6bf4d0f19e7b1f60bda47340498490a46ff8c33e71606a1f640aa9bdae7b6dd4c997120e74f64c6c600561d03c909e6e4a2fef501
 MISC metadata.xml 328 BLAKE2B 25f8b37a7e7885a50e5b7305c9090033c78b1154214e05060c3407f0d27ac436aa3f0da1dff3a5ba1685bef390f1fe99416893aaf59e002921cc3464ce0d2167 SHA512 6686c75dbfcd5a5f9d6ef4d667916f54388180045471f8eb585c7b0d6e03f5d56c3fc892c97851f7453318309a456bbfd877eb240cbf008b71984009d08a8181
diff --git a/media-libs/libopenmpt/libopenmpt-0.6.6.ebuild b/media-libs/libopenmpt/libopenmpt-0.6.6.ebuild
index 31433906b65f..edf408553eea 100644
--- a/media-libs/libopenmpt/libopenmpt-0.6.6.ebuild
+++ b/media-libs/libopenmpt/libopenmpt-0.6.6.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://lib.openmpt.org/libopenmpt/"
 SRC_URI="https://lib.openmpt.org/files/libopenmpt/src/${MY_P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm ppc ppc64 ~riscv ~x86"
 IUSE="examples mp3 ogg static-libs test vorbis zlib"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/lilv/Manifest b/media-libs/lilv/Manifest
index 00568f6677f8..465b532c7c53 100644
--- a/media-libs/lilv/Manifest
+++ b/media-libs/lilv/Manifest
@@ -3,5 +3,5 @@ DIST lilv-0.24.16.tar.xz 117928 BLAKE2B c3e7e9c55f2c2ebe8a02181cd2e11d3413e69a73
 DIST lilv-0.24.18.tar.xz 118216 BLAKE2B c1d191a8513776b4e783f05076b8a8d5a20866e734527ff84e04d970d190b26d2c922aa6f7ba346632caea47daa265c1008d9295c3f0e41f85227103337ccd1f SHA512 eece846338403ba3e7c366024511d33bd5e399d3b1e6871d04ec3907540a9e3541ab7b0445bf17cf61c5779c5263f1ef23eadefb6411a2e4be8d79464a5b873e
 EBUILD lilv-0.24.14.ebuild 1776 BLAKE2B 1cd04755b543809c7ec44ec4e3295784398d86213a9dc99fd26fdabea8ee0e72ba11eb1d56105a11360151d0cd83203ae86e590590b29d192701c71ef5c2dfb8 SHA512 a836bdb1fe475aab2664c3fb46889b1b24846396abb08a3e396928afa3579ca6daf6126f1e6a85f75209c65525fa195cfea8182f83f6161b430187d7959126cc
 EBUILD lilv-0.24.16-r1.ebuild 1574 BLAKE2B ab615f638f2f8650cac38b241057c888d6af2a91dd1fc4d26256a26189a491588cb537edb33d97ba5c18029ca0fec05103fd318c7d63198c1937f471985ef8d8 SHA512 2c89faf134d7a8e5648ebe02fc298896143c485239d6c351e55a5fdbd3def40705a8ba4a17265d1d5a5c41262134983b07cec2c54e23d99b52dafdfe7169ba5b
-EBUILD lilv-0.24.18-r1.ebuild 1553 BLAKE2B 6a2b04d5d89934f6dca85f2b3ded8ca0fd6d39c8d30a3cc64a9a56176bab6115c12972b79793dc987a2a926d35099b463e3b00a1ab1a399e6e94a857d057049d SHA512 44fca57091fc74b9c0716932b290ee3f818497ca20d612d5ffd6164461117f8e6957d7e61f259154b5d71184af1d8459620ef5d98d876b9228fe56a03cc61f49
+EBUILD lilv-0.24.18-r1.ebuild 1548 BLAKE2B 2caa58092c074244f487427a0ba52ba357814510ffe12e84520ea474e192e632f58ef1f1642e7e673f2f51c1be2e2a2757b4b054f5486b15c86ee7207edd872b SHA512 22b858b730915fa5936ca20a9a3c9b66fbb380f47a347d9b28c45fae47b613b7eb0c3737d4e124512bc5a16f5486b3d4bed8eb5ef65c358f424e2ea88f04e4cf
 MISC metadata.xml 684 BLAKE2B 82fdd1a88f5487cfa131221c915a77c19e04d3643fab9c8a9ea702920bbfce881c93f727e560e68532f583060a876407a412e3632a8f84cd30457a6c578f0524 SHA512 e1788982d4cc5c782cad4a3efbc93f7bc4560d45c72809f7c28df377ab7e38774844e013c6bc4859ecabf2cb654d0a89d1f7823d7712ab493c559f9ee4955ee0
diff --git a/media-libs/lilv/lilv-0.24.18-r1.ebuild b/media-libs/lilv/lilv-0.24.18-r1.ebuild
index cd2add997f0d..f7ebcd32fa36 100644
--- a/media-libs/lilv/lilv-0.24.18-r1.ebuild
+++ b/media-libs/lilv/lilv-0.24.18-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://download.drobilla.net/${P}.tar.xz"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86"
 IUSE="doc python test tools"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
diff --git a/media-libs/lv2/Manifest b/media-libs/lv2/Manifest
index bcdc760c37d5..71887fe65b11 100644
--- a/media-libs/lv2/Manifest
+++ b/media-libs/lv2/Manifest
@@ -4,5 +4,5 @@ DIST lv2-1.18.6.tar.xz 232836 BLAKE2B 27c9eb3e15e4515a63f93552c8924c502f8bc585fb
 DIST lv2-1.18.8.tar.xz 230584 BLAKE2B b9d6480286f0709d3e7ddd9444c092e4e1e108ed384a8cdc7991ec870e8374869bab21e09ebebad4c59445ec3a90ddd05bf2c461a1c9aeb986f68d84a937bbbd SHA512 9925290818bd683200bc738e3e9342b946fe82a04d983e89c240ae70b9053a7a59a8d505c522fe7af5b804adeba00fdf94403bd34844ce11e26cc1ff62c2f254
 EBUILD lv2-1.18.4.ebuild 1353 BLAKE2B 2570bea49f79de9acefa1539f19788fb2129e59375491d0802e6070ed766e9d48d77e04c21e6f64e354d23e31487738d1448f696ba2ef15da0a7b2d6d89b5c4a SHA512 51bfeb0cc93da2ee4dfd9af0109983e7118641e340060d0a142b79615a78ab8053d581c4044c42ef25dd1a5188057504e2c3a0297171237aab5e45bb2ed3268c
 EBUILD lv2-1.18.6-r2.ebuild 1395 BLAKE2B b8b6c0ac0954c7644a7ba1764e000dc2830853398266eaa4b4c27925b9ecdc8fec6e8e558c9b46e103bf87d82ff988a2ede6e8f4af3178bc2f84114630fe90c0 SHA512 795ccdeca300f61606e3e9fd10969fb435e431e758fd7aaf77a3e9648f503340726b39ebe9c319f77487342147b3255e27d088a818f33917d97ee4822acc90f6
-EBUILD lv2-1.18.8-r1.ebuild 1430 BLAKE2B a0063f292863b719085a2d5049c6e238b685bdd88a520ba181f587dc43e89afedcc63e67117ee7ee299a59ae8c6059a579d45c04ce2f25c87b579c9bf5d4708a SHA512 8cf90a7d84048fc602eb5e4519f1ff6b9b0327258fd786ccfcc39e0df4f025b6796862f3277c87649e3b353cbeaa83d0d11932476b143687cc4484a23b54fb54
+EBUILD lv2-1.18.8-r1.ebuild 1425 BLAKE2B 87da5e01741639d21521c3741dd1704318b16d8926ec82b0c21ea5ec25e1d8fc5b58b35d8622454a187137bf8d8c2cc2808824cde789cb34384fb66aceb3edc5 SHA512 0add9ef767ca4b2e865328dd0efdd22d023e47764b1ae5fc68027b999c51146da94f00d82210c9ac7df32922f4b4b9408778605e63939076c09cb2bd4ac32400
 MISC metadata.xml 341 BLAKE2B 041aa9ea5ba80d8639da9242b14896da75fe648666ec6f4a59de8449a2daf7c741a05187e3265da96c8032ca0ae5a1430dc516fd667b9a0826d561462b5079ca SHA512 7a949f5da6524129d3edbde9917ae3a996b67a36d362a1bbba8a842d70eacb3d3cc5040a62a4daddfd776733635e49b5e70d02001d2a0bf09e9421fc22f3b894
diff --git a/media-libs/lv2/lv2-1.18.8-r1.ebuild b/media-libs/lv2/lv2-1.18.8-r1.ebuild
index 4d070eae7261..d90d87ba4bd9 100644
--- a/media-libs/lv2/lv2-1.18.8-r1.ebuild
+++ b/media-libs/lv2/lv2-1.18.8-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://lv2plug.in/spec/${P}.tar.xz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86"
 IUSE="doc plugins"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/media-libs/sratom/Manifest b/media-libs/sratom/Manifest
index 4bc77f2dfc9c..00dc48de8f0f 100644
--- a/media-libs/sratom/Manifest
+++ b/media-libs/sratom/Manifest
@@ -2,6 +2,6 @@ DIST sratom-0.6.10.tar.bz2 327047 BLAKE2B 6205a0269216099556556cd251649eba58fdf1
 DIST sratom-0.6.12.tar.xz 23328 BLAKE2B 76a01c84e418ee3ffeb1e0e44214e9b02ab58b9b572372ee43309650a7a674a55e49384e8b62657af30933b7bdb02faf38ff100030e2ec86947972cacf32db69 SHA512 e677945f59494970c8c723319216cf6543ed38c590b6db94e5e928e830004e96dc957a2cf2fb0b76278cf55f0d62ea03ba705fbc449424c467e29593eaa948dc
 DIST sratom-0.6.14.tar.xz 24252 BLAKE2B 6f468e9a0de97cf83a4f3faeb8ceff8a5502da7f0dff6b5721ef985df352057cda0dbbf13656471ef7f3103a891570e3462ed6bf4517dbc546d9f83115db433b SHA512 3647ccca3ac98299a0bcc30d540788c627445c9a55f0b68a53e08ee45b15138c7a5466c92d1c10eac614325718d4f59eff6f0664f99891e8349e613be675c87d
 EBUILD sratom-0.6.10.ebuild 1278 BLAKE2B e1b8bd5bc3dd4c6ba7d922b3f7a021023c048c7efeba7f246e7eb12fd9a2ebb1c1996e8f3b713fc6748b8a10c08eca3966217ebb61c5559129125f9ebb58567b SHA512 79cd92b9ee933fdcea36374c4d8b7754176f084b9e6906e8603d3f929b7bf2467da5e4f22cb1c519c83b383e4b3492c8894f6c4730c61d9be71bc74d539875e8
-EBUILD sratom-0.6.12-r1.ebuild 1140 BLAKE2B 7d0a34f5ecb76c9d7cf7e32cfd35833f4516e91396704860654ca5eadb29803e60cf3069c0a983ef54cd831552d67f46f408835d006080cc352dcc420cfda6ab SHA512 85bed3f5d72b26687d9997cdd111fcbc042366892264088e4b38932aefb9cdf48d0c02d6c052f5c341c8cdcd4bee304da80b851198ee51bc104f63db7a8c57d0
+EBUILD sratom-0.6.12-r1.ebuild 1135 BLAKE2B 340797b37358cc5be4fc8b6eb94e0e8554869e2d9708111917abf6989ad5af0afb58a99efc3c6f89bef47ebbeb3e709852e3d53113899859e01e0829e3517c94 SHA512 df53471d5055e39fa957276c807911bb557cdd150cc022c712eccd00203c781449a8561f5a27b48ff14ef75d73d5536f72b87e5ac17466445e95bd89a243e16b
 EBUILD sratom-0.6.14.ebuild 1140 BLAKE2B 7d0a34f5ecb76c9d7cf7e32cfd35833f4516e91396704860654ca5eadb29803e60cf3069c0a983ef54cd831552d67f46f408835d006080cc352dcc420cfda6ab SHA512 85bed3f5d72b26687d9997cdd111fcbc042366892264088e4b38932aefb9cdf48d0c02d6c052f5c341c8cdcd4bee304da80b851198ee51bc104f63db7a8c57d0
 MISC metadata.xml 256 BLAKE2B 211ca90d8f704be5ca8a1994f0e8f1adbe1fd4937a10a301ced0b9be171dfdabb223661d168535cd7f5edfe0c8edca4620945e13dc3c43b5832ac183913188f0 SHA512 fde3b658512fa6742886d7dd84efc906331b43f5b0f8fdca353fe2280653381716d7143473c9237b9fe58b9df5889b38b008da34f6ce4b64336f38642d78e3dd
diff --git a/media-libs/sratom/sratom-0.6.12-r1.ebuild b/media-libs/sratom/sratom-0.6.12-r1.ebuild
index 7a0ecfc1b275..974ff6e8da7c 100644
--- a/media-libs/sratom/sratom-0.6.12-r1.ebuild
+++ b/media-libs/sratom/sratom-0.6.12-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://download.drobilla.net/${P}.tar.xz"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 505a0b3794cf..bca6ace09d59 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 27bf5bc2cf96..d7b32e7e6ee7 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Tue, 27 Sep 2022 01:09:37 +0000
+Tue, 27 Sep 2022 07:09:37 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 73d36a074621..927111ea7166 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 527347 BLAKE2B 2a3ca4466b681cdb565e900ea1a740da53b44fbb53b587593768b40df60e0574c7bd692ef80c62c3eb717f2ded2eddd9f52d1600f669a4df4b5cd88371298781 SHA512 966d722a4e31cba37994e6aa7863ecd729a7c644c719a26094f88a8acb8e90825cffcd239a1f665ad159294f5377cc124a3c9da2f622fbf7561835a7bb02c3e7
-TIMESTAMP 2022-09-27T01:09:40Z
+TIMESTAMP 2022-09-27T07:09:40Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmMyTVRfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmMyobRfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBLnRAAgxhJcAyiRpW4Z7ZeVluEzMNu2wQiwEr+Pl+JLb3gg4+wkAY987+Ba+TX
-Chwb6hzuR4URf033DwbCpVvJmmb3PP0P4T6+n3QkLASVNhpVv52cTu5E05HOKeV4
-IR7rKB3cq7T4QU8zYeRQ+rjeKklPS8niDqQ0vCFOhzZm4AMDhcIlNS6eC4eVwW6N
-rF/n1bnbJPMt7ZOh6DgngXVlW92aD8Ar9eK3B/lFRMmXISOpKeA7nbvUTngT2NOi
-n8MucjjhhxhBr7Yv8KTi9d6QwxXs8CEtxAigl6x3NNZsdAANNTWAvWBuVUmD8m1i
-dXEgTqK9yg39Q4u07P9kWK34MGZnDBT+sp+E3dBSkzc0CMd2hCdcq1lm6fWMUARE
-20B1lWlZc9LdWP/N8uG9YXXODCZGo1T8i/9N4HX49e8HeJOOPiqWVfDbBcG9BWw7
-fLnCn0DvKl684kwOtZVWZNoCjeXb3I8Q/vMDqIoVwzaN7V87lE+9xei3xleDWdj7
-oxc/mNl8wYPYWh78CbyIIOBPG9YFkJDVSle13g5iqQcTL6cbtDrVrf2um7OxjWJU
-7DvWH1EM7Q5KGgSkuKk4ukdyKEuZ8rNly3SofVVLGvEYBKvpLzEhfE8crfZnutyb
-QnqcYS3PIGESIbdaBddR2/BN/Z1ei2OL8N9/iykCmEiccoX6/HE=
-=vITY
+klBI4A/+N4gDLZlUaYyGURKGf2XXkBmCsKJ8AkixeNXv8tPO4w/z+XT6if+9pLdk
+MUcQ7g/uLsr327ruPp317V+dFScAxxbahNHKuuHPhNcF/CbAixRJZVunIRVlZtI0
+pNnzlNvW84VU6N7bYFYC2O488A4FDchnEqZLwUIEuo3j/0Gx5xzFsXZGRdY4AMZJ
+jdW2bDCguG8jEm6treqRW9IMeABNIHnxxLykIRLpF2n1JDR8NA+5ru4MZWcejqKw
+0WX5BUdeE1NhK7w6EdC73wfGSNVF9Xmvzt23Mj5T8a3/FVeM/D9KWkA/bHWj7yw6
+cRHUFGZe2X/Wlur9SsOFZC+RYcuEx5fbjtPnvB1GXqqgY3jPEAytQh1pkecPgKpO
+12x/sqRsHmkFJwq8ZRNHX1lqsnUsI1XViKjHEeNtHeB7roe40mc15I1Mo1mDTwT4
+YYFiCewYx+AAlf3dXo7cc+ECk+iX2Mu+5VTfEHStzqR5yxRjDmC9CZVImqjZh+u2
+3QnppuGYJlGmnzlUGeaofXhRHkHOh2TNfPXvAOTwhOD20sGVT9ZqC1NGQ3VukUVN
+oDtEU86ZQf2jcjFtQr4PsQz2yMDejWuADe6+YyClYrGd+jb8VflEvEvpppUJfICx
+gDcfTRRPgOh4ysLFHkT0GnnS+SgK3fJquONKZoq+5lzjrTsRxU0=
+=5fKm
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 27bf5bc2cf96..d7b32e7e6ee7 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Tue, 27 Sep 2022 01:09:37 +0000
+Tue, 27 Sep 2022 07:09:37 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 1d72101b399a..48e722125c31 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index 1c9d05119de1..254e0b07bf80 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.82 b/metadata/md5-cache/app-admin/awscli-1.25.82
new file mode 100644
index 000000000000..c2a965a55214
--- /dev/null
+++ b/metadata/md5-cache/app-admin/awscli-1.25.82
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/pytest-forked[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/botocore-1.27.81[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !app-admin/awscli-bin >=dev-python/pytest-7.1.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-8[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=Universal Command Line Environment for AWS
+EAPI=8
+HOMEPAGE=https://github.com/aws/aws-cli/ https://pypi.org/project/awscli/
+INHERIT=bash-completion-r1 distutils-r1 multiprocessing
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm64 ~riscv ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/botocore-1.27.81[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !app-admin/awscli-bin python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/aws/aws-cli/archive/1.25.82.tar.gz -> aws-cli-1.25.82.gh.tar.gz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=d3e40343c65019dc8ca8907cf3ccfe5a
diff --git a/metadata/md5-cache/app-admin/drush-6.7.0-r4 b/metadata/md5-cache/app-admin/drush-6.7.0-r4
new file mode 100644
index 000000000000..0a937f1c99ba
--- /dev/null
+++ b/metadata/md5-cache/app-admin/drush-6.7.0-r4
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare
+DESCRIPTION=Command line shell and scripting interface for Drupal
+EAPI=8
+HOMEPAGE=https://github.com/drush-ops/drush
+INHERIT=bash-completion-r1
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-lang/php[cli,ctype,json(+),simplexml] dev-php/PEAR-Console_Table
+SLOT=0
+SRC_URI=https://github.com/drush-ops/drush/archive/6.7.0.tar.gz -> drush-6.7.0.tar.gz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=015cea9eb05e8c7f57a34332403fe9c6
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index dc7ef2451ce7..e1148edb245c 100644
--- a/metadata/md5-cache/app-emulation/Manifest.gz
+++ b/metadata/md5-cache/app-emulation/Manifest.gz
diff --git a/metadata/md5-cache/app-emulation/qemu-7.0.0-r1 b/metadata/md5-cache/app-emulation/qemu-7.0.0-r1
deleted file mode 100644
index ed53a90c61df..000000000000
--- a/metadata/md5-cache/app-emulation/qemu-7.0.0-r1
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) dev-lang/perl sys-apps/texinfo virtual/pkgconfig doc? ( dev-python/sphinx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) gtk? ( nls? ( sys-devel/gettext ) ) test? ( dev-libs/glib[utils] sys-devel/bc ) virtual/pkgconfig
-DEFINED_PHASES=compile configure info install postinst postrm prepare pretend setup test
-DEPEND=!static? ( >=dev-libs/glib-2.0 sys-libs/zlib python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[ncurses,readline] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[ncurses,readline] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[ncurses,readline] ) ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr ) >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty[api] app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bpf? ( dev-libs/libbpf:= ) bzip2? ( app-arch/bzip2 ) capstone? ( dev-libs/capstone:= ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.5.1 ) fuse? ( >=sys-fs/fuse-3.1:3 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle:= >=net-libs/gnutls-3.0:= ) gtk? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.91 ) ) infiniband? ( sys-cluster/rdma-core ) iscsi? ( net-libs/libiscsi ) io-uring? ( sys-libs/liburing:= ) jack? ( virtual/jack ) jemalloc? ( dev-libs/jemalloc ) jpeg? ( virtual/jpeg:0= ) lzo? ( dev-libs/lzo:2 ) multipath? ( sys-fs/multipath-tools ) ncurses? ( sys-libs/ncurses:=[unicode(+)] sys-libs/ncurses:= ) nfs? ( >=net-fs/libnfs-1.9.3:= ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl(+),gbm(+)] ) pam? ( sys-libs/pam ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( media-libs/libsdl2[video] media-libs/libsdl2 ) sdl-image? ( media-libs/sdl2-image ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) slirp? ( net-libs/libslirp ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy:= ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh-0.8.6 ) udev? ( virtual/libudev:= ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools:= ) zstd? ( >=app-arch/zstd-1.4.0 ) ) qemu_softmmu_targets_i386? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-202105[binary] ~sys-firmware/ipxe-1.21.1[binary,qemu] ~sys-firmware/seabios-1.14.0[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre10[binary] ) !pin-upstream-blobs? ( >=sys-firmware/edk2-ovmf-202105 sys-firmware/ipxe[qemu] >=sys-firmware/seabios-1.14.0[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_x86_64? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-202105[binary] ~sys-firmware/ipxe-1.21.1[binary,qemu] ~sys-firmware/seabios-1.14.0[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre10[binary] ) !pin-upstream-blobs? ( >=sys-firmware/edk2-ovmf-202105 sys-firmware/ipxe[qemu] >=sys-firmware/seabios-1.14.0[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_ppc? ( pin-upstream-blobs? ( ~sys-firmware/seabios-1.14.0[binary,seavgabios] ) !pin-upstream-blobs? ( >=sys-firmware/seabios-1.14.0[seavgabios] ) ) qemu_softmmu_targets_ppc64? ( pin-upstream-blobs? ( ~sys-firmware/seabios-1.14.0[binary,seavgabios] ) !pin-upstream-blobs? ( >=sys-firmware/seabios-1.14.0[seavgabios] ) ) kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 ) static? ( >=dev-libs/glib-2.0[static-libs(+)] sys-libs/zlib[static-libs(+)] python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[ncurses,readline] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[ncurses,readline] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[ncurses,readline] ) ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr[static-libs(+)] ) >=x11-libs/pixman-0.28.0[static-libs(+)] accessibility? ( app-accessibility/brltty[api] app-accessibility/brltty[static-libs(+)] ) aio? ( dev-libs/libaio[static-libs(+)] ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bpf? ( dev-libs/libbpf:= ) bzip2? ( app-arch/bzip2[static-libs(+)] ) capstone? ( dev-libs/capstone:= ) caps? ( sys-libs/libcap-ng[static-libs(+)] ) curl? ( >=net-misc/curl-7.15.4[static-libs(+)] ) fdt? ( >=sys-apps/dtc-1.5.1[static-libs(+)] ) fuse? ( >=sys-fs/fuse-3.1:3[static-libs(+)] ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] ) gnutls? ( dev-libs/nettle:=[static-libs(+)] >=net-libs/gnutls-3.0:=[static-libs(+)] ) gtk? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.91 ) ) infiniband? ( sys-cluster/rdma-core[static-libs(+)] ) iscsi? ( net-libs/libiscsi ) io-uring? ( sys-libs/liburing:=[static-libs(+)] ) jack? ( virtual/jack ) jemalloc? ( dev-libs/jemalloc ) jpeg? ( virtual/jpeg:0=[static-libs(+)] ) lzo? ( dev-libs/lzo:2[static-libs(+)] ) multipath? ( sys-fs/multipath-tools ) ncurses? ( sys-libs/ncurses:=[unicode(+)] sys-libs/ncurses:=[static-libs(+)] ) nfs? ( >=net-fs/libnfs-1.9.3:=[static-libs(+)] ) numa? ( sys-process/numactl[static-libs(+)] ) opengl? ( virtual/opengl media-libs/libepoxy[static-libs(+)] media-libs/mesa[static-libs(+)] media-libs/mesa[egl(+),gbm(+)] ) pam? ( sys-libs/pam ) png? ( media-libs/libpng:0=[static-libs(+)] ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl[static-libs(+)] ) sdl? ( media-libs/libsdl2[video] media-libs/libsdl2[static-libs(+)] ) sdl-image? ( media-libs/sdl2-image[static-libs(+)] ) seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] ) slirp? ( net-libs/libslirp[static-libs(+)] ) smartcard? ( >=app-emulation/libcacard-2.5.0[static-libs(+)] ) snappy? ( app-arch/snappy:= ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0[static-libs(+)] ) ssh? ( >=net-libs/libssh-0.8.6[static-libs(+)] ) udev? ( virtual/libudev:= ) usb? ( >=virtual/libusb-1-r2[static-libs(+)] ) usbredir? ( >=sys-apps/usbredir-0.6[static-libs(+)] ) vde? ( net-misc/vde[static-libs(+)] ) virgl? ( media-libs/virglrenderer[static-libs(+)] ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools:= ) zstd? ( >=app-arch/zstd-1.4.0[static-libs(+)] ) ) static-user? ( >=dev-libs/glib-2.0[static-libs(+)] sys-libs/zlib[static-libs(+)] python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[ncurses,readline] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[ncurses,readline] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[ncurses,readline] ) ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr[static-libs(+)] ) )
-DESCRIPTION=QEMU + Kernel-based Virtual Machine userland tools
-EAPI=8
-HOMEPAGE=https://www.qemu.org https://www.linux-kvm.org
-IDEPEND=filecaps? ( sys-libs/libcap )
-INHERIT=linux-info toolchain-funcs python-r1 udev fcaps readme.gentoo-r1 pax-utils xdg-utils
-IUSE=accessibility +aio alsa bpf bzip2 capstone +caps +curl debug +doc +fdt fuse glusterfs +gnutls gtk infiniband iscsi io-uring jack jemalloc +jpeg lzo multipath ncurses nfs nls numa opengl +oss pam +pin-upstream-blobs plugins +png pulseaudio python rbd sasl +seccomp sdl sdl-image selinux +slirp smartcard snappy spice ssh static static-user systemtap test udev usb usbredir vde +vhost-net vhost-user-fs virgl virtfs +vnc vte xattr xen zstd qemu_softmmu_targets_aarch64 qemu_softmmu_targets_alpha qemu_softmmu_targets_arm qemu_softmmu_targets_cris qemu_softmmu_targets_hppa qemu_softmmu_targets_i386 qemu_softmmu_targets_m68k qemu_softmmu_targets_microblaze qemu_softmmu_targets_microblazeel qemu_softmmu_targets_mips qemu_softmmu_targets_mips64 qemu_softmmu_targets_mips64el qemu_softmmu_targets_mipsel qemu_softmmu_targets_nios2 qemu_softmmu_targets_or1k qemu_softmmu_targets_ppc qemu_softmmu_targets_ppc64 qemu_softmmu_targets_riscv32 qemu_softmmu_targets_riscv64 qemu_softmmu_targets_s390x qemu_softmmu_targets_sh4 qemu_softmmu_targets_sh4eb qemu_softmmu_targets_sparc qemu_softmmu_targets_sparc64 qemu_softmmu_targets_x86_64 qemu_softmmu_targets_xtensa qemu_softmmu_targets_xtensaeb qemu_softmmu_targets_avr qemu_softmmu_targets_rx qemu_softmmu_targets_tricore qemu_user_targets_aarch64 qemu_user_targets_alpha qemu_user_targets_arm qemu_user_targets_cris qemu_user_targets_hppa qemu_user_targets_i386 qemu_user_targets_m68k qemu_user_targets_microblaze qemu_user_targets_microblazeel qemu_user_targets_mips qemu_user_targets_mips64 qemu_user_targets_mips64el qemu_user_targets_mipsel qemu_user_targets_nios2 qemu_user_targets_or1k qemu_user_targets_ppc qemu_user_targets_ppc64 qemu_user_targets_riscv32 qemu_user_targets_riscv64 qemu_user_targets_s390x qemu_user_targets_sh4 qemu_user_targets_sh4eb qemu_user_targets_sparc qemu_user_targets_sparc64 qemu_user_targets_x86_64 qemu_user_targets_xtensa qemu_user_targets_xtensaeb qemu_user_targets_aarch64_be qemu_user_targets_armeb qemu_user_targets_hexagon qemu_user_targets_mipsn32 qemu_user_targets_mipsn32el qemu_user_targets_ppc64le qemu_user_targets_sparc32plus python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 +filecaps
-KEYWORDS=amd64 ~arm arm64 ~loong ~ppc ppc64 ~riscv x86
-LICENSE=GPL-2 LGPL-2 BSD-2
-RDEPEND=!static? ( >=dev-libs/glib-2.0 sys-libs/zlib python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[ncurses,readline] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[ncurses,readline] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[ncurses,readline] ) ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr ) >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty[api] app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bpf? ( dev-libs/libbpf:= ) bzip2? ( app-arch/bzip2 ) capstone? ( dev-libs/capstone:= ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.5.1 ) fuse? ( >=sys-fs/fuse-3.1:3 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle:= >=net-libs/gnutls-3.0:= ) gtk? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.91 ) ) infiniband? ( sys-cluster/rdma-core ) iscsi? ( net-libs/libiscsi ) io-uring? ( sys-libs/liburing:= ) jack? ( virtual/jack ) jemalloc? ( dev-libs/jemalloc ) jpeg? ( virtual/jpeg:0= ) lzo? ( dev-libs/lzo:2 ) multipath? ( sys-fs/multipath-tools ) ncurses? ( sys-libs/ncurses:=[unicode(+)] sys-libs/ncurses:= ) nfs? ( >=net-fs/libnfs-1.9.3:= ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl(+),gbm(+)] ) pam? ( sys-libs/pam ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( media-libs/libsdl2[video] media-libs/libsdl2 ) sdl-image? ( media-libs/sdl2-image ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) slirp? ( net-libs/libslirp ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy:= ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh-0.8.6 ) udev? ( virtual/libudev:= ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools:= ) zstd? ( >=app-arch/zstd-1.4.0 ) ) qemu_softmmu_targets_i386? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-202105[binary] ~sys-firmware/ipxe-1.21.1[binary,qemu] ~sys-firmware/seabios-1.14.0[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre10[binary] ) !pin-upstream-blobs? ( >=sys-firmware/edk2-ovmf-202105 sys-firmware/ipxe[qemu] >=sys-firmware/seabios-1.14.0[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_x86_64? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-202105[binary] ~sys-firmware/ipxe-1.21.1[binary,qemu] ~sys-firmware/seabios-1.14.0[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre10[binary] ) !pin-upstream-blobs? ( >=sys-firmware/edk2-ovmf-202105 sys-firmware/ipxe[qemu] >=sys-firmware/seabios-1.14.0[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_ppc? ( pin-upstream-blobs? ( ~sys-firmware/seabios-1.14.0[binary,seavgabios] ) !pin-upstream-blobs? ( >=sys-firmware/seabios-1.14.0[seavgabios] ) ) qemu_softmmu_targets_ppc64? ( pin-upstream-blobs? ( ~sys-firmware/seabios-1.14.0[binary,seavgabios] ) !pin-upstream-blobs? ( >=sys-firmware/seabios-1.14.0[seavgabios] ) ) acct-group/kvm selinux? ( sec-policy/selinux-qemu sys-libs/libselinux )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) qemu_softmmu_targets_arm? ( fdt ) qemu_softmmu_targets_microblaze? ( fdt ) qemu_softmmu_targets_mips64el? ( fdt ) qemu_softmmu_targets_ppc64? ( fdt ) qemu_softmmu_targets_ppc? ( fdt ) qemu_softmmu_targets_riscv32? ( fdt ) qemu_softmmu_targets_riscv64? ( fdt ) qemu_softmmu_targets_x86_64? ( fdt ) sdl-image? ( sdl ) static? ( static-user !alsa !gtk !jack !opengl !pam !pulseaudio !plugins !rbd !snappy !udev ) static-user? ( !plugins ) vhost-user-fs? ( caps seccomp ) virgl? ( opengl ) virtfs? ( caps xattr ) vnc? ( gnutls ) vte? ( gtk ) multipath? ( udev ) plugins? ( !static !static-user )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://download.qemu.org/qemu-7.0.0.tar.xz
-_eclasses_=fcaps	babe6282ea5c195981bd302af1adaf3a	linux-info	bbfa385d6907d7948d49a5e107bd654d	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	1542e649be915f43f6908a9e93909961	udev	eec0bbab06977f1cfc5597269c1fa152	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=0200a5e72a0860ce7d32bdf3689339f9
diff --git a/metadata/md5-cache/app-emulation/qemu-7.0.0-r2 b/metadata/md5-cache/app-emulation/qemu-7.0.0-r2
deleted file mode 100644
index bc6de8390379..000000000000
--- a/metadata/md5-cache/app-emulation/qemu-7.0.0-r2
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) dev-lang/perl sys-apps/texinfo virtual/pkgconfig doc? ( dev-python/sphinx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) gtk? ( nls? ( sys-devel/gettext ) ) test? ( dev-libs/glib[utils] sys-devel/bc ) virtual/pkgconfig
-DEFINED_PHASES=compile configure info install postinst postrm prepare pretend setup test
-DEPEND=!static? ( >=dev-libs/glib-2.0 sys-libs/zlib python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[ncurses,readline] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[ncurses,readline] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[ncurses,readline] ) ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr ) >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty[api] app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bpf? ( dev-libs/libbpf:= ) bzip2? ( app-arch/bzip2 ) capstone? ( dev-libs/capstone:= ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.5.1 ) fuse? ( >=sys-fs/fuse-3.1:3 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle:= >=net-libs/gnutls-3.0:= ) gtk? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.91 ) ) infiniband? ( sys-cluster/rdma-core ) iscsi? ( net-libs/libiscsi ) io-uring? ( sys-libs/liburing:= ) jack? ( virtual/jack ) jemalloc? ( dev-libs/jemalloc ) jpeg? ( media-libs/libjpeg-turbo:= ) lzo? ( dev-libs/lzo:2 ) multipath? ( sys-fs/multipath-tools ) ncurses? ( sys-libs/ncurses:=[unicode(+)] sys-libs/ncurses:= ) nfs? ( >=net-fs/libnfs-1.9.3:= ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl(+),gbm(+)] ) pam? ( sys-libs/pam ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( media-libs/libsdl2[video] media-libs/libsdl2 ) sdl-image? ( media-libs/sdl2-image ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) slirp? ( net-libs/libslirp ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy:= ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh-0.8.6 ) udev? ( virtual/libudev:= ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools:= ) zstd? ( >=app-arch/zstd-1.4.0 ) ) qemu_softmmu_targets_i386? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-202105[binary] ~sys-firmware/ipxe-1.21.1[binary,qemu] ~sys-firmware/seabios-1.14.0[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre10[binary] ) !pin-upstream-blobs? ( >=sys-firmware/edk2-ovmf-202105 sys-firmware/ipxe[qemu] >=sys-firmware/seabios-1.14.0[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_x86_64? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-202105[binary] ~sys-firmware/ipxe-1.21.1[binary,qemu] ~sys-firmware/seabios-1.14.0[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre10[binary] ) !pin-upstream-blobs? ( >=sys-firmware/edk2-ovmf-202105 sys-firmware/ipxe[qemu] >=sys-firmware/seabios-1.14.0[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_ppc? ( pin-upstream-blobs? ( ~sys-firmware/seabios-1.14.0[binary,seavgabios] ) !pin-upstream-blobs? ( >=sys-firmware/seabios-1.14.0[seavgabios] ) ) qemu_softmmu_targets_ppc64? ( pin-upstream-blobs? ( ~sys-firmware/seabios-1.14.0[binary,seavgabios] ) !pin-upstream-blobs? ( >=sys-firmware/seabios-1.14.0[seavgabios] ) ) kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 ) static? ( >=dev-libs/glib-2.0[static-libs(+)] sys-libs/zlib[static-libs(+)] python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[ncurses,readline] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[ncurses,readline] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[ncurses,readline] ) ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr[static-libs(+)] ) >=x11-libs/pixman-0.28.0[static-libs(+)] accessibility? ( app-accessibility/brltty[api] app-accessibility/brltty[static-libs(+)] ) aio? ( dev-libs/libaio[static-libs(+)] ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bpf? ( dev-libs/libbpf:= ) bzip2? ( app-arch/bzip2[static-libs(+)] ) capstone? ( dev-libs/capstone:= ) caps? ( sys-libs/libcap-ng[static-libs(+)] ) curl? ( >=net-misc/curl-7.15.4[static-libs(+)] ) fdt? ( >=sys-apps/dtc-1.5.1[static-libs(+)] ) fuse? ( >=sys-fs/fuse-3.1:3[static-libs(+)] ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] ) gnutls? ( dev-libs/nettle:=[static-libs(+)] >=net-libs/gnutls-3.0:=[static-libs(+)] ) gtk? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.91 ) ) infiniband? ( sys-cluster/rdma-core[static-libs(+)] ) iscsi? ( net-libs/libiscsi ) io-uring? ( sys-libs/liburing:=[static-libs(+)] ) jack? ( virtual/jack ) jemalloc? ( dev-libs/jemalloc ) jpeg? ( media-libs/libjpeg-turbo:=[static-libs(+)] ) lzo? ( dev-libs/lzo:2[static-libs(+)] ) multipath? ( sys-fs/multipath-tools ) ncurses? ( sys-libs/ncurses:=[unicode(+)] sys-libs/ncurses:=[static-libs(+)] ) nfs? ( >=net-fs/libnfs-1.9.3:=[static-libs(+)] ) numa? ( sys-process/numactl[static-libs(+)] ) opengl? ( virtual/opengl media-libs/libepoxy[static-libs(+)] media-libs/mesa[static-libs(+)] media-libs/mesa[egl(+),gbm(+)] ) pam? ( sys-libs/pam ) png? ( media-libs/libpng:0=[static-libs(+)] ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl[static-libs(+)] ) sdl? ( media-libs/libsdl2[video] media-libs/libsdl2[static-libs(+)] ) sdl-image? ( media-libs/sdl2-image[static-libs(+)] ) seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] ) slirp? ( net-libs/libslirp[static-libs(+)] ) smartcard? ( >=app-emulation/libcacard-2.5.0[static-libs(+)] ) snappy? ( app-arch/snappy:= ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0[static-libs(+)] ) ssh? ( >=net-libs/libssh-0.8.6[static-libs(+)] ) udev? ( virtual/libudev:= ) usb? ( >=virtual/libusb-1-r2[static-libs(+)] ) usbredir? ( >=sys-apps/usbredir-0.6[static-libs(+)] ) vde? ( net-misc/vde[static-libs(+)] ) virgl? ( media-libs/virglrenderer[static-libs(+)] ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools:= ) zstd? ( >=app-arch/zstd-1.4.0[static-libs(+)] ) ) static-user? ( >=dev-libs/glib-2.0[static-libs(+)] sys-libs/zlib[static-libs(+)] python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[ncurses,readline] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[ncurses,readline] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[ncurses,readline] ) ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr[static-libs(+)] ) )
-DESCRIPTION=QEMU + Kernel-based Virtual Machine userland tools
-EAPI=8
-HOMEPAGE=https://www.qemu.org https://www.linux-kvm.org
-IDEPEND=filecaps? ( sys-libs/libcap )
-INHERIT=linux-info toolchain-funcs python-r1 udev fcaps readme.gentoo-r1 pax-utils xdg-utils
-IUSE=accessibility +aio alsa bpf bzip2 capstone +caps +curl debug +doc +fdt fuse glusterfs +gnutls gtk infiniband iscsi io-uring jack jemalloc +jpeg lzo multipath ncurses nfs nls numa opengl +oss pam +pin-upstream-blobs plugins +png pulseaudio python rbd sasl +seccomp sdl sdl-image selinux +slirp smartcard snappy spice ssh static static-user systemtap test udev usb usbredir vde +vhost-net vhost-user-fs virgl virtfs +vnc vte xattr xen zstd qemu_softmmu_targets_aarch64 qemu_softmmu_targets_alpha qemu_softmmu_targets_arm qemu_softmmu_targets_cris qemu_softmmu_targets_hppa qemu_softmmu_targets_i386 qemu_softmmu_targets_m68k qemu_softmmu_targets_microblaze qemu_softmmu_targets_microblazeel qemu_softmmu_targets_mips qemu_softmmu_targets_mips64 qemu_softmmu_targets_mips64el qemu_softmmu_targets_mipsel qemu_softmmu_targets_nios2 qemu_softmmu_targets_or1k qemu_softmmu_targets_ppc qemu_softmmu_targets_ppc64 qemu_softmmu_targets_riscv32 qemu_softmmu_targets_riscv64 qemu_softmmu_targets_s390x qemu_softmmu_targets_sh4 qemu_softmmu_targets_sh4eb qemu_softmmu_targets_sparc qemu_softmmu_targets_sparc64 qemu_softmmu_targets_x86_64 qemu_softmmu_targets_xtensa qemu_softmmu_targets_xtensaeb qemu_softmmu_targets_avr qemu_softmmu_targets_rx qemu_softmmu_targets_tricore qemu_user_targets_aarch64 qemu_user_targets_alpha qemu_user_targets_arm qemu_user_targets_cris qemu_user_targets_hppa qemu_user_targets_i386 qemu_user_targets_m68k qemu_user_targets_microblaze qemu_user_targets_microblazeel qemu_user_targets_mips qemu_user_targets_mips64 qemu_user_targets_mips64el qemu_user_targets_mipsel qemu_user_targets_nios2 qemu_user_targets_or1k qemu_user_targets_ppc qemu_user_targets_ppc64 qemu_user_targets_riscv32 qemu_user_targets_riscv64 qemu_user_targets_s390x qemu_user_targets_sh4 qemu_user_targets_sh4eb qemu_user_targets_sparc qemu_user_targets_sparc64 qemu_user_targets_x86_64 qemu_user_targets_xtensa qemu_user_targets_xtensaeb qemu_user_targets_aarch64_be qemu_user_targets_armeb qemu_user_targets_hexagon qemu_user_targets_mipsn32 qemu_user_targets_mipsn32el qemu_user_targets_ppc64le qemu_user_targets_sparc32plus python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 +filecaps
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86
-LICENSE=GPL-2 LGPL-2 BSD-2
-RDEPEND=!static? ( >=dev-libs/glib-2.0 sys-libs/zlib python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[ncurses,readline] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[ncurses,readline] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[ncurses,readline] ) ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr ) >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty[api] app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bpf? ( dev-libs/libbpf:= ) bzip2? ( app-arch/bzip2 ) capstone? ( dev-libs/capstone:= ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.5.1 ) fuse? ( >=sys-fs/fuse-3.1:3 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle:= >=net-libs/gnutls-3.0:= ) gtk? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.91 ) ) infiniband? ( sys-cluster/rdma-core ) iscsi? ( net-libs/libiscsi ) io-uring? ( sys-libs/liburing:= ) jack? ( virtual/jack ) jemalloc? ( dev-libs/jemalloc ) jpeg? ( media-libs/libjpeg-turbo:= ) lzo? ( dev-libs/lzo:2 ) multipath? ( sys-fs/multipath-tools ) ncurses? ( sys-libs/ncurses:=[unicode(+)] sys-libs/ncurses:= ) nfs? ( >=net-fs/libnfs-1.9.3:= ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl(+),gbm(+)] ) pam? ( sys-libs/pam ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( media-libs/libsdl2[video] media-libs/libsdl2 ) sdl-image? ( media-libs/sdl2-image ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) slirp? ( net-libs/libslirp ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy:= ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh-0.8.6 ) udev? ( virtual/libudev:= ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools:= ) zstd? ( >=app-arch/zstd-1.4.0 ) ) qemu_softmmu_targets_i386? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-202105[binary] ~sys-firmware/ipxe-1.21.1[binary,qemu] ~sys-firmware/seabios-1.14.0[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre10[binary] ) !pin-upstream-blobs? ( >=sys-firmware/edk2-ovmf-202105 sys-firmware/ipxe[qemu] >=sys-firmware/seabios-1.14.0[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_x86_64? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-202105[binary] ~sys-firmware/ipxe-1.21.1[binary,qemu] ~sys-firmware/seabios-1.14.0[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre10[binary] ) !pin-upstream-blobs? ( >=sys-firmware/edk2-ovmf-202105 sys-firmware/ipxe[qemu] >=sys-firmware/seabios-1.14.0[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_ppc? ( pin-upstream-blobs? ( ~sys-firmware/seabios-1.14.0[binary,seavgabios] ) !pin-upstream-blobs? ( >=sys-firmware/seabios-1.14.0[seavgabios] ) ) qemu_softmmu_targets_ppc64? ( pin-upstream-blobs? ( ~sys-firmware/seabios-1.14.0[binary,seavgabios] ) !pin-upstream-blobs? ( >=sys-firmware/seabios-1.14.0[seavgabios] ) ) acct-group/kvm selinux? ( sec-policy/selinux-qemu sys-libs/libselinux )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) qemu_softmmu_targets_arm? ( fdt ) qemu_softmmu_targets_microblaze? ( fdt ) qemu_softmmu_targets_mips64el? ( fdt ) qemu_softmmu_targets_ppc64? ( fdt ) qemu_softmmu_targets_ppc? ( fdt ) qemu_softmmu_targets_riscv32? ( fdt ) qemu_softmmu_targets_riscv64? ( fdt ) qemu_softmmu_targets_x86_64? ( fdt ) sdl-image? ( sdl ) static? ( static-user !alsa !gtk !jack !opengl !pam !pulseaudio !plugins !rbd !snappy !udev ) static-user? ( !plugins ) vhost-user-fs? ( caps seccomp ) virgl? ( opengl ) virtfs? ( caps xattr ) vnc? ( gnutls ) vte? ( gtk ) multipath? ( udev ) plugins? ( !static !static-user )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://download.qemu.org/qemu-7.0.0.tar.xz
-_eclasses_=fcaps	babe6282ea5c195981bd302af1adaf3a	linux-info	bbfa385d6907d7948d49a5e107bd654d	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	1542e649be915f43f6908a9e93909961	udev	eec0bbab06977f1cfc5597269c1fa152	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=d0f647546a524db33639e4397ba66136
diff --git a/metadata/md5-cache/app-emulation/qemu-7.0.0-r3 b/metadata/md5-cache/app-emulation/qemu-7.0.0-r3
index 607bc43ec4e0..a30bf2f51fb4 100644
--- a/metadata/md5-cache/app-emulation/qemu-7.0.0-r3
+++ b/metadata/md5-cache/app-emulation/qemu-7.0.0-r3
@@ -1,18 +1,18 @@
-BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) dev-lang/perl sys-apps/texinfo virtual/pkgconfig doc? ( dev-python/sphinx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) gtk? ( nls? ( sys-devel/gettext ) ) test? ( dev-libs/glib[utils] sys-devel/bc ) virtual/pkgconfig
+BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) dev-lang/perl sys-apps/texinfo virtual/pkgconfig doc? ( dev-python/sphinx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) gtk? ( nls? ( sys-devel/gettext ) ) test? ( dev-libs/glib[utils] sys-devel/bc ) virtual/pkgconfig
 DEFINED_PHASES=compile configure info install postinst postrm prepare pretend setup test
-DEPEND=!static? ( >=dev-libs/glib-2.0 sys-libs/zlib python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[ncurses,readline] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[ncurses,readline] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[ncurses,readline] ) ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr ) >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty[api] app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bpf? ( dev-libs/libbpf:= ) bzip2? ( app-arch/bzip2 ) capstone? ( dev-libs/capstone:= ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.5.1 ) fuse? ( >=sys-fs/fuse-3.1:3 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle:= >=net-libs/gnutls-3.0:= ) gtk? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.91 ) ) infiniband? ( sys-cluster/rdma-core ) iscsi? ( net-libs/libiscsi ) io-uring? ( sys-libs/liburing:= ) jack? ( virtual/jack ) jemalloc? ( dev-libs/jemalloc ) jpeg? ( media-libs/libjpeg-turbo:= ) lzo? ( dev-libs/lzo:2 ) multipath? ( sys-fs/multipath-tools ) ncurses? ( sys-libs/ncurses:=[unicode(+)] sys-libs/ncurses:= ) nfs? ( >=net-fs/libnfs-1.9.3:= ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl(+),gbm(+)] ) pam? ( sys-libs/pam ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( media-libs/libsdl2[video] media-libs/libsdl2 ) sdl-image? ( media-libs/sdl2-image ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) slirp? ( net-libs/libslirp ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy:= ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh-0.8.6 ) udev? ( virtual/libudev:= ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools:= ) zstd? ( >=app-arch/zstd-1.4.0 ) ) qemu_softmmu_targets_i386? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-202105[binary] ~sys-firmware/ipxe-1.21.1[binary,qemu] ~sys-firmware/seabios-1.14.0[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre10[binary] ) !pin-upstream-blobs? ( >=sys-firmware/edk2-ovmf-202105 sys-firmware/ipxe[qemu] >=sys-firmware/seabios-1.14.0[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_x86_64? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-202105[binary] ~sys-firmware/ipxe-1.21.1[binary,qemu] ~sys-firmware/seabios-1.14.0[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre10[binary] ) !pin-upstream-blobs? ( >=sys-firmware/edk2-ovmf-202105 sys-firmware/ipxe[qemu] >=sys-firmware/seabios-1.14.0[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_ppc? ( pin-upstream-blobs? ( ~sys-firmware/seabios-1.14.0[binary,seavgabios] ) !pin-upstream-blobs? ( >=sys-firmware/seabios-1.14.0[seavgabios] ) ) qemu_softmmu_targets_ppc64? ( pin-upstream-blobs? ( ~sys-firmware/seabios-1.14.0[binary,seavgabios] ) !pin-upstream-blobs? ( >=sys-firmware/seabios-1.14.0[seavgabios] ) ) kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 ) static? ( >=dev-libs/glib-2.0[static-libs(+)] sys-libs/zlib[static-libs(+)] python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[ncurses,readline] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[ncurses,readline] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[ncurses,readline] ) ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr[static-libs(+)] ) >=x11-libs/pixman-0.28.0[static-libs(+)] accessibility? ( app-accessibility/brltty[api] app-accessibility/brltty[static-libs(+)] ) aio? ( dev-libs/libaio[static-libs(+)] ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bpf? ( dev-libs/libbpf:= ) bzip2? ( app-arch/bzip2[static-libs(+)] ) capstone? ( dev-libs/capstone:= ) caps? ( sys-libs/libcap-ng[static-libs(+)] ) curl? ( >=net-misc/curl-7.15.4[static-libs(+)] ) fdt? ( >=sys-apps/dtc-1.5.1[static-libs(+)] ) fuse? ( >=sys-fs/fuse-3.1:3[static-libs(+)] ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] ) gnutls? ( dev-libs/nettle:=[static-libs(+)] >=net-libs/gnutls-3.0:=[static-libs(+)] ) gtk? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.91 ) ) infiniband? ( sys-cluster/rdma-core[static-libs(+)] ) iscsi? ( net-libs/libiscsi ) io-uring? ( sys-libs/liburing:=[static-libs(+)] ) jack? ( virtual/jack ) jemalloc? ( dev-libs/jemalloc ) jpeg? ( media-libs/libjpeg-turbo:=[static-libs(+)] ) lzo? ( dev-libs/lzo:2[static-libs(+)] ) multipath? ( sys-fs/multipath-tools ) ncurses? ( sys-libs/ncurses:=[unicode(+)] sys-libs/ncurses:=[static-libs(+)] ) nfs? ( >=net-fs/libnfs-1.9.3:=[static-libs(+)] ) numa? ( sys-process/numactl[static-libs(+)] ) opengl? ( virtual/opengl media-libs/libepoxy[static-libs(+)] media-libs/mesa[static-libs(+)] media-libs/mesa[egl(+),gbm(+)] ) pam? ( sys-libs/pam ) png? ( media-libs/libpng:0=[static-libs(+)] ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl[static-libs(+)] ) sdl? ( media-libs/libsdl2[video] media-libs/libsdl2[static-libs(+)] ) sdl-image? ( media-libs/sdl2-image[static-libs(+)] ) seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] ) slirp? ( net-libs/libslirp[static-libs(+)] ) smartcard? ( >=app-emulation/libcacard-2.5.0[static-libs(+)] ) snappy? ( app-arch/snappy:= ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0[static-libs(+)] ) ssh? ( >=net-libs/libssh-0.8.6[static-libs(+)] ) udev? ( virtual/libudev:= ) usb? ( >=virtual/libusb-1-r2[static-libs(+)] ) usbredir? ( >=sys-apps/usbredir-0.6[static-libs(+)] ) vde? ( net-misc/vde[static-libs(+)] ) virgl? ( media-libs/virglrenderer[static-libs(+)] ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools:= ) zstd? ( >=app-arch/zstd-1.4.0[static-libs(+)] ) ) static-user? ( >=dev-libs/glib-2.0[static-libs(+)] sys-libs/zlib[static-libs(+)] python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[ncurses,readline] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[ncurses,readline] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[ncurses,readline] ) ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr[static-libs(+)] ) )
+DEPEND=!static? ( >=dev-libs/glib-2.0 sys-libs/zlib python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[ncurses,readline] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[ncurses,readline] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[ncurses,readline] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[ncurses,readline] ) ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr ) >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty[api] app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bpf? ( dev-libs/libbpf:= ) bzip2? ( app-arch/bzip2 ) capstone? ( dev-libs/capstone:= ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.5.1 ) fuse? ( >=sys-fs/fuse-3.1:3 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle:= >=net-libs/gnutls-3.0:= ) gtk? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.91 ) ) infiniband? ( sys-cluster/rdma-core ) iscsi? ( net-libs/libiscsi ) io-uring? ( sys-libs/liburing:= ) jack? ( virtual/jack ) jemalloc? ( dev-libs/jemalloc ) jpeg? ( media-libs/libjpeg-turbo:= ) lzo? ( dev-libs/lzo:2 ) multipath? ( sys-fs/multipath-tools ) ncurses? ( sys-libs/ncurses:=[unicode(+)] sys-libs/ncurses:= ) nfs? ( >=net-fs/libnfs-1.9.3:= ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl(+),gbm(+)] ) pam? ( sys-libs/pam ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( media-libs/libsdl2[video] media-libs/libsdl2 ) sdl-image? ( media-libs/sdl2-image ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) slirp? ( net-libs/libslirp ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy:= ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh-0.8.6 ) udev? ( virtual/libudev:= ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools:= ) zstd? ( >=app-arch/zstd-1.4.0 ) ) qemu_softmmu_targets_i386? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-202105[binary] ~sys-firmware/ipxe-1.21.1[binary,qemu] ~sys-firmware/seabios-1.14.0[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre10[binary] ) !pin-upstream-blobs? ( >=sys-firmware/edk2-ovmf-202105 sys-firmware/ipxe[qemu] >=sys-firmware/seabios-1.14.0[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_x86_64? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-202105[binary] ~sys-firmware/ipxe-1.21.1[binary,qemu] ~sys-firmware/seabios-1.14.0[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre10[binary] ) !pin-upstream-blobs? ( >=sys-firmware/edk2-ovmf-202105 sys-firmware/ipxe[qemu] >=sys-firmware/seabios-1.14.0[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_ppc? ( pin-upstream-blobs? ( ~sys-firmware/seabios-1.14.0[binary,seavgabios] ) !pin-upstream-blobs? ( >=sys-firmware/seabios-1.14.0[seavgabios] ) ) qemu_softmmu_targets_ppc64? ( pin-upstream-blobs? ( ~sys-firmware/seabios-1.14.0[binary,seavgabios] ) !pin-upstream-blobs? ( >=sys-firmware/seabios-1.14.0[seavgabios] ) ) kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 ) static? ( >=dev-libs/glib-2.0[static-libs(+)] sys-libs/zlib[static-libs(+)] python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[ncurses,readline] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[ncurses,readline] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[ncurses,readline] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[ncurses,readline] ) ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr[static-libs(+)] ) >=x11-libs/pixman-0.28.0[static-libs(+)] accessibility? ( app-accessibility/brltty[api] app-accessibility/brltty[static-libs(+)] ) aio? ( dev-libs/libaio[static-libs(+)] ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bpf? ( dev-libs/libbpf:= ) bzip2? ( app-arch/bzip2[static-libs(+)] ) capstone? ( dev-libs/capstone:= ) caps? ( sys-libs/libcap-ng[static-libs(+)] ) curl? ( >=net-misc/curl-7.15.4[static-libs(+)] ) fdt? ( >=sys-apps/dtc-1.5.1[static-libs(+)] ) fuse? ( >=sys-fs/fuse-3.1:3[static-libs(+)] ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] ) gnutls? ( dev-libs/nettle:=[static-libs(+)] >=net-libs/gnutls-3.0:=[static-libs(+)] ) gtk? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.91 ) ) infiniband? ( sys-cluster/rdma-core[static-libs(+)] ) iscsi? ( net-libs/libiscsi ) io-uring? ( sys-libs/liburing:=[static-libs(+)] ) jack? ( virtual/jack ) jemalloc? ( dev-libs/jemalloc ) jpeg? ( media-libs/libjpeg-turbo:=[static-libs(+)] ) lzo? ( dev-libs/lzo:2[static-libs(+)] ) multipath? ( sys-fs/multipath-tools ) ncurses? ( sys-libs/ncurses:=[unicode(+)] sys-libs/ncurses:=[static-libs(+)] ) nfs? ( >=net-fs/libnfs-1.9.3:=[static-libs(+)] ) numa? ( sys-process/numactl[static-libs(+)] ) opengl? ( virtual/opengl media-libs/libepoxy[static-libs(+)] media-libs/mesa[static-libs(+)] media-libs/mesa[egl(+),gbm(+)] ) pam? ( sys-libs/pam ) png? ( media-libs/libpng:0=[static-libs(+)] ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl[static-libs(+)] ) sdl? ( media-libs/libsdl2[video] media-libs/libsdl2[static-libs(+)] ) sdl-image? ( media-libs/sdl2-image[static-libs(+)] ) seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] ) slirp? ( net-libs/libslirp[static-libs(+)] ) smartcard? ( >=app-emulation/libcacard-2.5.0[static-libs(+)] ) snappy? ( app-arch/snappy:= ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0[static-libs(+)] ) ssh? ( >=net-libs/libssh-0.8.6[static-libs(+)] ) udev? ( virtual/libudev:= ) usb? ( >=virtual/libusb-1-r2[static-libs(+)] ) usbredir? ( >=sys-apps/usbredir-0.6[static-libs(+)] ) vde? ( net-misc/vde[static-libs(+)] ) virgl? ( media-libs/virglrenderer[static-libs(+)] ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools:= ) zstd? ( >=app-arch/zstd-1.4.0[static-libs(+)] ) ) static-user? ( >=dev-libs/glib-2.0[static-libs(+)] sys-libs/zlib[static-libs(+)] python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[ncurses,readline] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[ncurses,readline] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[ncurses,readline] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[ncurses,readline] ) ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr[static-libs(+)] ) )
 DESCRIPTION=QEMU + Kernel-based Virtual Machine userland tools
 EAPI=8
 HOMEPAGE=https://www.qemu.org https://www.linux-kvm.org
 IDEPEND=filecaps? ( sys-libs/libcap )
 INHERIT=linux-info toolchain-funcs python-r1 udev fcaps readme.gentoo-r1 pax-utils xdg-utils
-IUSE=accessibility +aio alsa bpf bzip2 capstone +caps +curl debug doc +fdt fuse glusterfs +gnutls gtk infiniband iscsi io-uring jack jemalloc +jpeg lzo multipath ncurses nfs nls numa opengl +oss pam +pin-upstream-blobs plugins +png pulseaudio python rbd sasl +seccomp sdl sdl-image selinux +slirp smartcard snappy spice ssh static static-user systemtap test udev usb usbredir vde +vhost-net vhost-user-fs virgl virtfs +vnc vte xattr xen zstd qemu_softmmu_targets_aarch64 qemu_softmmu_targets_alpha qemu_softmmu_targets_arm qemu_softmmu_targets_cris qemu_softmmu_targets_hppa qemu_softmmu_targets_i386 qemu_softmmu_targets_m68k qemu_softmmu_targets_microblaze qemu_softmmu_targets_microblazeel qemu_softmmu_targets_mips qemu_softmmu_targets_mips64 qemu_softmmu_targets_mips64el qemu_softmmu_targets_mipsel qemu_softmmu_targets_nios2 qemu_softmmu_targets_or1k qemu_softmmu_targets_ppc qemu_softmmu_targets_ppc64 qemu_softmmu_targets_riscv32 qemu_softmmu_targets_riscv64 qemu_softmmu_targets_s390x qemu_softmmu_targets_sh4 qemu_softmmu_targets_sh4eb qemu_softmmu_targets_sparc qemu_softmmu_targets_sparc64 qemu_softmmu_targets_x86_64 qemu_softmmu_targets_xtensa qemu_softmmu_targets_xtensaeb qemu_softmmu_targets_avr qemu_softmmu_targets_rx qemu_softmmu_targets_tricore qemu_user_targets_aarch64 qemu_user_targets_alpha qemu_user_targets_arm qemu_user_targets_cris qemu_user_targets_hppa qemu_user_targets_i386 qemu_user_targets_m68k qemu_user_targets_microblaze qemu_user_targets_microblazeel qemu_user_targets_mips qemu_user_targets_mips64 qemu_user_targets_mips64el qemu_user_targets_mipsel qemu_user_targets_nios2 qemu_user_targets_or1k qemu_user_targets_ppc qemu_user_targets_ppc64 qemu_user_targets_riscv32 qemu_user_targets_riscv64 qemu_user_targets_s390x qemu_user_targets_sh4 qemu_user_targets_sh4eb qemu_user_targets_sparc qemu_user_targets_sparc64 qemu_user_targets_x86_64 qemu_user_targets_xtensa qemu_user_targets_xtensaeb qemu_user_targets_aarch64_be qemu_user_targets_armeb qemu_user_targets_hexagon qemu_user_targets_mipsn32 qemu_user_targets_mipsn32el qemu_user_targets_ppc64le qemu_user_targets_sparc32plus python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 +filecaps
+IUSE=accessibility +aio alsa bpf bzip2 capstone +caps +curl debug doc +fdt fuse glusterfs +gnutls gtk infiniband iscsi io-uring jack jemalloc +jpeg lzo multipath ncurses nfs nls numa opengl +oss pam +pin-upstream-blobs plugins +png pulseaudio python rbd sasl +seccomp sdl sdl-image selinux +slirp smartcard snappy spice ssh static static-user systemtap test udev usb usbredir vde +vhost-net vhost-user-fs virgl virtfs +vnc vte xattr xen zstd qemu_softmmu_targets_aarch64 qemu_softmmu_targets_alpha qemu_softmmu_targets_arm qemu_softmmu_targets_cris qemu_softmmu_targets_hppa qemu_softmmu_targets_i386 qemu_softmmu_targets_m68k qemu_softmmu_targets_microblaze qemu_softmmu_targets_microblazeel qemu_softmmu_targets_mips qemu_softmmu_targets_mips64 qemu_softmmu_targets_mips64el qemu_softmmu_targets_mipsel qemu_softmmu_targets_nios2 qemu_softmmu_targets_or1k qemu_softmmu_targets_ppc qemu_softmmu_targets_ppc64 qemu_softmmu_targets_riscv32 qemu_softmmu_targets_riscv64 qemu_softmmu_targets_s390x qemu_softmmu_targets_sh4 qemu_softmmu_targets_sh4eb qemu_softmmu_targets_sparc qemu_softmmu_targets_sparc64 qemu_softmmu_targets_x86_64 qemu_softmmu_targets_xtensa qemu_softmmu_targets_xtensaeb qemu_softmmu_targets_avr qemu_softmmu_targets_rx qemu_softmmu_targets_tricore qemu_user_targets_aarch64 qemu_user_targets_alpha qemu_user_targets_arm qemu_user_targets_cris qemu_user_targets_hppa qemu_user_targets_i386 qemu_user_targets_m68k qemu_user_targets_microblaze qemu_user_targets_microblazeel qemu_user_targets_mips qemu_user_targets_mips64 qemu_user_targets_mips64el qemu_user_targets_mipsel qemu_user_targets_nios2 qemu_user_targets_or1k qemu_user_targets_ppc qemu_user_targets_ppc64 qemu_user_targets_riscv32 qemu_user_targets_riscv64 qemu_user_targets_s390x qemu_user_targets_sh4 qemu_user_targets_sh4eb qemu_user_targets_sparc qemu_user_targets_sparc64 qemu_user_targets_x86_64 qemu_user_targets_xtensa qemu_user_targets_xtensaeb qemu_user_targets_aarch64_be qemu_user_targets_armeb qemu_user_targets_hexagon qemu_user_targets_mipsn32 qemu_user_targets_mipsn32el qemu_user_targets_ppc64le qemu_user_targets_sparc32plus python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 +filecaps
 KEYWORDS=amd64 ~arm arm64 ~loong ~ppc ppc64 ~riscv x86
 LICENSE=GPL-2 LGPL-2 BSD-2
-RDEPEND=!static? ( >=dev-libs/glib-2.0 sys-libs/zlib python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[ncurses,readline] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[ncurses,readline] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[ncurses,readline] ) ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr ) >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty[api] app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bpf? ( dev-libs/libbpf:= ) bzip2? ( app-arch/bzip2 ) capstone? ( dev-libs/capstone:= ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.5.1 ) fuse? ( >=sys-fs/fuse-3.1:3 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle:= >=net-libs/gnutls-3.0:= ) gtk? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.91 ) ) infiniband? ( sys-cluster/rdma-core ) iscsi? ( net-libs/libiscsi ) io-uring? ( sys-libs/liburing:= ) jack? ( virtual/jack ) jemalloc? ( dev-libs/jemalloc ) jpeg? ( media-libs/libjpeg-turbo:= ) lzo? ( dev-libs/lzo:2 ) multipath? ( sys-fs/multipath-tools ) ncurses? ( sys-libs/ncurses:=[unicode(+)] sys-libs/ncurses:= ) nfs? ( >=net-fs/libnfs-1.9.3:= ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl(+),gbm(+)] ) pam? ( sys-libs/pam ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( media-libs/libsdl2[video] media-libs/libsdl2 ) sdl-image? ( media-libs/sdl2-image ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) slirp? ( net-libs/libslirp ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy:= ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh-0.8.6 ) udev? ( virtual/libudev:= ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools:= ) zstd? ( >=app-arch/zstd-1.4.0 ) ) qemu_softmmu_targets_i386? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-202105[binary] ~sys-firmware/ipxe-1.21.1[binary,qemu] ~sys-firmware/seabios-1.14.0[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre10[binary] ) !pin-upstream-blobs? ( >=sys-firmware/edk2-ovmf-202105 sys-firmware/ipxe[qemu] >=sys-firmware/seabios-1.14.0[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_x86_64? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-202105[binary] ~sys-firmware/ipxe-1.21.1[binary,qemu] ~sys-firmware/seabios-1.14.0[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre10[binary] ) !pin-upstream-blobs? ( >=sys-firmware/edk2-ovmf-202105 sys-firmware/ipxe[qemu] >=sys-firmware/seabios-1.14.0[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_ppc? ( pin-upstream-blobs? ( ~sys-firmware/seabios-1.14.0[binary,seavgabios] ) !pin-upstream-blobs? ( >=sys-firmware/seabios-1.14.0[seavgabios] ) ) qemu_softmmu_targets_ppc64? ( pin-upstream-blobs? ( ~sys-firmware/seabios-1.14.0[binary,seavgabios] ) !pin-upstream-blobs? ( >=sys-firmware/seabios-1.14.0[seavgabios] ) ) acct-group/kvm selinux? ( sec-policy/selinux-qemu sys-libs/libselinux )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) qemu_softmmu_targets_arm? ( fdt ) qemu_softmmu_targets_microblaze? ( fdt ) qemu_softmmu_targets_mips64el? ( fdt ) qemu_softmmu_targets_ppc64? ( fdt ) qemu_softmmu_targets_ppc? ( fdt ) qemu_softmmu_targets_riscv32? ( fdt ) qemu_softmmu_targets_riscv64? ( fdt ) qemu_softmmu_targets_x86_64? ( fdt ) sdl-image? ( sdl ) static? ( static-user !alsa !gtk !jack !opengl !pam !pulseaudio !plugins !rbd !snappy !udev ) static-user? ( !plugins ) vhost-user-fs? ( caps seccomp ) virgl? ( opengl ) virtfs? ( caps xattr ) vnc? ( gnutls ) vte? ( gtk ) multipath? ( udev ) plugins? ( !static !static-user )
+RDEPEND=!static? ( >=dev-libs/glib-2.0 sys-libs/zlib python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[ncurses,readline] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[ncurses,readline] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[ncurses,readline] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[ncurses,readline] ) ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr ) >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty[api] app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bpf? ( dev-libs/libbpf:= ) bzip2? ( app-arch/bzip2 ) capstone? ( dev-libs/capstone:= ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.5.1 ) fuse? ( >=sys-fs/fuse-3.1:3 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle:= >=net-libs/gnutls-3.0:= ) gtk? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.91 ) ) infiniband? ( sys-cluster/rdma-core ) iscsi? ( net-libs/libiscsi ) io-uring? ( sys-libs/liburing:= ) jack? ( virtual/jack ) jemalloc? ( dev-libs/jemalloc ) jpeg? ( media-libs/libjpeg-turbo:= ) lzo? ( dev-libs/lzo:2 ) multipath? ( sys-fs/multipath-tools ) ncurses? ( sys-libs/ncurses:=[unicode(+)] sys-libs/ncurses:= ) nfs? ( >=net-fs/libnfs-1.9.3:= ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl(+),gbm(+)] ) pam? ( sys-libs/pam ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( media-libs/libsdl2[video] media-libs/libsdl2 ) sdl-image? ( media-libs/sdl2-image ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) slirp? ( net-libs/libslirp ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy:= ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh-0.8.6 ) udev? ( virtual/libudev:= ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools:= ) zstd? ( >=app-arch/zstd-1.4.0 ) ) qemu_softmmu_targets_i386? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-202105[binary] ~sys-firmware/ipxe-1.21.1[binary,qemu] ~sys-firmware/seabios-1.14.0[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre10[binary] ) !pin-upstream-blobs? ( >=sys-firmware/edk2-ovmf-202105 sys-firmware/ipxe[qemu] >=sys-firmware/seabios-1.14.0[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_x86_64? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-202105[binary] ~sys-firmware/ipxe-1.21.1[binary,qemu] ~sys-firmware/seabios-1.14.0[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre10[binary] ) !pin-upstream-blobs? ( >=sys-firmware/edk2-ovmf-202105 sys-firmware/ipxe[qemu] >=sys-firmware/seabios-1.14.0[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_ppc? ( pin-upstream-blobs? ( ~sys-firmware/seabios-1.14.0[binary,seavgabios] ) !pin-upstream-blobs? ( >=sys-firmware/seabios-1.14.0[seavgabios] ) ) qemu_softmmu_targets_ppc64? ( pin-upstream-blobs? ( ~sys-firmware/seabios-1.14.0[binary,seavgabios] ) !pin-upstream-blobs? ( >=sys-firmware/seabios-1.14.0[seavgabios] ) ) acct-group/kvm selinux? ( sec-policy/selinux-qemu sys-libs/libselinux )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 ) qemu_softmmu_targets_arm? ( fdt ) qemu_softmmu_targets_microblaze? ( fdt ) qemu_softmmu_targets_mips64el? ( fdt ) qemu_softmmu_targets_ppc64? ( fdt ) qemu_softmmu_targets_ppc? ( fdt ) qemu_softmmu_targets_riscv32? ( fdt ) qemu_softmmu_targets_riscv64? ( fdt ) qemu_softmmu_targets_x86_64? ( fdt ) sdl-image? ( sdl ) static? ( static-user !alsa !gtk !jack !opengl !pam !pulseaudio !plugins !rbd !snappy !udev ) static-user? ( !plugins ) vhost-user-fs? ( caps seccomp ) virgl? ( opengl ) virtfs? ( caps xattr ) vnc? ( gnutls ) vte? ( gtk ) multipath? ( udev ) plugins? ( !static !static-user )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://download.qemu.org/qemu-7.0.0.tar.xz !doc? ( https://dev.gentoo.org/~sam/distfiles/app-emulation/qemu/qemu-7.0.0-docs.tar.xz )
 _eclasses_=fcaps	babe6282ea5c195981bd302af1adaf3a	linux-info	bbfa385d6907d7948d49a5e107bd654d	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	1542e649be915f43f6908a9e93909961	udev	eec0bbab06977f1cfc5597269c1fa152	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=b386040b98bc568da07a289902b5e615
+_md5_=5376bb46b6c7e1c5971bc153bdb21f4b
diff --git a/metadata/md5-cache/app-emulation/qemu-7.1.0 b/metadata/md5-cache/app-emulation/qemu-7.1.0
index 94405ff46bad..d2519179130b 100644
--- a/metadata/md5-cache/app-emulation/qemu-7.1.0
+++ b/metadata/md5-cache/app-emulation/qemu-7.1.0
@@ -1,17 +1,18 @@
-BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) dev-lang/perl dev-util/meson sys-apps/texinfo virtual/pkgconfig doc? ( dev-python/sphinx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) gtk? ( nls? ( sys-devel/gettext ) ) test? ( dev-libs/glib[utils] sys-devel/bc ) virtual/pkgconfig
+BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) dev-lang/perl dev-util/meson sys-apps/texinfo virtual/pkgconfig doc? ( dev-python/sphinx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) gtk? ( nls? ( sys-devel/gettext ) ) test? ( dev-libs/glib[utils] sys-devel/bc ) virtual/pkgconfig
 DEFINED_PHASES=compile configure info install postinst postrm prepare pretend setup test
-DEPEND=!static? ( >=dev-libs/glib-2.0 sys-libs/zlib python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[ncurses,readline] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[ncurses,readline] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[ncurses,readline] ) ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr ) >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty[api] app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bpf? ( dev-libs/libbpf:= ) bzip2? ( app-arch/bzip2 ) capstone? ( dev-libs/capstone:= ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.5.1 ) fuse? ( >=sys-fs/fuse-3.1:3 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle:= >=net-libs/gnutls-3.0:= ) gtk? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.91 ) ) infiniband? ( sys-cluster/rdma-core ) iscsi? ( net-libs/libiscsi ) io-uring? ( sys-libs/liburing:= ) jack? ( virtual/jack ) jemalloc? ( dev-libs/jemalloc ) jpeg? ( media-libs/libjpeg-turbo:= ) lzo? ( dev-libs/lzo:2 ) multipath? ( sys-fs/multipath-tools ) ncurses? ( sys-libs/ncurses:=[unicode(+)] sys-libs/ncurses:= ) nfs? ( >=net-fs/libnfs-1.9.3:= ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl(+),gbm(+)] ) pam? ( sys-libs/pam ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( media-libs/libsdl2[video] media-libs/libsdl2 ) sdl-image? ( media-libs/sdl2-image ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) slirp? ( net-libs/libslirp ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy:= ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh-0.8.6 ) udev? ( virtual/libudev:= ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools:= ) zstd? ( >=app-arch/zstd-1.4.0 ) ) qemu_softmmu_targets_i386? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-bin-202202 ~sys-firmware/ipxe-1.21.1[binary,qemu] ~sys-firmware/seabios-bin-1.16.0 ~sys-firmware/sgabios-0.1_pre10[binary] ) !pin-upstream-blobs? ( || ( >=sys-firmware/edk2-ovmf-202202 >=sys-firmware/edk2-ovmf-bin-202202 ) sys-firmware/ipxe[qemu] || ( >=sys-firmware/seabios-1.16.0[seavgabios] >=sys-firmware/seabios-bin-1.16.0 ) sys-firmware/sgabios ) ) qemu_softmmu_targets_x86_64? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-bin-202202 ~sys-firmware/ipxe-1.21.1[binary,qemu] ~sys-firmware/seabios-bin-1.16.0 ~sys-firmware/sgabios-0.1_pre10[binary] ) !pin-upstream-blobs? ( || ( >=sys-firmware/edk2-ovmf-202202 >=sys-firmware/edk2-ovmf-bin-202202 ) sys-firmware/ipxe[qemu] || ( >=sys-firmware/seabios-1.16.0[seavgabios] >=sys-firmware/seabios-bin-1.16.0 ) sys-firmware/sgabios ) ) qemu_softmmu_targets_ppc? ( pin-upstream-blobs? ( ~sys-firmware/seabios-bin-1.16.0 ) !pin-upstream-blobs? ( || ( >=sys-firmware/seabios-1.16.0[seavgabios] >=sys-firmware/seabios-bin-1.16.0 ) ) ) qemu_softmmu_targets_ppc64? ( pin-upstream-blobs? ( ~sys-firmware/seabios-bin-1.16.0 ) !pin-upstream-blobs? ( || ( >=sys-firmware/seabios-1.16.0[seavgabios] >=sys-firmware/seabios-bin-1.16.0 ) ) ) kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 ) static? ( >=dev-libs/glib-2.0[static-libs(+)] sys-libs/zlib[static-libs(+)] python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[ncurses,readline] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[ncurses,readline] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[ncurses,readline] ) ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr[static-libs(+)] ) >=x11-libs/pixman-0.28.0[static-libs(+)] accessibility? ( app-accessibility/brltty[api] app-accessibility/brltty[static-libs(+)] ) aio? ( dev-libs/libaio[static-libs(+)] ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bpf? ( dev-libs/libbpf:= ) bzip2? ( app-arch/bzip2[static-libs(+)] ) capstone? ( dev-libs/capstone:= ) caps? ( sys-libs/libcap-ng[static-libs(+)] ) curl? ( >=net-misc/curl-7.15.4[static-libs(+)] ) fdt? ( >=sys-apps/dtc-1.5.1[static-libs(+)] ) fuse? ( >=sys-fs/fuse-3.1:3[static-libs(+)] ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] ) gnutls? ( dev-libs/nettle:=[static-libs(+)] >=net-libs/gnutls-3.0:=[static-libs(+)] ) gtk? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.91 ) ) infiniband? ( sys-cluster/rdma-core[static-libs(+)] ) iscsi? ( net-libs/libiscsi ) io-uring? ( sys-libs/liburing:=[static-libs(+)] ) jack? ( virtual/jack ) jemalloc? ( dev-libs/jemalloc ) jpeg? ( media-libs/libjpeg-turbo:=[static-libs(+)] ) lzo? ( dev-libs/lzo:2[static-libs(+)] ) multipath? ( sys-fs/multipath-tools ) ncurses? ( sys-libs/ncurses:=[unicode(+)] sys-libs/ncurses:=[static-libs(+)] ) nfs? ( >=net-fs/libnfs-1.9.3:=[static-libs(+)] ) numa? ( sys-process/numactl[static-libs(+)] ) opengl? ( virtual/opengl media-libs/libepoxy[static-libs(+)] media-libs/mesa[static-libs(+)] media-libs/mesa[egl(+),gbm(+)] ) pam? ( sys-libs/pam ) png? ( media-libs/libpng:0=[static-libs(+)] ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl[static-libs(+)] ) sdl? ( media-libs/libsdl2[video] media-libs/libsdl2[static-libs(+)] ) sdl-image? ( media-libs/sdl2-image[static-libs(+)] ) seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] ) slirp? ( net-libs/libslirp[static-libs(+)] ) smartcard? ( >=app-emulation/libcacard-2.5.0[static-libs(+)] ) snappy? ( app-arch/snappy:= ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0[static-libs(+)] ) ssh? ( >=net-libs/libssh-0.8.6[static-libs(+)] ) udev? ( virtual/libudev:= ) usb? ( >=virtual/libusb-1-r2[static-libs(+)] ) usbredir? ( >=sys-apps/usbredir-0.6[static-libs(+)] ) vde? ( net-misc/vde[static-libs(+)] ) virgl? ( media-libs/virglrenderer[static-libs(+)] ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools:= ) zstd? ( >=app-arch/zstd-1.4.0[static-libs(+)] ) ) static-user? ( >=dev-libs/glib-2.0[static-libs(+)] sys-libs/zlib[static-libs(+)] python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[ncurses,readline] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[ncurses,readline] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[ncurses,readline] ) ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr[static-libs(+)] ) )
+DEPEND=!static? ( >=dev-libs/glib-2.0 sys-libs/zlib python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[ncurses,readline] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[ncurses,readline] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[ncurses,readline] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[ncurses,readline] ) ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr ) >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty[api] app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bpf? ( dev-libs/libbpf:= ) bzip2? ( app-arch/bzip2 ) capstone? ( dev-libs/capstone:= ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.5.1 ) fuse? ( >=sys-fs/fuse-3.1:3 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle:= >=net-libs/gnutls-3.0:= ) gtk? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.91 ) ) infiniband? ( sys-cluster/rdma-core ) iscsi? ( net-libs/libiscsi ) io-uring? ( sys-libs/liburing:= ) jack? ( virtual/jack ) jemalloc? ( dev-libs/jemalloc ) jpeg? ( media-libs/libjpeg-turbo:= ) lzo? ( dev-libs/lzo:2 ) multipath? ( sys-fs/multipath-tools ) ncurses? ( sys-libs/ncurses:=[unicode(+)] sys-libs/ncurses:= ) nfs? ( >=net-fs/libnfs-1.9.3:= ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl(+),gbm(+)] ) pam? ( sys-libs/pam ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( media-libs/libsdl2[video] media-libs/libsdl2 ) sdl-image? ( media-libs/sdl2-image ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) slirp? ( net-libs/libslirp ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy:= ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh-0.8.6 ) udev? ( virtual/libudev:= ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools:= ) zstd? ( >=app-arch/zstd-1.4.0 ) ) qemu_softmmu_targets_i386? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-bin-202202 ~sys-firmware/ipxe-1.21.1[binary,qemu] ~sys-firmware/seabios-bin-1.16.0 ~sys-firmware/sgabios-0.1_pre10[binary] ) !pin-upstream-blobs? ( || ( >=sys-firmware/edk2-ovmf-202202 >=sys-firmware/edk2-ovmf-bin-202202 ) sys-firmware/ipxe[qemu] || ( >=sys-firmware/seabios-1.16.0[seavgabios] >=sys-firmware/seabios-bin-1.16.0 ) sys-firmware/sgabios ) ) qemu_softmmu_targets_x86_64? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-bin-202202 ~sys-firmware/ipxe-1.21.1[binary,qemu] ~sys-firmware/seabios-bin-1.16.0 ~sys-firmware/sgabios-0.1_pre10[binary] ) !pin-upstream-blobs? ( || ( >=sys-firmware/edk2-ovmf-202202 >=sys-firmware/edk2-ovmf-bin-202202 ) sys-firmware/ipxe[qemu] || ( >=sys-firmware/seabios-1.16.0[seavgabios] >=sys-firmware/seabios-bin-1.16.0 ) sys-firmware/sgabios ) ) qemu_softmmu_targets_ppc? ( pin-upstream-blobs? ( ~sys-firmware/seabios-bin-1.16.0 ) !pin-upstream-blobs? ( || ( >=sys-firmware/seabios-1.16.0[seavgabios] >=sys-firmware/seabios-bin-1.16.0 ) ) ) qemu_softmmu_targets_ppc64? ( pin-upstream-blobs? ( ~sys-firmware/seabios-bin-1.16.0 ) !pin-upstream-blobs? ( || ( >=sys-firmware/seabios-1.16.0[seavgabios] >=sys-firmware/seabios-bin-1.16.0 ) ) ) kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 ) static? ( >=dev-libs/glib-2.0[static-libs(+)] sys-libs/zlib[static-libs(+)] python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[ncurses,readline] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[ncurses,readline] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[ncurses,readline] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[ncurses,readline] ) ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr[static-libs(+)] ) >=x11-libs/pixman-0.28.0[static-libs(+)] accessibility? ( app-accessibility/brltty[api] app-accessibility/brltty[static-libs(+)] ) aio? ( dev-libs/libaio[static-libs(+)] ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bpf? ( dev-libs/libbpf:= ) bzip2? ( app-arch/bzip2[static-libs(+)] ) capstone? ( dev-libs/capstone:= ) caps? ( sys-libs/libcap-ng[static-libs(+)] ) curl? ( >=net-misc/curl-7.15.4[static-libs(+)] ) fdt? ( >=sys-apps/dtc-1.5.1[static-libs(+)] ) fuse? ( >=sys-fs/fuse-3.1:3[static-libs(+)] ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] ) gnutls? ( dev-libs/nettle:=[static-libs(+)] >=net-libs/gnutls-3.0:=[static-libs(+)] ) gtk? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.91 ) ) infiniband? ( sys-cluster/rdma-core[static-libs(+)] ) iscsi? ( net-libs/libiscsi ) io-uring? ( sys-libs/liburing:=[static-libs(+)] ) jack? ( virtual/jack ) jemalloc? ( dev-libs/jemalloc ) jpeg? ( media-libs/libjpeg-turbo:=[static-libs(+)] ) lzo? ( dev-libs/lzo:2[static-libs(+)] ) multipath? ( sys-fs/multipath-tools ) ncurses? ( sys-libs/ncurses:=[unicode(+)] sys-libs/ncurses:=[static-libs(+)] ) nfs? ( >=net-fs/libnfs-1.9.3:=[static-libs(+)] ) numa? ( sys-process/numactl[static-libs(+)] ) opengl? ( virtual/opengl media-libs/libepoxy[static-libs(+)] media-libs/mesa[static-libs(+)] media-libs/mesa[egl(+),gbm(+)] ) pam? ( sys-libs/pam ) png? ( media-libs/libpng:0=[static-libs(+)] ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl[static-libs(+)] ) sdl? ( media-libs/libsdl2[video] media-libs/libsdl2[static-libs(+)] ) sdl-image? ( media-libs/sdl2-image[static-libs(+)] ) seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] ) slirp? ( net-libs/libslirp[static-libs(+)] ) smartcard? ( >=app-emulation/libcacard-2.5.0[static-libs(+)] ) snappy? ( app-arch/snappy:= ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0[static-libs(+)] ) ssh? ( >=net-libs/libssh-0.8.6[static-libs(+)] ) udev? ( virtual/libudev:= ) usb? ( >=virtual/libusb-1-r2[static-libs(+)] ) usbredir? ( >=sys-apps/usbredir-0.6[static-libs(+)] ) vde? ( net-misc/vde[static-libs(+)] ) virgl? ( media-libs/virglrenderer[static-libs(+)] ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools:= ) zstd? ( >=app-arch/zstd-1.4.0[static-libs(+)] ) ) static-user? ( >=dev-libs/glib-2.0[static-libs(+)] sys-libs/zlib[static-libs(+)] python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[ncurses,readline] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[ncurses,readline] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[ncurses,readline] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[ncurses,readline] ) ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr[static-libs(+)] ) )
 DESCRIPTION=QEMU + Kernel-based Virtual Machine userland tools
 EAPI=8
 HOMEPAGE=https://www.qemu.org https://www.linux-kvm.org
 IDEPEND=filecaps? ( sys-libs/libcap )
 INHERIT=linux-info toolchain-funcs python-r1 udev fcaps readme.gentoo-r1 pax-utils xdg-utils
-IUSE=accessibility +aio alsa bpf bzip2 capstone +caps +curl debug doc +fdt fuse glusterfs +gnutls gtk infiniband iscsi io-uring jack jemalloc +jpeg lzo multipath ncurses nfs nls numa opengl +oss pam +pin-upstream-blobs plugins +png pulseaudio python rbd sasl +seccomp sdl sdl-image selinux +slirp smartcard snappy spice ssh static static-user systemtap test udev usb usbredir vde +vhost-net vhost-user-fs virgl virtfs +vnc vte xattr xen zstd qemu_softmmu_targets_aarch64 qemu_softmmu_targets_alpha qemu_softmmu_targets_arm qemu_softmmu_targets_cris qemu_softmmu_targets_hppa qemu_softmmu_targets_i386 qemu_softmmu_targets_loongarch64 qemu_softmmu_targets_m68k qemu_softmmu_targets_microblaze qemu_softmmu_targets_microblazeel qemu_softmmu_targets_mips qemu_softmmu_targets_mips64 qemu_softmmu_targets_mips64el qemu_softmmu_targets_mipsel qemu_softmmu_targets_nios2 qemu_softmmu_targets_or1k qemu_softmmu_targets_ppc qemu_softmmu_targets_ppc64 qemu_softmmu_targets_riscv32 qemu_softmmu_targets_riscv64 qemu_softmmu_targets_s390x qemu_softmmu_targets_sh4 qemu_softmmu_targets_sh4eb qemu_softmmu_targets_sparc qemu_softmmu_targets_sparc64 qemu_softmmu_targets_x86_64 qemu_softmmu_targets_xtensa qemu_softmmu_targets_xtensaeb qemu_softmmu_targets_avr qemu_softmmu_targets_rx qemu_softmmu_targets_tricore qemu_user_targets_aarch64 qemu_user_targets_alpha qemu_user_targets_arm qemu_user_targets_cris qemu_user_targets_hppa qemu_user_targets_i386 qemu_user_targets_loongarch64 qemu_user_targets_m68k qemu_user_targets_microblaze qemu_user_targets_microblazeel qemu_user_targets_mips qemu_user_targets_mips64 qemu_user_targets_mips64el qemu_user_targets_mipsel qemu_user_targets_nios2 qemu_user_targets_or1k qemu_user_targets_ppc qemu_user_targets_ppc64 qemu_user_targets_riscv32 qemu_user_targets_riscv64 qemu_user_targets_s390x qemu_user_targets_sh4 qemu_user_targets_sh4eb qemu_user_targets_sparc qemu_user_targets_sparc64 qemu_user_targets_x86_64 qemu_user_targets_xtensa qemu_user_targets_xtensaeb qemu_user_targets_aarch64_be qemu_user_targets_armeb qemu_user_targets_hexagon qemu_user_targets_mipsn32 qemu_user_targets_mipsn32el qemu_user_targets_ppc64le qemu_user_targets_sparc32plus python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 +filecaps
+IUSE=accessibility +aio alsa bpf bzip2 capstone +caps +curl debug doc +fdt fuse glusterfs +gnutls gtk infiniband iscsi io-uring jack jemalloc +jpeg lzo multipath ncurses nfs nls numa opengl +oss pam +pin-upstream-blobs plugins +png pulseaudio python rbd sasl +seccomp sdl sdl-image selinux +slirp smartcard snappy spice ssh static static-user systemtap test udev usb usbredir vde +vhost-net vhost-user-fs virgl virtfs +vnc vte xattr xen zstd qemu_softmmu_targets_aarch64 qemu_softmmu_targets_alpha qemu_softmmu_targets_arm qemu_softmmu_targets_cris qemu_softmmu_targets_hppa qemu_softmmu_targets_i386 qemu_softmmu_targets_loongarch64 qemu_softmmu_targets_m68k qemu_softmmu_targets_microblaze qemu_softmmu_targets_microblazeel qemu_softmmu_targets_mips qemu_softmmu_targets_mips64 qemu_softmmu_targets_mips64el qemu_softmmu_targets_mipsel qemu_softmmu_targets_nios2 qemu_softmmu_targets_or1k qemu_softmmu_targets_ppc qemu_softmmu_targets_ppc64 qemu_softmmu_targets_riscv32 qemu_softmmu_targets_riscv64 qemu_softmmu_targets_s390x qemu_softmmu_targets_sh4 qemu_softmmu_targets_sh4eb qemu_softmmu_targets_sparc qemu_softmmu_targets_sparc64 qemu_softmmu_targets_x86_64 qemu_softmmu_targets_xtensa qemu_softmmu_targets_xtensaeb qemu_softmmu_targets_avr qemu_softmmu_targets_rx qemu_softmmu_targets_tricore qemu_user_targets_aarch64 qemu_user_targets_alpha qemu_user_targets_arm qemu_user_targets_cris qemu_user_targets_hppa qemu_user_targets_i386 qemu_user_targets_loongarch64 qemu_user_targets_m68k qemu_user_targets_microblaze qemu_user_targets_microblazeel qemu_user_targets_mips qemu_user_targets_mips64 qemu_user_targets_mips64el qemu_user_targets_mipsel qemu_user_targets_nios2 qemu_user_targets_or1k qemu_user_targets_ppc qemu_user_targets_ppc64 qemu_user_targets_riscv32 qemu_user_targets_riscv64 qemu_user_targets_s390x qemu_user_targets_sh4 qemu_user_targets_sh4eb qemu_user_targets_sparc qemu_user_targets_sparc64 qemu_user_targets_x86_64 qemu_user_targets_xtensa qemu_user_targets_xtensaeb qemu_user_targets_aarch64_be qemu_user_targets_armeb qemu_user_targets_hexagon qemu_user_targets_mipsn32 qemu_user_targets_mipsn32el qemu_user_targets_ppc64le qemu_user_targets_sparc32plus python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 +filecaps
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86
 LICENSE=GPL-2 LGPL-2 BSD-2
-RDEPEND=!static? ( >=dev-libs/glib-2.0 sys-libs/zlib python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[ncurses,readline] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[ncurses,readline] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[ncurses,readline] ) ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr ) >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty[api] app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bpf? ( dev-libs/libbpf:= ) bzip2? ( app-arch/bzip2 ) capstone? ( dev-libs/capstone:= ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.5.1 ) fuse? ( >=sys-fs/fuse-3.1:3 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle:= >=net-libs/gnutls-3.0:= ) gtk? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.91 ) ) infiniband? ( sys-cluster/rdma-core ) iscsi? ( net-libs/libiscsi ) io-uring? ( sys-libs/liburing:= ) jack? ( virtual/jack ) jemalloc? ( dev-libs/jemalloc ) jpeg? ( media-libs/libjpeg-turbo:= ) lzo? ( dev-libs/lzo:2 ) multipath? ( sys-fs/multipath-tools ) ncurses? ( sys-libs/ncurses:=[unicode(+)] sys-libs/ncurses:= ) nfs? ( >=net-fs/libnfs-1.9.3:= ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl(+),gbm(+)] ) pam? ( sys-libs/pam ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( media-libs/libsdl2[video] media-libs/libsdl2 ) sdl-image? ( media-libs/sdl2-image ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) slirp? ( net-libs/libslirp ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy:= ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh-0.8.6 ) udev? ( virtual/libudev:= ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools:= ) zstd? ( >=app-arch/zstd-1.4.0 ) ) qemu_softmmu_targets_i386? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-bin-202202 ~sys-firmware/ipxe-1.21.1[binary,qemu] ~sys-firmware/seabios-bin-1.16.0 ~sys-firmware/sgabios-0.1_pre10[binary] ) !pin-upstream-blobs? ( || ( >=sys-firmware/edk2-ovmf-202202 >=sys-firmware/edk2-ovmf-bin-202202 ) sys-firmware/ipxe[qemu] || ( >=sys-firmware/seabios-1.16.0[seavgabios] >=sys-firmware/seabios-bin-1.16.0 ) sys-firmware/sgabios ) ) qemu_softmmu_targets_x86_64? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-bin-202202 ~sys-firmware/ipxe-1.21.1[binary,qemu] ~sys-firmware/seabios-bin-1.16.0 ~sys-firmware/sgabios-0.1_pre10[binary] ) !pin-upstream-blobs? ( || ( >=sys-firmware/edk2-ovmf-202202 >=sys-firmware/edk2-ovmf-bin-202202 ) sys-firmware/ipxe[qemu] || ( >=sys-firmware/seabios-1.16.0[seavgabios] >=sys-firmware/seabios-bin-1.16.0 ) sys-firmware/sgabios ) ) qemu_softmmu_targets_ppc? ( pin-upstream-blobs? ( ~sys-firmware/seabios-bin-1.16.0 ) !pin-upstream-blobs? ( || ( >=sys-firmware/seabios-1.16.0[seavgabios] >=sys-firmware/seabios-bin-1.16.0 ) ) ) qemu_softmmu_targets_ppc64? ( pin-upstream-blobs? ( ~sys-firmware/seabios-bin-1.16.0 ) !pin-upstream-blobs? ( || ( >=sys-firmware/seabios-1.16.0[seavgabios] >=sys-firmware/seabios-bin-1.16.0 ) ) ) acct-group/kvm selinux? ( sec-policy/selinux-qemu sys-libs/libselinux )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) qemu_softmmu_targets_arm? ( fdt ) qemu_softmmu_targets_microblaze? ( fdt ) qemu_softmmu_targets_mips64el? ( fdt ) qemu_softmmu_targets_ppc64? ( fdt ) qemu_softmmu_targets_ppc? ( fdt ) qemu_softmmu_targets_riscv32? ( fdt ) qemu_softmmu_targets_riscv64? ( fdt ) qemu_softmmu_targets_x86_64? ( fdt ) sdl-image? ( sdl ) static? ( static-user !alsa !gtk !jack !opengl !pam !pulseaudio !plugins !rbd !snappy !udev ) static-user? ( !plugins ) vhost-user-fs? ( caps seccomp ) virgl? ( opengl ) virtfs? ( caps xattr ) vnc? ( gnutls ) vte? ( gtk ) multipath? ( udev ) plugins? ( !static !static-user )
+RDEPEND=!static? ( >=dev-libs/glib-2.0 sys-libs/zlib python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[ncurses,readline] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[ncurses,readline] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[ncurses,readline] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[ncurses,readline] ) ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr ) >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty[api] app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bpf? ( dev-libs/libbpf:= ) bzip2? ( app-arch/bzip2 ) capstone? ( dev-libs/capstone:= ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.5.1 ) fuse? ( >=sys-fs/fuse-3.1:3 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle:= >=net-libs/gnutls-3.0:= ) gtk? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.91 ) ) infiniband? ( sys-cluster/rdma-core ) iscsi? ( net-libs/libiscsi ) io-uring? ( sys-libs/liburing:= ) jack? ( virtual/jack ) jemalloc? ( dev-libs/jemalloc ) jpeg? ( media-libs/libjpeg-turbo:= ) lzo? ( dev-libs/lzo:2 ) multipath? ( sys-fs/multipath-tools ) ncurses? ( sys-libs/ncurses:=[unicode(+)] sys-libs/ncurses:= ) nfs? ( >=net-fs/libnfs-1.9.3:= ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl(+),gbm(+)] ) pam? ( sys-libs/pam ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( media-libs/libsdl2[video] media-libs/libsdl2 ) sdl-image? ( media-libs/sdl2-image ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) slirp? ( net-libs/libslirp ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy:= ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh-0.8.6 ) udev? ( virtual/libudev:= ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools:= ) zstd? ( >=app-arch/zstd-1.4.0 ) ) qemu_softmmu_targets_i386? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-bin-202202 ~sys-firmware/ipxe-1.21.1[binary,qemu] ~sys-firmware/seabios-bin-1.16.0 ~sys-firmware/sgabios-0.1_pre10[binary] ) !pin-upstream-blobs? ( || ( >=sys-firmware/edk2-ovmf-202202 >=sys-firmware/edk2-ovmf-bin-202202 ) sys-firmware/ipxe[qemu] || ( >=sys-firmware/seabios-1.16.0[seavgabios] >=sys-firmware/seabios-bin-1.16.0 ) sys-firmware/sgabios ) ) qemu_softmmu_targets_x86_64? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-bin-202202 ~sys-firmware/ipxe-1.21.1[binary,qemu] ~sys-firmware/seabios-bin-1.16.0 ~sys-firmware/sgabios-0.1_pre10[binary] ) !pin-upstream-blobs? ( || ( >=sys-firmware/edk2-ovmf-202202 >=sys-firmware/edk2-ovmf-bin-202202 ) sys-firmware/ipxe[qemu] || ( >=sys-firmware/seabios-1.16.0[seavgabios] >=sys-firmware/seabios-bin-1.16.0 ) sys-firmware/sgabios ) ) qemu_softmmu_targets_ppc? ( pin-upstream-blobs? ( ~sys-firmware/seabios-bin-1.16.0 ) !pin-upstream-blobs? ( || ( >=sys-firmware/seabios-1.16.0[seavgabios] >=sys-firmware/seabios-bin-1.16.0 ) ) ) qemu_softmmu_targets_ppc64? ( pin-upstream-blobs? ( ~sys-firmware/seabios-bin-1.16.0 ) !pin-upstream-blobs? ( || ( >=sys-firmware/seabios-1.16.0[seavgabios] >=sys-firmware/seabios-bin-1.16.0 ) ) ) acct-group/kvm selinux? ( sec-policy/selinux-qemu sys-libs/libselinux )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 ) qemu_softmmu_targets_arm? ( fdt ) qemu_softmmu_targets_microblaze? ( fdt ) qemu_softmmu_targets_mips64el? ( fdt ) qemu_softmmu_targets_ppc64? ( fdt ) qemu_softmmu_targets_ppc? ( fdt ) qemu_softmmu_targets_riscv32? ( fdt ) qemu_softmmu_targets_riscv64? ( fdt ) qemu_softmmu_targets_x86_64? ( fdt ) sdl-image? ( sdl ) static? ( static-user !alsa !gtk !jack !opengl !pam !pulseaudio !plugins !rbd !snappy !udev ) static-user? ( !plugins ) vhost-user-fs? ( caps seccomp ) virgl? ( opengl ) virtfs? ( caps xattr ) vnc? ( gnutls ) vte? ( gtk ) multipath? ( udev ) plugins? ( !static !static-user )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://download.qemu.org/qemu-7.1.0.tar.xz !doc? ( https://dev.gentoo.org/~ajak/distfiles/app-emulation/qemu/qemu-7.1.0-docs.tar.xz )
 _eclasses_=fcaps	babe6282ea5c195981bd302af1adaf3a	linux-info	bbfa385d6907d7948d49a5e107bd654d	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	1542e649be915f43f6908a9e93909961	udev	eec0bbab06977f1cfc5597269c1fa152	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=a0e790130632abdbb34ebab400cd8ddf
+_md5_=706baf5686b582551f6039f3525d8fa2
diff --git a/metadata/md5-cache/app-emulation/qemu-9999 b/metadata/md5-cache/app-emulation/qemu-9999
index 1b4e6ae93871..859e98033b0f 100644
--- a/metadata/md5-cache/app-emulation/qemu-9999
+++ b/metadata/md5-cache/app-emulation/qemu-9999
@@ -1,17 +1,17 @@
-BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) dev-lang/perl dev-util/meson sys-apps/texinfo virtual/pkgconfig doc? ( dev-python/sphinx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) gtk? ( nls? ( sys-devel/gettext ) ) test? ( dev-libs/glib[utils] sys-devel/bc ) virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) dev-lang/perl dev-util/meson sys-apps/texinfo virtual/pkgconfig doc? ( dev-python/sphinx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) gtk? ( nls? ( sys-devel/gettext ) ) test? ( dev-libs/glib[utils] sys-devel/bc ) virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure info install postinst postrm prepare pretend setup test unpack
-DEPEND=!static? ( >=dev-libs/glib-2.0 sys-libs/zlib python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[ncurses,readline] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[ncurses,readline] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[ncurses,readline] ) ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr ) >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty[api] app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bpf? ( dev-libs/libbpf:= ) bzip2? ( app-arch/bzip2 ) capstone? ( dev-libs/capstone:= ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.5.1 ) fuse? ( >=sys-fs/fuse-3.1:3 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle:= >=net-libs/gnutls-3.0:= ) gtk? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.91 ) ) infiniband? ( sys-cluster/rdma-core ) iscsi? ( net-libs/libiscsi ) io-uring? ( sys-libs/liburing:= ) jack? ( virtual/jack ) jemalloc? ( dev-libs/jemalloc ) jpeg? ( media-libs/libjpeg-turbo:= ) lzo? ( dev-libs/lzo:2 ) multipath? ( sys-fs/multipath-tools ) ncurses? ( sys-libs/ncurses:=[unicode(+)] sys-libs/ncurses:= ) nfs? ( >=net-fs/libnfs-1.9.3:= ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl(+),gbm(+)] ) pam? ( sys-libs/pam ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( media-libs/libsdl2[video] media-libs/libsdl2 ) sdl-image? ( media-libs/sdl2-image ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) slirp? ( net-libs/libslirp ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy:= ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh-0.8.6 ) udev? ( virtual/libudev:= ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools:= ) zstd? ( >=app-arch/zstd-1.4.0 ) ) qemu_softmmu_targets_i386? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-bin-202202 ~sys-firmware/ipxe-1.21.1[binary,qemu] ~sys-firmware/seabios-bin-1.16.0 ~sys-firmware/sgabios-0.1_pre10[binary] ) !pin-upstream-blobs? ( || ( >=sys-firmware/edk2-ovmf-202202 >=sys-firmware/edk2-ovmf-bin-202202 ) sys-firmware/ipxe[qemu] || ( >=sys-firmware/seabios-1.16.0[seavgabios] >=sys-firmware/seabios-bin-1.16.0 ) sys-firmware/sgabios ) ) qemu_softmmu_targets_x86_64? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-bin-202202 ~sys-firmware/ipxe-1.21.1[binary,qemu] ~sys-firmware/seabios-bin-1.16.0 ~sys-firmware/sgabios-0.1_pre10[binary] ) !pin-upstream-blobs? ( || ( >=sys-firmware/edk2-ovmf-202202 >=sys-firmware/edk2-ovmf-bin-202202 ) sys-firmware/ipxe[qemu] || ( >=sys-firmware/seabios-1.16.0[seavgabios] >=sys-firmware/seabios-bin-1.16.0 ) sys-firmware/sgabios ) ) qemu_softmmu_targets_ppc? ( pin-upstream-blobs? ( ~sys-firmware/seabios-bin-1.16.0 ) !pin-upstream-blobs? ( || ( >=sys-firmware/seabios-1.16.0[seavgabios] >=sys-firmware/seabios-bin-1.16.0 ) ) ) qemu_softmmu_targets_ppc64? ( pin-upstream-blobs? ( ~sys-firmware/seabios-bin-1.16.0 ) !pin-upstream-blobs? ( || ( >=sys-firmware/seabios-1.16.0[seavgabios] >=sys-firmware/seabios-bin-1.16.0 ) ) ) kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 ) static? ( >=dev-libs/glib-2.0[static-libs(+)] sys-libs/zlib[static-libs(+)] python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[ncurses,readline] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[ncurses,readline] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[ncurses,readline] ) ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr[static-libs(+)] ) >=x11-libs/pixman-0.28.0[static-libs(+)] accessibility? ( app-accessibility/brltty[api] app-accessibility/brltty[static-libs(+)] ) aio? ( dev-libs/libaio[static-libs(+)] ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bpf? ( dev-libs/libbpf:= ) bzip2? ( app-arch/bzip2[static-libs(+)] ) capstone? ( dev-libs/capstone:= ) caps? ( sys-libs/libcap-ng[static-libs(+)] ) curl? ( >=net-misc/curl-7.15.4[static-libs(+)] ) fdt? ( >=sys-apps/dtc-1.5.1[static-libs(+)] ) fuse? ( >=sys-fs/fuse-3.1:3[static-libs(+)] ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] ) gnutls? ( dev-libs/nettle:=[static-libs(+)] >=net-libs/gnutls-3.0:=[static-libs(+)] ) gtk? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.91 ) ) infiniband? ( sys-cluster/rdma-core[static-libs(+)] ) iscsi? ( net-libs/libiscsi ) io-uring? ( sys-libs/liburing:=[static-libs(+)] ) jack? ( virtual/jack ) jemalloc? ( dev-libs/jemalloc ) jpeg? ( media-libs/libjpeg-turbo:=[static-libs(+)] ) lzo? ( dev-libs/lzo:2[static-libs(+)] ) multipath? ( sys-fs/multipath-tools ) ncurses? ( sys-libs/ncurses:=[unicode(+)] sys-libs/ncurses:=[static-libs(+)] ) nfs? ( >=net-fs/libnfs-1.9.3:=[static-libs(+)] ) numa? ( sys-process/numactl[static-libs(+)] ) opengl? ( virtual/opengl media-libs/libepoxy[static-libs(+)] media-libs/mesa[static-libs(+)] media-libs/mesa[egl(+),gbm(+)] ) pam? ( sys-libs/pam ) png? ( media-libs/libpng:0=[static-libs(+)] ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl[static-libs(+)] ) sdl? ( media-libs/libsdl2[video] media-libs/libsdl2[static-libs(+)] ) sdl-image? ( media-libs/sdl2-image[static-libs(+)] ) seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] ) slirp? ( net-libs/libslirp[static-libs(+)] ) smartcard? ( >=app-emulation/libcacard-2.5.0[static-libs(+)] ) snappy? ( app-arch/snappy:= ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0[static-libs(+)] ) ssh? ( >=net-libs/libssh-0.8.6[static-libs(+)] ) udev? ( virtual/libudev:= ) usb? ( >=virtual/libusb-1-r2[static-libs(+)] ) usbredir? ( >=sys-apps/usbredir-0.6[static-libs(+)] ) vde? ( net-misc/vde[static-libs(+)] ) virgl? ( media-libs/virglrenderer[static-libs(+)] ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools:= ) zstd? ( >=app-arch/zstd-1.4.0[static-libs(+)] ) ) static-user? ( >=dev-libs/glib-2.0[static-libs(+)] sys-libs/zlib[static-libs(+)] python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[ncurses,readline] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[ncurses,readline] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[ncurses,readline] ) ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr[static-libs(+)] ) )
+DEPEND=!static? ( >=dev-libs/glib-2.0 sys-libs/zlib python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[ncurses,readline] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[ncurses,readline] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[ncurses,readline] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[ncurses,readline] ) ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr ) >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty[api] app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bpf? ( dev-libs/libbpf:= ) bzip2? ( app-arch/bzip2 ) capstone? ( dev-libs/capstone:= ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.5.1 ) fuse? ( >=sys-fs/fuse-3.1:3 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle:= >=net-libs/gnutls-3.0:= ) gtk? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.91 ) ) infiniband? ( sys-cluster/rdma-core ) iscsi? ( net-libs/libiscsi ) io-uring? ( sys-libs/liburing:= ) jack? ( virtual/jack ) jemalloc? ( dev-libs/jemalloc ) jpeg? ( media-libs/libjpeg-turbo:= ) lzo? ( dev-libs/lzo:2 ) multipath? ( sys-fs/multipath-tools ) ncurses? ( sys-libs/ncurses:=[unicode(+)] sys-libs/ncurses:= ) nfs? ( >=net-fs/libnfs-1.9.3:= ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl(+),gbm(+)] ) pam? ( sys-libs/pam ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( media-libs/libsdl2[video] media-libs/libsdl2 ) sdl-image? ( media-libs/sdl2-image ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) slirp? ( net-libs/libslirp ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy:= ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh-0.8.6 ) udev? ( virtual/libudev:= ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools:= ) zstd? ( >=app-arch/zstd-1.4.0 ) ) qemu_softmmu_targets_i386? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-bin-202202 ~sys-firmware/ipxe-1.21.1[binary,qemu] ~sys-firmware/seabios-bin-1.16.0 ~sys-firmware/sgabios-0.1_pre10[binary] ) !pin-upstream-blobs? ( || ( >=sys-firmware/edk2-ovmf-202202 >=sys-firmware/edk2-ovmf-bin-202202 ) sys-firmware/ipxe[qemu] || ( >=sys-firmware/seabios-1.16.0[seavgabios] >=sys-firmware/seabios-bin-1.16.0 ) sys-firmware/sgabios ) ) qemu_softmmu_targets_x86_64? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-bin-202202 ~sys-firmware/ipxe-1.21.1[binary,qemu] ~sys-firmware/seabios-bin-1.16.0 ~sys-firmware/sgabios-0.1_pre10[binary] ) !pin-upstream-blobs? ( || ( >=sys-firmware/edk2-ovmf-202202 >=sys-firmware/edk2-ovmf-bin-202202 ) sys-firmware/ipxe[qemu] || ( >=sys-firmware/seabios-1.16.0[seavgabios] >=sys-firmware/seabios-bin-1.16.0 ) sys-firmware/sgabios ) ) qemu_softmmu_targets_ppc? ( pin-upstream-blobs? ( ~sys-firmware/seabios-bin-1.16.0 ) !pin-upstream-blobs? ( || ( >=sys-firmware/seabios-1.16.0[seavgabios] >=sys-firmware/seabios-bin-1.16.0 ) ) ) qemu_softmmu_targets_ppc64? ( pin-upstream-blobs? ( ~sys-firmware/seabios-bin-1.16.0 ) !pin-upstream-blobs? ( || ( >=sys-firmware/seabios-1.16.0[seavgabios] >=sys-firmware/seabios-bin-1.16.0 ) ) ) kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 ) static? ( >=dev-libs/glib-2.0[static-libs(+)] sys-libs/zlib[static-libs(+)] python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[ncurses,readline] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[ncurses,readline] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[ncurses,readline] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[ncurses,readline] ) ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr[static-libs(+)] ) >=x11-libs/pixman-0.28.0[static-libs(+)] accessibility? ( app-accessibility/brltty[api] app-accessibility/brltty[static-libs(+)] ) aio? ( dev-libs/libaio[static-libs(+)] ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bpf? ( dev-libs/libbpf:= ) bzip2? ( app-arch/bzip2[static-libs(+)] ) capstone? ( dev-libs/capstone:= ) caps? ( sys-libs/libcap-ng[static-libs(+)] ) curl? ( >=net-misc/curl-7.15.4[static-libs(+)] ) fdt? ( >=sys-apps/dtc-1.5.1[static-libs(+)] ) fuse? ( >=sys-fs/fuse-3.1:3[static-libs(+)] ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] ) gnutls? ( dev-libs/nettle:=[static-libs(+)] >=net-libs/gnutls-3.0:=[static-libs(+)] ) gtk? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.91 ) ) infiniband? ( sys-cluster/rdma-core[static-libs(+)] ) iscsi? ( net-libs/libiscsi ) io-uring? ( sys-libs/liburing:=[static-libs(+)] ) jack? ( virtual/jack ) jemalloc? ( dev-libs/jemalloc ) jpeg? ( media-libs/libjpeg-turbo:=[static-libs(+)] ) lzo? ( dev-libs/lzo:2[static-libs(+)] ) multipath? ( sys-fs/multipath-tools ) ncurses? ( sys-libs/ncurses:=[unicode(+)] sys-libs/ncurses:=[static-libs(+)] ) nfs? ( >=net-fs/libnfs-1.9.3:=[static-libs(+)] ) numa? ( sys-process/numactl[static-libs(+)] ) opengl? ( virtual/opengl media-libs/libepoxy[static-libs(+)] media-libs/mesa[static-libs(+)] media-libs/mesa[egl(+),gbm(+)] ) pam? ( sys-libs/pam ) png? ( media-libs/libpng:0=[static-libs(+)] ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl[static-libs(+)] ) sdl? ( media-libs/libsdl2[video] media-libs/libsdl2[static-libs(+)] ) sdl-image? ( media-libs/sdl2-image[static-libs(+)] ) seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] ) slirp? ( net-libs/libslirp[static-libs(+)] ) smartcard? ( >=app-emulation/libcacard-2.5.0[static-libs(+)] ) snappy? ( app-arch/snappy:= ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0[static-libs(+)] ) ssh? ( >=net-libs/libssh-0.8.6[static-libs(+)] ) udev? ( virtual/libudev:= ) usb? ( >=virtual/libusb-1-r2[static-libs(+)] ) usbredir? ( >=sys-apps/usbredir-0.6[static-libs(+)] ) vde? ( net-misc/vde[static-libs(+)] ) virgl? ( media-libs/virglrenderer[static-libs(+)] ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools:= ) zstd? ( >=app-arch/zstd-1.4.0[static-libs(+)] ) ) static-user? ( >=dev-libs/glib-2.0[static-libs(+)] sys-libs/zlib[static-libs(+)] python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[ncurses,readline] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[ncurses,readline] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[ncurses,readline] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[ncurses,readline] ) ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr[static-libs(+)] ) )
 DESCRIPTION=QEMU + Kernel-based Virtual Machine userland tools
 EAPI=8
 HOMEPAGE=https://www.qemu.org https://www.linux-kvm.org
 IDEPEND=filecaps? ( sys-libs/libcap )
 INHERIT=linux-info toolchain-funcs python-r1 udev fcaps readme.gentoo-r1 pax-utils xdg-utils git-r3
-IUSE=accessibility +aio alsa bpf bzip2 capstone +caps +curl debug +doc +fdt fuse glusterfs +gnutls gtk infiniband iscsi io-uring jack jemalloc +jpeg lzo multipath ncurses nfs nls numa opengl +oss pam +pin-upstream-blobs plugins +png pulseaudio python rbd sasl +seccomp sdl sdl-image selinux +slirp smartcard snappy spice ssh static static-user systemtap test udev usb usbredir vde +vhost-net vhost-user-fs virgl virtfs +vnc vte xattr xen zstd qemu_softmmu_targets_aarch64 qemu_softmmu_targets_alpha qemu_softmmu_targets_arm qemu_softmmu_targets_cris qemu_softmmu_targets_hppa qemu_softmmu_targets_i386 qemu_softmmu_targets_loongarch64 qemu_softmmu_targets_m68k qemu_softmmu_targets_microblaze qemu_softmmu_targets_microblazeel qemu_softmmu_targets_mips qemu_softmmu_targets_mips64 qemu_softmmu_targets_mips64el qemu_softmmu_targets_mipsel qemu_softmmu_targets_nios2 qemu_softmmu_targets_or1k qemu_softmmu_targets_ppc qemu_softmmu_targets_ppc64 qemu_softmmu_targets_riscv32 qemu_softmmu_targets_riscv64 qemu_softmmu_targets_s390x qemu_softmmu_targets_sh4 qemu_softmmu_targets_sh4eb qemu_softmmu_targets_sparc qemu_softmmu_targets_sparc64 qemu_softmmu_targets_x86_64 qemu_softmmu_targets_xtensa qemu_softmmu_targets_xtensaeb qemu_softmmu_targets_avr qemu_softmmu_targets_rx qemu_softmmu_targets_tricore qemu_user_targets_aarch64 qemu_user_targets_alpha qemu_user_targets_arm qemu_user_targets_cris qemu_user_targets_hppa qemu_user_targets_i386 qemu_user_targets_loongarch64 qemu_user_targets_m68k qemu_user_targets_microblaze qemu_user_targets_microblazeel qemu_user_targets_mips qemu_user_targets_mips64 qemu_user_targets_mips64el qemu_user_targets_mipsel qemu_user_targets_nios2 qemu_user_targets_or1k qemu_user_targets_ppc qemu_user_targets_ppc64 qemu_user_targets_riscv32 qemu_user_targets_riscv64 qemu_user_targets_s390x qemu_user_targets_sh4 qemu_user_targets_sh4eb qemu_user_targets_sparc qemu_user_targets_sparc64 qemu_user_targets_x86_64 qemu_user_targets_xtensa qemu_user_targets_xtensaeb qemu_user_targets_aarch64_be qemu_user_targets_armeb qemu_user_targets_hexagon qemu_user_targets_mipsn32 qemu_user_targets_mipsn32el qemu_user_targets_ppc64le qemu_user_targets_sparc32plus python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 +filecaps
+IUSE=accessibility +aio alsa bpf bzip2 capstone +caps +curl debug +doc +fdt fuse glusterfs +gnutls gtk infiniband iscsi io-uring jack jemalloc +jpeg lzo multipath ncurses nfs nls numa opengl +oss pam +pin-upstream-blobs plugins +png pulseaudio python rbd sasl +seccomp sdl sdl-image selinux +slirp smartcard snappy spice ssh static static-user systemtap test udev usb usbredir vde +vhost-net vhost-user-fs virgl virtfs +vnc vte xattr xen zstd qemu_softmmu_targets_aarch64 qemu_softmmu_targets_alpha qemu_softmmu_targets_arm qemu_softmmu_targets_cris qemu_softmmu_targets_hppa qemu_softmmu_targets_i386 qemu_softmmu_targets_loongarch64 qemu_softmmu_targets_m68k qemu_softmmu_targets_microblaze qemu_softmmu_targets_microblazeel qemu_softmmu_targets_mips qemu_softmmu_targets_mips64 qemu_softmmu_targets_mips64el qemu_softmmu_targets_mipsel qemu_softmmu_targets_nios2 qemu_softmmu_targets_or1k qemu_softmmu_targets_ppc qemu_softmmu_targets_ppc64 qemu_softmmu_targets_riscv32 qemu_softmmu_targets_riscv64 qemu_softmmu_targets_s390x qemu_softmmu_targets_sh4 qemu_softmmu_targets_sh4eb qemu_softmmu_targets_sparc qemu_softmmu_targets_sparc64 qemu_softmmu_targets_x86_64 qemu_softmmu_targets_xtensa qemu_softmmu_targets_xtensaeb qemu_softmmu_targets_avr qemu_softmmu_targets_rx qemu_softmmu_targets_tricore qemu_user_targets_aarch64 qemu_user_targets_alpha qemu_user_targets_arm qemu_user_targets_cris qemu_user_targets_hppa qemu_user_targets_i386 qemu_user_targets_loongarch64 qemu_user_targets_m68k qemu_user_targets_microblaze qemu_user_targets_microblazeel qemu_user_targets_mips qemu_user_targets_mips64 qemu_user_targets_mips64el qemu_user_targets_mipsel qemu_user_targets_nios2 qemu_user_targets_or1k qemu_user_targets_ppc qemu_user_targets_ppc64 qemu_user_targets_riscv32 qemu_user_targets_riscv64 qemu_user_targets_s390x qemu_user_targets_sh4 qemu_user_targets_sh4eb qemu_user_targets_sparc qemu_user_targets_sparc64 qemu_user_targets_x86_64 qemu_user_targets_xtensa qemu_user_targets_xtensaeb qemu_user_targets_aarch64_be qemu_user_targets_armeb qemu_user_targets_hexagon qemu_user_targets_mipsn32 qemu_user_targets_mipsn32el qemu_user_targets_ppc64le qemu_user_targets_sparc32plus python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 +filecaps
 LICENSE=GPL-2 LGPL-2 BSD-2
 PROPERTIES=live
-RDEPEND=!static? ( >=dev-libs/glib-2.0 sys-libs/zlib python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[ncurses,readline] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[ncurses,readline] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[ncurses,readline] ) ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr ) >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty[api] app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bpf? ( dev-libs/libbpf:= ) bzip2? ( app-arch/bzip2 ) capstone? ( dev-libs/capstone:= ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.5.1 ) fuse? ( >=sys-fs/fuse-3.1:3 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle:= >=net-libs/gnutls-3.0:= ) gtk? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.91 ) ) infiniband? ( sys-cluster/rdma-core ) iscsi? ( net-libs/libiscsi ) io-uring? ( sys-libs/liburing:= ) jack? ( virtual/jack ) jemalloc? ( dev-libs/jemalloc ) jpeg? ( media-libs/libjpeg-turbo:= ) lzo? ( dev-libs/lzo:2 ) multipath? ( sys-fs/multipath-tools ) ncurses? ( sys-libs/ncurses:=[unicode(+)] sys-libs/ncurses:= ) nfs? ( >=net-fs/libnfs-1.9.3:= ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl(+),gbm(+)] ) pam? ( sys-libs/pam ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( media-libs/libsdl2[video] media-libs/libsdl2 ) sdl-image? ( media-libs/sdl2-image ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) slirp? ( net-libs/libslirp ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy:= ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh-0.8.6 ) udev? ( virtual/libudev:= ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools:= ) zstd? ( >=app-arch/zstd-1.4.0 ) ) qemu_softmmu_targets_i386? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-bin-202202 ~sys-firmware/ipxe-1.21.1[binary,qemu] ~sys-firmware/seabios-bin-1.16.0 ~sys-firmware/sgabios-0.1_pre10[binary] ) !pin-upstream-blobs? ( || ( >=sys-firmware/edk2-ovmf-202202 >=sys-firmware/edk2-ovmf-bin-202202 ) sys-firmware/ipxe[qemu] || ( >=sys-firmware/seabios-1.16.0[seavgabios] >=sys-firmware/seabios-bin-1.16.0 ) sys-firmware/sgabios ) ) qemu_softmmu_targets_x86_64? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-bin-202202 ~sys-firmware/ipxe-1.21.1[binary,qemu] ~sys-firmware/seabios-bin-1.16.0 ~sys-firmware/sgabios-0.1_pre10[binary] ) !pin-upstream-blobs? ( || ( >=sys-firmware/edk2-ovmf-202202 >=sys-firmware/edk2-ovmf-bin-202202 ) sys-firmware/ipxe[qemu] || ( >=sys-firmware/seabios-1.16.0[seavgabios] >=sys-firmware/seabios-bin-1.16.0 ) sys-firmware/sgabios ) ) qemu_softmmu_targets_ppc? ( pin-upstream-blobs? ( ~sys-firmware/seabios-bin-1.16.0 ) !pin-upstream-blobs? ( || ( >=sys-firmware/seabios-1.16.0[seavgabios] >=sys-firmware/seabios-bin-1.16.0 ) ) ) qemu_softmmu_targets_ppc64? ( pin-upstream-blobs? ( ~sys-firmware/seabios-bin-1.16.0 ) !pin-upstream-blobs? ( || ( >=sys-firmware/seabios-1.16.0[seavgabios] >=sys-firmware/seabios-bin-1.16.0 ) ) ) acct-group/kvm selinux? ( sec-policy/selinux-qemu sys-libs/libselinux )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) qemu_softmmu_targets_arm? ( fdt ) qemu_softmmu_targets_microblaze? ( fdt ) qemu_softmmu_targets_mips64el? ( fdt ) qemu_softmmu_targets_ppc64? ( fdt ) qemu_softmmu_targets_ppc? ( fdt ) qemu_softmmu_targets_riscv32? ( fdt ) qemu_softmmu_targets_riscv64? ( fdt ) qemu_softmmu_targets_x86_64? ( fdt ) sdl-image? ( sdl ) static? ( static-user !alsa !gtk !jack !opengl !pam !pulseaudio !plugins !rbd !snappy !udev ) static-user? ( !plugins ) vhost-user-fs? ( caps seccomp ) virgl? ( opengl ) virtfs? ( caps xattr ) vnc? ( gnutls ) vte? ( gtk ) multipath? ( udev ) plugins? ( !static !static-user )
+RDEPEND=!static? ( >=dev-libs/glib-2.0 sys-libs/zlib python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[ncurses,readline] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[ncurses,readline] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[ncurses,readline] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[ncurses,readline] ) ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr ) >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty[api] app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bpf? ( dev-libs/libbpf:= ) bzip2? ( app-arch/bzip2 ) capstone? ( dev-libs/capstone:= ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.5.1 ) fuse? ( >=sys-fs/fuse-3.1:3 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle:= >=net-libs/gnutls-3.0:= ) gtk? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.91 ) ) infiniband? ( sys-cluster/rdma-core ) iscsi? ( net-libs/libiscsi ) io-uring? ( sys-libs/liburing:= ) jack? ( virtual/jack ) jemalloc? ( dev-libs/jemalloc ) jpeg? ( media-libs/libjpeg-turbo:= ) lzo? ( dev-libs/lzo:2 ) multipath? ( sys-fs/multipath-tools ) ncurses? ( sys-libs/ncurses:=[unicode(+)] sys-libs/ncurses:= ) nfs? ( >=net-fs/libnfs-1.9.3:= ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl(+),gbm(+)] ) pam? ( sys-libs/pam ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( media-libs/libsdl2[video] media-libs/libsdl2 ) sdl-image? ( media-libs/sdl2-image ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) slirp? ( net-libs/libslirp ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy:= ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh-0.8.6 ) udev? ( virtual/libudev:= ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools:= ) zstd? ( >=app-arch/zstd-1.4.0 ) ) qemu_softmmu_targets_i386? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-bin-202202 ~sys-firmware/ipxe-1.21.1[binary,qemu] ~sys-firmware/seabios-bin-1.16.0 ~sys-firmware/sgabios-0.1_pre10[binary] ) !pin-upstream-blobs? ( || ( >=sys-firmware/edk2-ovmf-202202 >=sys-firmware/edk2-ovmf-bin-202202 ) sys-firmware/ipxe[qemu] || ( >=sys-firmware/seabios-1.16.0[seavgabios] >=sys-firmware/seabios-bin-1.16.0 ) sys-firmware/sgabios ) ) qemu_softmmu_targets_x86_64? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-bin-202202 ~sys-firmware/ipxe-1.21.1[binary,qemu] ~sys-firmware/seabios-bin-1.16.0 ~sys-firmware/sgabios-0.1_pre10[binary] ) !pin-upstream-blobs? ( || ( >=sys-firmware/edk2-ovmf-202202 >=sys-firmware/edk2-ovmf-bin-202202 ) sys-firmware/ipxe[qemu] || ( >=sys-firmware/seabios-1.16.0[seavgabios] >=sys-firmware/seabios-bin-1.16.0 ) sys-firmware/sgabios ) ) qemu_softmmu_targets_ppc? ( pin-upstream-blobs? ( ~sys-firmware/seabios-bin-1.16.0 ) !pin-upstream-blobs? ( || ( >=sys-firmware/seabios-1.16.0[seavgabios] >=sys-firmware/seabios-bin-1.16.0 ) ) ) qemu_softmmu_targets_ppc64? ( pin-upstream-blobs? ( ~sys-firmware/seabios-bin-1.16.0 ) !pin-upstream-blobs? ( || ( >=sys-firmware/seabios-1.16.0[seavgabios] >=sys-firmware/seabios-bin-1.16.0 ) ) ) acct-group/kvm selinux? ( sec-policy/selinux-qemu sys-libs/libselinux )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 ) qemu_softmmu_targets_arm? ( fdt ) qemu_softmmu_targets_microblaze? ( fdt ) qemu_softmmu_targets_mips64el? ( fdt ) qemu_softmmu_targets_ppc64? ( fdt ) qemu_softmmu_targets_ppc? ( fdt ) qemu_softmmu_targets_riscv32? ( fdt ) qemu_softmmu_targets_riscv64? ( fdt ) qemu_softmmu_targets_x86_64? ( fdt ) sdl-image? ( sdl ) static? ( static-user !alsa !gtk !jack !opengl !pam !pulseaudio !plugins !rbd !snappy !udev ) static-user? ( !plugins ) vhost-user-fs? ( caps seccomp ) virgl? ( opengl ) virtfs? ( caps xattr ) vnc? ( gnutls ) vte? ( gtk ) multipath? ( udev ) plugins? ( !static !static-user )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=fcaps	babe6282ea5c195981bd302af1adaf3a	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	linux-info	bbfa385d6907d7948d49a5e107bd654d	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	1542e649be915f43f6908a9e93909961	udev	eec0bbab06977f1cfc5597269c1fa152	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=48a5a28c6fb6225bebb3882566100f6a
+_md5_=e66fd7a740d6804d7dcab40ca2677910
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index 416ae22ef9c3..edfe6eea0e7b 100644
--- a/metadata/md5-cache/app-misc/Manifest.gz
+++ b/metadata/md5-cache/app-misc/Manifest.gz
diff --git a/metadata/md5-cache/app-misc/wayland-utils-1.1.0 b/metadata/md5-cache/app-misc/wayland-utils-1.1.0
new file mode 100644
index 000000000000..29ec26d8f7c3
--- /dev/null
+++ b/metadata/md5-cache/app-misc/wayland-utils-1.1.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/wayland-scanner >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install test
+DEPEND=>=dev-libs/wayland-1.20.0 x11-libs/libdrm dev-libs/wayland-protocols
+DESCRIPTION=Display information about supported Wayland protocols and current compositor
+EAPI=8
+HOMEPAGE=https://gitlab.freedesktop.org/wayland/wayland-utils
+INHERIT=meson
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=MIT
+RDEPEND=>=dev-libs/wayland-1.20.0 x11-libs/libdrm
+SLOT=0
+SRC_URI=https://gitlab.freedesktop.org/wayland/wayland-utils/-/archive/1.1.0/wayland-utils-1.1.0.tar.bz2
+_eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=f103360a2c44f9d79670cf72de671692
diff --git a/metadata/md5-cache/dev-cpp/Manifest.gz b/metadata/md5-cache/dev-cpp/Manifest.gz
index b1ed647f54d2..c7abe3d2ca47 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/rapidfuzz-cpp-1.7.0 b/metadata/md5-cache/dev-cpp/rapidfuzz-cpp-1.7.0
new file mode 100644
index 000000000000..c50a133f2f69
--- /dev/null
+++ b/metadata/md5-cache/dev-cpp/rapidfuzz-cpp-1.7.0
@@ -0,0 +1,14 @@
+BDEPEND=test? ( >=dev-cpp/catch-3 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Rapid fuzzy string matching in C++
+EAPI=8
+HOMEPAGE=https://github.com/maxbachmann/rapidfuzz-cpp/
+INHERIT=cmake
+IUSE=test
+KEYWORDS=~amd64
+LICENSE=MIT
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/maxbachmann/rapidfuzz-cpp/archive/v1.7.0.tar.gz -> rapidfuzz-cpp-1.7.0.gh.tar.gz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=6fd0f549df4c55037f1d24e8d6a2b97d
diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index 7e0968ea25f9..101472f49c03 100644
--- a/metadata/md5-cache/dev-db/Manifest.gz
+++ b/metadata/md5-cache/dev-db/Manifest.gz
diff --git a/metadata/md5-cache/dev-db/lmdb++-1.0.0-r1 b/metadata/md5-cache/dev-db/lmdb++-1.0.0-r1
index f623e0c4f8b1..18f4139caf66 100644
--- a/metadata/md5-cache/dev-db/lmdb++-1.0.0-r1
+++ b/metadata/md5-cache/dev-db/lmdb++-1.0.0-r1
@@ -3,10 +3,10 @@ DESCRIPTION=C++11 wrapper for the LMDB database library
 EAPI=8
 HOMEPAGE=https://github.com/hoytech/lmdbxx
 IUSE=test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=public-domain
 RDEPEND=dev-db/lmdb
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/hoytech/lmdbxx/archive/1.0.0.tar.gz -> lmdbxx-1.0.0.tar.gz
-_md5_=adedc16d4d71d05cef9e07c12a5877af
+_md5_=32d82b8d7e77fe85c746ed4cfe94aaae
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index 56031bc46399..7f53d1eef3a3 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.1.0 b/metadata/md5-cache/dev-java/tomcat-servlet-api-10.1.0
new file mode 100644
index 000000000000..ac2b88725665
--- /dev/null
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-10.1.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=Tomcat's Servlet API 6.0/JSP API 3.1/EL API 5.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-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=6.0
+SRC_URI=mirror://apache/tomcat/tomcat-10/v10.1.0/src/apache-tomcat-10.1.0-src.tar.gz
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	343e153526b31b64f7efec0fdfa0f33b	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
+_md5_=25f3ecd8bd80e13186d4d73231195fe5
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.67 b/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.67
new file mode 100644
index 000000000000..18c37c885f4a
--- /dev/null
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.67
@@ -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 4.0/JSP API 2.3/EL API 3.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=4.0
+SRC_URI=mirror://apache/tomcat/tomcat-9/v9.0.67/src/apache-tomcat-9.0.67-src.tar.gz
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	343e153526b31b64f7efec0fdfa0f33b	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
+_md5_=08ded5a97f72bfd8d150c726103afe2f
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 0035667ab6cc..1ec3c3636b30 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/libatomic_ops-7.6.12 b/metadata/md5-cache/dev-libs/libatomic_ops-7.6.12
deleted file mode 100644
index 2802c6f29e64..000000000000
--- a/metadata/md5-cache/dev-libs/libatomic_ops-7.6.12
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install test
-DESCRIPTION=Implementation for atomic memory update operations
-EAPI=7
-HOMEPAGE=https://github.com/ivmai/libatomic_ops/
-INHERIT=multilib-minimal
-IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT boehm-gc GPL-2+
-SLOT=0
-SRC_URI=https://github.com/ivmai/libatomic_ops/releases/download/v7.6.12/libatomic_ops-7.6.12.tar.gz
-_eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=60c7c8659bebcd8370788c1a41d5af3d
diff --git a/metadata/md5-cache/dev-libs/serd-0.30.14-r1 b/metadata/md5-cache/dev-libs/serd-0.30.14-r1
index f0962807f2db..4ee0d4fd4b72 100644
--- a/metadata/md5-cache/dev-libs/serd-0.30.14-r1
+++ b/metadata/md5-cache/dev-libs/serd-0.30.14-r1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=http://drobilla.net/software/serd/
 INHERIT=meson-multilib python-any-r1
 IUSE=doc static-libs test +tools abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86
 LICENSE=ISC
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://download.drobilla.net/serd-0.30.14.tar.xz
 _eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=cb9b0b9cb8a8b438d5940199fcc8de22
+_md5_=46dea7b9b7fadca960be523c423b9810
diff --git a/metadata/md5-cache/dev-libs/sord-0.16.12-r1 b/metadata/md5-cache/dev-libs/sord-0.16.12-r1
index c1379c4b2128..d8874018b6f6 100644
--- a/metadata/md5-cache/dev-libs/sord-0.16.12-r1
+++ b/metadata/md5-cache/dev-libs/sord-0.16.12-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=http://drobilla.net/software/sord/
 INHERIT=meson-multilib python-any-r1
 IUSE=doc test tools abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86
 LICENSE=ISC
 RDEPEND=dev-libs/libpcre dev-libs/serd
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://download.drobilla.net/sord-0.16.12.tar.xz
 _eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=feece0f9f9ddfaf9ffbd1aa60942ea9e
+_md5_=7f5e40548631730a45118a019b2172e3
diff --git a/metadata/md5-cache/dev-python/Faker-15.0.0 b/metadata/md5-cache/dev-python/Faker-15.0.0
new file mode 100644
index 000000000000..42e9eedf9adf
--- /dev/null
+++ b/metadata/md5-cache/dev-python/Faker-15.0.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/freezegun[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,tiff] dev-python/random2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/validators[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/python-dateutil-2.4.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !dev-ruby/faker >=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-8[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 Python package that generates fake data for you
+EAPI=8
+HOMEPAGE=https://github.com/joke2k/faker/ https://pypi.org/project/Faker/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/python-dateutil-2.4.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !dev-ruby/faker python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/F/Faker/Faker-15.0.0.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=f3bf23f934b35863ff1c0a26b844f327
diff --git a/metadata/md5-cache/dev-python/Levenshtein-0.20.4 b/metadata/md5-cache/dev-python/Levenshtein-0.20.4
new file mode 100644
index 000000000000..b5fc8f1e2adc
--- /dev/null
+++ b/metadata/md5-cache/dev-python/Levenshtein-0.20.4
@@ -0,0 +1,17 @@
+BDEPEND=dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/scikit-build-0.13.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( <dev-python/rapidfuzz-3.0.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-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-cpp/rapidfuzz-cpp-1.7.0
+DESCRIPTION=Functions for fast computation of Levenshtein distance, and edit operations
+EAPI=8
+HOMEPAGE=https://pypi.org/project/Levenshtein/ https://github.com/maxbachmann/Levenshtein/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64
+LICENSE=GPL-2+
+RDEPEND=<dev-python/rapidfuzz-3.0.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/maxbachmann/Levenshtein/archive/v0.20.4.tar.gz -> Levenshtein-0.20.4.gh.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=0ef92671e0ca9532c5991fcc777531ef
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 4822bb943f1f..79e83b211331 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/boto3-1.24.81 b/metadata/md5-cache/dev-python/boto3-1.24.81
new file mode 100644
index 000000000000..4f96c5cecca7
--- /dev/null
+++ b/metadata/md5-cache/dev-python/boto3-1.24.81
@@ -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.81[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-8[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.81[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.81.tar.gz -> boto3-1.24.81.gh.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=50e9b19da5bcce80f05fd9be69fe0ff8
diff --git a/metadata/md5-cache/dev-python/botocore-1.27.81 b/metadata/md5-cache/dev-python/botocore-1.27.81
new file mode 100644
index 000000000000..34aaac50b64c
--- /dev/null
+++ b/metadata/md5-cache/dev-python/botocore-1.27.81
@@ -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-8[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.81.tar.gz -> botocore-1.27.81.gh.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=bb152b00283104522fdf392996d7badc
diff --git a/metadata/md5-cache/dev-python/ipykernel-6.16.0 b/metadata/md5-cache/dev-python/ipykernel-6.16.0
new file mode 100644
index 000000000000..c54b603ec43d
--- /dev/null
+++ b/metadata/md5-cache/dev-python/ipykernel-6.16.0
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-python/debugpy-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ipython-7.23.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jupyter_client-6.1.12[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/matplotlib-inline-0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/nest_asyncio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyzmq-17[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/tornado-6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/traitlets-5.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/flaky[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-timeout[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ipyparallel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/debugpy-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ipython-7.23.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jupyter_client-6.1.12[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/matplotlib-inline-0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/nest_asyncio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyzmq-17[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/tornado-6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/traitlets-5.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.1.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[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-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/hatchling-1.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=IPython Kernel for Jupyter
+EAPI=8
+HOMEPAGE=https://github.com/ipython/ipykernel/ https://pypi.org/project/ipykernel/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=BSD
+RDEPEND=>=dev-python/debugpy-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ipython-7.23.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jupyter_client-6.1.12[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/matplotlib-inline-0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/nest_asyncio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyzmq-17[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/tornado-6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/traitlets-5.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+)] )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/i/ipykernel/ipykernel-6.16.0.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=71feeb2d3d4174c744809a361d9ef27e
diff --git a/metadata/md5-cache/dev-python/jaraco-classes-3.2.3 b/metadata/md5-cache/dev-python/jaraco-classes-3.2.3
new file mode 100644
index 000000000000..e822eb65ccf6
--- /dev/null
+++ b/metadata/md5-cache/dev-python/jaraco-classes-3.2.3
@@ -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/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-8[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=Classes used by other projects by developer jaraco
+EAPI=8
+HOMEPAGE=https://github.com/jaraco/jaraco.classes/ https://pypi.org/project/jaraco.classes/
+INHERIT=distutils-r1
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+LICENSE=MIT
+RDEPEND=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/j/jaraco.classes/jaraco.classes-3.2.3.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=681e4077eff5867299add3971538dd91
diff --git a/metadata/md5-cache/dev-python/jaraco-functools-3.5.2 b/metadata/md5-cache/dev-python/jaraco-functools-3.5.2
new file mode 100644
index 000000000000..a23263361dbe
--- /dev/null
+++ b/metadata/md5-cache/dev-python/jaraco-functools-3.5.2
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/jaraco-classes[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/more-itertools-0.12.0-r1[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-8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/flit_core-3.7.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Additional functions used by other projects by developer jaraco
+EAPI=7
+HOMEPAGE=https://github.com/jaraco/jaraco.functools/ https://pypi.org/project/jaraco.functools/
+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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=>=dev-python/more-itertools-0.12.0-r1[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/j/jaraco.functools/jaraco.functools-3.5.2.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=0ac4c3ae825a751635a03f8246c51a59
diff --git a/metadata/md5-cache/dev-python/jupyter_server-1.19.0 b/metadata/md5-cache/dev-python/jupyter_server-1.19.0
new file mode 100644
index 000000000000..b49e41c4846f
--- /dev/null
+++ b/metadata/md5-cache/dev-python/jupyter_server-1.19.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/ipykernel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-console-scripts[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-timeout[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-tornasync[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[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/pydata-sphinx-theme[python_targets_python3_10(-)] dev-python/myst_parser[python_targets_python3_10(-)] dev-python/ipython[python_targets_python3_10(-)] dev-python/sphinxemoji[python_targets_python3_10(-)] dev-python/sphinxcontrib-github-alt[python_targets_python3_10(-)] dev-python/sphinxcontrib-openapi[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/pydata-sphinx-theme[python_targets_python3_9(-)] dev-python/myst_parser[python_targets_python3_9(-)] dev-python/ipython[python_targets_python3_9(-)] dev-python/sphinxemoji[python_targets_python3_9(-)] dev-python/sphinxcontrib-github-alt[python_targets_python3_9(-)] dev-python/sphinxcontrib-openapi[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/pydata-sphinx-theme[python_targets_python3_8(-)] dev-python/myst_parser[python_targets_python3_8(-)] dev-python/ipython[python_targets_python3_8(-)] dev-python/sphinxemoji[python_targets_python3_8(-)] dev-python/sphinxcontrib-github-alt[python_targets_python3_8(-)] dev-python/sphinxcontrib-openapi[python_targets_python3_8(-)] ) ) ) test? ( >=dev-python/anyio-3.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/anyio-4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/argon2-cffi[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/jupyter_client-6.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jupyter_core-4.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nbconvert-6.4.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nbformat-5.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/prometheus_client[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyzmq-17[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/send2trash[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/terminado-0.8.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/tornado-6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/traitlets-5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/websocket-client[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-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jupyter_packaging-0.12.0-r1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Core services, APIs, and REST endpoints to Jupyter web applications
+EAPI=8
+HOMEPAGE=https://jupyter.org
+INHERIT=distutils-r1
+IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=BSD
+RDEPEND=>=dev-python/anyio-3.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/anyio-4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/argon2-cffi[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/jupyter_client-6.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jupyter_core-4.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nbconvert-6.4.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nbformat-5.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/prometheus_client[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyzmq-17[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/send2trash[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/terminado-0.8.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/tornado-6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/traitlets-5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/websocket-client[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=mirror://pypi/j/jupyter_server/jupyter_server-1.19.0.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=8a6e162115abb66840e60f68f6ea7956
diff --git a/metadata/md5-cache/dev-python/jupyterlab_server-2.15.2 b/metadata/md5-cache/dev-python/jupyterlab_server-2.15.2
new file mode 100644
index 000000000000..de43d39172da
--- /dev/null
+++ b/metadata/md5-cache/dev-python/jupyterlab_server-2.15.2
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/ipykernel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jupyter_server[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/openapi-core-0.14.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/openapi-core-0.15[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/openapi-spec-validator[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-console-scripts[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-tornasync[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-timeout[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ruamel-yaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/strict-rfc3339[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/Babel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/importlib_metadata-3.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jinja-3.0.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/json5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jsonschema-3.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jupyter_server-1.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/jupyter_server-2[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-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/hatchling-1.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Server components for JupyterLab and JupyterLab like applications
+EAPI=8
+HOMEPAGE=https://jupyter.org/ https://github.com/jupyterlab/jupyterlab_server/ https://pypi.org/project/jupyterlab-server/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-python/Babel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/importlib_metadata-3.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jinja-3.0.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/json5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jsonschema-3.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jupyter_server-1.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/jupyter_server-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/j/jupyterlab_server/jupyterlab_server-2.15.2.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=ea9f74a39ad04abac40a68eb8d13408b
diff --git a/metadata/md5-cache/dev-python/mypy-0.981 b/metadata/md5-cache/dev-python/mypy-0.981
new file mode 100644
index 000000000000..30fbf0351715
--- /dev/null
+++ b/metadata/md5-cache/dev-python/mypy-0.981
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/attrs-18.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/filelock-3.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/lxml-4.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-6.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-xdist-1.18[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/py-1.5.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/typed-ast-1.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/virtualenv-16.0.0[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-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-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(-)] ) ) ) test? ( !dev-util/stubgen >=dev-python/psutil-4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/typed-ast-1.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/typed-ast-1.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/typing-extensions-3.7.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/mypy_extensions-0.4.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/mypy_extensions-0.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-python/tomli[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/tomli[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/tomli[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-8[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=Optional static typing for Python
+EAPI=8
+HOMEPAGE=http://www.mypy-lang.org/ https://github.com/python/mypy/ https://pypi.org/project/mypy/
+INHERIT=distutils-r1 multiprocessing
+IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=!dev-util/stubgen >=dev-python/psutil-4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/typed-ast-1.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/typed-ast-1.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/typing-extensions-3.7.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/mypy_extensions-0.4.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/mypy_extensions-0.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-python/tomli[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/tomli[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/tomli[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/python/mypy/archive/v0.981.tar.gz -> mypy-0.981.gh.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=8529e9e27116f82c79e4fc3d1bdb1ad4
diff --git a/metadata/md5-cache/dev-python/sentry-sdk-1.9.9 b/metadata/md5-cache/dev-python/sentry-sdk-1.9.9
new file mode 100644
index 000000000000..b76d3a71bb41
--- /dev/null
+++ b/metadata/md5-cache/dev-python/sentry-sdk-1.9.9
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/asttokens[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/django[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/executing[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/fakeredis[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/flask-login[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/gevent[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jsonschema[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyrsistent[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-aiohttp[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-django[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-forked[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-localserver[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/werkzeug[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/zope-event[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-python/eventlet[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( dev-python/eventlet[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) ) test? ( dev-python/urllib3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/certifi[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-8[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 client for Sentry
+EAPI=8
+HOMEPAGE=https://sentry.io/ https://github.com/getsentry/sentry-python/ https://pypi.org/project/sentry-sdk/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=PSF-2
+RDEPEND=dev-python/urllib3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/certifi[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/getsentry/sentry-python/archive/1.9.9.tar.gz -> sentry-sdk-1.9.9.gh.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=f6ae091de04d37674e02a41e59a17db4
diff --git a/metadata/md5-cache/dev-python/sphinx-autodoc-typehints-1.19.3 b/metadata/md5-cache/dev-python/sphinx-autodoc-typehints-1.19.3
new file mode 100644
index 000000000000..79ac79a2f7c4
--- /dev/null
+++ b/metadata/md5-cache/dev-python/sphinx-autodoc-typehints-1.19.3
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/hatch-vcs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( >=dev-python/nptyping-2.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sphobjinv-2.2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/typing-extensions-4.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/sphinx-5.2.1[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-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/hatchling-1.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Type hints support for the Sphinx autodoc extension
+EAPI=8
+HOMEPAGE=https://github.com/tox-dev/sphinx-autodoc-typehints/ https://pypi.org/project/sphinx-autodoc-typehints/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/sphinx-5.2.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/tox-dev/sphinx-autodoc-typehints/archive/1.19.3.tar.gz -> sphinx-autodoc-typehints-1.19.3.gh.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=3ede162eb2995b607ac84148f233e531
diff --git a/metadata/md5-cache/dev-python/stack_data-0.5.0 b/metadata/md5-cache/dev-python/stack_data-0.5.0
index 54fc4d7d474e..a7946902e3db 100644
--- a/metadata/md5-cache/dev-python/stack_data-0.5.0
+++ b/metadata/md5-cache/dev-python/stack_data-0.5.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/alexmojaki/stack_data
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc ~x86
 LICENSE=MIT
 RDEPEND=dev-python/asttokens[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/executing[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pure_eval[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/s/stack_data/stack_data-0.5.0.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=205c2b24f7b35d50194cdd34de593aa4
+_md5_=23dddaeffe46a27ec8b92db8a8660d94
diff --git a/metadata/md5-cache/dev-python/starlette-0.21.0 b/metadata/md5-cache/dev-python/starlette-0.21.0
new file mode 100644
index 000000000000..f7c3750ffeb9
--- /dev/null
+++ b/metadata/md5-cache/dev-python/starlette-0.21.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( || ( dev-python/brotlicffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] app-arch/brotli[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) dev-python/trio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( <dev-python/anyio-5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/anyio-3.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/httpx-0.22.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/itsdangerous[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-python/typing-extensions-3.10.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-python/typing-extensions-3.10.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) 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-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/hatchling-1.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=The little ASGI framework that shines
+EAPI=8
+HOMEPAGE=https://www.starlette.io/ https://github.com/encode/starlette/ https://pypi.org/project/starlette/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=<dev-python/anyio-5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/anyio-3.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/httpx-0.22.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/itsdangerous[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-python/typing-extensions-3.10.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-python/typing-extensions-3.10.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) 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/encode/starlette/archive/0.21.0.tar.gz -> starlette-0.21.0.gh.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=23e0b5bbeab92a9d8c4efb87ed0538ad
diff --git a/metadata/md5-cache/dev-python/trove-classifiers-2022.6.23 b/metadata/md5-cache/dev-python/trove-classifiers-2022.6.23
deleted file mode 100644
index 958c5590b355..000000000000
--- a/metadata/md5-cache/dev-python/trove-classifiers-2022.6.23
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/calver[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( >=dev-python/pytest-7.1.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-8[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=Canonical source for classifiers on PyPI (pypi.org)
-EAPI=8
-HOMEPAGE=https://github.com/pypa/trove-classifiers/ https://pypi.org/project/trove-classifiers/
-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
-LICENSE=Apache-2.0
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/pypa/trove-classifiers/archive/2022.6.23.tar.gz -> trove-classifiers-2022.6.23.gh.tar.gz
-_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=8e59a55e5c5dad5a3500f535658cefd7
diff --git a/metadata/md5-cache/dev-python/trove-classifiers-2022.6.26 b/metadata/md5-cache/dev-python/trove-classifiers-2022.6.26
deleted file mode 100644
index da5ca77d744e..000000000000
--- a/metadata/md5-cache/dev-python/trove-classifiers-2022.6.26
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/calver[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( >=dev-python/pytest-7.1.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-8[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=Canonical source for classifiers on PyPI (pypi.org)
-EAPI=8
-HOMEPAGE=https://github.com/pypa/trove-classifiers/ https://pypi.org/project/trove-classifiers/
-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
-LICENSE=Apache-2.0
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/pypa/trove-classifiers/archive/2022.6.26.tar.gz -> trove-classifiers-2022.6.26.gh.tar.gz
-_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=8e59a55e5c5dad5a3500f535658cefd7
diff --git a/metadata/md5-cache/dev-python/trove-classifiers-2022.7.22 b/metadata/md5-cache/dev-python/trove-classifiers-2022.7.22
deleted file mode 100644
index 1bfa4abb28a4..000000000000
--- a/metadata/md5-cache/dev-python/trove-classifiers-2022.7.22
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/calver[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( >=dev-python/pytest-7.1.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-8[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=Canonical source for classifiers on PyPI (pypi.org)
-EAPI=8
-HOMEPAGE=https://github.com/pypa/trove-classifiers/ https://pypi.org/project/trove-classifiers/
-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
-LICENSE=Apache-2.0
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/pypa/trove-classifiers/archive/2022.7.22.tar.gz -> trove-classifiers-2022.7.22.gh.tar.gz
-_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=8e59a55e5c5dad5a3500f535658cefd7
diff --git a/metadata/md5-cache/dev-python/trove-classifiers-2022.8.7 b/metadata/md5-cache/dev-python/trove-classifiers-2022.8.7
deleted file mode 100644
index 39ddfa17c09f..000000000000
--- a/metadata/md5-cache/dev-python/trove-classifiers-2022.8.7
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/calver[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( >=dev-python/pytest-7.1.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-8[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=Canonical source for classifiers on PyPI (pypi.org)
-EAPI=8
-HOMEPAGE=https://github.com/pypa/trove-classifiers/ https://pypi.org/project/trove-classifiers/
-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
-LICENSE=Apache-2.0
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/pypa/trove-classifiers/archive/2022.8.7.tar.gz -> trove-classifiers-2022.8.7.gh.tar.gz
-_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=8e59a55e5c5dad5a3500f535658cefd7
diff --git a/metadata/md5-cache/dev-python/trove-classifiers-2022.8.24 b/metadata/md5-cache/dev-python/trove-classifiers-2022.9.26
index 1bbe83c2de5d..655edf56ef54 100644
--- a/metadata/md5-cache/dev-python/trove-classifiers-2022.8.24
+++ b/metadata/md5-cache/dev-python/trove-classifiers-2022.9.26
@@ -11,6 +11,6 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_
 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/pypa/trove-classifiers/archive/2022.8.24.tar.gz -> trove-classifiers-2022.8.24.gh.tar.gz
+SRC_URI=https://github.com/pypa/trove-classifiers/archive/2022.9.26.tar.gz -> trove-classifiers-2022.9.26.gh.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
 _md5_=8e59a55e5c5dad5a3500f535658cefd7
diff --git a/metadata/md5-cache/dev-python/yamlpath-3.6.6 b/metadata/md5-cache/dev-python/yamlpath-3.6.6
new file mode 100644
index 000000000000..2e4cc852b612
--- /dev/null
+++ b/metadata/md5-cache/dev-python/yamlpath-3.6.6
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/pytest-console-scripts[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-ruby/hiera-eyaml ) test? ( dev-python/ruamel-yaml[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/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
+DESCRIPTION=Command-line processors for YAML/JSON/Compatible data
+EAPI=8
+HOMEPAGE=https://github.com/wwkimball/yamlpath https://github.com/wwkimball/yamlpath/wiki
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64
+LICENSE=ISC
+RDEPEND=dev-python/ruamel-yaml[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/wwkimball/yamlpath/archive/v3.6.6.tar.gz -> yamlpath-3.6.6.gh.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=5ed439eb28629e5cf51e178007c22470
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 384f146c5c9d..985310db3dfd 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/bingrep-0.10.0 b/metadata/md5-cache/dev-util/bingrep-0.10.0
deleted file mode 100644
index a9ccb647b91e..000000000000
--- a/metadata/md5-cache/dev-util/bingrep-0.10.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=virtual/rust-1.53
-DEFINED_PHASES=compile configure install test unpack
-DESCRIPTION=Binary file analysis tool
-EAPI=8
-HOMEPAGE=https://github.com/m4b/bingrep
-INHERIT=cargo
-IUSE=debug
-KEYWORDS=~amd64 ~ppc64 ~x86
-LICENSE=Apache-2.0 Apache-2.0-with-LLVM-exceptions Boost-1.0 BSD BSD-2 CC0-1.0 GPL-3 ISC MIT Unlicense
-SLOT=0
-SRC_URI=https://github.com/m4b/bingrep/archive/refs/tags/v0.10.0.tar.gz -> bingrep-0.10.0.tar.gz 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.56/download -> anyhow-1.0.56.crate https://crates.io/api/v1/crates/arrayref/0.3.6/download -> arrayref-0.3.6.crate https://crates.io/api/v1/crates/arrayvec/0.5.2/download -> arrayvec-0.5.2.crate https://crates.io/api/v1/crates/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/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/blake2b_simd/0.5.11/download -> blake2b_simd-0.5.11.crate https://crates.io/api/v1/crates/bstr/0.2.17/download -> bstr-0.2.17.crate https://crates.io/api/v1/crates/byteorder/1.4.3/download -> byteorder-1.4.3.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/clap/3.1.6/download -> clap-3.1.6.crate https://crates.io/api/v1/crates/clap_derive/3.1.4/download -> clap_derive-3.1.4.crate https://crates.io/api/v1/crates/constant_time_eq/0.1.5/download -> constant_time_eq-0.1.5.crate https://crates.io/api/v1/crates/cpp_demangle/0.3.5/download -> cpp_demangle-0.3.5.crate https://crates.io/api/v1/crates/crossbeam-utils/0.8.8/download -> crossbeam-utils-0.8.8.crate https://crates.io/api/v1/crates/csv/1.1.6/download -> csv-1.1.6.crate https://crates.io/api/v1/crates/csv-core/0.1.10/download -> csv-core-0.1.10.crate https://crates.io/api/v1/crates/dirs/1.0.5/download -> dirs-1.0.5.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/env_logger/0.9.0/download -> env_logger-0.9.0.crate https://crates.io/api/v1/crates/fuchsia-cprng/0.1.1/download -> fuchsia-cprng-0.1.1.crate https://crates.io/api/v1/crates/getrandom/0.1.16/download -> getrandom-0.1.16.crate https://crates.io/api/v1/crates/goblin/0.5.1/download -> goblin-0.5.1.crate https://crates.io/api/v1/crates/hashbrown/0.11.2/download -> hashbrown-0.11.2.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/hexplay/0.2.1/download -> hexplay-0.2.1.crate https://crates.io/api/v1/crates/humantime/2.1.0/download -> humantime-2.1.0.crate https://crates.io/api/v1/crates/indexmap/1.8.0/download -> indexmap-1.8.0.crate https://crates.io/api/v1/crates/itoa/0.4.8/download -> itoa-0.4.8.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.121/download -> libc-0.2.121.crate https://crates.io/api/v1/crates/log/0.4.14/download -> log-0.4.14.crate https://crates.io/api/v1/crates/memchr/2.4.1/download -> memchr-2.4.1.crate https://crates.io/api/v1/crates/memrange/0.1.3/download -> memrange-0.1.3.crate https://crates.io/api/v1/crates/metagoblin/0.6.0/download -> metagoblin-0.6.0.crate https://crates.io/api/v1/crates/os_str_bytes/6.0.0/download -> os_str_bytes-6.0.0.crate https://crates.io/api/v1/crates/plain/0.2.3/download -> plain-0.2.3.crate https://crates.io/api/v1/crates/prettytable-rs/0.8.0/download -> prettytable-rs-0.8.0.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.36/download -> proc-macro2-1.0.36.crate https://crates.io/api/v1/crates/quote/1.0.16/download -> quote-1.0.16.crate https://crates.io/api/v1/crates/rand/0.3.23/download -> rand-0.3.23.crate https://crates.io/api/v1/crates/rand/0.4.6/download -> rand-0.4.6.crate https://crates.io/api/v1/crates/rand_core/0.3.1/download -> rand_core-0.3.1.crate https://crates.io/api/v1/crates/rand_core/0.4.2/download -> rand_core-0.4.2.crate https://crates.io/api/v1/crates/rdrand/0.4.0/download -> rdrand-0.4.0.crate https://crates.io/api/v1/crates/redox_syscall/0.1.57/download -> redox_syscall-0.1.57.crate https://crates.io/api/v1/crates/redox_users/0.3.5/download -> redox_users-0.3.5.crate https://crates.io/api/v1/crates/regex/1.5.5/download -> regex-1.5.5.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.25/download -> regex-syntax-0.6.25.crate https://crates.io/api/v1/crates/rust-argon2/0.8.3/download -> rust-argon2-0.8.3.crate https://crates.io/api/v1/crates/rustc-demangle/0.1.21/download -> rustc-demangle-0.1.21.crate https://crates.io/api/v1/crates/rustc-serialize/0.3.24/download -> rustc-serialize-0.3.24.crate https://crates.io/api/v1/crates/ryu/1.0.9/download -> ryu-1.0.9.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/serde/1.0.136/download -> serde-1.0.136.crate https://crates.io/api/v1/crates/strsim/0.10.0/download -> strsim-0.10.0.crate https://crates.io/api/v1/crates/syn/1.0.89/download -> syn-1.0.89.crate https://crates.io/api/v1/crates/term/0.5.2/download -> term-0.5.2.crate https://crates.io/api/v1/crates/termcolor/0.3.6/download -> termcolor-0.3.6.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/theban_interval_tree/0.7.1/download -> theban_interval_tree-0.7.1.crate https://crates.io/api/v1/crates/time/0.1.44/download -> time-0.1.44.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/unicode-xid/0.2.2/download -> unicode-xid-0.2.2.crate https://crates.io/api/v1/crates/version_check/0.9.4/download -> version_check-0.9.4.crate https://crates.io/api/v1/crates/wasi/0.9.0+wasi-snapshot-preview1/download -> wasi-0.9.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasi/0.10.0+wasi-snapshot-preview1/download -> wasi-0.10.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-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/wincolor/0.1.6/download -> wincolor-0.1.6.crate
-_eclasses_=cargo	52a92ed3815080c5f2caac1905687b1c	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=7bc59755f0517f3ac1233c395ada771b
diff --git a/metadata/md5-cache/dev-util/bingrep-0.10.1 b/metadata/md5-cache/dev-util/bingrep-0.10.1
new file mode 100644
index 000000000000..a05e5bd2b502
--- /dev/null
+++ b/metadata/md5-cache/dev-util/bingrep-0.10.1
@@ -0,0 +1,13 @@
+BDEPEND=>=virtual/rust-1.53
+DEFINED_PHASES=compile configure install test unpack
+DESCRIPTION=Binary file analysis tool
+EAPI=8
+HOMEPAGE=https://github.com/m4b/bingrep
+INHERIT=cargo
+IUSE=debug
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=MIT Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD Boost-1.0 ISC MIT Unicode-DFS-2016 Unlicense
+SLOT=0
+SRC_URI=https://github.com/m4b/bingrep/archive/refs/tags/v0.10.1.tar.gz -> bingrep-0.10.1.tar.gz 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.63/download -> anyhow-1.0.63.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/bitflags/1.3.2/download -> bitflags-1.3.2.crate https://crates.io/api/v1/crates/bstr/0.2.17/download -> bstr-0.2.17.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/clap/3.2.20/download -> clap-3.2.20.crate https://crates.io/api/v1/crates/clap_derive/3.2.18/download -> clap_derive-3.2.18.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/cpp_demangle/0.3.5/download -> cpp_demangle-0.3.5.crate https://crates.io/api/v1/crates/csv/1.1.6/download -> csv-1.1.6.crate https://crates.io/api/v1/crates/csv-core/0.1.10/download -> csv-core-0.1.10.crate https://crates.io/api/v1/crates/dirs-next/2.0.0/download -> dirs-next-2.0.0.crate https://crates.io/api/v1/crates/dirs-sys-next/0.1.2/download -> dirs-sys-next-0.1.2.crate https://crates.io/api/v1/crates/encode_unicode/1.0.0/download -> encode_unicode-1.0.0.crate https://crates.io/api/v1/crates/env_logger/0.9.0/download -> env_logger-0.9.0.crate https://crates.io/api/v1/crates/fuchsia-cprng/0.1.1/download -> fuchsia-cprng-0.1.1.crate https://crates.io/api/v1/crates/getrandom/0.2.7/download -> getrandom-0.2.7.crate https://crates.io/api/v1/crates/goblin/0.5.4/download -> goblin-0.5.4.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/hexplay/0.2.1/download -> hexplay-0.2.1.crate https://crates.io/api/v1/crates/humantime/2.1.0/download -> humantime-2.1.0.crate https://crates.io/api/v1/crates/indexmap/1.9.1/download -> indexmap-1.9.1.crate https://crates.io/api/v1/crates/itoa/0.4.8/download -> itoa-0.4.8.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.132/download -> libc-0.2.132.crate https://crates.io/api/v1/crates/log/0.4.17/download -> log-0.4.17.crate https://crates.io/api/v1/crates/memchr/2.5.0/download -> memchr-2.5.0.crate https://crates.io/api/v1/crates/memrange/0.1.3/download -> memrange-0.1.3.crate https://crates.io/api/v1/crates/metagoblin/0.6.0/download -> metagoblin-0.6.0.crate https://crates.io/api/v1/crates/once_cell/1.14.0/download -> once_cell-1.14.0.crate https://crates.io/api/v1/crates/os_str_bytes/6.3.0/download -> os_str_bytes-6.3.0.crate https://crates.io/api/v1/crates/plain/0.2.3/download -> plain-0.2.3.crate https://crates.io/api/v1/crates/prettytable-rs/0.9.0/download -> prettytable-rs-0.9.0.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.43/download -> proc-macro2-1.0.43.crate https://crates.io/api/v1/crates/quote/1.0.21/download -> quote-1.0.21.crate https://crates.io/api/v1/crates/rand/0.3.23/download -> rand-0.3.23.crate https://crates.io/api/v1/crates/rand/0.4.6/download -> rand-0.4.6.crate https://crates.io/api/v1/crates/rand_core/0.3.1/download -> rand_core-0.3.1.crate https://crates.io/api/v1/crates/rand_core/0.4.2/download -> rand_core-0.4.2.crate https://crates.io/api/v1/crates/rdrand/0.4.0/download -> rdrand-0.4.0.crate https://crates.io/api/v1/crates/redox_syscall/0.2.16/download -> redox_syscall-0.2.16.crate https://crates.io/api/v1/crates/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/rustc-demangle/0.1.21/download -> rustc-demangle-0.1.21.crate https://crates.io/api/v1/crates/rustc-serialize/0.3.24/download -> rustc-serialize-0.3.24.crate https://crates.io/api/v1/crates/rustversion/1.0.9/download -> rustversion-1.0.9.crate https://crates.io/api/v1/crates/ryu/1.0.11/download -> ryu-1.0.11.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/serde/1.0.144/download -> serde-1.0.144.crate https://crates.io/api/v1/crates/strsim/0.10.0/download -> strsim-0.10.0.crate https://crates.io/api/v1/crates/syn/1.0.99/download -> syn-1.0.99.crate https://crates.io/api/v1/crates/term/0.7.0/download -> term-0.7.0.crate https://crates.io/api/v1/crates/termcolor/0.3.6/download -> termcolor-0.3.6.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/theban_interval_tree/0.7.1/download -> theban_interval_tree-0.7.1.crate https://crates.io/api/v1/crates/thiserror/1.0.33/download -> thiserror-1.0.33.crate https://crates.io/api/v1/crates/thiserror-impl/1.0.33/download -> thiserror-impl-1.0.33.crate https://crates.io/api/v1/crates/time/0.1.44/download -> time-0.1.44.crate https://crates.io/api/v1/crates/unicode-ident/1.0.3/download -> unicode-ident-1.0.3.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/version_check/0.9.4/download -> version_check-0.9.4.crate https://crates.io/api/v1/crates/wasi/0.10.0+wasi-snapshot-preview1/download -> wasi-0.10.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasi/0.11.0+wasi-snapshot-preview1/download -> wasi-0.11.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/winapi/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/wincolor/0.1.6/download -> wincolor-0.1.6.crate
+_eclasses_=cargo	52a92ed3815080c5f2caac1905687b1c	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=2c7a471577d12cf7e1e7452d5deb74ef
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index d73a5e03c694..abf661f6731f 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/libopenmpt-0.6.6 b/metadata/md5-cache/media-libs/libopenmpt-0.6.6
index 8329a12be900..210307d6936e 100644
--- a/metadata/md5-cache/media-libs/libopenmpt-0.6.6
+++ b/metadata/md5-cache/media-libs/libopenmpt-0.6.6
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://lib.openmpt.org/libopenmpt/
 INHERIT=multilib-minimal
 IUSE=examples mp3 ogg static-libs test vorbis zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=~amd64 arm ppc ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=mp3? ( media-sound/mpg123[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ogg? ( media-libs/libogg[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vorbis? ( media-libs/libvorbis[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-0.6.6+release.autotools.tar.gz
 _eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=6a6acb6c58438839d27d065b0a935534
+_md5_=878942e0285242f9154462204accd63f
diff --git a/metadata/md5-cache/media-libs/lilv-0.24.18-r1 b/metadata/md5-cache/media-libs/lilv-0.24.18-r1
index a59ee5dcdee1..856baddac401 100644
--- a/metadata/md5-cache/media-libs/lilv-0.24.18-r1
+++ b/metadata/md5-cache/media-libs/lilv-0.24.18-r1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=http://drobilla.net/software/lilv/
 INHERIT=meson-multilib python-single-r1
 IUSE=doc python test tools abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86
 LICENSE=ISC
 RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[threads(+)] ) dev-libs/serd[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/sord[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/libsndfile media-libs/lv2[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/sratom[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=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://download.drobilla.net/lilv-0.24.18.tar.xz
 _eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=6a5f3e54e52932d4a9a391e94175f6df
+_md5_=2ac8bdb041ecb3da29d4522b5d8d0fbb
diff --git a/metadata/md5-cache/media-libs/lv2-1.18.8-r1 b/metadata/md5-cache/media-libs/lv2-1.18.8-r1
index 264c6745d134..af9765848021 100644
--- a/metadata/md5-cache/media-libs/lv2-1.18.8-r1
+++ b/metadata/md5-cache/media-libs/lv2-1.18.8-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://lv2plug.in/
 INHERIT=meson-multilib python-single-r1
 IUSE=doc plugins abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86
 LICENSE=MIT
 RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+)] ) plugins? ( media-libs/libsamplerate media-libs/libsndfile x11-libs/gtk+:2 ) python_single_target_python3_8? ( dev-python/lxml[python_targets_python3_8(-)] dev-python/pygments[python_targets_python3_8(-)] dev-python/rdflib[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/lxml[python_targets_python3_9(-)] dev-python/pygments[python_targets_python3_9(-)] dev-python/rdflib[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/lxml[python_targets_python3_10(-)] dev-python/pygments[python_targets_python3_10(-)] dev-python/rdflib[python_targets_python3_10(-)] )
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 SLOT=0
 SRC_URI=https://lv2plug.in/spec/lv2-1.18.8.tar.xz
 _eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=b1674b815c80cb664f7e0b6db3df689d
+_md5_=25edbc584682d995ed77019750c7b3c1
diff --git a/metadata/md5-cache/media-libs/sratom-0.6.12-r1 b/metadata/md5-cache/media-libs/sratom-0.6.12-r1
index c9502afcc08f..3f372f556f54 100644
--- a/metadata/md5-cache/media-libs/sratom-0.6.12-r1
+++ b/metadata/md5-cache/media-libs/sratom-0.6.12-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=http://drobilla.net/software/sratom/
 INHERIT=meson-multilib python-any-r1
 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 ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86
 LICENSE=ISC
 RDEPEND=dev-libs/serd dev-libs/sord media-libs/lv2
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://download.drobilla.net/sratom-0.6.12.tar.xz
 _eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=8afa2a093e36df8b9c5e60aa0de316bc
+_md5_=f694c3e36d9f2efd2aed0f37f85787c6
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index 2650fc01af90..64b01098a1e7 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/electrum-4.3.2 b/metadata/md5-cache/net-misc/electrum-4.3.2
new file mode 100644
index 000000000000..7117666f65e5
--- /dev/null
+++ b/metadata/md5-cache/net-misc/electrum-4.3.2
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/pyaes[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pycryptodome[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[ncurses?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[ncurses?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[ncurses?] ) dev-libs/libsecp256k1 >=dev-python/aiohttp-socks-0.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] =dev-python/aiorpcX-0.22*[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/attrs-19.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/bitstring[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/dnspython-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pbkdf2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/PySocks[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/qrcode[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/setuptools[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/protobuf-python-3.12[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] qrcode? ( media-gfx/zbar[v4l] ) qt5? ( dev-python/PyQt5[gui,widgets,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ncurses? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[ncurses] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[ncurses] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[ncurses] ) ) >=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[ncurses?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[ncurses?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[ncurses?] ) >=dev-python/gpep517-8[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 postrm prepare test
+DESCRIPTION=User friendly Bitcoin client
+EAPI=8
+HOMEPAGE=https://electrum.org/ https://github.com/spesmilo/electrum/
+INHERIT=distutils-r1 xdg-utils
+IUSE=cli ncurses qrcode +qt5 test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[ncurses?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[ncurses?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[ncurses?] ) dev-libs/libsecp256k1 >=dev-python/aiohttp-socks-0.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] =dev-python/aiorpcX-0.22*[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/attrs-19.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/bitstring[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/dnspython-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pbkdf2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/PySocks[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/qrcode[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/setuptools[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/protobuf-python-3.12[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] qrcode? ( media-gfx/zbar[v4l] ) qt5? ( dev-python/PyQt5[gui,widgets,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ncurses? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[ncurses] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[ncurses] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[ncurses] ) ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[ncurses?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[ncurses?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[ncurses?] )
+REQUIRED_USE=|| ( cli ncurses qt5 ) || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/spesmilo/electrum/archive/4.3.2.tar.gz -> electrum-4.3.2.gh.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=dbac4f9c2c0a3e0e15fc8bb578bd5e2a
diff --git a/metadata/md5-cache/net-proxy/Manifest.gz b/metadata/md5-cache/net-proxy/Manifest.gz
index 55c039b589fb..be4478e9d41b 100644
--- a/metadata/md5-cache/net-proxy/Manifest.gz
+++ b/metadata/md5-cache/net-proxy/Manifest.gz
diff --git a/metadata/md5-cache/net-proxy/tinyproxy-1.11.1_p20220908 b/metadata/md5-cache/net-proxy/tinyproxy-1.11.1_p20220908
index edfcd335b0cf..971df54b0c17 100644
--- a/metadata/md5-cache/net-proxy/tinyproxy-1.11.1_p20220908
+++ b/metadata/md5-cache/net-proxy/tinyproxy-1.11.1_p20220908
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://github.com/tinyproxy/tinyproxy/
 INHERIT=autotools systemd tmpfiles
 IUSE=test debug +filter-proxy reverse-proxy transparent-proxy +upstream-proxy +xtinyproxy-header
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=acct-group/tinyproxy acct-user/tinyproxy virtual/tmpfiles
 REQUIRED_USE=test? ( xtinyproxy-header )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tinyproxy/tinyproxy/archive/3764b8551463b900b5b4e3ec0cd9bb9182191cb7.tar.gz -> tinyproxy-1.11.1_p20220908.tar.gz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=be68ced0cd262c1946662c9533593b0b
+_md5_=19f173896c63b3e925a3e21c4f96ba0a
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index 2b86ac706318..86750e3921dc 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/hwinfo-22.1 b/metadata/md5-cache/sys-apps/hwinfo-22.1
index 28fcde919578..0876f02df38c 100644
--- a/metadata/md5-cache/sys-apps/hwinfo-22.1
+++ b/metadata/md5-cache/sys-apps/hwinfo-22.1
@@ -5,10 +5,10 @@ DESCRIPTION=Hardware detection tool used in SuSE Linux
 EAPI=7
 HOMEPAGE=https://github.com/openSUSE/hwinfo/
 INHERIT=rpm toolchain-funcs
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~riscv ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~riscv x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=amd64? ( dev-libs/libx86emu ) x86? ( dev-libs/libx86emu )
 SLOT=0
 SRC_URI=http://download.opensuse.org/tumbleweed/repo/src-oss/src/hwinfo-22.1-1.1.src.rpm
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	8f942ebdcf04334697649d4a0bf65a32	multilib	5ca4e49abed8e3a2f7b56920eadee157	rpm	f73e907469f65e52192f110dec72dce0	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=1d4ba8b8915c39a153d3b936f7e1dc86
+_md5_=723158c14f33da4c803786f6ce0b3fb7
diff --git a/metadata/md5-cache/sys-firmware/Manifest.gz b/metadata/md5-cache/sys-firmware/Manifest.gz
index d6a0af6cca43..c9331a09c794 100644
--- a/metadata/md5-cache/sys-firmware/Manifest.gz
+++ b/metadata/md5-cache/sys-firmware/Manifest.gz
diff --git a/metadata/md5-cache/sys-firmware/edk2-ovmf-202105-r1 b/metadata/md5-cache/sys-firmware/edk2-ovmf-202105-r1
deleted file mode 100644
index 13015db65fb8..000000000000
--- a/metadata/md5-cache/sys-firmware/edk2-ovmf-202105-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare setup
-DEPEND=!binary? ( amd64? ( app-emulation/qemu >=dev-lang/nasm-2.0.7 >=sys-power/iasl-20160729 || ( >=dev-lang/python-3.10.4:3.10[sqlite] >=dev-lang/python-3.9.12:3.9[sqlite] >=dev-lang/python-3.8.13:3.8[sqlite] ) ) )
-DESCRIPTION=UEFI firmware for 64-bit x86 virtual machines
-EAPI=7
-HOMEPAGE=https://github.com/tianocore/edk2
-INHERIT=python-any-r1 readme.gentoo-r1
-IUSE=+binary
-KEYWORDS=amd64 arm64 ~ppc ppc64 x86
-LICENSE=BSD-2 MIT
-REQUIRED_USE=!amd64? ( binary )
-SLOT=0
-SRC_URI=!binary? ( https://github.com/tianocore/edk2/archive/edk2-stable202105.tar.gz -> edk2-ovmf-202105.tar.gz https://github.com/openssl/openssl/archive/e2e09d9fba1187f8d6aafaa34d4172f56f1ffb72.tar.gz -> openssl-e2e09d9fba1187f8d6aafaa34d4172f56f1ffb72.tar.gz https://github.com/google/brotli/archive/666c3280cc11dc433c303d79a83d4ffbdd12cc8d.tar.gz -> brotli-666c3280cc11dc433c303d79a83d4ffbdd12cc8d.tar.gz ) binary? ( https://dev.gentoo.org/~tamiko/distfiles/edk2-ovmf-202105-r1-bin.tar.xz ) https://dev.gentoo.org/~tamiko/distfiles/edk2-ovmf-202105-qemu-firmware.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=d53ff1488e8b87099cbc0058590bc677
diff --git a/metadata/md5-cache/sys-firmware/edk2-ovmf-202105-r2 b/metadata/md5-cache/sys-firmware/edk2-ovmf-202105-r2
index 5988b1847d77..4a93c3358b20 100644
--- a/metadata/md5-cache/sys-firmware/edk2-ovmf-202105-r2
+++ b/metadata/md5-cache/sys-firmware/edk2-ovmf-202105-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst prepare setup
-DEPEND=!binary? ( amd64? ( app-emulation/qemu >=dev-lang/nasm-2.0.7 >=sys-power/iasl-20160729 || ( >=dev-lang/python-3.10.4:3.10[sqlite] >=dev-lang/python-3.9.12:3.9[sqlite] >=dev-lang/python-3.8.13:3.8[sqlite] ) ) )
+DEPEND=!binary? ( amd64? ( app-emulation/qemu >=dev-lang/nasm-2.0.7 >=sys-power/iasl-20160729 || ( >=dev-lang/python-3.11.0_beta4:3.11[sqlite] >=dev-lang/python-3.10.4:3.10[sqlite] >=dev-lang/python-3.9.12:3.9[sqlite] >=dev-lang/python-3.8.13:3.8[sqlite] ) ) )
 DESCRIPTION=UEFI firmware for 64-bit x86 virtual machines
 EAPI=7
 HOMEPAGE=https://github.com/tianocore/edk2
@@ -11,4 +11,4 @@ REQUIRED_USE=!amd64? ( binary )
 SLOT=0
 SRC_URI=!binary? ( https://github.com/tianocore/edk2/archive/edk2-stable202105.tar.gz -> edk2-ovmf-202105.tar.gz https://github.com/openssl/openssl/archive/e2e09d9fba1187f8d6aafaa34d4172f56f1ffb72.tar.gz -> openssl-e2e09d9fba1187f8d6aafaa34d4172f56f1ffb72.tar.gz https://github.com/google/brotli/archive/666c3280cc11dc433c303d79a83d4ffbdd12cc8d.tar.gz -> brotli-666c3280cc11dc433c303d79a83d4ffbdd12cc8d.tar.gz ) binary? ( https://dev.gentoo.org/~tamiko/distfiles/edk2-ovmf-202105-r1-bin.tar.xz ) https://dev.gentoo.org/~tamiko/distfiles/edk2-ovmf-202105-qemu-firmware.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=18318881ccb1b7ddab1a718973fc216d
+_md5_=1251be5bedd583e17189895bb6bd42d0
diff --git a/metadata/md5-cache/sys-firmware/edk2-ovmf-202202 b/metadata/md5-cache/sys-firmware/edk2-ovmf-202202
index b34e535c8f1b..446c5748a1d7 100644
--- a/metadata/md5-cache/sys-firmware/edk2-ovmf-202202
+++ b/metadata/md5-cache/sys-firmware/edk2-ovmf-202202
@@ -1,12 +1,13 @@
-BDEPEND=app-emulation/qemu >=dev-lang/nasm-2.0.7 >=sys-power/iasl-20160729 || ( >=dev-lang/python-3.10.4:3.10[sqlite] >=dev-lang/python-3.9.12:3.9[sqlite] >=dev-lang/python-3.8.13:3.8[sqlite] )
+BDEPEND=app-emulation/qemu >=dev-lang/nasm-2.0.7 >=sys-power/iasl-20160729 || ( >=dev-lang/python-3.11.0_beta4:3.11[sqlite] >=dev-lang/python-3.10.4:3.10[sqlite] >=dev-lang/python-3.9.12:3.9[sqlite] >=dev-lang/python-3.8.13:3.8[sqlite] )
 DEFINED_PHASES=compile install postinst prepare setup
 DESCRIPTION=UEFI firmware for 64-bit x86 virtual machines
 EAPI=8
 HOMEPAGE=https://github.com/tianocore/edk2
 INHERIT=python-any-r1 readme.gentoo-r1
+KEYWORDS=~amd64
 LICENSE=BSD-2 MIT
 RDEPEND=!sys-firmware/edk2-ovmf-bin
 SLOT=0
 SRC_URI=https://github.com/tianocore/edk2/archive/edk2-stable202202.tar.gz -> edk2-ovmf-202202.tar.gz https://github.com/openssl/openssl/archive/d82e959e621a3d597f1e0d50ff8c2d8b96915fd7.tar.gz -> openssl-d82e959e621a3d597f1e0d50ff8c2d8b96915fd7.tar.gz https://github.com/google/brotli/archive/f4153a09f87cbb9c826d8fc12c74642bb2d879ea.tar.gz -> brotli-f4153a09f87cbb9c826d8fc12c74642bb2d879ea.tar.gz https://dev.gentoo.org/~ajak/distfiles/edk2-ovmf-202202-qemu-firmware.tar.xz
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=9b86e74a748a853758e2854298cd4c8a
+_md5_=8654ccd925ce2e962d691345bdf3bec9
diff --git a/metadata/md5-cache/sys-firmware/edk2-ovmf-bin-202202 b/metadata/md5-cache/sys-firmware/edk2-ovmf-bin-202202
index e85b3742fb8d..42f7f87f2965 100644
--- a/metadata/md5-cache/sys-firmware/edk2-ovmf-bin-202202
+++ b/metadata/md5-cache/sys-firmware/edk2-ovmf-bin-202202
@@ -3,9 +3,10 @@ DESCRIPTION=UEFI firmware for 64-bit x86 virtual machines
 EAPI=8
 HOMEPAGE=https://github.com/tianocore/edk2
 INHERIT=readme.gentoo-r1
+KEYWORDS=~amd64 ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86
 LICENSE=BSD-2 MIT
 RDEPEND=!sys-firmware/edk2-ovmf
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ajak/distfiles/edk2-ovmf-202202-1.xpak
 _eclasses_=readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
-_md5_=bdd72de500b2a2b92271e1d7b44ea94a
+_md5_=006c9c22f62ef65cf90ded022eaf79b7
diff --git a/metadata/md5-cache/sys-firmware/seabios-1.12.0 b/metadata/md5-cache/sys-firmware/seabios-1.12.0
deleted file mode 100644
index 974f3c94bef9..000000000000
--- a/metadata/md5-cache/sys-firmware/seabios-1.12.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare pretend setup unpack
-DEPEND=!binary? ( amd64? ( >=sys-power/iasl-20060912 || ( >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) ) x86? ( >=sys-power/iasl-20060912 || ( >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) ) )
-DESCRIPTION=Open Source implementation of a 16-bit x86 BIOS
-EAPI=7
-HOMEPAGE=https://www.seabios.org/
-INHERIT=toolchain-funcs python-any-r1
-IUSE=+binary debug +seavgabios
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sparc x86
-LICENSE=LGPL-3 GPL-3
-REQUIRED_USE=debug? ( !binary ) !amd64? ( !x86? ( binary ) )
-SLOT=0
-SRC_URI=!binary? ( https://code.coreboot.org/p/seabios/downloads/get/seabios-1.12.0.tar.gz ) binary? ( https://dev.gentoo.org/~tamiko/distfiles/seabios-1.12.0-bin.tar.xz )
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=84da5fa9566738985e3bf56bcfee4596
diff --git a/metadata/md5-cache/sys-firmware/seabios-1.12.0-r1 b/metadata/md5-cache/sys-firmware/seabios-1.12.0-r1
deleted file mode 100644
index e96600981411..000000000000
--- a/metadata/md5-cache/sys-firmware/seabios-1.12.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare pretend setup unpack
-DEPEND=!binary? ( >=sys-power/iasl-20060912 || ( >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) )
-DESCRIPTION=Open Source implementation of a 16-bit x86 BIOS
-EAPI=7
-HOMEPAGE=https://www.seabios.org/
-INHERIT=toolchain-funcs python-any-r1
-IUSE=+binary debug +seavgabios
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=LGPL-3 GPL-3
-REQUIRED_USE=debug? ( !binary )
-SLOT=0
-SRC_URI=!binary? ( https://code.coreboot.org/p/seabios/downloads/get/seabios-1.12.0.tar.gz ) binary? ( https://dev.gentoo.org/~tamiko/distfiles/seabios-1.12.0-bin.tar.xz )
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=b7454a08f42bc5b1a52951c023db4981
diff --git a/metadata/md5-cache/sys-firmware/seabios-1.14.0 b/metadata/md5-cache/sys-firmware/seabios-1.14.0
deleted file mode 100644
index 848b4a8ec440..000000000000
--- a/metadata/md5-cache/sys-firmware/seabios-1.14.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare pretend setup unpack
-DEPEND=!binary? ( >=sys-power/iasl-20060912 || ( >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) )
-DESCRIPTION=Open Source implementation of a 16-bit x86 BIOS
-EAPI=7
-HOMEPAGE=https://www.seabios.org/
-INHERIT=toolchain-funcs python-any-r1
-IUSE=+binary debug +seavgabios
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sparc x86
-LICENSE=LGPL-3 GPL-3
-REQUIRED_USE=debug? ( !binary )
-SLOT=0
-SRC_URI=!binary? ( https://www.seabios.org/downloads/seabios-1.14.0.tar.gz ) binary? ( https://dev.gentoo.org/~tamiko/distfiles/seabios-1.14.0-bin.tar.xz )
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=0e0be4665aca9d1bed83cc7ed5bb985d
diff --git a/metadata/md5-cache/sys-firmware/seabios-1.14.0-r1 b/metadata/md5-cache/sys-firmware/seabios-1.14.0-r1
deleted file mode 100644
index 7392cac02de5..000000000000
--- a/metadata/md5-cache/sys-firmware/seabios-1.14.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare pretend setup unpack
-DEPEND=!binary? ( >=sys-power/iasl-20060912 || ( >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) )
-DESCRIPTION=Open Source implementation of a 16-bit x86 BIOS
-EAPI=7
-HOMEPAGE=https://www.seabios.org/
-INHERIT=toolchain-funcs python-any-r1
-IUSE=+binary debug +seavgabios
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=LGPL-3 GPL-3
-REQUIRED_USE=debug? ( !binary )
-SLOT=0
-SRC_URI=!binary? ( https://www.seabios.org/downloads/seabios-1.14.0.tar.gz ) binary? ( https://dev.gentoo.org/~tamiko/distfiles/seabios-1.14.0-bin.tar.xz )
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=38682abc3f953087579285ea26c8b758
diff --git a/metadata/md5-cache/sys-firmware/seabios-1.14.0-r2 b/metadata/md5-cache/sys-firmware/seabios-1.14.0-r2
index 957815a5b7a9..8fcda8100013 100644
--- a/metadata/md5-cache/sys-firmware/seabios-1.14.0-r2
+++ b/metadata/md5-cache/sys-firmware/seabios-1.14.0-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare pretend setup unpack
-DEPEND=!binary? ( >=sys-power/iasl-20060912 || ( >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) )
+DEPEND=!binary? ( >=sys-power/iasl-20060912 || ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) )
 DESCRIPTION=Open Source implementation of a 16-bit x86 BIOS
 EAPI=7
 HOMEPAGE=https://www.seabios.org/
@@ -11,4 +11,4 @@ REQUIRED_USE=debug? ( !binary )
 SLOT=0
 SRC_URI=!binary? ( https://www.seabios.org/downloads/seabios-1.14.0.tar.gz ) binary? ( https://dev.gentoo.org/~sam/distfiles/seabios-1.14.0-r2-bin.tar.xz )
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=3b17313750e2926082cb9c1ec6ab432d
+_md5_=02b0cac64f601fd5aa10ed5c97138107
diff --git a/metadata/md5-cache/sys-firmware/seabios-1.16.0 b/metadata/md5-cache/sys-firmware/seabios-1.16.0
index 75ee7c5cb446..fd625bdd9e13 100644
--- a/metadata/md5-cache/sys-firmware/seabios-1.16.0
+++ b/metadata/md5-cache/sys-firmware/seabios-1.16.0
@@ -1,13 +1,14 @@
-BDEPEND=>=sys-power/iasl-20060912 || ( >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 )
+BDEPEND=>=sys-power/iasl-20060912 || ( >=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 )
 DEFINED_PHASES=compile configure install prepare pretend setup
 DESCRIPTION=Open Source implementation of a 16-bit x86 BIOS
 EAPI=8
 HOMEPAGE=https://www.seabios.org/
 INHERIT=toolchain-funcs python-any-r1
 IUSE=debug +seavgabios
+KEYWORDS=~alpha ~amd64 ~arm64 ~loong ~m68k ~mips ~ppc ~ppc64 ~x86
 LICENSE=LGPL-3 GPL-3
 RDEPEND=!sys-firmware/seabios-bin
 SLOT=0
 SRC_URI=https://www.seabios.org/downloads/seabios-1.16.0.tar.gz
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=15f931c5878253751104c122a725e5d0
+_md5_=8c64e676273e15da58956842ec8ae250
diff --git a/metadata/md5-cache/sys-firmware/seabios-bin-1.16.0 b/metadata/md5-cache/sys-firmware/seabios-bin-1.16.0
index bbe4e3c57744..7f0bf509c634 100644
--- a/metadata/md5-cache/sys-firmware/seabios-bin-1.16.0
+++ b/metadata/md5-cache/sys-firmware/seabios-bin-1.16.0
@@ -2,8 +2,9 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=Open Source implementation of a 16-bit x86 BIOS
 EAPI=8
 HOMEPAGE=https://www.seabios.org/
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=LGPL-3 GPL-3
 RDEPEND=!sys-firmware/seabios
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ajak/distfiles/seabios-1.16.0-1.xpak
-_md5_=29960b1d7710c47079f20079cc0bf34b
+_md5_=a19c3dbe57d1d66f190dea59a18c8899
diff --git a/metadata/md5-cache/sys-process/Manifest.gz b/metadata/md5-cache/sys-process/Manifest.gz
index 465f59750b6d..a91c19b9792f 100644
--- a/metadata/md5-cache/sys-process/Manifest.gz
+++ b/metadata/md5-cache/sys-process/Manifest.gz
diff --git a/metadata/md5-cache/sys-process/psinfo-0.12-r2 b/metadata/md5-cache/sys-process/psinfo-0.12-r2
index 6ebd195fc435..3290e77d0588 100644
--- a/metadata/md5-cache/sys-process/psinfo-0.12-r2
+++ b/metadata/md5-cache/sys-process/psinfo-0.12-r2
@@ -3,9 +3,9 @@ DESCRIPTION=Process information and statistics using the kernel /proc interface
 EAPI=7
 HOMEPAGE=http://www.ward.nu/computer/psinfo/
 INHERIT=toolchain-funcs
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~riscv ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.ward.nu/computer/psinfo/psinfo-0.12.tar.gz
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=5ea6cef0e7f94216831009af42115aaa
+_md5_=e87b3e746bd48c6af93355a3d942d3a7
diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index 6afa61abb838..52a77bc00178 100644
--- a/metadata/md5-cache/www-client/Manifest.gz
+++ b/metadata/md5-cache/www-client/Manifest.gz
diff --git a/metadata/md5-cache/www-client/chromium-bin-106.0.5249.61 b/metadata/md5-cache/www-client/chromium-bin-106.0.5249.61
new file mode 100644
index 000000000000..c70239c2c297
--- /dev/null
+++ b/metadata/md5-cache/www-client/chromium-bin-106.0.5249.61
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst postrm pretend setup unpack
+DESCRIPTION=Open-source version of Google Chrome web browser
+EAPI=8
+HOMEPAGE=https://chromium.org/
+INHERIT=chromium-2 desktop pax-utils readme.gentoo-r1 unpacker xdg-utils
+IUSE=cpu_flags_x86_sse2 suid wayland widevine +l10n_af +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_ur +l10n_vi +l10n_zh-CN +l10n_zh-TW
+LICENSE=BSD
+RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/libxml2[icu] dev-libs/libxslt dev-libs/nspr >=dev-libs/nss-3.26 media-libs/alsa-lib || ( media-libs/flac:0/0 media-libs/flac-compat:8.3.0 ) media-libs/fontconfig >=media-libs/freetype-2.11.0-r1 media-libs/libjpeg-turbo media-libs/libwebp media-libs/mesa[gbm(+)] media-libs/openh264:0/6.1 net-misc/curl[ssl] net-print/cups sys-apps/dbus sys-apps/pciutils >=sys-devel/gcc-9.3.0 >=sys-libs/glibc-2.32 sys-libs/zlib[minizip] virtual/ttf-fonts virtual/udev x11-libs/cairo x11-libs/libdrm x11-libs/gdk-pixbuf:2 || ( x11-libs/gtk+:3[X,wayland?] gui-libs/gtk:4[X,wayland?] ) x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXtst x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/pango x11-misc/xdg-utils amd64? ( widevine? ( www-plugins/chrome-binary-plugins ) ) wayland? ( dev-libs/wayland )
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~sultan/distfiles/www-client/chromium-bin/chromium-bin-106.0.5249.61-1-common.tar.xz https://dev.gentoo.org/~sultan/distfiles/www-client/chromium-bin/chromium-bin-106.0.5249.61-1-l10n.tar.xz amd64? ( https://dev.gentoo.org/~sultan/distfiles/www-client/chromium-bin/chromium-bin-106.0.5249.61-1-common-x86_64.tar.xz wayland? ( https://dev.gentoo.org/~sultan/distfiles/www-client/chromium-bin/chromium-bin-106.0.5249.61-1-wayland-x86_64.tar.xz ) !wayland? ( https://dev.gentoo.org/~sultan/distfiles/www-client/chromium-bin/chromium-bin-106.0.5249.61-1-x11-x86_64.tar.xz ) ) arm64? ( https://dev.gentoo.org/~sultan/distfiles/www-client/chromium-bin/chromium-bin-106.0.5249.61-1-common-aarch64.tar.xz wayland? ( https://dev.gentoo.org/~sultan/distfiles/www-client/chromium-bin/chromium-bin-106.0.5249.61-1-wayland-aarch64.tar.xz ) !wayland? ( https://dev.gentoo.org/~sultan/distfiles/www-client/chromium-bin/chromium-bin-106.0.5249.61-1-x11-aarch64.tar.xz ) ) x86? ( https://dev.gentoo.org/~sultan/distfiles/www-client/chromium-bin/chromium-bin-106.0.5249.61-1-common-i686.tar.xz wayland? ( https://dev.gentoo.org/~sultan/distfiles/www-client/chromium-bin/chromium-bin-106.0.5249.61-1-wayland-i686.tar.xz ) !wayland? ( https://dev.gentoo.org/~sultan/distfiles/www-client/chromium-bin/chromium-bin-106.0.5249.61-1-x11-i686.tar.xz ) )
+_eclasses_=chromium-2	1004ce9fd1ae9622a0b7eabcd8fc0d69	desktop	22952d8f27cac191d75529d4c38e6bfa	linux-info	bbfa385d6907d7948d49a5e107bd654d	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	1542e649be915f43f6908a9e93909961	unpacker	697382d119fd3d195f110b7979184285	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=6688b0845224a7d93492f2ae4f311e8c
diff --git a/metadata/md5-cache/www-servers/Manifest.gz b/metadata/md5-cache/www-servers/Manifest.gz
index 8a46f15c9aa5..18d014f17caa 100644
--- a/metadata/md5-cache/www-servers/Manifest.gz
+++ b/metadata/md5-cache/www-servers/Manifest.gz
diff --git a/metadata/md5-cache/www-servers/tomcat-10.1.0 b/metadata/md5-cache/www-servers/tomcat-10.1.0
new file mode 100644
index 000000000000..8d867585e36f
--- /dev/null
+++ b/metadata/md5-cache/www-servers/tomcat-10.1.0
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack
+DEPEND=dev-java/eclipse-ecj:4.22 dev-java/glassfish-xmlrpc-api:0 dev-java/jakartaee-migration:0 ~dev-java/tomcat-servlet-api-10.1.0:6.0 dev-java/wsdl4j:0 app-admin/pwgen dev-java/ant-core >=virtual/jdk-11:* test? ( dev-java/ant-junit:0 dev-java/easymock:3.2 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
+DESCRIPTION=Tomcat Servlet-6.0/JSP-3.1/EL-5.0/WebSocket-2.1/JASPIC-3.0 Container
+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.22 dev-java/glassfish-xmlrpc-api:0 dev-java/jakartaee-migration:0 ~dev-java/tomcat-servlet-api-10.1.0:6.0 dev-java/wsdl4j:0 acct-group/tomcat acct-user/tomcat >=virtual/jre-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=test !test? ( test )
+SLOT=10.1
+SRC_URI=mirror://apache/tomcat/tomcat-10/v10.1.0/src/apache-tomcat-10.1.0-src.tar.gz https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/6.3.1/biz.aQute.bnd-6.3.1.jar https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/6.3.1/biz.aQute.bndlib-6.3.1.jar
+_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	multilib	5ca4e49abed8e3a2f7b56920eadee157	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=362c27753f01e05a61338023d3839617
diff --git a/metadata/md5-cache/www-servers/tomcat-9.0.67 b/metadata/md5-cache/www-servers/tomcat-9.0.67
new file mode 100644
index 000000000000..27b847f07777
--- /dev/null
+++ b/metadata/md5-cache/www-servers/tomcat-9.0.67
@@ -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/tomcat-servlet-api-9.0.67:4.0 dev-java/wsdl4j:0 app-admin/pwgen >=dev-java/ant-core-1.9.13 >=virtual/jdk-1.8:* test? ( >=dev-java/ant-junit-1.9:0 dev-java/easymock:3.2 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
+DESCRIPTION=Tomcat Servlet-4.0/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container
+EAPI=8
+HOMEPAGE=https://tomcat.apache.org/
+INHERIT=java-pkg-2 java-ant-2 prefix
+IUSE=extra-webapps doc source test
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=Apache-2.0
+RDEPEND=dev-java/eclipse-ecj:4.15 dev-java/glassfish-xmlrpc-api:0 ~dev-java/tomcat-servlet-api-9.0.67:4.0 dev-java/wsdl4j:0 acct-group/tomcat acct-user/tomcat >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=test !test? ( test )
+SLOT=9
+SRC_URI=mirror://apache/tomcat/tomcat-9/v9.0.67/src/apache-tomcat-9.0.67-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_=fafc247f2998ffbc741126e488bb3f84
diff --git a/metadata/md5-cache/x11-apps/Manifest.gz b/metadata/md5-cache/x11-apps/Manifest.gz
index d93a842d7abf..e478d03ca11c 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/fslsfonts-1.0.6 b/metadata/md5-cache/x11-apps/fslsfonts-1.0.6
new file mode 100644
index 000000000000..2e8ee3f6ac5d
--- /dev/null
+++ b/metadata/md5-cache/x11-apps/fslsfonts-1.0.6
@@ -0,0 +1,14 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare unpack
+DEPEND=x11-libs/libFS x11-base/xorg-proto
+DESCRIPTION=list fonts served by X font server
+EAPI=8
+HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/fslsfonts
+INHERIT=xorg-3
+KEYWORDS=~amd64 ~arm ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=x11-libs/libFS
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/app/fslsfonts-1.0.6.tar.xz
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961	xorg-3	38a663574d97f06b6b729046865c8fb6
+_md5_=020bee9bda6a084d4740d12f0f037a7e
diff --git a/metadata/md5-cache/x11-libs/Manifest.gz b/metadata/md5-cache/x11-libs/Manifest.gz
index 24b01ca0e49a..27e75757aa54 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/libXtst-1.2.4 b/metadata/md5-cache/x11-libs/libXtst-1.2.4
new file mode 100644
index 000000000000..d889432fcd34
--- /dev/null
+++ b/metadata/md5-cache/x11-libs/libXtst-1.2.4
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( || ( app-text/asciidoc dev-ruby/asciidoctor ) app-text/xmlto app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=>=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-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/libXi-1.7.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-base/xorg-proto
+DESCRIPTION=X.Org Xlib-based client API for the XTEST & RECORD extensions library
+EAPI=8
+HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/lib/libXtst
+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 doc
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+LICENSE=MIT
+RDEPEND=>=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=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/libXi-1.7.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/lib/libXtst-1.2.4.tar.xz
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	1542e649be915f43f6908a9e93909961	xorg-3	38a663574d97f06b6b729046865c8fb6
+_md5_=8a49c17a6b2734f0775cc7a92afc310d
diff --git a/metadata/md5-cache/x11-libs/libXxf86vm-1.1.5 b/metadata/md5-cache/x11-libs/libXxf86vm-1.1.5
new file mode 100644
index 000000000000..d433845a70ad
--- /dev/null
+++ b/metadata/md5-cache/x11-libs/libXxf86vm-1.1.5
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( || ( app-text/asciidoc dev-ruby/asciidoctor ) app-text/xmlto app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=>=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-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-base/xorg-proto
+DESCRIPTION=X.Org Xxf86vm library
+EAPI=8
+HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/lib/libXxf86vm
+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 doc
+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 ~x86-solaris ~x86-winnt
+LICENSE=MIT
+RDEPEND=>=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=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(-)?]
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/lib/libXxf86vm-1.1.5.tar.xz
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	1542e649be915f43f6908a9e93909961	xorg-3	38a663574d97f06b6b729046865c8fb6
+_md5_=244913d448931008b26c65a8461a6d3b
diff --git a/metadata/md5-cache/x11-wm/Manifest.gz b/metadata/md5-cache/x11-wm/Manifest.gz
index 578df32ec548..e5e3bc9ef950 100644
--- a/metadata/md5-cache/x11-wm/Manifest.gz
+++ b/metadata/md5-cache/x11-wm/Manifest.gz
diff --git a/metadata/md5-cache/x11-wm/i3-4.21 b/metadata/md5-cache/x11-wm/i3-4.21
new file mode 100644
index 000000000000..5254f07beebf
--- /dev/null
+++ b/metadata/md5-cache/x11-wm/i3-4.21
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=dev-libs/libev dev-libs/libpcre2 dev-libs/yajl x11-libs/cairo[X,xcb(+)] x11-libs/libxcb[xkb] x11-libs/libxkbcommon[X] x11-libs/pango[X] x11-libs/startup-notification x11-libs/xcb-util x11-libs/xcb-util-cursor x11-libs/xcb-util-keysyms x11-libs/xcb-util-wm x11-libs/xcb-util-xrm x11-misc/xkeyboard-config test? ( dev-perl/AnyEvent dev-perl/ExtUtils-PkgConfig dev-perl/Inline dev-perl/Inline-C dev-perl/IPC-Run dev-perl/local-lib dev-perl/X11-XCB virtual/perl-Test-Simple x11-base/xorg-server[xephyr] x11-misc/xvfb-run ) doc? ( app-text/asciidoc app-text/xmlto dev-lang/perl )
+DESCRIPTION=An improved dynamic tiling window manager
+EAPI=8
+HOMEPAGE=https://i3wm.org/
+INHERIT=meson optfeature virtualx
+IUSE=doc test test
+KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
+LICENSE=BSD
+RDEPEND=dev-libs/libev dev-libs/libpcre2 dev-libs/yajl x11-libs/cairo[X,xcb(+)] x11-libs/libxcb[xkb] x11-libs/libxkbcommon[X] x11-libs/pango[X] x11-libs/startup-notification x11-libs/xcb-util x11-libs/xcb-util-cursor x11-libs/xcb-util-keysyms x11-libs/xcb-util-wm x11-libs/xcb-util-xrm x11-misc/xkeyboard-config dev-lang/perl dev-perl/AnyEvent-I3 dev-perl/JSON-XS
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://i3wm.org/downloads/i3-4.21.tar.xz
+_eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	1a2157392a869265b2afcb63a26c12ac	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	644887c82aefdf12001489391fca4f02
+_md5_=3bd61d0d19804d81b3bb078b311c5ea4
diff --git a/metadata/md5-cache/x11-wm/i3-9999 b/metadata/md5-cache/x11-wm/i3-9999
index c6bdc46b3d22..a8f16b1eee63 100644
--- a/metadata/md5-cache/x11-wm/i3-9999
+++ b/metadata/md5-cache/x11-wm/i3-9999
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst prepare test unpack
-DEPEND=dev-libs/libev dev-libs/libpcre dev-libs/yajl x11-libs/cairo[X,xcb(+)] x11-libs/libxcb[xkb] x11-libs/libxkbcommon[X] x11-libs/pango[X] x11-libs/startup-notification x11-libs/xcb-util x11-libs/xcb-util-cursor x11-libs/xcb-util-keysyms x11-libs/xcb-util-wm x11-libs/xcb-util-xrm x11-misc/xkeyboard-config test? ( dev-perl/AnyEvent dev-perl/ExtUtils-PkgConfig dev-perl/Inline dev-perl/Inline-C dev-perl/IPC-Run dev-perl/local-lib dev-perl/X11-XCB virtual/perl-Test-Simple x11-base/xorg-server[xephyr] x11-misc/xvfb-run ) doc? ( app-text/asciidoc app-text/xmlto dev-lang/perl )
+DEPEND=dev-libs/libev dev-libs/libpcre2 dev-libs/yajl x11-libs/cairo[X,xcb(+)] x11-libs/libxcb[xkb] x11-libs/libxkbcommon[X] x11-libs/pango[X] x11-libs/startup-notification x11-libs/xcb-util x11-libs/xcb-util-cursor x11-libs/xcb-util-keysyms x11-libs/xcb-util-wm x11-libs/xcb-util-xrm x11-misc/xkeyboard-config test? ( dev-perl/AnyEvent dev-perl/ExtUtils-PkgConfig dev-perl/Inline dev-perl/Inline-C dev-perl/IPC-Run dev-perl/local-lib dev-perl/X11-XCB virtual/perl-Test-Simple x11-base/xorg-server[xephyr] x11-misc/xvfb-run ) doc? ( app-text/asciidoc app-text/xmlto dev-lang/perl )
 DESCRIPTION=An improved dynamic tiling window manager
 EAPI=7
 HOMEPAGE=https://i3wm.org/
@@ -8,8 +8,8 @@ INHERIT=meson optfeature virtualx git-r3
 IUSE=doc test test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-libs/libev dev-libs/libpcre dev-libs/yajl x11-libs/cairo[X,xcb(+)] x11-libs/libxcb[xkb] x11-libs/libxkbcommon[X] x11-libs/pango[X] x11-libs/startup-notification x11-libs/xcb-util x11-libs/xcb-util-cursor x11-libs/xcb-util-keysyms x11-libs/xcb-util-wm x11-libs/xcb-util-xrm x11-misc/xkeyboard-config dev-lang/perl dev-perl/AnyEvent-I3 dev-perl/JSON-XS
+RDEPEND=dev-libs/libev dev-libs/libpcre2 dev-libs/yajl x11-libs/cairo[X,xcb(+)] x11-libs/libxcb[xkb] x11-libs/libxkbcommon[X] x11-libs/pango[X] x11-libs/startup-notification x11-libs/xcb-util x11-libs/xcb-util-cursor x11-libs/xcb-util-keysyms x11-libs/xcb-util-wm x11-libs/xcb-util-xrm x11-misc/xkeyboard-config dev-lang/perl dev-perl/AnyEvent-I3 dev-perl/JSON-XS
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	1a2157392a869265b2afcb63a26c12ac	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	644887c82aefdf12001489391fca4f02
-_md5_=2501a5456667d4358aaa12d7c1f3a3b1
+_md5_=48d9a3a77076acaaa47efd0a59288666
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index ff13bc1edc31..48f1e8c4727f 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 14053 BLAKE2B c0a5bea7cd069c2e9b07dab158b876c74e027945a8fdd50fee280ec7abb59b03a223e89d53d1563fc784c8a353890e9928577f3cf4c4daaf3eebee6f871aa5c0 SHA512 43691780e35724149b779ecf32c3d83556a2e30fb3c35c56b8841fc4c866de83cb09e4b9be3071940181a4933de197417647dd3921df2f61e100510b23a9e327
-TIMESTAMP 2022-09-27T01:09:40Z
+TIMESTAMP 2022-09-27T07:09:40Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmMyTVRfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmMyobRfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klC/VQ/9HxRPhCVt3Gwqf5r+gk8G8UPWHW/RIfzZIxKlonpElH8TQSJnGRKlxl43
-yQrif9gSREMNi5RbrFjDN6PBtT+9bAE4i3vQ7TxGwdTpfL1VkW9m1vaJl0BTlEzH
-xokezomrY/vOQSfBTWqsseAd37HcUHCGZm3QEFSz1+Ph4Hmu9AQKFfbngeXU2zuS
-/633ZbP/yHAwONnWAOnyP+nBJU2RHIwWlbI1nXYw4CmKxfRQzGFcC0RojX6JCwbM
-d8MRHAvSOezGMtR6s3PuYbEBZuMMZigP9J2WHrSC3f5+HqIBtBALrRd3H8cPiV+d
-C9TktAS+c35k+wKY59ePTnSyxP2jV1rjT2RqsPqtwgbUg6DuZF6iefRFPXfJhTx4
-G8mtt2ngk+c/EIm0n+bznQp3OusCaZAYNP5Gwr83EFYoJIYctLN64hPxkGLSKlKZ
-HhX8gvE+eBYYWo6kmw7AFE3JDYynHguQVDZJtjNQc25W0HWhCm9ZbY8b5k7SPmys
-6JB+S5eynXiCBPjKCEMqDtsHYLcMZuO6SPxX0YNM29rFfxswGsu7fzWGEosAYihm
-mi85iExaP/ZmujothuR1Shzan0J46/FTmuRcSpzRs5+glN+NdSkLwFjIqCyDRvEJ
-RajeLi341RTYK5cjRJyXI2DWJuwI2IzImwBKhAdxzaD6zJJa3BE=
-=Z4Vp
+klD3+RAAiKHTZXT3cIluFGKQgqAmv2sfim2xMyLE0/aUlPRTgZNdudZUphsNYS6U
+N8XDhQmgCxJGzjiCa84ogfd0kbiS1KBIT1n36+UnUOB4t9fVcNIiD/HZoAdXeorN
+Mlahhkm5sC+2IKjesHmgO4To9jjnK7wKfkt7NGZuWRtP86HhB2DJZTN6EVqM3X7L
+SCtOEp230AyEbxlvcwxYxoLtF+QIlPvXkXYK2q4jPvqe/+CL76DkhZQGbTGue0/d
+6wlNo3bnS/qVkeb9Vcrj0p7jK9M7hSbMKnsG8Z/si0EmVpVcS7XtDYT47l6b2R8x
+h/g8x5gBwi7O0vtcRcBkh0l7xirZohaejtzHO/rfQcm1jRqFfsTk+y89jX+sOes9
+P+oVDiWZ6JTks4r4K3HZrA+Ui9cJ8UkhcYRfqjFY/SPuBEpmMceooZmJCBPRgPDv
+golxctR4IYCh4vLOYiKSfEEIbBTq8A8+iXLENS4THbeqO3hJve0m6IlIFiClLNjd
+WRMfLx6EAXREPX0AJaqTk2xKQSeH4LvLIS4T35RhMUH5cGqn0PpiC6vZrb+Tvsrk
+lhAL9/qukGtPiNNJXOAGQIeVOCBHVfZsQRoKHyDsNc3ihgdUaeaqZIaKCoiOvTt5
+dNnwlxz4yHX0WbUwVj0olwvS3zidchlX8NLReSAqP6tC4+Oy9jI=
+=AbDJ
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 27bf5bc2cf96..d7b32e7e6ee7 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Tue, 27 Sep 2022 01:09:37 +0000
+Tue, 27 Sep 2022 07:09:37 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 81af1f18ab7f..e72eb7c69ec1 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Tue Sep 27 01:09:37 AM UTC 2022
+Tue Sep 27 07:09:37 AM UTC 2022
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 00d659a5f1ad..194c5a9545a5 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Tue, 27 Sep 2022 01:15:01 +0000
+Tue, 27 Sep 2022 07:15:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 926683a54f8b..028577fdbda6 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-449268522b39ab1a12bfc7bc1607265b61a3ba5b 1664238022 2022-09-27T00:20:22+00:00
+c3b1b90a3869ca6c3d17866fa8c381e48b72f0fb 1664260706 2022-09-27T06:38:26+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index f537f4fd6443..2c7f56494a90 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1664241001 Tue 27 Sep 2022 01:10:01 AM UTC
+1664262601 Tue 27 Sep 2022 07:10:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 27bf5bc2cf96..d7b32e7e6ee7 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Tue, 27 Sep 2022 01:09:37 +0000
+Tue, 27 Sep 2022 07:09:37 +0000
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 32db98a9a3f2..7afeb4ff61d3 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/electrum/Manifest b/net-misc/electrum/Manifest
index 2bd889fa35e2..d684da9017c8 100644
--- a/net-misc/electrum/Manifest
+++ b/net-misc/electrum/Manifest
@@ -1,3 +1,5 @@
 DIST electrum-4.3.1.gh.tar.gz 5444509 BLAKE2B 68d63b730396c229bcb09262740a7d3ef322fce7fd16265d352e3eb2039e123d043307036d906b1688cc43d33620cf1b8f7aaa03ac9f5d68e5f9a2b84e6d44a7 SHA512 038b7c643ed11fe14e368be91bc09e5f043d4ae86cdf0ad0d80861ffa47aececcc4b0bec5a8596a8d78590b859bf302ed99d2d57bab1a2a053677fc7fa190e06
+DIST electrum-4.3.2.gh.tar.gz 5460546 BLAKE2B b2367116aef2a2a76dca30a635188bcd99f0fdd46ce6e8c5a2d6608fbb8f0a58e88b8352c5db92b7c8709f7bbc420fc1860204aca1efc2f2c4be2c788bfa1909 SHA512 dfb137e01ca6e511fb5ac70c34dcb01f36bdb209d7d290bd53c8fa5f95783f346898478d6e58435b241928dfe05ff46455e2e587520d47892c66b3198ab89c82
 EBUILD electrum-4.3.1.ebuild 2196 BLAKE2B c888d43cf12b8723bf03844916a42b69f6ab380207eea5aed148390c42f5391492e1a76e88e09efe380d9a434a5d4bd23f0df15d4b942b96c59590dd0be5522b SHA512 54630ab974a3696f2566f8c36911364e6079e0e499ec073b4bc3d3bbc488b0bc3d37a438639e71613279025b02e3ae917e527bd81423b2b33028236ec6f3d86d
+EBUILD electrum-4.3.2.ebuild 2198 BLAKE2B 34cf18c28a2ddb2d4226d16ac5b8ca44ecd077b5a7dd6dcf89ea546f44aa017388178e0a5a38f8ff729068f84a527a30b9cfa2c50833ee9854f910aa4b090c9c SHA512 c2721f46753db1758580b872f1fbe66d9da93bdf70e8c80ffbe6ffae42881c989dff9e7a8ade8b8a9193ce0b8b6eb56e5322fc6a8234c669002df9fc812eac27
 MISC metadata.xml 668 BLAKE2B b57807d75d1d31c191ecb43c4ed0bb7c598ed8bf82f8c00552299b15dc47942340777a60bd216aae6d2abbaab74952a8e17ba9db8dd5f6b857ed96d49556cb38 SHA512 6177da58a0be608c51f6b457785d91ff918636d9377ad81af0ad9dcfa7291526b6fa1f3c7a049d233951bd7b37d62215884c8fa20372c7220e490c6e161db625
diff --git a/net-misc/electrum/electrum-4.3.2.ebuild b/net-misc/electrum/electrum-4.3.2.ebuild
new file mode 100644
index 000000000000..52e7834f1a47
--- /dev/null
+++ b/net-misc/electrum/electrum-4.3.2.ebuild
@@ -0,0 +1,95 @@
+# 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="ncurses?"
+
+inherit distutils-r1 xdg-utils
+
+DESCRIPTION="User friendly Bitcoin client"
+HOMEPAGE="
+	https://electrum.org/
+	https://github.com/spesmilo/electrum/
+"
+SRC_URI="
+	https://github.com/spesmilo/electrum/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cli ncurses qrcode +qt5"
+REQUIRED_USE="|| ( cli ncurses qt5 )"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	dev-libs/libsecp256k1
+	>=dev-python/aiohttp-socks-0.3[${PYTHON_USEDEP}]
+	=dev-python/aiorpcX-0.22*[${PYTHON_USEDEP}]
+	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+	dev-python/bitstring[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	>=dev-python/dnspython-2[${PYTHON_USEDEP}]
+	dev-python/pbkdf2[${PYTHON_USEDEP}]
+	dev-python/PySocks[${PYTHON_USEDEP}]
+	dev-python/qrcode[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	>=dev-python/protobuf-python-3.12[${PYTHON_USEDEP}]
+	qrcode? ( media-gfx/zbar[v4l] )
+	qt5? (
+		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
+	)
+	ncurses? ( $(python_gen_impl_dep 'ncurses') )
+"
+BDEPEND="
+	test? (
+		dev-python/pyaes[${PYTHON_USEDEP}]
+		dev-python/pycryptodome[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# use backwards-compatible cryptodome API
+	sed -i -e 's:Cryptodome:Crypto:' electrum/crypto.py || die
+
+	# make qdarkstyle dep optional
+	sed -i -e '/qdarkstyle/d' contrib/requirements/requirements.txt || die
+
+	local bestgui
+	if use qt5; then
+		bestgui=qt
+	elif use ncurses; then
+		bestgui=text
+	else
+		bestgui=stdio
+	fi
+	sed -i 's/^\([[:space:]]*\)\(config_options\['\''cwd'\''\] = .*\)$/\1\2\n\1config_options.setdefault("gui", "'"${bestgui}"'")\n/' ${PN}/${PN} || die
+
+	eapply_user
+
+	xdg_environment_reset
+	distutils-r1_src_prepare
+}
+
+src_install() {
+	dodoc RELEASE-NOTES
+	distutils-r1_src_install
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/net-proxy/Manifest.gz b/net-proxy/Manifest.gz
index 8d09e160ab12..0525c9ef4a85 100644
--- a/net-proxy/Manifest.gz
+++ b/net-proxy/Manifest.gz
diff --git a/net-proxy/tinyproxy/Manifest b/net-proxy/tinyproxy/Manifest
index d45b13d65730..83173d50fba5 100644
--- a/net-proxy/tinyproxy/Manifest
+++ b/net-proxy/tinyproxy/Manifest
@@ -4,5 +4,5 @@ AUX tinyproxy.tmpfiles.conf 44 BLAKE2B a4e1cf0c8cbd78360175b8260c7d83885dfc9560a
 DIST tinyproxy-1.11.1.tar.xz 182080 BLAKE2B d39fa1986343af60cdfd07c6a049962e646a72874f7058fd082b9758bae3c7bc1a2288103527e0e1054ab098a3a41fc67eb3e08cd160e2bd4bd030e114326a6f SHA512 2e3435bbfece3797c11ccce222eef494ed92e00dd82bea2c40a54e454b7e03c8abc8e09b244f2da7192209c39047369439d08974b79eebc996fb3095230d0374
 DIST tinyproxy-1.11.1_p20220908.tar.gz 112898 BLAKE2B 0f00a103661a5e5891a9f82cb95f1a421a47e68ea6e2144ead01241e6b4bcda8dbd4dce302432fa0432aae1e048b4a788a0ad3bad2dc8691906b872730c31b2b SHA512 3d1c0ad4915e81e775e981b8ba625664128c8d63b2093cc29b3873dc83da4e16646e2a39e32769f463bab1d5af2b699deaa546a705f1269d5a6dfc2c927dafef
 EBUILD tinyproxy-1.11.1.ebuild 1719 BLAKE2B b4987e58b93d3e6bba9005766d882629a505b5c5509c7bbc0b12d823962f4bf19c5fae80cf1e3d074b638e99de76a97a3ab873f6613129f5a828cedc67903069 SHA512 aea1be8126aa552d56fd43716c6aafa3fc4098d80f1d3d99cc34dbf6ab184fdbc99c5610c5d7affde99c85ca26274a03a89a4157a6abad737b719be509c0c954
-EBUILD tinyproxy-1.11.1_p20220908.ebuild 1746 BLAKE2B 44f41d2142581c386c0ab257743851ca4ee815ede1a5261be2559e8885a337369c86f69e806b509f599b324bfa3efd237c3a7d7add14fc962c651281556dd62e SHA512 474a4922d2855033f116bec583e984c21ddb2b12ecf739ea139d0f804a626196f1524ded2cb52a11ebe21894333e315a95f31786defd58ec36f433b724fa8909
+EBUILD tinyproxy-1.11.1_p20220908.ebuild 1745 BLAKE2B 0f8846867c71074fc216456376cd8b6cf094a583a2245b8751e2e0aba1f86c6e0bb3f325cc1f5664388cae9de6a310ae2eedaf6f2bdce6f21ed1d164d6c20068 SHA512 c03703d7a0cc74b40f27cc9835fc3c5edd53d917a5b2501fded5a19a62da275f55e5428c0709cef1e5b47afc0e2562883088a5ba031e36cfb037fa8a128267d6
 MISC metadata.xml 563 BLAKE2B 07ee935476f241bbe02aef78b978263fbc0bc0440f191a61d9ca99ffe59a5c3c5d5e84e77e032159dc9aff83a18a453bbdbb18f4a2e14478b6249cae22a7aadb SHA512 c6495e76d667793098e3697854e68acc8fe8cce28cb70ca115fb8f48ea3ccad48b4f31f0c709fd6887435c06a015434596896eb8e8fef1d78a2406b672146c1e
diff --git a/net-proxy/tinyproxy/tinyproxy-1.11.1_p20220908.ebuild b/net-proxy/tinyproxy/tinyproxy-1.11.1_p20220908.ebuild
index 98a6c6810fd4..18245e11e252 100644
--- a/net-proxy/tinyproxy/tinyproxy-1.11.1_p20220908.ebuild
+++ b/net-proxy/tinyproxy/tinyproxy-1.11.1_p20220908.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/tinyproxy/tinyproxy/archive/${COMMIT}.tar.gz -> ${P}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
 
 IUSE="test debug +filter-proxy reverse-proxy transparent-proxy
 +upstream-proxy +xtinyproxy-header"
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index ffab3b8504e0..95833fc2755c 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/hwinfo/Manifest b/sys-apps/hwinfo/Manifest
index a8b9d105974e..8735e4c37cc6 100644
--- a/sys-apps/hwinfo/Manifest
+++ b/sys-apps/hwinfo/Manifest
@@ -1,5 +1,5 @@
 DIST hwinfo-21.80-1.1.src.rpm 968192 BLAKE2B a11a1060137ff89504963c01c4129dcac93e8eea9747ea20272763f648068e8b4fb3f1c31ae761664b1b1ffedf32971b3b27804f125473f0367cc6eed03751bf SHA512 7bf64d9ee6b2381c43ffb22dc5623c8a8ed05c26b4e154c3093a9cb255779a1d482c18cd085b272ce619249743f1c43989337bed142685b4d6c634f4551893ee
 DIST hwinfo-22.1-1.1.src.rpm 969862 BLAKE2B f295c941804d3264b45739fa3d1801c2e31d67ce50f49caafeaae5a4dbf809fcfb9b44eaefee6ac9c61f54c1639fe1cf7ba710a9bbae5c4adbc7b5740e706796 SHA512 83f5d2dc78dfb10987a57a52f194d5db38ec66e73daad8fdf08386b131cf862b6c7bc3404451550f91363bb3d4090e67ca36aeba001f506075e55721004f2759
 EBUILD hwinfo-21.80.ebuild 1561 BLAKE2B f66110bb40f16efaeade743b03ddc26b72cd7b875c4ecf6c4599f1729c0feaab83a3b3f24867630c46c38ccac6ac6010eacc0b8b655f1e3d03af8e4679330ce9 SHA512 b455efce4294dbbcba410c675df5f0c34c4e97b9fa065953db481faa060d51348619f3f6c1030e4eae8336749e717034a73501ecb347f19f03204d2058a133aa
-EBUILD hwinfo-22.1.ebuild 1564 BLAKE2B 4be0e61fe6a66381f3a9d54ded59b0be601ed883c6e6d90f0556196c5e21fceeeb8594be8a04d28279795fb089fb695a4ca65347e184312c131962b434077a4f SHA512 11e7f26927dd6bbf4d655b12c427bdedbbe1858c0006ea9c37346e2c9ccdcbbbd5d982ffe23883c2a1b19ed898b20bbca6ec40142aeacfefafd406a7bccdb380
+EBUILD hwinfo-22.1.ebuild 1562 BLAKE2B 40c12efd02b2afb69732d0c45acc2a3e4e41e5f0d399989af7e4ff96db793e49dabfccad33491d94d8be8a6929b8bf5832dc80613284741fc1b0fc30f2ef4530 SHA512 f629ff5f06a2e3b153dbccfd97864e1c368ba146f98d6f8622ee53731e6432588a28acda9364f6b94caf8f84917aa362d26540e78b39fc2254a248db23ded4c9
 MISC metadata.xml 335 BLAKE2B 038b3d0d2c3215e9c141823f3578880ecb43da74b991cce36793a6af5b3549603ad1fa95c1bbe477126c3b84f6493099400d8914d94cdbe1c557b0166c0ca43b SHA512 e24489f0c20cc1cd356f7059c4a2a8d02b2f39fcb43df0d685977ce6e1593c134420daf6d940f96f08fd0d19026618d89946e6ff0a24f449be5d5c8910b10581
diff --git a/sys-apps/hwinfo/hwinfo-22.1.ebuild b/sys-apps/hwinfo/hwinfo-22.1.ebuild
index a54748333293..8b4f800063ba 100644
--- a/sys-apps/hwinfo/hwinfo-22.1.ebuild
+++ b/sys-apps/hwinfo/hwinfo-22.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://download.opensuse.org/tumbleweed/repo/src-oss/src/${P}-1.1.src.r
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~riscv x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="
diff --git a/sys-firmware/Manifest.gz b/sys-firmware/Manifest.gz
index b77175e452ac..0ebdd0cae945 100644
--- a/sys-firmware/Manifest.gz
+++ b/sys-firmware/Manifest.gz
diff --git a/sys-firmware/edk2-ovmf-bin/Manifest b/sys-firmware/edk2-ovmf-bin/Manifest
index 33ebc8175b0f..a8c0af5d1532 100644
--- a/sys-firmware/edk2-ovmf-bin/Manifest
+++ b/sys-firmware/edk2-ovmf-bin/Manifest
@@ -1,3 +1,3 @@
 DIST edk2-ovmf-202202-1.xpak 2672386 BLAKE2B 75c15d4379610ab2af85b78166e350d52f4f1bc1fff5b2eb693ad0d7b1f6648e65d8ae3e2c5467f93f1557ad3b4fa664ab2d76ff10794667de22c2ea8cca6b2d SHA512 06783b89c96bada0fd025ff39eaee501a027abcb03c0bdcf3ff497d52be22927ab03013d90f145ee94a8662cfffe4f8c154dcd06db1bb1acef8a85ae43de14a3
-EBUILD edk2-ovmf-bin-202202.ebuild 2116 BLAKE2B 2560bcf5e338cfecf6531882e97a4d7528fc938182ce1bc8376e10dd484cf51f7b42c2723e7e96ed51f9ecef5f03551a33a4a5af3bf0a5fe42d8b31b8ebb13de SHA512 962a16c7a9540361bc3f79e56422c871998efb85bb4683360983b9bc2acc0d18eb775a4500d4a681b78337528a04a501cee7fd2792eadc800deca6755383f208
+EBUILD edk2-ovmf-bin-202202.ebuild 2115 BLAKE2B 0e952a34df1c795010bace042a220438b54d06dbac313908c7e30b27de75fff83e651f173d11439c55ab24172d6419af5733ee985137fc6a2a94bdd8af7cba25 SHA512 23cd81e96c217736e672d0562eb798a3fa90c4a035ccc7b73ceb3df3428dea3f74bae3b8e43e24aae3dd7154ba0ae3f557d7ba7c9623cdf9adc6e5def7e7d504
 MISC metadata.xml 272 BLAKE2B 27a9c4c06a3f01a09abd1c554d9682f0248cd486fa866be62e1e63fcd59c57df6ab036d307b91c4c509bf1190aa5a1620c5995e98fb518bad215eb94b024e2f6 SHA512 aaaaf0683baa09807a821ff4eff365008ee8f7cd7852fb042e7d0aa40cfcc8b192f3bd7bdee6c4cdaad2621b9ad42ea0a5784eb93e0923641e02f8aa24e562fe
diff --git a/sys-firmware/edk2-ovmf-bin/edk2-ovmf-bin-202202.ebuild b/sys-firmware/edk2-ovmf-bin/edk2-ovmf-bin-202202.ebuild
index 7b35ffe6dc9e..fac69443f73b 100644
--- a/sys-firmware/edk2-ovmf-bin/edk2-ovmf-bin-202202.ebuild
+++ b/sys-firmware/edk2-ovmf-bin/edk2-ovmf-bin-202202.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}"
 
 LICENSE="BSD-2 MIT"
 SLOT="0"
-#KEYWORDS="~amd64 ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
 
 RDEPEND="!sys-firmware/edk2-ovmf"
 
diff --git a/sys-firmware/edk2-ovmf/Manifest b/sys-firmware/edk2-ovmf/Manifest
index d9cf218886fe..8b2358ed77f3 100644
--- a/sys-firmware/edk2-ovmf/Manifest
+++ b/sys-firmware/edk2-ovmf/Manifest
@@ -8,7 +8,6 @@ DIST edk2-ovmf-202202-qemu-firmware.tar.xz 664 BLAKE2B 1aa4e25804ce0f3c967c80999
 DIST edk2-ovmf-202202.tar.gz 14208170 BLAKE2B d8411e6808b335ccd551349a10c983b9448a357e73273fa6c30a07785e27feffed0224950ee98b668712c33f6739a9b006e5043b7dfd014f48dba9fd449b3354 SHA512 200690a4867331de06e0478869b85577bc510213ebe679f2103160efb84d94c82ac8481ef1f15c3e42c1e9f22b7c5ef0d6c8f2c655bce7702ce843551cf9bb83
 DIST openssl-d82e959e621a3d597f1e0d50ff8c2d8b96915fd7.tar.gz 10034310 BLAKE2B 6996979dc12a523d565830e7b0943feb682a376f71ddb6f20cb8b9976bb7f12e39f088abaa45d514933ef79c0e4a2933dc6f1af4774fedaa16e74c0081c358e7 SHA512 a89bc652dc4318c5e8a9c594a43d890ca05dfc1acd6b15e2a8ab8b5628b5f33994143ff8024230e07b9e67556b28ea3a5e36763aa72dec20b52022ca8c6f2a7e
 DIST openssl-e2e09d9fba1187f8d6aafaa34d4172f56f1ffb72.tar.gz 9981169 BLAKE2B 33aac7364cdd45fec5654ab6caef84e1a829464380419c8a6bb311055c5a01c0aaff6e046a7c541a87e908fa9d26bae652f5be901461d03df36f2522f9c34b0c SHA512 db2087c04f0b428b3f4e1c8b3ac53cce69e0fd331ed2b86ba00facafd1685864d73f71c13eee48f4fe0af2bddad848f84a2b8ed2a17fabdf7fa2ed7d9eb39371
-EBUILD edk2-ovmf-202105-r1.ebuild 4974 BLAKE2B 34c7b4ec472917c3ab586ef6dbbd9a0814dc7d284311b94846c981dfd02e50de8d4f7612a3cb3ffc68bd74fb1194a97cf03634d70736010429cce3b6cea3f597 SHA512 b867679dc71db66f6aec9f54551c7feaf2cd2e9084f7f27b623b62d40aba52c5fc96c4db24b9609bc0d131158de3382768ac2efef408df9b23be015cf7d962a9
-EBUILD edk2-ovmf-202105-r2.ebuild 5079 BLAKE2B 5b55efe51f30d9d4c64d1d0c2a1b3ee7a5fc9633027da4f09820ca4596a894ce079bb4d08368a0fb4dd2d7be42df8e591230094221daf0710542439a0fe70cdc SHA512 b4c578c2d52625fd510f35b69a12e638271e8f33247e8fc9dcbde3779cc65b6ed3e6fdd1527a9838e6e68ebf1c5233cf07d38245fa16da5f6aa61da374c29f1e
-EBUILD edk2-ovmf-202202.ebuild 4658 BLAKE2B 56dade1ad8b694f47ff515bdb1106d708a6f0e37677e6e5e21e75b738d56a3ebcdc5708eb35670eb849622064bede8c8c00c1a405f1b401a3f4225b6c1467792 SHA512 65c42cc8bf8e3ec781c3466ced4d058ecacdd8f7d5512b682dd733dbe582e0d5a039cfa87f36fa3677a6e07284d83b193bb6bb16892bbc37bf03e422aeb02049
+EBUILD edk2-ovmf-202105-r2.ebuild 5082 BLAKE2B 5a730290ea04539a86979b6b3f92ad1ffd4fd33d53d515dac3d2e4405cb51a30fd2d771370e8776cedfdf085852bccba9cc69a1e076f7fcd6a033f5f42f437a6 SHA512 fa1270014a986738ca626da04db2e1fb117035d9625346b749a3a8c59aa8b4dbdbc0ee3f3df443cb676539f0342a4619af971744057ccaf6ee6902edca1b4a64
+EBUILD edk2-ovmf-202202.ebuild 4660 BLAKE2B 86a80a9cd991825651d46cc2debe0e57d93b9aea57cebf24eec571e705990722b4c5a4133fff1110a32a0ccb5f28b26e7da21107e7da80583cf82b036cfe21eb SHA512 a46f010ce581a381ef70e4d84a1cc5ecf36e973e46f9763eb490d06385cad15dbf284c940f16304e11a2e2883a7fdce3eb7d9e1f41784d579a7a2eaeb165905e
 MISC metadata.xml 436 BLAKE2B 091a94f2295817e420f919cc87c89b2ac5aab07f7d1b3279fa153bd89395ed9278d429aa75aa0aa3820ad9ee9400e80c1d4f56a3940eb8b37e39f767438f508a SHA512 d5854375acb0fcdf482458d80f0f916389cba9709a9cdc61ff9dc6ffc8bf5a145445fdf252fe543ea7d25ccd0491089b56aff32c7a30d7470be63acc30ad81d7
diff --git a/sys-firmware/edk2-ovmf/edk2-ovmf-202105-r1.ebuild b/sys-firmware/edk2-ovmf/edk2-ovmf-202105-r1.ebuild
deleted file mode 100644
index c316a3faf1bd..000000000000
--- a/sys-firmware/edk2-ovmf/edk2-ovmf-202105-r1.ebuild
+++ /dev/null
@@ -1,176 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_{8,9,10} )
-
-inherit python-any-r1 readme.gentoo-r1
-
-DESCRIPTION="UEFI firmware for 64-bit x86 virtual machines"
-HOMEPAGE="https://github.com/tianocore/edk2"
-
-BUNDLED_OPENSSL_SUBMODULE_SHA="e2e09d9fba1187f8d6aafaa34d4172f56f1ffb72"
-BUNDLED_BROTLI_SUBMODULE_SHA="666c3280cc11dc433c303d79a83d4ffbdd12cc8d"
-
-# TODO: talk with tamiko about unbundling (mva)
-
-# TODO: the binary 202105 package currently lacks the preseeded
-#       OVMF_VARS.secboot.fd file (that we typically get from fedora)
-
-SRC_URI="
-	!binary? (
-		https://github.com/tianocore/edk2/archive/edk2-stable${PV}.tar.gz -> ${P}.tar.gz
-		https://github.com/openssl/openssl/archive/${BUNDLED_OPENSSL_SUBMODULE_SHA}.tar.gz -> openssl-${BUNDLED_OPENSSL_SUBMODULE_SHA}.tar.gz
-		https://github.com/google/brotli/archive/${BUNDLED_BROTLI_SUBMODULE_SHA}.tar.gz -> brotli-${BUNDLED_BROTLI_SUBMODULE_SHA}.tar.gz
-	)
-	binary? ( https://dev.gentoo.org/~tamiko/distfiles/${PF}-bin.tar.xz )
-	https://dev.gentoo.org/~tamiko/distfiles/${P}-qemu-firmware.tar.xz
-"
-
-LICENSE="BSD-2 MIT"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc ppc64 x86"
-
-IUSE="+binary"
-REQUIRED_USE+="
-	!amd64? ( binary )
-"
-
-NON_BINARY_DEPEND="
-	app-emulation/qemu
-	>=dev-lang/nasm-2.0.7
-	>=sys-power/iasl-20160729
-	${PYTHON_DEPS}
-"
-
-DEPEND+="
-	!binary? (
-		amd64? (
-			${NON_BINARY_DEPEND}
-		)
-	)"
-RDEPEND=""
-
-PATCHES=(
-	"${FILESDIR}/${PN}-202105-werror.patch"
-)
-
-S="${WORKDIR}/edk2-edk2-stable${PV}"
-
-DISABLE_AUTOFORMATTING=true
-DOC_CONTENTS="This package contains the tianocore edk2 UEFI firmware for 64-bit x86
-virtual machines. The firmware is located under
-	/usr/share/edk2-ovmf/OVMF_CODE.fd
-	/usr/share/edk2-ovmf/OVMF_VARS.fd
-	/usr/share/edk2-ovmf/OVMF_CODE.secboot.fd
-
-If USE=binary is enabled, we also install an OVMF variables file (coming from
-fedora) that contains secureboot default keys
-
-	/usr/share/edk2-ovmf/OVMF_VARS.secboot.fd
-
-If you have compiled this package by hand, you need to either populate all
-necessary EFI variables by hand by booting
-	/usr/share/edk2-ovmf/UefiShell.(iso|img)
-or creating OVMF_VARS.secboot.fd by hand:
-	https://github.com/puiterwijk/qemu-ovmf-secureboot
-
-The firmware does not support csm (due to no free csm implementation
-available). If you need a firmware with csm support you have to download
-one for yourself. Firmware blobs are commonly labeled
-	OVMF{,_CODE,_VARS}-with-csm.fd
-
-In order to use the firmware you can run qemu the following way
-
-	$ qemu-system-x86_64 \
-		-drive file=/usr/share/edk2-ovmf/OVMF.fd,if=pflash,format=raw,unit=0,readonly=on \
-		..."
-
-pkg_setup() {
-	[[ ${PV} != "999999" ]] && use binary || python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	if use binary; then
-		eapply_user
-	else
-		# Bundled submodules
-		cp -rl "${WORKDIR}/openssl-${BUNDLED_OPENSSL_SUBMODULE_SHA}"/* "CryptoPkg/Library/OpensslLib/openssl/"
-		cp -rl "${WORKDIR}/brotli-${BUNDLED_BROTLI_SUBMODULE_SHA}"/* "BaseTools/Source/C/BrotliCompress/brotli/"
-		cp -rl "${WORKDIR}/brotli-${BUNDLED_BROTLI_SUBMODULE_SHA}"/* "MdeModulePkg/Library/BrotliCustomDecompressLib/brotli/"
-
-		sed -i -r \
-			-e "/function SetupPython3/,/\}/{s,\\\$\(whereis python3\),${EPYTHON},g}" \
-			"${S}"/edksetup.sh || die "Fixing for correct Python3 support failed"
-
-		default
-	fi
-}
-
-src_compile() {
-	TARGET_ARCH=X64
-	TARGET_NAME=RELEASE
-	TARGET_TOOLS=GCC49
-
-	BUILD_FLAGS="-D TLS_ENABLE \
-		-D HTTP_BOOT_ENABLE \
-		-D NETWORK_IP6_ENABLE \
-		-D TPM_ENABLE \
-		-D TPM2_ENABLE -D TPM2_CONFIG_ENABLE \
-		-D FD_SIZE_2MB"
-
-	SECUREBOOT_BUILD_FLAGS="${BUILD_FLAGS} \
-		-D SECURE_BOOT_ENABLE \
-		-D SMM_REQUIRE \
-		-D EXCLUDE_SHELL_FROM_FD"
-
-	[[ ${PV} != "999999" ]] && use binary && return
-
-	emake ARCH=${TARGET_ARCH} -C BaseTools
-
-	. ./edksetup.sh
-
-	# Build all EFI firmware blobs:
-
-	mkdir -p ovmf
-
-	./OvmfPkg/build.sh \
-		-a "${TARGET_ARCH}" -b "${TARGET_NAME}" -t "${TARGET_TOOLS}" \
-		${BUILD_FLAGS} || die "OvmfPkg/build.sh failed"
-
-	cp Build/OvmfX64/*/FV/OVMF_*.fd ovmf/
-	rm -rf Build/OvmfX64
-
-	./OvmfPkg/build.sh \
-		-a "${TARGET_ARCH}" -b "${TARGET_NAME}" -t "${TARGET_TOOLS}" \
-		${SECUREBOOT_BUILD_FLAGS} || die "OvmfPkg/build.sh failed"
-
-	cp Build/OvmfX64/*/FV/OVMF_CODE.fd ovmf/OVMF_CODE.secboot.fd || die "cp failed"
-	cp Build/OvmfX64/*/X64/Shell.efi ovmf/ || die "cp failed"
-	cp Build/OvmfX64/*/X64/EnrollDefaultKeys.efi ovmf || die "cp failed"
-
-	# Build a convenience UefiShell.img:
-
-	mkdir -p iso_image/efi/boot || die "mkdir failed"
-	cp ovmf/Shell.efi iso_image/efi/boot/bootx64.efi || die "cp failed"
-	cp ovmf/EnrollDefaultKeys.efi iso_image || die "cp failed"
-	qemu-img convert --image-opts \
-		driver=vvfat,floppy=on,fat-type=12,label=UEFI_SHELL,dir=iso_image \
-		ovmf/UefiShell.img || die "qemu-img failed"
-}
-
-src_install() {
-	insinto /usr/share/${PN}
-	doins ovmf/*
-
-	insinto /usr/share/qemu/firmware
-	doins qemu/*
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/sys-firmware/edk2-ovmf/edk2-ovmf-202105-r2.ebuild b/sys-firmware/edk2-ovmf/edk2-ovmf-202105-r2.ebuild
index 71e566bf0065..9fbaad4d5e74 100644
--- a/sys-firmware/edk2-ovmf/edk2-ovmf-202105-r2.ebuild
+++ b/sys-firmware/edk2-ovmf/edk2-ovmf-202105-r2.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_{8,9,10} )
+PYTHON_COMPAT=( python3_{8,9,10,11} )
 
 inherit python-any-r1 readme.gentoo-r1
 
diff --git a/sys-firmware/edk2-ovmf/edk2-ovmf-202202.ebuild b/sys-firmware/edk2-ovmf/edk2-ovmf-202202.ebuild
index 84319b7c4af0..c0510e2c0862 100644
--- a/sys-firmware/edk2-ovmf/edk2-ovmf-202202.ebuild
+++ b/sys-firmware/edk2-ovmf/edk2-ovmf-202202.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_{8,9,10} )
+PYTHON_COMPAT=( python3_{8,9,10,11} )
 
 inherit python-any-r1 readme.gentoo-r1
 
@@ -26,7 +26,7 @@ SRC_URI="https://github.com/tianocore/edk2/archive/edk2-stable${PV}.tar.gz -> ${
 
 LICENSE="BSD-2 MIT"
 SLOT="0"
-#KEYWORDS="~amd64"
+KEYWORDS="~amd64"
 
 BDEPEND="app-emulation/qemu
 	>=dev-lang/nasm-2.0.7
diff --git a/sys-firmware/seabios-bin/Manifest b/sys-firmware/seabios-bin/Manifest
index b8f7df6239b7..2b726206c3ba 100644
--- a/sys-firmware/seabios-bin/Manifest
+++ b/sys-firmware/seabios-bin/Manifest
@@ -1,3 +1,3 @@
 DIST seabios-1.16.0-1.xpak 141506 BLAKE2B b2d0cc367ea7ba958604f95dc2a7ab92fd76768e6133552b76d651755cab225eed3e1a6bd350b7f3b5058212390c073e9ca37896412797ac224fb1ce4b5f641a SHA512 4007a6cd40b7c82d1f53450a4151a19d5020ca4c3258b4502f9bfb1c3eacfef1a934794b58d38439e41884cd7a962aa436e22b9194b5731585383fd1476dd688
-EBUILD seabios-bin-1.16.0.ebuild 644 BLAKE2B 77c4246de261f73fdfcabb812325fa0aca14b3c7075cfde4c7f41ab763c8ceaa587f52f87153cb2881ef3f6a6f3e133885b1af219d91fc56887c20109d06f448 SHA512 67516aa0426bf7254d1f77b14b6f4278db0f97878845ea6aa54d546a797123ff4c05f7093289dcfb7fd94be6124cd5c6d9ae3d06a7fd3d4202d25bc18a62134c
+EBUILD seabios-bin-1.16.0.ebuild 643 BLAKE2B de4b32084b452edd93b36e4eee63d100754e89b516fc0000801d605893b56ebd0b8698659d5090ee0da7054bd09a6821720b94f2f74237301a6f55ba8384506a SHA512 9491de03cd2dd4a30d8f429b330673c7cfc0c0d847d196ff4c9121034d9bdbc994f842c012d92a05ce7fc8af041bba9af76cf3787e7396c9969422d9793c90c1
 MISC metadata.xml 272 BLAKE2B 27a9c4c06a3f01a09abd1c554d9682f0248cd486fa866be62e1e63fcd59c57df6ab036d307b91c4c509bf1190aa5a1620c5995e98fb518bad215eb94b024e2f6 SHA512 aaaaf0683baa09807a821ff4eff365008ee8f7cd7852fb042e7d0aa40cfcc8b192f3bd7bdee6c4cdaad2621b9ad42ea0a5784eb93e0923641e02f8aa24e562fe
diff --git a/sys-firmware/seabios-bin/seabios-bin-1.16.0.ebuild b/sys-firmware/seabios-bin/seabios-bin-1.16.0.ebuild
index 1632d76b3e55..5533ccd12d50 100644
--- a/sys-firmware/seabios-bin/seabios-bin-1.16.0.ebuild
+++ b/sys-firmware/seabios-bin/seabios-bin-1.16.0.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}"
 
 LICENSE="LGPL-3 GPL-3"
 SLOT="0"
-#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 RDEPEND="!sys-firmware/seabios"
 
diff --git a/sys-firmware/seabios/Manifest b/sys-firmware/seabios/Manifest
index 6aafacea3e8d..b7de89a0bccf 100644
--- a/sys-firmware/seabios/Manifest
+++ b/sys-firmware/seabios/Manifest
@@ -7,16 +7,9 @@ AUX seavgabios/config.vga-qxl 128 BLAKE2B f627711caa7dfbb236b4e9e83104d3d5c7d07a
 AUX seavgabios/config.vga-stdvga 59 BLAKE2B 7c10706c7d261f64e181d85c268375aa3b6b362bf3e5f1f391c52a6a3644a498a44c9627f60b6c47893c4fad24cc4667e816ab98e6bdcdb97b7d8f7463a8bf10 SHA512 4a1b7fcc729d78dc8fd4e73d1cb6258ed9d49f8a91e6e00cc184e07c89a304f8d38ef5446d1c4ba5e8e929c82693d82c21526e42992ad6e1a008f39bb7c90448
 AUX seavgabios/config.vga-virtio 128 BLAKE2B 98237322784b56cdff2c7d7298a419b18ab77031dfad9da743af73c3073a5b766be3940694a320c82ffda65c8a48e028eccd974d37ccd44f9ba0720b5787b53e SHA512 4d627be11d79f0b8bd814a49e608826375aba6b59a0189dcba9afe24a181347b92e6ab18e0d9199e2f7a78f8fb02f03dad84c63fbbc2ffe9af76777ef28c5f8a
 AUX seavgabios/config.vga-vmware 128 BLAKE2B 8ab374ee7b0ad5cd8f732ccc4983f2251a8ba4843bab358cb3e84e12a572e4e348094e762ecfaa94f704ad05d718bfebd34048b1db3076dae2309d7963794437 SHA512 2a82f75ca6dbf48546ffa5a756136dd7085855d9411c3b37a74cc53281027b4916cf628dba784bcad915682d94705b5f8116f7a1b7ec6a99d9b2fb3fffba01c0
-DIST seabios-1.12.0-bin.tar.xz 162492 BLAKE2B 9a5a349226ed7efbed328493dc057e232203b251677a23f1f09c133743ff0ca6b05270c9d27460be1d8897888fe23ff7bdfa122023fa8ddb23af03d5b9b6f8dd SHA512 f7a0395d621245093bb9a278d95ecc3d4e8d23f620058cd4fddaf885c8b86256f6258f3fd8173c1d24c03306f44d180e768bf8005ee123bc4b699b9f0ca371be
-DIST seabios-1.12.0.tar.gz 613542 BLAKE2B f145c2db716996bfa9e5c014086ccfaa8ae96ebc158f34303b122b7bf209408c567665d8691364df8d8e886f63e0e72a3f3cd319dfa86ef581023201b5d94e53 SHA512 e52c5363e5bb37b5286e55545aa06bd126218f9d0e3a06ac2e189de68fe3de3256c11ca1bb13357a9c384d7e3af6284083ff3aa587688b5de04ef11b97bdfa27
-DIST seabios-1.14.0-bin.tar.xz 170160 BLAKE2B 1ab471ce0c6e27633ec42a66e3069496be84de713baab5de4f297821bd0da26404f7f70abc82e223ec5aa317a878889ae92b019988c72d24f77e7dcc5865f916 SHA512 7964e9bb7dff4fd6593f5d6d64efc4b1460750461b86635dbe5255d2086d619f51711d7a35e4dc20e556f705091c0950afabeddcd2e8876f05ce14f9ca73ed71
 DIST seabios-1.14.0-r2-bin.tar.xz 132256 BLAKE2B 7d38949de254d6e3699d463a66c363156aa36bfe16c18bea48c55a61bdc423184175fd5427d3246a78d9c6335e61e5baa982f67e7406c5525e405b4383530d41 SHA512 5ce0e407b97e878842fbd7ad2f9e8a65f2565a5aa43d08e01cff024352780f55f8669958c58d20770db7f90e87cc52c860af831cefe3846227e7b45cd9dc33ee
 DIST seabios-1.14.0.tar.gz 628985 BLAKE2B cc1126925dab1551a655680d20d06ebf28c12c386500d1ee4df9e1a99403b4c5bc6a66c2cc5ef58b4c3d6d7226f35007506a6a1855c2cf2742469dcb7aba05bb SHA512 215c42f59425f8abd062be7b11fc0e39c977cee5001a2381551b0f851ac337d0dd53c065267e6dee0e710ffd700fa635f9007b89da8dfce0f47122c984ee8146
 DIST seabios-1.16.0.tar.gz 635419 BLAKE2B b645f20bae341d56ce4fc4a7044446050d8490c6c136377f6dccf02c88100b0644bc13d210b4a517a8be6002d5671b0fba77120a2aca3a9bafbad5e88d037e40 SHA512 9daefcfb1c9edda4462a4b080c9bac552154d577ae19703a914928e43005e7a52edd86869c6507e94a7f0c61ce8b3e6f5dea38cd5146628cb138a130947c522f
-EBUILD seabios-1.12.0-r1.ebuild 4058 BLAKE2B 960efadabb9000c6aecde46e41760d414f92f7b915ae546faf831cd52954b8f78e98419faeb54200189d0210c2d72057fa05997fa848fc10a42cbdff3d665a47 SHA512 9a9fe25e5766f9fc88fc22ac3fe796a3229a36bdba5c08a7648df8dcea0e8502fa9ada2ab3ab1aee2466f67bbb678e3e500ee99e2fe24b3e8b77c4bdded33a32
-EBUILD seabios-1.12.0.ebuild 3439 BLAKE2B 4e88e25af3df5c52d44259b8078f2c6a7baf5d88dfd572ab7e25c1d0a35737eca941002fb2e111a70143d95af61b012bbeb1da7e33a1b900471a4c3720cd6f70 SHA512 7e9a0e45766736bfc4aa71736aeee1e5301a044cb84f0ea7060be4cfc2e6f7da97ca789d136b85911d05a25aa1abcc6f644ebdf2da3c5e7a4371171d18614423
-EBUILD seabios-1.14.0-r1.ebuild 3922 BLAKE2B 28456deb4ae6bb85deae3f815372db3815bb84789c3107f6f8e47bf83d89f06f519c7ba0d4ed61838d90e476b7ebfb2d221158506ec6f79bbba9ef6f5de9eee6 SHA512 02d60543a35f653e2cfd17df4e8cbd6739d6a90ed444ad7783d1bf047af46424030efc0f425e469f3aca0ef5280422bd5993f7bfb7ac673e778bbc3dfff3278e
-EBUILD seabios-1.14.0-r2.ebuild 4312 BLAKE2B ddb719c9cb15130b786708227ff200b51a615806b2a1ba0b7aafb2c6076ccb6cb89629d3e046bd084360114b2d48111244b34cac12260d9b1020b199d1b29c24 SHA512 f8324420c74cc1d55a613c50e7b87fb8b30c787b550cd764c80f5d5188f2f372090deaa581663d7a50227adb85fe98001d940ae9bd235bbbfdc06885f3948197
-EBUILD seabios-1.14.0.ebuild 3773 BLAKE2B 3ae3a072999d39f6d639d5c06454a8c33cafcb90014e4a77c5811bc176a536e9b43b144cc12da1e85c21c958dd6b985921902e6129381a3c670aa074d4b1bf81 SHA512 054cda4d92a31852e9cd97dd79182f206c7270f332ffd2e4642890f17b57e89621f3add65ad62e20707c7ef2a929f732d82ee154b7ed47c3dbfbc8c0da5da7c0
-EBUILD seabios-1.16.0.ebuild 3398 BLAKE2B a5add1f7e4bcd07e77d520e32d3c8021e33244a82d990d5ac68a6b043f0347db2653595e4b8f2f6a8d858039a4f998b1a0d0fa4d415e0118236c2a77ada81739 SHA512 a7a157c830ff9a1f216476b4d427ff41f52e7d7a8c743fec74a8a95755f979b59308ce5a0c9069fe7d81e780731be7298b31f74e8650cf9785fc82b8db54b89a
+EBUILD seabios-1.14.0-r2.ebuild 4316 BLAKE2B 02a8fe7a44853f2dde852553e09c3c46de9931c1c572f0cf8146784f186a5715db31a11324f4d2a4a2323488a098a95d5d53c4b33396c1fd60bbd0bd46bdc9df SHA512 3e843dc4d966b8b80e4dd293a5778fc8a5c179216bb26f89e80a250fa3bc897dfa551cc8c78fadc2ec96d68ebc48169a85d3d67f753dd461f94f88937a826422
+EBUILD seabios-1.16.0.ebuild 3401 BLAKE2B f6fced8fa9f8c3a85576fabe8bc5fb7eb9d5a35803dc4fac97fa22e66788ceab19e570e2e2fb3e4a3378100b08cfe4421faf86df5496bde003897ffcfc65daf0 SHA512 7ff0b5f7818ee812647eaf45973d5cf010868f71c133ac2129faebd2aef88c0b19c272a77407a6d0a6dbab7e392ae7721585f866548814c6fb65ea6c10e8f368
 MISC metadata.xml 552 BLAKE2B c04d6ed849a522fa91d5698915ce4a2344cf68301fa7a4a1b1c3644be4892a36920b1daa83afff6c4296877617e394a2565699c3ba34e92acb9b6dc52be34adf SHA512 4c92f35b58ee8f41b2a9457f830ef33962f831e854fe87982579a78c65df7ae5d74c54fb7a90ab837e51229a8ca0d75ae84c989e92c2f679ec9a91ed5ebb7561
diff --git a/sys-firmware/seabios/seabios-1.12.0-r1.ebuild b/sys-firmware/seabios/seabios-1.12.0-r1.ebuild
deleted file mode 100644
index 03b9cd8cd76c..000000000000
--- a/sys-firmware/seabios/seabios-1.12.0-r1.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit toolchain-funcs python-any-r1
-
-# SeaBIOS maintainers sometimes don't release stable tarballs or stable
-# binaries to generate the stable tarball the following is necessary:
-# git clone git://git.seabios.org/seabios.git && cd seabios
-# git archive --output seabios-${PV}.tar.gz --prefix seabios-${PV}/ rel-${PV}
-
-if [[ ${PV} == *9999* || -n "${EGIT_COMMIT}" ]] ; then
-	EGIT_REPO_URI="git://git.seabios.org/seabios.git"
-	inherit git-r3
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-
-	# Binary versions taken from fedora:
-	# http://download.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/x86_64/os/Packages/s/
-	#   seabios-bin-1.12.1-2.fc31.noarch.rpm
-	#   seavgabios-bin-1.12.1-2.fc31.noarch.rpm
-	SRC_URI="
-		!binary? ( https://code.coreboot.org/p/seabios/downloads/get/${P}.tar.gz )
-		binary? ( https://dev.gentoo.org/~tamiko/distfiles/${P}-bin.tar.xz )"
-fi
-
-DESCRIPTION="Open Source implementation of a 16-bit x86 BIOS"
-HOMEPAGE="https://www.seabios.org/"
-
-LICENSE="LGPL-3 GPL-3"
-SLOT="0"
-IUSE="+binary debug +seavgabios"
-
-REQUIRED_USE="debug? ( !binary )"
-
-SOURCE_DEPEND="
-	>=sys-power/iasl-20060912
-	${PYTHON_DEPS}"
-DEPEND="
-	!binary? (
-		${SOURCE_DEPEND}
-	)"
-RDEPEND=""
-
-choose_target_chost() {
-	if [[ -n "${CC}" ]]; then
-		${CC} -dumpmachine
-		return
-	fi
-
-	if use amd64 || use x86; then
-		# Use the native compiler
-		echo "${CHOST}"
-		return
-	fi
-
-	local i
-	for i in x86_64 i686 i586 i486 i386 ; do
-		i=${i}-pc-linux-gnu
-		type -P ${i}-gcc > /dev/null && echo ${i} && return
-	done
-}
-
-pkg_pretend() {
-	if ! use binary; then
-		ewarn "You have decided to compile your own SeaBIOS. This is not"
-		ewarn "supported by upstream unless you use their recommended"
-		ewarn "toolchain (which you are not)."
-		elog
-		ewarn "If you are intending to use this build with QEMU, realize"
-		ewarn "you will not receive any support if you have compiled your"
-		ewarn "own SeaBIOS. Virtual machines subtly fail based on changes"
-		ewarn "in SeaBIOS."
-		if [[ -z "$(choose_target_chost)" ]]; then
-			elog
-			eerror "Before you can compile ${PN}[-binary], you need to install a x86 cross-compiler"
-			eerror "Run the following commands:"
-			eerror "  emerge crossdev"
-			eerror "  crossdev --stable -t x86_64-pc-linux-gnu"
-			die "cross-compiler is needed"
-		fi
-	fi
-}
-
-pkg_setup() {
-	use binary || python-any-r1_pkg_setup
-}
-
-src_unpack() {
-	default
-
-	# This simplifies the logic between binary & source builds.
-	mkdir -p "${S}"
-}
-
-src_prepare() {
-	default
-
-	# Ensure precompiled iasl files are never used
-	find "${WORKDIR}" -name '*.hex' -delete || die
-}
-
-src_configure() {
-	use binary && return
-
-	tc-ld-disable-gold #438058
-
-	if use debug ; then
-		echo "CONFIG_DEBUG_LEVEL=8" >.config
-	fi
-	_emake config
-}
-
-_emake() {
-	LANG=C \
-	emake V=1 \
-		CC="$(tc-getCC)" \
-		LD="$(tc-getLD)" \
-		AR="$(tc-getAR)" \
-		AS="$(tc-getAS)" \
-		OBJCOPY="$(tc-getOBJCOPY)" \
-		RANLIB="$(tc-getRANLIB)" \
-		OBJDUMP="$(tc-getOBJDUMP)" \
-		HOST_CC="$(tc-getBUILD_CC)" \
-		VERSION="Gentoo/${EGIT_COMMIT:-${PVR}}" \
-		"$@"
-}
-
-src_compile() {
-	use binary && return
-
-	local TARGET_CHOST=$(choose_target_chost)
-
-	cp "${FILESDIR}/seabios/config.seabios-256k" .config || die
-	_emake oldnoconfig
-	CHOST="${TARGET_CHOST}" _emake iasl
-	CHOST="${TARGET_CHOST}" _emake out/bios.bin
-	mv out/bios.bin ../bios-256k.bin || die
-
-	if use seavgabios ; then
-		local config t targets=(
-			cirrus
-			isavga
-			qxl
-			stdvga
-			virtio
-			vmware
-		)
-		for t in "${targets[@]}" ; do
-			emake clean distclean
-			cp "${FILESDIR}/seavgabios/config.vga-${t}" .config || die
-			_emake oldnoconfig
-			CHOST="${TARGET_CHOST}" _emake out/vgabios.bin
-			cp out/vgabios.bin ../vgabios-${t}.bin || die
-		done
-	fi
-}
-
-src_install() {
-	insinto /usr/share/seabios
-	use binary && doins ../bios.bin
-	doins ../bios-256k.bin
-
-	if use seavgabios ; then
-		insinto /usr/share/seavgabios
-		doins ../vgabios*.bin
-	fi
-}
diff --git a/sys-firmware/seabios/seabios-1.12.0.ebuild b/sys-firmware/seabios/seabios-1.12.0.ebuild
deleted file mode 100644
index 375070e32da8..000000000000
--- a/sys-firmware/seabios/seabios-1.12.0.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit toolchain-funcs python-any-r1
-
-# SeaBIOS maintainers sometimes don't release stable tarballs or stable
-# binaries to generate the stable tarball the following is necessary:
-# git clone git://git.seabios.org/seabios.git && cd seabios
-# git archive --output seabios-${PV}.tar.gz --prefix seabios-${PV}/ rel-${PV}
-
-if [[ ${PV} == *9999* || -n "${EGIT_COMMIT}" ]] ; then
-	EGIT_REPO_URI="git://git.seabios.org/seabios.git"
-	inherit git-r3
-else
-	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sparc x86"
-
-	# Binary versions taken from fedora:
-	# http://download.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/x86_64/os/Packages/s/
-	#   seabios-bin-1.12.1-2.fc31.noarch.rpm
-	#   seavgabios-bin-1.12.1-2.fc31.noarch.rpm
-	SRC_URI="
-		!binary? ( https://code.coreboot.org/p/seabios/downloads/get/${P}.tar.gz )
-		binary? ( https://dev.gentoo.org/~tamiko/distfiles/${P}-bin.tar.xz )"
-fi
-
-DESCRIPTION="Open Source implementation of a 16-bit x86 BIOS"
-HOMEPAGE="https://www.seabios.org/"
-
-LICENSE="LGPL-3 GPL-3"
-SLOT="0"
-IUSE="+binary debug +seavgabios"
-
-REQUIRED_USE="debug? ( !binary )
-	!amd64? ( !x86? ( binary ) )"
-
-# The amd64/x86 check is needed to workaround #570892.
-SOURCE_DEPEND="
-	>=sys-power/iasl-20060912
-	${PYTHON_DEPS}"
-DEPEND="
-	!binary? (
-		amd64? ( ${SOURCE_DEPEND} )
-		x86? ( ${SOURCE_DEPEND} )
-	)"
-RDEPEND=""
-
-pkg_pretend() {
-	if ! use binary; then
-		ewarn "You have decided to compile your own SeaBIOS. This is not"
-		ewarn "supported by upstream unless you use their recommended"
-		ewarn "toolchain (which you are not)."
-		elog
-		ewarn "If you are intending to use this build with QEMU, realize"
-		ewarn "you will not receive any support if you have compiled your"
-		ewarn "own SeaBIOS. Virtual machines subtly fail based on changes"
-		ewarn "in SeaBIOS."
-	fi
-}
-
-pkg_setup() {
-	use binary || python-any-r1_pkg_setup
-}
-
-src_unpack() {
-	default
-
-	# This simplifies the logic between binary & source builds.
-	mkdir -p "${S}"
-}
-
-src_prepare() {
-	default
-
-	# Ensure precompiled iasl files are never used
-	find "${WORKDIR}" -name '*.hex' -delete || die
-}
-
-src_configure() {
-	use binary && return
-
-	tc-ld-disable-gold #438058
-
-	if use debug ; then
-		echo "CONFIG_DEBUG_LEVEL=8" >.config
-	fi
-	_emake config
-}
-
-_emake() {
-	LANG=C \
-	emake V=1 \
-		CC="$(tc-getCC)" \
-		LD="$(tc-getLD)" \
-		AR="$(tc-getAR)" \
-		AS="$(tc-getAS)" \
-		OBJCOPY="$(tc-getOBJCOPY)" \
-		RANLIB="$(tc-getRANLIB)" \
-		OBJDUMP="$(tc-getOBJDUMP)" \
-		HOST_CC="$(tc-getBUILD_CC)" \
-		VERSION="Gentoo/${EGIT_COMMIT:-${PVR}}" \
-		"$@"
-}
-
-src_compile() {
-	use binary && return
-
-	cp "${FILESDIR}/seabios/config.seabios-256k" .config || die
-	_emake oldnoconfig
-	_emake iasl
-	_emake out/bios.bin
-	mv out/bios.bin ../bios-256k.bin || die
-
-	if use seavgabios ; then
-		local config t targets=(
-			cirrus
-			isavga
-			qxl
-			stdvga
-			virtio
-			vmware
-		)
-		for t in "${targets[@]}" ; do
-			emake clean distclean
-			cp "${FILESDIR}/seavgabios/config.vga-${t}" .config || die
-			_emake oldnoconfig
-			_emake out/vgabios.bin
-			cp out/vgabios.bin ../vgabios-${t}.bin || die
-		done
-	fi
-}
-
-src_install() {
-	insinto /usr/share/seabios
-	use binary && doins ../bios.bin
-	doins ../bios-256k.bin
-
-	if use seavgabios ; then
-		insinto /usr/share/seavgabios
-		doins ../vgabios*.bin
-	fi
-}
diff --git a/sys-firmware/seabios/seabios-1.14.0-r1.ebuild b/sys-firmware/seabios/seabios-1.14.0-r1.ebuild
deleted file mode 100644
index 92b326728a8d..000000000000
--- a/sys-firmware/seabios/seabios-1.14.0-r1.ebuild
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit toolchain-funcs python-any-r1
-
-# SeaBIOS maintainers sometimes don't release stable tarballs or stable
-# binaries to generate the stable tarball the following is necessary:
-# git clone git://git.seabios.org/seabios.git && cd seabios
-# git archive --output seabios-${PV}.tar.gz --prefix seabios-${PV}/ rel-${PV}
-
-if [[ ${PV} == *9999* || -n "${EGIT_COMMIT}" ]] ; then
-	EGIT_REPO_URI="git://git.seabios.org/seabios.git"
-	inherit git-r3
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-
-	SRC_URI="
-		!binary? ( https://www.seabios.org/downloads/${P}.tar.gz )
-		binary? ( https://dev.gentoo.org/~tamiko/distfiles/${P}-bin.tar.xz )"
-fi
-
-DESCRIPTION="Open Source implementation of a 16-bit x86 BIOS"
-HOMEPAGE="https://www.seabios.org/"
-
-LICENSE="LGPL-3 GPL-3"
-SLOT="0"
-IUSE="+binary debug +seavgabios"
-
-REQUIRED_USE="debug? ( !binary )"
-
-SOURCE_DEPEND="
-	>=sys-power/iasl-20060912
-	${PYTHON_DEPS}"
-DEPEND="
-	!binary? (
-		${SOURCE_DEPEND}
-	)"
-RDEPEND=""
-
-choose_target_chost() {
-	if [[ -n "${CC}" ]]; then
-		${CC} -dumpmachine
-		return
-	fi
-
-	if use amd64 || use x86; then
-		# Use the native compiler
-		echo "${CHOST}"
-		return
-	fi
-
-	local i
-	for i in x86_64 i686 i586 i486 i386 ; do
-		i=${i}-pc-linux-gnu
-		type -P ${i}-gcc > /dev/null && echo ${i} && return
-	done
-}
-
-pkg_pretend() {
-	if ! use binary; then
-		ewarn "You have decided to compile your own SeaBIOS. This is not"
-		ewarn "supported by upstream unless you use their recommended"
-		ewarn "toolchain (which you are not)."
-		elog
-		ewarn "If you are intending to use this build with QEMU, realize"
-		ewarn "you will not receive any support if you have compiled your"
-		ewarn "own SeaBIOS. Virtual machines subtly fail based on changes"
-		ewarn "in SeaBIOS."
-		if [[ -z "$(choose_target_chost)" ]]; then
-			elog
-			eerror "Before you can compile ${PN}[-binary], you need to install a x86 cross-compiler"
-			eerror "Run the following commands:"
-			eerror "  emerge crossdev"
-			eerror "  crossdev --stable -t x86_64-pc-linux-gnu"
-			die "cross-compiler is needed"
-		fi
-	fi
-}
-
-pkg_setup() {
-	use binary || python-any-r1_pkg_setup
-}
-
-src_unpack() {
-	default
-
-	# This simplifies the logic between binary & source builds.
-	mkdir -p "${S}"
-}
-
-src_prepare() {
-	default
-
-	if ! use binary; then
-		eapply "${FILESDIR}"/${PN}-1.14.0-binutils-2.36.patch
-	fi
-
-	# Ensure precompiled iasl files are never used
-	find "${WORKDIR}" -name '*.hex' -delete || die
-}
-
-src_configure() {
-	use binary && return
-
-	tc-ld-disable-gold #438058
-
-	if use debug ; then
-		echo "CONFIG_DEBUG_LEVEL=8" >.config
-	fi
-	_emake config
-}
-
-_emake() {
-	LANG=C \
-	emake V=1 \
-		CPP="$(tc-getPROG CPP cpp)" \
-		CC="$(tc-getCC)" \
-		LD="$(tc-getLD)" \
-		AR="$(tc-getAR)" \
-		AS="$(tc-getAS)" \
-		OBJCOPY="$(tc-getOBJCOPY)" \
-		RANLIB="$(tc-getRANLIB)" \
-		OBJDUMP="$(tc-getOBJDUMP)" \
-		STRIP="$(tc-getSTRIP)" \
-		HOST_CC="$(tc-getBUILD_CC)" \
-		VERSION="Gentoo/${EGIT_COMMIT:-${PVR}}" \
-		"$@"
-}
-
-src_compile() {
-	use binary && return
-
-	local TARGET_CHOST=$(choose_target_chost)
-
-	cp "${FILESDIR}/seabios/config.seabios-256k" .config || die
-	_emake oldnoconfig
-	CHOST="${TARGET_CHOST}" _emake iasl
-	CHOST="${TARGET_CHOST}" _emake out/bios.bin
-	mv out/bios.bin ../bios-256k.bin || die
-
-	if use seavgabios ; then
-		local config t targets=(
-			cirrus
-			isavga
-			qxl
-			stdvga
-			virtio
-			vmware
-		)
-		for t in "${targets[@]}" ; do
-			_emake clean distclean
-			cp "${FILESDIR}/seavgabios/config.vga-${t}" .config || die
-			_emake oldnoconfig
-			CHOST="${TARGET_CHOST}" _emake out/vgabios.bin
-			cp out/vgabios.bin ../vgabios-${t}.bin || die
-		done
-	fi
-}
-
-src_install() {
-	insinto /usr/share/seabios
-	doins ../bios-256k.bin
-
-	if use seavgabios ; then
-		insinto /usr/share/seavgabios
-		doins ../vgabios*.bin
-	fi
-}
diff --git a/sys-firmware/seabios/seabios-1.14.0-r2.ebuild b/sys-firmware/seabios/seabios-1.14.0-r2.ebuild
index b9e722164d1c..20707bc4b7c0 100644
--- a/sys-firmware/seabios/seabios-1.14.0-r2.ebuild
+++ b/sys-firmware/seabios/seabios-1.14.0-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8,9,10,11} )
 
 inherit toolchain-funcs python-any-r1
 
diff --git a/sys-firmware/seabios/seabios-1.14.0.ebuild b/sys-firmware/seabios/seabios-1.14.0.ebuild
deleted file mode 100644
index 67cefdec6735..000000000000
--- a/sys-firmware/seabios/seabios-1.14.0.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit toolchain-funcs python-any-r1
-
-# SeaBIOS maintainers sometimes don't release stable tarballs or stable
-# binaries to generate the stable tarball the following is necessary:
-# git clone git://git.seabios.org/seabios.git && cd seabios
-# git archive --output seabios-${PV}.tar.gz --prefix seabios-${PV}/ rel-${PV}
-
-if [[ ${PV} == *9999* || -n "${EGIT_COMMIT}" ]] ; then
-	EGIT_REPO_URI="git://git.seabios.org/seabios.git"
-	inherit git-r3
-else
-	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sparc x86"
-
-	SRC_URI="
-		!binary? ( https://www.seabios.org/downloads/${P}.tar.gz )
-		binary? ( https://dev.gentoo.org/~tamiko/distfiles/${P}-bin.tar.xz )"
-fi
-
-DESCRIPTION="Open Source implementation of a 16-bit x86 BIOS"
-HOMEPAGE="https://www.seabios.org/"
-
-LICENSE="LGPL-3 GPL-3"
-SLOT="0"
-IUSE="+binary debug +seavgabios"
-
-REQUIRED_USE="debug? ( !binary )"
-
-SOURCE_DEPEND="
-	>=sys-power/iasl-20060912
-	${PYTHON_DEPS}"
-DEPEND="
-	!binary? (
-		${SOURCE_DEPEND}
-	)"
-RDEPEND=""
-
-choose_target_chost() {
-	if [[ -n "${CC}" ]]; then
-		${CC} -dumpmachine
-		return
-	fi
-
-	if use amd64 || use x86; then
-		# Use the native compiler
-		echo "${CHOST}"
-		return
-	fi
-
-	local i
-	for i in x86_64 i686 i586 i486 i386 ; do
-		i=${i}-pc-linux-gnu
-		type -P ${i}-gcc > /dev/null && echo ${i} && return
-	done
-}
-
-pkg_pretend() {
-	if ! use binary; then
-		ewarn "You have decided to compile your own SeaBIOS. This is not"
-		ewarn "supported by upstream unless you use their recommended"
-		ewarn "toolchain (which you are not)."
-		elog
-		ewarn "If you are intending to use this build with QEMU, realize"
-		ewarn "you will not receive any support if you have compiled your"
-		ewarn "own SeaBIOS. Virtual machines subtly fail based on changes"
-		ewarn "in SeaBIOS."
-		if [[ -z "$(choose_target_chost)" ]]; then
-			elog
-			eerror "Before you can compile ${PN}[-binary], you need to install a x86 cross-compiler"
-			eerror "Run the following commands:"
-			eerror "  emerge crossdev"
-			eerror "  crossdev --stable -t x86_64-pc-linux-gnu"
-			die "cross-compiler is needed"
-		fi
-	fi
-}
-
-pkg_setup() {
-	use binary || python-any-r1_pkg_setup
-}
-
-src_unpack() {
-	default
-
-	# This simplifies the logic between binary & source builds.
-	mkdir -p "${S}"
-}
-
-src_prepare() {
-	default
-
-	# Ensure precompiled iasl files are never used
-	find "${WORKDIR}" -name '*.hex' -delete || die
-}
-
-src_configure() {
-	use binary && return
-
-	tc-ld-disable-gold #438058
-
-	if use debug ; then
-		echo "CONFIG_DEBUG_LEVEL=8" >.config
-	fi
-	_emake config
-}
-
-_emake() {
-	LANG=C \
-	emake V=1 \
-		CC="$(tc-getCC)" \
-		LD="$(tc-getLD)" \
-		AR="$(tc-getAR)" \
-		AS="$(tc-getAS)" \
-		OBJCOPY="$(tc-getOBJCOPY)" \
-		RANLIB="$(tc-getRANLIB)" \
-		OBJDUMP="$(tc-getOBJDUMP)" \
-		HOST_CC="$(tc-getBUILD_CC)" \
-		VERSION="Gentoo/${EGIT_COMMIT:-${PVR}}" \
-		"$@"
-}
-
-src_compile() {
-	use binary && return
-
-	local TARGET_CHOST=$(choose_target_chost)
-
-	cp "${FILESDIR}/seabios/config.seabios-256k" .config || die
-	_emake oldnoconfig
-	CHOST="${TARGET_CHOST}" _emake iasl
-	CHOST="${TARGET_CHOST}" _emake out/bios.bin
-	mv out/bios.bin ../bios-256k.bin || die
-
-	if use seavgabios ; then
-		local config t targets=(
-			cirrus
-			isavga
-			qxl
-			stdvga
-			virtio
-			vmware
-		)
-		for t in "${targets[@]}" ; do
-			emake clean distclean
-			cp "${FILESDIR}/seavgabios/config.vga-${t}" .config || die
-			_emake oldnoconfig
-			CHOST="${TARGET_CHOST}" _emake out/vgabios.bin
-			cp out/vgabios.bin ../vgabios-${t}.bin || die
-		done
-	fi
-}
-
-src_install() {
-	insinto /usr/share/seabios
-	doins ../bios-256k.bin
-
-	if use seavgabios ; then
-		insinto /usr/share/seavgabios
-		doins ../vgabios*.bin
-	fi
-}
diff --git a/sys-firmware/seabios/seabios-1.16.0.ebuild b/sys-firmware/seabios/seabios-1.16.0.ebuild
index 4ba443b19f0b..b6dc35043258 100644
--- a/sys-firmware/seabios/seabios-1.16.0.ebuild
+++ b/sys-firmware/seabios/seabios-1.16.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8,9,10,11} )
 
 inherit toolchain-funcs python-any-r1
 
@@ -17,7 +17,7 @@ if [[ ${PV} == *9999* || -n "${EGIT_COMMIT}" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://www.seabios.org/downloads/${P}.tar.gz"
-	#KEYWORDS="~alpha ~amd64 ~arm64 ~loong ~m68k ~mips ~ppc ~ppc64 ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm64 ~loong ~m68k ~mips ~ppc ~ppc64 ~x86"
 fi
 
 DESCRIPTION="Open Source implementation of a 16-bit x86 BIOS"
diff --git a/sys-process/Manifest.gz b/sys-process/Manifest.gz
index af71c28415e1..21ad3ec24bf2 100644
--- a/sys-process/Manifest.gz
+++ b/sys-process/Manifest.gz
diff --git a/sys-process/psinfo/Manifest b/sys-process/psinfo/Manifest
index 4b5379569515..ad93bd3ca827 100644
--- a/sys-process/psinfo/Manifest
+++ b/sys-process/psinfo/Manifest
@@ -2,5 +2,5 @@ AUX psinfo-0.12-asneeded.patch 1173 BLAKE2B 0b6b2aefa4e669c7775959191008819426ba
 AUX psinfo-0.12-char.patch 1957 BLAKE2B ffc4f74e36bfdceddbae5805465761f1b9d87fb1ab79f9fb9e213c4e250df6818f1deebd02b54c3231c2598d1376a19b33df7e606498377428a819e79a7fda5f SHA512 169837c96466579da3619f86ca4888dd74b587c9ed4362fa0a3c425040788a1e2ec08cdada8fe415266cce10cc86aa0cc277777e5f83895e5d8e63fb82d46d25
 DIST psinfo-0.12.tar.gz 9107 BLAKE2B d6e9d2c32ca9299220677fd1e2cb80259ee6163c953186346c0450d16cf6622875eb03a89dca945c863ad15d62ab39b0c0d65b06b819e4bdb4d835449908bb8d SHA512 481743c9b8112fa34779bcdeb12d84a1445a4e4c105161d9a9927fe920e5c4f190dc3e03cb65d9978538cb3d4102983af7e290d31c809a1efa0f6c871064c62f
 EBUILD psinfo-0.12-r1.ebuild 486 BLAKE2B fe2ec2c5bf959d576cc99471428d02e6e5815145ea94788678ab54ecdc751016f1b24a4ea506faa0319171d80721c9df43d1cb0e1c33ad105aab0400489f0480 SHA512 6202a6412b3392fed2ce33a4f0a1ad4bc5bb9e964e1d49d220986d9350a8cc7ee54c7c3f826d22e1c4be031207341514486d0636e9755435daa32b6e2398451a
-EBUILD psinfo-0.12-r2.ebuild 517 BLAKE2B b6d3f819d54e0817d4f5bbc174de936d420f51f7952e63806df1eea984548a419a134a4828c8eeb3cbbee664683f39719a7ce869d133ef221e06ebfce9c13159 SHA512 15ace75199fb3284035792b991a290ca8479f45efa1dd300d9e9b0f97ca07f9eba5c516c3832a54c8e7e282ba014aed4bf5c20ab2db46f377ed82cdcc71ecad0
+EBUILD psinfo-0.12-r2.ebuild 524 BLAKE2B e0d0b41cdf6d21e4e0272ff71af9a3132771ecb20e9a0714c4fcfe3909b590f8640b3b91dc3387d51d9db9261880c62ca99020d89239886c1d601560751dce05 SHA512 3cd292e4417656a7f84104d5da945c39a0d971fea2a2c47813753bf46834cefebb7c2307a640074d1c49f32e707f61627733f999ea148df71ad4d0bf2087694d
 MISC metadata.xml 262 BLAKE2B e27072dd98b7f5498daae1489ac8968231cfcfcb9f31ecf6097d268e188671b31bc4e508ab805667fdd439bc494038b63cef837afb48ecbea728931c13cbdcdb SHA512 8c217c8865ab5bebf8ce56edd243300895e206a29a717abb8d7a479b3021cb46a053fdb1ad235802b7a03cb124df70ec8806f3336c2e56d8844698f7bad22ee9
diff --git a/sys-process/psinfo/psinfo-0.12-r2.ebuild b/sys-process/psinfo/psinfo-0.12-r2.ebuild
index fdf62188a826..84c516c8dbf8 100644
--- a/sys-process/psinfo/psinfo-0.12-r2.ebuild
+++ b/sys-process/psinfo/psinfo-0.12-r2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.ward.nu/computer/psinfo/"
 SRC_URI="http://www.ward.nu/computer/${PN}/${P}.tar.gz"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 LICENSE="GPL-2"
 
 PATCHES=(
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index c96963be2e97..03946155599e 100644
--- a/www-client/Manifest.gz
+++ b/www-client/Manifest.gz
diff --git a/www-client/chromium-bin/Manifest b/www-client/chromium-bin/Manifest
index 365f3e090735..1e69f84c658f 100644
--- a/www-client/chromium-bin/Manifest
+++ b/www-client/chromium-bin/Manifest
@@ -14,5 +14,17 @@ DIST chromium-bin-105.0.5195.125-1-wayland-x86_64.tar.xz 84310036 BLAKE2B e1f283
 DIST chromium-bin-105.0.5195.125-1-x11-aarch64.tar.xz 82483584 BLAKE2B 1cafd3ce23bdf59d1bbd2771efd4d637ce5194e03b43bc66b2570db2ef2e59d9c063186363395b8c930136bcfc90d3047b26b68e0eb6977fdd2f87dce9ce09b5 SHA512 ac655790242cf6b465bf99706094a8421772154c58cd35e275d26c86b807b4fffc5f4eb4dea0d7c2bee7d6e26654f5b4c79caf5f10a81e7679af6759726327c5
 DIST chromium-bin-105.0.5195.125-1-x11-i686.tar.xz 84796860 BLAKE2B 0043e98ba4a1e9b0f019275d3d66c90eb652cdd223584dea5939b160bf108c7c44341a228c8a487f77637545907933d41d8d92995a968229c4b7c6eaf76cebd0 SHA512 2090e4f044d1c23aac5ccff4e947e153b4c614d1f0ffd0329fd9d83e5a964c31f3c9646f3a939754474e7137e327f10d785bbe8ada7e6f2dfe8de1437a0a973f
 DIST chromium-bin-105.0.5195.125-1-x11-x86_64.tar.xz 84129140 BLAKE2B 26cf5879c932b8d6c123ec500d25febc86e4e2ef3e84224116d3f99b3c70016f8621bea09df64525695ce4eaaf393612c3e02a32110d8be76536ccda0641a10f SHA512 0b0d45bd3a3801c47e1c207ef321ba61e5b0cc6f28f812b1f5544d5943209e35a7ebcf15feaded144946fff9d0931926f66ffee61c8783b7e6f1b7e5b9fb2128
+DIST chromium-bin-106.0.5249.61-1-common-aarch64.tar.xz 3205652 BLAKE2B 7abbfdb83bd78c343eee829ecbbf2d1f654d2a91fc3bd3899cb37e5f563d05f1d74b2a8682fbe42d0eab5ea1612302eeb0baca0ea81db29b760e4cbca4f3975e SHA512 80b9dd6834a5d96805a4d5fbc8af3e55dffbc51b593157d586444ae12a928eab2d092cc596ca3ad468d651f588e2819f93adfcf4aeaa3f3f34775296b51973d5
+DIST chromium-bin-106.0.5249.61-1-common-i686.tar.xz 3217744 BLAKE2B b3e7944f7e2294824f1b3d04b383adef58c6f37792e2b00ae4c7eaade4cf43cf2170ffcb409a466d5c5b461597659cff5b60c7e2c0df5c988f05e59054d7e5a8 SHA512 6eea3dbdc38e3e8500bd2b6b1b790df65e621904aa621102772c75c697212864f463a336591c3d087429229af619a5671d622776ae44788d97e29ba5f960ec1d
+DIST chromium-bin-106.0.5249.61-1-common-x86_64.tar.xz 3269596 BLAKE2B c37bddc9a28d3b3801dce22b53a32f207a7c3b8afa3979c183a2451e1cf95ef86ce4c1456f4f92e32a0999fa551507c9dce989faaad3d200340575a580fa3f78 SHA512 0526b19755685ffec3c09e3532f8fee19b46c6625ee154234a3e325e7145f3213b78856991f6837f2cbd63c6ab0c17d3b9a75e479f459320128e8a6c4a49c022
+DIST chromium-bin-106.0.5249.61-1-common.tar.xz 4467896 BLAKE2B e45a541dfabec6a60f72f51c6ae6cb069a233762b32e3bc12b1f615de4dd074a93ab952dc7ad05945e21272e4adca90ef7a6f81eaba9d58a7346cb9170348aaa SHA512 85941d889961423d84be7dd40a935442b14f0c5d8f53c4b947673e5ff3c4ae7efdfdf1525497f0911d2c8e76ce0dba072d2c8f56dbb6d1cc07e1952a93dca9b2
+DIST chromium-bin-106.0.5249.61-1-l10n.tar.xz 5133924 BLAKE2B dbd9936cef91b2ec949c9141af93d33515d84b27b64a796599a61d32994ecb8019fc4d990482a4b64f175a97e39e6c21c991321789c31853db1daa918a13cadb SHA512 9c314eb65a9340dfb809346b5d012cc4d25adb9de88058b0532e265ab7a345e2d78f07c0c6e37b6ea684079ac027f3b85d5f46914d0d8dd2519e2f6fa2fd9f59
+DIST chromium-bin-106.0.5249.61-1-wayland-aarch64.tar.xz 83423748 BLAKE2B 8a0e954a929f5922eba1af8199d154e67a52a46f83bec7a2aeb1087e54fb67a1faa16411af4298183a7e26657bae612378818934e6601dfff6cd424591fcac67 SHA512 66541afef8d4009e7f9d300bc586026986cea5dbb2e74a08291f2d93913734d649ad73a04d7ec69f37bbe8e70b2e97c9ce4b25781468ff1205e1a1c5c563a4c4
+DIST chromium-bin-106.0.5249.61-1-wayland-i686.tar.xz 85526252 BLAKE2B 30ec85f9f2767078c7aa5aaf6dcd118a08f34510d3478b5b8399d9a848f58f0f39790fdd240d183d382ad69c802e5fe32e89a4950d64a24080cb93f1648301d6 SHA512 18311392584361575d7e0fb2348f26c442a88eccbceef7df5122e02425100e9d5a64c62f62e6e0c060f31fdaec919eccf37144282fbd91f0512d3d07beb246ac
+DIST chromium-bin-106.0.5249.61-1-wayland-x86_64.tar.xz 85306772 BLAKE2B 6a79ad336222150bad0c7a354b8d80a061c720612c306e58501aac7c50a6324307a87871ca6e598998dd0ef315b3f7bc9f459ea1b092baebe990e892e21303b9 SHA512 570fe9166b30c1b20c443e892e1b91bffc0c9d7d463134ab4b32d9ec9465d026ae3cfa0d52d9af14a3e79172533c57b967cb6ca553542c127f8f1a2775811615
+DIST chromium-bin-106.0.5249.61-1-x11-aarch64.tar.xz 83195888 BLAKE2B b24605f987fa1f0aee8d7857237a8810cbf382ffd12652517373b08fed81f245bf9399065ddbe4175ee4ba29a38ce4a4b9c2683771b99530594c71e28561e46f SHA512 1d43249499287207a256b605fa0ca04ca6ec3274c3ff6e44c3c5acd95191f2e69cba8a4be2913ad80b7f482e69d01641d93a98835195183653db859a70aa1479
+DIST chromium-bin-106.0.5249.61-1-x11-i686.tar.xz 85299124 BLAKE2B 31683561e0d40d6a039755e62fd73e0fa1b8ec85c8343963517359db26802f024890c3a0003a8b0defabd196fd4f9002501e5266804e72a9c1e24f77880e782a SHA512 beede9c2bcb49e3c7a2e05d5f89ea3f5d27c90f9b34f1f5145172662f12be1cbbbe0d1d15b41e2f4126be180d2345c7ea53cf7063ad52432923ca68d68f84a06
+DIST chromium-bin-106.0.5249.61-1-x11-x86_64.tar.xz 85046604 BLAKE2B 6e7e9ef9d48ce57c12759449246ffa9ed69645a5df2de217e1e0797f966903e38d9d9868892341a71193cd04be3caa24d13d4c2188384e714d2afc30f4523d61 SHA512 212f11fe6b96fb6385313aff7c6a15d4346637a2def7bd17d4e91fa615658691da4159d2c88675494ef0c87c066dc6f82cbc0291b3191853c2699a9d20d55ee0
 EBUILD chromium-bin-105.0.5195.125.ebuild 7252 BLAKE2B 819ce87971d365c4d9e57acb45d373e4597c9aaf6fbfd4f62c2e40ba05d13a3da2fa2ea7e1e5220a1ad268ff5ced9c3a0c02ac6bb1a3724c34933680a4792ee1 SHA512 565ff1664d2ecadd11e4e86492920897fa6d22f1a70c9a88b1ec408a52727f853cfec88cd12d259a42bf7025c2967c0f1d475779fc4aae58e1aa12cbcd4341f4
+EBUILD chromium-bin-106.0.5249.61.ebuild 7253 BLAKE2B 5b7d2f9fe6aece71bc2637b8ad1b1f31fbe794e33d828ec20688431200b0827f55ff2819a1bff81b0850ef6a80e9100006af51ba0580ee7ed44a964e3e2306ec SHA512 6b521747be450ab93d41275e322edd5959b574033b7a366f93875dc24ab3738d1b0cfc45682d13ddd7bd754707308e3854552119e0a9e280d1d8eeb8bf3ec62a
 MISC metadata.xml 480 BLAKE2B 29b9f565ea38e89bb5559aa99c540e02b77db24046bbe3407d36440d95a7f0850261b08fb243095f4ffb00bb14d72dcb235786dd19040bbe1a2808fef4bdc662 SHA512 980ebd9f5ba50970f73c2cca4e0fc01df5e6003319d63be37dbd063b127786de2ed36a12c97281bb5208a04c52594f7578fdcbf00ea5b49a63995ba55e7e7127
diff --git a/www-client/chromium-bin/chromium-bin-106.0.5249.61.ebuild b/www-client/chromium-bin/chromium-bin-106.0.5249.61.ebuild
new file mode 100644
index 000000000000..475b7ec48b04
--- /dev/null
+++ b/www-client/chromium-bin/chromium-bin-106.0.5249.61.ebuild
@@ -0,0 +1,241 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CHROMIUM_LANGS="af am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
+	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
+	sv sw ta te th tr uk ur vi zh-CN zh-TW"
+
+inherit chromium-2 desktop pax-utils readme.gentoo-r1 unpacker xdg-utils
+
+DESCRIPTION="Open-source version of Google Chrome web browser"
+HOMEPAGE="https://chromium.org/"
+
+MY_P=${P}-1
+
+SRC_URI="https://dev.gentoo.org/~sultan/distfiles/www-client/chromium-bin/${MY_P}-common.tar.xz
+	https://dev.gentoo.org/~sultan/distfiles/www-client/chromium-bin/${MY_P}-l10n.tar.xz
+	amd64? (
+		https://dev.gentoo.org/~sultan/distfiles/www-client/chromium-bin/${MY_P}-common-x86_64.tar.xz
+		wayland? ( https://dev.gentoo.org/~sultan/distfiles/www-client/chromium-bin/${MY_P}-wayland-x86_64.tar.xz )
+		!wayland? ( https://dev.gentoo.org/~sultan/distfiles/www-client/chromium-bin/${MY_P}-x11-x86_64.tar.xz )
+	)
+	arm64? (
+		https://dev.gentoo.org/~sultan/distfiles/www-client/chromium-bin/${MY_P}-common-aarch64.tar.xz
+		wayland? ( https://dev.gentoo.org/~sultan/distfiles/www-client/chromium-bin/${MY_P}-wayland-aarch64.tar.xz )
+		!wayland? ( https://dev.gentoo.org/~sultan/distfiles/www-client/chromium-bin/${MY_P}-x11-aarch64.tar.xz )
+	)
+	x86? (
+		https://dev.gentoo.org/~sultan/distfiles/www-client/chromium-bin/${MY_P}-common-i686.tar.xz
+		wayland? ( https://dev.gentoo.org/~sultan/distfiles/www-client/chromium-bin/${MY_P}-wayland-i686.tar.xz )
+		!wayland? ( https://dev.gentoo.org/~sultan/distfiles/www-client/chromium-bin/${MY_P}-x11-i686.tar.xz )
+	)"
+
+LICENSE="BSD"
+SLOT="0"
+#KEYWORDS="-* ~amd64 ~arm64 ~x86"
+IUSE="cpu_flags_x86_sse2 suid wayland widevine"
+
+RDEPEND="
+	app-accessibility/at-spi2-atk:2
+	app-accessibility/at-spi2-core:2
+	dev-libs/atk
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/libxml2[icu]
+	dev-libs/libxslt
+	dev-libs/nspr
+	>=dev-libs/nss-3.26
+	media-libs/alsa-lib
+	|| (
+		media-libs/flac:0/0
+		media-libs/flac-compat:8.3.0
+	)
+	media-libs/fontconfig
+	>=media-libs/freetype-2.11.0-r1
+	media-libs/libjpeg-turbo
+	media-libs/libwebp
+	media-libs/mesa[gbm(+)]
+	media-libs/openh264:0/6.1
+	net-misc/curl[ssl]
+	net-print/cups
+	sys-apps/dbus
+	sys-apps/pciutils
+	>=sys-devel/gcc-9.3.0
+	>=sys-libs/glibc-2.32
+	sys-libs/zlib[minizip]
+	virtual/ttf-fonts
+	virtual/udev
+	x11-libs/cairo
+	x11-libs/libdrm
+	x11-libs/gdk-pixbuf:2
+	|| (
+		x11-libs/gtk+:3[X,wayland?]
+		gui-libs/gtk:4[X,wayland?]
+	)
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXrandr
+	x11-libs/libXtst
+	x11-libs/libxcb
+	x11-libs/libxkbcommon
+	x11-libs/libxshmfence
+	x11-libs/pango
+	x11-misc/xdg-utils
+	amd64? (
+		widevine? ( www-plugins/chrome-binary-plugins )
+	)
+	wayland? ( dev-libs/wayland )
+"
+
+S=${WORKDIR}
+QA_PREBUILT="*"
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="
+Some web pages may require additional fonts to display properly.
+Try installing some of the following packages if some characters
+are not displayed properly:
+- media-fonts/arphicfonts
+- media-fonts/droid
+- media-fonts/ipamonafont
+- media-fonts/noto
+- media-fonts/ja-ipafonts
+- media-fonts/takao-fonts
+- media-fonts/wqy-microhei
+- media-fonts/wqy-zenhei
+
+To fix broken icons on the Downloads page, you should install an icon
+theme that covers the appropriate MIME types, and configure this as your
+GTK+ icon theme.
+
+For native file dialogs in KDE, install kde-apps/kdialog.
+
+To make password storage work with your desktop environment you may
+have install one of the supported credentials management applications:
+- app-crypt/libsecret (GNOME)
+- kde-frameworks/kwallet (KDE)
+If you have one of above packages installed, but don't want to use
+them in Chromium, then add --password-store=basic to CHROMIUM_BIN_FLAGS
+in /etc/chromium-bin/default.
+"
+
+pkg_pretend() {
+	if use amd64 || use x86; then
+		if ! use cpu_flags_x86_sse2; then
+			eerror "This package requires a CPU supporting the SSE2 instruction set."
+			die "SSE2 support missing"
+		fi
+	fi
+}
+
+pkg_setup() {
+	chromium_suid_sandbox_check_kernel_config
+
+	if ! use amd64 && use widevine; then
+		ewarn "Widevine CDM plugin is not available for your architecture."
+	fi
+}
+
+src_unpack() {
+	:
+}
+
+src_install() {
+	dodir /
+	cd "${ED}" || die
+	unpacker
+
+	local CHROMIUM_BIN_HOME="opt/chromium-bin"
+
+	if ! use suid; then
+		rm "${CHROMIUM_BIN_HOME}/chrome-sandbox" || die
+	fi
+
+	# Clean unneeded languages
+	pushd "${CHROMIUM_BIN_HOME}/locales" > /dev/null || die
+	chromium_remove_language_paks
+	popd > /dev/null || die
+
+	# Install icons
+	local size
+	for size in 16 24 32 48 64 128 256 ; do
+		newicon -s ${size} "${CHROMIUM_BIN_HOME}/icons/hicolor/${size}x${size}/apps/chromium-browser.png" ${PN}-browser.png
+	done
+	rm -r "${CHROMIUM_BIN_HOME}/icons"
+
+	# Allow users to override command-line options, bug #357629.
+	insinto /etc/chromium-bin
+	newins "${FILESDIR}/chromium-bin.default" "default"
+
+	# Install desktop entry
+	domenu "${FILESDIR}/chromium-bin-browser-chromium.desktop"
+
+	# Install GNOME default application entry (bug #303100).
+	insinto /usr/share/gnome-control-center/default-apps
+	newins "${FILESDIR}/chromium-bin-browser.xml" chromium-bin-browser.xml
+
+	# Install manpage; bug #684550
+	doman "${FILESDIR}/chromium-bin-browser.1"
+	dosym chromium-bin-browser.1 /usr/share/man/man1/chromium-bin.1
+
+	pax-mark m "${CHROMIUM_BIN_HOME}/chrome"
+
+	# Symlink Widevine CDM
+	if use widevine; then
+		dosym "../../usr/$(get_libdir)/chromium-browser/WidevineCdm" "${CHROMIUM_BIN_HOME}/WidevineCdm"
+	fi
+
+	# Install launcher
+	exeinto "${CHROMIUM_BIN_HOME}"
+	doexe "${FILESDIR}/chromium-bin-launcher.sh"
+
+	# It is important that we name the target "chromium-bin-browser",
+	# xdg-utils expect it; bug #355517.
+	dosym "../../${CHROMIUM_BIN_HOME}/chromium-bin-launcher.sh" /usr/bin/chromium-bin-browser
+	# keep the old symlink around for consistency
+	dosym "../../${CHROMIUM_BIN_HOME}/chromium-bin-launcher.sh" /usr/bin/chromium-bin
+
+	dosym "../../${CHROMIUM_BIN_HOME}/chromedriver" /usr/bin/chromedriver-bin
+
+	readme.gentoo_create_doc
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+	readme.gentoo_print_elog
+
+	elog "For VA-API support you need to install x11-libs/libva with"
+	elog "USE=X enabled."
+	elog
+	elog "VA-API is disabled by default at runtime. You have to enable it"
+	elog "by adding --enable-features=VaapiVideoDecoder to CHROMIUM_BIN_FLAGS"
+	elog "in /etc/chromium-bin/default."
+
+	if use wayland; then
+		elog
+		elog "For screencast support you need to install media-video/pipewire."
+		elog
+		elog "Screencast is disabled by default at runtime. Either enable it"
+		elog "by navigating to chrome://flags/#enable-webrtc-pipewire-capturer"
+		elog "inside Chromium or add --enable-features=WebRTCPipeWireCapturer"
+		elog "to CHROMIUM_BIN_FLAGS in /etc/chromium-bin/default."
+	fi
+
+	elog
+	elog "chromium-bin profile defaults to \${HOME}/.config/chromium-bin."
+	elog "Some extensions (e.g. KeepassXC) expect default chromium profile"
+	elog "at \${HOME}/.config/chromium. You can overwrite this by adding"
+	elog "--user-data-dir=\${HOME}/.config/chromium to CHROMIUM_BIN_FLAGS"
+	elog "in /etc/chromium-bin/default."
+}
diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index a9cf3ef10106..7c2e46610b23 100644
--- a/www-servers/Manifest.gz
+++ b/www-servers/Manifest.gz
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 357dea583535..a53236116ee7 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -1,5 +1,6 @@
 AUX tomcat-10.0.16-build.xml-strip-html5.patch 1201 BLAKE2B 57df5e44b741bc3c981312ce48330d0f43353f3ca010870c5f4a43539c120178147371129a66baa6d3a16da31328d21e0653060aa5cd4647b5935a05349d20e9 SHA512 38e194748ffae04be81624fe3dd5175acc1d0f62d07f9762e0831c5e840180c947492d03bde9722271690f6c94b5805992a5f7513520968bfdc037e33f9ba455
 AUX tomcat-10.0.20-build.xml.patch 13813 BLAKE2B 2c6b1376751a768910b38de8bf4cd0e68f71e6215186f1efbfdd06e4a83e63faf8c124e7413f33f91eea50c8c35624f7cc0e43081c1ecdb18935bec6bae0f1e2 SHA512 43312b1fe6c25ff9144a20feba1871762abd6469d02cc7c92a649ffd738ce64fe3a2882d8129b6d0e1f8a69a73ba726001d6053873553cde25234701cd14e895
+AUX tomcat-10.1.0-build.xml.patch 13790 BLAKE2B f84bfdd9da38d738cc8fbd91bc4bf29b76feb82bb7b562e90aa9fbaa55009e482260c39958210912c0fa9936b29e7a479951765d99f49c8d70fe2190aa50cabe SHA512 c30fba95c36190dd1d0b61497536c5b8880c3e2ef629e697509c343a34be24a4848d84279ad9881196752b40d5d9b1d496840ffc317f4f9e668290f52ebc48a8
 AUX tomcat-8.5.66-build.xml.patch 10850 BLAKE2B 69353bcf5697e6ae0b930c71fbb870401e822340f0eb0b8a6283e0d8cd1388d1d22a12190d089f7001a06e2491bb2309aab8c93b8f2a79e8439571fed8d0aebb SHA512 498c2ac8ab49cd83151ddfc6b47bd3a7a7148096e331ae55c7fe3da90007c19387208de64f5b3e796ec54b4b8534b11f906940fcf49343157acc862fcf06f5c7
 AUX tomcat-9.0.37-fix-build-rewrite.patch 513 BLAKE2B e806ca32771bcad0fbc2f1b3f223af2b17d2caffe6ed034783294650d4ec22c8d9d9d215ade85569f6627508c61b7d469412d582093708b6bb728d6123d65155 SHA512 7aab16d1b52fa88352df849ca051dcaf27f645b1b3edd3df3a7d87385b5068d300105f89c18ba3a0f65818739b85ec847ddd5b28b8b655efbb7b39036099cae2
 AUX tomcat-9.0.50-insufficient-ecj.patch 2890 BLAKE2B 586fed374f9da437d441d59272faaadf898b684375edd999f7ea50c81a5fe1ffe98e89037ee64997e583fa835f32598a7b16f0595be75fbf947264d84eea4379 SHA512 3d31beab19f79b8bd477d06e2b0ff7575e8c5cfb6c056da6fb1c19e2a1efebe9151c9b698baa1e4168006a9c28974eb49924bf52c89795ba227111d678e38439
@@ -8,11 +9,17 @@ 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.23-src.tar.gz 6136614 BLAKE2B 4eaf963187b9a754ed459d7f85e6f7d329927b949bb4a390a602cdc6651aa037aeec559c511ddb9880b6ec4d7cd97b96d82da341509370e412e1b21b799d8c2e SHA512 19ec026bae75318e9ffbe2e619ad2e12ec116382ea88a1064696275afb3fd13e6f08efe497dde79689bfc828f76e27d114ad3a9284b79c8d956a6a85bdac6360
+DIST apache-tomcat-10.1.0-src.tar.gz 6060833 BLAKE2B 49f36131c1e809b298ac915e671b9f4df55b55c2ba34d21ee3fdeb8759ddaf53a6780b177e8049446079d91186c52669969f30762ddf776d9f8615e527d5a975 SHA512 08323eec0403473fa97f419d7911980c3dfe7b1607a64741bbe972a737dfa70ea04ea80ca9ab28bf72bdde9d24cf8f7161eeb8b194204c777d1628d00c78611c
 DIST apache-tomcat-8.5.82-src.tar.gz 6011553 BLAKE2B ea34c0485877ace8c84144f0e75f370c0ac461b5b725d97a07e27014b7a14b1ab88fad4230d4fae60190d7bff3836f691615b57b9f085797477acc69560a57ce SHA512 3e0a0a808fb78493930ce8832731eba4ab3cc440387c3b5226ff6e4ac2faf5fd70eff1560d840d34f14a8acfd7e60fc8b7f638f3dbe0c0ed4569dc4271a9c3f2
 DIST apache-tomcat-9.0.65-src.tar.gz 6195265 BLAKE2B 13ca956b58e9f1831700f67d1fa8883f6471ab6b700b2af169bf284552658a4e9ad4130451b36976af4dd366cc987e228e0b0f98e688cccf577c626dfc78aae7 SHA512 3ff344370cc36f5bed389ed198054783a4f5bc86476a751cda280618457a06bae38c1e764b0c110c2f68efe2d34243a4e24596e8b90e8fbd171bf584a22fd3bc
+DIST apache-tomcat-9.0.67-src.tar.gz 6211392 BLAKE2B 273b921ce580be6fb76d8567e5b0aec01b936518875f8470c1cee4b159519f723e606680d9986f61fbbab79cea2d027195f3debe9af59dfac786b0d0566d7c02 SHA512 33319d70c50fde71d163f66dc388ed2d5855aa4f087f7e2259adc27cc7ed30ace079d81e52def43a904c88ac670bb0c71667938b931a214470d77679108914cc
 DIST biz.aQute.bnd-6.2.0.jar 16669843 BLAKE2B 290aec26cb4e2248488038e6cb0919728ca0cc802b16de3f390d549d135bc1177053b75e500b9f74e47c996d20b231404d57965a3f412662730cc4c938d90a4f SHA512 ad51dc9a04fc117cd01b604559989dd7c7db776761ef6000eccdcfdab825dedc615297af60c778044e46867972a74840d90eebea9b0ff826bdbd10f4d2ec5d6f
+DIST biz.aQute.bnd-6.3.1.jar 16703723 BLAKE2B 97cc171a926be326abe95695e795ccb575bc6ca770b4c4df7764bdedbd6dfcf5643673484f50cc34f845f27d03ddf8a971c1c502b3b63db2541266c2b35e8e23 SHA512 59d3a50575ea8fcfc5f5c2178f7d40248c987c77ae8afeb0a8c9ec397ce9e4ceae277ba3b26dafc245bd2185bbafeaef219dd1af0988921631b6a8fe0cbd0abf
 DIST biz.aQute.bndlib-6.2.0.jar 3156015 BLAKE2B 922b9bc78e47968bad73a26f4df475d84d8a2bca3773473b1f8c147737e652728df4e90a49d09a20943f418a91fd5acfe18e51137e85850796d95b7415bcf684 SHA512 7b7b366467b71c6dd67b3d7a7bc63d476c4aca479153bbc1506435168b0b4c792152fb5b44e2b1f916cd67f482d15956d2c38182fdfaf9679dff65b1b109a16a
+DIST biz.aQute.bndlib-6.3.1.jar 3183076 BLAKE2B 73bef88e8f3c8015d259ac36b953672ed9cb0aa5d9dfca3361033a7f37646bb65bbea8be4ef1fb425518e85ec8a9cc63032815671ece5f956b754ecf555dc174 SHA512 7c3f7bc0280beb1b15182c558ef23f431719c046da8473545efe9aeec935776ebf6682cabbb7e7f53dcf2ccca168d8df35859be77121dab04340a5ec7e993608
 EBUILD tomcat-10.0.23.ebuild 6258 BLAKE2B 438a3004bf5f4206f8aee6b0267f9597e56981ad4a698f181e135df2cc3576f7e695be10815fce7a15207646e991ecfcfc69de13ce8325cb285e0eb75cce38d8 SHA512 d5c7815169e200036d326f8b2901342a00fe88992409eb53c956393640f791bf4e5f8030bf0389d36be9fc04ae5c2a9a3c6a22e7bca4cad2a6b080d127f0f3a7
+EBUILD tomcat-10.1.0.ebuild 5926 BLAKE2B 48b81bb89e5444506e8fe1c81bd7d3da502225bc6749e098e246f7fc6533c59cf10f6f2c75d1fcd1d79ea38b1c9341c003459bc2b744de3a67e8fbe36a979e2f SHA512 e8c817b480f93809ad6d8e2585cd3eed9035ef83e81595ab6f063db7776d2b67e8f740fd2c9be54640f3bc5ce3e08b3b87693e7b1a5c0f7115c5061c8ef1b05e
 EBUILD tomcat-8.5.82.ebuild 4749 BLAKE2B 07355b40016620c842b4b582ea11ca987bc04b4b89c65ed6228d0d94a37518d5cfe0da98589cec5985aa6d62fa701f9932c1bde8683734c1985bea6f7f181656 SHA512 2c5edb87d504df16582030f7340df7a27f845b12c95f0b342aaf5a2c88fae025ec1c8582d18312d9cf1d15cb8a0973e7f2763986690a3c3b59223832ea368cfe
 EBUILD tomcat-9.0.65.ebuild 5822 BLAKE2B 9ec1e8f21e7a6b07adf51e10dec445291e86260d33b2c014848c301e1593becc7a32a73c25c60ee19570c2ec8b6ead7005f9052b3b2e503b80d38e88e03baa73 SHA512 f5de64b7838ebeff771bb1c8f6aa3ddc0ad1a929faee65aa483ef79ae8aaecf6056b633f1ae0e4f169f09422b55b9053aefaa2caab94ab2d359a932e3d49dd16
+EBUILD tomcat-9.0.67.ebuild 5823 BLAKE2B 4cb40dde75f3a89d20cd2fbf069862a0cb733499e871d4d72808424d041cfdf6e03e2226f713af663f9a56069c66874079781d72619c92fd53fe367b6b07e644 SHA512 882546993468a1743de5c3cc289fdd9da57d3b95fb8bbb5184215cd7b53f8454e3a2c49a8f765514da1545d80ee14709eead03cd919fa0b056212e80de3c0901
 MISC metadata.xml 621 BLAKE2B 5565658450eaf5d63d832ed5f771084532243318f93e66a6241acd067cba1262cd957f8450e5aacdb68dc30933d889889cbceeb8b630b6bb8e8e39e8b95688c8 SHA512 89273106acd986ea2ac909f858ebcd538e42364b1d4a756b3550a805d3477f731db796307acb3db7376b33e199bd714c03bb1201578e97541f45f3100e7480f9
diff --git a/www-servers/tomcat/files/tomcat-10.1.0-build.xml.patch b/www-servers/tomcat/files/tomcat-10.1.0-build.xml.patch
new file mode 100644
index 000000000000..da51f82d9bd7
--- /dev/null
+++ b/www-servers/tomcat/files/tomcat-10.1.0-build.xml.patch
@@ -0,0 +1,347 @@
+diff --git a/build.xml b/build.xml
+index bdd0801..28319a5 100644
+--- a/build.xml
++++ b/build.xml
+@@ -1046,6 +1046,7 @@
+       addOSGi="true" />
+ 
+     <!-- Servlet Implementation JAR File -->
++<!--
+     <jarIt jarfile="${servlet-api.jar}"
+       filesDir="${tomcat.classes}"
+       filesId="files.servlet-api"
+@@ -1053,21 +1054,23 @@
+       notice="${tomcat.manifests}/servlet-api.jar.notice"
+       license="${tomcat.manifests}/servlet-api.jar.license"
+       addOSGi="true" />
+-
++-->
+     <!-- EL Implementation JAR File -->
++<!--
+     <jarIt jarfile="${el-api.jar}"
+       filesDir="${tomcat.classes}"
+       filesId="files.el-api"
+       manifest="${tomcat.manifests}/el-api.jar.manifest"
+       addOSGi="true" />
+-
++-->
+     <!-- JSP Implementation JAR File -->
++<!--
+     <jarIt jarfile="${jsp-api.jar}"
+       filesDir="${tomcat.classes}"
+       filesId="files.jsp-api"
+       manifest="${tomcat.manifests}/jsp-api.jar.manifest"
+       addOSGi="true" />
+-
++-->
+     <!-- WebSocket API JAR File -->
+     <jarIt jarfile="${websocket-api.jar}"
+       filesDir="${tomcat.classes}"
+@@ -1187,10 +1190,10 @@
+       addOSGi="true" />
+ 
+     <!-- Re-packaged Apache Commons DBCP 2-->
+-    <jarIt jarfile="${tomcat-dbcp.jar}"
++<!--    <jarIt jarfile="${tomcat-dbcp.jar}"
+       filesDir="${tomcat.classes}"
+       filesId="files.tomcat-dbcp"
+-      addOSGi="true" />
++      addOSGi="true" /> -->
+ 
+     <!-- i18n JARs -->
+     <jar jarfile="${tomcat.build}/lib/tomcat-i18n-cs.jar"
+@@ -1427,9 +1430,9 @@
+ 
+   <target name="deploy" depends="package,build-docs,build-tomcat-jdbc,compile-webapp-examples"
+           description="Default. Builds a working Tomcat instance">
+-
++<!--
+     <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" />
+-
++-->
+     <!-- Copy scripts -->
+     <copy todir="${tomcat.build}/bin">
+       <fileset dir="bin">
+@@ -1489,7 +1492,7 @@
+         <exclude name="${jdt.jar.filename}"/>
+       </fileset>
+     </delete>
+-    <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
++<!--    <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> -->
+ 
+     <!-- Delete all other versions of Tomcat Migration Tool for Jakarta EE and copy the current one -->
+     <local name="migration.jar.filename" />
+@@ -1500,7 +1503,7 @@
+         <exclude name="${migration-lib.jar.filename}"/>
+       </fileset>
+     </delete>
+-    <copy file="${migration-lib.jar}" todir="${tomcat.build}/lib"/>
++<!--    <copy file="${migration-lib.jar}" todir="${tomcat.build}/lib"/> -->
+ 
+     <!-- Delete all other versions of OpenSSL support for Tomcat and copy the current one -->
+     <!-- After module release
+@@ -1542,7 +1545,7 @@
+ 
+   </target>
+ 
+-  <target name="build-tomcat-jdbc" depends="package">
++  <target name="build-tomcat-jdbc" depends="package" unless="noget">
+     <!-- build the jdbc-pool jar and source jar-->
+     <echo message="Building Tomcat JDBC pool libraries"/>
+     <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}"
+@@ -1559,7 +1562,7 @@
+     <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/>
+   </target>
+ 
+-  <target name="build-tomcat-jdbc-src">
++  <target name="build-tomcat-jdbc-src" unless="noget">
+     <!-- build the jdbc-pool source jar-->
+     <echo message="Building Tomcat JDBC pool src JAR"/>
+     <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}"
+@@ -1662,9 +1665,11 @@
+ 
+     <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" />
+     <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" />
++<!--
+     <copy file="${tomcat-dbcp.jar}" todir="${tomcat.embed}"
+       failonerror="false"/>
+     <copy file="${jdt.jar}" todir="${tomcat.embed}" />
++-->
+     <copy file="${annotations-api.jar}" todir="${tomcat.embed}" />
+ 
+     <!-- Note the meta-inf below will work as long as there is only one JAR
+@@ -2182,11 +2187,12 @@
+     </copy>
+ 
+     <!-- Source bundles for native components -->
++<!--
+     <copy tofile="${tomcat.dist}/bin/tomcat-native.tar.gz"
+             file="${tomcat-native.tar.gz}" />
+     <copy tofile="${tomcat.dist}/bin/commons-daemon-native.tar.gz"
+             file="${commons-daemon.native.src.tgz}" />
+-
++-->
+     <!-- platform README files -->
+     <echo append="false" file="${tomcat.dist}/bin/x64/README">
+ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+@@ -2210,13 +2216,13 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+       additionalparam="-breakiterator -notimestamp -html5"
+       source="${compile.release}"
+       maxmemory="512m"
+-      failonerror="true"
+-      failonwarning="true">
++      failonerror="true">
+       <classpath>
+         <path refid="compile.classpath"/>
+         <path location="${ant.core.lib}"/>
+       </classpath>
+     </javadoc>
++<!--
+     <javadoc packagenames="jakarta.servlet.*"
+       excludepackagenames="jakarta.servlet.jsp.*"
+       sourcepath="${tomcat.dist}/src/java"
+@@ -2232,8 +2238,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+       additionalparam="-breakiterator -notimestamp -html5"
+       source="${compile.release}"
+       maxmemory="512m"
+-      failonerror="true"
+-      failonwarning="true">
++      failonerror="true">
+       <classpath>
+         <path refid="compile.classpath"/>
+         <path location="${ant.core.lib}"/>
+@@ -2253,8 +2258,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+       additionalparam="-breakiterator -notimestamp -html5"
+       source="${compile.release}"
+       maxmemory="512m"
+-      failonerror="true"
+-      failonwarning="true">
++      failonerror="true">
+       <classpath>
+         <path refid="compile.classpath"/>
+         <path location="${ant.core.lib}"/>
+@@ -2274,13 +2278,13 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+       additionalparam="-breakiterator -notimestamp -html5"
+       source="${compile.release}"
+       maxmemory="512m"
+-      failonerror="true"
+-      failonwarning="true">
++      failonerror="true">
+       <classpath>
+         <path refid="compile.classpath"/>
+         <path location="${ant.core.lib}"/>
+       </classpath>
+     </javadoc>
++-->
+     <javadoc packagenames="jakarta.websocket.*"
+       sourcepath="${tomcat.dist}/src/java"
+       destdir="${tomcat.dist}/webapps/docs/websocketapi"
+@@ -2295,8 +2299,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+       additionalparam="-breakiterator -notimestamp -html5"
+       source="${compile.release}"
+       maxmemory="512m"
+-      failonerror="true"
+-      failonwarning="true">
++      failonerror="true">
+       <classpath>
+         <path refid="compile.classpath"/>
+         <path location="${ant.core.lib}"/>
+@@ -2315,8 +2318,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+       charset="UTF-8"
+       additionalparam="-breakiterator -notimestamp -html5"
+       maxmemory="512m"
+-      failonerror="true"
+-      failonwarning="true">
++      failonerror="true">
+       <classpath>
+         <path refid="compile.classpath"/>
+         <path location="${ant.core.lib}"/>
+@@ -2335,20 +2337,23 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+       additionalparam="-breakiterator -notimestamp -html5"
+       source="${compile.release}"
+       maxmemory="512m"
+-      failonerror="true"
+       failonwarning="true">
+       <classpath>
+         <path refid="compile.classpath"/>
+         <path location="${ant.core.lib}"/>
+       </classpath>
+       <link href="../annotationapi"/>
++<!--
+       <link href="../servletapi"/>
+       <link href="../jspapi"/>
+       <link href="../elapi"/>
++-->
+       <link href="../websocketapi"/>
+       <link href="../jaspicapi"/>
++<!--
+       <link href="https://docs.oracle.com/en/java/javase/11/docs/api/"/>
+       <link href="https://jakarta.ee/specifications/platform/10/apidocs/"/>
++-->
+       <packageset dir="${tomcat.dist}/src/java/">
+         <include name="org/**"/>
+         <exclude name="org/apache/el/parser/**"/>
+@@ -3320,7 +3325,7 @@ asf.ldap.username=${release.asfusername}
+   </target>
+ 
+   <target name="download-test-compile"
+-          description="Download additional components for the tests" >
++          description="Download additional components for the tests">
+ 
+     <antcall target="downloadfile">
+       <param name="sourcefile" value="${junit.loc}"/>
+@@ -3448,7 +3453,7 @@ asf.ldap.username=${release.asfusername}
+   </target>
+ 
+   <target name="download-dist"
+-          description="Download additional components for a distribution" >
++          description="Download additional components for a distribution">
+ 
+     <antcall target="downloadfile-2">
+       <param name="sourcefile.1" value="${tomcat-native.loc.1}"/>
+@@ -3503,13 +3508,13 @@ asf.ldap.username=${release.asfusername}
+ 
+   <!-- =============== Utility Targets to support downloads ================ -->
+ 
+-  <target name="setproxy" if="${proxy.use}">
++  <target name="setproxy" if="${proxy.use}" unless="noget">
+     <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"
+               proxyuser="${proxy.user}" proxypassword="${proxy.password}" />
+     <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/>
+   </target>
+ 
+-  <target name="testexist">
++  <target name="testexist" unless="noget">
+     <echo message="Testing  for ${destfile}"/>
+     <available file="${destfile}" property="exist"/>
+   </target>
+@@ -3631,7 +3636,7 @@ asf.ldap.username=${release.asfusername}
+     </sequential>
+   </macrodef>
+ 
+-  <target name="downloadgz" unless="exist" if="${execute.download}" depends="testexist,setproxy">
++  <target name="downloadgz" unless="noget" if="${execute.download}" depends="testexist,setproxy">
+     <!-- Download and extract the package -->
+     <local name="temp.file"/>
+     <mkdir dir="${base.path}"/>
+@@ -3648,7 +3653,7 @@ asf.ldap.username=${release.asfusername}
+     <delete file="${temp.file}.tar.gz"/>
+   </target>
+ 
+-  <target name="downloadgz-2" unless="exist" if="${execute.download}" depends="testexist">
++  <target name="downloadgz-2" unless="noget" if="${execute.download}" depends="testexist">
+     <!-- Download and extract the package from the two alternative locations -->
+     <local name="temp.file"/>
+     <mkdir dir="${base.path}"/>
+@@ -3673,7 +3678,7 @@ asf.ldap.username=${release.asfusername}
+     <delete file="${temp.file}.tar.gz"/>
+   </target>
+ 
+-  <target name="downloadzip" unless="exist" if="${execute.download}" depends="testexist,setproxy">
++  <target name="downloadzip" unless="noget" if="${execute.download}" depends="testexist,setproxy">
+     <!-- Download and extract the package -->
+     <local name="temp.file"/>
+     <mkdir dir="${base.path}"/>
+@@ -3689,7 +3694,7 @@ asf.ldap.username=${release.asfusername}
+     <delete file="${temp.file}"/>
+   </target>
+ 
+-  <target name="downloadzip-2" unless="exist" if="${execute.download}" depends="testexist">
++  <target name="downloadzip-2" unless="noget" if="${execute.download}" depends="testexist">
+     <!-- Download and extract the package from the two alternative locations -->
+     <local name="temp.file"/>
+     <mkdir dir="${base.path}"/>
+@@ -3713,7 +3718,7 @@ asf.ldap.username=${release.asfusername}
+     <delete file="${temp.file}"/>
+   </target>
+ 
+-  <target name="downloadfile" unless="exist" if="${execute.download}" depends="testexist,setproxy">
++  <target name="downloadfile" unless="noget" if="${execute.download}" depends="testexist,setproxy">
+     <!-- Download the file -->
+     <local name="temp.file"/>
+     <mkdir dir="${base.path}"/>
+@@ -3728,7 +3733,7 @@ asf.ldap.username=${release.asfusername}
+     <move file="${temp.file}" tofile="${destfile}"/>
+   </target>
+ 
+-  <target name="downloadfile-2" unless="exist" if="${execute.download}" depends="testexist">
++  <target name="downloadfile-2" unless="noget" if="${execute.download}" depends="testexist">
+     <!-- Download the file from the two alternative locations -->
+     <local name="temp.file"/>
+     <mkdir dir="${base.path}"/>
+@@ -3756,7 +3761,7 @@ asf.ldap.username=${release.asfusername}
+     <move file="${temp.file}" tofile="${destfile}"/>
+   </target>
+ 
+-  <target name="trydownload.check" depends="setproxy">
++  <target name="trydownload.check" depends="setproxy" unless="noget">
+     <condition property="trydownload.run">
+       <and>
+         <not>
+@@ -3767,7 +3772,7 @@ asf.ldap.username=${release.asfusername}
+     </condition>
+   </target>
+ 
+-  <target name="trydownload" if="trydownload.run" depends="trydownload.check">
++  <target name="trydownload" if="trydownload.run" depends="trydownload.check" unless="noget">
+     <!-- Downloads a file if not yet downloaded and the source URL is available -->
+     <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" />
+   </target>
+@@ -3778,7 +3783,7 @@ asf.ldap.username=${release.asfusername}
+ 
+   <target name="ide-eclipse"
+           depends="download-compile, download-test-compile"
+-          description="Prepares the source tree to be built in Eclipse">
++          description="Prepares the source tree to be built in Eclipse" unless="noget">
+ 
+     <!-- Copy the sample project files into the root directory -->
+     <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/>
+@@ -3796,7 +3801,7 @@ Read the Building page on the Apache Tomcat documentation site for details on ho
+ 
+   <target name="ide-intellij"
+           depends="download-compile, download-test-compile"
+-          description="Creates project directory .idea for IntelliJ IDEA">
++          description="Creates project directory .idea for IntelliJ IDEA" unless="noget">
+ 
+     <copy todir="${tomcat.home}/.idea">
+       <fileset dir="${tomcat.home}/res/ide-support/idea"/>
diff --git a/www-servers/tomcat/tomcat-10.1.0.ebuild b/www-servers/tomcat/tomcat-10.1.0.ebuild
new file mode 100644
index 000000000000..a1647adfb4d0
--- /dev/null
+++ b/www-servers/tomcat/tomcat-10.1.0.ebuild
@@ -0,0 +1,190 @@
+# 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.3.1"
+BND="biz.aQute.bnd-${BND_VERSION}.jar"
+BNDLIB="biz.aQute.bndlib-${BND_VERSION}.jar"
+
+DESCRIPTION="Tomcat Servlet-6.0/JSP-3.1/EL-5.0/WebSocket-2.1/JASPIC-3.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.1"
+KEYWORDS="~amd64 ~amd64-linux"
+IUSE="extra-webapps"
+
+RESTRICT="test" # can we run them on a production system?
+
+ECJ_SLOT="4.22"
+SAPI_SLOT="6.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-11:*"
+DEPEND="${COMMON_DEP}
+	app-admin/pwgen
+	dev-java/ant-core
+	>=virtual/jdk-11:*
+	test? (
+		dev-java/ant-junit:0
+		dev-java/easymock:3.2
+	)"
+
+S=${WORKDIR}/${MY_P}
+
+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.1.0-build.xml.patch"
+
+	local vm_version="$(java-config -g PROVIDES_VERSION)"
+
+	# 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/tomcat/tomcat-9.0.67.ebuild b/www-servers/tomcat/tomcat-9.0.67.ebuild
new file mode 100644
index 000000000000..e151500fc704
--- /dev/null
+++ b/www-servers/tomcat/tomcat-9.0.67.ebuild
@@ -0,0 +1,190 @@
+# 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-4.0/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/${PN}/tomcat-9/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="9"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+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="4.0"
+
+COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
+	dev-java/glassfish-xmlrpc-api:0
+	~dev-java/tomcat-servlet-api-${PV}:${SAPI_SLOT}
+	dev-java/wsdl4j:0"
+RDEPEND="${COMMON_DEP}
+	acct-group/tomcat
+	acct-user/tomcat
+	>=virtual/jre-1.8:*"
+DEPEND="${COMMON_DEP}
+	app-admin/pwgen
+	>=dev-java/ant-core-1.9.13
+	>=virtual/jdk-1.8:*
+	test? (
+		>=dev-java/ant-junit-1.9: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/javax/{el,servlet} || die
+
+	eapply "${FILESDIR}/${PN}-9.0.62-build.xml.patch"
+
+	# For use of catalina.sh in netbeans
+	sed -i -e "/^# ----- Execute The Requested Command/ a\
+		CLASSPATH=\`java-config --with-dependencies --classpath ${PN}-${SLOT}\`" \
+		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},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 "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/x11-apps/Manifest.gz b/x11-apps/Manifest.gz
index 58e768ddad1d..0677e5281435 100644
--- a/x11-apps/Manifest.gz
+++ b/x11-apps/Manifest.gz
diff --git a/x11-apps/fslsfonts/Manifest b/x11-apps/fslsfonts/Manifest
index b76ec482f2a3..e29c8dffe014 100644
--- a/x11-apps/fslsfonts/Manifest
+++ b/x11-apps/fslsfonts/Manifest
@@ -1,3 +1,5 @@
 DIST fslsfonts-1.0.5.tar.bz2 125650 BLAKE2B df08689dc452d07e895a93d5e755b3820b21c1df997b5269835ac04ac81beb09d98ebdcf7030d3e6c7ae288b3e7388b136a8b7b58f95ce3958e12923bab50620 SHA512 3a30598ace981c7396bfe44f0d8f76d40fca3f77158dceb3914a524594a12187dcad0b0f225fa81f251f0b7896bf046cec4ba610b4676da9be311eec5d8c6cc2
+DIST fslsfonts-1.0.6.tar.xz 123484 BLAKE2B af894405cad7351574c546bd3055dad9483b091eb2d9296e69167c1939d235cb8e539abf96b5c36c05a988b88e3cb70a20191bbdb7d9eec95534bd7b2fb68d6a SHA512 1181a8e6cc820410d1deac98b3e5097506e4168c6515307b6b9aaf705cb57193a009cb331a51d46ce68e9548712f122b5c942d5a1bc1e01bdd191b7b1beab09e
 EBUILD fslsfonts-1.0.5-r1.ebuild 301 BLAKE2B c5b4fa40580a60c7ce374069f070925150fb9e9632f294c81bc6840b5d146037efdb3c035c74445930f77a460314e3533a55d1fa7646764081be137dc76c80ab SHA512 eac96bf8e6653d2bd932d88aefe5e356ce1767b1713c019246ee96bea1149c1d70c69cb51ac65db994f15424000e2667091c93ec030588778e318bee8a61e0a7
+EBUILD fslsfonts-1.0.6.ebuild 330 BLAKE2B 3d171cb26cada56476afb935f72faa86634b182c887a1f1f67561b92cbf1b5ea4a468a8b620424f67bb7732144bc5bf377040e0702eafbd4247c1e111396bf2f SHA512 2adb8533b2ba58f757e06176efc9486b11737b80668deebc953335107b6c66d3157258fbf79fee64f3d6e355caeafabe528697f565e0e5c513aa9c0498fe2fb8
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-apps/fslsfonts/fslsfonts-1.0.6.ebuild b/x11-apps/fslsfonts/fslsfonts-1.0.6.ebuild
new file mode 100644
index 000000000000..8dac4aed20db
--- /dev/null
+++ b/x11-apps/fslsfonts/fslsfonts-1.0.6.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+XORG_TARBALL_SUFFIX="xz"
+inherit xorg-3
+
+DESCRIPTION="list fonts served by X font server"
+
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+RDEPEND="x11-libs/libFS"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index 14409a5ef79b..c98b209fcb14 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/libXtst/Manifest b/x11-libs/libXtst/Manifest
index b2ca4213fad1..4497c648419a 100644
--- a/x11-libs/libXtst/Manifest
+++ b/x11-libs/libXtst/Manifest
@@ -1,3 +1,5 @@
 DIST libXtst-1.2.3.tar.bz2 321819 BLAKE2B 92a75d6ea9000fa7736093ce479d275c57a4a5bf849df2d6afae9478a53a07ba395013ba6676c2ea7dcb6a1f34475967ed6508b7c304b887f83ec44a611b8e6c SHA512 6f6741fd3596775eaa056465319f78c29c91b3893a851a4899df651a2023a4d762497b112a33d7d3e8865fe85d173d03e4b49daef76a66af1ae1eaab82a12765
+DIST libXtst-1.2.4.tar.xz 287636 BLAKE2B 6c3e6154f221530158b8275ee638934c633f2e812333df0093a01663c416ded0b6be509578cca78d51c6b540ab17379e1e0503bf296abe3112f1afeda12e4af9 SHA512 f2f4e01239b892b8e26284cede90feb4fe7738beb243bca0f6adb349029f8bf87b5a482911edcd2401733c92ef78eec07fcd455b92e5b8c4828374769e60098d
 EBUILD libXtst-1.2.3-r2.ebuild 627 BLAKE2B e353486f424db1cb32ee99f072cf715d093a675d462d90e4052ecad45c8ff03e2ef34a4836f1c38c957b281cdda22621cd7fda1b988e98bf63742c969ce6af66 SHA512 5a1a8ba0b1f0fbf1bdea9d50c4c2ac4dadacfa90d60307aa6de383954aa5ae5a067b58e7c8d6107eaa97dc94dc89a762bb67fbc2942831a208b2a0fdfce8474a
+EBUILD libXtst-1.2.4.ebuild 659 BLAKE2B 16068f46dae3963727b2c244257117a7aa325771b0aa3fc4141ff1d074ee882cb2cbaac33caa8314e4ca40abce7891794da133d2e537dcfc3a07b027a3a01828 SHA512 fa999aaa7ddbc87a8ca528f2477a2e90b50e7ed652635d50f6ef704d02691a9469355af48832079c30cdee7b27a61c4efad22e5305e613ad1b50785f82aa8858
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-libs/libXtst/libXtst-1.2.4.ebuild b/x11-libs/libXtst/libXtst-1.2.4.ebuild
new file mode 100644
index 000000000000..c967e502c27b
--- /dev/null
+++ b/x11-libs/libXtst/libXtst-1.2.4.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+XORG_DOC=doc
+XORG_MULTILIB=yes
+XORG_TARBALL_SUFFIX="xz"
+inherit xorg-3
+
+DESCRIPTION="X.Org Xlib-based client API for the XTEST & RECORD extensions library"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+
+RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+	>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+	>=x11-libs/libXi-1.7.2[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
diff --git a/x11-libs/libXxf86vm/Manifest b/x11-libs/libXxf86vm/Manifest
index d4fa3073e9af..8c0cbab1ef1b 100644
--- a/x11-libs/libXxf86vm/Manifest
+++ b/x11-libs/libXxf86vm/Manifest
@@ -1,3 +1,5 @@
 DIST libXxf86vm-1.1.4.tar.bz2 295346 BLAKE2B 22698db5beb0ac06663e9163e13f8afd99597afc6dbc9f9d4fb232682df6b41a155d63fc1beb58da3d83bd0e420872c457671696246dbf39a6451454a6e24b9e SHA512 c5f92d86e143db02ebb36bcd25618acaa2cb2831f5a23800a06dd431cd73b6702d95de8fe7407ce626336bf614c288d5256f4d87ea7781fad2ab6c517cbf09e0
+DIST libXxf86vm-1.1.5.tar.xz 265384 BLAKE2B 4e94267ad815cf47ec558959ca122d89b5f8b54ead2b2cb93dc3ef7f9bc694b515978a0b2301bb8e48d32bc768595b50cd8cb71e7a65c65a752699b80c2c079b SHA512 68226fcb9773a583ea417ab413146203dd7db6ff8a4d388285da972353355e11e179861a77c9fa284aefac025bb3bbf5a9537fa0bf246c782e0116a667c9d9b6
 EBUILD libXxf86vm-1.1.4-r2.ebuild 523 BLAKE2B 882d2297b0583b91984abec38afb1bdc324b3297d8efb9880558a83dcf97e4081d94e1b1f06339e41ff87345be06cc4b8edcc60aea85e86bc62bcc5f074496ac SHA512 b868dd8bcc9aa94298572190eb6bf6d9e4d3623fdb661a96d15da81381b88172c35f31e8b7e81c9dea6f6eaa0e5dbbb4a4a9031c94602a9736357689436667d9
+EBUILD libXxf86vm-1.1.5.ebuild 558 BLAKE2B 2366234ca4725b0e302fc08583c202247a4b508ee4ec54e7737b244c93e4236dcbbb785181c32c0e6ae0592390de9ff47baba508b7f4717f820aad75c4963e46 SHA512 86c9651ddb00cfdc4705dd9b313122f182fd8dd76b6ca50c241f54f57a1185c8d1b62be7a9a3dcca57ae0590687fb4289a99103b0d873c6c98c67d4f9822f8df
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-libs/libXxf86vm/libXxf86vm-1.1.5.ebuild b/x11-libs/libXxf86vm/libXxf86vm-1.1.5.ebuild
new file mode 100644
index 000000000000..7fa7ab99e327
--- /dev/null
+++ b/x11-libs/libXxf86vm/libXxf86vm-1.1.5.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+XORG_DOC=doc
+XORG_MULTILIB=yes
+XORG_TARBALL_SUFFIX="xz"
+inherit xorg-3
+
+DESCRIPTION="X.Org Xxf86vm library"
+
+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 ~x86-solaris ~x86-winnt"
+
+RDEPEND="
+	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+	>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index ee00587f1f6a..25f599ea588f 100644
--- a/x11-wm/Manifest.gz
+++ b/x11-wm/Manifest.gz
diff --git a/x11-wm/i3/Manifest b/x11-wm/i3/Manifest
index e648ca2fd876..02c417f33b92 100644
--- a/x11-wm/i3/Manifest
+++ b/x11-wm/i3/Manifest
@@ -1,5 +1,7 @@
 AUX i3-4.16-musl-GLOB_TILDE.patch 2783 BLAKE2B 9dea47af64b78a77006d3aa641273aa7a77846d4425e1da17424528445450112ab275cdf7098ba8c2a76f1b08561b1d1a852cb9fd4ee4c61e53832ca702ad55d SHA512 fdff65255e7c9b30eefdbf032e04ba568d5b75a5b7dfc5fce1aecaac0f0d376b6bb4f87338e1eaf5f20b1c5882ebfc7349f8ab43c804349b5f5c626f9fc1d340
 DIST i3-4.20.1.tar.xz 1284984 BLAKE2B a7943b3bc680eb3df596b008d751d034fc6ccf2b6891db731b9af5164fdcfc2872c0756c81c3f11f94a30aa9bdc4ecf4b47d20022a214bb6eb6c06fd78458fb3 SHA512 c0f6b991d46180ca470cbb7ab4cf5492552beb9dbf2631c61c8d92d0647106885481962381682e9129f3993d70bc6e5de506da1d32c3710fca64a66d51e8c8ce
+DIST i3-4.21.tar.xz 1294968 BLAKE2B cf53e0087cb4dabc8eefa8430cc5f7057de927ef49f8172a05c62d690ca60e5d20733da4f3a6230d311bf54a94f117d21665e3d2b39b7f45814e3b0462e12efe SHA512 db56d93850b0cbc8352f5762d9596d38a641e4cf7330cf0afd3778c41a8ed140bbbed3e5419023b1bf3dcc1c470da40018aac9bf684b18d02c12ffe886d29193
 EBUILD i3-4.20.1.ebuild 1978 BLAKE2B c2fd96844cd8518e764eacc4c17580e390438b082c7ed5465d9c13f8bde52b073c9dc46d2a37a3335d0491692ea6da3ab122328d3d04bd6b761741d4ef8e5409 SHA512 6170714aaddfc8d23e5e022f22575dd05d5c315af359e5aa55ead0c9478ddfe4972c8d1206ec1b391b017a215dc908a9e03b2a45bd07620866b2f981a07970a2
-EBUILD i3-9999.ebuild 1973 BLAKE2B 6560c66a1e6b47f767f7b9b7711646aeab3603d4856dba9973751f12ba99019d4c0f5d45d6ab28a75f01652d300654847b7f6eea8be48efe797e0940adfd4697 SHA512 d240e390c4c7f949de52ac382421afd5cab2f507fbe2bec97756180424c098a2fb62190d595dc49c8a4d71e59a3b433cb8a0177086445315af7c82a5a7e10dc6
+EBUILD i3-4.21.ebuild 1981 BLAKE2B 23d1f86a61741c0ac453fa63ac04bbbfac91ab31e50990306299a186458ab212ef07497683a1c63191ead596379ed03684cfa06a32c52ee5ab52d6e5b359db85 SHA512 1c4cf8d4d509c81431dfe654c12f9fa62b9fd715e0d347a31b16cf77c9e210a04ff019585c5994c18d77e27aeefcc2724b93391115824829956bddb60b7ea080
+EBUILD i3-9999.ebuild 1974 BLAKE2B 0bdadcda946d86bca6290cf8cd9e3f2c41588d76954b84160a1f3263433792ca3b8d335db3de34aea29c03900d687fcb4107bdaacdd1438bdcdc6259b2bfd600 SHA512 5af39cb58ff99b08476accdec182ee43e0da94a03ab75689c3ab7f207cfa3e387f7c198bd14afd544263e012b5d88c7643206c4a0f656464c593a0d317174685
 MISC metadata.xml 537 BLAKE2B 81033b6b7a90a15350b23f77fe6c99d277025ae1f36ef6b5d78bf28f0b5c9fab608c165809433577551f0b478e5a154bc7b95b64b19f7ef9be18f6c7772473f8 SHA512 157b7fc03f7d9c9a455b787061a3e806701e98e3335a0f9edb50fbd5f7712ee3ed6e9573046d8fe72093e162c3253bad3e564b73633f4c67c60a326a103583be
diff --git a/x11-wm/i3/i3-4.21.ebuild b/x11-wm/i3/i3-4.21.ebuild
new file mode 100644
index 000000000000..4c767977870b
--- /dev/null
+++ b/x11-wm/i3/i3-4.21.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson optfeature virtualx
+
+DESCRIPTION="An improved dynamic tiling window manager"
+HOMEPAGE="https://i3wm.org/"
+if [[ "${PV}" = *9999 ]]; then
+	EGIT_REPO_URI="https://github.com/i3/i3"
+	EGIT_BRANCH="next"
+	inherit git-r3
+else
+	SRC_URI="https://i3wm.org/downloads/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	dev-libs/libev
+	dev-libs/libpcre2
+	dev-libs/yajl
+	x11-libs/cairo[X,xcb(+)]
+	x11-libs/libxcb[xkb]
+	x11-libs/libxkbcommon[X]
+	x11-libs/pango[X]
+	x11-libs/startup-notification
+	x11-libs/xcb-util
+	x11-libs/xcb-util-cursor
+	x11-libs/xcb-util-keysyms
+	x11-libs/xcb-util-wm
+	x11-libs/xcb-util-xrm
+	x11-misc/xkeyboard-config
+"
+DEPEND="
+	${COMMON_DEPEND}
+	test? (
+		dev-perl/AnyEvent
+		dev-perl/ExtUtils-PkgConfig
+		dev-perl/Inline
+		dev-perl/Inline-C
+		dev-perl/IPC-Run
+		dev-perl/local-lib
+		dev-perl/X11-XCB
+		virtual/perl-Test-Simple
+		x11-base/xorg-server[xephyr]
+		x11-misc/xvfb-run
+	)
+	doc? (
+		app-text/asciidoc
+		app-text/xmlto
+		dev-lang/perl
+	)
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	dev-lang/perl
+	dev-perl/AnyEvent-I3
+	dev-perl/JSON-XS
+"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.16-musl-GLOB_TILDE.patch
+)
+
+src_prepare() {
+	default
+
+	cat > "${T}"/i3wm <<- EOF || die
+		#!/bin/sh
+		exec /usr/bin/i3
+	EOF
+}
+
+src_configure() {
+	local emesonargs=(
+		-Ddocdir="${EPREFIX}"/usr/share/doc/${PF}
+		$(meson_use doc docs)
+		$(meson_use doc mans)
+	)
+
+	meson_src_configure
+}
+
+src_test() {
+	virtx meson_src_test
+}
+
+src_install() {
+	meson_src_install
+
+	exeinto /etc/X11/Sessions
+	doexe "${T}"/i3wm
+}
+
+pkg_postinst() {
+	optfeature_header "There are several packages that may be useful with i3:"
+	optfeature "application launcher" x11-misc/dmenu
+	optfeature "simple screen locker" x11-misc/i3lock
+	optfeature "status bar generator" x11-misc/i3status
+}
diff --git a/x11-wm/i3/i3-9999.ebuild b/x11-wm/i3/i3-9999.ebuild
index 8aedb5be5197..af60288595be 100644
--- a/x11-wm/i3/i3-9999.ebuild
+++ b/x11-wm/i3/i3-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -23,7 +23,7 @@ RESTRICT="!test? ( test )"
 
 COMMON_DEPEND="
 	dev-libs/libev
-	dev-libs/libpcre
+	dev-libs/libpcre2
 	dev-libs/yajl
 	x11-libs/cairo[X,xcb(+)]
 	x11-libs/libxcb[xkb]