gentoo auto-resync : 04:08:2022 - 20:05:57

192 files changed, 3781 insertions, 530 deletions

diff --git a/Manifest b/Manifest
index b38f2ef3d8ab..b62ee2a8421f 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29623 BLAKE2B 043ef570818c99978365b36f37eba8d1ffa5b9e9fba0a697cc4c09c5ab7f7d2998e73a3f621d41bbbb4eb2864b8a2574aa6d5c240f5bc8ca6b5ebe949868c85f SHA512 00a465dbeed4f375a946a324cbc7d07ca0fafa66b6a383880762948e2e988e10546816f2b92e06873a08355d46f2f78adc8dc307ea4006da0ec3b04470a3e4bb
-TIMESTAMP 2022-08-04T12:09:56Z
+MANIFEST Manifest.files.gz 29617 BLAKE2B 436b9aba22d79a1fe984e437ef51d23622617265d816bb7d0df3d59da2b369b1e72ab2850d4278e353e4b8a180e43b6d248026e456bdc3e5612b68e8065b3f6f SHA512 952a8a78dc2e02ab78e35217a3cf1d89c5c1dfeb809ab18ad005688e90d2971244aea934f1ca963af2303eaadcd51ed9d163bf99d496404bca2376999d8b2b7e
+TIMESTAMP 2022-08-04T18:09:49Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLrtxRfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLsC21fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDjkhAAgIBWMEgG/52JPW6mHQ3OL0+GZ6XVcR64N1EraAvctz/RN75EY7G9IQdu
-UbvtN8dhpsp7kVlVt+vO7zh+RC0j3iDAHTg+CKZpyXUG5YqEjw3fz3AiQqOAj69S
-m2D438xnWGYmulCU2bhzTBjR+FdnD6++qB0E7Tbe9HTvssGd4xQhY7/IVD2ZMv/d
-MVFVl+g5jnhpKJbGNPIBQ3CfTzr1CnLB/hkuT308lvWQGxsIGgaVgBTBnQRUcQe5
-A77/7MCx4DCSn6kb5ISgJOKkINtMoDHukP8mOz+iTPB4hSZm3lL7lVRJiAOsGEM0
-wYKcP1JRPun9dojxthSzTaMJNE5+j620KL3H7z1J0kPOjqyQPIevUpS+JBuj/9Rh
-bwTNpzGGAPcLflSMu6oMKCLbUb4IRlt55dDDTZr/bahmPzXc0MMTiuXl4OEWi7I2
-UNYrVtP1U6mLG6u3VzqHC9QlIOpGmKjsIxmp85cgRkeinuAKJxp4ycVn4/UpFCyO
-nk7AgJrWg/5RAJX+0YRqIgvNDUKnSZE+6bDFo0E7iTgn4/yq707jc3CTDA20Ki/v
-Dc8GnGVHLpdMEjX64BZGrJHKjvVy7iJWdE5GvGtlhAMNDaWVmiIzpaLgsqM28u7z
-UmqH7QY2Lj/1NacXkjnfHVyXxnMCkDXjOtUYYUgzEtIplCC6WPU=
-=uSEm
+klDT7g/9EHcOY4AaAzcdRpIHVPeleOlD0zvGSZhfZIIgdwAhPJYFFPRZGSs9CO3c
+zAqZ9oH++eqeTLSIHXpnXYUB2NbR7oBoxGXQD87bEkureVjcHq3iFzofZgtficJl
+ojAHS1qnw+4pTUtguE19c7TcbojJxRRWmxpuTHxwTFIkzJ6l4vhATaTNhq6hVMeq
+5lDOz7qxX0NnYCKdWBEeLq0XWV+HU/g2xNQXlzOFoFvwFEX/m6jGR7lH9lv5lws0
+og5mpO68Omoz1G4JlrnoU1PTtv2lDuQgzcDnIReoN5kma0moX1jZyIqdfcUFA1Db
+K0GU/kpF8QIxlWxxiVDS8G/xEu/q1Oa6Z7U41dFFZqBR7u68MiSWkXENLPPtll8Q
+A3HWPS95LoSy+LWbWpWtXPIZjYc5nkGLLsXvRZUa7lleZ+y50JnJAbp2nl6rTdQy
+utRu2bbkV3ExtEaBYXw1l62BnzN7ljcUmxEZlOwz4GMusxBDv2NrHmzBpD7YX6+A
+chpugI0PMaCt8D/S94zA3rZeycvVdrpJOl9WsdGJhbjzHTSeS9QnsxylVie/g1NX
+uCuhRvLsvcW5Eg9ghbmTbbQQDGT6R7Plk+wFGxH3iDvenXS7eWcNmfXmZUJQ3kgf
+ik6vhN6Jg7vEmC+VIMs3g2fTj9vSjdpJHKSEH1msParEEmaxjjg=
+=jQpa
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index ef3050056fa5..c85641fcc208 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 4665c55e2e0f..ef58faa43de5 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index 2d728bac2cb1..e941969f55b6 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -4,10 +4,12 @@ DIST aws-cli-1.25.41.gh.tar.gz 2238897 BLAKE2B b0e4d1b96048971f41a0fce9c91491547
 DIST aws-cli-1.25.42.gh.tar.gz 2239243 BLAKE2B 081535dbe7dac01101b570ef319af9c1bfff6ac1eb1dd000d9f15906a1538682dd77c9d6c78ee38db0f103c3681b9a9b2fb3954be0e5f6a11dcd16e54c33b79f SHA512 6d771f4e4235da349905ef0df1a5b118877425e9192ae5eac3b711c63a4ef80c491476d6a14440af19bae01e51c7a86fb6dd0efe976d11fa0bec2d526ba0e0b1
 DIST aws-cli-1.25.43.gh.tar.gz 2239407 BLAKE2B cad8350671679b1314f22ed0a21b1933b7fb960549b16d1ec60ff6e2bdaf91f943fe108f54521a538cfe558aa7185aeaf82b353da4b83026856578df1cb70d13 SHA512 e62ead7f3e1d8edef20bc8781304a3cec507807c919f70ae0dd59634e9d5af271e040d05117739eeca48d148b7d89d7afb3798a8bae7a26def343fcf419e31dc
 DIST aws-cli-1.25.44.gh.tar.gz 2239578 BLAKE2B 26a8fda0d12f4b46cf82189c02cc6a17be25e7c2bb2de82821ed6f93e4d02c8c178eaea1eb67fec3c3c012fd3cd2368f3e969c7eb69f40de94c56f58a79fe649 SHA512 08982c0c74028513a7bbf7141fe3b4896f2dd32dfcaf25f1a959feaa0ed0456fe39a5548324c928bc8b75aa7d5360fcf2d647b5f9797695701f6bd2a8d6575b4
+DIST aws-cli-1.25.45.gh.tar.gz 2239771 BLAKE2B eeddfbbd02da47965255319385c7579d39de76d3bd173c4bc7010f68cb4ebfdfce1133c0a1f3db0a0dba8312e70865bf34b7fe32bceb16b022cc1e8efe86d816 SHA512 f93ad04b8766348ff0d61ec468bc9a805917c94a8edc566456f944747cdb269873da9c200c7f5318a513b9c42bf459db190d3eaeb24aee4b373144eda41df050
 EBUILD awscli-1.25.31.ebuild 1834 BLAKE2B 8dd7abd62571c499386dcc73967b693b028c094797cb10c43b7719b7ad2af01e683c056e9888e6ab6119204362dd2e61b6a465d3d115045130075d54c16295aa SHA512 84785cb46646fc3c97a504a712db51fc68d92739732fe696c1d5e198b99fc5665776629400cb99cb17fcebc47f6a426cc3678c827ebf28912854b8f9b5960906
 EBUILD awscli-1.25.36.ebuild 1836 BLAKE2B dae7d5415e625d711cf8b71492dfe80e2ffe77da7c538f4a7b04e2777c942973ad985fdb2f65a96511ce7486c3a4e78daed6110194672b19651191f7db2f484a SHA512 8454d269cfbca202e068c39704fdf48b9e21985e6ee1e825399620585707d315c867ef26f9726c2d8b8f55054980bd5f8e88ffaa0ed8cf45a4eedb5c410325d2
 EBUILD awscli-1.25.41.ebuild 1836 BLAKE2B dae7d5415e625d711cf8b71492dfe80e2ffe77da7c538f4a7b04e2777c942973ad985fdb2f65a96511ce7486c3a4e78daed6110194672b19651191f7db2f484a SHA512 8454d269cfbca202e068c39704fdf48b9e21985e6ee1e825399620585707d315c867ef26f9726c2d8b8f55054980bd5f8e88ffaa0ed8cf45a4eedb5c410325d2
 EBUILD awscli-1.25.42.ebuild 1836 BLAKE2B dae7d5415e625d711cf8b71492dfe80e2ffe77da7c538f4a7b04e2777c942973ad985fdb2f65a96511ce7486c3a4e78daed6110194672b19651191f7db2f484a SHA512 8454d269cfbca202e068c39704fdf48b9e21985e6ee1e825399620585707d315c867ef26f9726c2d8b8f55054980bd5f8e88ffaa0ed8cf45a4eedb5c410325d2
 EBUILD awscli-1.25.43.ebuild 1836 BLAKE2B dae7d5415e625d711cf8b71492dfe80e2ffe77da7c538f4a7b04e2777c942973ad985fdb2f65a96511ce7486c3a4e78daed6110194672b19651191f7db2f484a SHA512 8454d269cfbca202e068c39704fdf48b9e21985e6ee1e825399620585707d315c867ef26f9726c2d8b8f55054980bd5f8e88ffaa0ed8cf45a4eedb5c410325d2
 EBUILD awscli-1.25.44.ebuild 1836 BLAKE2B dae7d5415e625d711cf8b71492dfe80e2ffe77da7c538f4a7b04e2777c942973ad985fdb2f65a96511ce7486c3a4e78daed6110194672b19651191f7db2f484a SHA512 8454d269cfbca202e068c39704fdf48b9e21985e6ee1e825399620585707d315c867ef26f9726c2d8b8f55054980bd5f8e88ffaa0ed8cf45a4eedb5c410325d2
+EBUILD awscli-1.25.45.ebuild 1836 BLAKE2B dae7d5415e625d711cf8b71492dfe80e2ffe77da7c538f4a7b04e2777c942973ad985fdb2f65a96511ce7486c3a4e78daed6110194672b19651191f7db2f484a SHA512 8454d269cfbca202e068c39704fdf48b9e21985e6ee1e825399620585707d315c867ef26f9726c2d8b8f55054980bd5f8e88ffaa0ed8cf45a4eedb5c410325d2
 MISC metadata.xml 334 BLAKE2B 84c9f50e6c0d015aad36a7f625cddf90cf1137a8c2d445cc641cd4890d64261187c10fde59ee1a6c19b98cfdb6ff534c66ae7a7a48a00ec62d6984c9a1891750 SHA512 a845de531df2cd75abf23cdbfa613e586855b95ac4e96566ef193708d7ecf2ec7f7db72fd31b8af0ac4ccd57e51da9c6d129d426bfdc6c4feb57d7df8647f160
diff --git a/app-admin/awscli/awscli-1.25.45.ebuild b/app-admin/awscli/awscli-1.25.45.ebuild
new file mode 100644
index 000000000000..9f176fa05cc8
--- /dev/null
+++ b/app-admin/awscli/awscli-1.25.45.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit bash-completion-r1 distutils-r1 multiprocessing
+
+MY_P=aws-cli-${PV}
+DESCRIPTION="Universal Command Line Environment for AWS"
+HOMEPAGE="
+	https://github.com/aws/aws-cli/
+	https://pypi.org/project/awscli/
+"
+SRC_URI="
+	https://github.com/aws/aws-cli/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+# botocore is x.(y+2).z
+BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)"
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	dev-python/colorama[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/rsa[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	!app-admin/awscli-bin
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-forked[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+	# strip overzealous upper bounds on requirements
+	sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# integration tests require AWS credentials and Internet access
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)" --forked
+}
+
+python_install_all() {
+	newbashcomp bin/aws_bash_completer aws
+
+	insinto /usr/share/zsh/site-functions
+	newins bin/aws_zsh_completer.sh _aws
+
+	distutils-r1_python_install_all
+
+	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
+}
diff --git a/app-admin/puppet-agent/Manifest b/app-admin/puppet-agent/Manifest
index 22a3cdce8616..22c4adecbd7b 100644
--- a/app-admin/puppet-agent/Manifest
+++ b/app-admin/puppet-agent/Manifest
@@ -1,11 +1,8 @@
 AUX puppet.initd2 758 BLAKE2B caf8c2e3563f24d9d313e790498dc362fcd14467ca2b6329cf454a5163bae5cfa2b7af1a212b2e5bfcb4693c7291d5306e47e574d3c937aaedd02625dc954a9e SHA512 df93f7dbcf61eee9f42f4a0c2fa0e2dfc806ac737ba98329cee158e04150c9bf346abd9364b2a6824df4bb862e676be7b2c23f5947ef5aa589df745ac5c5cd03
-DIST puppet-agent_7.16.0-1focal_amd64.deb 20349200 BLAKE2B 73a5bc404b988fc009b95e25ab906afdc56cf8a9b977d0974177bdd5dcf9c0882f10d7e56f05c054f2ff1ea89824879671f857d1f1bf41d4f725ae90994d24ac SHA512 57d58b0a4ea74f461e7820e1f99838eb3c357f1be5277623ce8bb5cdf6aa46696d53db7c64c16ede972bc01660f30ea19111d2495087032d412672564b8612f8
-DIST puppet-agent_7.16.0-1focal_arm64.deb 19543124 BLAKE2B 2a946462ddf1344f05f21c5c5f0a3ad4a1b92fa0b386d405b6cb563b0cb3de0a06ad8212d6001f10ed7afe2d7787d1107732a5890e48de99a32cec802d78d16d SHA512 74db9defefe8aa91daaac8337dd500cf2582c017eab34f61992630a30dc9b2ef62ae5aba21b9ee94f30b6f92e99557e61da742711bba7df8200b3eca5a06f748
 DIST puppet-agent_7.17.0-1focal_amd64.deb 20397624 BLAKE2B 8304f937e6eb3f1a3c2a72ba34fce029ecec99decaf1a78b08b556c1ebe3073fa159e70e43baf468e833ede2e9a659f6384f52969e16932ac24a2a997da14eee SHA512 f493298af50e6eed61c7ffb0cf4234b1eb69594caedd24826bc9bcb5d85e736101bfa98b14dcfdceab5ee98e8bc228f25743fdcce440398ff9e0019c6861bde2
 DIST puppet-agent_7.17.0-1focal_arm64.deb 19595304 BLAKE2B 719473363cb24dcd58a864c9ce4d24cb8d8f328d6179ec666d3f3ba1dbf8df53746b9dba37a820c782b6b7b56639c068da1a7db4813e44c5520dfc74ff026008 SHA512 5d74f2fca8fe214c70931b099582d5861ae95a3f11be69e33ee4a10b5135cde43d57b117fa3492983b13e023f9138584d72df6ea788015e058124e4578ae1e39
 DIST puppet-agent_7.18.0-1focal_amd64.deb 33767214 BLAKE2B def38171c1e0cad50cdffc8aada569af0996b1b7e3f788ffa3c5e3b05d0456d2776f2d12a4cf2f8a9227ebf3c1c13b52fa28f210249b04a54de1fbbc19f26c30 SHA512 387d3e1ca3a05c107411dc7a126b2984e8dacf3580823022c0010f33b08305b6722d8a1babee7825b8f60769589b1f166991931f66a484d94a17ac7d437141e1
 DIST puppet-agent_7.18.0-1focal_arm64.deb 33559710 BLAKE2B af2a4657c95dc7208b5c2f7494b9cec03f1c9ed0e73c06c150f492fa474d5620f5a58b23b7d928d4117a9b2b8c6384514b7f7000e7a6639582ebe97ab82571a7 SHA512 fafabbd00c4ef03b3bd6d9680bc78ada42ffefa8bc8186f24203be277e01267363f0ff35f176f3f04057c46ff437bbb957d4416ce5b6ffc1b3e1f79492c2ce7b
-EBUILD puppet-agent-7.16.0.ebuild 2593 BLAKE2B 1e94777916beb4e793dfbcdbc5c83c875c72ff39bcc4cfee6d8799dd9445cdc46d45a58266739406399f6c4551a5e55fe46f13dd7d4e8cdabb97ed105d16835d SHA512 84230e1234ca4314eba502a376595534d5af4b135c8563308a24c874e6305b72a176652f328b37d061daf5633f83fab0a0bfd941f76a3071c6a0c20d8338cbe6
 EBUILD puppet-agent-7.17.0.ebuild 2593 BLAKE2B 1e94777916beb4e793dfbcdbc5c83c875c72ff39bcc4cfee6d8799dd9445cdc46d45a58266739406399f6c4551a5e55fe46f13dd7d4e8cdabb97ed105d16835d SHA512 84230e1234ca4314eba502a376595534d5af4b135c8563308a24c874e6305b72a176652f328b37d061daf5633f83fab0a0bfd941f76a3071c6a0c20d8338cbe6
 EBUILD puppet-agent-7.18.0.ebuild 2594 BLAKE2B 50cf4300e0420105383d9ce375f643b6122562bb5cf6841db7b8009107bc752827be49288a30c9ccce030b854c3dcbedde3d86bf64e9af37cef7cf5b2e521faa SHA512 9c4e4599785c65a32bdf31a7257862c953bd3c7ee1b7db2279bd1bceb9082ec20dd3f020a3592f5bd211e27b55fa8a5ed7b116c67d11c73151015f326a66bb81
 MISC metadata.xml 1032 BLAKE2B 35156eb59a786ad7dab4ac5c281796af6a8f3dcad2b7ebc2c6af926aee6fcbffaef39f0f7119f1aefed42a1e8148f323ee4d3d5f77dfb4d3671317af6fd078cc SHA512 b624438f825e288802e516637dd38f775a63b4a4aabaa53c5adfd1f71f694018dbf3d47f1622a90d5da25a00aac696f9203c085190e574a586f3a3e4fe14f9d1
diff --git a/app-admin/puppet-agent/puppet-agent-7.16.0.ebuild b/app-admin/puppet-agent/puppet-agent-7.16.0.ebuild
deleted file mode 100644
index 0776db0b3b8b..000000000000
--- a/app-admin/puppet-agent/puppet-agent-7.16.0.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit systemd unpacker tmpfiles
-
-DESCRIPTION="general puppet client utils along with hiera and facter"
-HOMEPAGE="https://puppetlabs.com/"
-SRC_URI="amd64? ( http://apt.puppetlabs.com/pool/focal/puppet/${PN:0:1}/${PN}/${PN}_${PV}-1focal_amd64.deb )
-arm64? ( http://apt.puppetlabs.com/pool/focal/puppet/${PN:0:1}/${PN}/${PN}_${PV}-1focal_arm64.deb )"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="puppetdb selinux"
-RESTRICT="strip"
-
-# virtual/libcrypt:= is in here despite being a pre-built package
-# to ensure that the has_version logic for the symlink doesn't become stale
-CDEPEND="!app-admin/puppet
-	!dev-ruby/hiera
-	!dev-ruby/facter
-	app-emulation/virt-what
-	acct-user/puppet
-	acct-group/puppet
-	virtual/libcrypt:="
-
-DEPEND="
-	${CDEPEND}
-	app-admin/augeas"
-RDEPEND="${CDEPEND}
-	app-portage/eix
-	sys-apps/dmidecode
-	sys-libs/libselinux
-	sys-libs/glibc
-	sys-libs/readline:0/8
-	sys-libs/libxcrypt[compat]
-	sys-libs/ncurses:0[tinfo]
-	selinux? (
-		sys-libs/libselinux[ruby]
-		sec-policy/selinux-puppet
-	)
-	puppetdb? ( >=dev-ruby/puppetdb-termini-5.0.1 )"
-
-S=${WORKDIR}
-
-QA_PREBUILT="*"
-
-src_install() {
-	# conf.d
-	doconfd etc/default/puppet
-	doconfd etc/default/pxp-agent
-	# logrotate.d
-	insinto /etc/logrotate.d
-	doins etc/logrotate.d/pxp-agent
-	# puppet itself
-	insinto /etc/puppetlabs
-	doins -r etc/puppetlabs/*
-	# logdir for systemd
-	keepdir var/log/puppetlabs/puppet/
-	chmod 0750 var/log/puppetlabs/puppet/
-	# the rest
-	insinto /opt
-	dodir opt/puppetlabs/puppet/cache
-	doins -r opt/*
-	fperms 0750 /opt/puppetlabs/puppet/cache
-	# init
-	newinitd "${FILESDIR}/puppet.initd2" puppet
-	systemd_dounit lib/systemd/system/puppet.service
-	systemd_dounit lib/systemd/system/pxp-agent.service
-	newtmpfiles usr/lib/tmpfiles.d/puppet-agent.conf puppet-agent.conf
-	# symlinks
-	chmod 0755 -R "${D}/opt/puppetlabs/puppet/bin/"
-	dosym ../../opt/puppetlabs/bin/facter /usr/bin/facter
-	dosym ../../opt/puppetlabs/bin/hiera /usr/bin/hiera
-	dosym ../../opt/puppetlabs/bin/puppet /usr/bin/puppet
-
-	# Handling of the path to the crypt library during the ongoing migration
-	# from glibc[crypt] to libxcrypt
-	# https://www.gentoo.org/support/news-items/2021-07-23-libxcrypt-migration.html
-	if has_version "sys-libs/glibc[crypt]"; then
-		local crypt_target='../../../../usr/lib64/xcrypt/libcrypt.so.1'
-	else
-		local crypt_target='../../../../usr/lib/libcrypt.so.1'
-	fi
-	dosym $crypt_target /opt/puppetlabs/puppet/lib/libcrypt.so.1
-}
-
-pkg_postinst() {
-	tmpfiles_process puppet-agent.conf
-}
diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
index 0917d5a7db2c..72209a2fab6d 100644
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@@ -4,12 +4,10 @@ AUX puppetmaster.confd 640 BLAKE2B 78d85ee9b2c413c59eadef3498a8a2e2ee6c6d029bf76
 AUX puppetmaster.init-4.x 1108 BLAKE2B 1793d3d881de2c1808159f940bf1e758c2e7fad8fc8eca3c0199828b2c0119547cd744c49f79334de1bc0a7227c0791a5b3645eedb51d3fa8be5822487354b1a SHA512 e177109d90f5954e7cd1968db1d0e0d0e2c6e98bc4d53d0ae0a816d181e304e1b7555f65d8807b98df9f0f8cf7ebafc9d8cca9c32574fb7127c4b480d23b5cc6
 AUX tmpfiles.d 39 BLAKE2B 2c9a992bf709a384ae02395299ddeb2febf3cd83b924acd97d0ca7fbc17dac273cb27c926790708c0d929f62282dec0477f167ed2e5fc1418a9ff5d130f246f1 SHA512 2dfec45e6f762ce0431d55b1a826e707e970defacbe050df838b66b347e7423eac78a35248c74908e7b52fa84cde5129ce3f562f64dac357f0368a3bc0b719a1
 DIST puppet-5.5.22.tar.gz 2998132 BLAKE2B 8662c89190d0904fe44ffeca1cf9a9ddca40d57ba6fb2d1e644ca353ceb55b1ca3a91416f1eef2975233c9c4498784e7d7280c111ea0cc070870cadc69341d99 SHA512 5332b084a63bdf244672cc4751022c84a1cc50d3f394a13bdcbccf7fcf4ebea67953e88957f23046608bf25e9182548449be824c18289cb2bf1e3ed29b40dc58
-DIST puppet-7.16.0.tar.gz 2817116 BLAKE2B d367005ea69ceb0f89f4294e74639ad61305f23929e5edf0385eb2cce5da76fa157c5bc7408599dcca4d9adba39c3b29250e78d8f584873f72bb34452a90a74d SHA512 b1f3c6072821225c9068089f44ad9ab955534f2d91bf88b44f762e0588442b9d6191eb89909dc05b7efc3a82302d2d3dc5a5a040fbc84f81645817d695b4db72
 DIST puppet-7.17.0.tar.gz 2812615 BLAKE2B 80b5115b8825a87427a688ca7a9337334180fcb7722d437f44009b5cf74ede16dac52f1648a2e7595558abb5fa92322095e71dcf0d7d8d06a2275e13caf79163 SHA512 f691b6d3e931c5cc879c8e5129af2a935bedc891964ba5cbb873d6d69e0ec61bd82ca7d413a94389cda13cb6c8c536aae6f11dade4c6e2597abc7756a74f4df0
 DIST puppet-7.18.0.tar.gz 2816776 BLAKE2B 7c653744a9aa694c6e7558295d33fa8de1958f333cb274a51119ce543846ce649755d5c37ba677d1cdcf2417b237611073ef523aa7a109a3e3dc0e75bd986614 SHA512 428268c9d8333c0624023a3d4b55b5dddfaa890eb6d88a31486c8de5112db4d1dce7553050de81c4b5ffd0fec74c5d10f3c09c3fb1826ffc196808f2b45495d4
 EBUILD puppet-5.5.22-r1.ebuild 3750 BLAKE2B 4cfe9e58f764927a378ccb706ea14ed3ac8e981356c2000d16b8a33b924c7d08fd8cc6f27c70cf66f859d5649c13a33d4982ea69573ba73d4b19375c8da95cdb SHA512 87fff4d2c68e882894b3a24f28db1d0b68b081530eeaaf3149314aa1968094fe3f0b37b57c5240e2e4dfe19828084b82b07e0bc3105a1dee0b52f9e28f034cb4
 EBUILD puppet-5.5.22-r2.ebuild 3758 BLAKE2B e9e5ed85c6606cc4ed8e29c1c3f4601be291ed9da1074404cbc0870bb7ad0485a440778d50c8c1753d5bb80627bae35d107c1a2f697b63d1bfb35f86a8474b5a SHA512 b4c19d02f28f6337a0e468374b6547f388208ebab6ca4bce65b6f957b6f28329f65360d2554887b10e2727fac8b206d80fb56938fde4bd416c9b532f8fd7dc04
-EBUILD puppet-7.16.0.ebuild 3457 BLAKE2B 67bf80033dbe3bec0117118b158f4d177695dee5d6956322e156efea99cc2ba75eb830912f019e495e903706a36b623e62492b62b1f66463946a048a223104bc SHA512 0e870b484df92c17ff5af92f883ad8d8da911e0cc48e4dc9ead0505e1dd9c2e3681b683f6f4b92176dcc83a76b5b03939dd326f182d3eb72590c62adc9116b2c
 EBUILD puppet-7.17.0.ebuild 3457 BLAKE2B 67bf80033dbe3bec0117118b158f4d177695dee5d6956322e156efea99cc2ba75eb830912f019e495e903706a36b623e62492b62b1f66463946a048a223104bc SHA512 0e870b484df92c17ff5af92f883ad8d8da911e0cc48e4dc9ead0505e1dd9c2e3681b683f6f4b92176dcc83a76b5b03939dd326f182d3eb72590c62adc9116b2c
 EBUILD puppet-7.18.0.ebuild 3457 BLAKE2B 67bf80033dbe3bec0117118b158f4d177695dee5d6956322e156efea99cc2ba75eb830912f019e495e903706a36b623e62492b62b1f66463946a048a223104bc SHA512 0e870b484df92c17ff5af92f883ad8d8da911e0cc48e4dc9ead0505e1dd9c2e3681b683f6f4b92176dcc83a76b5b03939dd326f182d3eb72590c62adc9116b2c
 MISC metadata.xml 1570 BLAKE2B 5ea0d1f9d7e83fc99130bc7375de7638fd509d18ea5728d14d370338089c33c788156f20b976e6b909502e94e356428e4a1ce95e10bf307d81bd2fbbb1166941 SHA512 4ec568674227749e9644c4eb09d39c25f2458a7eb89f7d36d2be035845e8ffefc6bffbdbc09be9950bb424f2c940ff9bf43ea60e22cd4816bf12d3593e41e7b1
diff --git a/app-admin/puppet/puppet-7.16.0.ebuild b/app-admin/puppet/puppet-7.16.0.ebuild
deleted file mode 100644
index b0c6d6d3ffe3..000000000000
--- a/app-admin/puppet/puppet-7.16.0.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_TASK_DOC="doc:all"
-RUBY_FAKEGEM_EXTRAINSTALL="locales"
-
-inherit ruby-fakegem systemd tmpfiles
-
-DESCRIPTION="A system automation and configuration management software"
-HOMEPAGE="https://puppet.com/"
-SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
-
-LICENSE="Apache-2.0 GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86"
-IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax"
-RESTRICT="test"
-
-ruby_add_rdepend "
-	dev-ruby/hiera
-	dev-ruby/json:=
-	dev-ruby/semantic_puppet
-	>=dev-ruby/facter-3.0.0
-	dev-ruby/concurrent-ruby
-	augeas? ( dev-ruby/ruby-augeas )
-	diff? ( dev-ruby/diff-lcs )
-	doc? ( dev-ruby/rdoc )
-	ldap? ( dev-ruby/ruby-ldap )
-	shadow? ( dev-ruby/ruby-shadow )
-	sqlite? ( dev-ruby/sqlite3 )
-	virtual/ruby-ssl
-	dev-ruby/hocon"
-
-ruby_add_bdepend "
-	doc? ( dev-ruby/yard )
-	test? (
-		dev-ruby/mocha
-		dev-ruby/rack
-		dev-ruby/rspec-its
-	)"
-# this should go in the above lists, but isn't because of test deps not being keyworded
-#   dev-ruby/rspec-collection_matchers
-
-RDEPEND+=" ${RDEPEND}
-	rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
-	selinux? (
-		sys-libs/libselinux[ruby]
-		sec-policy/selinux-puppet
-	)
-	vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 )
-	>=app-portage/eix-0.18.0
-	acct-user/puppet
-	acct-group/puppet"
-PDEPEND="emacs? ( >=app-emacs/puppet-mode-0.3-r1 )"
-
-all_ruby_prepare() {
-	# Avoid spec that require unpackaged json-schema.
-	rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die
-
-	# fix systemd path
-	eapply -p0 "${FILESDIR}/puppet-systemd.patch"
-
-	# Avoid specs that can only run in the puppet.git repository. This
-	# should be narrowed down to the specific specs.
-	rm spec/integration/parser/compiler_spec.rb || die
-
-	# Avoid failing spec that need further investigation.
-	rm spec/unit/module_tool/metadata_spec.rb || die
-}
-
-each_ruby_install() {
-	each_fakegem_install
-#	dosym "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${P}" "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${PN}"
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	# systemd stuffs
-	systemd_dounit "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
-
-	# tmpfiles stuff
-	newtmpfiles "${FILESDIR}/tmpfiles.d" "puppet.conf"
-
-	# openrc init stuff
-	newinitd "${FILESDIR}"/puppet.init-4.x puppet
-
-	keepdir /etc/puppetlabs/puppet/ssl
-
-	keepdir /var/lib/puppet/facts
-	keepdir /var/lib/puppet/files
-	fowners -R puppet:puppet /var/lib/puppet
-
-	fperms 0750 /var/lib/puppet
-
-	fperms 0750 /etc/puppetlabs
-	fperms 0750 /etc/puppetlabs/puppet
-	fperms 0750 /etc/puppetlabs/puppet/ssl
-	fowners -R :puppet /etc/puppetlabs
-	fowners -R :puppet /var/lib/puppet
-
-	# ext and examples files
-	for f in $(find ext examples -type f) ; do
-		docinto "$(dirname ${f})"
-		dodoc "${f}"
-	done
-}
-
-pkg_postinst() {
-	tmpfiles_process puppet.conf
-
-	elog
-	elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could"
-	elog "cause puppet to hang while installing packages."
-	elog
-	elog "Portage Puppet module with Gentoo-specific resources:"
-	elog "http://forge.puppetlabs.com/gentoo/portage"
-	elog
-	elog "If updating from puppet 5 to 6, keep in mind that webrick (server/master)"
-	elog "suppert was removed for >=6.x, please migrate to puppetserver if you have"
-	elog "not already done so."
-	elog
-}
diff --git a/app-admin/puppetserver/Manifest b/app-admin/puppetserver/Manifest
index 4e6f20d589b7..b37011026428 100644
--- a/app-admin/puppetserver/Manifest
+++ b/app-admin/puppetserver/Manifest
@@ -1,9 +1,7 @@
 AUX puppetserver.init 2138 BLAKE2B 6c157cb6bbe9e085ae67920abadf99ff97798115f784a60e2be4fa565f5b897f60d8abea21af273b1951477a1662c778081ee9a31063780c179097e764b0845b SHA512 50e78feda08e06a16290f90b7d593653c7fe2e98efdfc8cc7cc4a85a5be528e8bc585b934330f3a87b6f038311942fd8bc6d73f0538069d7b132dd3a64e23f11
 AUX puppetserver.init-r1 2190 BLAKE2B 6e4b547af51989d678a52e0fb41e8b27a669d96aaa445998b532524651f2bf2349a26f8eb77ead92a9e0f613a5269fe464045937f318947c8c2878b93dad0d4f SHA512 de159346c4b1b5705d53337994cf77f4b70edd20d60f0e1338589be4ee67c4a1bddca5cfdf9a4e744ff9360676f86391a6675b137c3bef050d71f2964b885b58
-DIST puppetserver-7.7.0.tar.gz 64646018 BLAKE2B 7ce0dfc469705093107f3761c25119a488fffd0bf95112108b86fd0bbaf923d090712c0612d0efb8226059645b15386593fcc5b5c13b0881a9ffd36b714a7d50 SHA512 f56a94cfb75f2e95aef4947b2e755cda1ba4b3a1f646f14525c2ed2434c49da7d71b5dc2766bae727dcc307e06e2c56df80682b2376d8379b7c291a319a37ed1
 DIST puppetserver-7.8.0.tar.gz 64651673 BLAKE2B 7bd53e3a15128eb4405b47edc066e702a3ea702a22258d039a4be5a7fecb509c724dcf21d893e9d76a99e9c94ca8a514d48bcd7085bcf429dd318defdf9fbd8d SHA512 82503c79e3d24ae2700537c8acdd410ddd3b400993d51f392f30664f6d259c224ba782c8ebeaf21e49c4acfb503b2f1a8ac880359a67c8d008797abcaa3210ab
 DIST puppetserver-7.9.0.tar.gz 66386534 BLAKE2B 8aac7501c9923eb67bd06e965dd766ddce290b2eaaa8c752f6c7124a13d24364ede22847fdd1171d0e71b45bae191bc3c9b0c89cc5ebf9ed78d5230b8e28bfcf SHA512 6f0acabbf332072306386b4d942532270e202801bf98dcd436884c85b969437ca51adefb51a0f99556432c4c204e03ee8d3fecdecadf5e046b037ce06619a27c
-EBUILD puppetserver-7.7.0.ebuild 5355 BLAKE2B a056b0cc747b7c04099df4d0a99d33081a60285bdda79286dc9bf6866bd7ca935f6ba74694031974e90fd6450e3078edffa17165f40c9f91fcf7305dac56e70b SHA512 22198f51ab66063f4962a519e2b4be072176baee327f3d7bd4e46931829eb2793b97609a095f814240eba3ed6f23297f10540b0c654a245d2b9f905a89ec4b09
 EBUILD puppetserver-7.8.0.ebuild 5355 BLAKE2B a056b0cc747b7c04099df4d0a99d33081a60285bdda79286dc9bf6866bd7ca935f6ba74694031974e90fd6450e3078edffa17165f40c9f91fcf7305dac56e70b SHA512 22198f51ab66063f4962a519e2b4be072176baee327f3d7bd4e46931829eb2793b97609a095f814240eba3ed6f23297f10540b0c654a245d2b9f905a89ec4b09
 EBUILD puppetserver-7.9.0.ebuild 5356 BLAKE2B d16d614eafd7c9770b1c1b01afa58f7aa51bc5de6055144736a1bce4931f2752861c6e1ab0b0f17a477406b9384e3b492fc4a86d4bdf45ddbba50eda36496c55 SHA512 01ea3ed8ea76519754a51921c9c58aec187192915b3fd92be92df0db6fce8caf78bbeca6af12715581495f85d65c147e6bccdc9b90e3292aad18621e4ce0d4e3
 MISC metadata.xml 341 BLAKE2B 6e19f31ed866283c5827f9ca2550ca99c12d8b9506fbc13447d8bdad3ceaae844d3b103fe6cced8f829a75b7b1c317ef43bd2d1e885e9b509f70b8646a9e5bf6 SHA512 72945305ef496758676dba53925ebbd5cd0d01935fe82708559f941d831bf6b2ce34444d5b85a16b116f577596b2647183fe7b7c6ef92080a8e332fc0226d7ac
diff --git a/app-admin/puppetserver/puppetserver-7.7.0.ebuild b/app-admin/puppetserver/puppetserver-7.7.0.ebuild
deleted file mode 100644
index 7323a3ecf896..000000000000
--- a/app-admin/puppetserver/puppetserver-7.7.0.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit systemd tmpfiles
-
-DESCRIPTION="Puppet Server is the next-generation application for managing Puppet agents"
-HOMEPAGE="http://docs.puppetlabs.com/puppetserver/"
-SRC_URI="https://downloads.puppetlabs.com/puppet/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="puppetdb"
-# will need the same keywords in puppet-agent (puppet-agent now has arm64)
-KEYWORDS="amd64"
-
-RDEPEND+="
-		>=virtual/jdk-1.8.0
-		app-admin/puppet-agent[puppetdb?]"
-DEPEND+="acct-user/puppet
-	acct-group/puppet"
-
-src_prepare() {
-	sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' ext/redhat/puppetserver.service || die
-	sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' ext/bin/puppetserver || die
-	sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' install.sh || die
-	sed -i 's/var\/run/run/g' ext/config/conf.d/puppetserver.conf || die
-	sed -i 's/var\/run/run/g' ext/redhat/puppetserver.service || die
-	sed -i 's/var\/run/run/g' install.sh || die
-	default
-}
-
-src_compile() {
-		einfo "not compiling"
-}
-
-src_install() {
-	insinto /opt/puppetlabs/server/apps/puppetserver
-	insopts -m0774
-	doins ext/ezbake-functions.sh
-	insopts -m0644
-	doins ext/ezbake.manifest
-	doins puppet-server-release.jar
-	insinto /etc/puppetlabs/puppetserver
-	doins ext/config/logback.xml
-	doins ext/config/request-logging.xml
-	insinto /etc/puppetlabs/puppetserver/services.d
-	doins ext/system-config/services.d/bootstrap.cfg
-	doins ext/config/services.d/ca.cfg
-	insinto /etc/puppetlabs/puppetserver/conf.d
-	doins ext/config/conf.d/puppetserver.conf
-	doins ext/config/conf.d/auth.conf
-	doins ext/config/conf.d/global.conf
-	doins ext/config/conf.d/web-routes.conf
-	doins ext/config/conf.d/metrics.conf
-	doins ext/config/conf.d/webserver.conf
-	insopts -m0755
-	insinto /opt/puppetlabs/server/apps/puppetserver/scripts
-	doins install.sh
-	insinto /opt/puppetlabs/server/apps/puppetserver/cli/apps
-	doins ext/cli/ca
-	doins ext/cli/irb
-	doins ext/cli/foreground
-	doins ext/cli/gem
-	doins ext/cli/ruby
-	doins ext/cli/reload
-	doins ext/cli/start
-	doins ext/cli/stop
-	insinto /opt/puppetlabs/server/apps/puppetserver/cli
-	doins ext/cli_defaults/cli-defaults.sh
-	insinto /opt/puppetlabs/server/apps/puppetserver/bin
-	doins ext/bin/puppetserver
-	insopts -m0644
-	dodir /opt/puppetlabs/server/bin
-	dosym ../apps/puppetserver/bin/puppetserver /opt/puppetlabs/server/bin/puppetserver
-	dodir /opt/puppetlabs/bin
-	dosym ../server/apps/puppetserver/bin/puppetserver /opt/puppetlabs/bin/puppetserver
-	dosym ../../opt/puppetlabs/server/apps/puppetserver/bin/puppetserver /usr/bin/puppetserver
-	dodir /opt/puppetlabs/server/apps/puppetserver/config/services.d
-	# other sys stuff
-	dodir /etc/puppetlabs/code
-	# needed for systemd
-	keepdir /var/log/puppetlabs/puppetserver
-	dodir /etc/puppetlabs/puppet/ssl
-	fowners -R puppet:puppet /etc/puppetlabs/puppet/ssl
-	fperms -R 771 /etc/puppetlabs/puppet/ssl
-	# systemd type things
-	insinto /etc/systemd/system/puppetserver.service.d/
-	systemd_dounit ext/redhat/puppetserver.service
-	insinto /etc/default
-	newins ext/default puppetserver
-	# normal init type tasks
-	dosym ../default/puppetserver /etc/conf.d/puppetserver
-	newinitd "${FILESDIR}/puppetserver.init-r1" puppetserver
-	# misc
-	insinto /etc/logrotate.d
-	newins ext/puppetserver.logrotate.conf puppetserver
-	# cleanup
-	dodir /opt/puppetlabs/server/data/puppetserver/jruby-gems
-	fowners -R puppet:puppet /opt/puppetlabs/server/data
-	fperms -R 775 /opt/puppetlabs/server/data/puppetserver
-	fperms -R 700 /var/log/puppetlabs/puppetserver
-	insinto /opt/puppetlabs/server/data
-	doins ext/build-scripts/jruby-gem-list.txt
-	doins ext/build-scripts/mri-gem-list-no-dependencies.txt
-	newtmpfiles ext/puppetserver.tmpfiles.conf puppetserver.conf
-}
-
-pkg_postinst() {
-	tmpfiles_process puppetserver.conf
-
-	elog "to install you may want to run the following:"
-	elog
-	elog "puppet config set --section master vardir  /opt/puppetlabs/server/data/puppetserver"
-	elog "puppet config set --section master logdir  /var/log/puppetlabs/puppetserver"
-	elog "puppet config set --section master rundir  /run/puppetlabs/puppetserver"
-	elog "puppet config set --section master pidfile /run/puppetlabs/puppetserver/puppetserver.pid"
-	elog "puppet config set --section master codedir /etc/puppetlabs/code"
-	elog
-	elog "# install puppetserver gems"
-	elog "cd /opt/puppetlabs/server/apps/puppetserver"
-	elog "echo \"jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/server/data/puppetserver/vendored-jruby-gems }\" > jruby.conf"
-	elog "while read LINE; do"
-	elog "  java -cp puppet-server-release.jar:jruby-9k.jar clojure.main -m puppetlabs.puppetserver.cli.gem --config jruby.conf -- install --no-document \$(echo \$LINE |awk '{print \$1}') --version \$(echo \$LINE |awk '{print \$2}')"
-	elog "done < /opt/puppetlabs/server/data/jruby-gem-list.txt"
-	elog "echo \"jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/puppet/lib/ruby/vendor_gems }\" > jruby.conf"
-	elog "while read LINE; do"
-	elog "  java -cp puppet-server-release.jar:jruby-9k.jar clojure.main -m puppetlabs.puppetserver.cli.gem --config jruby.conf -- install --no-document --ignore-dependencies \$(echo \$LINE |awk '{print \$1}') --version \$(echo \$LINE |awk '{print \$2}')"
-	elog "done < /opt/puppetlabs/server/data/mri-gem-list-no-dependencies.txt"
-}
diff --git a/app-containers/Manifest.gz b/app-containers/Manifest.gz
index ac19b7b005e5..1a8d2976e64a 100644
--- a/app-containers/Manifest.gz
+++ b/app-containers/Manifest.gz
diff --git a/app-containers/buildah/Manifest b/app-containers/buildah/Manifest
index 4c407a02090e..2e8883407f67 100644
--- a/app-containers/buildah/Manifest
+++ b/app-containers/buildah/Manifest
@@ -2,8 +2,10 @@ DIST buildah-1.25.1.tar.gz 14212065 BLAKE2B ec4f668654011f1b93745e1a1d575fdda0cd
 DIST buildah-1.26.1.tar.gz 14159554 BLAKE2B bf17a51653bb07591c19fca449d6f4eeb87693a4d20ae5f12f669b10c328fadd763e0c0fa76605154a5a6439f4e250bc8f00c2d01c9fbf1e266aa67189aafdbd SHA512 07225ebb23e5a815be1ef8acb5d15ef9fb8c6e9324fa9b65ec024f7b6bbe892721f9feaac2911d1b466c2cf336bd0c68e3d1b4df953f13a3390da84a93f76723
 DIST buildah-1.26.2.tar.gz 14155439 BLAKE2B 3f858f86221b64623d94783c0ef3dd15fa14cef730b30cc5f0554e37f9e3e609a6381842b90b7614b6708434ee5c109497ee89f2da89bb9cc5360e2f8b345adb SHA512 f50a7ee787d10a8f8d1a7e0ff9f86990de975df427af894be5bcc84bceafd2eb87dfe75c1b967ae57056299893c942df257aef1e9aaeb712022a8abceeaebba9
 DIST buildah-1.26.3.tar.gz 14468210 BLAKE2B 1ec44501e63bf3594c72575d7460c6478a9d996977659b9fb466fbc658e4923892a77bea9f48a503f02a6101615be9a663f9701ee343436d140d580d8ab01875 SHA512 5d8ea60246085ba27795b52152765fc3c85c92c5caf4515c1b2973aec17844eb9da2ffff82f6c503e36f675089c998b9ee51c4b4b899104ccd9fa771308c8048
+DIST buildah-1.26.4.tar.gz 14471666 BLAKE2B ddedadc8f5eac161bc98ab2460abf356ebef9d09bffb1e681db822ed273d9e424e1d638171fcff667efd956e415f988668e6d9fdb3d15db6ed900441c40736eb SHA512 39425ee3f40f1cfd2c76749b43f07efe19c90dff56d9b2024a69e092a328cf526f6bbb23b6f38536e7df11a465219f8f344aa643a82f6511fbb0253e5729d71a
 EBUILD buildah-1.25.1.ebuild 1196 BLAKE2B 3f0e2e2cb09af594cac29666ef4c9b1f3b7721659f6fff2ff29fa9ebc30f841cb2703d5fd3ce41b4dcc32a30841372ae3b3d36af791423bca05c4f70f2ce655a SHA512 ec2aa76c2ba6676d828534e2ceb7a5e12f800d44b382c35ca2bd76f24631084103ba6e94f519252d90bf4511e47ac0d341dfab3c2f5206781096e87203d51fe7
 EBUILD buildah-1.26.1.ebuild 1198 BLAKE2B 7e9ccc06d48faa040cca405dcc77d031852f903b0246cbc5678271df37c9a977e095a0787b8ef29fbc2d1cb83170252dab4787c3060150167d9e713503776e74 SHA512 62effe1025136327f5f94b3d34213a545d05cb8eb7e778f259317f4c0adbc90b442d3b0eac833439d16efe5c40bd32c58e09a2b75c346d743e191fa008409437
 EBUILD buildah-1.26.2.ebuild 1198 BLAKE2B f78c35be3ea11e7ba619cb672b8ee9be5a0a93119d81aece756a3112e437704b751b953e0cd9c75abcfe93e281ad39f29eedf8d42e4147bd80affdc78625cf10 SHA512 bf3f00632b547a3c8824e76cce3021442a1556a563fef43237b7e061c3284bed9340703b10c1b1bbc94d233ee8302a2893afe338edc1ab3b3256b681231dcdcc
 EBUILD buildah-1.26.3.ebuild 1198 BLAKE2B 7fb6c618e0789b389c9bc0f9bc64c4491e6ec5b3d3fe26913d363a37bda2fd0c8c87221f453a7d28491a4ce39c5fe2f0aadd1b6354ee0f70f8d2280c3c47566c SHA512 eda025f7e065ec0ba6d5e4ffab07c47c1e5cd0dc5d7b1331bbccc6355e93f23700665c170d374777ac1097af0727279bdcd937f7a41da427808a62ed6e1ed5a4
+EBUILD buildah-1.26.4.ebuild 1198 BLAKE2B 7de216f4a417a670bc3bda68939ce926263af2080eeb6673b17c170f453a9ce37532546e1a05b974ff2598083cdcaba1d5b870e4eefe2a0d1fc6e734b3a62195 SHA512 0ab4523efe4ecb9e77a5721180bc16e4489c4fa3832e896343304b7e10006fe75d72b140beb0718b3179e63b78cf185841dfb678191709ed8b31ddadf8af165d
 MISC metadata.xml 328 BLAKE2B 55d2d2b5cc972b7e6b6fb77d14e79e304adcbc7056ff351f5ee3cac6cf5f83b4ef2a10c70754d1d30a5ecd88e652abc07cddd8005c3767e7f709c0c5cb61d068 SHA512 7520f5745909da195d4bfdd750e4c716c461a3789adfde56dd9be46b91dfb789653d642c0958b5a2950eea220cc00143bfcd5db402fcc2578c8fe5f8ff69275f
diff --git a/app-containers/buildah/buildah-1.26.4.ebuild b/app-containers/buildah/buildah-1.26.4.ebuild
new file mode 100644
index 000000000000..956963e68243
--- /dev/null
+++ b/app-containers/buildah/buildah-1.26.4.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit bash-completion-r1 go-module
+GIT_COMMIT=981f8017
+
+DESCRIPTION="A tool that facilitates building OCI images"
+HOMEPAGE="https://github.com/containers/buildah"
+SRC_URI="https://github.com/containers/buildah/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="selinux"
+
+RDEPEND="app-crypt/gpgme:=
+	app-containers/skopeo
+	dev-libs/libgpg-error:=
+	dev-libs/libassuan:=
+	sys-apps/shadow:=
+	sys-fs/lvm2:=
+	sys-libs/libseccomp:=
+	selinux? ( sys-libs/libselinux:= )"
+DEPEND="${RDEPEND}"
+
+RESTRICT+=" test"
+
+src_prepare() {
+	default
+	[[ -f selinux_tag.sh ]] || die
+	use selinux || { echo -e "#!/bin/sh\ntrue" > \
+		selinux_tag.sh || die; }
+	sed -i -e 's/make -C/$(MAKE) -C/' Makefile || die 'sed failed'
+}
+
+src_compile() {
+	emake GIT_COMMIT=${GIT_COMMIT} all
+}
+
+src_install() {
+	dodoc CHANGELOG.md CONTRIBUTING.md README.md install.md troubleshooting.md
+	doman docs/*.1
+	dodoc -r docs/tutorials
+	dobin bin/{${PN},imgtype}
+	dobashcomp contrib/completions/bash/buildah
+}
+
+src_test() {
+	emake test-unit
+}
diff --git a/app-containers/grype/Manifest b/app-containers/grype/Manifest
index 525bd33978df..27d9267bc60e 100644
--- a/app-containers/grype/Manifest
+++ b/app-containers/grype/Manifest
@@ -1,5 +1,8 @@
 DIST grype-0.44.0-deps.tar.xz 641743984 BLAKE2B f30557d75628f84dff70ca4272555c7c3577bfe572c9ba16b0e78bc472732d5e82e734ed1ba4dfed59dbb86dc6a788d1379824e7b31bcdd148c5dff43f87e011 SHA512 de46c03f35f70353f0250b77364252316c48f70c1c4549f5d2a680062faee0305c7190906087e94d927333c4fae76de3c3b16046e3f3dc089013b66e132a2ff9
 DIST grype-0.44.0.tar.gz 1071804 BLAKE2B 2334ec9b9c04dfc03dbd280725a55bb6cdcd4569431eeb94abe799c75be08ff5164446cba7e97e3dc0ed8dcc10ba4bc8f70edecf9766cdc63e91b3dd420de391 SHA512 7573d03c2e0cbabb6ae3a91ebaa65848a7b43fc3624416f6c52a001acf6cfc839bce806e8e914c29bc2d0fc1aadd9b568ffc21d5a60bd9c05905e0185d7bdcd3
+DIST grype-0.45.0-deps.tar.xz 644905072 BLAKE2B 5f1dd53106798b861ed90ed502406aa844fb99448fc8bf30dec3d32749db00c11106a16a93c2d92893cb2e8611b6dae7c63d9a5dfcc56b98fd373c3f8ddafc28 SHA512 31c343e898a880c91f7153e258e68d4c350484c9edcabb7b4a0df4d18a10b518b6878d04b5d96b8029855bf81f0b59fc052ee1cac3bcb27bdcfa334bdbe876ce
+DIST grype-0.45.0.tar.gz 1074637 BLAKE2B 4cfa86a0ad695971241c40f19f982f54654642ff31f7220583af3b3aa0c1d6ca56f613e96b7343c4cb32b567efeb81c2145c19f009183b3d7f23ddeb1f01e02d SHA512 0a899c420d3d6ed9e669a0d02b0d79f0c63d50288b31c44cbbe61a883d46b93bf98be263cd7859d392ee40b82754c8cbe9b284dec593f79c5906988b01369209
 EBUILD grype-0.44.0-r1.ebuild 1018 BLAKE2B 6642d3ab6abee69d6b6467469a4a3a8a9a625db99509c318fed928a223dc75bd012699f0189818603499ea39ff159d5ff273b344f0960471f6fe391bbc66919e SHA512 8f7965f641e810a222dc3962da5f0da8e6730258093f3df6add5a4dbd93c642cf78e05a31435fda0460a6ab8bcc3d878d6522fed8b161485a0882e391b59e8d5
 EBUILD grype-0.44.0.ebuild 511 BLAKE2B c1cf14d31e5d8bf842ce01048f0f3e9813e19e16d39222b3ae485134418587dbef88eaa5122ab37e693b635e0336835449aeea430df8fda7dac8b116e72b5c4c SHA512 b5f79ba354cc9db9dccff1c3e5b87be41924d5fc07df36b85a4fa20e65b04f9b473d0742620ba9238fe92644a8ff2a67c16e62708e6fbf11d690f205e8319dec
+EBUILD grype-0.45.0.ebuild 1018 BLAKE2B a44a04fe7e93332d9896c23b6e676d0c79b426e9315251727a3197fc447084273692b3bb44a19e597f3c05a42f518659f9e1787cc24ec613266e33e49d84427a SHA512 5ddfb95f8bcb504dbfa59ddcd635b3bb8e32500b429c65dc779fda8a6ba1bdf5935baa46034d6875dab551f71f0fd28b9e1e712985bdc942f24f8834cc294f01
 MISC metadata.xml 243 BLAKE2B 63665ae2020bc799fa6ebd6e1fca6755be6498803fdbc17cc630f9f4ffa03fbd46a9ad396e70adc3bc1c32b0a746fe4bab1c6291f32e68e636251207bca9e95c SHA512 78eab20831018fcf4957171a83aaaca9ced53380e01f083c07450c30fa1adfc02dd50ff2fa9f491dd62802f6e779264add1c47a09ade0a35cda558c1d5529ad0
diff --git a/app-containers/grype/grype-0.45.0.ebuild b/app-containers/grype/grype-0.45.0.ebuild
new file mode 100644
index 000000000000..44c3442495f8
--- /dev/null
+++ b/app-containers/grype/grype-0.45.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module
+GIT_COMMIT=8fe761b41ffc280e58e82b7fbba4d0d1a05aeb91
+SYFT_VERSION=0.53.4
+
+DESCRIPTION="A vulnerability scanner for container images and filesystems"
+HOMEPAGE="https://www.anchore.com"
+SRC_URI="https://github.com/anchore/grype/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+# tests require a running docker
+RESTRICT="test"
+
+src_compile() {
+	ego build -o bin/grype -ldflags "
+		-extldflags '-static'
+		-X github.com/anchore/grype/internal/version.version=${PV}
+		-X github.com/anchore/grype/internal/version.syftVersion=${SYFT_VERSION}
+		-X github.com/anchore/grype/internal/version.gitCommit=${GIT_COMMIT}
+			-X github.com/anchore/grype/internal/version.buildDate=${BUILD_DATE}
+			-X github.com/anchore/grype/internal/version.gitDescription=v${PV}"
+}
+
+src_install() {
+	dobin bin/grype
+}
diff --git a/app-containers/syft/Manifest b/app-containers/syft/Manifest
index 7fb3be61838b..61b75f68d0d3 100644
--- a/app-containers/syft/Manifest
+++ b/app-containers/syft/Manifest
@@ -1,5 +1,8 @@
 DIST syft-0.52.0-deps.tar.xz 962322444 BLAKE2B 696dd14adf54c8ab51cc91d22028ce0ace3b6a5835fb8c3ce6d26080f0ce75d2a9ca332f2275a71706a2152519b01a71577827ac63c12ffb87ad1605ffd18b28 SHA512 b6897a12b8a15c8c2b4672e93ca03fe26a182ee87e48ac4bdd26057f544a6a45aa5ce6317a38e157b99a70830d4a0241f8b4cb15f8fffccaf195ac4c4ff64cd8
 DIST syft-0.52.0.tar.gz 3726656 BLAKE2B de8492adde3bef944a9b853990ba5909aa14ccc223f42833fa2a49d1bd5772455bd3ab9ac3a8886b353dc79c6e93338e43e9c448623bd31c422155e0adb1f276 SHA512 2ffaaa154546061d1d61bf8f0b3d5cf10282dbbb08876cc9e87777a23efdba1fd462c395ee4cf14d334f49ae4575e2db5fe8b5fbe7439dd24ff22ec8efeb6501
+DIST syft-0.53.4-deps.tar.xz 668995648 BLAKE2B a2120e677e1438ea8dc369939c157dcdff772bd98b1f32d6ac3edfb553cfc0f6dfde8dfe86f0b4306a4286dca08646e79f72c3cde8bcc86f7308dff6f22755fe SHA512 beaf914bcecf75d461e241aa3b96ac162dd8e5c1ffd69fa117ea6170b2f6f1c76a424e33e5a29cf177c0c5ac55b3399bae6cab564f055b80ba745dd28ebdef40
+DIST syft-0.53.4.tar.gz 3765398 BLAKE2B 15abe368451c14dc0afa9c0d63cdd10d056c0b09f906478188c772241750e0d9e903bd0efe55d87c0c04c4a5a21fa5bc3e1e63b0115e2b24e068d0a52e68b560 SHA512 9267e45165b860540a89ad6c317351abe26d3089294ec9698fa26b37c4413581424f43aae3f01a111b68806c6de30e8464fce27eda1b1cba442e1e0f613843c5
 EBUILD syft-0.52.0-r1.ebuild 1017 BLAKE2B a4b66cc02469d967489b9f61af5712ba7475e11e8109256af241b4606a6762a9680d29b0d206bd4398851fa9ae61a99a1fa7f93b5947fc6a9fb7f293dd96adb8 SHA512 d79f5db1f6d39a494545defe4ddd386de74f53234ad2dadbfd7ad0e2cf3faadb93cd0fea2b3aca18ae703fead219b57be3b89baf1e90e92e55992b5eb94f314f
 EBUILD syft-0.52.0.ebuild 531 BLAKE2B cc3863fc3db089b85095646c7de8eb1b8a74cbdd72e7e7eedd57e3082443ee2ac685a87094336530e23d9097fbb7ade8699fc54e98f0910c6a33bb1d935ef166 SHA512 c248c0cda550e2479736a22dd25777ce6cd11d97c4468db14a2b43f57e78c6780c957a0502e461af41b941c5056c947bc5026e7f2aa50420a7bffe82302c3356
+EBUILD syft-0.53.4.ebuild 1017 BLAKE2B 3809b7129c509d101b810f283d6bf4f7adb1c53e1e184e70bc505e9d154cba4750b001e54a26a2bf05a4dd365b8ee267dbb6c02802ee42cfacd135be5abc1d17 SHA512 e1f49921d15524cfb5f5f6ffa7e35b5edde7e4f48b5adbf7c1d0d10f4c40d6e225fffe14420825a6f138d4463f041d32428efbcfdb5ee48f0c10a7b0d43813e7
 MISC metadata.xml 243 BLAKE2B 63665ae2020bc799fa6ebd6e1fca6755be6498803fdbc17cc630f9f4ffa03fbd46a9ad396e70adc3bc1c32b0a746fe4bab1c6291f32e68e636251207bca9e95c SHA512 78eab20831018fcf4957171a83aaaca9ced53380e01f083c07450c30fa1adfc02dd50ff2fa9f491dd62802f6e779264add1c47a09ade0a35cda558c1d5529ad0
diff --git a/app-containers/syft/syft-0.53.4.ebuild b/app-containers/syft/syft-0.53.4.ebuild
new file mode 100644
index 000000000000..00e3a35973be
--- /dev/null
+++ b/app-containers/syft/syft-0.53.4.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module
+GIT_COMMIT=69bde44c6e50a5838cdd2c2c821edb0111013178
+
+DESCRIPTION="Generate a Software Bill of Materials from container images and filesystems"
+HOMEPAGE="https://www.anchore.com"
+SRC_URI="https://github.com/anchore/syft/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+
+# tests require a running docker daemon
+RESTRICT="test"
+
+src_compile() {
+	local BUILD_DATE
+	BUILD_DATE=$(date -u +%Y-%m-%dT%H:%M:%SZ)
+	ego build -o bin/syft -ldflags "
+		-extldflags '-static'
+		-X github.com/anchore/syft/internal/version.version=${PV}
+		-X github.com/anchore/syft/internal/version.gitCommit=${GIT_COMMIT}
+			-X github.com/anchore/syft/internal/version.buildDate=${BUILD_DATE}
+			-X github.com/anchore/syft/internal/version.gitDescription=v${PV}
+		" ./cmd/syft
+}
+
+src_install() {
+	dobin bin/*
+}
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 7191a843b1e9..e09779839d53 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/xsdlib/Manifest b/dev-java/xsdlib/Manifest
index 3c4b433cf658..6974dd08f0f3 100644
--- a/dev-java/xsdlib/Manifest
+++ b/dev-java/xsdlib/Manifest
@@ -1,5 +1,5 @@
 DIST xsdlib-2013.6.1-sources.jar 274740 BLAKE2B 356c3e6005c26a1b63ea016a523140d93bb8c6a4c1952d60f5a881c92dd013e1691451be96e31b7c96c48e1f182e0224bceb712e230bb008ad97732a8e9ffdb6 SHA512 a4e308fae6a1116158ddbebfad0570f6cf1f840acb72de8bdd9414b363da78edf6aea2349f4ac7511b774a494f9e4c17c309f86aefc39b30421a1c86945302b0
 DIST xsdlib.20090415.zip 914126 BLAKE2B 7f8dc45c590606ece1775d08634f87bb7cd392c69c66204073d4867f925cf7159fe14b43cde6d59a72da90ab284d9a3adc0c4d6aa117ea5143eff8efc5bf6534 SHA512 479b20bb24c32f7a8bf548689cb6d7efc99e36d7f887d9e33b34b2e4707d74149ae1e312f7166a90acbd44422248729d6158a55d710616b656eb628cafc1e3f2
 EBUILD xsdlib-20090415-r1.ebuild 1194 BLAKE2B f1229a0275c91114f42476ae8e58c2792451b0a656f32f890fad2c05337ea36cf4714ab55aee0a37e71090c28f6631128ae610d6acac758b444d733e7318e050 SHA512 1d204071ae5193ac531c695784639cf1b18db853265aed676517eacb9e4469a0efe6b3df3d4d0db4a6e24ae38c0972dd04719d6f481560880d257dfa6ddda564
-EBUILD xsdlib-2013.6.1.ebuild 920 BLAKE2B a4c7fa253716a28ac78518472f84ca7682c80188e4cadfd802479513a3a20bb9f5b21263a263632e7e71b7b98aff60c457eb6fae7f5824987706037dd595cd0a SHA512 87f0acf3c483014e7c9b65395d22aa12c137dd4b9a3837a12ef1eda5098acf64c1701b7e3d6e1d6a6b956ece116af17bb9fdfa0319ac7252ac6dc03e9277978e
+EBUILD xsdlib-2013.6.1.ebuild 919 BLAKE2B fd843917328a72c37d6b802b096a46a77c0eb791880f0a98eacceace6a0dab70c0341c57171bac5dabfd36ac8369996b92750196114f4d510f666ba7df674f87 SHA512 16996b817d1136658aed80f3c2d83b7e534a7821c53d1b98871efcd3095135b0ef8c1e6001c96bffbdc6aedad90299ffd88416c837dcf5de1b6f8304df425c98
 MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/dev-java/xsdlib/xsdlib-2013.6.1.ebuild b/dev-java/xsdlib/xsdlib-2013.6.1.ebuild
index 986f5e46081a..e359fba350b3 100644
--- a/dev-java/xsdlib/xsdlib-2013.6.1.ebuild
+++ b/dev-java/xsdlib/xsdlib-2013.6.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://repo1.maven.org/maven2/net/java/dev/msv/xsdlib/${PV}/xsdlib-${P
 
 LICENSE="BSD Apache-1.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 CP_DEPEND="dev-java/relaxng-datatype:0"
 BDEPEND="app-arch/unzip"
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index f9e40b39d9c8..b99cf1b604ef 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index a196a1cbada7..77de558d22d5 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -7,9 +7,13 @@ AUX php80-firebird-warnings.patch 1949 BLAKE2B ab1b693afe26b6529aab8628f9a614478
 DIST php-7.4.30.tar.xz 10419136 BLAKE2B 5860ead4051173d3139f93be24f15c7ed2044a9e6b3488234aaca73dff8abace3adf00bde782c3fc950d81d2dfdb67979bb5b99c3587d07f5ccbe782d9cba37d SHA512 7bce44a23c07193c10c57459f08b08fdce4e3a269d6829a61371d1b1f117ecf4e167805a40e1a5e7687f534aee9d5f5745a3f4dcb344e9e781c105bc964ed738
 DIST php-8.0.20.tar.xz 10879064 BLAKE2B 3b18d6593ddc78e1c289b87ba8bb65e55cbd815d2b06d4f9759265e9ae76ea6b78dc9f52652be1b1a721ccfe736f80d2a8f59c01ba4c38a8ff46710753bcc9ed SHA512 24153733111bb5104298679fb5ee02d8abad4e6b2a8e0a07c2a6076e1c9104309abe56bcb7b5fe17670c266e5e9981c520ed0ac12b699ae0050953ff99ef04fa
 DIST php-8.0.21.tar.xz 10785364 BLAKE2B ea8a640b47c96b235b49ce3a98accbfa4aa967c7e917684e19667a74ca0f77e070847dabdf15c3dbd56cff01ef662e79e9408d3e57e870e51893e969291a0932 SHA512 c1c1577f3d6af445d8ac15338877186f2a639a76ad980328011cb0a5e9592bdb24c1cda7ae8a0c495c881497d54cbca6e1373ede71bf097e69a040368841d567
+DIST php-8.0.22.tar.xz 10785228 BLAKE2B 3dbbcd47d138ffe8765942fec820a654e8ebffacb912be82f007fa6b5afd2f8daa4378ffd09a910edbb05affb9983e1585f7b2cbb3f30f12f1d3e88ebcdef15a SHA512 e4f117331aed84542034524df96e14a73fe4770205c38576659cec90e376e205a8c4a16191119a73d1115e731b3d16cbdaac4a2e4267738e9b9beb22b0add5a7
 DIST php-8.1.8.tar.xz 11722100 BLAKE2B 117e0823b47485d4fc469edfbc5e9051b5d35588bf36a2d9e12282b83c12056cfc2a4376bf0e21b5f947190a906e3e4fdde7bec20b7ea7e9ab36912e865c2c13 SHA512 4ef03b4c412bdbcdf6c3dc4784b3218a0519e6b91a0682e796270d4426c05c62309b4835ea31271857a5f2535d00f20a9f9b4a79703a49c3e40f16fafa948dd4
+DIST php-8.1.9.tar.xz 11787892 BLAKE2B f35911f272e0c0118841d713e52a347b001324d9456613b749e06031a6a2a292e4c813c950e329889af46f2e585eb3de92f825cff9bcb51f09b74e056fedda75 SHA512 a75731edbfa6e8841d4c836336b07fd7aec4668b3d38487e630015cfc9d76fdfd04bae946d4fe783679df05adee7e2617b42ca4d3c2415c0f88ed5bffad87d7d
 EBUILD php-7.4.30.ebuild 21310 BLAKE2B f2342deede65a4c66380a77b43d26ff7d09e31a13cac7c4d44d558f619e96498ca83941b0d550d33818dc48622bbc7c92f4535b0eccd39faa5a9035f1d88ccea SHA512 55fa2460ba1e9142311b78849884b45d2fe013d6592249746b7b2c0c0e1d09ce1264a8e205639b2f4a2058e07c7fd8ae132a0862200da11b0108ab04d45712d6
 EBUILD php-8.0.20.ebuild 21845 BLAKE2B 9bbc8fcd79a39502a50257ba00eb68abaa8313306d2554e3ade270203bd872fa66083a57fc10f6d4e7e46c8930efbfcf6de7c6562d2499dc262fb690db1aeb7d SHA512 af251c56145df7af13bbbcb73dce4f311af742245e5558cf062a6505526c77e45637adc99454471f5d30791ced2a9fd96438191bce71a1275df2137b85043c5c
 EBUILD php-8.0.21.ebuild 21852 BLAKE2B 11b093daf7700943d1349f68d2e0d6511b149eeeb0ea22669ad4df07cb743f6b27a1cc67a7bbf9d47a7aaba65daa44ad65755fe1185667dc7de9d4a0f8f40b57 SHA512 deb66942b30e5a2156218f9eee559d0ff9881e0d365e832f8e764f9febcfffa00021ccad3f500be60045deb6598a3f3b058eec3c99b886cbf2111c2c96c8647c
+EBUILD php-8.0.22.ebuild 21852 BLAKE2B 11b093daf7700943d1349f68d2e0d6511b149eeeb0ea22669ad4df07cb743f6b27a1cc67a7bbf9d47a7aaba65daa44ad65755fe1185667dc7de9d4a0f8f40b57 SHA512 deb66942b30e5a2156218f9eee559d0ff9881e0d365e832f8e764f9febcfffa00021ccad3f500be60045deb6598a3f3b058eec3c99b886cbf2111c2c96c8647c
 EBUILD php-8.1.8.ebuild 21858 BLAKE2B ee7b59351797d0e5819b3216b92975bec678941aa41da1b204c06f8fe55ac4e66efb032293c0afa7927ee7a6ef9b9d51c91531e80526df2a0ad1274e4d6a114e SHA512 7f3a23f64e997439b250d43a25dece1e15ce1f722c10f11d107ffa19cb68b3baf2c89cc67db53c10fe10833d855b21f608df5cd43bf9e0091e81d3dcfefb7f13
+EBUILD php-8.1.9.ebuild 21802 BLAKE2B 1beed9c3626102b03414da382bf1e52e05bacc2fc490d6cbeebe2b9d750338e2c43f417de63a7a0c5a1429becaf80e4b5e5224ff1d958ece27ce523529539fab SHA512 0040527b43e0a7b5bbfbc9e814a7d286a1c8e0a4cc99ad369ab0fb28fb90dc8cffa59e9b30ec5611bdc1111982524451d9c55d38a239f523dbbb2f30d9dc4c80
 MISC metadata.xml 3230 BLAKE2B 215062835c9f7ae9d570a40b3a6e59c7a2b7fb51e0fb9b89cd51888f54e2cbee1cbcf571b8ccfef3ed1970949dcac81bb411ca6536e972875b184caee688cb12 SHA512 03d948a300d3a29a113248b371be92fa9c1c4feb371886a9cab335e956a2ff9958cb9b5449aab88a5306bcafed42161ac88655115a1e286fa9e876920ad1d59a
diff --git a/dev-lang/php/php-8.0.22.ebuild b/dev-lang/php/php-8.0.22.ebuild
new file mode 100644
index 000000000000..c9ead2270c39
--- /dev/null
+++ b/dev-lang/php/php-8.0.22.ebuild
@@ -0,0 +1,758 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+WANT_AUTOMAKE="none"
+
+inherit flag-o-matic systemd autotools
+
+MY_PV=${PV/_rc/rc}
+DESCRIPTION="The PHP language runtime engine"
+HOMEPAGE="https://www.php.net/"
+SRC_URI="https://www.php.net/distributions/${P}.tar.xz"
+
+LICENSE="PHP-3.01
+	BSD
+	Zend-2.0
+	bcmath? ( LGPL-2.1+ )
+	fpm? ( BSD-2 )
+	gd? ( gd )
+	unicode? ( BSD-2 LGPL-2.1 )"
+
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+# We can build the following SAPIs in the given order
+SAPIS="embed cli cgi fpm apache2 phpdbg"
+
+# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
+IUSE="${IUSE}
+	${SAPIS/cli/+cli}
+	threads"
+
+IUSE="${IUSE} acl apparmor argon2 bcmath berkdb bzip2 calendar cdb cjk
+	coverage +ctype curl debug
+	enchant exif ffi +fileinfo +filter firebird
+	+flatfile ftp gd gdbm gmp +iconv imap inifile
+	intl iodbc ipv6 +jit kerberos ldap ldap-sasl libedit lmdb
+	mhash mssql mysql mysqli nls
+	oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
+	readline selinux +session session-mm sharedmem
+	+simplexml snmp soap sockets sodium spell sqlite ssl
+	sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode webp
+	+xml xmlreader xmlwriter xpm xslt zip zlib"
+
+# Without USE=readline or libedit, the interactive "php -a" CLI will hang.
+# The Oracle instant client provides its own incompatible ldap library.
+REQUIRED_USE="
+	|| ( cli cgi fpm apache2 embed phpdbg )
+	cli? ( ^^ ( readline libedit ) )
+	!cli? ( ?? ( readline libedit ) )
+	truetype? ( gd zlib )
+	webp? ( gd zlib )
+	cjk? ( gd zlib )
+	exif? ( gd zlib )
+	xpm? ( gd zlib )
+	gd? ( zlib )
+	simplexml? ( xml )
+	soap? ( xml )
+	xmlreader? ( xml )
+	xmlwriter? ( xml )
+	xslt? ( xml )
+	ldap-sasl? ( ldap )
+	oci8-instant-client? ( !ldap )
+	qdbm? ( !gdbm )
+	session-mm? ( session !threads )
+	mysql? ( || ( mysqli pdo ) )
+	firebird? ( pdo )
+	mssql? ( pdo )
+"
+
+RESTRICT="!test? ( test )"
+
+# The supported (that is, autodetected) versions of BDB are listed in
+# the ./configure script. Other versions *work*, but we need to stick to
+# the ones that can be detected to avoid a repeat of bug #564824.
+COMMON_DEPEND="
+	>=app-eselect/eselect-php-0.9.7[apache2?,fpm?]
+	>=dev-libs/libpcre2-10.30[jit?,unicode]
+	fpm? ( acl? ( sys-apps/acl ) apparmor? ( sys-libs/libapparmor ) )
+	apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] )
+	argon2? ( app-crypt/argon2:= )
+	berkdb? ( || (	sys-libs/db:5.3 sys-libs/db:4.8 ) )
+	bzip2? ( app-arch/bzip2:0= )
+	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
+	coverage? ( dev-util/lcov )
+	curl? ( >=net-misc/curl-7.29.0 )
+	enchant? ( app-text/enchant:2 )
+	ffi? ( >=dev-libs/libffi-3.0.11:= )
+	firebird? ( dev-db/firebird )
+	gd? ( media-libs/libjpeg-turbo:0= media-libs/libpng:0= )
+	gdbm? ( >=sys-libs/gdbm-1.8.0:0= )
+	gmp? ( dev-libs/gmp:0= )
+	iconv? ( virtual/libiconv )
+	imap? ( >=virtual/imap-c-client-2[kerberos=,ssl=] )
+	intl? ( dev-libs/icu:= )
+	kerberos? ( virtual/krb5 )
+	ldap? ( >=net-nds/openldap-1.2.11:= )
+	ldap-sasl? ( dev-libs/cyrus-sasl )
+	libedit? ( dev-libs/libedit )
+	lmdb? ( dev-db/lmdb:= )
+	mssql? ( dev-db/freetds[mssql] )
+	nls? ( sys-devel/gettext )
+	oci8-instant-client? ( dev-db/oracle-instantclient[sdk] )
+	odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) )
+	postgres? ( >=dev-db/postgresql-9.1:* )
+	qdbm? ( dev-db/qdbm )
+	readline? ( sys-libs/readline:0= )
+	session-mm? ( dev-libs/mm )
+	snmp? ( >=net-analyzer/net-snmp-5.2 )
+	sodium? ( dev-libs/libsodium:=[-minimal] )
+	spell? ( >=app-text/aspell-0.50 )
+	sqlite? ( >=dev-db/sqlite-3.7.6.3 )
+	ssl? ( >=dev-libs/openssl-1.0.1:0= )
+	tidy? ( app-text/htmltidy )
+	tokyocabinet? ( dev-db/tokyocabinet )
+	truetype? ( =media-libs/freetype-2* )
+	unicode? ( dev-libs/oniguruma:= )
+	webp? ( media-libs/libwebp:0= )
+	xml? ( >=dev-libs/libxml2-2.9.0 )
+	xpm? ( x11-libs/libXpm )
+	xslt? ( dev-libs/libxslt )
+	zip? ( >=dev-libs/libzip-1.2.0:= )
+	zlib? ( >=sys-libs/zlib-1.2.0.4:0= )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	virtual/mta
+	fpm? (
+		selinux? ( sec-policy/selinux-phpfpm )
+		systemd? ( sys-apps/systemd ) )"
+
+# Bison isn't actually needed when building from a release tarball
+# However, the configure script will warn if it's absent or if you
+# have an incompatible version installed. See bug 593278.
+DEPEND="${COMMON_DEPEND}
+	app-arch/xz-utils
+	>=sys-devel/bison-3.0.1"
+
+BDEPEND="virtual/pkgconfig"
+
+PHP_MV="$(ver_cut 1)"
+
+PATCHES=(
+	"${FILESDIR}/php-iodbc-header-location.patch"
+	"${FILESDIR}/php80-firebird-warnings.patch"
+)
+
+php_install_ini() {
+	local phpsapi="${1}"
+
+	# work out where we are installing the ini file
+	php_set_ini_dir "${phpsapi}"
+
+	# Always install the production INI file, bug 611214.
+	local phpinisrc="php.ini-production-${phpsapi}"
+	cp php.ini-production "${phpinisrc}" || die
+
+	# default to /tmp for save_path, bug #282768
+	sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" || die
+
+	# Set the extension dir
+	sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" \
+		-i "${phpinisrc}" || die
+
+	# Set the include path to point to where we want to find PEAR packages
+	sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die
+
+	insinto "${PHP_INI_DIR#${EPREFIX}}"
+	newins "${phpinisrc}" php.ini
+
+	elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
+	elog
+
+	dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
+	dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
+
+	if use opcache; then
+		elog "Adding opcache to $PHP_EXT_INI_DIR"
+		echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> \
+			 "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
+		dosym "../ext/opcache.ini" \
+			  "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
+	fi
+
+	# SAPI-specific handling
+	if [[ "${sapi}" == "fpm" ]] ; then
+		einfo "Installing FPM config files php-fpm.conf and www.conf"
+		insinto "${PHP_INI_DIR#${EPREFIX}}"
+		doins sapi/fpm/php-fpm.conf
+		insinto "${PHP_INI_DIR#${EPREFIX}}/fpm.d"
+		doins sapi/fpm/www.conf
+	fi
+
+	dodoc php.ini-{development,production}
+}
+
+php_set_ini_dir() {
+	PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
+	PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
+	PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
+}
+
+src_prepare() {
+	default
+
+	# In php-7.x, the FPM pool configuration files have been split off
+	# of the main config. By default the pool config files go in
+	# e.g. /etc/php-fpm.d, which isn't slotted. So here we move the
+	# include directory to a subdirectory "fpm.d" of $PHP_INI_DIR. Later
+	# we'll install the pool configuration file "www.conf" there.
+	php_set_ini_dir fpm
+	sed -i "s~^include=.*$~include=${PHP_INI_DIR}/fpm.d/*.conf~" \
+		sapi/fpm/php-fpm.conf.in \
+		|| die 'failed to move the include directory in php-fpm.conf'
+
+	# Emulate buildconf to support cross-compilation
+	rm -fr aclocal.m4 autom4te.cache config.cache \
+		configure main/php_config.h.in || die
+	eautoconf --force
+	eautoheader
+
+	# Remove false positive test failures
+	# stream_isatty fails due to portage redirects
+	# curl tests here fail for network sandbox issues
+	# session tests here fail because we set the session directory to $T
+	rm tests/output/stream_isatty_err.phpt \
+	   tests/output/stream_isatty_out-err.phpt \
+	   tests/output/stream_isatty_out.phpt \
+	   ext/curl/tests/bug76675.phpt \
+	   ext/curl/tests/bug77535.phpt \
+	   ext/curl/tests/curl_error_basic.phpt \
+	   ext/session/tests/bug74514.phpt \
+	   ext/session/tests/bug74936.phpt || die
+
+}
+
+src_configure() {
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+	addpredict /var/lib/net-snmp/mib_indexes #nowarn
+
+	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
+
+	# The php-fpm config file wants localstatedir to be ${EPREFIX}/var
+	# and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002.
+	local our_conf=(
+		--prefix="${PHP_DESTDIR}"
+		--mandir="${PHP_DESTDIR}/man"
+		--infodir="${PHP_DESTDIR}/info"
+		--libdir="${PHP_DESTDIR}/lib"
+		--with-libdir="$(get_libdir)"
+		--localstatedir="${EPREFIX}/var"
+		--without-pear
+		$(use_enable threads zts)
+	)
+
+	our_conf+=(
+		$(use_with apparmor fpm-apparmor)
+		$(use_with argon2 password-argon2 "${EPREFIX}/usr")
+		$(use_enable bcmath)
+		$(use_with bzip2 bz2 "${EPREFIX}/usr")
+		$(use_enable calendar)
+		$(use_enable coverage gcov)
+		$(use_enable ctype)
+		$(use_with curl)
+		$(use_enable xml dom)
+		$(use_with enchant)
+		$(use_enable exif)
+		$(use_with ffi)
+		$(use_enable fileinfo)
+		$(use_enable filter)
+		$(use_enable ftp)
+		$(use_with nls gettext "${EPREFIX}/usr")
+		$(use_with gmp gmp "${EPREFIX}/usr")
+		$(use_with mhash mhash "${EPREFIX}/usr")
+		$(use_with iconv iconv \
+			$(use elibc_glibc || use elibc_musl || echo "${EPREFIX}/usr"))
+		$(use_enable intl)
+		$(use_enable ipv6)
+		$(use_with kerberos)
+		$(use_with xml libxml)
+		$(use_enable unicode mbstring)
+		$(use_with ssl openssl)
+		$(use_enable pcntl)
+		$(use_enable phar)
+		$(use_enable pdo)
+		$(use_enable opcache)
+		$(use_with postgres pgsql "${EPREFIX}/usr")
+		$(use_enable posix)
+		$(use_with spell pspell "${EPREFIX}/usr")
+		$(use_enable simplexml)
+		$(use_enable sharedmem shmop)
+		$(use_with snmp snmp "${EPREFIX}/usr")
+		$(use_enable soap)
+		$(use_enable sockets)
+		$(use_with sodium)
+		$(use_with sqlite sqlite3)
+		$(use_enable sysvipc sysvmsg)
+		$(use_enable sysvipc sysvsem)
+		$(use_enable sysvipc sysvshm)
+		$(use_with tidy tidy "${EPREFIX}/usr")
+		$(use_enable tokenizer)
+		$(use_enable xml)
+		$(use_enable xmlreader)
+		$(use_enable xmlwriter)
+		$(use_with xslt xsl)
+		$(use_with zip)
+		$(use_with zlib zlib "${EPREFIX}/usr")
+		$(use_enable debug)
+	)
+
+	# DBA support
+	if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
+		|| use qdbm || use lmdb || use tokyocabinet ; then
+		our_conf+=( "--enable-dba" )
+	fi
+
+	# DBA drivers support
+	our_conf+=(
+		$(use_with cdb)
+		$(use_with berkdb db4 "${EPREFIX}/usr")
+		$(use_enable flatfile)
+		$(use_with gdbm gdbm "${EPREFIX}/usr")
+		$(use_enable inifile)
+		$(use_with qdbm qdbm "${EPREFIX}/usr")
+		$(use_with tokyocabinet tcadb "${EPREFIX}/usr")
+		$(use_with lmdb lmdb "${EPREFIX}/usr")
+	)
+
+	# Support for the GD graphics library
+	our_conf+=(
+		$(use_with truetype freetype)
+		$(use_enable cjk gd-jis-conv)
+		$(use_with gd jpeg)
+		$(use_with xpm)
+		$(use_with webp)
+	)
+	# enable gd last, so configure can pick up the previous settings
+	our_conf+=( $(use_enable gd) )
+
+	# IMAP support
+	if use imap ; then
+		our_conf+=(
+			$(use_with imap imap "${EPREFIX}/usr")
+			$(use_with ssl imap-ssl "${EPREFIX}/usr")
+		)
+	fi
+
+	# LDAP support
+	if use ldap ; then
+		our_conf+=(
+			$(use_with ldap ldap "${EPREFIX}/usr")
+			$(use_with ldap-sasl)
+		)
+	fi
+
+	# MySQL support
+	local mysqllib="mysqlnd"
+	local mysqlilib="mysqlnd"
+
+	our_conf+=( $(use_with mysqli mysqli "${mysqlilib}") )
+
+	local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock"
+	if use mysql || use mysqli ; then
+		our_conf+=( $(use_with mysql mysql-sock "${mysqlsock}") )
+	fi
+
+	# ODBC support
+	if use odbc && use iodbc ; then
+		our_conf+=(
+			--without-unixODBC
+			--with-iodbc
+			$(use_with pdo pdo-odbc "iODBC,${EPREFIX}/usr")
+		)
+	elif use odbc ; then
+		our_conf+=(
+			--with-unixODBC="${EPREFIX}/usr"
+			--without-iodbc
+			$(use_with pdo pdo-odbc "unixODBC,${EPREFIX}/usr")
+		)
+	else
+		our_conf+=(
+			--without-unixODBC
+			--without-iodbc
+			--without-pdo-odbc
+		)
+	fi
+
+	# Oracle support
+	our_conf+=( $(use_with oci8-instant-client oci8) )
+
+	# PDO support
+	if use pdo ; then
+		our_conf+=(
+			$(use_with mssql pdo-dblib "${EPREFIX}/usr")
+			$(use_with mysql pdo-mysql "${mysqllib}")
+			$(use_with postgres pdo-pgsql)
+			$(use_with sqlite pdo-sqlite)
+			$(use_with firebird pdo-firebird "${EPREFIX}/usr")
+			$(use_with oci8-instant-client pdo-oci)
+		)
+	fi
+
+	# readline/libedit support
+	our_conf+=(
+		$(use_with readline readline "${EPREFIX}/usr")
+		$(use_with libedit)
+	)
+
+	# Session support
+	if use session ; then
+		our_conf+=( $(use_with session-mm mm "${EPREFIX}/usr") )
+	else
+		our_conf+=( $(use_enable session) )
+	fi
+
+	# Use pic for shared modules such as apache2's mod_php
+	our_conf+=( --with-pic )
+
+	# we use the system copy of pcre
+	# --with-external-pcre affects ext/pcre
+	our_conf+=(
+		--with-external-pcre
+		$(use_with jit pcre-jit)
+	)
+
+	# Catch CFLAGS problems
+	# Fixes bug #14067.
+	# Changed order to run it in reverse for bug #32022 and #12021.
+	replace-cpu-flags "k6*" "i586"
+
+	# Cache the ./configure test results between SAPIs.
+	our_conf+=( --cache-file="${T}/config.cache" )
+
+	# Support user-passed configuration parameters
+	our_conf+=( ${EXTRA_ECONF:-} )
+
+	# Support the Apache2 extras, they must be set globally for all
+	# SAPIs to work correctly, especially for external PHP extensions
+
+	local one_sapi
+	local sapi
+	mkdir -p "${WORKDIR}/sapis-build" || die
+	for one_sapi in $SAPIS ; do
+		use "${one_sapi}" || continue
+		php_set_ini_dir "${one_sapi}"
+
+		# The BUILD_DIR variable is used to determine where to output
+		# the files that autotools creates. This was all originally
+		# based on the autotools-utils eclass.
+		BUILD_DIR="${WORKDIR}/sapis-build/${one_sapi}"
+		cp -a "${S}" "${BUILD_DIR}" || die
+		cd "${BUILD_DIR}" || die
+
+		local sapi_conf=(
+			--with-config-file-path="${PHP_INI_DIR}"
+			--with-config-file-scan-dir="${PHP_EXT_INI_DIR_ACTIVE}"
+		)
+
+		for sapi in $SAPIS ; do
+			case "$sapi" in
+				cli|cgi|embed|fpm|phpdbg)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf+=( "--enable-${sapi}" )
+						if [[ "fpm" == "${sapi}" ]] ; then
+							sapi_conf+=(
+								$(use_with acl fpm-acl)
+								$(use_with systemd fpm-systemd)
+							)
+						fi
+					else
+						sapi_conf+=( "--disable-${sapi}" )
+					fi
+					;;
+
+				apache2)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf+=( --with-apxs2="${EPREFIX}/usr/bin/apxs" )
+					else
+						sapi_conf+=( --without-apxs2 )
+					fi
+					;;
+			esac
+		done
+
+		# Construct the $myeconfargs array by concatenating $our_conf
+		# (the common args) and $sapi_conf (the SAPI-specific args).
+		local myeconfargs=( "${our_conf[@]}" )
+		myeconfargs+=( "${sapi_conf[@]}" )
+
+		pushd "${BUILD_DIR}" > /dev/null || die
+		econf "${myeconfargs[@]}"
+		popd > /dev/null || die
+	done
+}
+
+src_compile() {
+	# snmp seems to run during src_compile, too (bug #324739)
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+	addpredict /var/lib/net-snmp/mib_indexes #nowarn
+
+	local sapi
+	for sapi in ${SAPIS} ; do
+		if use "${sapi}"; then
+			cd "${WORKDIR}/sapis-build/$sapi" || \
+				die "Failed to change dir to ${WORKDIR}/sapis-build/$1"
+			emake
+		fi
+	done
+}
+
+src_install() {
+	# see bug #324739 for what happens when we don't have that
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+
+	# grab the first SAPI that got built and install common files from there
+	local first_sapi="", sapi=""
+	for sapi in $SAPIS ; do
+		if use $sapi ; then
+			first_sapi=$sapi
+			break
+		fi
+	done
+
+	# Makefile forgets to create this before trying to write to it...
+	dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
+
+	# Install php environment (without any sapis)
+	cd "${WORKDIR}/sapis-build/$first_sapi" || die
+	emake INSTALL_ROOT="${D}" \
+		install-build install-headers install-programs
+
+	local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
+
+	# Create the directory where we'll put version-specific php scripts
+	keepdir "/usr/share/php${PHP_MV}"
+
+	local file=""
+	local sapi_list=""
+
+	for sapi in ${SAPIS}; do
+		if use "${sapi}" ; then
+			einfo "Installing SAPI: ${sapi}"
+			cd "${WORKDIR}/sapis-build/${sapi}" || die
+
+			if [[ "${sapi}" == "apache2" ]] ; then
+				# We're specifically not using emake install-sapi as libtool
+				# may cause unnecessary relink failures (see bug #351266)
+				insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
+				newins ".libs/libphp$(get_libname)" \
+					   "libphp${PHP_MV}$(get_libname)"
+				keepdir "/usr/$(get_libdir)/apache2/modules"
+			else
+				# needed each time, php_install_ini would reset it
+				local dest="${PHP_DESTDIR#${EPREFIX}}"
+				into "${dest}"
+				case "$sapi" in
+					cli)
+						source="sapi/cli/php"
+						# Install the "phar" archive utility.
+						if use phar ; then
+							emake INSTALL_ROOT="${D}" install-pharcmd
+							dosym "..${dest#/usr}/bin/phar" "/usr/bin/phar${SLOT}"
+						fi
+						;;
+					cgi)
+						source="sapi/cgi/php-cgi"
+						;;
+					fpm)
+						source="sapi/fpm/php-fpm"
+						;;
+					embed)
+						source="libs/libphp$(get_libname)"
+						;;
+					phpdbg)
+						source="sapi/phpdbg/phpdbg"
+						;;
+					*)
+						die "unhandled sapi in src_install"
+						;;
+				esac
+
+				if [[ "${source}" == *"$(get_libname)" ]]; then
+					dolib.so "${source}"
+				else
+					dobin "${source}"
+					local name="$(basename ${source})"
+					dosym "..${dest#/usr}/bin/${name}" "/usr/bin/${name}${SLOT}"
+				fi
+			fi
+
+			php_install_ini "${sapi}"
+
+			# construct correct SAPI string for php-config
+			# thanks to ferringb for the bash voodoo
+			if [[ "${sapi}" == "apache2" ]]; then
+				sapi_list="${sapi_list:+${sapi_list} }apache2handler"
+			else
+				sapi_list="${sapi_list:+${sapi_list} }${sapi}"
+			fi
+		fi
+	done
+
+	# Installing opcache module
+	if use opcache ; then
+		into "${PHP_DESTDIR#${EPREFIX}}"
+		dolib.so "modules/opcache$(get_libname)"
+	fi
+
+	# Install env.d files
+	newenvd "${FILESDIR}/20php5-envd" "20php${SLOT}"
+	sed -e "s|/lib/|/$(get_libdir)/|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
+	sed -e "s|php5|php${SLOT}|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
+
+	# set php-config variable correctly (bug #278439)
+	sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
+		"${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" || die
+
+	if use fpm ; then
+		if use systemd; then
+			systemd_newunit "${FILESDIR}/php-fpm_at.service" \
+							"php-fpm@${SLOT}.service"
+		else
+			systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" \
+							"php-fpm@${SLOT}.service"
+		fi
+	fi
+}
+
+src_test() {
+	echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+	PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
+	if [[ ! -x "${PHP_BIN}" ]] ; then
+		ewarn "Test phase requires USE=cli, skipping"
+		return
+	else
+		export TEST_PHP_EXECUTABLE="${PHP_BIN}"
+	fi
+
+	if [[ -x "${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi" ]] ; then
+		export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi"
+	fi
+
+	if [[ -x "${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg" ]] ; then
+		export TEST_PHPDBG_EXECUTABLE="${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg"
+	fi
+
+	SKIP_ONLINE_TESTS=1 REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n  -d \
+					  "session.save_path=${T}" \
+					  "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d \
+					  "session.save_path=${T}"
+
+	for name in ${EXPECTED_TEST_FAILURES}; do
+		mv "${name}.out" "${name}.out.orig" 2>/dev/null || die
+	done
+
+	local failed="$(find -name '*.out')"
+	if [[ ${failed} != "" ]] ; then
+		ewarn "The following test cases failed unexpectedly:"
+		for name in ${failed}; do
+			ewarn "  ${name/.out/}"
+		done
+	else
+		einfo "No unexpected test failures, all fine"
+	fi
+
+	if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
+		local passed=""
+		for name in ${EXPECTED_TEST_FAILURES}; do
+			[[ -f "${name}.diff" ]] && continue
+			passed="${passed} ${name}"
+		done
+		if [[ ${passed} != "" ]] ; then
+			einfo "The following test cases passed unexpectedly:"
+			for name in ${passed}; do
+				ewarn "  ${passed}"
+			done
+		else
+			einfo "None of the known-to-fail tests passed, all fine"
+		fi
+	fi
+}
+
+pkg_postinst() {
+	# Output some general info to the user
+	if use apache2 ; then
+		elog
+		elog "To enable PHP in apache, you will need to add \"-D PHP\" to"
+		elog "your apache2 command. OpenRC users can append that string to"
+		elog "APACHE2_OPTS in /etc/conf.d/apache2."
+		elog
+		elog "The apache module configuration file 70_mod_php.conf is"
+		elog "provided (and maintained) by eselect-php."
+		elog
+	fi
+
+	# Create the symlinks for php
+	local m
+	for m in ${SAPIS}; do
+		[[ ${m} == 'embed' ]] && continue;
+		if use $m ; then
+			local ci=$(eselect php show $m)
+			if [[ -z $ci ]]; then
+				eselect php set $m php${SLOT} || die
+				einfo "Switched ${m} to use php:${SLOT}"
+				einfo
+			elif [[ $ci != "php${SLOT}" ]] ; then
+				elog "To switch $m to use php:${SLOT}, run"
+				elog "    eselect php set $m php${SLOT}"
+				elog
+			fi
+		fi
+	done
+
+	# Remove dead symlinks for SAPIs that were just disabled. For
+	# example, if the user has the cgi SAPI enabled, then he has an
+	# eselect-php symlink for it. If he later reinstalls PHP with
+	# USE="-cgi", that symlink will break. This call to eselect is
+	# supposed to remove that dead link per bug 572436.
+	eselect php cleanup || die
+
+	if ! has "php${SLOT/./-}" ${PHP_TARGETS}; then
+	   elog "To build extensions for this version of PHP, you will need to"
+	   elog "add php${SLOT/./-} to your PHP_TARGETS USE_EXPAND variable."
+	   elog
+	fi
+
+	# Warn about the removal of PHP_INI_VERSION if the user has it set.
+	if [[ -n "${PHP_INI_VERSION}" ]]; then
+		ewarn 'The PHP_INI_VERSION variable has been phased out. You may'
+		ewarn 'remove it from your configuration at your convenience. See'
+		ewarn
+		ewarn '  https://bugs.gentoo.org/611214'
+		ewarn
+		ewarn 'for more information.'
+	fi
+
+	elog "For details on how version slotting works, please see"
+	elog "the wiki:"
+	elog
+	elog "  https://wiki.gentoo.org/wiki/PHP"
+	elog
+}
+
+pkg_postrm() {
+	# This serves two purposes. First, if we have just removed the last
+	# installed version of PHP, then this will remove any dead symlinks
+	# belonging to eselect-php. Second, if a user upgrades slots from
+	# (say) 5.6 to 7.0 and depcleans the old slot, then this will update
+	# his existing symlinks to point to the new 7.0 installation. The
+	# latter is bug 432962.
+	#
+	# Note: the eselect-php package may not be installed at this point,
+	# so we can't die() if this command fails.
+	eselect php cleanup
+}
diff --git a/dev-lang/php/php-8.1.9.ebuild b/dev-lang/php/php-8.1.9.ebuild
new file mode 100644
index 000000000000..08ae68bc439d
--- /dev/null
+++ b/dev-lang/php/php-8.1.9.ebuild
@@ -0,0 +1,756 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+WANT_AUTOMAKE="none"
+
+inherit flag-o-matic systemd autotools
+
+MY_PV=${PV/_rc/RC}
+DESCRIPTION="The PHP language runtime engine"
+HOMEPAGE="https://www.php.net/"
+SRC_URI="https://www.php.net/distributions/${P}.tar.xz"
+
+LICENSE="PHP-3.01
+	BSD
+	Zend-2.0
+	bcmath? ( LGPL-2.1+ )
+	fpm? ( BSD-2 )
+	gd? ( gd )
+	unicode? ( BSD-2 LGPL-2.1 )"
+
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+# We can build the following SAPIs in the given order
+SAPIS="embed cli cgi fpm apache2 phpdbg"
+
+# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
+IUSE="${IUSE}
+	${SAPIS/cli/+cli}
+	threads"
+
+IUSE="${IUSE} acl apparmor argon2 bcmath berkdb bzip2 calendar cdb cjk
+	coverage +ctype curl debug
+	enchant exif ffi +fileinfo +filter firebird
+	+flatfile ftp gd gdbm gmp +iconv imap inifile
+	intl iodbc ipv6 +jit kerberos ldap ldap-sasl libedit lmdb
+	mhash mssql mysql mysqli nls
+	oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
+	readline selinux +session session-mm sharedmem
+	+simplexml snmp soap sockets sodium spell sqlite ssl
+	sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode webp
+	+xml xmlreader xmlwriter xpm xslt zip zlib"
+
+# Without USE=readline or libedit, the interactive "php -a" CLI will hang.
+# The Oracle instant client provides its own incompatible ldap library.
+REQUIRED_USE="
+	|| ( cli cgi fpm apache2 embed phpdbg )
+	cli? ( ^^ ( readline libedit ) )
+	!cli? ( ?? ( readline libedit ) )
+	truetype? ( gd zlib )
+	webp? ( gd zlib )
+	cjk? ( gd zlib )
+	exif? ( gd zlib )
+	xpm? ( gd zlib )
+	gd? ( zlib )
+	simplexml? ( xml )
+	soap? ( xml )
+	xmlreader? ( xml )
+	xmlwriter? ( xml )
+	xslt? ( xml )
+	ldap-sasl? ( ldap )
+	oci8-instant-client? ( !ldap )
+	qdbm? ( !gdbm )
+	session-mm? ( session !threads )
+	mysql? ( || ( mysqli pdo ) )
+	firebird? ( pdo )
+	mssql? ( pdo )
+"
+
+RESTRICT="!test? ( test )"
+
+# The supported (that is, autodetected) versions of BDB are listed in
+# the ./configure script. Other versions *work*, but we need to stick to
+# the ones that can be detected to avoid a repeat of bug #564824.
+COMMON_DEPEND="
+	>=app-eselect/eselect-php-0.9.7[apache2?,fpm?]
+	>=dev-libs/libpcre2-10.30[jit?,unicode]
+	fpm? ( acl? ( sys-apps/acl ) apparmor? ( sys-libs/libapparmor ) )
+	apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] )
+	argon2? ( app-crypt/argon2:= )
+	berkdb? ( || (	sys-libs/db:5.3 sys-libs/db:4.8 ) )
+	bzip2? ( app-arch/bzip2:0= )
+	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
+	coverage? ( dev-util/lcov )
+	curl? ( >=net-misc/curl-7.29.0 )
+	enchant? ( app-text/enchant:2 )
+	ffi? ( >=dev-libs/libffi-3.0.11:= )
+	firebird? ( dev-db/firebird )
+	gd? ( media-libs/libjpeg-turbo:0= media-libs/libpng:0= )
+	gdbm? ( >=sys-libs/gdbm-1.8.0:0= )
+	gmp? ( dev-libs/gmp:0= )
+	iconv? ( virtual/libiconv )
+	imap? ( >=virtual/imap-c-client-2[kerberos=,ssl=] )
+	intl? ( dev-libs/icu:= )
+	kerberos? ( virtual/krb5 )
+	ldap? ( >=net-nds/openldap-1.2.11:= )
+	ldap-sasl? ( dev-libs/cyrus-sasl )
+	libedit? ( dev-libs/libedit )
+	lmdb? ( dev-db/lmdb:= )
+	mssql? ( dev-db/freetds[mssql] )
+	nls? ( sys-devel/gettext )
+	oci8-instant-client? ( dev-db/oracle-instantclient[sdk] )
+	odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) )
+	postgres? ( >=dev-db/postgresql-9.1:* )
+	qdbm? ( dev-db/qdbm )
+	readline? ( sys-libs/readline:0= )
+	session-mm? ( dev-libs/mm )
+	snmp? ( >=net-analyzer/net-snmp-5.2 )
+	sodium? ( dev-libs/libsodium:=[-minimal] )
+	spell? ( >=app-text/aspell-0.50 )
+	sqlite? ( >=dev-db/sqlite-3.7.6.3 )
+	ssl? ( >=dev-libs/openssl-1.0.2:0= )
+	tidy? ( app-text/htmltidy )
+	tokyocabinet? ( dev-db/tokyocabinet )
+	truetype? ( =media-libs/freetype-2* )
+	unicode? ( dev-libs/oniguruma:= )
+	webp? ( media-libs/libwebp:0= )
+	xml? ( >=dev-libs/libxml2-2.9.0 )
+	xpm? ( x11-libs/libXpm )
+	xslt? ( dev-libs/libxslt )
+	zip? ( >=dev-libs/libzip-1.2.0:= )
+	zlib? ( >=sys-libs/zlib-1.2.0.4:0= )
+"
+
+IDEPEND=">=app-eselect/eselect-php-0.9.7[apache2?,fpm?]"
+
+RDEPEND="${COMMON_DEPEND}
+	virtual/mta
+	fpm? (
+		selinux? ( sec-policy/selinux-phpfpm )
+		systemd? ( sys-apps/systemd ) )"
+
+# Bison isn't actually needed when building from a release tarball
+# However, the configure script will warn if it's absent or if you
+# have an incompatible version installed. See bug 593278.
+DEPEND="${COMMON_DEPEND}
+	app-arch/xz-utils
+	>=sys-devel/bison-3.0.1"
+
+BDEPEND="virtual/pkgconfig"
+
+PHP_MV="$(ver_cut 1)"
+
+PATCHES=(
+	"${FILESDIR}/php-iodbc-header-location.patch"
+)
+
+php_install_ini() {
+	local phpsapi="${1}"
+
+	# work out where we are installing the ini file
+	php_set_ini_dir "${phpsapi}"
+
+	# Always install the production INI file, bug 611214.
+	local phpinisrc="php.ini-production-${phpsapi}"
+	cp php.ini-production "${phpinisrc}" || die
+
+	# default to /tmp for save_path, bug #282768
+	sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" || die
+
+	# Set the extension dir
+	sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" \
+		-i "${phpinisrc}" || die
+
+	# Set the include path to point to where we want to find PEAR packages
+	sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die
+
+	insinto "${PHP_INI_DIR#${EPREFIX}}"
+	newins "${phpinisrc}" php.ini
+
+	elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
+	elog
+
+	dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
+	dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
+
+	if use opcache; then
+		elog "Adding opcache to $PHP_EXT_INI_DIR"
+		echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> \
+			 "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
+		dosym "../ext/opcache.ini" \
+			  "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
+	fi
+
+	# SAPI-specific handling
+	if [[ "${sapi}" == "fpm" ]] ; then
+		einfo "Installing FPM config files php-fpm.conf and www.conf"
+		insinto "${PHP_INI_DIR#${EPREFIX}}"
+		doins sapi/fpm/php-fpm.conf
+		insinto "${PHP_INI_DIR#${EPREFIX}}/fpm.d"
+		doins sapi/fpm/www.conf
+	fi
+
+	dodoc php.ini-{development,production}
+}
+
+php_set_ini_dir() {
+	PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
+	PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
+	PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
+}
+
+src_prepare() {
+	default
+
+	# In php-7.x, the FPM pool configuration files have been split off
+	# of the main config. By default the pool config files go in
+	# e.g. /etc/php-fpm.d, which isn't slotted. So here we move the
+	# include directory to a subdirectory "fpm.d" of $PHP_INI_DIR. Later
+	# we'll install the pool configuration file "www.conf" there.
+	php_set_ini_dir fpm
+	sed -i "s~^include=.*$~include=${PHP_INI_DIR}/fpm.d/*.conf~" \
+		sapi/fpm/php-fpm.conf.in \
+		|| die 'failed to move the include directory in php-fpm.conf'
+
+	# Emulate buildconf to support cross-compilation
+	rm -fr aclocal.m4 autom4te.cache config.cache \
+		configure main/php_config.h.in || die
+	eautoconf --force
+	eautoheader
+
+	# Remove false positive test failures
+	# stream_isatty fails due to portage redirects
+	# curl tests here fail for network sandbox issues
+	# session tests here fail because we set the session directory to $T
+	rm tests/output/stream_isatty_err.phpt \
+	   tests/output/stream_isatty_out-err.phpt \
+	   tests/output/stream_isatty_out.phpt \
+	   ext/curl/tests/bug76675.phpt \
+	   ext/curl/tests/bug77535.phpt \
+	   ext/curl/tests/curl_error_basic.phpt \
+	   ext/session/tests/bug74514.phpt \
+	   ext/session/tests/bug74936.phpt || die
+
+}
+
+src_configure() {
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+	addpredict /var/lib/net-snmp/mib_indexes #nowarn
+
+	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
+
+	# The php-fpm config file wants localstatedir to be ${EPREFIX}/var
+	# and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002.
+	local our_conf=(
+		--prefix="${PHP_DESTDIR}"
+		--mandir="${PHP_DESTDIR}/man"
+		--infodir="${PHP_DESTDIR}/info"
+		--libdir="${PHP_DESTDIR}/lib"
+		--with-libdir="$(get_libdir)"
+		--localstatedir="${EPREFIX}/var"
+		--without-pear
+		$(use_enable threads zts)
+	)
+
+	our_conf+=(
+		$(use_with apparmor fpm-apparmor)
+		$(use_with argon2 password-argon2 "${EPREFIX}/usr")
+		$(use_enable bcmath)
+		$(use_with bzip2 bz2 "${EPREFIX}/usr")
+		$(use_enable calendar)
+		$(use_enable coverage gcov)
+		$(use_enable ctype)
+		$(use_with curl)
+		$(use_enable xml dom)
+		$(use_with enchant)
+		$(use_enable exif)
+		$(use_with ffi)
+		$(use_enable fileinfo)
+		$(use_enable filter)
+		$(use_enable ftp)
+		$(use_with nls gettext "${EPREFIX}/usr")
+		$(use_with gmp gmp "${EPREFIX}/usr")
+		$(use_with mhash mhash "${EPREFIX}/usr")
+		$(use_with iconv iconv \
+			$(use elibc_glibc || use elibc_musl || echo "${EPREFIX}/usr"))
+		$(use_enable intl)
+		$(use_enable ipv6)
+		$(use_with kerberos)
+		$(use_with xml libxml)
+		$(use_enable unicode mbstring)
+		$(use_with ssl openssl)
+		$(use_enable pcntl)
+		$(use_enable phar)
+		$(use_enable pdo)
+		$(use_enable opcache)
+		$(use_with postgres pgsql "${EPREFIX}/usr")
+		$(use_enable posix)
+		$(use_with spell pspell "${EPREFIX}/usr")
+		$(use_enable simplexml)
+		$(use_enable sharedmem shmop)
+		$(use_with snmp snmp "${EPREFIX}/usr")
+		$(use_enable soap)
+		$(use_enable sockets)
+		$(use_with sodium)
+		$(use_with sqlite sqlite3)
+		$(use_enable sysvipc sysvmsg)
+		$(use_enable sysvipc sysvsem)
+		$(use_enable sysvipc sysvshm)
+		$(use_with tidy tidy "${EPREFIX}/usr")
+		$(use_enable tokenizer)
+		$(use_enable xml)
+		$(use_enable xmlreader)
+		$(use_enable xmlwriter)
+		$(use_with xslt xsl)
+		$(use_with zip)
+		$(use_with zlib zlib "${EPREFIX}/usr")
+		$(use_enable debug)
+	)
+
+	# DBA support
+	if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
+		|| use qdbm || use lmdb || use tokyocabinet ; then
+		our_conf+=( "--enable-dba" )
+	fi
+
+	# DBA drivers support
+	our_conf+=(
+		$(use_with cdb)
+		$(use_with berkdb db4 "${EPREFIX}/usr")
+		$(use_enable flatfile)
+		$(use_with gdbm gdbm "${EPREFIX}/usr")
+		$(use_enable inifile)
+		$(use_with qdbm qdbm "${EPREFIX}/usr")
+		$(use_with tokyocabinet tcadb "${EPREFIX}/usr")
+		$(use_with lmdb lmdb "${EPREFIX}/usr")
+	)
+
+	# Support for the GD graphics library
+	our_conf+=(
+		$(use_with truetype freetype)
+		$(use_enable cjk gd-jis-conv)
+		$(use_with gd jpeg)
+		$(use_with xpm)
+		$(use_with webp)
+	)
+	# enable gd last, so configure can pick up the previous settings
+	our_conf+=( $(use_enable gd) )
+
+	# IMAP support
+	if use imap ; then
+		our_conf+=(
+			$(use_with imap imap "${EPREFIX}/usr")
+			$(use_with ssl imap-ssl "${EPREFIX}/usr")
+		)
+	fi
+
+	# LDAP support
+	if use ldap ; then
+		our_conf+=(
+			$(use_with ldap ldap "${EPREFIX}/usr")
+			$(use_with ldap-sasl)
+		)
+	fi
+
+	# MySQL support
+	our_conf+=( $(use_with mysqli mysqli "mysqlnd") )
+
+	local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock"
+	if use mysql || use mysqli ; then
+		our_conf+=( $(use_with mysql mysql-sock "${mysqlsock}") )
+	fi
+
+	# ODBC support
+	if use odbc && use iodbc ; then
+		our_conf+=(
+			--without-unixODBC
+			--with-iodbc
+			$(use_with pdo pdo-odbc "iODBC,${EPREFIX}/usr")
+		)
+	elif use odbc ; then
+		our_conf+=(
+			--with-unixODBC="${EPREFIX}/usr"
+			--without-iodbc
+			$(use_with pdo pdo-odbc "unixODBC,${EPREFIX}/usr")
+		)
+	else
+		our_conf+=(
+			--without-unixODBC
+			--without-iodbc
+			--without-pdo-odbc
+		)
+	fi
+
+	# Oracle support
+	our_conf+=( $(use_with oci8-instant-client oci8) )
+
+	# PDO support
+	if use pdo ; then
+		our_conf+=(
+			$(use_with mssql pdo-dblib "${EPREFIX}/usr")
+			$(use_with mysql pdo-mysql "mysqlnd")
+			$(use_with postgres pdo-pgsql)
+			$(use_with sqlite pdo-sqlite)
+			$(use_with firebird pdo-firebird "${EPREFIX}/usr")
+			$(use_with oci8-instant-client pdo-oci)
+		)
+	fi
+
+	# readline/libedit support
+	our_conf+=(
+		$(use_with readline readline "${EPREFIX}/usr")
+		$(use_with libedit)
+	)
+
+	# Session support
+	if use session ; then
+		our_conf+=( $(use_with session-mm mm "${EPREFIX}/usr") )
+	else
+		our_conf+=( $(use_enable session) )
+	fi
+
+	# Use pic for shared modules such as apache2's mod_php
+	our_conf+=( --with-pic )
+
+	# we use the system copy of pcre
+	# --with-external-pcre affects ext/pcre
+	our_conf+=(
+		--with-external-pcre
+		$(use_with jit pcre-jit)
+	)
+
+	# Catch CFLAGS problems
+	# Fixes bug #14067.
+	# Changed order to run it in reverse for bug #32022 and #12021.
+	replace-cpu-flags "k6*" "i586"
+
+	# Cache the ./configure test results between SAPIs.
+	our_conf+=( --cache-file="${T}/config.cache" )
+
+	# Support user-passed configuration parameters
+	our_conf+=( ${EXTRA_ECONF:-} )
+
+	# Support the Apache2 extras, they must be set globally for all
+	# SAPIs to work correctly, especially for external PHP extensions
+
+	local one_sapi
+	local sapi
+	mkdir -p "${WORKDIR}/sapis-build" || die
+	for one_sapi in $SAPIS ; do
+		use "${one_sapi}" || continue
+		php_set_ini_dir "${one_sapi}"
+
+		# The BUILD_DIR variable is used to determine where to output
+		# the files that autotools creates. This was all originally
+		# based on the autotools-utils eclass.
+		BUILD_DIR="${WORKDIR}/sapis-build/${one_sapi}"
+		cp -a "${S}" "${BUILD_DIR}" || die
+		cd "${BUILD_DIR}" || die
+
+		local sapi_conf=(
+			--with-config-file-path="${PHP_INI_DIR}"
+			--with-config-file-scan-dir="${PHP_EXT_INI_DIR_ACTIVE}"
+		)
+
+		for sapi in $SAPIS ; do
+			case "$sapi" in
+				cli|cgi|embed|fpm|phpdbg)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf+=( "--enable-${sapi}" )
+						if [[ "fpm" == "${sapi}" ]] ; then
+							sapi_conf+=(
+								$(use_with acl fpm-acl)
+								$(use_with systemd fpm-systemd)
+							)
+						fi
+					else
+						sapi_conf+=( "--disable-${sapi}" )
+					fi
+					;;
+
+				apache2)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf+=( --with-apxs2="${EPREFIX}/usr/bin/apxs" )
+					else
+						sapi_conf+=( --without-apxs2 )
+					fi
+					;;
+			esac
+		done
+
+		# Construct the $myeconfargs array by concatenating $our_conf
+		# (the common args) and $sapi_conf (the SAPI-specific args).
+		local myeconfargs=( "${our_conf[@]}" )
+		myeconfargs+=( "${sapi_conf[@]}" )
+
+		pushd "${BUILD_DIR}" > /dev/null || die
+		econf "${myeconfargs[@]}"
+		popd > /dev/null || die
+	done
+}
+
+src_compile() {
+	# snmp seems to run during src_compile, too (bug #324739)
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+	addpredict /var/lib/net-snmp/mib_indexes #nowarn
+
+	local sapi
+	for sapi in ${SAPIS} ; do
+		if use "${sapi}"; then
+			cd "${WORKDIR}/sapis-build/$sapi" || \
+				die "Failed to change dir to ${WORKDIR}/sapis-build/$1"
+			emake
+		fi
+	done
+}
+
+src_install() {
+	# see bug #324739 for what happens when we don't have that
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+
+	# grab the first SAPI that got built and install common files from there
+	local first_sapi="", sapi=""
+	for sapi in $SAPIS ; do
+		if use $sapi ; then
+			first_sapi=$sapi
+			break
+		fi
+	done
+
+	# Makefile forgets to create this before trying to write to it...
+	dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
+
+	# Install php environment (without any sapis)
+	cd "${WORKDIR}/sapis-build/$first_sapi" || die
+	emake INSTALL_ROOT="${D}" \
+		install-build install-headers install-programs
+
+	local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
+
+	# Create the directory where we'll put version-specific php scripts
+	keepdir "/usr/share/php${PHP_MV}"
+
+	local file=""
+	local sapi_list=""
+
+	for sapi in ${SAPIS}; do
+		if use "${sapi}" ; then
+			einfo "Installing SAPI: ${sapi}"
+			cd "${WORKDIR}/sapis-build/${sapi}" || die
+
+			if [[ "${sapi}" == "apache2" ]] ; then
+				# We're specifically not using emake install-sapi as libtool
+				# may cause unnecessary relink failures (see bug #351266)
+				insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
+				newins ".libs/libphp$(get_libname)" \
+					   "libphp${PHP_MV}$(get_libname)"
+				keepdir "/usr/$(get_libdir)/apache2/modules"
+			else
+				# needed each time, php_install_ini would reset it
+				local dest="${PHP_DESTDIR#${EPREFIX}}"
+				into "${dest}"
+				case "$sapi" in
+					cli)
+						source="sapi/cli/php"
+						# Install the "phar" archive utility.
+						if use phar ; then
+							emake INSTALL_ROOT="${D}" install-pharcmd
+							dosym "..${dest#/usr}/bin/phar" "/usr/bin/phar${SLOT}"
+						fi
+						;;
+					cgi)
+						source="sapi/cgi/php-cgi"
+						;;
+					fpm)
+						source="sapi/fpm/php-fpm"
+						;;
+					embed)
+						source="libs/libphp$(get_libname)"
+						;;
+					phpdbg)
+						source="sapi/phpdbg/phpdbg"
+						;;
+					*)
+						die "unhandled sapi in src_install"
+						;;
+				esac
+
+				if [[ "${source}" == *"$(get_libname)" ]]; then
+					dolib.so "${source}"
+				else
+					dobin "${source}"
+					local name="$(basename ${source})"
+					dosym "..${dest#/usr}/bin/${name}" "/usr/bin/${name}${SLOT}"
+				fi
+			fi
+
+			php_install_ini "${sapi}"
+
+			# construct correct SAPI string for php-config
+			# thanks to ferringb for the bash voodoo
+			if [[ "${sapi}" == "apache2" ]]; then
+				sapi_list="${sapi_list:+${sapi_list} }apache2handler"
+			else
+				sapi_list="${sapi_list:+${sapi_list} }${sapi}"
+			fi
+		fi
+	done
+
+	# Installing opcache module
+	if use opcache ; then
+		into "${PHP_DESTDIR#${EPREFIX}}"
+		dolib.so "modules/opcache$(get_libname)"
+	fi
+
+	# Install env.d files
+	newenvd "${FILESDIR}/20php5-envd" "20php${SLOT}"
+	sed -e "s|/lib/|/$(get_libdir)/|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
+	sed -e "s|php5|php${SLOT}|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
+
+	# set php-config variable correctly (bug #278439)
+	sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
+		"${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" || die
+
+	if use fpm ; then
+		if use systemd; then
+			systemd_newunit "${FILESDIR}/php-fpm_at.service" \
+							"php-fpm@${SLOT}.service"
+		else
+			systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" \
+							"php-fpm@${SLOT}.service"
+		fi
+	fi
+}
+
+src_test() {
+	echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+	PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
+	if [[ ! -x "${PHP_BIN}" ]] ; then
+		ewarn "Test phase requires USE=cli, skipping"
+		return
+	else
+		export TEST_PHP_EXECUTABLE="${PHP_BIN}"
+	fi
+
+	if [[ -x "${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi" ]] ; then
+		export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi"
+	fi
+
+	if [[ -x "${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg" ]] ; then
+		export TEST_PHPDBG_EXECUTABLE="${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg"
+	fi
+
+	SKIP_ONLINE_TESTS=1 REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n  -d \
+					  "session.save_path=${T}" \
+					  "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d \
+					  "session.save_path=${T}"
+
+	for name in ${EXPECTED_TEST_FAILURES}; do
+		mv "${name}.out" "${name}.out.orig" 2>/dev/null || die
+	done
+
+	local failed="$(find -name '*.out')"
+	if [[ ${failed} != "" ]] ; then
+		ewarn "The following test cases failed unexpectedly:"
+		for name in ${failed}; do
+			ewarn "  ${name/.out/}"
+		done
+	else
+		einfo "No unexpected test failures, all fine"
+	fi
+
+	if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
+		local passed=""
+		for name in ${EXPECTED_TEST_FAILURES}; do
+			[[ -f "${name}.diff" ]] && continue
+			passed="${passed} ${name}"
+		done
+		if [[ ${passed} != "" ]] ; then
+			einfo "The following test cases passed unexpectedly:"
+			for name in ${passed}; do
+				ewarn "  ${passed}"
+			done
+		else
+			einfo "None of the known-to-fail tests passed, all fine"
+		fi
+	fi
+}
+
+pkg_postinst() {
+	# Output some general info to the user
+	if use apache2 ; then
+		elog
+		elog "To enable PHP in apache, you will need to add \"-D PHP\" to"
+		elog "your apache2 command. OpenRC users can append that string to"
+		elog "APACHE2_OPTS in /etc/conf.d/apache2."
+		elog
+		elog "The apache module configuration file 70_mod_php.conf is"
+		elog "provided (and maintained) by eselect-php."
+		elog
+	fi
+
+	# Create the symlinks for php
+	local m
+	for m in ${SAPIS}; do
+		[[ ${m} == 'embed' ]] && continue;
+		if use $m ; then
+			local ci=$(eselect php show $m)
+			if [[ -z $ci ]]; then
+				eselect php set $m php${SLOT} || die
+				einfo "Switched ${m} to use php:${SLOT}"
+				einfo
+			elif [[ $ci != "php${SLOT}" ]] ; then
+				elog "To switch $m to use php:${SLOT}, run"
+				elog "    eselect php set $m php${SLOT}"
+				elog
+			fi
+		fi
+	done
+
+	# Remove dead symlinks for SAPIs that were just disabled. For
+	# example, if the user has the cgi SAPI enabled, then he has an
+	# eselect-php symlink for it. If he later reinstalls PHP with
+	# USE="-cgi", that symlink will break. This call to eselect is
+	# supposed to remove that dead link per bug 572436.
+	eselect php cleanup || die
+
+	if ! has "php${SLOT/./-}" ${PHP_TARGETS}; then
+	   elog "To build extensions for this version of PHP, you will need to"
+	   elog "add php${SLOT/./-} to your PHP_TARGETS USE_EXPAND variable."
+	   elog
+	fi
+
+	# Warn about the removal of PHP_INI_VERSION if the user has it set.
+	if [[ -n "${PHP_INI_VERSION}" ]]; then
+		ewarn 'The PHP_INI_VERSION variable has been phased out. You may'
+		ewarn 'remove it from your configuration at your convenience. See'
+		ewarn
+		ewarn '  https://bugs.gentoo.org/611214'
+		ewarn
+		ewarn 'for more information.'
+	fi
+
+	elog "For details on how version slotting works, please see"
+	elog "the wiki:"
+	elog
+	elog "  https://wiki.gentoo.org/wiki/PHP"
+	elog
+}
+
+pkg_postrm() {
+	# This serves two purposes. First, if we have just removed the last
+	# installed version of PHP, then this will remove any dead symlinks
+	# belonging to eselect-php. Second, if a user upgrades slots from
+	# (say) 5.6 to 7.0 and depcleans the old slot, then this will update
+	# his existing symlinks to point to the new 7.0 installation. The
+	# latter is bug 432962.
+	#
+	# Note: the eselect-php package may not be installed at this point,
+	# so we can't die() if this command fails.
+	eselect php cleanup
+}
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 13b9766cc4f6..053fe6868e5d 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/trio/Manifest b/dev-libs/trio/Manifest
index c1262ee71cda..999651d38c4e 100644
--- a/dev-libs/trio/Manifest
+++ b/dev-libs/trio/Manifest
@@ -1,4 +1,6 @@
 AUX trio-1.16-no-inline.patch 197 BLAKE2B 6d4eaad93ef8bafe450d9dce6a6b676e649be525184a313af55f82916090a0c73edcc606f96097009700a8c1dfaae3c1a5081e0ed32b7b22f2c88a0cb385edbf SHA512 ee581daa9e957c6bbfc080f688b664bf04df29cd2dfb5ce59cc9e6f41ec005258a2584ac81505760a939f23b14991913b42d67742fa44e16000bd0552518aaa0
 DIST trio-1.16.tar.gz 167337 BLAKE2B 0f284e0a130723f7511c0e874276c79c1addc1329833d14f0b76bae9808d90b76a2b26817ee85da71c3997360918cb534917a11bbe35ba627d1012cd8a2f6299 SHA512 3a8bac3ed001f70f498bd2ab0881ed6d3760bc978bf9ff587c3fc1d5d7a38205f779c5fe445f41edaa9e23c15bc1b4a521916e19161277741bc8e2f744b46c69
+DIST trio-1.17.tar.gz 452237 BLAKE2B 77ff673cc103b07b1424720d28c49d2e33a1402a98d8d21124fabb0cafd3498a99976d808cbbc5a90e1b3a063c6af68c3daf94768d533e4a762b730a253fa012 SHA512 19f4732b32c6a3754677d5766399fa70083c6a78c0d04b1dfa10a578b21405ba3e3d3af6543e4811f5fd305ec2727781a1b0f2888e59c574ca735f8406da7954
 EBUILD trio-1.16.ebuild 860 BLAKE2B cb67c7210025e47731cfe8aca3aa8f95a6b43ce82574e7f3c5129508ba51736652955d9c7428d79d2bc77b7195ffd80ba4beeebc70a490766207d877d3d830ca SHA512 9ce79b1dcdead5e65097eb89d456c63af2538d9c267e8f864a33b060beec73dd62bbe298cf7eb589eb9a3fba5ddf0189ae704c769b79c42a348224c54f65812a
-MISC metadata.xml 329 BLAKE2B 9685c85253e1f6cf065c157f073948ad54f7008d6f1a34327e098852d2be690a449389ea0107e88107478e1098d4c8f8760108544f71a15ce756edd6449e07f3 SHA512 0904503b16e05f1250f9a56466f435a9363725d2b598bdad0d14fe48201d89f0b50aec2bf233c9eefdeb6e18572e27b2903160087176b99a9f94d035db98aad6
+EBUILD trio-1.17.ebuild 544 BLAKE2B da4a36e2ac24aa7e116bddd1401f19e87b682f2c44d95cd4bd4d7fa819c4d37f1a557a089619e1a57961c545567e51730d77b7554f0d1c23cc36e2bfe0e22b62 SHA512 2a995659a8da3cea24dfc4830c40b74488a5583bd7a38d0ec70d6133a6ee7df6dbf45212b5f96b621cc737a4042456ef62047878813f7ad4f799b52108ec53f2
+MISC metadata.xml 329 BLAKE2B 5863c898baa0c23c810edcdc6ae637b0a391579d1fee8db773c899bb936e36c76fb847e2d6de1410d9b6b286154459fb7d515f0a7f270c16a762274f4c19457f SHA512 5ee6ecb624bca2b159b5a6ebd0605d5ccef265c21f37e5f440317032a4144851b0b2eeaabf5fa89f710b9b18b85ad6812827cf9d32f4cfefc4d44e6592c98de2
diff --git a/dev-libs/trio/metadata.xml b/dev-libs/trio/metadata.xml
index a7124f3f8f71..d2790650b579 100644
--- a/dev-libs/trio/metadata.xml
+++ b/dev-libs/trio/metadata.xml
@@ -6,6 +6,6 @@
 		<name>Gentoo Games Project</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="sourceforge">ctrio</remote-id>
+		<remote-id type="github">orbea/trio</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-libs/trio/trio-1.17.ebuild b/dev-libs/trio/trio-1.17.ebuild
new file mode 100644
index 000000000000..a12bd3608b4d
--- /dev/null
+++ b/dev-libs/trio/trio-1.17.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DOCS_BUILDER="doxygen"
+DOCS_DIR="doc"
+
+inherit docs
+
+DESCRIPTION="Portable string functions, focus on the *printf() and *scanf() clones"
+HOMEPAGE="https://daniel.haxx.se/projects/trio/"
+SRC_URI="https://github.com/orbea/trio/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="trio"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+src_compile() {
+	default
+	docs_compile
+}
+
+src_install() {
+	default
+	find "${ED}" -type f -name '*.la' -delete || die
+}
diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index 943782d7292f..567d5896a2bb 100644
--- a/dev-ml/Manifest.gz
+++ b/dev-ml/Manifest.gz
diff --git a/dev-ml/jingoo/Manifest b/dev-ml/jingoo/Manifest
index c293a0fe7c53..66d4f6585cbb 100644
--- a/dev-ml/jingoo/Manifest
+++ b/dev-ml/jingoo/Manifest
@@ -1,3 +1,3 @@
 DIST jingoo-1.4.2.tar.gz 67611 BLAKE2B 5d2ead117863a2edd18320da4fa7539a7ebd6c537509b5cd37df3778d90c3459dde73d03d3d97b0ed64cfa4b7ef46f620e5638dd75f7e5b290340cc53761deea SHA512 d54d9114b87efdf49b81931b28ee2b61edbd984792c8371f7498b42175f574da7d2774b7b28702b62eeae704168e18c7e9283c4618045abc559b2d1d680e92ad
-EBUILD jingoo-1.4.2.ebuild 662 BLAKE2B ac0e63fca5fd603639b97cc4782e27002208df0381fcf3a159610bf9555e57d44758e64ec00d8ad7f95402b69b1d9521e190829b5a4d1708edb92bb95ed03287 SHA512 28a73b1689e89d05bbf9718ef41bad379a2260bd4bfb3d1d727bcab784b06b45189eb3ea94e9788ddc1d7b9dcf3dc2b14532dcfbe6f197b56c267cf6bf3b382b
+EBUILD jingoo-1.4.2.ebuild 701 BLAKE2B c805e12d9b3cd70bff8ebe35e23a1516aea760ae5a6030aeca2c493000f2668007ee0626ac574c4cadd523f35dc938e9facf9e2aba751f80a7b65dc8bf9d5731 SHA512 3035861be4acb5b1eb3fe597554a524acdedacfec0ea0e5a42f3410462ebff5f0180f7b4d376d451d971a7fdff1d552894ad18bacf48b5aa2b39a40239cc5d1a
 MISC metadata.xml 318 BLAKE2B a882d48f971b725d9604a9205258cdf6747d2ebcfb868f9782267fa54ca4aca64482032bca93c54708bf9908e700b0c38a96b6f075f834ba2381744920075fd7 SHA512 15f06496cd273fac20f93fd79dec7bfc08ede35639e162e4de9e2e9c90cb187218f0232e4bd011d1b4dd8ebd9ee7c2ec32ea4091cac2adee2f772a3db5e88652
diff --git a/dev-ml/jingoo/jingoo-1.4.2.ebuild b/dev-ml/jingoo/jingoo-1.4.2.ebuild
index cef6205ee582..fb7f96eea9f3 100644
--- a/dev-ml/jingoo/jingoo-1.4.2.ebuild
+++ b/dev-ml/jingoo/jingoo-1.4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -20,6 +20,7 @@ RDEPEND="dev-ml/ppx_deriving:=
 	dev-ml/uucp:=
 	dev-ml/uutf:=
 	dev-ml/re:=
+	dev-ml/ocaml-migrate-parsetree:=
 	dev-ml/menhir:="
 DEPEND="${RDEPEND}
 	test? ( dev-ml/ounit2 )"
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 3b97b2037774..6bfc54dbf592 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 85473afebb4a..fd8e61afc32a 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -5,6 +5,7 @@ DIST boto3-1.24.41.gh.tar.gz 523844 BLAKE2B 0cff30d6aba5e8eddb8f545737e22a146ef9
 DIST boto3-1.24.42.gh.tar.gz 523969 BLAKE2B f8f802975f05246da85d5c1feafed0fbf612f5f67cb533178e189b1abc4edd9352dad5b0af44543d406dc405e7f18bf9792675e6b328c03c5ab0e5d55647289e SHA512 d0d102851d016cb4ae3db70c84005905495ba64142f79760fa2b477e6d0d6ea1f25062200fa5c42f685b07e5af3ef549562ef247a573c727ac8d341921bf4266
 DIST boto3-1.24.43.gh.tar.gz 524913 BLAKE2B f3a04f7ddd2b9b4cb9ca0c12a1306797d8bd96a459049f5fa0cf504a4d48afd5d83ec72f8c7bd6c5b3255bfe0d7ca0948c44c7a963c20773c4b04564167b6007 SHA512 b69eff403ffa4ebabf724168b664078d4e77f79f259f3bb2fbc7403067d5c0b7ad2fd067b6cd6227ce7289a25b16afd7a4ba219a18c2c616f3a266b2fcbe693d
 DIST boto3-1.24.44.gh.tar.gz 525172 BLAKE2B 4fa8156a119f66bbbee29610daf6e8c6c946e1ce31d2058945f22116523cb21b9ee924b2b013fd212c93fde6c2626cf7363025a8f5547717db37f884a407b7b6 SHA512 0db4e2f664bb123a4aa5ff57165d5fc70650f8a73fd1014eb760971d8df0c02d7dddec10a4bd677dd917f38c4c8be448343aa48ade964b3168a4054c7b8bd7b2
+DIST boto3-1.24.45.gh.tar.gz 524634 BLAKE2B 5b8b38efe86b30084e2071061de24744cb255cdf10ad00d872e6bcf476885f41d05f2dcbe0918fe4afbc167fde6a434782539b75fda897eaa5ebe3f33be93adb SHA512 1a89d0034a9dd987d79456f3e1baa1c26a0269f93f3fe8577c2e76a78c556e2bfde59f06bd35e8735466df3d82ce2123bf95f3291f07f6b520c7a0ad4b126fca
 EBUILD boto3-1.24.26.ebuild 1579 BLAKE2B 394d8a1bb7a1036ab4821bc789c9eea285f8a6a7c21e751d60c94a53d5fdd37119eab54bfd19bfe0856b7557df04340f50c7cebbe631234e8f582e7d62af13ec SHA512 beee3b634e3b1d66365beb2e97b9d09188fa795e00d9d05f2101de423128741ee1f8ad8ae4b0c35f1e6c6473ce73cc3acf47d9141029b4435d39a9803a5fe1b2
 EBUILD boto3-1.24.31.ebuild 1579 BLAKE2B 394d8a1bb7a1036ab4821bc789c9eea285f8a6a7c21e751d60c94a53d5fdd37119eab54bfd19bfe0856b7557df04340f50c7cebbe631234e8f582e7d62af13ec SHA512 beee3b634e3b1d66365beb2e97b9d09188fa795e00d9d05f2101de423128741ee1f8ad8ae4b0c35f1e6c6473ce73cc3acf47d9141029b4435d39a9803a5fe1b2
 EBUILD boto3-1.24.36.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
@@ -12,5 +13,6 @@ EBUILD boto3-1.24.41.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd536
 EBUILD boto3-1.24.42.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
 EBUILD boto3-1.24.43.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
 EBUILD boto3-1.24.44.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
+EBUILD boto3-1.24.45.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.45.ebuild b/dev-python/boto3/boto3-1.24.45.ebuild
new file mode 100644
index 000000000000..6edcc751d54b
--- /dev/null
+++ b/dev-python/boto3/boto3-1.24.45.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 4c52f8d97205..5bf3b1d07840 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -5,6 +5,7 @@ DIST botocore-1.27.41.gh.tar.gz 9493802 BLAKE2B dff510a658e77fe7185a8d118228cd80
 DIST botocore-1.27.42.gh.tar.gz 9493679 BLAKE2B 324c574bfa30b26428010750d1488a814946a505409afe356d7d7a55c4498d7c67c504638540083276c3ecf734693d21cb9c7650c1b3a05ef4f3638f92fdee21 SHA512 24ac5ddb90bb6b03369cf6ed1bc9364192d4f9a6904dbd285910c2c24efd0fe2fc9fffd55a94b6ad6ca38cb17748e7bc4a8fc54f6318d2ce6d915810d1f10aac
 DIST botocore-1.27.43.gh.tar.gz 9495496 BLAKE2B b445d81c9d56b4440e689559da576b82dc36c0c6cc8009ab97df16e5b012078b66367f4ce2140296b193d6fe729ddfeeae6fb3d561aab9a5018b18b1e62430c4 SHA512 f9314ed1dbca83c33f81f6454ada6566a401a9ce60dd77fbe491e0b8a5feab91161c953cbd6092c086fd9bbd4b2c8c6a0c9711941e1c8e96436d9062523ff656
 DIST botocore-1.27.44.gh.tar.gz 9498149 BLAKE2B 233abf5899b1855bda0128ddc1cfed8def2ad76253e972d25ca36459fea14a87f3f99aa2c586bac798bbf7dea1b02693f7f361383c80b7c8b2e7c22f2cd92279 SHA512 b34d4fb5eff7de44f2c842e9ebc31119780f731362279b0a1384d608810dd677a90e9c4735cd709303e1190125b530ba721617ecd39aa17de5c3b5b82b97dc93
+DIST botocore-1.27.45.gh.tar.gz 9501193 BLAKE2B 83bdab59babdaec8665be39089a6be298156065eec6058e89e405dfed5cc0caa0156404efaa9ac991cc6e2dbed0a93901232f1c3a174ba8012f07d54e68fab7f SHA512 7a334c124ee77f26d249d4bb95caf29397472534c682967d3c64db07f6872a986555ad7ccaed5ac49eb2b2ddf9179156e488f9743bc50cdb57daf5a80373d0c9
 EBUILD botocore-1.27.26.ebuild 1572 BLAKE2B d019098e9bd4f40cfe93307947813ffe3e880e9462b25ff6eaa16caf3ffad2ea5c6db9e482b7b3dc995ca174bde48e90ecd8861a86291c1d454dcf6212bbe7d8 SHA512 db12020b9130b5b940a44ae7fca5a6b0e4c3d84fa2efcff156099d355cab185ea52cb3c4740ebbea25d865d6af8d64ae58ea1e4c6129b1c1026fe8bce6f0580d
 EBUILD botocore-1.27.31.ebuild 1572 BLAKE2B d019098e9bd4f40cfe93307947813ffe3e880e9462b25ff6eaa16caf3ffad2ea5c6db9e482b7b3dc995ca174bde48e90ecd8861a86291c1d454dcf6212bbe7d8 SHA512 db12020b9130b5b940a44ae7fca5a6b0e4c3d84fa2efcff156099d355cab185ea52cb3c4740ebbea25d865d6af8d64ae58ea1e4c6129b1c1026fe8bce6f0580d
 EBUILD botocore-1.27.36.ebuild 1617 BLAKE2B d33413fa74479d5ca72e82609b4b1c57a33f6953d5acb82db1e2f9de7599190c69d8e633ac0da8417121a9959346723f509d5bb8945d1de63689046756ba303a SHA512 20aeccea53aa2e5d294739c9256fb590d21a89c216411383b1bc8c1ee25528ce4ac94fe3a210a1a6ff173b81c1d97b0972d611772963592a9c8be8039c12717a
@@ -12,5 +13,6 @@ EBUILD botocore-1.27.41.ebuild 1617 BLAKE2B d33413fa74479d5ca72e82609b4b1c57a33f
 EBUILD botocore-1.27.42.ebuild 1617 BLAKE2B d33413fa74479d5ca72e82609b4b1c57a33f6953d5acb82db1e2f9de7599190c69d8e633ac0da8417121a9959346723f509d5bb8945d1de63689046756ba303a SHA512 20aeccea53aa2e5d294739c9256fb590d21a89c216411383b1bc8c1ee25528ce4ac94fe3a210a1a6ff173b81c1d97b0972d611772963592a9c8be8039c12717a
 EBUILD botocore-1.27.43.ebuild 1617 BLAKE2B d33413fa74479d5ca72e82609b4b1c57a33f6953d5acb82db1e2f9de7599190c69d8e633ac0da8417121a9959346723f509d5bb8945d1de63689046756ba303a SHA512 20aeccea53aa2e5d294739c9256fb590d21a89c216411383b1bc8c1ee25528ce4ac94fe3a210a1a6ff173b81c1d97b0972d611772963592a9c8be8039c12717a
 EBUILD botocore-1.27.44.ebuild 1617 BLAKE2B d33413fa74479d5ca72e82609b4b1c57a33f6953d5acb82db1e2f9de7599190c69d8e633ac0da8417121a9959346723f509d5bb8945d1de63689046756ba303a SHA512 20aeccea53aa2e5d294739c9256fb590d21a89c216411383b1bc8c1ee25528ce4ac94fe3a210a1a6ff173b81c1d97b0972d611772963592a9c8be8039c12717a
+EBUILD botocore-1.27.45.ebuild 1617 BLAKE2B d33413fa74479d5ca72e82609b4b1c57a33f6953d5acb82db1e2f9de7599190c69d8e633ac0da8417121a9959346723f509d5bb8945d1de63689046756ba303a SHA512 20aeccea53aa2e5d294739c9256fb590d21a89c216411383b1bc8c1ee25528ce4ac94fe3a210a1a6ff173b81c1d97b0972d611772963592a9c8be8039c12717a
 EBUILD botocore-9999.ebuild 1617 BLAKE2B d33413fa74479d5ca72e82609b4b1c57a33f6953d5acb82db1e2f9de7599190c69d8e633ac0da8417121a9959346723f509d5bb8945d1de63689046756ba303a SHA512 20aeccea53aa2e5d294739c9256fb590d21a89c216411383b1bc8c1ee25528ce4ac94fe3a210a1a6ff173b81c1d97b0972d611772963592a9c8be8039c12717a
 MISC metadata.xml 499 BLAKE2B e5aaa7da26f200c09adfdf38b68f656bbccbec627cb5d966b280ac2165334e7eec659c89075bcace748f58e2ec3e7d2998e54a688d56ecea2d30653c67dfd35a SHA512 103c554d5dbd967bf9b6e418b3913d9235e7e910d012160909ce0715134ed2e37b06e6a345395f9d16ce08d1cf51f3ce458bce93c6a978fd3dca6610f2acdbd0
diff --git a/dev-python/botocore/botocore-1.27.45.ebuild b/dev-python/botocore/botocore-1.27.45.ebuild
new file mode 100644
index 000000000000..6558cbe56a50
--- /dev/null
+++ b/dev-python/botocore/botocore-1.27.45.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="
+	https://github.com/boto/botocore/
+	https://pypi.org/project/botocore/
+"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="
+		https://github.com/boto/botocore/archive/${PV}.tar.gz
+			-> ${P}.gh.tar.gz
+	"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	<dev-python/jmespath-2[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests pytest
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+
+	# unbundle deps
+	rm -r botocore/vendored || die
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# rely on bundled six
+		tests/functional/test_six_imports.py::test_no_bare_six_imports
+		tests/functional/test_six_threading.py::test_six_thread_safety
+	)
+
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/ensurepip-wheels/Manifest b/dev-python/ensurepip-wheels/Manifest
index f787efc6dd74..2a40183307e5 100644
--- a/dev-python/ensurepip-wheels/Manifest
+++ b/dev-python/ensurepip-wheels/Manifest
@@ -1,4 +1,7 @@
 DIST pip-22.2.1-py3-none-any.whl 2044666 BLAKE2B 702699d059273182f248acb48f6f6c9ec287e2edb3de2c84c05402b4fc82da23c14f76e2d3ed8cc1c281e3c8d8fd1a467963d3b9ab6fa384c16d5057fce1561d SHA512 dad2ce78544502a3ec4492a57acc5c1cf6f34ee1d3200a46cf19246f7eda701524d745237909b154317c3d6be6d4e61b086be9562d31d54b60268ca573692638
+DIST pip-22.2.2-py3-none-any.whl 2044706 BLAKE2B 254427e593e44d9f1ce48276fd40f214e8ca9d27b6c31b7a6ed5fa4566df6b1f723215c6a1766a534ce18174f2363c383dbff19368d1b89f1519a53bebd34215 SHA512 142d3144c14b692c645613d98bf35dd91193128d5e21b61a8a702548f1247fac662499d6e39b65c0aa9a0444d2d92983fd8c410439796626485a4e1be99a102f
 DIST setuptools-63.3.0-py3-none-any.whl 1228351 BLAKE2B 5a7a8d864b5fc992952a4c7f0230c3ebb6f33c7b4fc965ca8bfa4cf3b57948e8353f59074f7374e3d002866333d3ad5fd072ccd479f8470cbfcd14aa635efc54 SHA512 f2df66493fb9520b50e3e93560b17e5aa6f01e5fde27028a550249beb54f3ea6b2d8f0a2bcc57afaff193e38d5b217544c0623b254ac300652aed444abf06a14
+DIST setuptools-63.4.1-py3-none-any.whl 1228875 BLAKE2B 8f5a91764f509311f217d9cec6030c8318138d2d60bf8e8cf8ab0d7e9a9d578c1f644aaf30988846c4f22b962b10fa47c2e92cf63ffe0186acaf697c8eb96cc9 SHA512 c73f075f80a97d77906ed9acc1850ab4e458c1d4423a3f9a4b71bd677d7bd0e3ea291683942cd2cc9a91d454e905ea9732e169711c5218a8047997049e0c5536
 EBUILD ensurepip-wheels-63.3.0.22.2.1.ebuild 848 BLAKE2B 2d4062dcde645e944dcc73a9fe8150ded2473bdeb0656832223cc1071b8fbc9b99522eff3eef11778ac9f12e97a85a8c99bdd78a4fd85b7b87b6711439d5e0c4 SHA512 cd12ffe723070c282e9f92ce6c0b125ba0f336e73d063c68f49ad4c91e29dba542ed877dcfe1afd5913c71cfc1f0cc8333d0cb8f7f9ee36050e8f42610a3498d
+EBUILD ensurepip-wheels-63.4.1.22.2.2.ebuild 848 BLAKE2B 2d4062dcde645e944dcc73a9fe8150ded2473bdeb0656832223cc1071b8fbc9b99522eff3eef11778ac9f12e97a85a8c99bdd78a4fd85b7b87b6711439d5e0c4 SHA512 cd12ffe723070c282e9f92ce6c0b125ba0f336e73d063c68f49ad4c91e29dba542ed877dcfe1afd5913c71cfc1f0cc8333d0cb8f7f9ee36050e8f42610a3498d
 MISC metadata.xml 333 BLAKE2B 800dafc25b6f76bebd9f1d47d42e3427c7024ea0114c00201a766fd33d2cd2a466587da9e1cb22b2cd6e45637e8b8f93af7b6a52afd5fbbd460bea880f55a2e8 SHA512 40ee1087f3b5575c3a86368a5ee56c606442e8ace9396eb409bcfda734cc480e781f75d861253772cf9ef113d3cc4a05687b76df45ad5ecff984460ce54583e7
diff --git a/dev-python/ensurepip-wheels/ensurepip-wheels-63.4.1.22.2.2.ebuild b/dev-python/ensurepip-wheels/ensurepip-wheels-63.4.1.22.2.2.ebuild
new file mode 100644
index 000000000000..691136b4b5bb
--- /dev/null
+++ b/dev-python/ensurepip-wheels/ensurepip-wheels-63.4.1.22.2.2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+SETUPTOOLS_WHL=setuptools-$(ver_cut 1-3)-py3-none-any.whl
+PIP_WHL=pip-$(ver_cut 4-)-py3-none-any.whl
+
+DESCRIPTION="Shared wheels for ensurepip Python module"
+HOMEPAGE="
+	https://pypi.org/project/pip/
+	https://pypi.org/project/setuptools/
+"
+SRC_URI="
+	https://files.pythonhosted.org/packages/py3/p/pip/${PIP_WHL}
+	https://files.pythonhosted.org/packages/py3/s/setuptools/${SETUPTOOLS_WHL}
+"
+S=${DISTDIR}
+
+# combined license of setuptools and pip (with its bundled deps)
+LICENSE="Apache-2.0 BSD BSD-2 ISC LGPL-2.1+ MIT MPL-2.0 PSF-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+src_install() {
+	insinto /usr/lib/python/ensurepip
+	doins "${PIP_WHL}" "${SETUPTOOLS_WHL}"
+}
diff --git a/dev-python/flake8/Manifest b/dev-python/flake8/Manifest
index b60c93b38e9a..196a5899bedf 100644
--- a/dev-python/flake8/Manifest
+++ b/dev-python/flake8/Manifest
@@ -3,8 +3,10 @@ DIST flake8-4.0.1.tar.gz 154905 BLAKE2B b93fea36236881da595ae924b056686e0cd35d24
 DIST flake8-5.0.1.gh.tar.gz 145559 BLAKE2B 27c49d0e30696be086a68382235611fccf978edbd73fff0b41cd285eb6443bc183f12d54337777d07348951a6e1775793608be567149fecdfcd40cb75e879fcd SHA512 63e91269c9cad7d5807a5b6cc6dfe5fc1db6353fe28bbb6b3459e9a7ee3140db2a40c202d5964acc69546af386d4f0ea5132cbcc60d07f179960249827062440
 DIST flake8-5.0.2.gh.tar.gz 145812 BLAKE2B 64ebbeebf8aa2dc4dca2e14cb09965cfa86f6a5353f5ff78cb0cb2a8e60cd05d041e3d1e1668a1f9c143030bb62ca6d8d17d8b084a2e56175843460cf0bfe78c SHA512 0d1ba9bff706060bd9d5ad0f230c7a4d8a2b70f30907c8a78222d54b0f099f77b7a48e5658251cb862d0894a45e230b058bf50ba324ea1d4ddcdf1336c343cb6
 DIST flake8-5.0.3.gh.tar.gz 145956 BLAKE2B c6a54c67962bad905827600632f08b73c34c42ffe4f4242b9448b222ef0d1339d9e68174bcb17a8b85f357783e847c3171f963f7d21d9d2014af02c4a5e5856d SHA512 db2ce4a2bbbcc97c3a79dbf64e299ef2853470ace99dceae0dd63a5f58603531af2d4afe3f3db76ac483bb5c8884bfbaf15ba4c9e61f6b507634cbff83dcbb47
+DIST flake8-5.0.4.gh.tar.gz 146207 BLAKE2B c99ec0977948e98ca62106737509f7901b15871894f08c1dc82a4dfdf7567bc85eaca5918600fc42d0c82de612644df1b587e8a7c84fbe040d1402c3513e1855 SHA512 2e9f8bf2bbca1ab0b7cb0bc6aee53f7e12288194a80a8be915478061fd76adb8d270ee50383b45beb9d4dd1ee806f104e7bbf29f69b23a7cd88ee0902ff3e965
 EBUILD flake8-4.0.1-r2.ebuild 1233 BLAKE2B 8b22865d9d36db9a860b4132b71dcc9ce9a4de8d00312538fe7f5880d70763a4300151379222d10bfffcbcae965533581096fd47b0bcb0a2d89337cabc44c8dc SHA512 d99542c787c24d2ea3473b3acaa24f0debf53a9b038d5f14374932efc1f760c68f1aa066729b4f60c0a55e75e7b0f2d260ab4867f85652065d294d0399b8e340
 EBUILD flake8-5.0.1.ebuild 1245 BLAKE2B 93f0af3655fe3a220a0085451f6212326531253cbb2566bc582757cf44cae1706b723050aa1a6be40459bc82d16ca844aec7d6fdf990722af4a9c0e9b0ec2e9e SHA512 f974db0529efa02f5853742e65a2466c3e0d3d0e396d3911a4f0e450280c91531203f504d5f4980e57d555484a15e05fb1eb44ea9d695aa5b3003be8bdb6e0f4
 EBUILD flake8-5.0.2.ebuild 1245 BLAKE2B 93f0af3655fe3a220a0085451f6212326531253cbb2566bc582757cf44cae1706b723050aa1a6be40459bc82d16ca844aec7d6fdf990722af4a9c0e9b0ec2e9e SHA512 f974db0529efa02f5853742e65a2466c3e0d3d0e396d3911a4f0e450280c91531203f504d5f4980e57d555484a15e05fb1eb44ea9d695aa5b3003be8bdb6e0f4
 EBUILD flake8-5.0.3.ebuild 1245 BLAKE2B 93f0af3655fe3a220a0085451f6212326531253cbb2566bc582757cf44cae1706b723050aa1a6be40459bc82d16ca844aec7d6fdf990722af4a9c0e9b0ec2e9e SHA512 f974db0529efa02f5853742e65a2466c3e0d3d0e396d3911a4f0e450280c91531203f504d5f4980e57d555484a15e05fb1eb44ea9d695aa5b3003be8bdb6e0f4
+EBUILD flake8-5.0.4.ebuild 1245 BLAKE2B 93f0af3655fe3a220a0085451f6212326531253cbb2566bc582757cf44cae1706b723050aa1a6be40459bc82d16ca844aec7d6fdf990722af4a9c0e9b0ec2e9e SHA512 f974db0529efa02f5853742e65a2466c3e0d3d0e396d3911a4f0e450280c91531203f504d5f4980e57d555484a15e05fb1eb44ea9d695aa5b3003be8bdb6e0f4
 MISC metadata.xml 399 BLAKE2B 70701bbf00aac5f16ae5bb241b56a69c79abe02eea8695d5cdf71fb427e5ed1f1e19dca0e77904889a99e22026b39d64c309d4072dc4175f7660e414aec3736d SHA512 98ef1cc82925436bd40fe18876be4ba3b8b5aee42e62e73406b46ac49cdd2c689a69e4e685fb5f69f5ea7fbf6335797dc059817f4cf36f51c73404255830acf9
diff --git a/dev-python/flake8/flake8-5.0.4.ebuild b/dev-python/flake8/flake8-5.0.4.ebuild
new file mode 100644
index 000000000000..37823287f388
--- /dev/null
+++ b/dev-python/flake8/flake8-5.0.4.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="A wrapper around PyFlakes, pep8 & mccabe"
+HOMEPAGE="
+	https://github.com/pycqa/flake8/
+	https://pypi.org/project/flake8/
+"
+SRC_URI="
+	https://github.com/PyCQA/flake8/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+# requires.txt inc. mccabe however that creates a circular dep
+RDEPEND="
+	>=dev-python/pyflakes-2.5.0[${PYTHON_USEDEP}]
+	<dev-python/pyflakes-2.6.0[${PYTHON_USEDEP}]
+	>=dev-python/pycodestyle-2.9.0[${PYTHON_USEDEP}]
+	<dev-python/pycodestyle-2.10.0[${PYTHON_USEDEP}]
+"
+PDEPEND="
+	>=dev-python/mccabe-0.7.0[${PYTHON_USEDEP}]
+	<dev-python/mccabe-0.8.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	${RDEPEND}
+	test? (
+		${PDEPEND}
+	)
+"
+
+distutils_enable_sphinx docs/source dev-python/sphinx-prompt dev-python/sphinx_rtd_theme
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# fails if additional flake8 plugins are installed
+	tests/integration/test_plugins.py::test_local_plugin_can_add_option
+)
diff --git a/dev-python/flask/Manifest b/dev-python/flask/Manifest
index 1da19734b5a5..757888f0ecca 100644
--- a/dev-python/flask/Manifest
+++ b/dev-python/flask/Manifest
@@ -1,5 +1,7 @@
 DIST Flask-2.1.2.tar.gz 631846 BLAKE2B 9024a12dd6fabeffcf5939e2852734b278f25fb99830bb165cf46a09e3fd67d0997558d1b06a0dec3425d9b750be25bde147341c937e874811fe2496224a1f3e SHA512 65ca756d63da05e74863fbfd2ae574d6e75d6fab683dd08ea97b22a9b27be4f9a03ce7be44312a1f2c6a802bdf77ede3899734f3f1546000dd8b9c592571deec
 DIST Flask-2.1.3.tar.gz 630206 BLAKE2B 83c876fe94d2cb1b35677227214664b35b6908270097d3ef0e1150a7259cdce82fb91fa6ba7cc90e819623bb9cc79f8254cc5688c6dd1e1dedaa673f23591bfb SHA512 6289bcaa295265c501fda1292b496911768525acf4155c856e14479a213aec4ca50a45ddd81b30ccd31fd684da1942ec10400f2dc8280ceff6ded9baf55494e5
+DIST Flask-2.2.1.tar.gz 687433 BLAKE2B 9d5fbc6827110882c64102f596b1d272bf5b16fd5540eedf0bad52f4456b54c3ab53e474ec74bb0e7d3cc7cfc26a22d19fd908d0973b94e64b47ee3a66c5a4e6 SHA512 845857cd6441e935a5274f362708c1e84654f757b0412bb57dd1235943d1d0562b081b53e77920ab9891bbe6810a06f7564e828cda472844413f7a1249335d1a
 EBUILD flask-2.1.2.ebuild 1512 BLAKE2B 4c087e67a6aac823a44f27a9040ba4af1b3e1d083043be671a39bfccfc4369490e746a869aeea137877c229b50a77da4dcc1e56907c2b0fb0c1f3dd6550a8e52 SHA512 dc6b6ecc43fecf840ac2fff079f9b9fc8e9650fa0ad761c1b4b9726935038f4685084a782fae385212be01ae640404ad53e12af5bf9a10fe988200cad86425aa
 EBUILD flask-2.1.3.ebuild 1520 BLAKE2B e9677b4637436038576b85d6b7b022a180b5db935f71ef1abbb3c1cae2e461f9ab18f634265d2c010134bd89f3de84685adb02a78727fb2e60d5d5bb6809a692 SHA512 44d8d8af5978da14bdef4490acf54e54c0cd3ced026a16df571142886ce4a436cbe3f961773db5efd5b23c935427f0cd3b5886dccf4fe3600d74b8bd15145489
+EBUILD flask-2.2.1.ebuild 1520 BLAKE2B a81452c06be28a3670e745a543a4a07c906cc4738693ea7a065a8107798b495e86304bfe7cbaf6cacd3a5f8b71a11b517dd3b783547f017c5f45a6f98c65ae21 SHA512 11d80c89560d6cc9aeb9e57ce30770ab97453df65bfd0cd8e6bffb5f37de638e96a255510c1e5cb4d00419dd004935a4c58117b65aa78222f7881c3815e7e3d2
 MISC metadata.xml 386 BLAKE2B b449c54b966bc8943f7b7b12d6126867a89a2759eb749c08f7ad53a174e93ecad07f09b5e30c8562c63ab05df75a82e2f48f550ea8cf3a546f5afc2eef5a896d SHA512 123334db31948046e47f3cdbe0237cdec3dc2207485c8243d1e34e065436995423b6a89909563a6158741a8cc62a7fdad95923870a7114cf69e58ef715e7ec5c
diff --git a/dev-python/flask/flask-2.2.1.ebuild b/dev-python/flask/flask-2.2.1.ebuild
new file mode 100644
index 000000000000..3a8c008e1ad8
--- /dev/null
+++ b/dev-python/flask/flask-2.2.1.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..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A microframework based on Werkzeug, Jinja2 and good intentions"
+HOMEPAGE="
+	https://palletsprojects.com/p/flask/
+	https://github.com/pallets/flask/
+	https://pypi.org/project/Flask/
+"
+MY_PN="Flask"
+MY_P="${MY_PN}-${PV}"
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/mitsuhiko/flask.git"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="examples"
+
+RDEPEND="
+	>=dev-python/click-8.0[${PYTHON_USEDEP}]
+	dev-python/blinker[${PYTHON_USEDEP}]
+	>=dev-python/itsdangerous-2.0[${PYTHON_USEDEP}]
+	>=dev-python/jinja-3.0[${PYTHON_USEDEP}]
+	>=dev-python/werkzeug-2.2[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_metadata-3.6.0[${PYTHON_USEDEP}]
+	' 3.8 3.9)
+"
+BDEPEND="
+	test? (
+		>=dev-python/asgiref-3.2[${PYTHON_USEDEP}]
+		!!dev-python/shiboken2
+	)
+"
+
+distutils_enable_sphinx docs \
+	dev-python/pallets-sphinx-themes \
+	dev-python/sphinx-issues \
+	dev-python/sphinx-tabs \
+	dev-python/sphinxcontrib-log_cabinet
+distutils_enable_tests pytest
+
+python_test() {
+	epytest -p no:httpbin
+}
+
+python_install_all() {
+	use examples && dodoc -r examples
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/identify/Manifest b/dev-python/identify/Manifest
index af36e65ebe6a..9083f432b48a 100644
--- a/dev-python/identify/Manifest
+++ b/dev-python/identify/Manifest
@@ -1,5 +1,7 @@
 DIST identify-2.5.1.gh.tar.gz 101393 BLAKE2B 8586721838c427b00a7c70e842d2ab1a2f0437909d84d5cba6614aff3f8265f17b5137628bdd78e5f324fbf6a0fef8b5ca0246e6861af023c2d9a1a323cc43f6 SHA512 8b61dd03bcdb8908a1a7f3b13d66121bb4f4bb3aab57672bff55a84232dcff310214ed0a90cfcf79846da9abc111bff08761ec9dd40c8b9b183bfbbf365efac4
 DIST identify-2.5.2.gh.tar.gz 101399 BLAKE2B f0ef048c6543b32016ad47a84e4b4b049a88424e496b159ce6ec1a1358172a87849e132b045a7345e818b02aee359e6d9458c458430a4d5d2b9f918cba685ed7 SHA512 72aaf406e5aa7acc83189820c389e82e90cf775541013e4ad91e5d25abdecd8526d1c47d203baa8ab8e5e028836da755a7045e74fded7e8e3167397557d4b1f0
+DIST identify-2.5.3.gh.tar.gz 101397 BLAKE2B 8782a4dfcea2d84facec9fefac8c7241c978ca1f494aa3e0602171dc017b41d24545ec7a3537b07a5e9962edcc4813fa4f45f76d807ba8ba69243041bc777d1b SHA512 d6cc5737b119498af5fb3cc9478881960b4d9532eec552622e942292ec3f1c75182f50ccc94fe7e1bb8993525c5e50fcdfd58881a9226da52fbe5feb3b83a8c3
 EBUILD identify-2.5.1.ebuild 588 BLAKE2B eff914d7f68c76704a11dcdbfef21c51f52f0abcb6d29f669ba173106369d2eaedc818e9d89ed2d35e765184b07fe471c3d9c86db84f0093ebe87e46bf951152 SHA512 2ff5036390cf415ad56c87cc4bc7e1c2fbf0992ebf92ef3cbdf44ed40832a0326bb5f946e4fa432d4e429f8b224c7e6b37fb3ebac56d2388201df754205bd42e
 EBUILD identify-2.5.2.ebuild 590 BLAKE2B 9903b2478df4f9ce56ff68e2877d9b8e5d86a814e3c021b0533f3db6a1aabc5709c5cda6a719e47126c1ffac7ef34bfac74531395e035055a856a9427b9ca179 SHA512 b9c852d73351dc0386609a4db9072467a47fcf768205fbcfdc7798d0acac40de383315a734547acf4b3fc46cc1c21c66fabc0d97583c2fa0ad946ad89551be03
+EBUILD identify-2.5.3.ebuild 590 BLAKE2B 9903b2478df4f9ce56ff68e2877d9b8e5d86a814e3c021b0533f3db6a1aabc5709c5cda6a719e47126c1ffac7ef34bfac74531395e035055a856a9427b9ca179 SHA512 b9c852d73351dc0386609a4db9072467a47fcf768205fbcfdc7798d0acac40de383315a734547acf4b3fc46cc1c21c66fabc0d97583c2fa0ad946ad89551be03
 MISC metadata.xml 501 BLAKE2B da95534590927f7290f78f47e30484e3349c9058048c15522e7346a74d9a2c96141a18897b10b230adf966d3c237217ef1d2dcfe59814ccfffd58ab4c38c1ebf SHA512 8d78245bbd2e14016eb70f1d8f8d6129e6b265084f7da95bd915f01ce5af94f86bd69c33c1514195de70d0f834332d9ca968a18afb59a7016c8cb58681d04d24
diff --git a/dev-python/identify/identify-2.5.3.ebuild b/dev-python/identify/identify-2.5.3.ebuild
new file mode 100644
index 000000000000..8ce2bd5b0e7d
--- /dev/null
+++ b/dev-python/identify/identify-2.5.3.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="File identification library for Python"
+HOMEPAGE="
+	https://github.com/pre-commit/identify/
+	https://pypi.org/project/identify/
+"
+SRC_URI="
+	https://github.com/pre-commit/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	dev-python/ukkonen[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/oslo-concurrency/Manifest b/dev-python/oslo-concurrency/Manifest
index c7a0d8e36a75..b204a85bc170 100644
--- a/dev-python/oslo-concurrency/Manifest
+++ b/dev-python/oslo-concurrency/Manifest
@@ -1,3 +1,5 @@
 DIST oslo.concurrency-4.5.1.tar.gz 59126 BLAKE2B 61f509b4ce76cd036b695bb5ad744374e029239a63a629a4b96d44c8ba29150095fe9d57000367c4d07dc7c358ef61cfa4868a2347f206327093ad32ffb85955 SHA512 88319915c90befb01a275666b4a760357c1e72f04d5faf27ab9c67629ecbf2dd3a73d077f3c57435231b55aa777a9642f26e91cc4cb27ad56eb801b2b98eca48
+DIST oslo.concurrency-5.0.0.tar.gz 59343 BLAKE2B 412fba38e0281b2c6d7b27182d159c99730a22ec3400586481f234998cd2f446de5cdd84aaa3abb1cdd93eb9eff1294c87ce51e165dc49caa078e69932ecd19b SHA512 570acbaf599a8a177ba6bc7c009edb43db5e077c06bee5c5895d81944daf78c8dde197bd9af730b17b5075fdaf527252aa44ea0edb79d73e16714582645afb7e
 EBUILD oslo-concurrency-4.5.1.ebuild 1289 BLAKE2B b622f95226eaa12059d70956621db39bebd6681bbd7809473ae97633e13eaf337e244ce923948903c4ae95a46a8b3a334e23f658ef1297858fe6c1c3ee62f742 SHA512 4516c8be42f0716c4992adc77be2dff98863edb93a0f9450cbe4a5da212fa98c3e3a2d4f88d706e0e7a1c11317d52a3b58df05a8b90f47b7b92ff98f97d9307c
+EBUILD oslo-concurrency-5.0.0.ebuild 1291 BLAKE2B e3efa35f7cafdf4393a87b94e9c726cef3f7b290c4911abe0de01ec09c349f5bb7047643c1d1bc72a0f4068399cb739b27d20b2303a0cc1995a51b0e082dfc5b SHA512 6e70d93c1b7bd8dc43d11ce657819e0ab8f7d9a32626d3400d6afd6e971346df646762ba8d97a708c1c01ab5e9269274e37e5e2628bfa72309a5df719d2cf678
 MISC metadata.xml 540 BLAKE2B 3cf35ead27deb8915aafded620fabef948d56e3feff9a6936bf8b80cf4ca3a84a000a0f56c2fee944dbd5c0ad7fb5211656ae861c64257d2ef83629e914521ad SHA512 a10fd1f009c73620ae68719bda0304ee3d8b64c0edb05d6bc818d14475499a1a78c613815b9fd29991c9b90b830e099139f263861e10b696432651da65a7d637
diff --git a/dev-python/oslo-concurrency/oslo-concurrency-5.0.0.ebuild b/dev-python/oslo-concurrency/oslo-concurrency-5.0.0.ebuild
new file mode 100644
index 000000000000..e51f8493591c
--- /dev/null
+++ b/dev-python/oslo-concurrency/oslo-concurrency-5.0.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Oslo Concurrency library"
+HOMEPAGE="https://pypi.org/project/oslo.concurrency/
+	https://github.com/openstack/oslo.concurrency"
+SRC_URI="mirror://pypi/o/${PN/-/.}/${PN/-/.}-${PV}.tar.gz"
+S="${WORKDIR}/${PN/-/.}-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
+	>=dev-python/fasteners-0.7.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			>=dev-python/eventlet-0.19.0[${PYTHON_USEDEP}]
+		' 3.8 3.9)
+	)
+"
+
+distutils_enable_tests unittest
+
+python_compile() {
+	distutils-r1_python_compile
+	if ! has "${EPYTHON}" python3.{8..9}; then
+		find "${BUILD_DIR}"/install -name '*eventlet*.py' -delete || die
+	fi
+}
+
+python_test() {
+	cd "${BUILD_DIR}/install$(python_get_sitedir)" || die
+	eunittest
+}
diff --git a/dev-python/phonenumbers/Manifest b/dev-python/phonenumbers/Manifest
index 8b88f0c3dc97..84abcd3c9695 100644
--- a/dev-python/phonenumbers/Manifest
+++ b/dev-python/phonenumbers/Manifest
@@ -1,3 +1,5 @@
 DIST python-phonenumbers-8.12.52.gh.tar.gz 4904385 BLAKE2B c063fee535e3d1dd30844ea7a974601962fb8fd6b56608046e0c488e638624456020100b2b775f979f770ea1690bda38044d4f7457341d1261132f4323a6de86 SHA512 638ec8e09d58adc5131e855a9436b45f1f0252c084638a13130df793d5357fc249e695668e2cce4902a534300c4683b64078e08620fdd2636857f6d328a45d82
+DIST python-phonenumbers-8.12.53.gh.tar.gz 4904940 BLAKE2B c8da67f781c71265faa4d24e5cadf7d2c4e707de6f6fc2efae37f0b846cafd6c00814188c2d89d98ec0fb7dbeef9fedc45dc908adf117643bc2b2a0ab56a4496 SHA512 aa699e5df1b612bbcf384e01b80251099872e67fd5632dab35e53861ab6b28157266ac0a1700f4371a0a2975f0484256fb46b6287b87dc8e69aca85323475490
 EBUILD phonenumbers-8.12.52.ebuild 808 BLAKE2B ef45a7f57cab5aa38bb958cae5b0bb0bbca327073d8d4bc41aa56552037a2ae91e5e01b3e6af6e9d948ad4f7edd5ff7fd0808c2a7d742845040fbcd55a6b3b77 SHA512 2786479b7b053e0c900d5548a1339a0d81c0d4c44a25d0b33ce6058e06a872710d7c887d4ee20b7c705065e2a2e4eee6519bb76960902afc45f86c3806819108
+EBUILD phonenumbers-8.12.53.ebuild 810 BLAKE2B 3b18782b7466900c6dcf66ada03d333fefd3df0a6a02bc1417de82a4e692e0baf316db5d1b4bf070d4a73b7f8b5133018c22587f5549fbe8863b8e3ec6859441 SHA512 9f1fc8118ab9fc7284723238e398f9152d6e491bfe0be97fa5b181f1bb30a0d96900c1e1674b6ca325daefb8813bc25dfae44f1ab172361e367725c5a040ba4e
 MISC metadata.xml 413 BLAKE2B 4fa9965e76205ab35de37314b8c06fae26ccf34a944401e672487d7ad42b0046b4de85c8dd4c500d2703b5ecca49755b3f6d9047a20d7226fdbdf63e0aca3220 SHA512 de88d4162ba8f97748a1d2a17a8bea48f59b84f67c76aec11a9bad8ab0d0b66bc9cc2395dfff446bbad591f52f755a38ccd0daf2480b4f2e22e80ce5d44a42c1
diff --git a/dev-python/phonenumbers/phonenumbers-8.12.53.ebuild b/dev-python/phonenumbers/phonenumbers-8.12.53.ebuild
new file mode 100644
index 000000000000..baab22b23fc7
--- /dev/null
+++ b/dev-python/phonenumbers/phonenumbers-8.12.53.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+MY_P=python-${P}
+DESCRIPTION="Python port of Google's libphonenumber"
+HOMEPAGE="
+	https://github.com/daviddrysdale/python-phonenumbers/
+	https://pypi.org/project/phonenumbers/
+"
+SRC_URI="
+	https://github.com/daviddrysdale/python-phonenumbers/archive/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}/python
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~riscv ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	test? (
+		dev-python/protobuf-python[${PYTHON_USEDEP}]
+	)
+"
+
+DOCS=( ../README.md )
+
+python_test() {
+	"${EPYTHON}" testwrapper.py -v || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/pip/Manifest b/dev-python/pip/Manifest
index 3995a7d96172..bc3703b9f67b 100644
--- a/dev-python/pip/Manifest
+++ b/dev-python/pip/Manifest
@@ -4,6 +4,7 @@ AUX pip-22.2-no-coverage.patch 1833 BLAKE2B 8111b66a8e97b0415b1fe9314f8c1fcf49c1
 AUX pip-22.2.1-no-coverage.patch 1805 BLAKE2B 790a6736194d3ad7cadbb7965978f19c251a65b98b67c64726072f2baa24831f3e3788fdba560c247cde948183c6589b6edf18d5861468801e5729ba53c42995 SHA512 5fd775c0a1cb0f88c6c632a90294f11788916371b7d4bb8b378ed1530b461a9788f289a06d6619e66fcb45dd08a7063a749a608c5f12a778db84dfcbb5e79cba
 DIST pip-22.1.2.gh.tar.gz 9346675 BLAKE2B f709f8977d467d5a3170884bb75cd2f74a2f40801ae02a3725d442e18e4073f9c4a39cd1c9d2ce3949eb888be69d151f67d0cf2d0cbad7e2ec1ec6e78150b5c7 SHA512 7dd13150023f1cca8f5e01da7688ae418b5d0b36364efcfc15374a5147c7cabd46ff1d34e6499bc8e182dc0d34a366f5fe21d8ab4de4d112d269a97200401305
 DIST pip-22.2.1.gh.tar.gz 9279141 BLAKE2B 61906027e36c8b3b82f3d17a59cbc995864622184c7f4099e9dfbb5082d1953dff72551558b8fe0d463d7defcd8b9403a978e4a8c7d79af5cd6b9dbbbcc9c7b5 SHA512 77996ce7e1aa4b5aab0c55dfee5e9bfe9f5f09f33cb796ce78bba7365f37ce9f1cce4eeaf5fdbeddde0819ecc6a30ffdafa6b7e25f93c672fcc8646303a7946e
+DIST pip-22.2.2.gh.tar.gz 9279218 BLAKE2B 2179b0d3f5f05bbd678f1785b4dbc0613078c09c83b45faa62d766182dfeb564095abda809ed99f45644abcb06c125efc528aeaed3ad40ab1c9e8972e33ccbb2 SHA512 bd59e28b55475b77a8f11ea771cbad3b2602ff974e219f9a55288963a9522c9279a5b00fde40fb65cfebefae0e905d3da3c06fe50b402aa5326b25f70a98a015
 DIST pip-22.2.gh.tar.gz 9278410 BLAKE2B e32fe63e81593a0ec9c0110af0f07f1a47ddd3d6c660c11e9eb9142c251b7f45e3a1cc343193b123364a6a3a69490add7d4ebb368aac027c448f00f7cd163d7c SHA512 2ff3f9c2dc84c65c14c978e8c58cd3cee6cfff9753655c726763d6d7780d147479f32c47873d402ad9e0821fef940b971a7df93fabd6b998f07dea5af1251c9b
 DIST setuptools-62.3.2-py3-none-any.whl 1225929 BLAKE2B 608952e201f749ebf557e3962ba9856d5bdcbc534f3a25598cab0d6c53282cfb3b9f007ba135497a8addf49db4c02bc4387c486d95a4529d01ce4114154ec28a SHA512 366d69dc44e326dd7549cdacd8dec481a14dce4feef4338adc38b9de5c4c338f04d61696e13ce8603be1315f2e8734100f92d3fe4b4b11843e19f550c9631978
 DIST virtualenv-16.7.12.gh.tar.gz 8906590 BLAKE2B a1f206769e4e5797562906162e492e44c4a72720e4f88a0362dc802ce2df20c65aaab6a72dce2238445601a10fae59bd90cd362217994d30911f105afd71c5fa SHA512 0278b33fb19f6553e70ad3dcffa6ea1a455ff435b216ac9b4fadff216b2932714faa2bb6027af3058010111d8511a5c2fcd424f31c9645be361603971f111c8e
@@ -11,4 +12,5 @@ DIST wheel-0.36.2-py2.py3-none-any.whl 35046 BLAKE2B bc4e8dab7c74eea34d3b4a813b7
 EBUILD pip-22.1.2-r1.ebuild 4244 BLAKE2B eb572300446fe1697e4201024ba005d25edfcfec50c4102c2053b8b586af60ea261db2898e48b7e8b4f07d9deb289f5f6719918f66132ad078ba7a35756be7e2 SHA512 737f505103c8e2401cae1ba09f25407c598379bf085d28d9761abf93d4451d67c5aa08a8f446b5a03da2bf3ac68afb2f1bb6e57e0c8fec3b8fef4cd63a0b5b1d
 EBUILD pip-22.2-r1.ebuild 4440 BLAKE2B 28cf5c72f782107f7d322d418b503067a21217d8552580051641438883ecb18235b761bdc1e9574817e77bc5523104197dd0fe3472ed676d65619593b5726932 SHA512 c37dd2ce831728511b4cbc08b87076f1112cf23815eea1cc0cf959721d7d697ebe65bf458c27ed777475d54d58ee0d00fa9190c6829e06ae666e775e6fe03c03
 EBUILD pip-22.2.1-r1.ebuild 4510 BLAKE2B 60e0a608797cac42cc03cba07ef99733e5e9631e8044876a7e929394fde697edb89a95291ddd0d5db4ae7456458ec3ec15dcdf6fe2c1ab976488365d1e22daf3 SHA512 79bd859969f22b8cc20d38b3a152d93249848b3110c714bb95e4e14fa347fe77d3ee92422a46fca0a1008fb23f0959fd8985b9aa0c67fae473be8a05eb5a9b31
+EBUILD pip-22.2.2.ebuild 4510 BLAKE2B 60e0a608797cac42cc03cba07ef99733e5e9631e8044876a7e929394fde697edb89a95291ddd0d5db4ae7456458ec3ec15dcdf6fe2c1ab976488365d1e22daf3 SHA512 79bd859969f22b8cc20d38b3a152d93249848b3110c714bb95e4e14fa347fe77d3ee92422a46fca0a1008fb23f0959fd8985b9aa0c67fae473be8a05eb5a9b31
 MISC metadata.xml 392 BLAKE2B 94ea3de1220cb9ca64ae1186597789cc83a54adfe44695932c07dd5065df0e5f9ee5078a495e3a12563b36809d781d8ab86bb6c92c485c023199d92547b74f27 SHA512 603199f6547105f3bb64f4fcaf004e9ef62fa2e0f8ec6eab56078119684b0f5119161e0f164fe02b2cf6dd6b115588c9ef77d727eeb6d138e281f1cb0bcb5de9
diff --git a/dev-python/pip/pip-22.2.2.ebuild b/dev-python/pip/pip-22.2.2.ebuild
new file mode 100644
index 000000000000..8d3b6ef3e28e
--- /dev/null
+++ b/dev-python/pip/pip-22.2.2.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# please bump dev-python/ensurepip-wheels along with this package!
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_TESTED=( python3_{8..10} )
+PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" python3_11 pypy3 )
+PYTHON_REQ_USE="ssl(+),threads(+)"
+
+inherit bash-completion-r1 distutils-r1 multiprocessing
+
+# setuptools & wheel .whl files are required for testing,
+# the exact version is not very important.
+SETUPTOOLS_WHL="setuptools-62.3.2-py3-none-any.whl"
+WHEEL_WHL="wheel-0.36.2-py2.py3-none-any.whl"
+# upstream still requires virtualenv-16 for testing, we are now fetching
+# it directly to avoid blockers with virtualenv-20
+VENV_PV=16.7.12
+
+DESCRIPTION="The PyPA recommended tool for installing Python packages"
+HOMEPAGE="
+	https://pip.pypa.io/en/stable/
+	https://pypi.org/project/pip/
+	https://github.com/pypa/pip/
+"
+SRC_URI="
+	https://github.com/pypa/${PN}/archive/${PV}.tar.gz -> ${P}.gh.tar.gz
+	test? (
+		https://files.pythonhosted.org/packages/py3/s/setuptools/${SETUPTOOLS_WHL}
+		https://files.pythonhosted.org/packages/py2.py3/w/wheel/${WHEEL_WHL}
+		https://github.com/pypa/virtualenv/archive/${VENV_PV}.tar.gz
+			-> virtualenv-${VENV_PV}.gh.tar.gz
+	)
+"
+
+LICENSE="MIT"
+# bundled deps
+LICENSE+=" Apache-2.0 BSD BSD-2 ISC LGPL-2.1+ MPL-2.0 PSF-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+SLOT="0"
+IUSE="vanilla"
+
+RDEPEND="
+	>=dev-python/setuptools-39.2.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	${RDEPEND}
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/freezegun[${PYTHON_USEDEP}]
+			dev-python/pretend[${PYTHON_USEDEP}]
+			dev-python/pytest-xdist[${PYTHON_USEDEP}]
+			dev-python/scripttest[${PYTHON_USEDEP}]
+			dev-python/tomli-w[${PYTHON_USEDEP}]
+			dev-python/werkzeug[${PYTHON_USEDEP}]
+			dev-python/wheel[${PYTHON_USEDEP}]
+			!alpha? ( !arm? ( !hppa? ( !ia64? ( !s390? ( !sparc? (
+				dev-python/cryptography[${PYTHON_USEDEP}]
+			) ) ) ) ) )
+		' "${PYTHON_TESTED[@]}")
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	local PATCHES=(
+		"${FILESDIR}/pip-22.2.1-no-coverage.patch"
+	)
+	if ! use vanilla; then
+		PATCHES+=( "${FILESDIR}/pip-20.0.2-disable-system-install.patch" )
+	fi
+
+	distutils-r1_python_prepare_all
+
+	if use test; then
+		mkdir tests/data/common_wheels/ || die
+		cp "${DISTDIR}"/{${SETUPTOOLS_WHL},${WHEEL_WHL}} \
+			tests/data/common_wheels/ || die
+	fi
+}
+
+python_compile_all() {
+	# 'pip completion' command embeds full $0 into completion script, which confuses
+	# 'complete' and causes QA warning when running as "${PYTHON} -m pip".
+	# This trick sets correct $0 while still calling just installed pip.
+	local pipcmd='import sys; sys.argv[0] = "pip"; __file__ = ""; from pip._internal.cli.main import main; sys.exit(main())'
+	"${EPYTHON}" -c "${pipcmd}" completion --bash > completion.bash || die
+	"${EPYTHON}" -c "${pipcmd}" completion --zsh > completion.zsh || die
+}
+
+python_test() {
+	if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then
+		einfo "Skipping tests on ${EPYTHON} since virtualenv-16 is broken"
+		return 0
+	fi
+
+	local EPYTEST_DESELECT=(
+		tests/functional/test_inspect.py::test_inspect_basic
+		tests/functional/test_install.py::test_double_install_fail
+		tests/functional/test_list.py::test_multiple_exclude_and_normalization
+		# Internet
+		tests/functional/test_install.py::test_install_dry_run
+		tests/functional/test_install.py::test_install_editable_with_prefix_setup_cfg
+		tests/functional/test_install.py::test_editable_install__local_dir_no_setup_py_with_pyproject
+		tests/functional/test_install.py::test_editable_install__local_dir_setup_requires_with_pyproject
+	)
+
+	if ! has_version "dev-python/cryptography[${PYTHON_USEDEP}]"; then
+		EPYTEST_DESELECT+=(
+			tests/functional/test_install.py::test_install_sends_client_cert
+			tests/functional/test_install_config.py::test_do_not_prompt_for_authentication
+			tests/functional/test_install_config.py::test_prompt_for_authentication
+			tests/functional/test_install_config.py::test_prompt_for_keyring_if_needed
+		)
+	fi
+
+	local -x GENTOO_PIP_TESTING=1
+	local -x PYTHONPATH="${WORKDIR}/virtualenv-${VENV_PV}"
+	local -x SETUPTOOLS_USE_DISTUTILS=stdlib
+	local -x PIP_DISABLE_PIP_VERSION_CHECK=1
+	epytest -m "not network" -n "$(makeopts_jobs)"
+}
+
+python_install_all() {
+	local DOCS=( AUTHORS.txt docs/html/**/*.rst )
+	distutils-r1_python_install_all
+
+	newbashcomp completion.bash pip
+
+	insinto /usr/share/zsh/site-functions
+	newins completion.zsh _pip
+}
diff --git a/dev-python/pycodestyle/Manifest b/dev-python/pycodestyle/Manifest
index c95560d71a04..841ff84e68f7 100644
--- a/dev-python/pycodestyle/Manifest
+++ b/dev-python/pycodestyle/Manifest
@@ -1,5 +1,7 @@
 DIST pycodestyle-2.8.0.tar.gz 102299 BLAKE2B ac4708a513582bb0f27f1abfcc983319e6c7b853c53971d5f026f297f897b25a6c8a651a4d2441b19ab37e6df6f7a38a472aad0757fec59e0438263d76ccfdb2 SHA512 0098be44451bc173507e2b396aaf342ccf7f25a6a1f5d5c1f802079a76a66e6bedf9f358b5e07b27bee66e3b279c72a6b72f63e5984f58ae83b7fc5806880fc1
 DIST pycodestyle-2.9.0.tar.gz 102014 BLAKE2B ee2c2cad332e7442f9e557f388c3de09ea0ea65b0678c65d64d6293de18aa884a39a6a65ce47a99ac04b98da4e4bad14d2ccd228b22bdbd7361a3a0ca2c27afb SHA512 82926bf1c5b72decc0679d4fcec705d707b91b347ea0eec52b1f05301b96e55fc75afdb367ecdec674976fe1f2f7b475498a8e9a2ba19e3dfd483584a9ef841e
+DIST pycodestyle-2.9.1.tar.gz 102127 BLAKE2B 701e6325a73173b8ab8540f03f794066f05ffe7f29cfac49f065ec6f8cc6a50b1334372b8fd7619a368a54605dde0214da9e9b3b59326c58803bf7f49d6981ea SHA512 da1c67815b50d13c8eb70cebcc12c761a6407518a4ed4a8780ee7064089c9e89a5c3246d05f19916c0ec293fc1a372d3b2adb72e11f775b1cfbd1fbbe07a1a83
 EBUILD pycodestyle-2.8.0-r1.ebuild 988 BLAKE2B 1a03070b2034e0980a1bcbccea10fb802cf8d29103ade396ad4834cbbe1b7f63c11e771467cdd53c188a0ee7025e5c0c5e7d7cc06d179d2d40c2e30194bdde99 SHA512 7ae95a135f574daea73067a52cd143bf502f54706264c7736673ed552cb7cd1bc33f2017f3fb8726d1605d86acfa294a469b9ed7e9fe69ac13ff61b55b1acc29
 EBUILD pycodestyle-2.9.0.ebuild 1067 BLAKE2B 440eb3e87210bbc3b2b013daec2ab9eb89c5d759d9a0d9553d1d817fe09a722281a7e478fcc34276ebcb38be84471bcf74263dc4d86ec1e7ef540fbcde348f0f SHA512 d3d9712990c3204b4d790f3ada1d438ab2618b6a34da97a647b2af73ab423845fd30181c3c6687fafbbe73c8ba8627cebe402080e050270bffbf766e2d514a7d
+EBUILD pycodestyle-2.9.1.ebuild 1067 BLAKE2B 440eb3e87210bbc3b2b013daec2ab9eb89c5d759d9a0d9553d1d817fe09a722281a7e478fcc34276ebcb38be84471bcf74263dc4d86ec1e7ef540fbcde348f0f SHA512 d3d9712990c3204b4d790f3ada1d438ab2618b6a34da97a647b2af73ab423845fd30181c3c6687fafbbe73c8ba8627cebe402080e050270bffbf766e2d514a7d
 MISC metadata.xml 350 BLAKE2B 6ca2711d99bb29041b5cc2a65218ace68f8d4f2d1d2d0a19f62d17f2340cc44faa7488d4eb29b72e86a0b2f003ea6a2df5f5d4e7d95894ff9c8c229bb6441156 SHA512 db79cd77edb6be824903614c78a39f427af51e940c0b08e1512c264b634ef3474fdba21a1a8b6c9458c2687f871d9374ea5f9b5080da4f6e652dd919e89d990c
diff --git a/dev-python/pycodestyle/pycodestyle-2.9.1.ebuild b/dev-python/pycodestyle/pycodestyle-2.9.1.ebuild
new file mode 100644
index 000000000000..509d1524f65a
--- /dev/null
+++ b/dev-python/pycodestyle/pycodestyle-2.9.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python style guide checker (fka pep8)"
+HOMEPAGE="
+	https://pycodestyle.pycqa.org/en/latest/
+	https://github.com/PyCQA/pycodestyle/
+	https://pypi.org/project/pycodestyle/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+distutils_enable_sphinx docs \
+	dev-python/sphinx_rtd_theme
+
+python_test() {
+	local -x PYTHONPATH=${S}
+	"${EPYTHON}" pycodestyle.py -v --statistics pycodestyle.py || die "Tests failed with ${EPYTHON}"
+	"${EPYTHON}" pycodestyle.py -v --max-doc-length=72 --testsuite=testsuite || die "Tests failed with ${EPYTHON}"
+	"${EPYTHON}" pycodestyle.py --doctest -v || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/python-engineio/Manifest b/dev-python/python-engineio/Manifest
index 2e1eeebe94d4..feb19231a6fb 100644
--- a/dev-python/python-engineio/Manifest
+++ b/dev-python/python-engineio/Manifest
@@ -1,5 +1,7 @@
 DIST python-engineio-4.3.2.gh.tar.gz 299722 BLAKE2B 87dece98d72b7b0384e3b9d57062a3eaa7aeb80ac3f2f685d50b8816e122398ffd54da1f4b99a90a1f535e2d0f0d282167a682de022373e6108f7e91f8689aa1 SHA512 59933a0093167042a3873ba1561d2859359a5ad160f6b7b5c19478b1f73d1bd068779942c8bfc44dd5a8d9f155359571298b960bcd217aab341bdfec35bc5b28
 DIST python-engineio-4.3.3.gh.tar.gz 300494 BLAKE2B 302de4432717154258748602598d455650e858d3193127054abbd6d4e070255b26f38d08f620769b4782b29c43a9e6255896ff1192878c23b033168328036f90 SHA512 a8022b853c0a249e269c1e682f28d67022a2bd44975d67ea55e5244a02b540cded8042d7e9cbc5461f2a12970b64c00fa6d2e1a91ce93926fb0eace60096dccc
+DIST python-engineio-4.3.4.gh.tar.gz 300665 BLAKE2B 78488fb7deb54136a255b1027e52e1869e7d09b38769d3dd144b26146ac8db58091238c3f1cfa81d4c29af4d1bd8bb998559756053e53f6c7876c2866da31575 SHA512 427f224ae24d939d55316931cd087676741195d578415224de291f9871b535fdd02b835ac32a65d73be0428c8c4be0414faefca06a4964b1fe34e2ac91b02694
 EBUILD python-engineio-4.3.2-r2.ebuild 1763 BLAKE2B 74e891a2966f99ed984f7fe7d7cd651c92ee1242a9b7679053f493a9632c210ead89460208cb716c15231175004e9f37caeb17a240730553476003f787f5b7d5 SHA512 754b43f5240620970c9694b0be0cc64b44e48b653ddabebcd66285356b08333b5ffe2501792808f74216cf1de2dbdb27cc83e270e8ddd1d4eaeebfc675027474
 EBUILD python-engineio-4.3.3.ebuild 1600 BLAKE2B 61bc9b1474a880cb8f2de42a45fe5b00d9f57fbf0780b9eb0a2ae4acd6043c8173e17803673cea5a91fa57be40b8e07783d8eb24247ef4bf8cd19d637497d237 SHA512 03e16152123590786bbf7f9bbb2c563a5499a6e07dcb176c29884e94baf3e3a5240e1b1157715b297d85974c894b1e0a6b50423566116c5685f11bcaf7df183a
+EBUILD python-engineio-4.3.4.ebuild 1610 BLAKE2B bf6903562eba5cf6e29e2eba44b26381f5aae0700b80a43e43ae4539370cc7905a27d48908062025b519b724420d756471bb1ddbd1f065b2b0822757bdc6dab9 SHA512 9be92dc628cf39253ef0cdc5084040c3b73f8f98b8dfd628cb186d023989da40449a7a6211412b2db0daeed8f17b129a4539f9bf2f314c65b493e9d1b9d4d847
 MISC metadata.xml 518 BLAKE2B 7325d24cc26b1a3b4e2dec04159cdd4ebcceaf0384fccbee11205f9c000b1e9f84f97c742a6181dbad419e2527c6f874bc3f89760daa6b6dd2feb9b1f874b515 SHA512 40fe9ac96224019d28206f75ae6249c75dbcb759918c03826af4f8a394586bd5df445ef475cd009e8af93ea5c7424abebbbfd65ac2e2eb7bdd9e8a29f2dcb34f
diff --git a/dev-python/python-engineio/python-engineio-4.3.4.ebuild b/dev-python/python-engineio/python-engineio-4.3.4.ebuild
new file mode 100644
index 000000000000..f9c4a5c25eb8
--- /dev/null
+++ b/dev-python/python-engineio/python-engineio-4.3.4.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
+
+DESCRIPTION="Python implementation of the Engine.IO realtime server"
+HOMEPAGE="
+	https://python-engineio.readthedocs.io/
+	https://github.com/miguelgrinberg/python-engineio/
+	https://pypi.org/project/python-engineio/"
+SRC_URI="
+	https://github.com/miguelgrinberg/python-engineio/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/aiohttp[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/websocket-client[${PYTHON_USEDEP}]
+"
+# Can use eventlet, werkzeug, or gevent, but no tests for werkzeug
+# eventlet doesn't yet support Python 3.10, so let's work around it
+BDEPEND="
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/eventlet[${PYTHON_USEDEP}]
+		' python3_{8,9} )
+
+		dev-python/gevent[${PYTHON_USEDEP}]
+		dev-python/websockets[${PYTHON_USEDEP}]
+		www-servers/tornado[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs \
+	dev-python/alabaster
+
+python_test() {
+	if ! has_version "dev-python/eventlet[${PYTHON_USEDEP}]"; then
+		local EPYTEST_IGNORE=(
+			tests/common/test_async_eventlet.py
+		)
+
+		local EPYTEST_DESELECT=(
+			tests/common/test_server.py::TestServer::test_async_mode_eventlet
+			tests/common/test_server.py::TestServer::test_connect
+			tests/common/test_server.py::TestServer::test_service_task_started
+			tests/common/test_server.py::TestServer::test_upgrades
+		)
+	fi
+
+	epytest
+}
diff --git a/dev-python/tifffile/Manifest b/dev-python/tifffile/Manifest
index 0000fcee7a39..4a65226807d3 100644
--- a/dev-python/tifffile/Manifest
+++ b/dev-python/tifffile/Manifest
@@ -1,7 +1,9 @@
 DIST tifffile-2022.5.4.gh.tar.gz 290116 BLAKE2B 4c608ad38ad7ada0e1b41512eae7b4109680cab1f5623ea3cd6c01dfe17b534b518868ee21879ecfa9909f7680a04fbb63967b5c8064062cc325286baaaccb6b SHA512 cc6139872c42e0e2840a9774989b5cba57ef8957e2efa4349e7b224c61ebb8ad34287b9305dddd85b1239d03be4ada73526259b038c19c73513007e5f63d224d
 DIST tifffile-2022.7.28.gh.tar.gz 309010 BLAKE2B 4a52a688ce7f09265592f8bd2bed2eaf9648304908aa1b190c07a22b58f10bb3f71f9ea1f9a612a2592f75f457acc04cc2139ef0cbd75ea40a7e91408075062b SHA512 12647884cb77fc8e414c09aface82def1ad2bb0a11a1f17fa00e6954cf565a906b6a8c9e861d0a476a86ef8ea25da12d1069199109cb84030d312021d722f23e
 DIST tifffile-2022.7.31.gh.tar.gz 309561 BLAKE2B 9a7c2584dbf7741d3c77c7dac3a6a16393dc5630ac97fa2d5110ad7458c04b60dbb618075718856f7ad7846470430c6f978a17dc1706a58441460b28a57d0c78 SHA512 6e935b46cf404cc027e6430e304c3993e74b6ae577817efc68fff525de96b01f13b14cfce9a21c5d25a082bdcb56e4b4e6ab9803959357ec6bd7a26bf0d0503a
+DIST tifffile-2022.8.3.gh.tar.gz 310296 BLAKE2B ae503d79105ff5172879cb1b048b061b7ac795efebe8c3fe44792a33fb3fb14d1d6ba5e57cdaf5b8df6623b512efc3a8979474b3327b932087d898226b786b65 SHA512 7040ff4cdcf4de33bd158172086a31072084dd43ebd9b3277394ac7f50044af2447e8871a4f9df7132b068e0bea71ab4beefbbbb0e91dfaf3bdb07337cb7ec0a
 EBUILD tifffile-2022.5.4.ebuild 1307 BLAKE2B e8d54bd2167e36d459d27d5d661339fac170426c90b0cc061d01a312b93563af890e0e342ebb287557a57eeb6e64e373243e1b04630ca42f80c16c2eb5cc5906 SHA512 9ba9172bf4621a59a8518ddc5caa6e5f0968a79373f2cd487b4510a98ef6b9f78380707bd4afedca2d0202dbbdc49574101e39dad961fdf2fd0d584e2f265e56
 EBUILD tifffile-2022.7.28.ebuild 1307 BLAKE2B e8d54bd2167e36d459d27d5d661339fac170426c90b0cc061d01a312b93563af890e0e342ebb287557a57eeb6e64e373243e1b04630ca42f80c16c2eb5cc5906 SHA512 9ba9172bf4621a59a8518ddc5caa6e5f0968a79373f2cd487b4510a98ef6b9f78380707bd4afedca2d0202dbbdc49574101e39dad961fdf2fd0d584e2f265e56
 EBUILD tifffile-2022.7.31.ebuild 1299 BLAKE2B 4c6855ac820a1edd5d87bd0c92bfd6d7681ee5a0a13bdfe7202414b858af116529a5b7859008412b9c88642e0f98c28b318875266924ad4bdef16fda385d60c3 SHA512 1ba1326803b67f7d339600d44460250c9e2844d1aa08305be51cfe963b0851ce85281801f9e62e3161c0722d98e32b17b1cdee9aaf06014dbfeee5b627b69815
+EBUILD tifffile-2022.8.3.ebuild 1299 BLAKE2B 4c6855ac820a1edd5d87bd0c92bfd6d7681ee5a0a13bdfe7202414b858af116529a5b7859008412b9c88642e0f98c28b318875266924ad4bdef16fda385d60c3 SHA512 1ba1326803b67f7d339600d44460250c9e2844d1aa08305be51cfe963b0851ce85281801f9e62e3161c0722d98e32b17b1cdee9aaf06014dbfeee5b627b69815
 MISC metadata.xml 346 BLAKE2B 8cecb51fe01826a2a190c4e3020836f5706a918515a3ef5b4624fc3e9985411a8fd3c261fb7b6d8ad4f4486164487d11bdc2b071eeb5a95083db4c5323ae2dbe SHA512 81f8f6f5231d6cc9a8e7f95416a63cc52027f58fa54ce16bacfaa0ae285a48c5a3850d83d5ab50ca89be248ce386528db32811b23d61fa0d0e1e0cc737150465
diff --git a/dev-python/tifffile/tifffile-2022.8.3.ebuild b/dev-python/tifffile/tifffile-2022.8.3.ebuild
new file mode 100644
index 000000000000..867f25de5f9d
--- /dev/null
+++ b/dev-python/tifffile/tifffile-2022.8.3.ebuild
@@ -0,0 +1,53 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Read and write TIFF files"
+HOMEPAGE="
+	https://pypi.org/project/tifffile/
+	https://github.com/cgohlke/tifffile/
+	https://www.cgohlke.com/
+"
+SRC_URI="
+	https://github.com/cgohlke/tifffile/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/numpy-1.19.2[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/dask[${PYTHON_USEDEP}]
+		>=dev-python/fsspec-2021.5.0[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/xarray[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# Internet
+	tests/test_tifffile.py::test_class_omexml
+	tests/test_tifffile.py::test_class_omexml_fail
+	tests/test_tifffile.py::test_class_omexml_modulo
+	tests/test_tifffile.py::test_class_omexml_attributes
+	tests/test_tifffile.py::test_class_omexml_multiimage
+	tests/test_tifffile.py::test_write_ome
+	tests/test_tifffile.py::test_write_ome_manual
+	# requires tons of free space
+	tests/test_tifffile.py::test_write_3gb
+	tests/test_tifffile.py::test_write_bigtiff
+	'tests/test_tifffile.py::test_write_imagej_raw'
+)
diff --git a/dev-python/virtualenv/Manifest b/dev-python/virtualenv/Manifest
index 1e4637f79c40..a202c16c4949 100644
--- a/dev-python/virtualenv/Manifest
+++ b/dev-python/virtualenv/Manifest
@@ -1,7 +1,9 @@
 DIST virtualenv-20.15.1.tar.gz 13523736 BLAKE2B 4f8d491fae7c0c28ae349845c4c5ddd27e53b9007a427c8a36e66a427269b519829f1c351f028b63fe38b49e934f4e209bd2cf2e07363171f732c6b0a052a3bc SHA512 244e3b091c8b049edbb07d808633fd44b3327200e1d38394814794773d05723ef535721ee163b382d23bc16572d55657b5c2544efd83494753746cc85116696a
 DIST virtualenv-20.16.0.tar.gz 12217565 BLAKE2B 534d665b56191c2e804306677b6771d3d0fa6104c476f8f17fbf40c2f8a3b7ccf6ffa9f8dec4d8de515f610f2ffc7b5d67bc99d82be4c0cc73990e5664a1d1e3 SHA512 f34827ec0e1b7325ee23b53b5fa2c36c1377d3fe7265b7187cf43592f74b37d66747abf69f0f33850212bf3aa69c98147cfffc37b311b98a1127f7ac5d9c69e4
 DIST virtualenv-20.16.2.tar.gz 12217706 BLAKE2B 1dff9c8697eb80cf590819c451790599977d52dcfe2935c7d9e355aeb34c9b3bd4f6d97bb051c7a02ba95878717fac82766a0370124d21a4c89fee42a31bbb31 SHA512 3998ea1e70a56d859be808059249251ca944216998a48af70db731cf5655624c12078d94caa5827ab41326cfd702319d3a486fbc0fe424369e07df39c9cd8ce9
+DIST virtualenv-20.16.3.tar.gz 12219368 BLAKE2B 00a7d38db3e9d929e5f01eb020436cf5b917a10bca876ef4abe7a07f5e86a1b1930ed42acbac96d80375a78b660a70872ba6048c673a4ad4d51cafb7824d8f6d SHA512 d3a90bab9862ea2a70e1dc429dff98a729425858a2153281cba4ecaf13107e6c3a43781e8c96b1f2a6c1ddd797de86bcfee8129a698e45d20eed76432efba5a6
 EBUILD virtualenv-20.15.1.ebuild 4636 BLAKE2B df586e00a1dfe68aa3eb6f1757ced244836475eb4795dfc5044f78ea612f15226fa50186d7441cf01f4b7eb3f58fe166e49dc46cd9f71e8ec1c400ee7857338c SHA512 4e307ce1dc6b604f71423942f8adc2277fb96ca94584922982cbbae801ea22fb55e2b5b4766c783f1ad39606a366539fafdbc939dffb8e4cc946f640f690d0b5
 EBUILD virtualenv-20.16.0.ebuild 4831 BLAKE2B 2b51a3445b2ebf8570a8af6a4a49e746854c44f3060bdad926dc20e657aca800aff09b345faf25e23bf991d7b7fbbc3f8bb9fe73b6645186a798fe38b42825e8 SHA512 cb68375357095304a6f52c6a0fea22b54c7531e4091f709a9363c202dab2804c7c018b343a7a938c97ac728124d229946280a34946c5077839b12974ed43fd79
 EBUILD virtualenv-20.16.2.ebuild 4831 BLAKE2B 2b51a3445b2ebf8570a8af6a4a49e746854c44f3060bdad926dc20e657aca800aff09b345faf25e23bf991d7b7fbbc3f8bb9fe73b6645186a798fe38b42825e8 SHA512 cb68375357095304a6f52c6a0fea22b54c7531e4091f709a9363c202dab2804c7c018b343a7a938c97ac728124d229946280a34946c5077839b12974ed43fd79
+EBUILD virtualenv-20.16.3.ebuild 4839 BLAKE2B 30c1c06aa24da5da51446ba58d9775ab6021d3af1934bf14599941e4c812595f9873897bef133e6018e601db64625c2cd8d730cbadd08bf619f4858d75f41e08 SHA512 6d3474150863394fae062f5d3b5da0281ac9002bd2c17c72b332f63e5ea141c10a176090c482a746464b43b3563d5e96a4dd4fbfacd08e8ac9e1e00e92a69367
 MISC metadata.xml 406 BLAKE2B 97fee04c2662c5c36b6e16538284def46eb2454424770f42edf2567ed804ca15c4e969c714c57573f897b0946246577ab6e35204ed1f3f1735713d8ab5d24667 SHA512 356d42db463b63a3b3a55c1e98eb661de0a10aa6a5fde4f8b3f888ec73020c6679e86efd8dbb0b3e4a5a720af95e658612ba460fe548e081a90beec75fb9c1b2
diff --git a/dev-python/virtualenv/virtualenv-20.16.3.ebuild b/dev-python/virtualenv/virtualenv-20.16.3.ebuild
new file mode 100644
index 000000000000..fe3fd6720779
--- /dev/null
+++ b/dev-python/virtualenv/virtualenv-20.16.3.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Virtual Python Environment builder"
+HOMEPAGE="
+	https://virtualenv.pypa.io/en/stable/
+	https://pypi.org/project/virtualenv/
+	https://github.com/pypa/virtualenv/
+"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+SLOT="0"
+
+RDEPEND="
+	>=dev-python/distlib-0.3.5[${PYTHON_USEDEP}]
+	>=dev-python/filelock-3.4.1[${PYTHON_USEDEP}]
+	>=dev-python/platformdirs-2.4[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-63.2.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+"
+# coverage is used somehow magically in virtualenv, maybe it actually
+# tests something useful
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/flaky[${PYTHON_USEDEP}]
+		>=dev-python/pip-22.2.1[${PYTHON_USEDEP}]
+		>=dev-python/pytest-freezegun-0.4.2[${PYTHON_USEDEP}]
+		>=dev-python/pytest-mock-3.6.1[${PYTHON_USEDEP}]
+		>=dev-python/pytest-timeout-2.1[${PYTHON_USEDEP}]
+		dev-python/wheel[${PYTHON_USEDEP}]
+		>=dev-python/packaging-20.0[${PYTHON_USEDEP}]
+	)
+"
+
+# (unpackaged deps)
+#distutils_enable_sphinx docs \
+#	dev-python/sphinx-argparse \
+#	dev-python/sphinx_rtd_theme \
+#	dev-python/towncrier
+distutils_enable_tests pytest
+
+src_configure() {
+	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		tests/unit/activation/test_xonsh.py
+		tests/unit/seed/embed/test_bootstrap_link_via_app_data.py::test_seed_link_via_app_data
+		tests/unit/create/test_creator.py::test_cross_major
+		# tests failing without python2 installed
+		"tests/unit/create/test_creator.py::test_py_pyc_missing[True-False]"
+		"tests/unit/create/test_creator.py::test_py_pyc_missing[False-False]"
+	)
+	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
+		'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-isolated]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-global]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-isolated]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-global]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[root-venv-copies-isolated]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[root-venv-copies-global]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[venv-venv-copies-isolated]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[venv-venv-copies-global]'
+		'tests/unit/create/test_creator.py::test_zip_importer_can_import_setuptools'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.10-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.10--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.9-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.9--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.10-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.10--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3--bin-]'
+	)
+	[[ ${EPYTHON} == python3.11 ]] && EPYTEST_DESELECT+=(
+		# TODO
+		tests/unit/discovery/py_info/test_py_info.py::test_py_info_setuptools
+		tests/unit/discovery/py_info/test_py_info.py::test_custom_venv_install_scheme_is_prefered
+	)
+
+	epytest
+}
+
+pkg_postinst() {
+	elog "Please note that while virtualenv package no longer supports"
+	elog "Python 2.7, you can still create py2.7 virtualenvs via:"
+	elog "  $ virtualenv -p 2.7 ..."
+}
diff --git a/dev-python/wand/Manifest b/dev-python/wand/Manifest
index e42aa34b26a9..6a743d5026f8 100644
--- a/dev-python/wand/Manifest
+++ b/dev-python/wand/Manifest
@@ -1,6 +1,8 @@
 DIST Wand-0.6.7.tar.gz 11686093 BLAKE2B 58abbdc22eb1603ed42e2e2473c0ed2b9026c9c0a499bb885512b56ecf01fb4ffe450979808bba2b4c4466994f86bea9a9c0ced216f8338c845b96a755f39c9f SHA512 e79ecb909f6ad7b3ddae217bb7b27f3c010d22a40eb99866e2a6eb07346000acbead280176e3352da13c20b68a341c751c55d6203bef7968522c8dbcfcab0b06
 DIST Wand-0.6.8.tar.gz 11884527 BLAKE2B 45784abf55682d8b5e101cc4fc93f0492f9275a2805f06dbda2d98e28c6359c7df84fd7870b12348c0a6c513ae3f2bafba61a00020a41263d6a91fd67d9ce682 SHA512 111eef211edd8d5a6c825f0b455db5510c91b43852165934dbab36a9cdeea7e920987c98d975fb8c7f82ac19f20867c0ed5c8c1e2f9dd9467bc30931b4a03dd1
+DIST Wand-0.6.9.tar.gz 11885077 BLAKE2B 15390e6aca4ac947dbeba84e2f6805689d4c44e318f7dd4827c6cf2cca42066968de0d9a7a932c950f79ef82bc090d8061e86b63234477f4807b5dc1cc36f735 SHA512 23adcb3360bc6a579aa4e4ff406631821cca05c8ad5ca057510a3185bf09ee58c13940706ce3b725545cc46ca5e8aaaebeb9b418e2a91cf15b570e223ede6552
 EBUILD wand-0.6.7-r1.ebuild 725 BLAKE2B 744d613a797f5234560def501a49e49f97800148600c46a1a17338070e6370b279ae8cb30bb86a8c9129647be4c353fd7ec3576a7b5f29e589258bd80afc2e29 SHA512 c60ad6aabd3e2ba297f8394d5741b00360c689d35b02934bb319b633819267aae126e863db7c85beb0643dda380e323e3ae0c2de77bed2485b015777da41fb0c
 EBUILD wand-0.6.7.ebuild 693 BLAKE2B 2fb65a5aafa6af1e39919bde33b704d3dd06f3974b472b8bd2eddb13a8d267a4541afc46d857adc6cc6100f81247e12defa0119320216e2a8bc2d5dd78e5e7e6 SHA512 ce87a3e330c250fcf8a5e02f02db6532e93958288fd26904921ae8ca370690871ec6c1a6f0c2d72e7400a4b5b12dd1cfe0a6d393033f55dbb93e9af187bed7f0
 EBUILD wand-0.6.8.ebuild 799 BLAKE2B 26c6b310db4aeb8b9b1aae8f96b80c5067ab7159398a7ca6f7870deb5f7128dc080f7ed4fa77422a7a263deeaa022fbad6cda9e8a862b2b8c8e70141d78b5452 SHA512 96355dfe9edb46610e62fc30a3190362d002b52edb58ec045ed9e4d9b00fc4ec88513a9a151446309d4d1ea8f9443047a5ab4b88f2a27fa6cc6c3a8d49788271
+EBUILD wand-0.6.9.ebuild 799 BLAKE2B eeb6abc511b922b6064b824c624fdb770724a9dcea5109013da4cff54c667e5167ba366f392905b035b7bcda33b929fa5394162debf069c67396eab6f100011c SHA512 567de4c082a51a9a3f97f743128a6efdf9be070e3702746ac2920577ba39bcefbc18d362c9de8e77a169711525d3633906fa38bd1c94c1b3289bc18e221a95a5
 MISC metadata.xml 534 BLAKE2B 0c2295ce9b9805ceff22c9549adfa46578a5d5d1d4f13b7af416ad23f305ee24275deb7204a68076901e6060d41a3935580e24578d2fe56a2c32817ab83165b5 SHA512 68f30bc7ad8cf6a451acf550c02b76e1f71a8c66c9ffc8832995bd292bd460d16c9526e5bb2daaed9cabece9591499f9dd3b0f11d748af247c78654d6104ee13
diff --git a/dev-python/wand/wand-0.6.9.ebuild b/dev-python/wand/wand-0.6.9.ebuild
new file mode 100644
index 000000000000..d5709e974bca
--- /dev/null
+++ b/dev-python/wand/wand-0.6.9.ebuild
@@ -0,0 +1,40 @@
+# 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="Ctypes-based simple ImageMagick binding for Python"
+HOMEPAGE="
+	https://docs.wand-py.org/
+	https://github.com/emcconville/wand/
+	https://pypi.org/project/Wand/
+"
+SRC_URI="mirror://pypi/${MY_P::1}/${PN^}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	media-gfx/imagemagick
+"
+BDEPEND="
+	test? (
+		media-gfx/imagemagick[fftw,jpeg,png,truetype,xml]
+	)
+"
+
+distutils_enable_sphinx docs
+distutils_enable_tests pytest
+
+python_test() {
+	# PDF support is blocked by the default ImageMagick security policy
+	epytest --skip-pdf
+}
diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz
index ace78f07f85b..767b725a9b9c 100644
--- a/dev-qt/Manifest.gz
+++ b/dev-qt/Manifest.gz
diff --git a/dev-qt/qtconcurrent/Manifest b/dev-qt/qtconcurrent/Manifest
index 60de877b8196..b391a0586f7d 100644
--- a/dev-qt/qtconcurrent/Manifest
+++ b/dev-qt/qtconcurrent/Manifest
@@ -3,6 +3,6 @@ DIST qtbase-5.15-gentoo-patchset-1.tar.xz 4204 BLAKE2B 1399eb6f4c776d370e1837351
 DIST qtbase-5.15.5-gentoo-kde-1.tar.xz 520224 BLAKE2B 48807bc79cede557b114786ee072d8d94545f4ada3d96aa4fe04dbf79a356dc6c17d9299014ed70aa10296346c30c7512fb7d9f88ee4b301e9a54a241363be8b SHA512 ab9f27d506d7aa1a9339ba52d51daffb4c6f9abb5d858fd728ef2110528bc0f2ae101b4e2e7c344836b42e4aafa2c5a4ab5c5fa37465e692cce500c0f3347fa7
 DIST qtbase-5.15.5-gentoo-kde-2.tar.xz 526240 BLAKE2B 68ecca0805c2ea0b29b65706b0c03a3ead1d106e089f2a48a988035842d0cc8ac67d950cbc67ae8f8be860fd11443579d3e06bfe96a2e3161f94e07206d2815e SHA512 d877a2eb4cd05b712a7db6a943f955d3ced88f51efe3e29b2d6716fba4da08398dbd2ed580ca5b9bfbd92a5a20e34451e06a324274447d4b3692b25af4ff8ddf
 DIST qtbase-everywhere-opensource-src-5.15.5.tar.xz 50247388 BLAKE2B e9bbfe8e73e6f25ccadeef722818b5aeb82d1f136bec21fcbc3b26bf76044b38f25c7268010c648e1161e9b61013b8b775f17b9fdcfdd70402bdfbf70bf7f9d5 SHA512 ce80eedc88abbd5a200bacc10a8e94adc1ef2122ac220715ba084adf1e32d67f2dc66168503de5fb5b5a6ab15f7a75ca23dc9956aed12ead994a8ffa6291ef87
-EBUILD qtconcurrent-5.15.5-r1.ebuild 561 BLAKE2B 520f00a64a9db9112087145437089a93141ab2a4206cb27d94218a2fe8e267eeb2b2dc024c6a8e9fa5415bf7a87e0a0c29bf8a57025a24eec8fbd08c72826dfb SHA512 0ed732913bed9a3a867d63829ae34a895772fb36cb967b8adc1f4bb4f3e6357290a6fa333ec182c6f2f1548d3a1998681e488af1706b95f586360ee359dda4f9
+EBUILD qtconcurrent-5.15.5-r1.ebuild 559 BLAKE2B 80b934e90e027424600a1fd2abcbe74b7a497ac6f37d7509c6ab75e9a1aea86b85ac6da93fc631b072dfec55000ac391166139d0020fdad147787ea8ab69d01d SHA512 e9ad1589568f3e17ea73571dd512c9364a57d62d0ab48c57350a22f5b46d061665f3bc5d7aa1a521574fcc7cd0e9b6ece52e1811d6029b3de7cb9d91ac9d3639
 EBUILD qtconcurrent-5.15.5.ebuild 482 BLAKE2B f6f93d1439f8b280891d63be609ca31d81dd58e655d109f137b24cea79517771e7b10fc501f24537a4f3617448148658a0074e9b97090bb6dc9a3a38e0eeb126 SHA512 71a36bb5d57392da512b20c8e65a53c99c53e81da6d6b3f582aeffd517614ce4eb6cb74811588c78e74fedb96892c1d6994d363e4075aff63b0ded1ec51cbc64
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtconcurrent/qtconcurrent-5.15.5-r1.ebuild b/dev-qt/qtconcurrent/qtconcurrent-5.15.5-r1.ebuild
index ba62a7bd4f2e..b0bb2006c592 100644
--- a/dev-qt/qtconcurrent/qtconcurrent-5.15.5-r1.ebuild
+++ b/dev-qt/qtconcurrent/qtconcurrent-5.15.5-r1.ebuild
@@ -10,7 +10,7 @@ inherit qt5-build
 DESCRIPTION="Multi-threading concurrence support library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc ~x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtcore/Manifest b/dev-qt/qtcore/Manifest
index 75dd4abbffeb..c925c702f199 100644
--- a/dev-qt/qtcore/Manifest
+++ b/dev-qt/qtcore/Manifest
@@ -6,5 +6,5 @@ DIST qtbase-5.15.5-gentoo-kde-1.tar.xz 520224 BLAKE2B 48807bc79cede557b114786ee0
 DIST qtbase-5.15.5-gentoo-kde-2.tar.xz 526240 BLAKE2B 68ecca0805c2ea0b29b65706b0c03a3ead1d106e089f2a48a988035842d0cc8ac67d950cbc67ae8f8be860fd11443579d3e06bfe96a2e3161f94e07206d2815e SHA512 d877a2eb4cd05b712a7db6a943f955d3ced88f51efe3e29b2d6716fba4da08398dbd2ed580ca5b9bfbd92a5a20e34451e06a324274447d4b3692b25af4ff8ddf
 DIST qtbase-everywhere-opensource-src-5.15.5.tar.xz 50247388 BLAKE2B e9bbfe8e73e6f25ccadeef722818b5aeb82d1f136bec21fcbc3b26bf76044b38f25c7268010c648e1161e9b61013b8b775f17b9fdcfdd70402bdfbf70bf7f9d5 SHA512 ce80eedc88abbd5a200bacc10a8e94adc1ef2122ac220715ba084adf1e32d67f2dc66168503de5fb5b5a6ab15f7a75ca23dc9956aed12ead994a8ffa6291ef87
 EBUILD qtcore-5.15.5-r1.ebuild 2213 BLAKE2B 071bb5ba9e3351cf11b7efc40b30a7df80c49d9d36520abe53aa88e412c380fba5b0525c330d41fe4bf0ae3ad79ef8f38b5bb29596b9c26013f9a59a1eace9b7 SHA512 53a00e769a6cbb916a184404597c0abe5627cd3fe67f0e6fee9b468163480c4ba1c61e723ad459da58f75cc656b965f3db058704b3e54e9c2c43e69dc160de9d
-EBUILD qtcore-5.15.5-r2.ebuild 2323 BLAKE2B f6d19c60faa4e42d07710f9def2acbcdcf82a3751cbf63790593b095470a8fe39258371fcfbe44d66fd575c70b2de83bf0a11c9379454e9e75e581f9ebfa5f80 SHA512 81f5b38941316c9be0c6d5f7681324ee11fd5b963a13e60d6d97aa99bcd898a8537d0cc3128ee3470d99df12dd94188f83ccf5bf9bc8269b311519bc77dc8715
+EBUILD qtcore-5.15.5-r2.ebuild 2321 BLAKE2B ad5128cda4ba06921e32d877ccf4770a69b2634f691ae7d642c984427576640dab60c78f2cc57f8ada6530672ad365b171d6ebfc508fcb7ea3a90bdd45365f7c SHA512 a2317b612fcddc24a87b3c9a3099e3aa65f322bc65b5cc1fac10a749060ebe0a3a7a8fe8ad5954bbbdded2f38265989e370c5d5ac252c0800fb61a1c891de757
 MISC metadata.xml 833 BLAKE2B 79b441c34e55017f23dd85cdb062ef4cbcfce05dff74936de887256ba8b9b596632b570b55b7014c38467829751771bb116f067cd6a246a11309f20b67fb55f0 SHA512 f1ffedc2ad17d198ba14a9a93e6c8dd35a7709e6f1e07dae606c16c05868f2f8e696f25fa5cf2602ed50f41eb5a914ff0d652b9ac37163e5130ddbfb475a1ff5
diff --git a/dev-qt/qtcore/qtcore-5.15.5-r2.ebuild b/dev-qt/qtcore/qtcore-5.15.5-r2.ebuild
index e86b12357c55..73065ec8df69 100644
--- a/dev-qt/qtcore/qtcore-5.15.5-r2.ebuild
+++ b/dev-qt/qtcore/qtcore-5.15.5-r2.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Cross-platform application development framework"
 SLOT=5/${QT5_PV}
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc ~x86"
 fi
 
 IUSE="icu old-kernel systemd"
diff --git a/dev-qt/qtdbus/Manifest b/dev-qt/qtdbus/Manifest
index 4a570f850f70..88b1294062f8 100644
--- a/dev-qt/qtdbus/Manifest
+++ b/dev-qt/qtdbus/Manifest
@@ -2,6 +2,6 @@ DIST qtbase-5.15-gentoo-patchset-1.tar.xz 4204 BLAKE2B 1399eb6f4c776d370e1837351
 DIST qtbase-5.15.5-gentoo-kde-1.tar.xz 520224 BLAKE2B 48807bc79cede557b114786ee072d8d94545f4ada3d96aa4fe04dbf79a356dc6c17d9299014ed70aa10296346c30c7512fb7d9f88ee4b301e9a54a241363be8b SHA512 ab9f27d506d7aa1a9339ba52d51daffb4c6f9abb5d858fd728ef2110528bc0f2ae101b4e2e7c344836b42e4aafa2c5a4ab5c5fa37465e692cce500c0f3347fa7
 DIST qtbase-5.15.5-gentoo-kde-2.tar.xz 526240 BLAKE2B 68ecca0805c2ea0b29b65706b0c03a3ead1d106e089f2a48a988035842d0cc8ac67d950cbc67ae8f8be860fd11443579d3e06bfe96a2e3161f94e07206d2815e SHA512 d877a2eb4cd05b712a7db6a943f955d3ced88f51efe3e29b2d6716fba4da08398dbd2ed580ca5b9bfbd92a5a20e34451e06a324274447d4b3692b25af4ff8ddf
 DIST qtbase-everywhere-opensource-src-5.15.5.tar.xz 50247388 BLAKE2B e9bbfe8e73e6f25ccadeef722818b5aeb82d1f136bec21fcbc3b26bf76044b38f25c7268010c648e1161e9b61013b8b775f17b9fdcfdd70402bdfbf70bf7f9d5 SHA512 ce80eedc88abbd5a200bacc10a8e94adc1ef2122ac220715ba084adf1e32d67f2dc66168503de5fb5b5a6ab15f7a75ca23dc9956aed12ead994a8ffa6291ef87
-EBUILD qtdbus-5.15.5-r1.ebuild 723 BLAKE2B 272f8e378a638a0d650859c9d1621db729fa3c5cdf1f068180845ba164f3d2025fb55ffdcdd629b987fb23eed6799adcced53d03214f1104f53789cb3226b26a SHA512 239672d0fcd1105e24f49d865f51577f7eb68de856ae3d153784e50750a94e17762c889686673883ee82559ad93f1b07e355ee2b2edc5c27e28367ca3175bf52
+EBUILD qtdbus-5.15.5-r1.ebuild 721 BLAKE2B 287b1d7961c6597a99a56005f6767329dfefdc55b5fb01aa9fea67c984c3ee7ee44d3545e00828b76a910527c1ebcb78e49a9152dafd96b4695e5126150c6897 SHA512 b5d79d7c783e6771d6e26328ece574fd8f49a58973ddca8d3877495e4d37bdc5a14e5b4f86efa7c7b9bb327a453b26709c2ff6e987d39de2b5f79fa21c4faf59
 EBUILD qtdbus-5.15.5.ebuild 717 BLAKE2B 180641b51d75ddeaf646e6b690859dbf7078cda7b0530a06bedeca8169fa604df86933f2fcc2a65ed5a7cc7ee37ca84ed7fec14cddf0501bf018cb4c26438c8d SHA512 8b8b6afe4744513483d865259b86a8c2d634da25c043a3c47e68a5d1485bab43f74356ef1edefb21eeb97db31c4caf01a6b48a69d0907a5dfee184406dbe0863
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtdbus/qtdbus-5.15.5-r1.ebuild b/dev-qt/qtdbus/qtdbus-5.15.5-r1.ebuild
index d21a8d264414..214f37338fa5 100644
--- a/dev-qt/qtdbus/qtdbus-5.15.5-r1.ebuild
+++ b/dev-qt/qtdbus/qtdbus-5.15.5-r1.ebuild
@@ -10,7 +10,7 @@ inherit qt5-build
 DESCRIPTION="Qt5 module for inter-process communication over the D-Bus protocol"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc ~x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtgui/Manifest b/dev-qt/qtgui/Manifest
index 79648aeb96c2..d75c6804f9ef 100644
--- a/dev-qt/qtgui/Manifest
+++ b/dev-qt/qtgui/Manifest
@@ -2,6 +2,6 @@ DIST qtbase-5.15-gentoo-patchset-1.tar.xz 4204 BLAKE2B 1399eb6f4c776d370e1837351
 DIST qtbase-5.15.5-gentoo-kde-1.tar.xz 520224 BLAKE2B 48807bc79cede557b114786ee072d8d94545f4ada3d96aa4fe04dbf79a356dc6c17d9299014ed70aa10296346c30c7512fb7d9f88ee4b301e9a54a241363be8b SHA512 ab9f27d506d7aa1a9339ba52d51daffb4c6f9abb5d858fd728ef2110528bc0f2ae101b4e2e7c344836b42e4aafa2c5a4ab5c5fa37465e692cce500c0f3347fa7
 DIST qtbase-5.15.5-gentoo-kde-2.tar.xz 526240 BLAKE2B 68ecca0805c2ea0b29b65706b0c03a3ead1d106e089f2a48a988035842d0cc8ac67d950cbc67ae8f8be860fd11443579d3e06bfe96a2e3161f94e07206d2815e SHA512 d877a2eb4cd05b712a7db6a943f955d3ced88f51efe3e29b2d6716fba4da08398dbd2ed580ca5b9bfbd92a5a20e34451e06a324274447d4b3692b25af4ff8ddf
 DIST qtbase-everywhere-opensource-src-5.15.5.tar.xz 50247388 BLAKE2B e9bbfe8e73e6f25ccadeef722818b5aeb82d1f136bec21fcbc3b26bf76044b38f25c7268010c648e1161e9b61013b8b775f17b9fdcfdd70402bdfbf70bf7f9d5 SHA512 ce80eedc88abbd5a200bacc10a8e94adc1ef2122ac220715ba084adf1e32d67f2dc66168503de5fb5b5a6ab15f7a75ca23dc9956aed12ead994a8ffa6291ef87
-EBUILD qtgui-5.15.5-r1.ebuild 3901 BLAKE2B 854fec0398bd5708f0e62122eff23649c9daafd36bc7a250d61709db01c47c4325caeb9929f5a7f0e3e352be17fb313c9b55000bbf0eb0142b9624c3bc4f1e5f SHA512 88b4b4d63e598debb6884567498cda0d285effe1dcb3fd78373fc8441a1dedc2f04545d081769652f691dc7dd49b6dad1ea5735c06c3e2d84f2ba479701785bb
+EBUILD qtgui-5.15.5-r1.ebuild 3899 BLAKE2B 9d20eb9409986009c0556f73ace8fbd1f4e558f5233efb569afe26552e8beb19ed38b9ecfb4cbcb9d97f152806f62e5ade38659b5c8e6175e57454b912ec833f SHA512 fbef2c29528fd3112ec90bafa85d2d9d38f645b65af5e8320f5a603828c0f57050cae5375866133943298efc31fb4517de5350414479de0f2b3cbb06b2d5a620
 EBUILD qtgui-5.15.5.ebuild 3895 BLAKE2B 44c8de506dfd6172926579f0ddeb182c7b496b8c26880cdb5875622cad8f3079b647c43a32cbf5de8af8843f6ed9655125083e499ee486fd38414cd5ff563b85 SHA512 a461ec66e91256c2bf491e596b31d1a81a899c2ae186309537b5e74a59efd8e6a1a6a3650c403122abbc4b2b997a9ecc8b605a54b0c004ccd40404521f7ca9e7
 MISC metadata.xml 1387 BLAKE2B a370bc2dc77b3efcca29b46e9690b1b5e5c08c5fbfcf06211c1a384c9b998517b4da4357b1cc33998d4f480f9c5481e41b42f3b20f8f72d2635b317ed1d5b412 SHA512 ffa4622291427193109a83d422ff53f373fc3eb7449855849f0f39091383abc30fbfcb88a7d53e29bf2d39e1ec1c40f7aac7433b4d7c0aeefd48983047e912d5
diff --git a/dev-qt/qtgui/qtgui-5.15.5-r1.ebuild b/dev-qt/qtgui/qtgui-5.15.5-r1.ebuild
index a37b515ef4a1..0a3424875a30 100644
--- a/dev-qt/qtgui/qtgui-5.15.5-r1.ebuild
+++ b/dev-qt/qtgui/qtgui-5.15.5-r1.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="The GUI module and platform plugins for the Qt5 framework"
 SLOT=5/${QT5_PV} # bug 707658
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc ~x86"
 fi
 
 IUSE="accessibility dbus egl eglfs evdev +gif gles2-only ibus jpeg
diff --git a/dev-qt/qtimageformats/Manifest b/dev-qt/qtimageformats/Manifest
index 8b41a0ad0df8..dbb629e7054e 100644
--- a/dev-qt/qtimageformats/Manifest
+++ b/dev-qt/qtimageformats/Manifest
@@ -2,5 +2,5 @@ DIST qtimageformats-5.15.5-gentoo-kde-2.tar.xz 2596 BLAKE2B c09bea5234b433d33f63
 DIST qtimageformats-5.15.5-gentoo-kde-3.tar.xz 3268 BLAKE2B 21ada34678a2b999190ac9e642065d654e8bbc30ebe7789d20b97a49f3cae2d5e6893325b0019af695460fec8cb1f25e15b9573752396034a7db8ff6d7e49431 SHA512 fb2324d73db23da1ca13d1e050b9f045f1fd0b09cf722b94dc39eaea457629a643adacac16471841d4204cea7becfae11354674b70a4edf272dddc8863a10b22
 DIST qtimageformats-everywhere-opensource-src-5.15.5.tar.xz 1829872 BLAKE2B 7b240291e6076537daa9bc3b87f13f3285f19a4638de5b5db44a2b55275fbe843dc974226e999cd90e6bf902b43fbcd25f052619f291fa36807830a26c10cd52 SHA512 50a68bbe83fac710f21f05f3c0637beff17de00f9309aab2ceb27cfe7a178a1a56b0906f357584eef3188d7b89504591c924a9d4988a7321fb18a72271bb2dfd
 EBUILD qtimageformats-5.15.5-r1.ebuild 710 BLAKE2B bca14a1badda00a13e852dbe4e70168179a73ebcdf1e7a3799fb0da55fb0b4960460975090bcc46fd4e0e96c64595755cb38eccb0196d9f0c1c61bb70b96c4c0 SHA512 1ed641faed82574aeffec083593138b591d98fef813792695ea22a3fd9fad54488a3cf1efcc6fc52d022b66d153c683a4c4d19c32e5512b83faffd1a2fc73370
-EBUILD qtimageformats-5.15.5-r2.ebuild 714 BLAKE2B 7a3971aa8397ae509cf30dca30fd8deb9f25b38d7e33dce0d3e42b3a91e7c1a920b59ff76c109662b3c214061f8e410cbf38f79f7190a4c46605dcc47fd8ea38 SHA512 162501698f4d3c50f9349a0e5f2fd6d04c2383b61c7f76b197e9dad446b6382a659c497df6536a458dd5ee55e38194c162148a3148588f098344461173826553
+EBUILD qtimageformats-5.15.5-r2.ebuild 713 BLAKE2B 8e65b6d162e28501a6ee45118167f54efe3e373a733c4bf01075d2e59c44b2c0b36591f9ae89a79356cd5089dce76c513ae83264dd78376c342c780bd406c928 SHA512 8682fa0db02d22f2f6d6d236b02582fda7d91157fbea6b6131ca53e4ddcb8a41bd56afbad3daca774e30dacc7134dddf73f7c35aeeca29c4e5c20c233d4c5dde
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtimageformats/qtimageformats-5.15.5-r2.ebuild b/dev-qt/qtimageformats/qtimageformats-5.15.5-r2.ebuild
index 33eee75394dd..3d27e670d2fa 100644
--- a/dev-qt/qtimageformats/qtimageformats-5.15.5-r2.ebuild
+++ b/dev-qt/qtimageformats/qtimageformats-5.15.5-r2.ebuild
@@ -9,7 +9,7 @@ inherit qt5-build
 DESCRIPTION="Additional format plugins for the Qt image I/O system"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ppc64 ~riscv ~sparc ~x86"
 fi
 
 IUSE="mng"
diff --git a/dev-qt/qtprintsupport/Manifest b/dev-qt/qtprintsupport/Manifest
index a9f6a7d2f4c2..b1b324a683ca 100644
--- a/dev-qt/qtprintsupport/Manifest
+++ b/dev-qt/qtprintsupport/Manifest
@@ -3,6 +3,6 @@ DIST qtbase-5.15-gentoo-patchset-1.tar.xz 4204 BLAKE2B 1399eb6f4c776d370e1837351
 DIST qtbase-5.15.5-gentoo-kde-1.tar.xz 520224 BLAKE2B 48807bc79cede557b114786ee072d8d94545f4ada3d96aa4fe04dbf79a356dc6c17d9299014ed70aa10296346c30c7512fb7d9f88ee4b301e9a54a241363be8b SHA512 ab9f27d506d7aa1a9339ba52d51daffb4c6f9abb5d858fd728ef2110528bc0f2ae101b4e2e7c344836b42e4aafa2c5a4ab5c5fa37465e692cce500c0f3347fa7
 DIST qtbase-5.15.5-gentoo-kde-2.tar.xz 526240 BLAKE2B 68ecca0805c2ea0b29b65706b0c03a3ead1d106e089f2a48a988035842d0cc8ac67d950cbc67ae8f8be860fd11443579d3e06bfe96a2e3161f94e07206d2815e SHA512 d877a2eb4cd05b712a7db6a943f955d3ced88f51efe3e29b2d6716fba4da08398dbd2ed580ca5b9bfbd92a5a20e34451e06a324274447d4b3692b25af4ff8ddf
 DIST qtbase-everywhere-opensource-src-5.15.5.tar.xz 50247388 BLAKE2B e9bbfe8e73e6f25ccadeef722818b5aeb82d1f136bec21fcbc3b26bf76044b38f25c7268010c648e1161e9b61013b8b775f17b9fdcfdd70402bdfbf70bf7f9d5 SHA512 ce80eedc88abbd5a200bacc10a8e94adc1ef2122ac220715ba084adf1e32d67f2dc66168503de5fb5b5a6ab15f7a75ca23dc9956aed12ead994a8ffa6291ef87
-EBUILD qtprintsupport-5.15.5-r1.ebuild 917 BLAKE2B 6cf411ae6bbbeac93eaef52ba6c5703313318ec049b50dd989efe160ae4baf208f611b8ef4b57f82c13ca2e5de17dbd97f4cc951c2e7c0791f937d63218e5d8d SHA512 df5b1da13b0d9564fb9ea69d5d2a6a953386c3da8874ed7a9551beb7d80e483a2d1dc5f2749863ff75f102692b816cbfc2e6dadfe5f70e48460745bbf69db83c
+EBUILD qtprintsupport-5.15.5-r1.ebuild 915 BLAKE2B f66b2b111cf7b26170a0baef71e1015ac2bcc2a2b6839060399c0bb6631c687e59fe1f4f2d20679f78365998ff8857c427b2b54071339c187a64991babc4e9cc SHA512 2254a767d05d860d15463b084b43f9c97bd001c54ec660ce31688985050e90bc004226d9f882977c0a1d34ea0fd0a360d61d18ebf346029833ad1513a525848e
 EBUILD qtprintsupport-5.15.5.ebuild 833 BLAKE2B f83d54fd48a8828d6bd34815915042ef61b5070fd754582efe8fe71a3c86f6753624743c6c526e1bb61ebce8d75cac812e3691f42d33c9b99ad748d6658fce3a SHA512 ce6bec40b14228bf13ef9e6c2793cbe7f8022287d1f911dc60f5609e46093df1b0ae711a8202b6fb541ec3cc6d2172288d1ad56a7b966ffbbc61ed3c1b4b3cb7
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtprintsupport/qtprintsupport-5.15.5-r1.ebuild b/dev-qt/qtprintsupport/qtprintsupport-5.15.5-r1.ebuild
index 34caeb0c1d49..1cd663747519 100644
--- a/dev-qt/qtprintsupport/qtprintsupport-5.15.5-r1.ebuild
+++ b/dev-qt/qtprintsupport/qtprintsupport-5.15.5-r1.ebuild
@@ -11,7 +11,7 @@ inherit qt5-build
 DESCRIPTION="Printing support library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc ~x86"
 fi
 
 IUSE="cups gles2-only"
diff --git a/dev-qt/qtsvg/Manifest b/dev-qt/qtsvg/Manifest
index 69d332104d12..0075c633828d 100644
--- a/dev-qt/qtsvg/Manifest
+++ b/dev-qt/qtsvg/Manifest
@@ -2,7 +2,7 @@ DIST qtsvg-5.15.5-gentoo-kde-1.tar.xz 6796 BLAKE2B 03e80a083fef2b595d11e53cdf638
 DIST qtsvg-5.15.5-gentoo-kde-2.tar.xz 7428 BLAKE2B 8a061086a08f6f8a493685989c62d6360f55bc62e759b00ab2b501e7128b7ddf3c510df25cc8121a3abd47b4040bf9024ac44c9a8288ab8590ce2b80e8e20e59 SHA512 5b537d58886444e58089284473a9fac504edc6e2ac6b34102e6ac23965d0488b05294b185783ff1d3ae65dd3e519ff39213f8215fb34cf7a13b982850879de67
 DIST qtsvg-everywhere-opensource-src-5.15.5.tar.xz 1888600 BLAKE2B 3bf675d3ac14f64c9afd096342ef4fb574c6b9d93f52b6cba3a5184b8f0f54204c90a133193685a4838236eecb72e5329eb2254c80948fa55a6a103d52256b0f SHA512 7938a84abca282f263f7840425863379ed9e0f9854ecfe38e5d1edacdaf39b2516e9e9b8b5dbcf52113785d8c4123ebea550f441abc000d01c07a20a6a742ac4
 DIST qtsvg-everywhere-src-6.3.1.tar.xz 1727104 BLAKE2B be22d9083366faa0e5fe1a3e7bd37e5f439ae1bc3c2aea18ac9987d208d85a47384b71b989dd4a9e0118b740b0723815d959c1f46abbf60dbcc8814a8aea20d1 SHA512 c040e96d2dc7ef615859dec589e0b0c4e5972c3761dcf9208086b0662bfa1c3d147a10534d62d86fd8c9786a1567f8e9ca196f942a372422fc81cd02f1312c4c
-EBUILD qtsvg-5.15.5-r1.ebuild 514 BLAKE2B 72107f9a7eaa338fa26de2c2c0b484b8d48c8d3002b09f41706a42769881c2c46dcf7c1c9000313ea87fe3d756b512e62b927266bb6de8ab0102a0255ea690aa SHA512 31e0808446ee51560245994f680e4c87b9b2c4b0285490fa34995d980124120278cdac8dbdfbd19cf7a14be4a19c483437ae798ccee11f147b565b89ecd23403
+EBUILD qtsvg-5.15.5-r1.ebuild 512 BLAKE2B 2eb7b95859646f8ece8ac1bb158ca95555b3eae2e3c49effc34f88c5812d40cd91cd87eb02c2385cb84aa04002fec25f0e81c8bee4d2ee370024877359d872db SHA512 439c2072283b89c44aef5295641beb2022d15f10291d5001b179b5e95db2c670de0335254e0f3b2540b4fd33f0a8ac56849be33c024c0205acac161f1e268eec
 EBUILD qtsvg-5.15.5.ebuild 508 BLAKE2B b8ff9b538c8348a5b25c09fe4063962c40cf6262274cbcbeaf5a27227556083e49ff6b134afabf968648ad85dffa0b31fbe1b109dd23e314b0c89354f31a514e SHA512 f6fb04786de78cc499fe09ce6fc28b088fafcae699736d8ba7ae47156ea2c4aafebbedafd027844961b4e721ab87cb59c4ef3ee3e1e2426de09615da601bbf73
 EBUILD qtsvg-6.3.1.ebuild 342 BLAKE2B 09c0c3a8014981af4f44da56fc0b5f0d79924f21ae7188f32c59905e0561e071bc403945aaa88d37317ead2d788bfb9a2b58c46dae88f56fe0c2f3f0802b5207 SHA512 432c136765f20e6f2f418e5cb851d2d77fac85d20dda139f59dc088b552f7b89e7d518d506b17ea2094e084445ebf7b27b2a4eed4243d0ce308e3787f90333f9
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtsvg/qtsvg-5.15.5-r1.ebuild b/dev-qt/qtsvg/qtsvg-5.15.5-r1.ebuild
index 00cf752cdc68..a68b355383be 100644
--- a/dev-qt/qtsvg/qtsvg-5.15.5-r1.ebuild
+++ b/dev-qt/qtsvg/qtsvg-5.15.5-r1.ebuild
@@ -9,7 +9,7 @@ inherit qt5-build
 DESCRIPTION="SVG rendering library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc ~x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtwayland/Manifest b/dev-qt/qtwayland/Manifest
index 55ccd7a87f9a..ee7b7d1c401d 100644
--- a/dev-qt/qtwayland/Manifest
+++ b/dev-qt/qtwayland/Manifest
@@ -4,7 +4,7 @@ DIST qtwayland-5.15.5-gentoo-kde-1.tar.xz 32076 BLAKE2B e42d847deaef08271eb2f321
 DIST qtwayland-5.15.5-gentoo-kde-2.tar.xz 35492 BLAKE2B 91334609155e4bd227d76e5972422b400ab4b6196389a1b6b4c271994287851bc3b624ae761ece1418037735784edf7740ed5337ef6972bf708c598c202b7e86 SHA512 2663b59c7647e8a7d5f64905be114fc1b248cd8e10c2eba6bddc25b74fbbc5216e8264f41f50b6368819664921e27dfe96d4c1556c0e56f8c3c2c0ed75a72080
 DIST qtwayland-everywhere-opensource-src-5.15.5.tar.xz 567384 BLAKE2B 01ce4d546bda7bf332f8cc4f86a5e8bfb1be0ef60336ee3cae58266a25d51cf00fef3e6c4204f0179abc2ef748f88bd3a20f89f36da74d5d15c70ae7b4975186 SHA512 828dceb7bc54ce610a73f110f0aca332a90cf95df4a3bc971bd21c4e878366cb8d2248e609b73ce4d381579a143843c87a62f23dcc95767e522874e53a1b0327
 DIST qtwayland-everywhere-src-6.3.1.tar.xz 835896 BLAKE2B 97dce7d120769d1d68c6b15f8154e7aefc95d44d011a3ab86565868e2b81ee38780ce0931ba02973b878eed24781c6098ae688294c4bd30fb265d6815a215a36 SHA512 571654a6abcd865717d4624c65d78e1b911829bba84f609521f349bf896b9475a8ce7759ba6b69e4bc4eef10c31e404c71610816dbee20d1202401efefa2323d
-EBUILD qtwayland-5.15.5-r1.ebuild 1153 BLAKE2B 7e5ff059f7f96da0c7c5302a8e57255d50cb7e07291d5fb9f00cc5a0c58fe223de899dd7da6132bc8a9ce6018080fa867fdae9b629fc0830b4794c3eb5699c3b SHA512 20235ece58cc1aaace573ecdd0212c65108ea54b37c692143e759eb0e1a250eccc1c45d33a3d9518befd72db5eef375965e3d804d7a1920ba6c7efae83b82432
+EBUILD qtwayland-5.15.5-r1.ebuild 1151 BLAKE2B cefbd91dbf1c6beabc5226b89e26d046626705ec29e5cb03ee81b064749091bde2da5121897b35632bfd5b6decf564a10b4470724708d4a5cb02954dbaf2d3c3 SHA512 5d1f81dd65cb826359fe12c5d9dd19b5f97665314d38761a917f3c6bc52b2e2f5f4125ec5397f565db5acf86187c07b1c143827bc0ec8c343083a521b210f83a
 EBUILD qtwayland-5.15.5.ebuild 1147 BLAKE2B cb388d4b724850c2ac83f161f5546d12f9bebf2193c73f3252abe1afb9de5ee8d277b84dd539a159191c50e011c42bf643a76a0ccd2950b815edef36f1f45245 SHA512 55e53e006bb1d8f138e7c9ffe40eda9b670a0d82f22b64d6867db3285ea84846c205df1a3c3516c1636cfa20a825338ce16aa1c1cce753e93730ade702f32f80
 EBUILD qtwayland-6.3.1.ebuild 438 BLAKE2B ecb43b4035f97bde672b22faf6a1aa7a5fd0860db6bf871b4055c97b1c199840e2ba84b6720a69a3a2ff5bc8222abaead3a6ba53c282e83b1c3c114cd075115a SHA512 c9512430e1085f3e60a4fcab21036ac8aa393eb442ec2ebcc7f4161958316a9131bddbdb422fb2018f190ec99d5d51d2ba02a28503c220cc5e2c16e904445190
 MISC metadata.xml 584 BLAKE2B ad42909b120209835e121a29de558d338bae4348eb55e69a94e8ac8b54f26564df0a750839bef9418ae8056a0d24f234615247a610b8287f5b0fbffbc60193f2 SHA512 86fd81d63b19fc6e95bdcb92e9da9b03861248a4e78e9de36aca6996e61644ab8bce7a60ca22ee7ad86fefc9b407a1fd0136240b8fdfa3c40a149444ab1dcbe2
diff --git a/dev-qt/qtwayland/qtwayland-5.15.5-r1.ebuild b/dev-qt/qtwayland/qtwayland-5.15.5-r1.ebuild
index 82916bcd104b..f6eb9bb49913 100644
--- a/dev-qt/qtwayland/qtwayland-5.15.5-r1.ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.15.5-r1.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Wayland platform plugin for Qt"
 SLOT=5/${QT5_PV} # bug 815646
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc ~x86"
 fi
 
 IUSE="vulkan X"
diff --git a/dev-qt/qtwidgets/Manifest b/dev-qt/qtwidgets/Manifest
index 12c0d161c29c..c1528c336dd9 100644
--- a/dev-qt/qtwidgets/Manifest
+++ b/dev-qt/qtwidgets/Manifest
@@ -2,6 +2,6 @@ DIST qtbase-5.15-gentoo-patchset-1.tar.xz 4204 BLAKE2B 1399eb6f4c776d370e1837351
 DIST qtbase-5.15.5-gentoo-kde-1.tar.xz 520224 BLAKE2B 48807bc79cede557b114786ee072d8d94545f4ada3d96aa4fe04dbf79a356dc6c17d9299014ed70aa10296346c30c7512fb7d9f88ee4b301e9a54a241363be8b SHA512 ab9f27d506d7aa1a9339ba52d51daffb4c6f9abb5d858fd728ef2110528bc0f2ae101b4e2e7c344836b42e4aafa2c5a4ab5c5fa37465e692cce500c0f3347fa7
 DIST qtbase-5.15.5-gentoo-kde-2.tar.xz 526240 BLAKE2B 68ecca0805c2ea0b29b65706b0c03a3ead1d106e089f2a48a988035842d0cc8ac67d950cbc67ae8f8be860fd11443579d3e06bfe96a2e3161f94e07206d2815e SHA512 d877a2eb4cd05b712a7db6a943f955d3ced88f51efe3e29b2d6716fba4da08398dbd2ed580ca5b9bfbd92a5a20e34451e06a324274447d4b3692b25af4ff8ddf
 DIST qtbase-everywhere-opensource-src-5.15.5.tar.xz 50247388 BLAKE2B e9bbfe8e73e6f25ccadeef722818b5aeb82d1f136bec21fcbc3b26bf76044b38f25c7268010c648e1161e9b61013b8b775f17b9fdcfdd70402bdfbf70bf7f9d5 SHA512 ce80eedc88abbd5a200bacc10a8e94adc1ef2122ac220715ba084adf1e32d67f2dc66168503de5fb5b5a6ab15f7a75ca23dc9956aed12ead994a8ffa6291ef87
-EBUILD qtwidgets-5.15.5-r1.ebuild 1208 BLAKE2B 794bdcb1861bd33cd632e26def79dffcefdfa59d2ad5a960f73f4999007751f87733d878895e0d6274113d0f72905d6b4b9476b77130f4a1fc035bf7688d4bd7 SHA512 41a1072bec44ae7e73146ae9e9239affe549d418bc82ad64ac628f172bcf01fe247b9b188cc0203fdffee0d06df3f5363491c0f2fb6c6149fed27968c6b31628
+EBUILD qtwidgets-5.15.5-r1.ebuild 1206 BLAKE2B 5bae2ff803aa12fcff0509391a54ec8a12a958b875e436bddcba8104fc0214ff996300d8a25e22a7bc1554d94c73823aba8d59741d93c17da26faaceb466a6da SHA512 8feec9d777c7a22e76e66fb11e12c3459a569bbc9539085bd4f1ccea8618c1a34891449a95fba38ba0846b02911ca3ea1c5276b459f6c70b38828f153280bbdf
 EBUILD qtwidgets-5.15.5.ebuild 1202 BLAKE2B 4b07340a89e1d70785fac371c793e17af1276e173d6f0b548bf36ff75effe09e92ebf419f56ae9672d7acf60e41fd126ac452e6273ed52e38cefd7b82267209d SHA512 e9a199986ca80b3ff20d8f9ae54d71c77725ea055f4b69bb17fd266b4aacb68a592d721987423c758b8d2f6784f7cfd0b33a72607341a5a7fb54a0433f6d1f56
 MISC metadata.xml 559 BLAKE2B 3ea80a5e419db32987d68d7e5033fa75fa0ff22b31b0842fd7ead902172cbe83650b0bbdf8657a57e428726e7cdf114d9011bd16066c080bc5f6ecb3f691d42c SHA512 51172365a186fbca09651bfd751284960dda4036390af2afab9812a7ae3fabdd9d60a336dee3cfc5e3d133a0216bf77e29660b9cdee2f0bcd2ce43c27297bdb1
diff --git a/dev-qt/qtwidgets/qtwidgets-5.15.5-r1.ebuild b/dev-qt/qtwidgets/qtwidgets-5.15.5-r1.ebuild
index b2145cb8b006..6a1755c8b6af 100644
--- a/dev-qt/qtwidgets/qtwidgets-5.15.5-r1.ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5.15.5-r1.ebuild
@@ -10,7 +10,7 @@ inherit qt5-build
 DESCRIPTION="Set of components for creating classic desktop-style UIs for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc ~x86"
 fi
 
 # keep IUSE defaults in sync with qtgui
diff --git a/games-engines/Manifest.gz b/games-engines/Manifest.gz
index 86b787d68e27..7363468af93d 100644
--- a/games-engines/Manifest.gz
+++ b/games-engines/Manifest.gz
diff --git a/games-engines/qtads/Manifest b/games-engines/qtads/Manifest
index a2ad030e4cbe..c7f4f8580593 100644
--- a/games-engines/qtads/Manifest
+++ b/games-engines/qtads/Manifest
@@ -1,3 +1,5 @@
 DIST qtads-3.2.0-source.tar.xz 5415396 BLAKE2B 100812db9dd0d0630a5392036e29a366afd61778be2c887e19a1dfafd8f54af00654350fd855691e7e787385675d79a1c065767c93bc97665840396719ae5a0f SHA512 db52ed092d676029cc1ff1d02ddf9e5a91e0bcd77fbfd8e43c923deea4413c452895b70835c519e234f8af0bddf61bad7ad3ec5209876335eacaabe63ed6390a
+DIST qtads-3.3.0-source.tar.xz 6085960 BLAKE2B 516d9c38c1bed36d88f60ef746f1f8b7a82db14505e640c0d3024995a74c9efb68e7783111007db6ca7a2b6adbf7e5b96b6b1e7db1c0cce6441436e1ca81381b SHA512 7e2a647fc4bb81e9784a0b05b3fdee3e6306767aebd32466f6451dc8b2e0f61e01a5657d0bfb8ba091bdd8365c9fed4fd2ab5cd2a27bf5403a5192d42472f7b2
 EBUILD qtads-3.2.0-r1.ebuild 948 BLAKE2B 81fb89795ca6e7acdcf13e112553f83b3ee21aadebf95d26882c172b7dc2d7d603af54e25602f228e31dbbaaedac491a9285a20c33a9fcebd96ea0e1d2efcd0a SHA512 6e5bf4e1a1e65ecb0de2c84195dc402419c95cd3eac10506cce776f5efb5df617ce7dc9f12c6a458fc1aa9dd228d2766e26d6c7bacb35e8fe3b4b848b1a53198
+EBUILD qtads-3.3.0.ebuild 948 BLAKE2B ecd401019fa353cb0e75f8ee1acf2c92039122ca16d120adb66b32d2406b9be87498aba78144232918b8652bc1452a1cc34002a0aa59c366ce8b966e8fd97454 SHA512 348436bb3220d53adbb5f351b0b5feec3e345141bc8a3886473336ebf3075841501b8f94283bfca01c6c1425196ec02e647c5160d426dcd41be03ac780bd6f4b
 MISC metadata.xml 600 BLAKE2B 7aa1de6bd8c9c4809e7775a692a69c6e413ed3062a20f89a952859f9b1a4fec9fd86530933edd9e9977df7fba093b1623f231fe8c010dea08d8fb1b89202ff7c SHA512 4d65532cb39d2c90870fbbc1ed038c48646f90f5c5037e69aa1f5b0f965f46a37bd51621aaeebc62f8360b18dbc37e12f605e057d071b6a3313d4a446a66a2c2
diff --git a/games-engines/qtads/qtads-3.3.0.ebuild b/games-engines/qtads/qtads-3.3.0.ebuild
new file mode 100644
index 000000000000..18bed43aba43
--- /dev/null
+++ b/games-engines/qtads/qtads-3.3.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qmake-utils xdg
+
+DESCRIPTION="Multimedia interpreter for TADS text adventures"
+HOMEPAGE="https://realnc.github.io/qtads"
+SRC_URI="https://github.com/realnc/qtads/releases/download/v${PV}/${P}-source.tar.xz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+sound"
+
+BDEPEND="
+	virtual/pkgconfig
+"
+DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5[jpeg,png]
+	dev-qt/qtimageformats[mng]
+	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5[png]
+	sound? (
+		media-libs/libsdl2[sound]
+		media-libs/libsndfile
+		media-libs/libvorbis
+		media-sound/fluidsynth:0=
+		media-sound/mpg123
+	)
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	eqmake5 \
+		PREFIX="${EPREFIX}/usr" \
+		DOCDIR="${EPREFIX}/usr/share/${PF}" \
+		$(usev !sound CONFIG+=disable-audio) \
+		-after CONFIG-=silent
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+}
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index bc07dfabb275..cdd1ee5fbe95 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 8faa17d133fc..4882b12d1d7a 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Thu, 04 Aug 2022 12:09:52 +0000
+Thu, 04 Aug 2022 18:09:44 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index fafc6b894c8f..3b8852c82805 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 518764 BLAKE2B 800d8c605261a8d2ca31eca4bde7d3bb3f684de4f3181019daf03f289f18680c6d96f494d58f96fe4ad07cdd9e1d88375337c122e7b8e08a991332389d887299 SHA512 aedc41e29d7be49299b1cb0ff40f391a2deff64b9b55c25130ff0d38269f249b737b1d372d346ecfc163d0044fae33a0e164e57a26c205b60f17269607a8117b
-TIMESTAMP 2022-08-04T12:09:55Z
+MANIFEST Manifest.files.gz 519553 BLAKE2B 95b916bb9f20b609241e18817604d9aedbd9b94266162c0ae72c4075b346239f9bd4fbc73135a0dac0faa2a62330ae77a5fadd98fff5b4147580808a7c200ffe SHA512 4eb7457d78ec74e73c36af46d3c675bcb9bc9cf33d2f1fde05df8e517560b480fc8f920df111c03877fd301aeb0d0d260bbfc22b80cd0d7497e107fd5ded7e3c
+TIMESTAMP 2022-08-04T18:09:48Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLrtxNfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLsC2xfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCaEw/+KIdI9/zP7WSa4yasw8sfLEybpWWo2hiS0SoASnhIWZ2TBG5XkBkWV8JE
-ab+rtBcJPXXq28NUBso6Vy7nSwtPuvJxl7zRfb9XXboDj4pCpAlo82yVXd+oL0lI
-kHPmdHMLJPipcOkvS8iBOKDckrOBC+/FyJ4IhK5Qm+YCZEs5/Aiu4JL0CDpna6AG
-amQm/f3XlQBDUS6+JCBtbHLG5f23XNW6VmON08vTjj9apxedqG2vy3tnVyBqLguv
-7KRKTS9gSaU+kzpp0Gg5n+uVdQR9J/BnHE6W2JBC7bp8LT0LOKWsBvwp6HjzvolB
-ST98s9XVe92MbU3QpiDaQEwQ2CmeeO+L1YtxUrRhCQiG9ySXNbNLI5eIMhxDGFTn
-2izhdIAwxhEKW3NWyzajRwDlKQJ6a/b8GlRRu0CEdzpzrqG6dr2qIH/WHFSprYVI
-9RPvI5CUeBkuSfbZzOqgfG1wEqeCuQylL/RJvRYFr/aCUgBE8zywinX7fpTc3e6Q
-o4Ick/nqaK9MEZ5gPlRnU7rnFuSOoEME5Dkl+dIm2ZB/N3ujaJA04mevjPovkD9/
-vADAv2hylVTdy3pkNIJVj46HYfeCSeYiK9RpPvLim+/eYP9QJzaNQ+x4106klOgI
-JtJH/2DmLlSWBph+Su1h3MFAMR5eCMTEoAWuySCoUhiHpi6TlS8=
-=ZxjK
+klCKbQ//bntJ95joz38QqRnmXbL+NwnSI+uSHeUInVQFp1b2JpPzbXp0tM7vCnqI
+MGLfrFhwYU2Vk/EolMxNBq9qB9SCg904ymbeBu3z1OED97YtzrZONkl1ISuxICjY
+SZitZI7lUMifAGzAaDNTBu4ZxVcXIujonjq/jTdCrut9LCkHJwuHZVdnIfutzvnp
+15iLlHa+aq1tO2OMPkyKDCHbXF5qSu/4LsGl3TA7oJEVu3Iuv7VjNdArcV4CYHc+
+q3kzxu8B1mGv4bAhK2v9cVXqn+IdszHqxBKp7AqM6kqOWjft+0zR60slWhEWyknK
+/4CFRfhhCVeWzvhzcYc+dHo3WAy5qAPh7Jmq/gElo6Tmf6LcHjqEU2fXGpF5f6Bv
+ncinwnEubMFUrtoNtWpeukY8rlkwBFj0AatbIlsqHNoUEZbOyJsxwRGie6Co4dry
+g8WUOr8s4ldHIX/E+hRmbGYUr/VXh9v4sFBtGa3WIDfO/bKkVItlXs924vlaQXTx
+cMglcCB7d7NCLm36K6PobfpYjknHSXD/Lh0TIk2i1Yxow3yVOPyjD+bV5qcznwI8
+WJFOMGDmwp03zUqH8+uBz4AgrZ3AcuBMHlAF5q9IDfi+kFSs8a3gbZcWNR5CqJAS
+EMet+c3iNt5X69ARcpSTTZxivYEtERuyfKJiJqDDpTn/Kr0ZcK8=
+=TLF9
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/Manifest.files.gz b/metadata/glsa/Manifest.files.gz
index 1f73abc83f0a..5b6ba51e4671 100644
--- a/metadata/glsa/Manifest.files.gz
+++ b/metadata/glsa/Manifest.files.gz
diff --git a/metadata/glsa/glsa-202208-01.xml b/metadata/glsa/glsa-202208-01.xml
new file mode 100644
index 000000000000..ed2d5810df34
--- /dev/null
+++ b/metadata/glsa/glsa-202208-01.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="202208-01">
+    <title>3MF Consortium lib3mf: Remote code execution</title>
+    <synopsis>A vulnerability in lib3mf could lead to remote code execution.</synopsis>
+    <product type="ebuild">lib3mf</product>
+    <announced>2022-08-04</announced>
+    <revised count="1">2022-08-04</revised>
+    <bug>775362</bug>
+    <access>remote</access>
+    <affected>
+        <package name="media-libs/lib3mf" auto="yes" arch="*">
+            <unaffected range="ge">2.1.1</unaffected>
+            <vulnerable range="lt">2.1.1</vulnerable>
+        </package>
+    </affected>
+    <background>
+        <p>lib3mf is an implementation of the 3D Manufacturing Format file standard.</p>
+    </background>
+    <description>
+        <p>Incorrect memory handling within lib3mf could result in a use-after-free.</p>
+    </description>
+    <impact type="normal">
+        <p>An attacker that can provide malicious input to an application using 3MF Consortium&#39;s lib3mf could achieve remote code execution.</p>
+    </impact>
+    <workaround>
+        <p>There is no known workaround at this time.</p>
+    </workaround>
+    <resolution>
+        <p>All 3MF Consortium lib3mf users should upgrade to the latest version:</p>
+        
+        <code>
+          # emerge --sync
+          # emerge --ask --oneshot --verbose ">=media-libs/lib3mf-2.1.1"
+        </code>
+    </resolution>
+    <references>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-21772">CVE-2021-21772</uri>
+    </references>
+    <metadata tag="requester" timestamp="2022-08-04T13:52:26.273448Z">ajak</metadata>
+    <metadata tag="submitter" timestamp="2022-08-04T13:52:26.289354Z">ajak</metadata>
+</glsa>
\ No newline at end of file
diff --git a/metadata/glsa/glsa-202208-02.xml b/metadata/glsa/glsa-202208-02.xml
new file mode 100644
index 000000000000..f8dd813ed94a
--- /dev/null
+++ b/metadata/glsa/glsa-202208-02.xml
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="202208-02">
+    <title>Go: Multiple Vulnerabilities</title>
+    <synopsis>Multiple vulnerabilities have been found in Go, the worst of which could result in remote code execution.</synopsis>
+    <product type="ebuild">go</product>
+    <announced>2022-08-04</announced>
+    <revised count="1">2022-08-04</revised>
+    <bug>754210</bug>
+    <bug>766216</bug>
+    <bug>775326</bug>
+    <bug>788640</bug>
+    <bug>794784</bug>
+    <bug>802054</bug>
+    <bug>806659</bug>
+    <bug>807049</bug>
+    <bug>816912</bug>
+    <bug>821859</bug>
+    <bug>828655</bug>
+    <bug>833156</bug>
+    <bug>834635</bug>
+    <bug>838130</bug>
+    <bug>843644</bug>
+    <bug>849290</bug>
+    <bug>857822</bug>
+    <bug>862822</bug>
+    <access>remote</access>
+    <affected>
+        <package name="dev-lang/go" auto="yes" arch="*">
+            <unaffected range="ge">1.18.5</unaffected>
+            <vulnerable range="lt">1.18.5</vulnerable>
+        </package>
+    </affected>
+    <background>
+        <p>Go is an open source programming language that makes it easy to build simple, reliable, and efficient software.</p>
+    </background>
+    <description>
+        <p>Multiple vulnerabilities have been discovered in Go. Please review the CVE identifiers referenced below for details.</p>
+    </description>
+    <impact type="high">
+        <p>Please review the referenced CVE identifiers for details.</p>
+    </impact>
+    <workaround>
+        <p>There is no known workaround at this time.</p>
+    </workaround>
+    <resolution>
+        <p>All Go users shoud upgrade to the latest version:</p>
+        
+        <code>
+          # emerge --sync
+          # emerge --ask --oneshot --verbose ">=dev-lang/go-1.18.5"
+        </code>
+        
+        <p>In addition, users using Portage 3.0.9 or later should ensure that packages with Go binaries have no vulnerable code statically linked into their binaries by rebuilding the @golang-rebuild set:</p>
+        
+        <code>
+          # emerge --ask --oneshot --verbose @golang-rebuild
+        </code>
+    </resolution>
+    <references>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-28366">CVE-2020-28366</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-28367">CVE-2020-28367</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-27918">CVE-2021-27918</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-27919">CVE-2021-27919</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-29923">CVE-2021-29923</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-3114">CVE-2021-3114</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-3115">CVE-2021-3115</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-31525">CVE-2021-31525</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-33195">CVE-2021-33195</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-33196">CVE-2021-33196</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-33197">CVE-2021-33197</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-33198">CVE-2021-33198</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-34558">CVE-2021-34558</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-36221">CVE-2021-36221</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-38297">CVE-2021-38297</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-41771">CVE-2021-41771</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-41772">CVE-2021-41772</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-44716">CVE-2021-44716</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-44717">CVE-2021-44717</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-1705">CVE-2022-1705</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-23772">CVE-2022-23772</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-23773">CVE-2022-23773</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-23806">CVE-2022-23806</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-24675">CVE-2022-24675</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-24921">CVE-2022-24921</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-27536">CVE-2022-27536</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-28131">CVE-2022-28131</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-28327">CVE-2022-28327</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-29526">CVE-2022-29526</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-30629">CVE-2022-30629</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-30630">CVE-2022-30630</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-30631">CVE-2022-30631</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-30632">CVE-2022-30632</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-30633">CVE-2022-30633</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-30635">CVE-2022-30635</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-32148">CVE-2022-32148</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-32189">CVE-2022-32189</uri>
+    </references>
+    <metadata tag="requester" timestamp="2022-08-04T13:53:02.198118Z">ajak</metadata>
+    <metadata tag="submitter" timestamp="2022-08-04T13:53:02.201567Z">ajak</metadata>
+</glsa>
\ No newline at end of file
diff --git a/metadata/glsa/glsa-202208-03.xml b/metadata/glsa/glsa-202208-03.xml
new file mode 100644
index 000000000000..942101cddcc7
--- /dev/null
+++ b/metadata/glsa/glsa-202208-03.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="202208-03">
+    <title>Babel: Remote code execution</title>
+    <synopsis>A vulnerability in Babel could result in remote code execution.</synopsis>
+    <product type="ebuild">Babel</product>
+    <announced>2022-08-04</announced>
+    <revised count="1">2022-08-04</revised>
+    <bug>786954</bug>
+    <access>remote</access>
+    <affected>
+        <package name="dev-python/Babel" auto="yes" arch="*">
+            <unaffected range="ge">2.9.1</unaffected>
+            <vulnerable range="lt">2.9.1</vulnerable>
+        </package>
+    </affected>
+    <background>
+        <p>Babel is a collection of tools for internationalizing Python applications.</p>
+    </background>
+    <description>
+        <p>Babel does not properly restrict which sources a locale can be loaded from. If Babel loads an attacker-controlled .dat file, arbitrary code execution can be achieved via unsafe Pickle deserialization.</p>
+    </description>
+    <impact type="normal">
+        <p>An attacker with filesystem access and control over the locales Babel loads can achieve code execution.</p>
+    </impact>
+    <workaround>
+        <p>There is no known workaround at this time.</p>
+    </workaround>
+    <resolution>
+        <p>All Babel users should upgrade to the latest version:</p>
+        
+        <code>
+          # emerge --sync
+          # emerge --ask --oneshot --verbose ">=dev-python/Babel-2.9.1"
+        </code>
+    </resolution>
+    <references>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-20095">CVE-2021-20095</uri>
+    </references>
+    <metadata tag="requester" timestamp="2022-08-04T13:53:26.311668Z">ajak</metadata>
+    <metadata tag="submitter" timestamp="2022-08-04T13:53:26.316368Z">ajak</metadata>
+</glsa>
\ No newline at end of file
diff --git a/metadata/glsa/glsa-202208-04.xml b/metadata/glsa/glsa-202208-04.xml
new file mode 100644
index 000000000000..59a03c63d718
--- /dev/null
+++ b/metadata/glsa/glsa-202208-04.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="202208-04">
+    <title>libmcpp: Denial of service</title>
+    <synopsis>Multiple vulnerabilities in libmcpp could result in a denial of service condition.</synopsis>
+    <product type="ebuild">libmcpp</product>
+    <announced>2022-08-04</announced>
+    <revised count="1">2022-08-04</revised>
+    <bug>718808</bug>
+    <access>remote</access>
+    <affected>
+        <package name="dev-cpp/libmcpp" auto="yes" arch="*">
+            <unaffected range="ge">2.7.2_p5</unaffected>
+            <vulnerable range="lt">2.7.2_p5</vulnerable>
+        </package>
+    </affected>
+    <background>
+        <p>libmcpp is a portable C/C++ preprocessor.</p>
+    </background>
+    <description>
+        <p>A buffer overflow and an out-of-bounds read vulnerability have been discovered in libmcpp, which could be exploited for denial of service.</p>
+    </description>
+    <impact type="low">
+        <p>An attacker that can provide crafted input to libmcpp could achieve denial of service.</p>
+    </impact>
+    <workaround>
+        <p>There is no known workaround at this time.</p>
+    </workaround>
+    <resolution>
+        <p>All libmcpp users should upgrade to the latest version:</p>
+        
+        <code>
+          # emerge --sync
+          # emerge --ask --oneshot --verbose ">=dev-cpp/libmcpp-2.7.2_p5"
+        </code>
+    </resolution>
+    <references>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2019-14274">CVE-2019-14274</uri>
+    </references>
+    <metadata tag="requester" timestamp="2022-08-04T13:53:45.282478Z">ajak</metadata>
+    <metadata tag="submitter" timestamp="2022-08-04T13:53:45.286989Z">ajak</metadata>
+</glsa>
\ No newline at end of file
diff --git a/metadata/glsa/glsa-202208-05.xml b/metadata/glsa/glsa-202208-05.xml
new file mode 100644
index 000000000000..088ef70191b0
--- /dev/null
+++ b/metadata/glsa/glsa-202208-05.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="202208-05">
+    <title>Icinga Web 2: Multiple Vulnerabilities</title>
+    <synopsis>Multiple vulnerabilities have been found in Icinga Web 2, the worst of which could result in remote code execution.</synopsis>
+    <product type="ebuild">icingaweb2</product>
+    <announced>2022-08-04</announced>
+    <revised count="1">2022-08-04</revised>
+    <bug>738024</bug>
+    <bug>834802</bug>
+    <access>remote</access>
+    <affected>
+        <package name="www-apps/icingaweb2" auto="yes" arch="*">
+            <unaffected range="ge">2.9.6</unaffected>
+            <vulnerable range="lt">2.9.6</vulnerable>
+        </package>
+    </affected>
+    <background>
+        <p>Icinga Web 2 is a frontend for icinga2.</p>
+    </background>
+    <description>
+        <p>Multiple vulnerabilities have been discovered in Icinga Web 2. Please review the CVE identifiers referenced below for details.</p>
+    </description>
+    <impact type="high">
+        <p>Please review the referenced CVE identifiers for details.</p>
+    </impact>
+    <workaround>
+        <p>There is no known workaround at this time.</p>
+    </workaround>
+    <resolution>
+        <p>All Icinga Web 2 users should upgrade to the latest version:</p>
+        
+        <code>
+          # emerge --sync
+          # emerge --ask --oneshot --verbose ">=www-apps/icingaweb2-2.9.6"
+        </code>
+    </resolution>
+    <references>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-24368">CVE-2020-24368</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-24714">CVE-2022-24714</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-24715">CVE-2022-24715</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-24716">CVE-2022-24716</uri>
+    </references>
+    <metadata tag="requester" timestamp="2022-08-04T13:54:03.704673Z">ajak</metadata>
+    <metadata tag="submitter" timestamp="2022-08-04T13:54:03.709641Z">ajak</metadata>
+</glsa>
\ No newline at end of file
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 8faa17d133fc..73af047d975d 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Thu, 04 Aug 2022 12:09:52 +0000
+Thu, 04 Aug 2022 18:09:45 +0000
diff --git a/metadata/glsa/timestamp.commit b/metadata/glsa/timestamp.commit
index 349124ae11e5..3c24c45fc243 100644
--- a/metadata/glsa/timestamp.commit
+++ b/metadata/glsa/timestamp.commit
@@ -1 +1 @@
-254c716d0dd35a6846f281fd4a3eaf970dc0bede 1659377108 2022-08-01T18:05:08+00:00
+911ba97fd465c36414fa2eb8a1fea31d4152990a 1659621622 2022-08-04T14:00:22+00:00
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 00d579d00d28..1baad86532d2 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 40d117a519fc..8056da055ee0 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.45 b/metadata/md5-cache/app-admin/awscli-1.25.45
new file mode 100644
index 000000000000..0e87bab960cd
--- /dev/null
+++ b/metadata/md5-cache/app-admin/awscli-1.25.45
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/pytest-forked[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/botocore-1.27.45[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !app-admin/awscli-bin >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/gpep517-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=Universal Command Line Environment for AWS
+EAPI=8
+HOMEPAGE=https://github.com/aws/aws-cli/ https://pypi.org/project/awscli/
+INHERIT=bash-completion-r1 distutils-r1 multiprocessing
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/botocore-1.27.45[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !app-admin/awscli-bin python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/aws/aws-cli/archive/1.25.45.tar.gz -> aws-cli-1.25.45.gh.tar.gz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=0fd6a2cdd4f5b854d8449e5fd0580e2b
diff --git a/metadata/md5-cache/app-admin/puppet-7.16.0 b/metadata/md5-cache/app-admin/puppet-7.16.0
deleted file mode 100644
index fa9f9dbc3e66..000000000000
--- a/metadata/md5-cache/app-admin/puppet-7.16.0
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby26? ( dev-ruby/hiera[ruby_targets_ruby26(-)] dev-ruby/json:=[ruby_targets_ruby26(-)] dev-ruby/semantic_puppet[ruby_targets_ruby26(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby26(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby26(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby26(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby26(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby26(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby26(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby26(-)] ) virtual/ruby-ssl[ruby_targets_ruby26(-)] dev-ruby/hocon[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/hiera[ruby_targets_ruby27(-)] dev-ruby/json:=[ruby_targets_ruby27(-)] dev-ruby/semantic_puppet[ruby_targets_ruby27(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby27(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby27(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby27(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby27(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby27(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby27(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby27(-)] ) virtual/ruby-ssl[ruby_targets_ruby27(-)] dev-ruby/hocon[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/yard[ruby_targets_ruby26(-)] ) test? ( dev-ruby/mocha[ruby_targets_ruby26(-)] dev-ruby/rack[ruby_targets_ruby26(-)] dev-ruby/rspec-its[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/yard[ruby_targets_ruby27(-)] ) test? ( dev-ruby/mocha[ruby_targets_ruby27(-)] dev-ruby/rack[ruby_targets_ruby27(-)] dev-ruby/rspec-its[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=A system automation and configuration management software
-EAPI=7
-HOMEPAGE=https://puppet.com/
-INHERIT=ruby-fakegem systemd tmpfiles
-IUSE=augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax test ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86
-LICENSE=Apache-2.0 GPL-2
-PDEPEND=emacs? ( >=app-emacs/puppet-mode-0.3-r1 )
-RDEPEND=ruby_targets_ruby26? ( dev-ruby/hiera[ruby_targets_ruby26(-)] dev-ruby/json:=[ruby_targets_ruby26(-)] dev-ruby/semantic_puppet[ruby_targets_ruby26(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby26(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby26(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby26(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby26(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby26(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby26(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby26(-)] ) virtual/ruby-ssl[ruby_targets_ruby26(-)] dev-ruby/hocon[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/hiera[ruby_targets_ruby27(-)] dev-ruby/json:=[ruby_targets_ruby27(-)] dev-ruby/semantic_puppet[ruby_targets_ruby27(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby27(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby27(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby27(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby27(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby27(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby27(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby27(-)] ) virtual/ruby-ssl[ruby_targets_ruby27(-)] dev-ruby/hocon[ruby_targets_ruby27(-)] ) ruby_targets_ruby26? ( dev-ruby/hiera[ruby_targets_ruby26(-)] dev-ruby/json:=[ruby_targets_ruby26(-)] dev-ruby/semantic_puppet[ruby_targets_ruby26(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby26(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby26(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby26(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby26(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby26(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby26(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby26(-)] ) virtual/ruby-ssl[ruby_targets_ruby26(-)] dev-ruby/hocon[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/hiera[ruby_targets_ruby27(-)] dev-ruby/json:=[ruby_targets_ruby27(-)] dev-ruby/semantic_puppet[ruby_targets_ruby27(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby27(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby27(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby27(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby27(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby27(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby27(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby27(-)] ) virtual/ruby-ssl[ruby_targets_ruby27(-)] dev-ruby/hocon[ruby_targets_ruby27(-)] ) rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] ) selinux? ( sys-libs/libselinux[ruby] sec-policy/selinux-puppet ) vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 ) >=app-portage/eix-0.18.0 acct-user/puppet acct-group/puppet ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) virtual/tmpfiles
-REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=test !test? ( test )
-SLOT=0
-SRC_URI=http://downloads.puppetlabs.com/puppet/puppet-7.16.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	55326c3bb01904e05d55c73c84c85d07	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=af112911e65ff3bc7cda4c98ff40d609
diff --git a/metadata/md5-cache/app-admin/puppet-agent-7.16.0 b/metadata/md5-cache/app-admin/puppet-agent-7.16.0
deleted file mode 100644
index 2af9e51c3611..000000000000
--- a/metadata/md5-cache/app-admin/puppet-agent-7.16.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=install postinst unpack
-DEPEND=!app-admin/puppet !dev-ruby/hiera !dev-ruby/facter app-emulation/virt-what acct-user/puppet acct-group/puppet virtual/libcrypt:= app-admin/augeas
-DESCRIPTION=general puppet client utils along with hiera and facter
-EAPI=7
-HOMEPAGE=https://puppetlabs.com/
-INHERIT=systemd unpacker tmpfiles
-IUSE=puppetdb selinux
-KEYWORDS=amd64 ~arm64
-LICENSE=Apache-2.0
-RDEPEND=!app-admin/puppet !dev-ruby/hiera !dev-ruby/facter app-emulation/virt-what acct-user/puppet acct-group/puppet virtual/libcrypt:= app-portage/eix sys-apps/dmidecode sys-libs/libselinux sys-libs/glibc sys-libs/readline:0/8 sys-libs/libxcrypt[compat] sys-libs/ncurses:0[tinfo] selinux? ( sys-libs/libselinux[ruby] sec-policy/selinux-puppet ) puppetdb? ( >=dev-ruby/puppetdb-termini-5.0.1 ) virtual/tmpfiles
-RESTRICT=strip
-SLOT=0
-SRC_URI=amd64? ( http://apt.puppetlabs.com/pool/focal/puppet/p/puppet-agent/puppet-agent_7.16.0-1focal_amd64.deb ) arm64? ( http://apt.puppetlabs.com/pool/focal/puppet/p/puppet-agent/puppet-agent_7.16.0-1focal_arm64.deb )
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	1542e649be915f43f6908a9e93909961	unpacker	697382d119fd3d195f110b7979184285
-_md5_=0e2f40438af6fd760767db9204970987
diff --git a/metadata/md5-cache/app-admin/puppetserver-7.7.0 b/metadata/md5-cache/app-admin/puppetserver-7.7.0
deleted file mode 100644
index ddc6520f66f0..000000000000
--- a/metadata/md5-cache/app-admin/puppetserver-7.7.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile install postinst prepare
-DEPEND=acct-user/puppet acct-group/puppet
-DESCRIPTION=Puppet Server is the next-generation application for managing Puppet agents
-EAPI=8
-HOMEPAGE=http://docs.puppetlabs.com/puppetserver/
-INHERIT=systemd tmpfiles
-IUSE=puppetdb
-KEYWORDS=amd64
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jdk-1.8.0 app-admin/puppet-agent[puppetdb?] virtual/tmpfiles
-SLOT=0
-SRC_URI=https://downloads.puppetlabs.com/puppet/puppetserver-7.7.0.tar.gz
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=331d43f87eabf5746ea7002dcad6dfd8
diff --git a/metadata/md5-cache/app-containers/Manifest.gz b/metadata/md5-cache/app-containers/Manifest.gz
index 38edd6e52410..813c0d265738 100644
--- a/metadata/md5-cache/app-containers/Manifest.gz
+++ b/metadata/md5-cache/app-containers/Manifest.gz
diff --git a/metadata/md5-cache/app-containers/buildah-1.26.4 b/metadata/md5-cache/app-containers/buildah-1.26.4
new file mode 100644
index 000000000000..4496203ad515
--- /dev/null
+++ b/metadata/md5-cache/app-containers/buildah-1.26.4
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-lang/go-1.16 app-arch/unzip
+DEFINED_PHASES=compile install prepare test unpack
+DEPEND=app-crypt/gpgme:= app-containers/skopeo dev-libs/libgpg-error:= dev-libs/libassuan:= sys-apps/shadow:= sys-fs/lvm2:= sys-libs/libseccomp:= selinux? ( sys-libs/libselinux:= )
+DESCRIPTION=A tool that facilitates building OCI images
+EAPI=7
+HOMEPAGE=https://github.com/containers/buildah
+INHERIT=bash-completion-r1 go-module
+IUSE=selinux
+KEYWORDS=~amd64 ~arm64
+LICENSE=Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0
+RDEPEND=app-crypt/gpgme:= app-containers/skopeo dev-libs/libgpg-error:= dev-libs/libassuan:= sys-apps/shadow:= sys-fs/lvm2:= sys-libs/libseccomp:= selinux? ( sys-libs/libselinux:= )
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/containers/buildah/archive/v1.26.4.tar.gz -> buildah-1.26.4.tar.gz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	go-module	a13d34fe4e2996720e1ca6c53b9ea95a	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=02692f5d07ab3f2abe2c8156eeceef96
diff --git a/metadata/md5-cache/app-containers/grype-0.45.0 b/metadata/md5-cache/app-containers/grype-0.45.0
new file mode 100644
index 000000000000..50b89b36ec73
--- /dev/null
+++ b/metadata/md5-cache/app-containers/grype-0.45.0
@@ -0,0 +1,13 @@
+BDEPEND=>=dev-lang/go-1.16 app-arch/unzip
+DEFINED_PHASES=compile install unpack
+DESCRIPTION=A vulnerability scanner for container images and filesystems
+EAPI=8
+HOMEPAGE=https://www.anchore.com
+INHERIT=go-module
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RESTRICT=test strip
+SLOT=0
+SRC_URI=https://github.com/anchore/grype/archive/v0.45.0.tar.gz -> grype-0.45.0.tar.gz https://dev.gentoo.org/~williamh/dist/grype-0.45.0-deps.tar.xz
+_eclasses_=go-module	a13d34fe4e2996720e1ca6c53b9ea95a
+_md5_=7dedb2689e6851cd870a03ec9b616724
diff --git a/metadata/md5-cache/app-containers/syft-0.53.4 b/metadata/md5-cache/app-containers/syft-0.53.4
new file mode 100644
index 000000000000..866fef9e87af
--- /dev/null
+++ b/metadata/md5-cache/app-containers/syft-0.53.4
@@ -0,0 +1,13 @@
+BDEPEND=>=dev-lang/go-1.16 app-arch/unzip
+DEFINED_PHASES=compile install unpack
+DESCRIPTION=Generate a Software Bill of Materials from container images and filesystems
+EAPI=8
+HOMEPAGE=https://www.anchore.com
+INHERIT=go-module
+KEYWORDS=~amd64 ~arm64
+LICENSE=Apache-2.0
+RESTRICT=test strip
+SLOT=0
+SRC_URI=https://github.com/anchore/syft/archive/v0.53.4.tar.gz -> syft-0.53.4.tar.gz https://dev.gentoo.org/~williamh/dist/syft-0.53.4-deps.tar.xz
+_eclasses_=go-module	a13d34fe4e2996720e1ca6c53b9ea95a
+_md5_=13ce0c3315bb7effac105ec84a52b9d8
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index 3884a2451b1e..101752fa300c 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/xsdlib-2013.6.1 b/metadata/md5-cache/dev-java/xsdlib-2013.6.1
index 3eddfc479bee..1316fe238af2 100644
--- a/metadata/md5-cache/dev-java/xsdlib-2013.6.1
+++ b/metadata/md5-cache/dev-java/xsdlib-2013.6.1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=http://msv.java.net/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~amd64 ~arm ~arm64 ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD Apache-1.1
 RDEPEND=dev-java/relaxng-datatype:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://repo1.maven.org/maven2/net/java/dev/msv/xsdlib/2013.6.1/xsdlib-2013.6.1-sources.jar
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	343e153526b31b64f7efec0fdfa0f33b	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=69a4dadcf250848082220a15cecd36ae
+_md5_=e0ac9d6623cc2b7233088a90d5a2ff9b
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index 73db148381ad..002e1b441648 100644
--- a/metadata/md5-cache/dev-lang/Manifest.gz
+++ b/metadata/md5-cache/dev-lang/Manifest.gz
diff --git a/metadata/md5-cache/dev-lang/php-8.0.22 b/metadata/md5-cache/dev-lang/php-8.0.22
new file mode 100644
index 000000000000..f3851e9f53ae
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/php-8.0.22
@@ -0,0 +1,17 @@
+BDEPEND=virtual/pkgconfig virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 sys-devel/automake >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=>=app-eselect/eselect-php-0.9.7[apache2?,fpm?] >=dev-libs/libpcre2-10.30[jit?,unicode] fpm? ( acl? ( sys-apps/acl ) apparmor? ( sys-libs/libapparmor ) ) apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) argon2? ( app-crypt/argon2:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:4.8 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) curl? ( >=net-misc/curl-7.29.0 ) enchant? ( app-text/enchant:2 ) ffi? ( >=dev-libs/libffi-3.0.11:= ) firebird? ( dev-db/firebird ) gd? ( media-libs/libjpeg-turbo:0= media-libs/libpng:0= ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( >=virtual/imap-c-client-2[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11:= ) ldap-sasl? ( dev-libs/cyrus-sasl ) libedit? ( dev-libs/libedit ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient[sdk] ) odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) ) postgres? ( >=dev-db/postgresql-9.1:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) session-mm? ( dev-libs/mm ) snmp? ( >=net-analyzer/net-snmp-5.2 ) sodium? ( dev-libs/libsodium:=[-minimal] ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( >=dev-libs/openssl-1.0.1:0= ) tidy? ( app-text/htmltidy ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.9.0 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt ) zip? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( >=sys-libs/zlib-1.2.0.4:0= ) app-arch/xz-utils >=sys-devel/bison-3.0.1
+DESCRIPTION=The PHP language runtime engine
+EAPI=7
+HOMEPAGE=https://www.php.net/
+INHERIT=flag-o-matic systemd autotools
+IUSE=embed +cli cgi fpm apache2 phpdbg threads acl apparmor argon2 bcmath berkdb bzip2 calendar cdb cjk coverage +ctype curl debug enchant exif ffi +fileinfo +filter firebird +flatfile ftp gd gdbm gmp +iconv imap inifile intl iodbc ipv6 +jit kerberos ldap ldap-sasl libedit lmdb mhash mssql mysql mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline selinux +session session-mm sharedmem +simplexml snmp soap sockets sodium spell sqlite ssl sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode webp +xml xmlreader xmlwriter xpm xslt zip zlib
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+LICENSE=PHP-3.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )
+RDEPEND=>=app-eselect/eselect-php-0.9.7[apache2?,fpm?] >=dev-libs/libpcre2-10.30[jit?,unicode] fpm? ( acl? ( sys-apps/acl ) apparmor? ( sys-libs/libapparmor ) ) apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) argon2? ( app-crypt/argon2:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:4.8 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) curl? ( >=net-misc/curl-7.29.0 ) enchant? ( app-text/enchant:2 ) ffi? ( >=dev-libs/libffi-3.0.11:= ) firebird? ( dev-db/firebird ) gd? ( media-libs/libjpeg-turbo:0= media-libs/libpng:0= ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( >=virtual/imap-c-client-2[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11:= ) ldap-sasl? ( dev-libs/cyrus-sasl ) libedit? ( dev-libs/libedit ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient[sdk] ) odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) ) postgres? ( >=dev-db/postgresql-9.1:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) session-mm? ( dev-libs/mm ) snmp? ( >=net-analyzer/net-snmp-5.2 ) sodium? ( dev-libs/libsodium:=[-minimal] ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( >=dev-libs/openssl-1.0.1:0= ) tidy? ( app-text/htmltidy ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.9.0 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt ) zip? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( >=sys-libs/zlib-1.2.0.4:0= ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) )
+REQUIRED_USE=|| ( cli cgi fpm apache2 embed phpdbg ) cli? ( ^^ ( readline libedit ) ) !cli? ( ?? ( readline libedit ) ) truetype? ( gd zlib ) webp? ( gd zlib ) cjk? ( gd zlib ) exif? ( gd zlib ) xpm? ( gd zlib ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) xmlreader? ( xml ) xmlwriter? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) oci8-instant-client? ( !ldap ) qdbm? ( !gdbm ) session-mm? ( session !threads ) mysql? ( || ( mysqli pdo ) ) firebird? ( pdo ) mssql? ( pdo )
+RESTRICT=!test? ( test )
+SLOT=8.0
+SRC_URI=https://www.php.net/distributions/php-8.0.22.tar.xz
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=1aafcbc675dff41c7b7ecf2218c88581
diff --git a/metadata/md5-cache/dev-lang/php-8.1.9 b/metadata/md5-cache/dev-lang/php-8.1.9
new file mode 100644
index 000000000000..82fbd5173954
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/php-8.1.9
@@ -0,0 +1,18 @@
+BDEPEND=virtual/pkgconfig virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 sys-devel/automake >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=>=app-eselect/eselect-php-0.9.7[apache2?,fpm?] >=dev-libs/libpcre2-10.30[jit?,unicode] fpm? ( acl? ( sys-apps/acl ) apparmor? ( sys-libs/libapparmor ) ) apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) argon2? ( app-crypt/argon2:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:4.8 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) curl? ( >=net-misc/curl-7.29.0 ) enchant? ( app-text/enchant:2 ) ffi? ( >=dev-libs/libffi-3.0.11:= ) firebird? ( dev-db/firebird ) gd? ( media-libs/libjpeg-turbo:0= media-libs/libpng:0= ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( >=virtual/imap-c-client-2[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11:= ) ldap-sasl? ( dev-libs/cyrus-sasl ) libedit? ( dev-libs/libedit ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient[sdk] ) odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) ) postgres? ( >=dev-db/postgresql-9.1:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) session-mm? ( dev-libs/mm ) snmp? ( >=net-analyzer/net-snmp-5.2 ) sodium? ( dev-libs/libsodium:=[-minimal] ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( >=dev-libs/openssl-1.0.2:0= ) tidy? ( app-text/htmltidy ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.9.0 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt ) zip? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( >=sys-libs/zlib-1.2.0.4:0= ) app-arch/xz-utils >=sys-devel/bison-3.0.1
+DESCRIPTION=The PHP language runtime engine
+EAPI=8
+HOMEPAGE=https://www.php.net/
+IDEPEND=>=app-eselect/eselect-php-0.9.7[apache2?,fpm?]
+INHERIT=flag-o-matic systemd autotools
+IUSE=embed +cli cgi fpm apache2 phpdbg threads acl apparmor argon2 bcmath berkdb bzip2 calendar cdb cjk coverage +ctype curl debug enchant exif ffi +fileinfo +filter firebird +flatfile ftp gd gdbm gmp +iconv imap inifile intl iodbc ipv6 +jit kerberos ldap ldap-sasl libedit lmdb mhash mssql mysql mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline selinux +session session-mm sharedmem +simplexml snmp soap sockets sodium spell sqlite ssl sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode webp +xml xmlreader xmlwriter xpm xslt zip zlib
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+LICENSE=PHP-3.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )
+RDEPEND=>=app-eselect/eselect-php-0.9.7[apache2?,fpm?] >=dev-libs/libpcre2-10.30[jit?,unicode] fpm? ( acl? ( sys-apps/acl ) apparmor? ( sys-libs/libapparmor ) ) apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) argon2? ( app-crypt/argon2:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:4.8 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) curl? ( >=net-misc/curl-7.29.0 ) enchant? ( app-text/enchant:2 ) ffi? ( >=dev-libs/libffi-3.0.11:= ) firebird? ( dev-db/firebird ) gd? ( media-libs/libjpeg-turbo:0= media-libs/libpng:0= ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( >=virtual/imap-c-client-2[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11:= ) ldap-sasl? ( dev-libs/cyrus-sasl ) libedit? ( dev-libs/libedit ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient[sdk] ) odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) ) postgres? ( >=dev-db/postgresql-9.1:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) session-mm? ( dev-libs/mm ) snmp? ( >=net-analyzer/net-snmp-5.2 ) sodium? ( dev-libs/libsodium:=[-minimal] ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( >=dev-libs/openssl-1.0.2:0= ) tidy? ( app-text/htmltidy ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.9.0 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt ) zip? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( >=sys-libs/zlib-1.2.0.4:0= ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) )
+REQUIRED_USE=|| ( cli cgi fpm apache2 embed phpdbg ) cli? ( ^^ ( readline libedit ) ) !cli? ( ?? ( readline libedit ) ) truetype? ( gd zlib ) webp? ( gd zlib ) cjk? ( gd zlib ) exif? ( gd zlib ) xpm? ( gd zlib ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) xmlreader? ( xml ) xmlwriter? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) oci8-instant-client? ( !ldap ) qdbm? ( !gdbm ) session-mm? ( session !threads ) mysql? ( || ( mysqli pdo ) ) firebird? ( pdo ) mssql? ( pdo )
+RESTRICT=!test? ( test )
+SLOT=8.1
+SRC_URI=https://www.php.net/distributions/php-8.1.9.tar.xz
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=c4699840559effe4459549020cf37f55
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 194fa4c98054..bb4e10c80c7a 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/trio-1.17 b/metadata/md5-cache/dev-libs/trio-1.17
new file mode 100644
index 000000000000..155c0b7599bc
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/trio-1.17
@@ -0,0 +1,13 @@
+BDEPEND=doc? ( app-doc/doxygen )
+DEFINED_PHASES=compile install
+DESCRIPTION=Portable string functions, focus on the *printf() and *scanf() clones
+EAPI=8
+HOMEPAGE=https://daniel.haxx.se/projects/trio/
+INHERIT=docs
+IUSE=doc
+KEYWORDS=~amd64 ~x86
+LICENSE=trio
+SLOT=0
+SRC_URI=https://github.com/orbea/trio/releases/download/v1.17/trio-1.17.tar.gz
+_eclasses_=docs	8ed2a8a28ff109e7a3582c9abb7fe327
+_md5_=c89fd6a7c229188649150da303450b51
diff --git a/metadata/md5-cache/dev-ml/Manifest.gz b/metadata/md5-cache/dev-ml/Manifest.gz
index e47c7ade30f8..34774ce205f0 100644
--- a/metadata/md5-cache/dev-ml/Manifest.gz
+++ b/metadata/md5-cache/dev-ml/Manifest.gz
diff --git a/metadata/md5-cache/dev-ml/jingoo-1.4.2 b/metadata/md5-cache/dev-ml/jingoo-1.4.2
index f3a17ff54a28..431346c08020 100644
--- a/metadata/md5-cache/dev-ml/jingoo-1.4.2
+++ b/metadata/md5-cache/dev-ml/jingoo-1.4.2
@@ -1,6 +1,6 @@
 BDEPEND=dev-ml/dune dev-lang/ocaml
 DEFINED_PHASES=compile install prepare test
-DEPEND=dev-ml/ppx_deriving:= dev-ml/uucp:= dev-ml/uutf:= dev-ml/re:= dev-ml/menhir:= test? ( dev-ml/ounit2 ) >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DEPEND=dev-ml/ppx_deriving:= dev-ml/uucp:= dev-ml/uutf:= dev-ml/re:= dev-ml/ocaml-migrate-parsetree:= dev-ml/menhir:= test? ( dev-ml/ounit2 ) >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 DESCRIPTION=OCaml template engine almost compatible with Jinja2
 EAPI=7
 HOMEPAGE=https://github.com/tategakibunko/jingoo
@@ -8,9 +8,9 @@ INHERIT=dune
 IUSE=+ocamlopt test
 KEYWORDS=amd64 x86
 LICENSE=ISC
-RDEPEND=dev-ml/ppx_deriving:= dev-ml/uucp:= dev-ml/uutf:= dev-ml/re:= dev-ml/menhir:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+RDEPEND=dev-ml/ppx_deriving:= dev-ml/uucp:= dev-ml/uutf:= dev-ml/re:= dev-ml/ocaml-migrate-parsetree:= dev-ml/menhir:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tategakibunko/jingoo/archive/v1.4.2.tar.gz -> jingoo-1.4.2.tar.gz
 _eclasses_=dune	c8f275f00adf2380fe0a57d8a249885c	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=1368d4e2e069f081aaa32b11b4b87e3e
+_md5_=37e4ff7e09fe801b7b08657d0bb47450
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 77f59dd5bc48..0769fee75271 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.45 b/metadata/md5-cache/dev-python/boto3-1.24.45
new file mode 100644
index 000000000000..15751580d7b0
--- /dev/null
+++ b/metadata/md5-cache/dev-python/boto3-1.24.45
@@ -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.45[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.45[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.45.tar.gz -> boto3-1.24.45.gh.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=50e9b19da5bcce80f05fd9be69fe0ff8
diff --git a/metadata/md5-cache/dev-python/botocore-1.27.45 b/metadata/md5-cache/dev-python/botocore-1.27.45
new file mode 100644
index 000000000000..267093c62335
--- /dev/null
+++ b/metadata/md5-cache/dev-python/botocore-1.27.45
@@ -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.45.tar.gz -> botocore-1.27.45.gh.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=b81d1890717c7eec6242fb986ac35277
diff --git a/metadata/md5-cache/dev-python/ensurepip-wheels-63.4.1.22.2.2 b/metadata/md5-cache/dev-python/ensurepip-wheels-63.4.1.22.2.2
new file mode 100644
index 000000000000..3e8f1e713cfc
--- /dev/null
+++ b/metadata/md5-cache/dev-python/ensurepip-wheels-63.4.1.22.2.2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install
+DESCRIPTION=Shared wheels for ensurepip Python module
+EAPI=8
+HOMEPAGE=https://pypi.org/project/pip/ https://pypi.org/project/setuptools/
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=Apache-2.0 BSD BSD-2 ISC LGPL-2.1+ MIT MPL-2.0 PSF-2
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/py3/p/pip/pip-22.2.2-py3-none-any.whl https://files.pythonhosted.org/packages/py3/s/setuptools/setuptools-63.4.1-py3-none-any.whl
+_md5_=38599eac27c58e664ba46672b8e33827
diff --git a/metadata/md5-cache/dev-python/flake8-5.0.4 b/metadata/md5-cache/dev-python/flake8-5.0.4
new file mode 100644
index 000000000000..b6b04817d01a
--- /dev/null
+++ b/metadata/md5-cache/dev-python/flake8-5.0.4
@@ -0,0 +1,17 @@
+BDEPEND=>=dev-python/pyflakes-2.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/pyflakes-2.6.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pycodestyle-2.9.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/pycodestyle-2.10.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( >=dev-python/mccabe-0.7.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/mccabe-0.8.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_11(-)] dev-python/sphinx-prompt[python_targets_python3_11(-)] dev-python/sphinx_rtd_theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_10(-)] dev-python/sphinx-prompt[python_targets_python3_10(-)] dev-python/sphinx_rtd_theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_9(-)] dev-python/sphinx-prompt[python_targets_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_8(-)] dev-python/sphinx-prompt[python_targets_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)] ) ( >=dev-python/pypy3-7.3.9_p1:0 >=dev-python/sphinx-4.5.0-r1[python_targets_pypy3(-)] dev-python/sphinx-prompt[python_targets_pypy3(-)] dev-python/sphinx_rtd_theme[python_targets_pypy3(-)] ) ) ) test? ( >=dev-python/pyflakes-2.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/pyflakes-2.6.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pycodestyle-2.9.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/pycodestyle-2.10.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-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=A wrapper around PyFlakes, pep8 & mccabe
+EAPI=8
+HOMEPAGE=https://github.com/pycqa/flake8/ https://pypi.org/project/flake8/
+INHERIT=distutils-r1
+IUSE=doc test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+LICENSE=MIT
+PDEPEND=>=dev-python/mccabe-0.7.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/mccabe-0.8.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+RDEPEND=>=dev-python/pyflakes-2.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/pyflakes-2.6.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pycodestyle-2.9.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/pycodestyle-2.10.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/PyCQA/flake8/archive/5.0.4.tar.gz -> flake8-5.0.4.gh.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=62f5e295bc162701c434a18b440f58a2
diff --git a/metadata/md5-cache/dev-python/flask-2.2.1 b/metadata/md5-cache/dev-python/flask-2.2.1
new file mode 100644
index 000000000000..aca1e965ddad
--- /dev/null
+++ b/metadata/md5-cache/dev-python/flask-2.2.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/asgiref-3.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !!dev-python/shiboken2 ) doc? ( || ( ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_11(-)] dev-python/pallets-sphinx-themes[python_targets_python3_11(-)] dev-python/sphinx-issues[python_targets_python3_11(-)] dev-python/sphinx-tabs[python_targets_python3_11(-)] dev-python/sphinxcontrib-log_cabinet[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/pallets-sphinx-themes[python_targets_python3_10(-)] dev-python/sphinx-issues[python_targets_python3_10(-)] dev-python/sphinx-tabs[python_targets_python3_10(-)] dev-python/sphinxcontrib-log_cabinet[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/pallets-sphinx-themes[python_targets_python3_9(-)] dev-python/sphinx-issues[python_targets_python3_9(-)] dev-python/sphinx-tabs[python_targets_python3_9(-)] dev-python/sphinxcontrib-log_cabinet[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/pallets-sphinx-themes[python_targets_python3_8(-)] dev-python/sphinx-issues[python_targets_python3_8(-)] dev-python/sphinx-tabs[python_targets_python3_8(-)] dev-python/sphinxcontrib-log_cabinet[python_targets_python3_8(-)] ) ( >=dev-python/pypy3-7.3.9_p1:0 >=dev-python/sphinx-4.5.0-r1[python_targets_pypy3(-)] dev-python/pallets-sphinx-themes[python_targets_pypy3(-)] dev-python/sphinx-issues[python_targets_pypy3(-)] dev-python/sphinx-tabs[python_targets_pypy3(-)] dev-python/sphinxcontrib-log_cabinet[python_targets_pypy3(-)] ) ) ) test? ( >=dev-python/click-8.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/blinker[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/itsdangerous-2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jinja-3.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/werkzeug-2.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/importlib_metadata-3.6.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( >=dev-python/importlib_metadata-3.6.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-python/importlib_metadata-3.6.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) >=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=A microframework based on Werkzeug, Jinja2 and good intentions
+EAPI=8
+HOMEPAGE=https://palletsprojects.com/p/flask/ https://github.com/pallets/flask/ https://pypi.org/project/Flask/
+INHERIT=distutils-r1
+IUSE=examples doc test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=BSD
+RDEPEND=>=dev-python/click-8.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/blinker[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/itsdangerous-2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jinja-3.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/werkzeug-2.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/importlib_metadata-3.6.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( >=dev-python/importlib_metadata-3.6.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-python/importlib_metadata-3.6.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) 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/F/Flask/Flask-2.2.1.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=771bcddea4641740e588421f11d34a69
diff --git a/metadata/md5-cache/dev-python/identify-2.5.3 b/metadata/md5-cache/dev-python/identify-2.5.3
new file mode 100644
index 000000000000..9a59018cc62e
--- /dev/null
+++ b/metadata/md5-cache/dev-python/identify-2.5.3
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/ukkonen[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.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=File identification library for Python
+EAPI=8
+HOMEPAGE=https://github.com/pre-commit/identify/ https://pypi.org/project/identify/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~riscv ~x86
+LICENSE=MIT
+RDEPEND=dev-python/ukkonen[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/pre-commit/identify/archive/v2.5.3.tar.gz -> identify-2.5.3.gh.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=29defb420bf1f95c1a449e7e67cce4c0
diff --git a/metadata/md5-cache/dev-python/oslo-concurrency-5.0.0 b/metadata/md5-cache/dev-python/oslo-concurrency-5.0.0
new file mode 100644
index 000000000000..e48aae9d8a6a
--- /dev/null
+++ b/metadata/md5-cache/dev-python/oslo-concurrency-5.0.0
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-python/pbr-2.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( >=dev-python/oslotest-3.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/fixtures-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-python/eventlet-0.19.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-python/eventlet-0.19.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) ) test? ( >dev-python/pbr-2.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/oslo-config-5.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/oslo-i18n-3.15.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/oslo-utils-3.33.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/fasteners-0.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-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=Oslo Concurrency library
+EAPI=8
+HOMEPAGE=https://pypi.org/project/oslo.concurrency/ https://github.com/openstack/oslo.concurrency
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
+LICENSE=Apache-2.0
+RDEPEND=>dev-python/pbr-2.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/oslo-config-5.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/oslo-i18n-3.15.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/oslo-utils-3.33.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/fasteners-0.7.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=mirror://pypi/o/oslo.concurrency/oslo.concurrency-5.0.0.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=74a61874f00132c21ea57079ed5ed193
diff --git a/metadata/md5-cache/dev-python/phonenumbers-8.12.53 b/metadata/md5-cache/dev-python/phonenumbers-8.12.53
new file mode 100644
index 000000000000..5526c2725080
--- /dev/null
+++ b/metadata/md5-cache/dev-python/phonenumbers-8.12.53
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/protobuf-python[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 port of Google's libphonenumber
+EAPI=8
+HOMEPAGE=https://github.com/daviddrysdale/python-phonenumbers/ https://pypi.org/project/phonenumbers/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~ppc64 ~riscv ~x86
+LICENSE=Apache-2.0
+RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/daviddrysdale/python-phonenumbers/archive/v8.12.53.tar.gz -> python-phonenumbers-8.12.53.gh.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=ace22bdcc29265ea793f8ce1640c3bd8
diff --git a/metadata/md5-cache/dev-python/pip-22.2.2 b/metadata/md5-cache/dev-python/pip-22.2.2
new file mode 100644
index 000000000000..4566da095f49
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pip-22.2.2
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-python/setuptools-39.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( python_targets_python3_8? ( dev-python/freezegun[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pretend[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/scripttest[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tomli-w[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/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !alpha? ( !arm? ( !hppa? ( !ia64? ( !s390? ( !sparc? ( dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) ) ) ) ) ) python_targets_python3_9? ( dev-python/freezegun[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pretend[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/scripttest[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tomli-w[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/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !alpha? ( !arm? ( !hppa? ( !ia64? ( !s390? ( !sparc? ( dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) ) ) ) ) ) python_targets_python3_10? ( dev-python/freezegun[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pretend[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/scripttest[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tomli-w[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/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !alpha? ( !arm? ( !hppa? ( !ia64? ( !s390? ( !sparc? ( dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) ) ) ) ) ) ) test? ( >=dev-python/setuptools-39.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0=[ssl(+),threads(+)] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[ssl(+),threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[ssl(+),threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[ssl(+),threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[ssl(+),threads(+)] ) >=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=The PyPA recommended tool for installing Python packages
+EAPI=8
+HOMEPAGE=https://pip.pypa.io/en/stable/ https://pypi.org/project/pip/ https://github.com/pypa/pip/
+INHERIT=bash-completion-r1 distutils-r1 multiprocessing
+IUSE=vanilla test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=MIT Apache-2.0 BSD BSD-2 ISC LGPL-2.1+ MPL-2.0 PSF-2
+RDEPEND=>=dev-python/setuptools-39.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0=[ssl(+),threads(+)] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[ssl(+),threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[ssl(+),threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[ssl(+),threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[ssl(+),threads(+)] )
+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/pip/archive/22.2.2.tar.gz -> pip-22.2.2.gh.tar.gz test? ( https://files.pythonhosted.org/packages/py3/s/setuptools/setuptools-62.3.2-py3-none-any.whl https://files.pythonhosted.org/packages/py2.py3/w/wheel/wheel-0.36.2-py2.py3-none-any.whl https://github.com/pypa/virtualenv/archive/16.7.12.tar.gz -> virtualenv-16.7.12.gh.tar.gz )
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=c9567acdc11233479cbf09879b81bd60
diff --git a/metadata/md5-cache/dev-python/pycodestyle-2.9.1 b/metadata/md5-cache/dev-python/pycodestyle-2.9.1
new file mode 100644
index 000000000000..f1645c95f0cf
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pycodestyle-2.9.1
@@ -0,0 +1,15 @@
+BDEPEND=doc? ( || ( ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_11(-)] dev-python/sphinx_rtd_theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_10(-)] dev-python/sphinx_rtd_theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)] ) ( >=dev-python/pypy3-7.3.9_p1:0 >=dev-python/sphinx-4.5.0-r1[python_targets_pypy3(-)] dev-python/sphinx_rtd_theme[python_targets_pypy3(-)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-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=Python style guide checker (fka pep8)
+EAPI=8
+HOMEPAGE=https://pycodestyle.pycqa.org/en/latest/ https://github.com/PyCQA/pycodestyle/ https://pypi.org/project/pycodestyle/
+INHERIT=distutils-r1
+IUSE=doc python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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=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 )
+SLOT=0
+SRC_URI=mirror://pypi/p/pycodestyle/pycodestyle-2.9.1.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=9e14b7b0c9e406350a1c998f487f7e8b
diff --git a/metadata/md5-cache/dev-python/python-engineio-4.3.4 b/metadata/md5-cache/dev-python/python-engineio-4.3.4
new file mode 100644
index 000000000000..e7abc1fd25fc
--- /dev/null
+++ b/metadata/md5-cache/dev-python/python-engineio-4.3.4
@@ -0,0 +1,16 @@
+BDEPEND=test? ( 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(-)?] ) dev-python/gevent[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/websockets[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] www-servers/tornado[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/aiohttp[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/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(-)?] ) doc? ( || ( ( >=dev-lang/python-3.10.4:3.10 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_10(-)] dev-python/alabaster[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/alabaster[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/alabaster[python_targets_python3_8(-)] ) ) ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=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 implementation of the Engine.IO realtime server
+EAPI=8
+HOMEPAGE=https://python-engineio.readthedocs.io/ https://github.com/miguelgrinberg/python-engineio/ https://pypi.org/project/python-engineio/
+INHERIT=distutils-r1
+IUSE=test doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-python/aiohttp[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/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=https://github.com/miguelgrinberg/python-engineio/archive/v4.3.4.tar.gz -> python-engineio-4.3.4.gh.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=b4bb715de8ded968ee87ef41110e3872
diff --git a/metadata/md5-cache/dev-python/tifffile-2022.8.3 b/metadata/md5-cache/dev-python/tifffile-2022.8.3
new file mode 100644
index 000000000000..1f1d7c592ee7
--- /dev/null
+++ b/metadata/md5-cache/dev-python/tifffile-2022.8.3
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/dask[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/fsspec-2021.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/xarray[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/numpy-1.19.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/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=Read and write TIFF files
+EAPI=8
+HOMEPAGE=https://pypi.org/project/tifffile/ https://github.com/cgohlke/tifffile/ https://www.cgohlke.com/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-python/numpy-1.19.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/cgohlke/tifffile/archive/v2022.8.3.tar.gz -> tifffile-2022.8.3.gh.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=f46b47d9d3d796cf5fb416f9f42bc974
diff --git a/metadata/md5-cache/dev-python/virtualenv-20.16.3 b/metadata/md5-cache/dev-python/virtualenv-20.16.3
new file mode 100644
index 000000000000..189a15cb3fa7
--- /dev/null
+++ b/metadata/md5-cache/dev-python/virtualenv-20.16.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/coverage[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/flaky[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pip-22.2.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-freezegun-0.4.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-mock-3.6.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-timeout-2.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-20.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/distlib-0.3.5[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/filelock-3.4.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/platformdirs-2.4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-63.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/six-1.9.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.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 postinst prepare test
+DESCRIPTION=Virtual Python Environment builder
+EAPI=8
+HOMEPAGE=https://virtualenv.pypa.io/en/stable/ https://pypi.org/project/virtualenv/ https://github.com/pypa/virtualenv/
+INHERIT=distutils-r1
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/distlib-0.3.5[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/filelock-3.4.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/platformdirs-2.4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-63.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/six-1.9.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/v/virtualenv/virtualenv-20.16.3.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=ec9da2d3b0a244e986df414b40a8d200
diff --git a/metadata/md5-cache/dev-python/wand-0.6.9 b/metadata/md5-cache/dev-python/wand-0.6.9
new file mode 100644
index 000000000000..e820f9db6639
--- /dev/null
+++ b/metadata/md5-cache/dev-python/wand-0.6.9
@@ -0,0 +1,16 @@
+BDEPEND=test? ( media-gfx/imagemagick[fftw,jpeg,png,truetype,xml] ) doc? ( || ( ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_8(-)] ) ( >=dev-python/pypy3-7.3.9_p1:0 >=dev-python/sphinx-4.5.0-r1[python_targets_pypy3(-)] ) ) ) test? ( media-gfx/imagemagick >=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=Ctypes-based simple ImageMagick binding for Python
+EAPI=8
+HOMEPAGE=https://docs.wand-py.org/ https://github.com/emcconville/wand/ https://pypi.org/project/Wand/
+INHERIT=distutils-r1
+IUSE=doc test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=media-gfx/imagemagick 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/W/Wand/Wand-0.6.9.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=7450ff0e510598dcb9d82a764d54bdb0
diff --git a/metadata/md5-cache/dev-qt/Manifest.gz b/metadata/md5-cache/dev-qt/Manifest.gz
index fb167b83dd9a..02da39bb1d10 100644
--- a/metadata/md5-cache/dev-qt/Manifest.gz
+++ b/metadata/md5-cache/dev-qt/Manifest.gz
diff --git a/metadata/md5-cache/dev-qt/qtconcurrent-5.15.5-r1 b/metadata/md5-cache/dev-qt/qtconcurrent-5.15.5-r1
index 18b5661594a8..bbf7f5df62db 100644
--- a/metadata/md5-cache/dev-qt/qtconcurrent-5.15.5-r1
+++ b/metadata/md5-cache/dev-qt/qtconcurrent-5.15.5-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qtbase https://community.kde.org/Qt5PatchCollection
 INHERIT=qt5-build
 IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc ~x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.5*:5=
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.5/submodules/qtbase-everywhere-opensource-src-5.15.5.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15-gentoo-patchset-1.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.5-gentoo-kde-2.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	qt5-build	f2dfafcf0c2b89d7f474fae87a25d2dc	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	644887c82aefdf12001489391fca4f02
-_md5_=e0c0b0e6a65c58c8687c836568c5a2ad
+_md5_=02fcac78f35e9fcf116f25307f2700da
diff --git a/metadata/md5-cache/dev-qt/qtcore-5.15.5-r2 b/metadata/md5-cache/dev-qt/qtcore-5.15.5-r2
index 74b309b41363..5fa50513489d 100644
--- a/metadata/md5-cache/dev-qt/qtcore-5.15.5-r2
+++ b/metadata/md5-cache/dev-qt/qtcore-5.15.5-r2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qtbase https://community.kde.org/Qt5PatchCollection
 INHERIT=linux-info qt5-build
 IUSE=icu old-kernel systemd debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc ~x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=dev-libs/double-conversion:= dev-libs/glib:2 dev-libs/libpcre2[pcre16,unicode] sys-libs/zlib:= icu? ( dev-libs/icu:= ) !icu? ( virtual/libiconv ) systemd? ( sys-apps/systemd:= )
 RESTRICT=test
 SLOT=5/5.15.5
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.5/submodules/qtbase-everywhere-opensource-src-5.15.5.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15-gentoo-patchset-1.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.5-gentoo-kde-2.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	5ca4e49abed8e3a2f7b56920eadee157	qt5-build	f2dfafcf0c2b89d7f474fae87a25d2dc	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	644887c82aefdf12001489391fca4f02
-_md5_=b8a6efac3f28798dc9465f20618e987d
+_md5_=3101fdc5170e4d2ba081e53d6f7c20d5
diff --git a/metadata/md5-cache/dev-qt/qtdbus-5.15.5-r1 b/metadata/md5-cache/dev-qt/qtdbus-5.15.5-r1
index 36d696a407d2..4b160fec31a6 100644
--- a/metadata/md5-cache/dev-qt/qtdbus-5.15.5-r1
+++ b/metadata/md5-cache/dev-qt/qtdbus-5.15.5-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qtbase https://community.kde.org/Qt5PatchCollection
 INHERIT=qt5-build
 IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc ~x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.5*:5= sys-apps/dbus
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.5/submodules/qtbase-everywhere-opensource-src-5.15.5.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15-gentoo-patchset-1.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.5-gentoo-kde-2.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	qt5-build	f2dfafcf0c2b89d7f474fae87a25d2dc	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	644887c82aefdf12001489391fca4f02
-_md5_=1f1923887ebd33d5de1c1f367aa586c3
+_md5_=6e6d9827f94fd5f068962ae208a966c8
diff --git a/metadata/md5-cache/dev-qt/qtgui-5.15.5-r1 b/metadata/md5-cache/dev-qt/qtgui-5.15.5-r1
index eca2168847fa..39a766235580 100644
--- a/metadata/md5-cache/dev-qt/qtgui-5.15.5-r1
+++ b/metadata/md5-cache/dev-qt/qtgui-5.15.5-r1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qtbase https://community.kde.org/Qt5PatchCollection
 INHERIT=qt5-build
 IUSE=accessibility dbus egl eglfs evdev +gif gles2-only ibus jpeg +libinput linuxfb +png tslib tuio +udev vnc vulkan wayland +X debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc ~x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 PDEPEND=ibus? ( app-i18n/ibus ) wayland? ( =dev-qt/qtwayland-5.15.5* )
 RDEPEND=dev-libs/glib:2 =dev-qt/qtcore-5.15.5*:5= dev-util/gtk-update-icon-cache media-libs/fontconfig media-libs/freetype:2 media-libs/harfbuzz:= sys-libs/zlib:= dbus? ( =dev-qt/qtdbus-5.15.5* ) eglfs? ( media-libs/mesa[gbm(+)] x11-libs/libdrm ) evdev? ( sys-libs/mtdev ) jpeg? ( media-libs/libjpeg-turbo:= ) gles2-only? ( media-libs/libglvnd ) !gles2-only? ( media-libs/libglvnd[X] ) libinput? ( dev-libs/libinput:= x11-libs/libxkbcommon ) png? ( media-libs/libpng:= ) tslib? ( >=x11-libs/tslib-1.21 ) tuio? ( =dev-qt/qtnetwork-5.15.5* ) udev? ( virtual/libudev:= ) vnc? ( =dev-qt/qtnetwork-5.15.5* ) vulkan? ( dev-util/vulkan-headers ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libxcb:=[xkb] x11-libs/libxkbcommon[X] x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm )
@@ -15,4 +15,4 @@ RESTRICT=test
 SLOT=5/5.15.5
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.5/submodules/qtbase-everywhere-opensource-src-5.15.5.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15-gentoo-patchset-1.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.5-gentoo-kde-2.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	qt5-build	f2dfafcf0c2b89d7f474fae87a25d2dc	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	644887c82aefdf12001489391fca4f02
-_md5_=8bddd74cd106fa0dd94c247c91a84a23
+_md5_=e6a4c9aa23ee1facb8c1bc88e60ab3e4
diff --git a/metadata/md5-cache/dev-qt/qtimageformats-5.15.5-r2 b/metadata/md5-cache/dev-qt/qtimageformats-5.15.5-r2
index 4d3ba6e64cdb..fa81bcaeeea7 100644
--- a/metadata/md5-cache/dev-qt/qtimageformats-5.15.5-r2
+++ b/metadata/md5-cache/dev-qt/qtimageformats-5.15.5-r2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qtimageformats https://community.kde.org/Qt5PatchCollection
 INHERIT=qt5-build
 IUSE=mng debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ppc64 ~riscv ~sparc ~x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.5* =dev-qt/qtgui-5.15.5* media-libs/libwebp:= media-libs/tiff:0 mng? ( media-libs/libmng:= )
 RESTRICT=test
 SLOT=5
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.5/submodules/qtimageformats-everywhere-opensource-src-5.15.5.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtimageformats-5.15.5-gentoo-kde-3.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	qt5-build	f2dfafcf0c2b89d7f474fae87a25d2dc	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	644887c82aefdf12001489391fca4f02
-_md5_=129e3aada31038e89746b3425dc42ecf
+_md5_=f609368d17cb03a5f597ffb9b88edb53
diff --git a/metadata/md5-cache/dev-qt/qtprintsupport-5.15.5-r1 b/metadata/md5-cache/dev-qt/qtprintsupport-5.15.5-r1
index 4be16aa9d2c3..c23b2f438978 100644
--- a/metadata/md5-cache/dev-qt/qtprintsupport-5.15.5-r1
+++ b/metadata/md5-cache/dev-qt/qtprintsupport-5.15.5-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qtbase https://community.kde.org/Qt5PatchCollection
 INHERIT=qt5-build
 IUSE=cups gles2-only test debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc ~x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.5*:5= =dev-qt/qtgui-5.15.5*[gles2-only=] =dev-qt/qtwidgets-5.15.5*[gles2-only=] cups? ( net-print/cups )
 RESTRICT=!test? ( test ) test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.5/submodules/qtbase-everywhere-opensource-src-5.15.5.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15-gentoo-patchset-1.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.5-gentoo-kde-2.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	qt5-build	f2dfafcf0c2b89d7f474fae87a25d2dc	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	644887c82aefdf12001489391fca4f02
-_md5_=5bd9562d5f372f6ba89d27b429d8a854
+_md5_=4d7c372e3b5b3457d11c90539d4f7392
diff --git a/metadata/md5-cache/dev-qt/qtsvg-5.15.5-r1 b/metadata/md5-cache/dev-qt/qtsvg-5.15.5-r1
index d085afe99ea5..d5b0b225b6a5 100644
--- a/metadata/md5-cache/dev-qt/qtsvg-5.15.5-r1
+++ b/metadata/md5-cache/dev-qt/qtsvg-5.15.5-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qtsvg https://community.kde.org/Qt5PatchCollection
 INHERIT=qt5-build
 IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc ~x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.5* =dev-qt/qtgui-5.15.5* =dev-qt/qtwidgets-5.15.5* sys-libs/zlib:=
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.5/submodules/qtsvg-everywhere-opensource-src-5.15.5.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtsvg-5.15.5-gentoo-kde-2.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	qt5-build	f2dfafcf0c2b89d7f474fae87a25d2dc	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	644887c82aefdf12001489391fca4f02
-_md5_=86a9daad1f419ed21e784b5beb7858fb
+_md5_=58d42eee2d0523274d8912a3bff12e35
diff --git a/metadata/md5-cache/dev-qt/qtwayland-5.15.5-r1 b/metadata/md5-cache/dev-qt/qtwayland-5.15.5-r1
index 14fc50dbfa66..23a257626ccd 100644
--- a/metadata/md5-cache/dev-qt/qtwayland-5.15.5-r1
+++ b/metadata/md5-cache/dev-qt/qtwayland-5.15.5-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qtwayland https://community.kde.org/Qt5PatchCollection
 INHERIT=qt5-build
 IUSE=vulkan X debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc ~x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=dev-libs/wayland =dev-qt/qtcore-5.15.5*:5= =dev-qt/qtdeclarative-5.15.5*:5= =dev-qt/qtgui-5.15.5*:5=[egl,libinput,vulkan=,X?] media-libs/libglvnd vulkan? ( dev-util/vulkan-headers ) X? ( =dev-qt/qtgui-5.15.5*[-gles2-only] x11-libs/libX11 x11-libs/libXcomposite )
 RESTRICT=test
 SLOT=5/5.15.5
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.5/submodules/qtwayland-everywhere-opensource-src-5.15.5.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtwayland-5.15.5-gentoo-kde-2.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	qt5-build	f2dfafcf0c2b89d7f474fae87a25d2dc	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	644887c82aefdf12001489391fca4f02
-_md5_=7a5fb6c1ce7ec005a24500fa3ef9d8cc
+_md5_=aef325b5666ac50eb2664968793c3382
diff --git a/metadata/md5-cache/dev-qt/qtwidgets-5.15.5-r1 b/metadata/md5-cache/dev-qt/qtwidgets-5.15.5-r1
index d4625066da62..ada452d20f26 100644
--- a/metadata/md5-cache/dev-qt/qtwidgets-5.15.5-r1
+++ b/metadata/md5-cache/dev-qt/qtwidgets-5.15.5-r1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qtbase https://community.kde.org/Qt5PatchCollection
 INHERIT=qt5-build
 IUSE=dbus gles2-only gtk +png +X debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc ~x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.5*:5= =dev-qt/qtgui-5.15.5*:5=[gles2-only=,png=,X?] dbus? ( =dev-qt/qtdbus-5.15.5* ) gtk? ( dev-libs/glib:2 =dev-qt/qtgui-5.15.5*:5=[dbus] x11-libs/gtk+:3 x11-libs/libX11 x11-libs/pango )
 REQUIRED_USE=gtk? ( dbus )
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.5/submodules/qtbase-everywhere-opensource-src-5.15.5.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15-gentoo-patchset-1.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.5-gentoo-kde-2.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	qt5-build	f2dfafcf0c2b89d7f474fae87a25d2dc	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	644887c82aefdf12001489391fca4f02
-_md5_=3c1b4448bce0e97e9595719b98303f30
+_md5_=134d94017fb460621e403d26728e88f2
diff --git a/metadata/md5-cache/games-engines/Manifest.gz b/metadata/md5-cache/games-engines/Manifest.gz
index ece32f5fa6d1..7c108cd9d973 100644
--- a/metadata/md5-cache/games-engines/Manifest.gz
+++ b/metadata/md5-cache/games-engines/Manifest.gz
diff --git a/metadata/md5-cache/games-engines/qtads-3.3.0 b/metadata/md5-cache/games-engines/qtads-3.3.0
new file mode 100644
index 000000000000..3264df789074
--- /dev/null
+++ b/metadata/md5-cache/games-engines/qtads-3.3.0
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure install postinst postrm preinst
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5[jpeg,png] dev-qt/qtimageformats[mng] dev-qt/qtnetwork:5[ssl] dev-qt/qtsvg:5 dev-qt/qtwidgets:5[png] sound? ( media-libs/libsdl2[sound] media-libs/libsndfile media-libs/libvorbis media-sound/fluidsynth:0= media-sound/mpg123 )
+DESCRIPTION=Multimedia interpreter for TADS text adventures
+EAPI=8
+HOMEPAGE=https://realnc.github.io/qtads
+INHERIT=qmake-utils xdg
+IUSE=+sound
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5[jpeg,png] dev-qt/qtimageformats[mng] dev-qt/qtnetwork:5[ssl] dev-qt/qtsvg:5 dev-qt/qtwidgets:5[png] sound? ( media-libs/libsdl2[sound] media-libs/libsndfile media-libs/libvorbis media-sound/fluidsynth:0= media-sound/mpg123 )
+SLOT=0
+SRC_URI=https://github.com/realnc/qtads/releases/download/v3.3.0/qtads-3.3.0-source.tar.xz
+_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=e6fdd3b82ef8430bf0bd0dd92c3fa8ff
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index b20b64acf4ec..a7bd206e8cf1 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/dropbox-154.4.5363 b/metadata/md5-cache/net-misc/dropbox-154.4.5363
new file mode 100644
index 000000000000..0da718e47c5e
--- /dev/null
+++ b/metadata/md5-cache/net-misc/dropbox-154.4.5363
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/patchelf virtual/pkgconfig
+DEFINED_PHASES=install postinst postrm preinst prepare unpack
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Dropbox daemon (pretends to be GUI-less)
+EAPI=7
+HOMEPAGE=https://www.dropbox.com/
+INHERIT=desktop pax-utils systemd xdg
+IUSE=selinux X
+KEYWORDS=~amd64 ~x86 ~x86-linux
+LICENSE=BSD-2 CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox
+RDEPEND=X? ( x11-themes/hicolor-icon-theme ) selinux? ( sec-policy/selinux-dropbox ) app-arch/bzip2 dev-libs/glib:2 dev-libs/libffi-compat:6 media-libs/fontconfig media-libs/freetype net-misc/wget sys-libs/zlib sys-libs/ncurses-compat:5 virtual/opengl x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXrender x11-libs/libxcb
+RESTRICT=mirror strip
+SLOT=0
+SRC_URI=amd64? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86_64-154.4.5363.tar.gz ) x86? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86-154.4.5363.tar.gz ) https://www.dropbox.com/sh/42f8d4kq6yt5lte/AAD69lhaw6gy46W8HfQAm0GSa/Glyph/Dropbox/SVG/DropboxGlyph_Blue.svg
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=ee732e48347e53dbbd1fe14a25fb7a9e
diff --git a/metadata/md5-cache/net-misc/memcached-1.6.16 b/metadata/md5-cache/net-misc/memcached-1.6.16
new file mode 100644
index 000000000000..24b14372f3a3
--- /dev/null
+++ b/metadata/md5-cache/net-misc/memcached-1.6.16
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=>=dev-libs/libevent-1.4:= dev-lang/perl sasl? ( dev-libs/cyrus-sasl ) seccomp? ( sys-libs/libseccomp ) selinux? ( sec-policy/selinux-memcached ) ssl? ( >=dev-libs/openssl-1.1.0g:= ) acct-user/memcached test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 ssl? ( dev-perl/IO-Socket-SSL ) )
+DESCRIPTION=High-performance, distributed memory object caching system
+EAPI=7
+HOMEPAGE=http://memcached.org/
+INHERIT=autotools flag-o-matic systemd
+IUSE=debug sasl seccomp selinux slabs-reassign ssl test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=BSD
+RDEPEND=>=dev-libs/libevent-1.4:= dev-lang/perl sasl? ( dev-libs/cyrus-sasl ) seccomp? ( sys-libs/libseccomp ) selinux? ( sec-policy/selinux-memcached ) ssl? ( >=dev-libs/openssl-1.1.0g:= )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://www.memcached.org/files/memcached-1.6.16.tar.gz https://www.memcached.org/files/old/memcached-1.6.16.tar.gz
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=1e1f7ff0079b1fa4f571a37bfd80d3c1
diff --git a/metadata/md5-cache/net-p2p/Manifest.gz b/metadata/md5-cache/net-p2p/Manifest.gz
index 07bc6c2a81bb..b0c7b67b3836 100644
--- a/metadata/md5-cache/net-p2p/Manifest.gz
+++ b/metadata/md5-cache/net-p2p/Manifest.gz
diff --git a/metadata/md5-cache/net-p2p/syncthing-1.19.2 b/metadata/md5-cache/net-p2p/syncthing-1.19.2
index cfd2ae8c712e..e9075dd72ec0 100644
--- a/metadata/md5-cache/net-p2p/syncthing-1.19.2
+++ b/metadata/md5-cache/net-p2p/syncthing-1.19.2
@@ -1,4 +1,4 @@
-BDEPEND=>=dev-lang/go-1.16 app-arch/unzip virtual/pkgconfig
+BDEPEND=<dev-lang/go-1.19 >=dev-lang/go-1.16 app-arch/unzip virtual/pkgconfig
 DEFINED_PHASES=compile install postinst postrm prepare test unpack
 DESCRIPTION=Open Source Continuous File Synchronization
 EAPI=8
@@ -12,4 +12,4 @@ RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/syncthing/syncthing/archive/v1.19.2.tar.gz -> syncthing-1.19.2.tar.gz https://dev.gentoo.org/~marecki/dists/net-p2p/syncthing/syncthing-1.19.2-deps.tar.xz
 _eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	go-module	a13d34fe4e2996720e1ca6c53b9ea95a	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=c223d5b07575babcf8ecd41597793a03
+_md5_=11ae020df748059650799133aebd36c4
diff --git a/metadata/md5-cache/net-p2p/syncthing-1.20.2 b/metadata/md5-cache/net-p2p/syncthing-1.20.2
index 6fcaceea4342..6bdd9ae33526 100644
--- a/metadata/md5-cache/net-p2p/syncthing-1.20.2
+++ b/metadata/md5-cache/net-p2p/syncthing-1.20.2
@@ -1,4 +1,4 @@
-BDEPEND=>=dev-lang/go-1.16 app-arch/unzip virtual/pkgconfig
+BDEPEND=<dev-lang/go-1.19 >=dev-lang/go-1.16 app-arch/unzip virtual/pkgconfig
 DEFINED_PHASES=compile install postinst postrm prepare test unpack
 DESCRIPTION=Open Source Continuous File Synchronization
 EAPI=8
@@ -12,4 +12,4 @@ RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/syncthing/syncthing/archive/v1.20.2.tar.gz -> syncthing-1.20.2.tar.gz https://dev.gentoo.org/~marecki/dists/net-p2p/syncthing/syncthing-1.20.2-deps.tar.xz
 _eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	go-module	a13d34fe4e2996720e1ca6c53b9ea95a	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=2944cc42dadf7ba025741b8907b85771
+_md5_=3fcfc8e1effe3acfa89dd89dd4f0f9ad
diff --git a/metadata/md5-cache/net-p2p/syncthing-1.20.3 b/metadata/md5-cache/net-p2p/syncthing-1.20.3
index ee3944c6c209..e0fa4fa55275 100644
--- a/metadata/md5-cache/net-p2p/syncthing-1.20.3
+++ b/metadata/md5-cache/net-p2p/syncthing-1.20.3
@@ -1,4 +1,4 @@
-BDEPEND=>=dev-lang/go-1.16 app-arch/unzip virtual/pkgconfig
+BDEPEND=<dev-lang/go-1.19 >=dev-lang/go-1.16 app-arch/unzip virtual/pkgconfig
 DEFINED_PHASES=compile install postinst postrm prepare test unpack
 DESCRIPTION=Open Source Continuous File Synchronization
 EAPI=8
@@ -12,4 +12,4 @@ RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/syncthing/syncthing/archive/v1.20.3.tar.gz -> syncthing-1.20.3.tar.gz https://dev.gentoo.org/~marecki/dists/net-p2p/syncthing/syncthing-1.20.3-deps.tar.xz
 _eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	go-module	a13d34fe4e2996720e1ca6c53b9ea95a	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=fb3332e99c0c9851dc0ac3018a612c84
+_md5_=7627d3a8a59add3c6926de4190b9f3ff
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index 0aa7c02b5224..d4274154c9ae 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/man-db-2.10.2-r1 b/metadata/md5-cache/sys-apps/man-db-2.10.2-r1
index 76506c80ee0a..68033402c2bc 100644
--- a/metadata/md5-cache/sys-apps/man-db-2.10.2-r1
+++ b/metadata/md5-cache/sys-apps/man-db-2.10.2-r1
@@ -13,4 +13,4 @@ RDEPEND=>=dev-libs/libpipeline-1.5.0 sys-apps/groff sys-libs/gdbm:= seccomp? ( s
 SLOT=0
 SRC_URI=mirror://nongnu/man-db/man-db-2.10.2.tar.xz
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	prefix	eab3c99d77fe00506c109c8a736186f7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=e06ec87905df993ac45259bc8bc2ea4b
+_md5_=0873ed6d075902726fa0715e09af8462
diff --git a/metadata/md5-cache/sys-apps/man-db-9999 b/metadata/md5-cache/sys-apps/man-db-9999
index 9ab3f1007ad7..95d16aeb7067 100644
--- a/metadata/md5-cache/sys-apps/man-db-9999
+++ b/metadata/md5-cache/sys-apps/man-db-9999
@@ -12,4 +12,4 @@ PROPERTIES=live
 RDEPEND=>=dev-libs/libpipeline-1.5.0 sys-apps/groff sys-libs/gdbm:= seccomp? ( sys-libs/libseccomp ) zlib? ( sys-libs/zlib ) acct-group/man acct-user/man selinux? ( sec-policy/selinux-mandb ) virtual/tmpfiles
 SLOT=0
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	prefix	eab3c99d77fe00506c109c8a736186f7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=d3de14d21b94aed9a64be796712ea47b
+_md5_=1a05881cc44d95ca38db38ecc37d3312
diff --git a/metadata/md5-cache/sys-cluster/Manifest.gz b/metadata/md5-cache/sys-cluster/Manifest.gz
index 936e5baafdc6..948979fd60da 100644
--- a/metadata/md5-cache/sys-cluster/Manifest.gz
+++ b/metadata/md5-cache/sys-cluster/Manifest.gz
diff --git a/metadata/md5-cache/sys-cluster/cilium-cli-0.12.1 b/metadata/md5-cache/sys-cluster/cilium-cli-0.12.1
new file mode 100644
index 000000000000..93bdc19d7e3f
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/cilium-cli-0.12.1
@@ -0,0 +1,13 @@
+BDEPEND=>=dev-lang/go-1.16 app-arch/unzip
+DEFINED_PHASES=compile install unpack
+DESCRIPTION=Next generation command line interface for cilium
+EAPI=8
+HOMEPAGE=https://cilium.io
+INHERIT=go-module
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://github.com/cilium/cilium-cli/archive/v0.12.1.tar.gz -> cilium-cli-0.12.1.tar.gz
+_eclasses_=go-module	a13d34fe4e2996720e1ca6c53b9ea95a
+_md5_=ad775947c95d6304c72a56de4b2f6524
diff --git a/metadata/md5-cache/sys-cluster/hubble-0.10.0 b/metadata/md5-cache/sys-cluster/hubble-0.10.0
new file mode 100644
index 000000000000..5aa896bc495f
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/hubble-0.10.0
@@ -0,0 +1,13 @@
+BDEPEND=>=dev-lang/go-1.16 app-arch/unzip
+DEFINED_PHASES=compile install test unpack
+DESCRIPTION=Network, Service & Security Observability for Kubernetes using eBPF
+EAPI=8
+HOMEPAGE=https://cilium.io
+INHERIT=go-module
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://github.com/cilium/hubble/archive/v0.10.0.tar.gz -> hubble-0.10.0.tar.gz
+_eclasses_=go-module	a13d34fe4e2996720e1ca6c53b9ea95a
+_md5_=80abaebe768052742b60807b8920cee4
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index 7eab5735a8b4..7b8020be6216 100644
--- a/metadata/md5-cache/sys-fs/Manifest.gz
+++ b/metadata/md5-cache/sys-fs/Manifest.gz
diff --git a/metadata/md5-cache/sys-fs/btrfs-progs-5.18.1-r1 b/metadata/md5-cache/sys-fs/btrfs-progs-5.18.1-r1
index 2231c54a025c..c862cf6b9457 100644
--- a/metadata/md5-cache/sys-fs/btrfs-progs-5.18.1-r1
+++ b/metadata/md5-cache/sys-fs/btrfs-progs-5.18.1-r1
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0/0
 SRC_URI=https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v5.18.1.tar.xz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961	udev	f3a0a3964e2028a140c181f00eea9712
-_md5_=d13f908e9c6c62f8fa257b886e9840f6
+_md5_=4b7a97ef713e2574dbd82a40bb28c4cf
diff --git a/metadata/md5-cache/www-apps/Manifest.gz b/metadata/md5-cache/www-apps/Manifest.gz
index 2d3c6608810f..9630058a07d8 100644
--- a/metadata/md5-cache/www-apps/Manifest.gz
+++ b/metadata/md5-cache/www-apps/Manifest.gz
diff --git a/metadata/md5-cache/www-apps/tt-rss-99999999 b/metadata/md5-cache/www-apps/tt-rss-99999999
index f5a9aa0410cd..98d12a8ccd9e 100644
--- a/metadata/md5-cache/www-apps/tt-rss-99999999
+++ b/metadata/md5-cache/www-apps/tt-rss-99999999
@@ -8,8 +8,8 @@ INHERIT=git-r3 webapp
 IUSE=+acl daemon gd +mysqli postgres vhosts
 LICENSE=GPL-3
 PROPERTIES=live
-RDEPEND=daemon? ( acl? ( sys-apps/acl ) ) daemon? ( acct-user/ttrssd acct-group/ttrssd || ( ( virtual/httpd-php:8.0 dev-lang/php:8.0[gd?,mysqli?,postgres?,curl,fileinfo,intl,json(+),pdo,unicode,xml,cli,pcntl] ) ( virtual/httpd-php:7.4 dev-lang/php:7.4[gd?,mysqli?,postgres?,curl,fileinfo,intl,json(+),pdo,unicode,xml,cli,pcntl] ) ( virtual/httpd-php:7.3 dev-lang/php:7.3[gd?,mysqli?,postgres?,curl,fileinfo,intl,json(+),pdo,unicode,xml,cli,pcntl] ) ) ) !daemon? ( || ( ( virtual/httpd-php:8.0 dev-lang/php:8.0[gd?,mysqli?,postgres?,curl,fileinfo,intl,json(+),pdo,unicode,xml] ) ( virtual/httpd-php:7.4 dev-lang/php:7.4[gd?,mysqli?,postgres?,curl,fileinfo,intl,json(+),pdo,unicode,xml] ) ( virtual/httpd-php:7.3 dev-lang/php:7.3[gd?,mysqli?,postgres?,curl,fileinfo,intl,json(+),pdo,unicode,xml] ) ) ) app-admin/webapp-config
+RDEPEND=daemon? ( acl? ( sys-apps/acl ) ) daemon? ( acct-user/ttrssd acct-group/ttrssd || ( ( virtual/httpd-php:8.0 dev-lang/php:8.0[gd?,mysqli?,postgres?,curl,fileinfo,intl,json(+),pdo,unicode,xml,cli,pcntl] ) ( virtual/httpd-php:7.4 dev-lang/php:7.4[gd?,mysqli?,postgres?,curl,fileinfo,intl,json(+),pdo,unicode,xml,cli,pcntl] ) ) ) !daemon? ( || ( ( virtual/httpd-php:8.0 dev-lang/php:8.0[gd?,mysqli?,postgres?,curl,fileinfo,intl,json(+),pdo,unicode,xml] ) ( virtual/httpd-php:7.4 dev-lang/php:7.4[gd?,mysqli?,postgres?,curl,fileinfo,intl,json(+),pdo,unicode,xml] ) ) ) app-admin/webapp-config
 REQUIRED_USE=|| ( mysqli postgres )
 SLOT=99999999
 _eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	webapp	d872f28d7595b70dd46545199ef35fb0
-_md5_=7edea2c26cd642034c216378cd22bfae
+_md5_=db0f5dee6cd243918eb75dd2ab230bd1
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 7de8233af37a..75aa6a43ccf8 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 14051 BLAKE2B d460feca8bc7b4b0010f7ac7463f4648f0179be7700fc4f9141b971da3afd32867e4c57f7cc8b362bd97297526d49c086c2e727585677c6d001cb79f9ad21b12 SHA512 36e0a69e355d9df65eb4e07b145e6ac9baa2486cc796754e7a282c04a51eb949476215df45047dc77cbfbded75ae5fa94866b42dcd31f97fb13dd70c78334c0f
-TIMESTAMP 2022-08-04T12:09:55Z
+TIMESTAMP 2022-08-04T18:09:48Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLrtxNfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLsC2xfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBEdw//QGvInGNxJORLlxy1K5FuyxgNmIxWwS2PFVnJmiDUbsGceDvDXxScsAZh
-ZKfUzFhweVxOSijuU8Vpjm9mXqj8AZ5oxXZmuKRTovXGi15GbZHPYr2Z8KLYYcyj
-+5Jcyf97OFOdcJP0OdDsRp5rc+TIHL0ATp6wLuwDm4bEWpaFKu3BGMjZEhZrbfuc
-NCTWCF+3FjPsLQI3gFAmDvlkV/POsExX2sX5XkqxTDIqpTYYai/G/BbTIH/9FAIV
-RhCvLO7+B6cJ1B8+zWXexZLa6OgAaU+zxcLDEzoV/2KiX57UoS78kKBgdqUwabgS
-dH5FzdH7ZBePOabkdR6rSOkD9mUFViI/cF97SA4aOyPW9WjMkf93djhacQep+P0z
-QHjp5yqum8Dh6vAaA4DPCAQ5L3o5DJyiTfwu4Q7Lwp6513JfvZxCvsDanFh2A8jV
-R9vftQOK3FYAcer6RxG9Ql3UlDrMFpw+QuedrglMCKTEk4aNUk0PUCE09Wnuy9f2
-WslP4/bBGqJsAwU26Xm6yWF6a62BOGH0cWGHqzl+cPoinMKRv/li/MVpdcgt8wPF
-Trt7Nb+94SUzVhSTxc37bnrVTzj8jcj1D8dlicKYj0Gqfv/WiAETRYPGhxOWN/sp
-z5T6gm+y3tQfxBl/zcCTfyXfQMWIgf2BC56JrLMJF+0L4k202iE=
-=MFxc
+klBy/A/+LGY8Ugg8dsXnq9xhJYlJ/lo5iIhNGJTQYmKe4/Go2DNNNsPZ42wuK9uc
+aRCK1N5RLDLtXa9eccA3KEIkWoAw/3buu81oXtQQ3WUS4CuWY/FR5B8QSPWg51hq
+6mB2Tz8jZyir8ZODV0QBEmsH3Jzk5BJwkDcgVq04o3mZpRs99asHyBGMHYjGmwKK
+kkM0fBqIxPdYLszYGwJXdyqi67rT8JksQ5eKERr9TLxflOlGJ3nLxmkn2GXGb+J5
+Y9a3oLveyzg1fFGFPVZBZD617Mze0Ushj2TI2MHovKwuZKQheBXqmSNqHjotWde4
+NB8duc8KlSsBRn3UAS7Eb4ZNc5Rta6QSzmf84YZyfI4NTJYmCc6J4Seohpw3E+Er
+Thci3XQcxZDc+W5+2SiHNYY9be9UpzR38GnEiGfmhxbzKll+pB0nkteqcRwpn2pg
+a1uw4W+1WKnRggAJSEabEL37ooqFJYAQyOXnmLjFPG/wCXHe1fdAVrxXIjNE8+a/
+77vyFyz4QoFK+NC/NdYn05NC66pUqKi4POBJyRBCSR2SCvgmu7jrQhfpwZru/uyo
+FYlvy34klL6L3yxdfNSz1KlxWNqTCAzV1TM07O713C3XwJEmK0zyuD8M7AHHDMVy
+K+bNkYJxOUWPFQk7k+b9MeiJAinYjLb5jgRdFtFvQwjaxRJP1sM=
+=OuyM
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 8faa17d133fc..73af047d975d 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Thu, 04 Aug 2022 12:09:52 +0000
+Thu, 04 Aug 2022 18:09:45 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index f6becb4a003e..028cb1967ad4 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Thu Aug  4 12:09:52 PM UTC 2022
+Thu Aug  4 06:09:44 PM UTC 2022
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index cc9a1d19f65d..edb34a0d090d 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Thu, 04 Aug 2022 12:15:01 +0000
+Thu, 04 Aug 2022 18:15:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 46b6a182a110..99e0891fd72b 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-7cd9f9e7a598919b3dfc29385d7a54c7b706ee0c 1659611352 2022-08-04T11:09:12+00:00
+626717b30badc95edcf5099105834156e4e8331e 1659635771 2022-08-04T17:56:11+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 4bfe8b830f50..5807f2c28a7b 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1659615001 Thu 04 Aug 2022 12:10:01 PM UTC
+1659636601 Thu 04 Aug 2022 06:10:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 8faa17d133fc..4882b12d1d7a 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Thu, 04 Aug 2022 12:09:52 +0000
+Thu, 04 Aug 2022 18:09:44 +0000
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 8219398e882a..2841a00233ac 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/dropbox/Manifest b/net-misc/dropbox/Manifest
index a6f04902fd32..a24c4821595c 100644
--- a/net-misc/dropbox/Manifest
+++ b/net-misc/dropbox/Manifest
@@ -4,8 +4,11 @@ AUX dropbox_at.service-r2 1582 BLAKE2B 7a5d8eb1e99d6a9f6cc7d903d8d2cb6b124b4a521
 DIST DropboxGlyph_Blue.svg 605 BLAKE2B 6c488bd261293b22da98035935ddfa9247bedbc6f4da2f9fc2470af802c1f4f597ac88b01b5bef9e77e1e717267f633d6a04af2ccfd3c5f9dbff22fbceaf9a91 SHA512 9202344b904dcd7955e5a355dadf537d1544140d74f8a33bdc40e18e36661e3a474d11cf17613eaebf4e76c170d8413d99abdedfb8635784bcd6892b4b259712
 DIST dropbox-lnx.x86-152.4.4880.tar.gz 104241545 BLAKE2B 9564ce288aaec193142b203edd703498f72c7c21cff33a0b3a3b6450fe45d03cec375017e3805d84b604431ae427b63ddec605aba6fd64e3d1a6cc8516f35a5a SHA512 db305c224d29eb5c053bc535ab7f20ca43cfc85bd73972feae38ab4a7b0f1261c1e6a0b18840a4ebff7ce75119a02f78114a1b12a7115ccea6958702e331ab76
 DIST dropbox-lnx.x86-153.4.3932.tar.gz 104494686 BLAKE2B 5b6b0619c38d4c1ee802b531bdbc07471f0dc0dedb14f17e76743c691ad547bd5305f414acce4611cc58157f3c6754d5f1528b6b464973f14dbd7da04d171eb1 SHA512 560cd1ea7c2b62aff35962dac0f536fa524b28cbf215c09c011e274a2de72e603a956e663bfdfabb2471625b60cb9cc5651fcfd94ffe8ef3d809db49c81c50a6
+DIST dropbox-lnx.x86-154.4.5363.tar.gz 109668134 BLAKE2B 633f03d4bef7aa5ba739f347b8b22a60290b84442378b0aa590e4b8e8a89589b3d5bfc8bacb252dfe3a5c6b5d8165fd5590f77ac84633195f785d43f6f12f5a6 SHA512 dbc3fac256a2dcc33d1400c56df3825a05b122684afa393d050771361ba60460db3cd4cea4f2dbaf80aaebfb802beae761c3c3527eaa5305c4906b7adf46f089
 DIST dropbox-lnx.x86_64-152.4.4880.tar.gz 106098480 BLAKE2B ac28503b6e5e41521466658704ba7d69f8e9786dc366fbe93b0f69de869c5272ce6202c6bc5a8b757796c3d11537363dc47cf8d5b18edaf4ad94ab2d8f68ca1c SHA512 5f4f8c377f046bf35fac4c386528f487d5996a55d84b1e0ed018bacf1e5c20844cb8626e87a41925da7f423c9118dc9f606085103270162ae5bd237f868fde80
 DIST dropbox-lnx.x86_64-153.4.3932.tar.gz 106353970 BLAKE2B eea6685eeefc7a532ac5697e32ca9ce9017872e4fbf928f6a24137160767e1315eb999deba6fdf0c7b3ae4df31aa827ad890a072bef79ce45c4bb50af9e624af SHA512 64d97316d3094341f2b661123c5bb4e42ea12a1270c9672fb29f8e365f27d40982878ac8b3a851fb65b604d5ddfeca3ec1a7f3c56299e6a46e7dd70f6bf656d5
+DIST dropbox-lnx.x86_64-154.4.5363.tar.gz 111278830 BLAKE2B a7866826cd09aca55d5d30c769124e9e588ad49f8134f873504bd360d5a9fe73993ffb3b7507ce147a1ee45e8990c52de918fca22c89353c6b095513ecd8e216 SHA512 654b4b553f0fb6d040e492bef9763dbbbc4ecd0d903b0a136709072c72d361f98f0f734c5922a3ed274f592ae7e1c4420c28118fe419544b9193e3864a015fc9
 EBUILD dropbox-152.4.4880.ebuild 2865 BLAKE2B 05f3927207125b61497a4ce3c6e76d4e0380bf5f06ef104942036b4663ba6862b64c3ac140753d0199df66aa2556cbb10eb149720bf219f220c7609df970bd11 SHA512 4da3e90183b7f79ce35e50e1b231cd1a3cfb9aeb4fbeafe4cbb922ba45e805e39c2fe91176d52dda7073ff0b8cf300069222fac35fa928fc88ecc936937204d5
 EBUILD dropbox-153.4.3932.ebuild 2867 BLAKE2B 5cb3cbee274db23705e0e5804036332e08450993fe1ffe41ad7ba97b6b85a772b02aed8c4eede759406c65892dd757e49dcccee9be56d66bf47eff1f046add30 SHA512 56e3830c2c7eb74129c91a014ad2ba605df87c5b6e5a98020e2d226375a5343e891c817685375eaf1cc3449d10e427ff5921192cbb3a5373a736781b6e175820
+EBUILD dropbox-154.4.5363.ebuild 2867 BLAKE2B 5cb3cbee274db23705e0e5804036332e08450993fe1ffe41ad7ba97b6b85a772b02aed8c4eede759406c65892dd757e49dcccee9be56d66bf47eff1f046add30 SHA512 56e3830c2c7eb74129c91a014ad2ba605df87c5b6e5a98020e2d226375a5343e891c817685375eaf1cc3449d10e427ff5921192cbb3a5373a736781b6e175820
 MISC metadata.xml 336 BLAKE2B 0932d5cb97ca50abfbfd49b3b209733da73c94ed41ef1087e6c43c4e65f3a09186f74c507cf0db5d64a1c5231d3560a7d6a8bb6130e95e1d5dbb7f3974801df3 SHA512 25bee9aa1ab64f01bb4544dec14b4b98bcb3877714ec33c6cbed4cdd3362d2a4cab58f425cad3723398e4ee0a2ba16a550ab38ff9f974cd0c5046df1b34b5eb0
diff --git a/net-misc/dropbox/dropbox-154.4.5363.ebuild b/net-misc/dropbox/dropbox-154.4.5363.ebuild
new file mode 100644
index 000000000000..0c3e0f739306
--- /dev/null
+++ b/net-misc/dropbox/dropbox-154.4.5363.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop pax-utils systemd xdg
+
+DESCRIPTION="Dropbox daemon (pretends to be GUI-less)"
+HOMEPAGE="https://www.dropbox.com/"
+SRC_URI="
+	amd64? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86_64-${PV}.tar.gz )
+	x86? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86-${PV}.tar.gz )
+	https://www.dropbox.com/sh/42f8d4kq6yt5lte/AAD69lhaw6gy46W8HfQAm0GSa/Glyph/Dropbox/SVG/DropboxGlyph_Blue.svg
+"
+
+LICENSE="BSD-2 CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-linux"
+IUSE="selinux X"
+
+RESTRICT="mirror strip"
+
+QA_PREBUILT="opt/.*"
+QA_EXECSTACK="opt/dropbox/dropbox"
+
+BDEPEND="dev-util/patchelf"
+
+# Be sure to have GLIBCXX_3.4.9, #393125
+RDEPEND="
+	X? (
+		x11-themes/hicolor-icon-theme
+	)
+	selinux? ( sec-policy/selinux-dropbox )
+	app-arch/bzip2
+	dev-libs/glib:2
+	dev-libs/libffi-compat:6
+	media-libs/fontconfig
+	media-libs/freetype
+	net-misc/wget
+	sys-libs/zlib
+	sys-libs/ncurses-compat:5
+	virtual/opengl
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXrender
+	x11-libs/libxcb
+"
+
+src_unpack() {
+	unpack ${A}
+	mkdir -p "${S}" || die
+	mv "${WORKDIR}"/.dropbox-dist/* "${S}" || die
+	mv "${S}"/dropbox-lnx.*-${PV}/* "${S}" || die
+	rmdir "${S}"/dropbox-lnx.*-${PV}/ || die
+	rmdir .dropbox-dist || die
+}
+
+src_prepare() {
+	default
+	# we supply all of these in RDEPEND
+	rm -vf libGL.so.1 libX11* libffi.so.6 || die
+	# some of these do not appear to be used
+	rm -vf libQt5{OpenGL,PrintSupport,Qml,Quick,Sql,WebKit,WebKitWidgets}.so.5 \
+		PyQt5.QtPrintSupport.* PyQt5.QtQml.* PyQt5.QtQuick.*  \
+		wmctrl libdrm.so.2 libpopt.so.0 || die
+	if use X ; then
+		mv images/hicolor/16x16/status "${T}" || die
+	else
+		rm -vrf images || die
+	fi
+	patchelf --set-rpath '$ORIGIN' \
+		apex._apex.*.so \
+		nucleus_python.*.so \
+		tprt.*.so \
+		|| die
+	pax-mark cm dropbox
+	mv README ACKNOWLEDGEMENTS "${T}" || die
+}
+
+src_install() {
+	local targetdir="/opt/dropbox"
+
+	insinto "${targetdir}"
+	doins -r *
+	fperms a+x "${targetdir}"/{dropbox,dropboxd}
+	dosym "${targetdir}/dropboxd" "/opt/bin/dropbox"
+
+	if use X; then
+		doicon -s 16 -c status "${T}"/status
+		newicon -s scalable "${DISTDIR}/DropboxGlyph_Blue.svg" dropbox.svg
+	fi
+
+	make_desktop_entry "${PN}" "Dropbox" "dropboxstatus-logo"
+
+	newinitd "${FILESDIR}"/dropbox.initd dropbox
+	newconfd "${FILESDIR}"/dropbox.conf dropbox
+	systemd_newunit "${FILESDIR}"/dropbox_at.service-r2 "dropbox@.service"
+
+	dodoc "${T}"/{README,ACKNOWLEDGEMENTS}
+}
+
+pkg_postinst() {
+	einfo "Warning: while running, dropbox may attempt to autoupdate itself in"
+	einfo " your user's home directory.  To prevent this, run the following as"
+	einfo " each user who will run dropbox:"
+	einfo ""
+	einfo "install -dm0 ~/.dropbox-dist"
+}
diff --git a/net-misc/memcached/Manifest b/net-misc/memcached/Manifest
index 623c7bd44398..33284a4ea4bc 100644
--- a/net-misc/memcached/Manifest
+++ b/net-misc/memcached/Manifest
@@ -9,8 +9,10 @@ DIST memcached-1.6.10.tar.gz 609630 BLAKE2B 1b4d632cb57e1f49d6e667aea5a4d2a1c74b
 DIST memcached-1.6.13.tar.gz 1031167 BLAKE2B f65871ad2a110fb4baa96dd57844cfc403bcfc905120bbf13a6be9392a78ae3dafcbb59f05b9d212a1239ede465a3688d5ca90e5d104f654e36c76739545c234 SHA512 3f3ef37f5838d8b1b8100cdb77b2226d8d29eef093bcb2c9a03f2420144aa35a5c8c1c957134eddce1fdd37a05b5ffc19058baf05dd3aad60fca12f8c81eaf1d
 DIST memcached-1.6.14.tar.gz 1034514 BLAKE2B 960da79748019cfc6b8c1e2f63e67bede8a472985e738e3998ef41e48bd1c645671cf42661280cd4d97fde8de368f9f5d74e0aa83a7447d7f19fa6eeb303a01c SHA512 607b5c0d4c721c714b6e6e3fbca4845fc24103e1dfb988a2edf818b78f918eeb71b86b211e311dc2bcbc438a9a0ffcb69a3bd6694b591720ede8b5349c804740
 DIST memcached-1.6.15.tar.gz 1051109 BLAKE2B 96e931b2a513cc6717dbc3262e3c7d30a2293c7a1380e3bd961d82e3f24bb2f3fce20950a587e0588bf11c9606af230cad6ab1e749d438e62daf171cbaaf1853 SHA512 00ee15eb7932420a25f3ce973bc7fcc5ba77a514091883f8b4e58ea861073caa91c676c0020f03c768077e20c76f34bca96616be104af3fbc8e7e78303958f3d
+DIST memcached-1.6.16.tar.gz 1054877 BLAKE2B 6052153a0442df1e7fcd8a959184c6ef1ca5ca26ef8c145144f8d26d4ded971e19bfd7a310f80e7b1cded840ebe95626a8714b583e156111ba68ae4721bda0c2 SHA512 cacd71d11aaa575361b83b5c565b6d665cac7a6dc6768af209d5108620d6883a7b3159351b7eab6da034a15162fa71fefe8024e41a1f46911acd1ca3aa23b209
 EBUILD memcached-1.6.10.ebuild 2861 BLAKE2B 766d0823415f5695f50c3ef538277ca8eaddc0c21c19680bf917acc4c2cda54f942fb4bb742fe87bc2b734f4e3d440a1db1f5f3fde8f9783b611fa4d731e47ef SHA512 f19bc943a41580db184bf036fdc517f59fe8f8418ffa7855a5066160c1427ebfb9eb73d07df62803c5f095fa01e0deba56ae1464bd462610b6f0c4f175897cff
 EBUILD memcached-1.6.13.ebuild 2868 BLAKE2B 5f38656aec2eb9d62cc12ee437410a01d9e666e33856c9755aa3c2add6c75db2614932415933431f545e5f0b1bc90d8af11397ece9ddeddd70fe474f6082432e SHA512 b7388ee5dc5bef4597104a92d3a314207fb35bfc3a66c17b5c691fabc3bbb9bc49587acc0d432b01c1e838c032330ee23c93df4d15bd726bbe300032381deff3
 EBUILD memcached-1.6.14-r1.ebuild 2968 BLAKE2B d1683d929f3a1165f0c92645fa33ae16cee48f64bae0427e75228edf2611acb7432012f04d754693fe36bef88ae689a13c1f6fe6af7177bfde399af8201c8a2d SHA512 edde0dcf4d1d46972b7503b4b4ce0ea8ff0ad6ee0086beb12a63148b1e2ea96036842f3e2c47f5c61d2e12dd99c5f9d3286f9e29f1686d7a2cb6fb6f4a811c75
 EBUILD memcached-1.6.15.ebuild 2975 BLAKE2B 99872c458f163b3b1a297776faaea7fd20834858c69e512e98d86f412359a4f9cae5111cad94ace6d6d1de1a3209594f0fcbdf22ee714f05c1edeef9add7e602 SHA512 accb543d702a6998989aee10cf7618fa7498aa2a87bc26541b428a9f29d12f9a7254aa243253d052490b402ce263c3cf233ea434163e9245f02ad590e669d466
+EBUILD memcached-1.6.16.ebuild 2975 BLAKE2B 99872c458f163b3b1a297776faaea7fd20834858c69e512e98d86f412359a4f9cae5111cad94ace6d6d1de1a3209594f0fcbdf22ee714f05c1edeef9add7e602 SHA512 accb543d702a6998989aee10cf7618fa7498aa2a87bc26541b428a9f29d12f9a7254aa243253d052490b402ce263c3cf233ea434163e9245f02ad590e669d466
 MISC metadata.xml 1135 BLAKE2B d16930abfea735bd634c90e0add475eab661c6309c83f418586f0fb3a23e001888bb9c455d886a074d652da98bdaf99c2292357d6241b06c33bd046aac67b0ce SHA512 7bc61552d088369f7ad0204444371140dbd75aa10e9340bdafd2046c0dbfe1921edf8806ff8f96dde8e1e9a9239e82f1d8019e386b44c1e916aa39157c29b6de
diff --git a/net-misc/memcached/memcached-1.6.16.ebuild b/net-misc/memcached/memcached-1.6.16.ebuild
new file mode 100644
index 000000000000..39801d79547c
--- /dev/null
+++ b/net-misc/memcached/memcached-1.6.16.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic systemd
+
+MY_PV="${PV/_rc/-rc}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="High-performance, distributed memory object caching system"
+HOMEPAGE="http://memcached.org/"
+SRC_URI="https://www.memcached.org/files/${MY_P}.tar.gz
+	https://www.memcached.org/files/old/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="debug sasl seccomp selinux slabs-reassign ssl test" # hugetlbfs later
+
+RDEPEND=">=dev-libs/libevent-1.4:=
+	dev-lang/perl
+	sasl? ( dev-libs/cyrus-sasl )
+	seccomp? ( sys-libs/libseccomp )
+	selinux? ( sec-policy/selinux-memcached )
+	ssl? ( >=dev-libs/openssl-1.1.0g:= )"
+DEPEND="${RDEPEND}
+	acct-user/memcached
+	test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 ssl? ( dev-perl/IO-Socket-SSL ) )"
+
+S="${WORKDIR}/${MY_P}"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.2.2-fbsd.patch"
+	"${FILESDIR}/${PN}-1.4.0-fix-as-needed-linking.patch"
+	"${FILESDIR}/${PN}-1.4.4-as-needed.patch"
+	"${FILESDIR}/${PN}-1.4.17-EWOULDBLOCK.patch"
+)
+
+src_prepare() {
+	default
+
+	sed -i -e 's,-Werror,,g' configure.ac || die
+	sed -i -e 's,AM_CONFIG_HEADER,AC_CONFIG_HEADERS,' configure.ac || die
+
+	eautoreconf
+
+	use slabs-reassign && append-flags -DALLOW_SLABS_REASSIGN
+
+	# Tweak upstream systemd unit to use Gentoo variables/envfile.
+	# As noted by bug #587440
+	sed -i -e '/^ExecStart/{
+			s,{USER},{MEMCACHED_RUNAS},g;
+			s,{CACHESIZE},{MEMUSAGE},g;
+			s,OPTIONS,MISC_OPTS,g;
+		};
+		/Environment=/{s,OPTIONS,MISC_OPTS,g;};
+		/EnvironmentFile=/{s,/sysconfig/,/conf.d/,g;};
+		' \
+		"${S}"/scripts/memcached.service
+}
+
+src_configure() {
+	econf \
+		--disable-docs \
+		$(use_enable sasl) \
+		$(use_enable ssl tls)
+	# The xml2rfc tool to build the additional docs requires TCL :-(
+	# `use_enable doc docs`
+}
+
+src_compile() {
+	# There is a heavy degree of per-object compile flags
+	# Users do NOT know better than upstream. Trying to compile the testapp and
+	# the -debug version with -DNDEBUG _WILL_ fail.
+	append-flags -UNDEBUG -pthread
+	emake testapp memcached-debug CFLAGS="${CFLAGS}"
+
+	filter-flags -UNDEBUG
+	emake
+}
+
+src_test() {
+	emake -j1 test
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dobin scripts/memcached-tool
+	use debug && dobin memcached-debug
+
+	dodoc AUTHORS ChangeLog NEWS README.md doc/{CONTRIBUTORS,*.txt}
+
+	newconfd "${FILESDIR}/memcached.confd" memcached
+	newinitd "${FILESDIR}/memcached.init2" memcached
+	systemd_dounit "${S}/scripts/memcached.service"
+}
+
+pkg_postinst() {
+	elog "With this version of Memcached Gentoo now supports multiple instances."
+	elog "To enable this you should create a symlink in /etc/init.d/ for each instance"
+	elog "to /etc/init.d/memcached and create the matching conf files in /etc/conf.d/"
+	elog "Please see Gentoo bug #122246 for more info"
+}
diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz
index 2af52fd9ac78..5940df6ce483 100644
--- a/net-p2p/Manifest.gz
+++ b/net-p2p/Manifest.gz
diff --git a/net-p2p/syncthing/Manifest b/net-p2p/syncthing/Manifest
index 453b5faa9907..7b639eb6d7e3 100644
--- a/net-p2p/syncthing/Manifest
+++ b/net-p2p/syncthing/Manifest
@@ -15,7 +15,7 @@ DIST syncthing-1.20.2-deps.tar.xz 96286888 BLAKE2B ddac0c324dc9fedfebb4e7b261dbe
 DIST syncthing-1.20.2.tar.gz 6303918 BLAKE2B 4a9786558584ee3d11d7dc278e99d98a57b727dd2b1e61a82357bc4f9be5d025b3e5b003ae0d44e033991c8fe91aa9668dd653a8dedd200e4d385a827c361918 SHA512 f4abf939ce4023df8bd619d8be393dedc657a9e62d99b3793af32ca88a4478ba6640ccecd6b4ae009a06656e74bca3e462bef717ad17a6e9fa6ac00ef77ea137
 DIST syncthing-1.20.3-deps.tar.xz 96198124 BLAKE2B 196bffdd1004a00545c046ac3f3f4a2db3f5c779c3e9d0f1fbe1417f8cd27f6b8969a7c4f8c515ad85abad9391b5dbf9b64a6acf949f17b982e6465658d296d2 SHA512 5f8b52af226c2e86be84bb5dfe06a1e76d21f90aaf84cd44d9724cb0c0f918bb80c88fe0fe2c70ff6942626659492ceb5b3d618efa65d401f63eeff8ab6052a0
 DIST syncthing-1.20.3.tar.gz 6304903 BLAKE2B 61534220a633c8cf9b99e60a43032834874bdf6f3cfd26c81b578148a22ac0d3443f112e5763e3fb916cfea6d7f55564bdfec967e8fa83f0c9502f1dbbe8689c SHA512 429fb13de8b34459794d7c9dff66abe0e6c12086a27af71d90934c2ac09f2a332a103eaa7149baa0b1920ddb676380ab2c0fbcc025d80d032dd7d8d67284328a
-EBUILD syncthing-1.19.2.ebuild 2714 BLAKE2B 0d628b77d361991277df40b6466f99b9a676b7eb41641f352a5cb0d7514aed4eeb544754b6800491af4cac585d7b1b7c590e154b14f302a9078bee594cba2e05 SHA512 e6796a6f3154bbdf647659c690020f72ee7bf382f65e547db7110ba58169724bac7585a4fea2175e6213d63e5c6a33b262794493c5d6d1b527caf7ea4460de69
-EBUILD syncthing-1.20.2.ebuild 2719 BLAKE2B 3ca938eddacc33343876319ab01791a8a651adc59d2811df4ed251fe103b513e45e8198566f2db0d226b1ed4ddceb1bd450d355d392eb465f85856046eb9500c SHA512 8cf4b943d176d88cb9059e03067dfd2c7330c5167583b6d6c375abf42045bf7ab9221bcebce1da9d701bd9396d21e498c8cdf1cd6109b4f0225cc97e1bd82cbc
-EBUILD syncthing-1.20.3.ebuild 2902 BLAKE2B 0a1e2f08da90723d279aa2efc4baf14d876b1997da4ca214e0eeb4b9fa1dcb831bfda756fc4f7105534b2123a1e7f555d668cc82495a3a285cd52ce00e75201e SHA512 c4d5258e7972ec814d0c2a556e0f50a350e940a1969403e8b2be0f56abf2e11951001d25aaf06da42fdac6dc79176bde5340e275cbb529ebd8118ac44d03b893
+EBUILD syncthing-1.19.2.ebuild 2755 BLAKE2B 430cf79be8dfc730971d324721a335056e778549f922281f3741a8538b97dd6365c623a8391823a0cbf37cbc01a67b1f227f00b6b6043ace14311e1d5854c195 SHA512 d29603e80f0472fe56aab18c485aef9d6cb2fcef4bff1abb93a2ea497b5b043c20a59a8a9207c7fce0c56fbcae91cd456b3bc128ec728ec75ef83779fd0eb70c
+EBUILD syncthing-1.20.2.ebuild 2760 BLAKE2B bb37206f06f423c7a2d15b1149aeb9e2da527d434f55c7ec84dfe28c62f54923b12ff5f253f665e99235d0cd0d09dc9650e75cf2647d0fc901d9489d24b84384 SHA512 ae83b051381041e5b476d6d02e9ca7fe412e8228f515138294e62f5ef44ba609f5aaf1f91d1ebda5a6c7d14c4120934ec57a65e0c9091178b7353d88314e1aaa
+EBUILD syncthing-1.20.3.ebuild 2943 BLAKE2B c183ce39e4d01e8881ef68df283f2ba420881c34f174ad5cd36570a95d03f24d8331ccee5e650f46d6ec69887910d62665e020a5538df6c898bf6dffdb7ad365 SHA512 2bc2c9cc25f7dbb622c0661bc196ca67313694b96570db141dfc075d75387415da7d3ea29ab5280d1ccd8b2c033ca4fa2f2852a60afcadfb6499b17852934fe8
 MISC metadata.xml 870 BLAKE2B 9d6abd4129ab6ab9ece49e3cb74b6537cf185c5e7e0d7cf893543ea6e75be83e534a8d3f4d042aeb778f9284c9ed7a6f2d60461593ae46f65901a42a3582acc2 SHA512 ef4f1fb81733a7c53f4deb239de1d01d4d2710cf92cb4abfb49659f64bfe5a080c3ab50ec9ec9bda531d0ca87f2f5b9ac80fe1beba1eaaccd1971b1759b3e93a
diff --git a/net-p2p/syncthing/syncthing-1.19.2.ebuild b/net-p2p/syncthing/syncthing-1.19.2.ebuild
index 469c501469b1..7425a1b095db 100644
--- a/net-p2p/syncthing/syncthing-1.19.2.ebuild
+++ b/net-p2p/syncthing/syncthing-1.19.2.ebuild
@@ -20,6 +20,8 @@ RDEPEND="acct-group/syncthing
 	tools? ( >=acct-user/stdiscosrv-1
 		>=acct-user/strelaysrv-1 )
 	selinux? ( sec-policy/selinux-syncthing )"
+# Bug #86348
+BDEPEND="<dev-lang/go-1.19"
 
 DOCS=( README.md AUTHORS CONTRIBUTING.md )
 
diff --git a/net-p2p/syncthing/syncthing-1.20.2.ebuild b/net-p2p/syncthing/syncthing-1.20.2.ebuild
index 602b88210caa..cf1dfef89e20 100644
--- a/net-p2p/syncthing/syncthing-1.20.2.ebuild
+++ b/net-p2p/syncthing/syncthing-1.20.2.ebuild
@@ -20,6 +20,8 @@ RDEPEND="acct-group/syncthing
 	tools? ( >=acct-user/stdiscosrv-1
 		>=acct-user/strelaysrv-1 )
 	selinux? ( sec-policy/selinux-syncthing )"
+# Bug #86348
+BDEPEND="<dev-lang/go-1.19"
 
 DOCS=( README.md AUTHORS CONTRIBUTING.md )
 
diff --git a/net-p2p/syncthing/syncthing-1.20.3.ebuild b/net-p2p/syncthing/syncthing-1.20.3.ebuild
index 4f3b90d5f252..687924d4f607 100644
--- a/net-p2p/syncthing/syncthing-1.20.3.ebuild
+++ b/net-p2p/syncthing/syncthing-1.20.3.ebuild
@@ -20,6 +20,8 @@ RDEPEND="acct-group/syncthing
 	tools? ( >=acct-user/stdiscosrv-1
 		>=acct-user/strelaysrv-1 )
 	selinux? ( sec-policy/selinux-syncthing )"
+# Bug #86348
+BDEPEND="<dev-lang/go-1.19"
 
 DOCS=( README.md AUTHORS CONTRIBUTING.md )
 
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index b008523c64d5..9edff23cf04e 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/man-db/Manifest b/sys-apps/man-db/Manifest
index 58b842c412fd..7cf9f14abf64 100644
--- a/sys-apps/man-db/Manifest
+++ b/sys-apps/man-db/Manifest
@@ -1,6 +1,6 @@
 AUX man-db-2.9.3-sandbox-env-tests.patch 315 BLAKE2B d6f4835e9e32f8afffe6ab1a70ee664192db05fbe74013724fcdbe112ead2d4288f90be032777a58ee41515c23d5561ab9cde495a92aa9f74ee353479ef884e3 SHA512 d8840d45c3b115f51bb9b3fc11ece2fecadfe284cd7db29cd012ed32faed990b12a9920cf11282358e5dd27df4bcf3c1a0316116ecae58917ef3c65efb1eb22b
 AUX man-db.cron-r1 252 BLAKE2B 1d48851bd11ddf65ee24cae65a8bdb43b2c0df515a790661680775598fae21ef0776f04736425d511d48e97873d44b36a04d6ff41a53fceda0d8254482a4b53a SHA512 c2c7c05bcf241bb066c3ef98e33fb8c3b06abf92c20709f97c1e1e048d47aa4cf5ea412231a490008b3f1d87b284e381e611bb3275e8413ad031dac113112054
 DIST man-db-2.10.2.tar.xz 1902840 BLAKE2B 8d1748503cdf66a613d7544a27b42df9436bdf4e07ccb130d2fa62343488d2c4ab791238c348236a253abddb564db9d1bb851249da9911737ff822d822819599 SHA512 5ad7a7b601aadf4d2d7cc068881fffe3d91dc85fcf4c17e66fbe6e2b04bb1c46f5ba5d4bc7f6ab3f39e00065be39061b101d3064c12b1e89f0fee61c088611bf
-EBUILD man-db-2.10.2-r1.ebuild 5098 BLAKE2B 3a09876a1109ec7bbf287d045961873cc59fce1c0cdbf4236a470f381e0f38b2b18fcfa73d56e8e495a945503f22678c195f94be947b8a7fbccae78eff87e701 SHA512 36ff78df7e2054ed9710fd09367b4cf0cf02ecb636ad3f8d48b1c42e37267c59ffb2ab39ded688d89ff400b368a71e50444600e2a04999d93a363235e85c1796
-EBUILD man-db-9999.ebuild 5099 BLAKE2B a2e368e7a251606c73b503f7ebca4731e48d95f57a2d932cce268e7019d332f7b21ee427270efb29abeba1ea0da744fda906676756738b6edfbb7536ef302576 SHA512 dcfdc38ac4afd98fb828038cda07cc5763a550d3bb819cc55f8ef668e40145ecfad31f3e8cad90b4940cf12e3209f20dcb8164fef37a340d296acbec1a1a8a1f
+EBUILD man-db-2.10.2-r1.ebuild 5128 BLAKE2B 532d907a06f95b28f8b6705fe58d9d62797ae5ac2633b25981cae36ed16678e44a7026c19d7449244b7fcbdc5187d08a898753af1c7c2c3d2e718ab4c450032b SHA512 a80d67860f7ebc8b029fb5b83adbbef32ab1714102351cee8c2605228e00caf87627dfc08e129d255c80f04a232e0b30eeaee196bb7da969c3cad1021153751d
+EBUILD man-db-9999.ebuild 5129 BLAKE2B 54f75508846c452ad4ce6707f3555be89a51783904d253bca4823a29252fffd9880d5eba1a5661e9e027aeb04df1643c6e97981b1d5dff077d4edb60dc06a7dc SHA512 b50ee75c71f661c81835058c07b5f786c58602a3b4fda31d20726bcbabd61082770747326c686b885d57a73c0d6bb7f13b8b200f1ad3f9f2a83c7801b499bb73
 MISC metadata.xml 430 BLAKE2B d4221530699e16ed249eb5bcc439753af22cb7f502cbb9508ddfa572b80bfc11b474b362384922f2395df532491bc85453c38281fc4331807a22796cc53eaf0c SHA512 d70aa91bc631163eac4b04e699a56c583ea41cde9092ae8858079b1d326a8cc60fd24a5ab5b6bb565168e7b5dd5a21722074e76ba9f9e4102d0a9d5e7852c541
diff --git a/sys-apps/man-db/man-db-2.10.2-r1.ebuild b/sys-apps/man-db/man-db-2.10.2-r1.ebuild
index 215bd2c7051d..6ffa81f959e6 100644
--- a/sys-apps/man-db/man-db-2.10.2-r1.ebuild
+++ b/sys-apps/man-db/man-db-2.10.2-r1.ebuild
@@ -131,9 +131,11 @@ src_configure() {
 	econf "${myeconfargs[@]}"
 
 	# Disable color output from groff so that the manpager can add it. bug #184604
-	sed -i \
-		-e '/^#DEFINE.*\<[nt]roff\>/{s:^#::;s:$: -c:}' \
-		src/man_db.conf || die
+	if use manpager; then
+		sed -i \
+			-e '/^#DEFINE.*\<[nt]roff\>/{s:^#::;s:$: -c:}' \
+			src/man_db.conf || die
+	fi
 
 	cat > 15man-db <<-EOF || die
 	SANDBOX_PREDICT="/var/cache/man"
diff --git a/sys-apps/man-db/man-db-9999.ebuild b/sys-apps/man-db/man-db-9999.ebuild
index ef05ecd8416f..cd2743aa2ef1 100644
--- a/sys-apps/man-db/man-db-9999.ebuild
+++ b/sys-apps/man-db/man-db-9999.ebuild
@@ -131,9 +131,11 @@ src_configure() {
 	econf "${myeconfargs[@]}"
 
 	# Disable color output from groff so that the manpager can add it. bug #184604
-	sed -i \
-		-e '/^#DEFINE.*\<[nt]roff\>/{s:^#::;s:$: -c:}' \
-		src/man_db.conf || die
+	if use manpager; then
+		sed -i \
+			-e '/^#DEFINE.*\<[nt]roff\>/{s:^#::;s:$: -c:}' \
+			src/man_db.conf || die
+	fi
 
 	cat > 15man-db <<-EOF || die
 	SANDBOX_PREDICT="/var/cache/man"
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index 8c64b8efcddd..da868b83f021 100644
--- a/sys-cluster/Manifest.gz
+++ b/sys-cluster/Manifest.gz
diff --git a/sys-cluster/cilium-cli/Manifest b/sys-cluster/cilium-cli/Manifest
new file mode 100644
index 000000000000..b2b9c4f7fa65
--- /dev/null
+++ b/sys-cluster/cilium-cli/Manifest
@@ -0,0 +1,3 @@
+DIST cilium-cli-0.12.1.tar.gz 20888710 BLAKE2B 70444c6aeab762f2107a6e38c28157913d623059e6e95819dcbf9de657e573ffe10bc11f6fac68a2fed589d44b53cd1ad31266002479a253fe6a43db010022b9 SHA512 337a62dce0f7947da46ec9b6162c5c9a6d81770f40ce88413e29be561eef9e91824552356646c357166b474f9fbb40c916eeae4061833d1d9b0dec821ec75c7c
+EBUILD cilium-cli-0.12.1.ebuild 426 BLAKE2B df5b6ee7e983d66b6241cd98d1fb340f7c95d3cf72030b83ed6b1e5fa52ff1dbc15c7fed9de15887482729fed4f5d59f0a5f5ed069349d9a81ac7f9abfe86675 SHA512 4e49e3404abb75bfaae47be0084d45f9ca9990a40ca63efd0953862c872f6a69aa0db9d956dc0193b825f07aea38c74c4760d77ce3296ef01ca57f9e39e30f75
+MISC metadata.xml 248 BLAKE2B e3169a566d2e7b49ba47bdf59b43c8ae49e63c9ecc75b97a103e0c74e0439607777ceea96ac4f60516cae80bb271cfb6911ce82ac777dbcac3edb0a8b8c081fd SHA512 8abb8d5dc3e3ba99c48747fec50fd6d84be3b0a4f0e6598918123afdb99709c220bf77748b81e9e3cd4412cebe59547786931ccae3c634c7db7404fcc5b855d0
diff --git a/sys-cluster/cilium-cli/cilium-cli-0.12.1.ebuild b/sys-cluster/cilium-cli/cilium-cli-0.12.1.ebuild
new file mode 100644
index 000000000000..98a573711555
--- /dev/null
+++ b/sys-cluster/cilium-cli/cilium-cli-0.12.1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module
+
+DESCRIPTION="Next generation command line interface for cilium"
+HOMEPAGE="https://cilium.io"
+SRC_URI="https://github.com/cilium/cilium-cli/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+src_compile() {
+	emake VERSION=v${PV}
+}
+
+src_install() {
+	dobin cilium
+}
diff --git a/sys-cluster/cilium-cli/metadata.xml b/sys-cluster/cilium-cli/metadata.xml
new file mode 100644
index 000000000000..986f23e712b2
--- /dev/null
+++ b/sys-cluster/cilium-cli/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+		<email>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/sys-cluster/hubble/Manifest b/sys-cluster/hubble/Manifest
new file mode 100644
index 000000000000..f8384d11a9f5
--- /dev/null
+++ b/sys-cluster/hubble/Manifest
@@ -0,0 +1,3 @@
+DIST hubble-0.10.0.tar.gz 6453598 BLAKE2B e3b91e4aa3fd7de6cc474a7f99e37cbde542ae66d3dc2e509cc9db36e3d0e127803fb84b972c017cafa598663f5d845832c246b4fc99420dade4f61e94ad4e2f SHA512 d8f6347954a7fc4ff2a707c7a21e699c562647c9d4eea238345db9c93fdf232cf52482c8f79046bdee1fff8d34839eaf4b80de6877b18d45cec77a8190ef7f58
+EBUILD hubble-0.10.0.ebuild 536 BLAKE2B 09403e2ae94c1499d5248314ad9edfae776a2cb3bcb462e1861501335792f3c13615b0b22d46e4fbba171a1c70989ad938c8d750fe5be0393f6dd4b4ea5a804a SHA512 65e03696502b32de986a665817f2c5c40599bb189305f2fdbda35ede2aa77bd0299ce2626b4759c8c2cc0292d1bb988d1e57ae31e156d25284694770cfdf9eac
+MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
diff --git a/sys-cluster/hubble/hubble-0.10.0.ebuild b/sys-cluster/hubble/hubble-0.10.0.ebuild
new file mode 100644
index 000000000000..c9c9ba326b12
--- /dev/null
+++ b/sys-cluster/hubble/hubble-0.10.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module
+# make sure this gets updated on every bump
+GIT_HASH=daec1c89
+
+DESCRIPTION="Network, Service & Security Observability for Kubernetes using eBPF"
+HOMEPAGE="https://cilium.io"
+SRC_URI="https://github.com/cilium/hubble/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+src_compile() {
+	emake GIT_HASH=${GIT_HASH}
+}
+
+src_test() {
+	emake test
+}
+
+src_install() {
+	dobin hubble
+}
diff --git a/sys-cluster/hubble/metadata.xml b/sys-cluster/hubble/metadata.xml
new file mode 100644
index 000000000000..db463f3eeb66
--- /dev/null
+++ b/sys-cluster/hubble/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 57112595dafc..82245ac4180f 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/btrfs-progs/Manifest b/sys-fs/btrfs-progs/Manifest
index 10c44087f501..a6fd2a84f133 100644
--- a/sys-fs/btrfs-progs/Manifest
+++ b/sys-fs/btrfs-progs/Manifest
@@ -1,3 +1,4 @@
+AUX btrfs-progs-5.18.1-glibc-2.36.patch 984 BLAKE2B d7aefe6434a4719d1b98ce1842e340f8eb322b95adb4037cac10a7824fa94ad7c8a86e01967d99e1e9ede9cda4f6e55b53c440e9d37b94018e31388b7214c5d4 SHA512 cad4314966c634f44252173ff23f09822d2448ac9346d1e9d5c0a193ada1606ed6c7515a3283b2560d68ffb7a004c4c25549f1cd5c87330a1aa49e1a3d722719
 DIST btrfs-progs-v5.10.1.tar.xz 2204164 BLAKE2B ed83729754f9abd22d4d2e7ae9a7e90e80be9b63d49a4a9692e20e5939467dbd864834b71495661e1c7a1fca89e253a62fbda37f1d01d2eadecb13f5904f0dd0 SHA512 32e5b8bda1863e34613802db91946f240b2cde21288ff8f95c1807e7afd0a67c5a704aa4d2bc0d7b1ca094de6831adbfec83fe61f74e1caf6d1975be7d972f2d
 DIST btrfs-progs-v5.15.1.tar.xz 2280796 BLAKE2B b460254a6261d3d04a2d265a3b4e05a89385888f7ea4f2b16ec5b73922646c7f47a546fc78ba7c009e65914125435cf38157eabffc74f5d00df2c21c844922e3 SHA512 68ed89e337ae857fdaf077eaa889e259e9f162ea2222bdaa03f4187783a8682c24d45c91b0559b901d81429ba2cd3f84087d032d354092d5512fb226bdf91549
 DIST btrfs-progs-v5.16.2.tar.xz 2334464 BLAKE2B a21809a840107c370f1598e19f8b07d8bdd704e8ff3ce4cb78431000e7560802e1047d8200c523a45a761d59a311f1ec384946bd585826a129b05a1a5fd0250e SHA512 c89a763e8b099e0e9d04ff239dfee156a15fc783c515bbd48597f5645f720c377dbb4f2dfe9065971a65d3ade9d8fcb24cf37d527811bf4204153a06f7c8c3a7
@@ -7,6 +8,6 @@ EBUILD btrfs-progs-5.10.1-r1.ebuild 3052 BLAKE2B 11e654a2bf6fa0256e844c6bde5b3b0
 EBUILD btrfs-progs-5.15.1.ebuild 3090 BLAKE2B 206bd5d48607139125e423fa8d7d88dd961c87f2ecc8b1fde2cea01c683b9000d8e9b1bd41bc1ae96870edef1bd55cf45411136b652f5b63895d84a4f5768b22 SHA512 438c8d7bc27ea19dcc6698d5b6cab82742b11c9918506ed79d40c0c3553a2725aa29c74a00bf520d17295e6d81eb66877a0795382b831291679232ba31c78f78
 EBUILD btrfs-progs-5.16.2.ebuild 3145 BLAKE2B 6c3553cc850c61c0661712c648013c78e46e9151ba825f194e35566334dff5a18a1e0270e17a938fef669abf750fb01db7972c7dcdf7e12636d3a7d615279a45 SHA512 d5bca8a96f59eea41c9cf8ee1060f7a3a0b4ca30aae4fb399eb09e5f9ac05bb0710b37c6501c59733fe2a9afaaf73a0c16b6f82d6b3d9e7b316425901aea3ec6
 EBUILD btrfs-progs-5.17.ebuild 3114 BLAKE2B acecdd2560d5fd72f013e3604a23818608bf2cd87613f8fa4f282be2c6dfaaa5e0e3f7a8617610f11ff9a08dd9dce0fbf97b6c0941c6cf3ad476c4c37246fcaa SHA512 5ae0124a9f8ae4c448fa058c003be65225dc0281a50178bc1fb5cda5feccb684d85e10a86577b62c40341f07da13f06d72386eb876a14a7efce5277439d44818
-EBUILD btrfs-progs-5.18.1-r1.ebuild 3316 BLAKE2B 47162d7502cdcc51a5238d4138b5b84332054e73bb9ea60aa606a8a4019ad334d4e8760c6e639a942224f9c77fb2d311480b3d55a0e9eb940a6c4a1276b2a5fd SHA512 2a5a9821b0030515c1d16a621066457d242898e20077720186933747e7328c10aacaad1aee65254309d57929948b3ffd238f857b980d656c8a963563cff1a8ce
+EBUILD btrfs-progs-5.18.1-r1.ebuild 3388 BLAKE2B 9abed0b3cf61e0ea8ce61270e53751fd6cefbe2907bd498543237e8653e52f9fc4bee773139c136a14a6b99cda5e46af903169eb547a8637050981281fe74a9d SHA512 8cca2d5536600c1193594fe15447051fc2d8b653bba077c7e0e3b63f08c53ed689f3ecc8fd465020fa5bc13e36e38deab48cdf5b61e47a50818d1a8c62d66664
 EBUILD btrfs-progs-9999.ebuild 3316 BLAKE2B 47162d7502cdcc51a5238d4138b5b84332054e73bb9ea60aa606a8a4019ad334d4e8760c6e639a942224f9c77fb2d311480b3d55a0e9eb940a6c4a1276b2a5fd SHA512 2a5a9821b0030515c1d16a621066457d242898e20077720186933747e7328c10aacaad1aee65254309d57929948b3ffd238f857b980d656c8a963563cff1a8ce
 MISC metadata.xml 524 BLAKE2B 4e27833128aeb064271af7a4f3c05699b4603b1d993b32bef3d9d973182d3d0c88ac799c95f0f35495e9a99e645627afd96049273c08c3e1334d8fe1ccf0debe SHA512 471014a98bc3feb75e7930485e89daf6cb3390c37a330b8373d5c3b0b764b9180cbff133839ce4742a3c76f63e6f18895060d5906e6a113d2cd43af0df3b0d5a
diff --git a/sys-fs/btrfs-progs/btrfs-progs-5.18.1-r1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-5.18.1-r1.ebuild
index 76f2afe1fe01..0ba3477e685f 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-5.18.1-r1.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-5.18.1-r1.ebuild
@@ -87,6 +87,9 @@ pkg_setup() {
 }
 
 src_prepare() {
+	local PATCHES=(
+		"${FILESDIR}/btrfs-progs-5.18.1-glibc-2.36.patch"
+	)
 	default
 	if [[ ${PV} == 9999 ]]; then
 		AT_M4DIR="m4" eautoreconf
diff --git a/sys-fs/btrfs-progs/files/btrfs-progs-5.18.1-glibc-2.36.patch b/sys-fs/btrfs-progs/files/btrfs-progs-5.18.1-glibc-2.36.patch
new file mode 100644
index 000000000000..52671ea6c357
--- /dev/null
+++ b/sys-fs/btrfs-progs/files/btrfs-progs-5.18.1-glibc-2.36.patch
@@ -0,0 +1,31 @@
+https://github.com/kdave/btrfs-progs/commit/46eb32a019834b0a49ae9744db1a921aaa6a3d63
+
+From 46eb32a019834b0a49ae9744db1a921aaa6a3d63 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Mon, 25 Jul 2022 11:58:35 -0700
+Subject: [PATCH] btrfs-progs: use linux mount.h instead of sys/mount.h
+
+This file includes linux/fs.h which includes linux/mount.h and with
+glibc 2.36 linux/mount.h and glibc mount.h are not compatible [1]
+therefore try to avoid including both headers
+
+[1] https://sourceware.org/glibc/wiki/Release/2.36
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+Signed-off-by: David Sterba <dsterba@suse.com>
+---
+ common/device-utils.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/common/device-utils.c b/common/device-utils.c
+index 617b67462..25a4fb8c4 100644
+--- a/common/device-utils.c
++++ b/common/device-utils.c
+@@ -15,7 +15,6 @@
+  */
+ 
+ #include <sys/ioctl.h>
+-#include <sys/mount.h>
+ #include <sys/statfs.h>
+ #include <sys/types.h>
+ #include <stdio.h>
diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index 627e319a44b2..e99c210b27d4 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
diff --git a/www-apps/tt-rss/Manifest b/www-apps/tt-rss/Manifest
index c59fcaa3b3b1..a8d614ff39a7 100644
--- a/www-apps/tt-rss/Manifest
+++ b/www-apps/tt-rss/Manifest
@@ -8,5 +8,5 @@ AUX ttrssd.initd-r4 2863 BLAKE2B 28a0b410b8425bcf4c9abc5197ff777b06347c1cdefa021
 AUX ttrssd.logrotated-r1 135 BLAKE2B dc653add518cd3ed5296097d51ca2346e102edcbad5ec82397713ded489e8ed8e49af928331e58b80152f13bddc37d673c67440df388651c875cfbd37ff62080 SHA512 c292020a55688c6edb4306d9d8144ad7d30be94fda08467b8bbe560c7bf02b0877d9591123a226dd030e9a9c01b79df4a3696e54fd1ece0dbdef1c285cdae97a
 DIST tt-rss-20220218.tar.gz 9916433 BLAKE2B 318969b6e5156842079bf68c4ea614e5e60e21d8caa46b1a78f2cef051904da30e5091838f6e10f6f610d8ee39c7922137aeb60b7cd5004cabc1d2cdf65edfa8 SHA512 38a81dd737462724bc52ca3915350c175abe548cd566a4f9a5e1d5efda9287d0666e9348e5b13dd20549360501de5b0bfb659292fb650f7a60fdab8b63cf8202
 EBUILD tt-rss-20220218.ebuild 1927 BLAKE2B f533ff2137699ee6696856cbaadbb0773eea148f45c13e8c7736d2212078171c8629f17c53e0701ddc6b27d69328a7e634854a9e6b8e5c9097be6bd0bf9b2481 SHA512 9edac5cb8ffc212c74f35aa0f16289dafd4c88ba3de7bcb75113c5f8e5e4fae1603de3c087cf3cba3bc8599dd7797ae3838403f76ce851e453b05a47fdb1a803
-EBUILD tt-rss-99999999.ebuild 2095 BLAKE2B 48eba6ada7e044849ab98970716aa3811d663df9f2c4d19b183e5ca08c763f4db83ed6585c8b7412848f227e2f93c6ed6fb2ccf64da03694cda49bca54ca0d19 SHA512 3e4397360072b66119aa09fa1f8f6762cdac3a29409b89c16a086dbc1dbc9c1490c80b862e112995e2f8cf1975fa2ad05fd40d17404f26bc84d7a421ff9d5e98
+EBUILD tt-rss-99999999.ebuild 2091 BLAKE2B 961a4846f45e7220b70fa597cd6f27dd893b292409d65f4c490f326f4f3a0935261ef22bfa616aea50d90479ac56d47cf6c4608a306a657e1b02ab2185ca5e5a SHA512 09c44e3e2e0aaefa6fbf037ca6d6e55c050d9010fdaad1b6732ee9431ed921d4b975bcb5c5227830bc41a1de03ceefd13b8b57d2f9e48c38ac87179cb679b282
 MISC metadata.xml 374 BLAKE2B 659dd027265141ba90d4bf8abe45e12ed5187c866605f939f26fd4b55911870c8cca907c96f4bae2f84cb43c1691a6eb79eabe671e4b3de0c34d9befb6ed4c46 SHA512 ab38e1e98bb90c292576830d65ad6871dc6feab2a93d7cc9a580f1333e6c7859cb215ef44952b3e9018b431ca0c4c7f61fd0ee6d2daa86bde971ab2e113ba0bc
diff --git a/www-apps/tt-rss/tt-rss-99999999.ebuild b/www-apps/tt-rss/tt-rss-99999999.ebuild
index 89e1ba0ce816..7e27f7a80c80 100644
--- a/www-apps/tt-rss/tt-rss-99999999.ebuild
+++ b/www-apps/tt-rss/tt-rss-99999999.ebuild
@@ -13,7 +13,7 @@ SLOT="${PV}" # Single live slot.
 IUSE="+acl daemon gd +mysqli postgres"
 REQUIRED_USE="|| ( mysqli postgres )"
 
-PHP_SLOTS="8.0 7.4 7.3"
+PHP_SLOTS="8.0 7.4"
 PHP_USE="gd?,mysqli?,postgres?,curl,fileinfo,intl,json(+),pdo,unicode,xml"
 
 php_rdepend() {