gentoo auto-resync : 10:07:2022 - 13:27:24

268 files changed, 1670 insertions, 2183 deletions

diff --git a/Manifest b/Manifest
index 6ef663ceeb15..b55d19f505b1 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29588 BLAKE2B 90b23d84985aed9446fb1021381e7c4c5ccfd5b00656aacf6411e593c0c7cd666584abdb5298f407c9c2df77b3f7c113a66ad2d4eddd0c27334bdd6f2e09b695 SHA512 3d5da3e6a0c131feca1db967c3c87d7d4bce6f6dc99701caade05a34db488ddf5f14d364130728080c238eeb8f7709b256b70c9c0ea07dfb1d3ebd8f24e6154e
-TIMESTAMP 2022-07-10T05:39:48Z
+MANIFEST Manifest.files.gz 29575 BLAKE2B a3743826336b433aa624b52d4a560806a073ae4f003b6c44aa072c1a9d31124bad1aefe7450ab46a05fb8e44a9c14a1e1ce5f9e0619692c220ecedd6c8baba7a SHA512 2f231477dfecbcaee5ba884163ec5c2d7f5c839ec8c4f7c5345300d451dc462fdb81275ecb74d1b97e18fd6f880db10f6773665858372052db04dc8432852fdb
+TIMESTAMP 2022-07-10T11:39:49Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLKZiRfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLKuoVfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDcLxAAi8/W2fJjn3uYTTHQZ4nXGQOhPYj5XtLXSBZ+AojLkez3HHmLKY7CuUj0
-Cywd+Aa8SjgrhXhJwvt8tZP/MvXP9Y5Ms/XZSo7fCKmd3/iKtvaLobrAo40WXOSx
-Uv9FIsPKtm2xY2uT1apgqNL8kJDRmdbdBLllPxBEn5GbtJ/FT7RJTFqNHu+9Jppm
-fIGyo0NgaEppa90hVg+qLa/mo7EZ8i3Kcwv5Ryzt/E6A8p1GIFb6/KrTXlEy6tmt
-KF8HP0BRgOGkNZnK68O9ctZU2juKkZsxdISTVsp0OIRf2Hz5X/7cBJ9cMtMGEvx+
-1Z3psnqhNb+p4VTTC6RKj113I62UEM9Y8F9W0vSDcKJxuLCU+2xvZTnBqiAEA0WW
-Edsgs2Y6BD6RCpzZ0GMqAtsXnThpxD0ovJlWhXuH80+/QNvsFrL9ITKCKZril9I2
-ucii962De4DBD5nxjKfuY10HXc1pqo9/YUTEbtvbQ8oKqJlz5T3pcI8OZsuXzVRX
-wgeNOzil2GHIYiL4R3C5c8BpRXsuv+7Z1EvvGqpRgNalDtto9qpKCJrKHzBErQyp
-LHSYozRD03m+g4v0vrrVzpuCS5ORP5a84Q9sN2C2L92nSDnJkaR9+zeEn/hlAyU2
-Tk/M7WtM/kdHYTf+4RCnvWmnQHZL2Ana89ZtbOlzvvAlKSw9Lu4=
-=bXhH
+klB53g/+MLhx/ZBKEU+FO4cOgli1lF3Wf0ie6bps9xlP6Rqg4vufbQmc9fqVoLxg
+vpcfYr0h977cOo05oOoxMgyq9k4Dz554yqM9MYqFHlqOmgKFH0ru05k5rfr6LSZ2
+7tMGCZBPg6ywbDjaOMmJniP6iwki7OkdGCbumNhJ0l+5NIC2rU7D6i7ahgFgdmmR
+2rS7V8vyUQgLZKDoldBpCjSNUoX+V1TQn/npdcMYcmeaK1C8aMv/MHhDWuto/fbc
+/ZSGZrO6cJ0Ej7OlxlOUjoXkhk5ZP2gDgTNhiAN5YhUP4reXm+LTQfHaZSvq55WE
+X0etPMwQIIUUXJQTupjIXMFQfAW16l6RAXCHky8kAzlhuVN/ouxvTnJj3O2rNA6F
+cusZslETgd/2VT4LZ31N/8gAiODjOW9LO8GYsPb3I/cPM3ECmHfagFhx+X1SP9C1
+/xQOHxEsUZbl4T6BzxsAJxNxlDcHxQltEjooc4uibiqJNNTUjQ1IBzt0TW/sl+X4
+cRG0/cs0WO2JE8/K79gCFe3Lyxtzb0pdgC3IIy7p4U1k/aL5GCYHMbgvbIBLl5z7
+lAuYAljO2hV0A8u1RO9Tt9wlva1W/yAWCw9n+YwdK/RagbRGoI6JDO5rEeA0xGTO
+84LtegdAVLEKVY9BHgB20Vb/qXbLgkYIaC2/lTyjjed439VMt7Q=
+=U/Ed
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index ba12675d7a61..4e4afb4468fd 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index ba2c087c19b0..ed0aa6ab3c19 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index b381bd0587f9..f3dda3d5494a 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -1,19 +1,7 @@
-DIST aws-cli-1.25.12.gh.tar.gz 2224456 BLAKE2B d6425983b09fc3942727108e188e184f48399388704ada03df1d65ddb9adffc9597a217b863766a862e96b59c03fdb3202e694289b54ee9298fe7e547639ecc3 SHA512 a77e0d082a8dacecadbd2fa6cc1143fa5148e075894565fe9a552e9d1a27fd068c72ae57eb5c628129bb024267111b76722cf2c40dc9f719db8d96232302b918
 DIST aws-cli-1.25.17.gh.tar.gz 2226115 BLAKE2B d07a9c7a8e13019fd728489d27465497ba31f53087ef09e5f816792267bcb58158fa0a7f71fc499d3e343b5b3a0da45cc3632f8c69345b8cd93ebc735f645672 SHA512 1a7f90e28d6702f9e73fe3a93e0d91e2c4ea3d93574f21a3ecde1148445fe6b5f98f217e2e61a1cbba50a07590f0ab0abd00390fb04cbb3db74dfff698224997
-DIST aws-cli-1.25.20.gh.tar.gz 2227422 BLAKE2B 7dfeb6266578fc61a4fa54f39bbaaabcc8c53fc133f1993669a3cda0398fa67a6e54f122b6a103474a0b6a31c7a259237cf4a759995eab727d8f103a8649163a SHA512 0179487b9dbc9864eeb066e9f4f30c67b17dec589c5860b476cbc7798d1b163080d7d3caeae18367afdd89d299f508bfbbb2150d4795aaa85efdeb5b61030663
-DIST aws-cli-1.25.21.gh.tar.gz 2228274 BLAKE2B 3246bcc1607fa7a43cb081192176345c189b8e19c197e22f27396d3dd72f7e55436820010f9245375ddbf4cfc24f13d2fc47864ad34a5dca1529669e91b6bff1 SHA512 26a97d632206016cfba2a8a51949ad623677a04a6582d1f7f28191c02adb39bf8f4b42e22796c3c97c29ae2dc36007803fc25f442111a67f93f3cc8880e50759
 DIST aws-cli-1.25.22.gh.tar.gz 2228459 BLAKE2B e9ca58f6be9d5836b2b4d8ce51154ecd9dca3e443a120ff6ab3475b0777ca5e50c17a3c30641c57df1df63cc065fc0316b1e847b695bdfbe49a0a5b330912a74 SHA512 328303792a75c9f44c7e37e825ffb81aa2a071d4ae18b21c31f2c9abc5e0ae8f3ec079725847cd731d4cc49b5064a0244129176789f4ce0865e6d8cae0dda1e8
-DIST aws-cli-1.25.23.gh.tar.gz 2229364 BLAKE2B 1610ceba16cc6555b333d1f2869f4c8667a7aecfb28ac21f46ebd1ca9a3f26da78d1f84816a7ec6c279273c5d17ab97e1963a73499c5a648571da0386f715b88 SHA512 8cc030c386b9a3d58ea2ff41d9a8da30f126707db1b9e8397ee676f3f9f4d0c8f74aa840307ba6664508d47e2f73d7fb3fe5090b7d117aab8d8b47b1b3a191eb
-DIST aws-cli-1.25.24.gh.tar.gz 2229473 BLAKE2B 2937ca1016052732ff382b70c5a479250a139a9c556f1cf40a2903dac35f8fbe89575b1cd3bf787c23a0cb70ebe87fd7cf3952ce9eef08347c439e30a0efd3dd SHA512 7a0c7b3ac9cc9cedefe72ce9d7004afa5cf4b5cb25826153452fd83fdef89970d286e63c1e47f699b9d8bbe2cd39f7079a2154cd3d1064ecbd6d8b6ab244c9a2
-DIST aws-cli-1.25.25.gh.tar.gz 2230412 BLAKE2B 3dc6ab33083e0ff276c2f053675af7ad56287864d6112e8ff03270807bd68d8959753a20fb8b9569dce10c20cc1c6bfd4730b95139f95b911f30992eb38caedc SHA512 fb90e9132e8911acbc984154f739b9bdba77a805b0de0419ff500634af9428e88ff6220d2fc09b301f6af510559bfbec88ec6ec4c56e81e049145f9b43da6cfd
 DIST aws-cli-1.25.26.gh.tar.gz 2230449 BLAKE2B bb792fb2e4ba25870168e4fc3301d4b92d93d831301b0a46ec7dab1ac4b1bdeda9d43f9f6cf20de153f9df3d6b66b0d9ed9754ee4c27b79aacf9d9b8d7e11c2f SHA512 56f9d02d54d20624944c8749860d3e92e7c0887b1c6f524545394ad590ad5ab63752abf25ecba400cfcb9273bdecbae110e4811804e287f15bdfde0d8638adff
-EBUILD awscli-1.25.12-r1.ebuild 1834 BLAKE2B 8dd7abd62571c499386dcc73967b693b028c094797cb10c43b7719b7ad2af01e683c056e9888e6ab6119204362dd2e61b6a465d3d115045130075d54c16295aa SHA512 84785cb46646fc3c97a504a712db51fc68d92739732fe696c1d5e198b99fc5665776629400cb99cb17fcebc47f6a426cc3678c827ebf28912854b8f9b5960906
-EBUILD awscli-1.25.17-r1.ebuild 1836 BLAKE2B dae7d5415e625d711cf8b71492dfe80e2ffe77da7c538f4a7b04e2777c942973ad985fdb2f65a96511ce7486c3a4e78daed6110194672b19651191f7db2f484a SHA512 8454d269cfbca202e068c39704fdf48b9e21985e6ee1e825399620585707d315c867ef26f9726c2d8b8f55054980bd5f8e88ffaa0ed8cf45a4eedb5c410325d2
-EBUILD awscli-1.25.20.ebuild 1836 BLAKE2B dae7d5415e625d711cf8b71492dfe80e2ffe77da7c538f4a7b04e2777c942973ad985fdb2f65a96511ce7486c3a4e78daed6110194672b19651191f7db2f484a SHA512 8454d269cfbca202e068c39704fdf48b9e21985e6ee1e825399620585707d315c867ef26f9726c2d8b8f55054980bd5f8e88ffaa0ed8cf45a4eedb5c410325d2
-EBUILD awscli-1.25.21.ebuild 1836 BLAKE2B dae7d5415e625d711cf8b71492dfe80e2ffe77da7c538f4a7b04e2777c942973ad985fdb2f65a96511ce7486c3a4e78daed6110194672b19651191f7db2f484a SHA512 8454d269cfbca202e068c39704fdf48b9e21985e6ee1e825399620585707d315c867ef26f9726c2d8b8f55054980bd5f8e88ffaa0ed8cf45a4eedb5c410325d2
+EBUILD awscli-1.25.17-r1.ebuild 1834 BLAKE2B 8dd7abd62571c499386dcc73967b693b028c094797cb10c43b7719b7ad2af01e683c056e9888e6ab6119204362dd2e61b6a465d3d115045130075d54c16295aa SHA512 84785cb46646fc3c97a504a712db51fc68d92739732fe696c1d5e198b99fc5665776629400cb99cb17fcebc47f6a426cc3678c827ebf28912854b8f9b5960906
 EBUILD awscli-1.25.22.ebuild 1836 BLAKE2B dae7d5415e625d711cf8b71492dfe80e2ffe77da7c538f4a7b04e2777c942973ad985fdb2f65a96511ce7486c3a4e78daed6110194672b19651191f7db2f484a SHA512 8454d269cfbca202e068c39704fdf48b9e21985e6ee1e825399620585707d315c867ef26f9726c2d8b8f55054980bd5f8e88ffaa0ed8cf45a4eedb5c410325d2
-EBUILD awscli-1.25.23.ebuild 1836 BLAKE2B dae7d5415e625d711cf8b71492dfe80e2ffe77da7c538f4a7b04e2777c942973ad985fdb2f65a96511ce7486c3a4e78daed6110194672b19651191f7db2f484a SHA512 8454d269cfbca202e068c39704fdf48b9e21985e6ee1e825399620585707d315c867ef26f9726c2d8b8f55054980bd5f8e88ffaa0ed8cf45a4eedb5c410325d2
-EBUILD awscli-1.25.24.ebuild 1836 BLAKE2B dae7d5415e625d711cf8b71492dfe80e2ffe77da7c538f4a7b04e2777c942973ad985fdb2f65a96511ce7486c3a4e78daed6110194672b19651191f7db2f484a SHA512 8454d269cfbca202e068c39704fdf48b9e21985e6ee1e825399620585707d315c867ef26f9726c2d8b8f55054980bd5f8e88ffaa0ed8cf45a4eedb5c410325d2
-EBUILD awscli-1.25.25.ebuild 1836 BLAKE2B dae7d5415e625d711cf8b71492dfe80e2ffe77da7c538f4a7b04e2777c942973ad985fdb2f65a96511ce7486c3a4e78daed6110194672b19651191f7db2f484a SHA512 8454d269cfbca202e068c39704fdf48b9e21985e6ee1e825399620585707d315c867ef26f9726c2d8b8f55054980bd5f8e88ffaa0ed8cf45a4eedb5c410325d2
 EBUILD awscli-1.25.26.ebuild 1836 BLAKE2B dae7d5415e625d711cf8b71492dfe80e2ffe77da7c538f4a7b04e2777c942973ad985fdb2f65a96511ce7486c3a4e78daed6110194672b19651191f7db2f484a SHA512 8454d269cfbca202e068c39704fdf48b9e21985e6ee1e825399620585707d315c867ef26f9726c2d8b8f55054980bd5f8e88ffaa0ed8cf45a4eedb5c410325d2
 MISC metadata.xml 334 BLAKE2B 84c9f50e6c0d015aad36a7f625cddf90cf1137a8c2d445cc641cd4890d64261187c10fde59ee1a6c19b98cfdb6ff534c66ae7a7a48a00ec62d6984c9a1891750 SHA512 a845de531df2cd75abf23cdbfa613e586855b95ac4e96566ef193708d7ecf2ec7f7db72fd31b8af0ac4ccd57e51da9c6d129d426bfdc6c4feb57d7df8647f160
diff --git a/app-admin/awscli/awscli-1.25.12-r1.ebuild b/app-admin/awscli/awscli-1.25.12-r1.ebuild
deleted file mode 100644
index f241876330bb..000000000000
--- a/app-admin/awscli/awscli-1.25.12-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..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/awscli/awscli-1.25.17-r1.ebuild b/app-admin/awscli/awscli-1.25.17-r1.ebuild
index 9f176fa05cc8..f241876330bb 100644
--- a/app-admin/awscli/awscli-1.25.17-r1.ebuild
+++ b/app-admin/awscli/awscli-1.25.17-r1.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 # botocore is x.(y+2).z
 BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)"
diff --git a/app-admin/awscli/awscli-1.25.20.ebuild b/app-admin/awscli/awscli-1.25.20.ebuild
deleted file mode 100644
index 9f176fa05cc8..000000000000
--- a/app-admin/awscli/awscli-1.25.20.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..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/awscli/awscli-1.25.21.ebuild b/app-admin/awscli/awscli-1.25.21.ebuild
deleted file mode 100644
index 9f176fa05cc8..000000000000
--- a/app-admin/awscli/awscli-1.25.21.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..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/awscli/awscli-1.25.23.ebuild b/app-admin/awscli/awscli-1.25.23.ebuild
deleted file mode 100644
index 9f176fa05cc8..000000000000
--- a/app-admin/awscli/awscli-1.25.23.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..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/awscli/awscli-1.25.24.ebuild b/app-admin/awscli/awscli-1.25.24.ebuild
deleted file mode 100644
index 9f176fa05cc8..000000000000
--- a/app-admin/awscli/awscli-1.25.24.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..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/awscli/awscli-1.25.25.ebuild b/app-admin/awscli/awscli-1.25.25.ebuild
deleted file mode 100644
index 9f176fa05cc8..000000000000
--- a/app-admin/awscli/awscli-1.25.25.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..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/needrestart/Manifest b/app-admin/needrestart/Manifest
index 7ee02579849a..5767fb0abe2a 100644
--- a/app-admin/needrestart/Manifest
+++ b/app-admin/needrestart/Manifest
@@ -1,7 +1,5 @@
-DIST needrestart-3.3.tar.gz 59814 BLAKE2B bfba00dee7c0f225efcaaa80b301eb38d0ea82645f253c8bef9294102f9f4183433ed1b6efe71a9dc34c65f76364ff3fc2344e840b34f97361f3ddcd0dc9ab4b SHA512 ea2f3cbe228a6b879905bd3b3de8b5e0bb2362e8d3cd566817d2e7d519d54207ff5923eb8e49cbd8ffe8ed50729f4da04bf4d55268e806f49157860584058d50
 DIST needrestart-3.5.tar.gz 67824 BLAKE2B 73af940efa578b145d89cb0724f7103edd0fe869bfb211596109b67fd16a8ddce83060942687c3ca0e861d9d545022845b64d90bc44e39997e8943b1575dd5f1 SHA512 e082ab92497cce7b65da9c625ba0bc2332cc7863c5b7d99a04593c646256da0302519fb7c9fc9823ce0058affdf7eb6a4587a1874881eda8aa4d07032093eb0b
 DIST needrestart-3.6.tar.gz 71159 BLAKE2B 76994ef0e77a4db0532dca2e17990097b2314f912fc3c32e67643eca7c44fff9611a42b49abd55f959a0e959d6ea69cfef36ad9008c86debfd125b64bdc673b5 SHA512 5c0f2f427c93e6f621fc1727f6abf42651e184e168b3f720708ac73b425bc7dfb94622c6cc2afad1161e3ffbfd36500eb99c375f2f5a525c9cd10d7142f1e365
-EBUILD needrestart-3.3.ebuild 837 BLAKE2B 96162645388eff943edf52e9af487eecb8123e1ccf101dd9e4ae3564ee4f8ceca7d673f7a26679171d12c69f66e39ebb4536753c32acc4f5d0bc5ee179e75c0a SHA512 9e900a39d78fe2fba7d182ed0698259eca04df70b00d8eb5d6a28ef3af0b3da9c51f39a93cbc2b4b4d82638582b04dbef33a26c553ee8bbe7db9381b2cd956d3
 EBUILD needrestart-3.5.ebuild 913 BLAKE2B b7526899199daa72bb6d0c5d323dffc48bae329d6469f64c20e2a427b54508c03eed410d366aa0b78e666ff8a39095d48869e59a9e573927d564c5eb20c42f1b SHA512 6cd43d37250a15db77e143ee371f69a23b0aac8f2c8828f27cbb3b270cff20717262dd3cd0fc84f32c1d09d076efd6635b1a4e2e13f9ce23753575db821cfdd6
 EBUILD needrestart-3.6.ebuild 915 BLAKE2B 82577740e01939ca0e0104f3c2be796ae6bdc1e74e0d197057f6672ba9242785e4145ea578c6f236b00f7ab59e61364cbb874837eaa2c99c5c72fbc7752afb7a SHA512 983cfb758f1994a85a68c8a5a45b32218862ede337e7e3443c19133645efa0b691a078a54cc65787acc0608be2a99adfef745aa5f68d6d87f43ffd26a3545d79
 EBUILD needrestart-9999.ebuild 915 BLAKE2B 82577740e01939ca0e0104f3c2be796ae6bdc1e74e0d197057f6672ba9242785e4145ea578c6f236b00f7ab59e61364cbb874837eaa2c99c5c72fbc7752afb7a SHA512 983cfb758f1994a85a68c8a5a45b32218862ede337e7e3443c19133645efa0b691a078a54cc65787acc0608be2a99adfef745aa5f68d6d87f43ffd26a3545d79
diff --git a/app-admin/needrestart/needrestart-3.3.ebuild b/app-admin/needrestart/needrestart-3.3.ebuild
deleted file mode 100644
index 576521c08c4f..000000000000
--- a/app-admin/needrestart/needrestart-3.3.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/liske/${PN}.git"
-	inherit git-r3
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/liske/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 x86"
-fi
-
-DESCRIPTION="Restart daemons after library updates"
-HOMEPAGE="https://fiasko-nw.net/~thomas/tag/needrestart.html https://github.com/liske/needrestart"
-
-SLOT="0"
-LICENSE="GPL-2+"
-
-RDEPEND="
-	>=sys-apps/sed-4.2.2
-	dev-lang/perl:=
-	dev-perl/libintl-perl
-	dev-perl/Module-Find
-	dev-perl/Module-ScanDeps
-	dev-perl/Proc-ProcessTable
-	dev-perl/Sort-Naturally
-	dev-perl/TermReadKey
-	sys-apps/init-system-helpers
-"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-"
-
-src_install() {
-	default
-	doman man/*.1
-	dodoc -r ex
-}
diff --git a/app-admin/pwgen/Manifest b/app-admin/pwgen/Manifest
index 184841444092..515dbc9bf6a6 100644
--- a/app-admin/pwgen/Manifest
+++ b/app-admin/pwgen/Manifest
@@ -1,4 +1,5 @@
 AUX pwgen.rc 389 BLAKE2B d8a3af8df9be2a78e18aaddd7d17269ecb0c61a4c77252a77bb2d492edfe5b8c31279de616c4b0bf92ef6ec4763235b18931edc333121c543cae3e839927bedc SHA512 5d2bdf0dfbaf8fc31cd8217495fccccfefb383779c8a03faedcfaa830851b3bbdccb63fdf8d1bf8aa8a96759ea90a31da6b7a4e0cf5368e62ed10b8db8b0382d
 DIST pwgen-2.08.tar.gz 54884 BLAKE2B 43bb6176d9408558b362bd84839c190c4bcf5d8f71b46fcbbe0b00c390d957683fd9403ff697e96cef2e4de27776c841e12032d3589965629e8e2d29bf202583 SHA512 4a930dc7d4c58a4434209db30c54629d76fce57d0fd5767cd7894168bb1a5b85eaae6734a982b0f4e0640540c366ce27ad84860ff2c406dea3f5902b5bb54255
+EBUILD pwgen-2.08-r1.ebuild 605 BLAKE2B f10c824ae577bb71cf0d394ceebfad72eb9f46ea41c435d4409f3fec13fe81d05a3f5de94b522259d29358f3770a5466e58991ba408338dea0cdb5dd914c49bd SHA512 4d5281965c65581155fa120b2d3c56321fb43d93d16dc8e26429ab318dd05b94e67023ff4f1aa3f88831d79ae3b316da543e641561f7da3e943db27452a2ce53
 EBUILD pwgen-2.08.ebuild 597 BLAKE2B 3ddd679af075d48ad52db3c370fc3dbe33cc45f5d315bc803ad860c921ef231d7279e399d257b391baea63d0351cb787d2ee5ba5c6ae55b85d90c184be521431 SHA512 d9edc8ecc0873444a53632d1faf7cda6e72661f91a8eedbda33253a172cb0f180548664d3e236a82c302cae6317c7f081ad81fa42a91fdc6bb684bd6e583ce5a
 MISC metadata.xml 801 BLAKE2B dd9ac9712fcbfc2a681587ca84aa40ac7e2c96474dd6b89ba4f16b40be44c7ea441bf44dd4008397aa99ad08ae2ab07a535ce5375940b6f3991dc6e8e9f5f75a SHA512 15ab62126db1bb0211d39963ff8102e31cfb8791a496c660d6a63666c0c440ab1d6f04ad490e0455aa39f9c69bb69035e0c33c02107b9940e45a0a788b2f9ce9
diff --git a/app-admin/pwgen/pwgen-2.08-r1.ebuild b/app-admin/pwgen/pwgen-2.08-r1.ebuild
new file mode 100644
index 000000000000..c9004c9dec93
--- /dev/null
+++ b/app-admin/pwgen/pwgen-2.08-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Password Generator"
+HOMEPAGE="https://sourceforge.net/projects/pwgen/"
+SRC_URI="mirror://sourceforge/pwgen/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="livecd"
+
+src_configure() {
+	econf --sysconfdir="${EPREFIX}"/etc/pwgen
+}
+
+src_install() {
+	default
+
+	use livecd && newinitd "${FILESDIR}"/pwgen.rc pwgen
+}
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 668a171d4a21..88c7c80f4b17 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/unace/Manifest b/app-arch/unace/Manifest
index 3c12c15af8ae..2941f13284cc 100644
--- a/app-arch/unace/Manifest
+++ b/app-arch/unace/Manifest
@@ -1,4 +1,5 @@
+AUX unace-2.5-includes.patch 269 BLAKE2B e4a0d3d03c392b3ff7af055d0a2ee8fe182cd5bde54e2868606bd78cc5a0a801b79f795e0cbfbf0d771b7e9dec5679daec3681b83563b94ec5081ea9523a129e SHA512 7986366dde0c1459b184fd81ffcd89b0a6469198c28dbcbe391f38596022c94a45103a8a573e3434b59d17e9d361bc0d70f047778361fa74ea15299ec31975b5
 DIST unace-nonfree_2.5-9.debian.tar.xz 16900 BLAKE2B f7120278d0bd7b5ccccd76b4ffb16e4c501510f88c4b20e214026d1a39f93e3a1e37129d8b54b61f90aa04ca56d9bb1bb186ea3d394772ef48660d6926312ea3 SHA512 bb704cc1881601b3319b6052bce71f1c98d638b6822f32b9595c9b5434898187d747220c7167cc4acb2bbdbe8bde8618856fdcd277a69026a4bef41950cbb46b
 DIST unace-nonfree_2.5.orig.tar.gz 122509 BLAKE2B b395139e2f58bf0ef65774a0725bd3340eb1aca4a6680915eaecb93d5d744fca9f5e53a8866e861421b4fa08f462571d7662f68c091c35ed84e3bc367d9f846c SHA512 f7e9f3431f882160693cb55a90449e881aead9dc501bb4bb8303f04530bd3f6e1d84bbc2775d23e7c680e1e2d55a06872658c4b14c7bf51dd2db73fdcdea953b
-EBUILD unace-2.5-r5.ebuild 677 BLAKE2B d6e46d2e819fa3d5a13c708cbceadd3def0bb3ded130420767e6411e5cd3853fc847191f35a9f0ea198d1a3e6a5dd56a8d80128223a63bbc2bc51f3384cbcdda SHA512 33572c57f7b86998e043fff8b73449d08ca340e28e47766c701672285d08827d8ae77e473d8733903a4acb71732db7904990eeb999baa6301a656df02b3b95dc
+EBUILD unace-2.5-r6.ebuild 706 BLAKE2B 3f5fb8dbab50636437adb19dd9bb8611a8faf7d316efce5a3edfe7d86027533f05356b68f41aa12330c1a9cb23e9eaa3655c6b095e5a47379f1d221534944994 SHA512 aa049a1e2670927c8418a5d91878f256c57a0101c51938f32f333827f3a7948942284b1f563bcdd3bc7d5dc3e781cccb62a43088d280690fca0dce6ca7f2898a
 MISC metadata.xml 254 BLAKE2B f3a9f843cf94243d1129711770df727fcdc8808bca829ef784819cab6f5410dfa463cfed85182f8228c7de796a674dd602653ad3ef817a62c0c3e7198b23befe SHA512 b9fcd3084a7e197f6138e1ce8b0eff99c4c203c37a7d5c40de207040ba1501ef0e5b2f4e00216a567037bcd6d3394fdec6ff587484c9ba2fca9d04f431733b7c
diff --git a/app-arch/unace/files/unace-2.5-includes.patch b/app-arch/unace/files/unace-2.5-includes.patch
new file mode 100644
index 000000000000..ca272a185041
--- /dev/null
+++ b/app-arch/unace/files/unace-2.5-includes.patch
@@ -0,0 +1,10 @@
+--- a/source/base/all/uninorm/unincore.c
++++ b/source/base/all/uninorm/unincore.c
+@@ -19,6 +19,7 @@
+ #include <string.h>
+ #include "base/all/includes.h" /* BASE_LFN_MAXLEN */
+ #include "unidata.h"
++#include "unincore.h"
+ 
+ /* Hangul constants */
+ #define SBase  0xAC00
diff --git a/app-arch/unace/unace-2.5-r5.ebuild b/app-arch/unace/unace-2.5-r6.ebuild
index fd5a75cbe2f2..f8dbaf5919a5 100644
--- a/app-arch/unace/unace-2.5-r5.ebuild
+++ b/app-arch/unace/unace-2.5-r6.ebuild
@@ -1,22 +1,26 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=8
 
 inherit toolchain-funcs
 
 DEB_VER="9"
+
 DESCRIPTION="ACE unarchiver"
 HOMEPAGE="http://www.winace.com/"
-SRC_URI="mirror://debian/pool/non-free/u/unace-nonfree/unace-nonfree_${PV}.orig.tar.gz
+SRC_URI="
+	mirror://debian/pool/non-free/u/unace-nonfree/unace-nonfree_${PV}.orig.tar.gz
 	mirror://debian/pool/non-free/u/unace-nonfree/unace-nonfree_${PV}-${DEB_VER}.debian.tar.xz"
 
 LICENSE="freedist"
 SLOT="1"
 KEYWORDS="~alpha amd64 arm ~hppa ppc ppc64 ~s390 x86 ~amd64-linux ~x86-linux ~sparc-solaris"
-IUSE=""
 
-PATCHES=( "${WORKDIR}"/debian/patches/ )
+PATCHES=(
+	"${WORKDIR}"/debian/patches/
+	"${FILESDIR}"/${P}-includes.patch
+)
 
 src_configure() {
 	tc-export CC
diff --git a/app-arch/unadf/Manifest b/app-arch/unadf/Manifest
index e81fc6a832d5..8599385dacff 100644
--- a/app-arch/unadf/Manifest
+++ b/app-arch/unadf/Manifest
@@ -1,4 +1,4 @@
 AUX unadf-0.7.12-CVE-2016-1243_CVE-2016-1244.patch 5191 BLAKE2B f888e30e1a4d7caefbb407e1cb0fc76345deb960fce974f5ad80e3cad41d3dfde78e34370bdedc11f5dc2729c6695a339db1eab3d37ed5f0bfae9e104c0d2949 SHA512 d1c9a8efcf026d58eaee61e92ee99304c52672836a63dd69f5e1e0472c9b2278521b5a2597f55449ffd23dd307e2c045324bed9b5bf89d160ab517542706aca3
 DIST adflib-0.7.12.tar.bz2 135412 BLAKE2B 964ef195c0539779c33acb2f3c103f97f7fd7f78bb32a83af9d586157700664f5e531908121aea8234592bb00fb8bff2e8f754e620f989d6d4e52537675c030e SHA512 d63846f0780bd57cae5ff667eb70f98a0ba3659cfd0b12b3ae2f29ac96631e522088f911b1ba6e5ee3b00620a28a802f14d93cdf8462e18a7e3f749915ab5af3
-EBUILD unadf-0.7.12-r1.ebuild 712 BLAKE2B d3b7c30a3646c35f0c231f0ebb28a4e2ed615a61f061e250217569421c0f3384aff24d5f7103525fcec6d08aff2f380490a38e3851f1978eb36e9616d973b1f8 SHA512 5f7f95bc553a624af88bb31bb87fda728ac3a1a9042d76e4fdccceee2fd7c665d83b29ace890e581555760a0fc8ad5840dbb1338a4622fba21303cb88d20521f
+EBUILD unadf-0.7.12-r2.ebuild 630 BLAKE2B e4e3eb425272a0d5eb33643c29262b4fc270d7f8b1fc38b258254ad64b6621c092cfbd6490a64f4670a3e77032a4393694a613f0a67ca25f412e2353aa30cf4c SHA512 7c905dde35cde5cda520aa3afafaa4ed5dc3a77873d5d608a22d9c6d04953ec88d1810c267caf211a9ee385e6b09b050f08690d1731a0dc04220dd200565134c
 MISC metadata.xml 217 BLAKE2B fbec54484edc2603e95c90cb231985ef0f5f8d2cd48632ac8a097a4dac165499ff4cc087b1ca9ba6a4368bbb73b3af1ee99622a80df17072e1a340c345a2ee64 SHA512 7d3fc456b183fe7bdea26fb6edce39f702741a762b74cd7d2159a0ba85af50ebc87fbd921c926692a6164d50c9faf6b19680ab96528819bb06aaeac679e42de2
diff --git a/app-arch/unadf/unadf-0.7.12-r1.ebuild b/app-arch/unadf/unadf-0.7.12-r2.ebuild
index fb1aed5c2ad7..2c73f6a4a614 100644
--- a/app-arch/unadf/unadf-0.7.12-r1.ebuild
+++ b/app-arch/unadf/unadf-0.7.12-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit autotools
 
@@ -10,13 +10,12 @@ MY_PN="adflib"
 DESCRIPTION="Extract files from Amiga adf disk images"
 HOMEPAGE="http://lclevy.free.fr/adflib/"
 SRC_URI="http://lclevy.free.fr/${MY_PN}/${MY_PN}-${PV}.tar.bz2"
+S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~hppa ppc x86 ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-IUSE="static-libs"
 
-S="${WORKDIR}/${MY_PN}-${PV}"
 PATCHES=( "${FILESDIR}"/${PN}-0.7.12-CVE-2016-1243_CVE-2016-1244.patch )
 
 src_prepare() {
@@ -24,11 +23,7 @@ src_prepare() {
 	eautoreconf
 }
 
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
 src_install() {
 	default
-	find "${D}" -name '*.la' -delete || die
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/app-arch/zpaq/Manifest b/app-arch/zpaq/Manifest
index 02bbc65cd739..be58d243f0be 100644
--- a/app-arch/zpaq/Manifest
+++ b/app-arch/zpaq/Manifest
@@ -1,3 +1,3 @@
 DIST zpaq715.zip 1000646 BLAKE2B 3ecc69af7c14ca43643d54feac54647c82ac25e0212fc7f6e60821b76ba1976a2b2ccbf07e030ab6518c8643b452309d622cbea602fc4fe8798af7e4ecb2b027 SHA512 4cddcc04dff5e9dceb7138cf9e82b718b696048368ff494339f877d93e4423ed7959c0cfb2e30ba7dcbcdd6bbd59fa1021ceaca6d51e3180d8034b7a3997c265
-EBUILD zpaq-7.15.ebuild 1031 BLAKE2B 62d4893a1d53bda01e99877d8fe92442ecc0476f422d9bf799c05717c16bf8dc0f42e5635075a236e966014369dc6aa321e188292e4061725b1ced99652d555a SHA512 bc1e2f1e7da4e74bb91cbf700b4e81aadf4c9534f28c034176bd0c4904decf0489d62ba0969b5f1d964d1a8432632d1eb5c8989d5d44095f70a3919cc308dad3
+EBUILD zpaq-7.15-r1.ebuild 1032 BLAKE2B 57dd4e8f9b18daa44a7ab8c473e1bc84230a9824c733ca0e4f92cd83d9069b967ff4f449d882f7d8a1b53101b8e3d6dd399d00928e6b1c78b761290da2872c98 SHA512 04bcc6901531a9d6fa5781378a60800d8ff5b7608106e0a1991a2e222958abd5c1710f202a494c722dd1ace6eb3cf4460435e00f4c8a119b3da456071acfa815
 MISC metadata.xml 248 BLAKE2B f308d2aa052d11e427850af58bbebf95e7773f5562ed221f39043474b4c3827d724d49667edf1874272a5586a13201159f40e8f5eafb7e400e79c6566e1a6ac2 SHA512 b875c838394523483ae7d93585207eb3c642a345bbb08e1dcef3ceb737c813fa779e2f5479d48cdcc30732b8a0a9e6ecc648df940def6731e4dff43b23786e6d
diff --git a/app-arch/zpaq/zpaq-7.15.ebuild b/app-arch/zpaq/zpaq-7.15-r1.ebuild
index aabf4cdca479..cd79e48be432 100644
--- a/app-arch/zpaq/zpaq-7.15.ebuild
+++ b/app-arch/zpaq/zpaq-7.15-r1.ebuild
@@ -1,14 +1,16 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit flag-o-matic pax-utils toolchain-funcs
 
-MY_P=${PN}${PV/./}
+MY_P="${PN}${PV/./}"
+
 DESCRIPTION="Journaling incremental deduplicating archiving compressor"
 HOMEPAGE="http://mattmahoney.net/dc/zpaq.html"
 SRC_URI="http://mattmahoney.net/dc/${MY_P}.zip"
+S="${WORKDIR}"
 
 LICENSE="Unlicense"
 SLOT="0"
@@ -16,12 +18,10 @@ KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="debug +jit"
 
 # perl for pod2man
-DEPEND="
+BDEPEND="
 	app-arch/unzip
 	dev-lang/perl"
 
-S=${WORKDIR}
-
 src_compile() {
 	use debug || append-cppflags -DNDEBUG
 	use jit || append-cppflags -DNOJIT
@@ -34,8 +34,8 @@ src_test() {
 }
 
 src_install() {
-	emake install PREFIX="${ED%/}"/usr
-	use jit && pax-mark m "${ED%/}"/usr/bin/zpaq
+	emake install PREFIX="${ED}"/usr
+	use jit && pax-mark m "${ED}"/usr/bin/zpaq
 	einstalldocs
 }
 
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 0ccb9a2bd639..f2c0fc7db7bb 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/age/Manifest b/app-crypt/age/Manifest
index 743b6cc9e767..eec29c26da8f 100644
--- a/app-crypt/age/Manifest
+++ b/app-crypt/age/Manifest
@@ -13,5 +13,5 @@ DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20210615171337-6886f2dfbf5b.mod 95 BLAK
 DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20210615171337-6886f2dfbf5b.zip 21403 BLAKE2B f95e96b20328a04dd2a3a20985bf54d0d859a88e45f5f61eaee3f2bc22b575ae37c8ccf7275dbd68ac2851fd0d374f7ff8874ecc44c51629199a846154ed93d8 SHA512 82711ee27037e2ec090919fe58efb173626b31b4bc9e0118d732eb585ba4a16de6f1ee994b97ae78b7ff1cb89c34f6aa7392ff4b3432cf1cf2c56d101c64fec8
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod 97 BLAKE2B ed93c1d43f199d8cbd43cb25edac5de569cb78773d7f3232d59a0a4de6d174c5c100db2b02ca42c51f3e17e0f5e781ba9b5641a512b0dc72dcfaa5f6bd7d451b SHA512 f3f68808ccf5223453f765f59db1ef551b2130069eb83518878961c2d4a2044f9049f8d49df6e67699fcd2645cf90b84d35626590b2cfbca302fcf0eac76dc8b
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
-EBUILD age-1.0.0.ebuild 1526 BLAKE2B 97ea25b37ac4b3c313f14d2fbd60e280f76bae319ba572cae9746a3f38de15977921cb4923e26f0e260fe5f1652d7f50f836df489306b4f4ce7d5bb7ff4329ad SHA512 22a3a573ba0a76e81ca926c489adaaddc2883cbc15ba975732b619e6b04d71392f313bccd26fc9e14f903222f012162ddf9fae827c2a62aa07c08e8cf902c3fc
+EBUILD age-1.0.0.ebuild 1525 BLAKE2B 83cfd242a9ef9020d0a37a6591f3e2e0ba99ad82b124a5ac0cbe2533bde00c882fbe4dfa5d5c921af7aab2e9d949b9a7ef5e13d8abec8db247ca3a6619e5099c SHA512 82ed806acef835ceeba847161ca95bb508288e5c44826e05dc9898d7192583007d729d1deac5624b2f06fcf507fff4807a98bc6679e7c050e2aa47ad82771c4d
 MISC metadata.xml 495 BLAKE2B 8a96af0353f1721a164ab2308f4645dfcf214d5059e9b8897b3b3d57f8df44e1981cf083ae79e04eae04f61c2bb934a2b74a4f89010fc4dad4519fa45fb35c50 SHA512 03ce2c7701e7dcd1c9e73d094a6918da82fd3a792b2ca4ea5f753ad85a78c1bfdf9cc1f98b38ef0a7e9087502e730943f280e0ebb6ada7ac89a3e382d0901e1c
diff --git a/app-crypt/age/age-1.0.0.ebuild b/app-crypt/age/age-1.0.0.ebuild
index 851789821aa9..9aa23483c70b 100644
--- a/app-crypt/age/age-1.0.0.ebuild
+++ b/app-crypt/age/age-1.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -32,7 +32,7 @@ S="${WORKDIR}/age-${PV}"
 LICENSE="BSD"
 #RESTRICT+=" test"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 BDEPEND="dev-go/gox"
 
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index 36eb98fd37cd..a510376a90cb 100644
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
diff --git a/app-emacs/corfu/Manifest b/app-emacs/corfu/Manifest
index c9bf7419822d..0a56b6ee3bb7 100644
--- a/app-emacs/corfu/Manifest
+++ b/app-emacs/corfu/Manifest
@@ -1,4 +1,6 @@
 AUX 50corfu-gentoo.el 80 BLAKE2B 030035947690cded0580337466f06e7561c996ef27d6dce32cacf28249e71f3a99083e1dcd68e8fb1e2d0bcff75a70881ca88c7f41128123876e6f34230235fa SHA512 cde0d90e0b8bafffafd8d79c6fb4bc7957d1c7e5a6eb86b2c2cdeb73910bfddb6b8b2985bd46af406e5d3f3d1e1205b37ac2bf8cb26aa3d052b06054ae7ba00e
 DIST corfu-0.25.tar.gz 38366 BLAKE2B 297c8c556d32ee9f0a42265bbcd9b7cdd19881b8d85a9c92b6be84cb52e5558996cb16da596d13349fd1c9c72c7b6247e003ab48fcc41fd4acbe2d151b8e2e90 SHA512 602a9072cfa6a75672e1879e8da95b59355cc720482c8946311446c5722d13d0db6171eab8d899b689a689fe306d11f9b063e6bdc07dc710d9ee8f6f15b5aeee
+DIST corfu-0.26.tar.gz 38840 BLAKE2B 47dfcd2430cfd37c912cc2101760692bb1e4ef788bafec64760c81b02412119156b99d57a129e31d7109a62a073dfeb836453076f8bc59ece835015b4ec19ac0 SHA512 3996528e5ee9992462bc2cb241c36b7a05aeca460de0a04db542e6cd9eb7352067283ea4d8c668053003a7afc2dacc97e3b634842b847c05450fd8472ae8249a
 EBUILD corfu-0.25.ebuild 521 BLAKE2B a4caf9986c9ee8edf59147fd748765f18c3dce07b6b573c6c8f9b79147449216aeba2ea33578789a10cdb491bd3714cdcd5ed6e0bfa82a2e956952ee821d113b SHA512 4efb8703c33148f8b9c508f5787594c6519e8dbed90cc4e3389d12d7ce3ad4fdae4687f19eead535183a791605fb2b55ef4202a82ac7e73cea34daa94a902d5f
+EBUILD corfu-0.26.ebuild 521 BLAKE2B a4caf9986c9ee8edf59147fd748765f18c3dce07b6b573c6c8f9b79147449216aeba2ea33578789a10cdb491bd3714cdcd5ed6e0bfa82a2e956952ee821d113b SHA512 4efb8703c33148f8b9c508f5787594c6519e8dbed90cc4e3389d12d7ce3ad4fdae4687f19eead535183a791605fb2b55ef4202a82ac7e73cea34daa94a902d5f
 MISC metadata.xml 357 BLAKE2B 4a324f2913cf600a98085a72ffc69263205068f54b191101ed2825d3e3c84f951e58af8ebcab481bd50908685dc3603cdba3156772f153bf5a565ab43831b201 SHA512 038f5605bc71c57700f5d34539c8474c667f4434261cdb7dacb28c1dd80a64e656c395dfc2c84329d36e6cee28aaa9986d3cceb25f46d887bf8fdc1cbb348b8c
diff --git a/app-emacs/corfu/corfu-0.26.ebuild b/app-emacs/corfu/corfu-0.26.ebuild
new file mode 100644
index 000000000000..7cc6d4bc7c42
--- /dev/null
+++ b/app-emacs/corfu/corfu-0.26.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+NEED_EMACS=27
+
+inherit elisp
+
+DESCRIPTION="Completion Overlay Region FUnction"
+HOMEPAGE="https://github.com/minad/corfu"
+SRC_URI="https://github.com/minad/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_prepare() {
+	default
+	mv extensions/*.el . || die
+}
+
+src_compile() {
+	elisp_src_compile
+	elisp-make-autoload-file
+}
diff --git a/app-emacs/vertico/Manifest b/app-emacs/vertico/Manifest
index e27f44ea1b96..33fe91c0dfac 100644
--- a/app-emacs/vertico/Manifest
+++ b/app-emacs/vertico/Manifest
@@ -1,6 +1,6 @@
 AUX 50vertico-gentoo.el 82 BLAKE2B 89e0376cb0361d71ad40318455820607ac23fe004dbc80c77c9943a94426c47ee409956e0770a1f8c3157b50f0f105275337b0c94b597755dac59baeac29eecc SHA512 ea5c77218cab48e770cf56d1732b8101bbe453fe5e98fccf92c6adf53fd3aa8c1c3fd4d33e02fcb02d7ef44c56661e9c593588ffefec0852ecd43c00da30a5dd
-DIST vertico-0.23.tar.gz 42631 BLAKE2B ccb5a30cb3da9bed0a16af06919635ebc23777d0f19fad4fbbb422b0bf04e38f1de1a51e375263f212b0ae25881f4428e9fc6d665ef46ff9aaabd3964b4ab006 SHA512 7425b33a7628e8fd246386908835ee52ef357ecd3909a6cde0f9ed89dc468590fc854b599c2ed13572003ef6b36bd8df26db3da0764feadc407918ed68ba910a
 DIST vertico-0.24.tar.gz 42777 BLAKE2B 64e3f11dfb425c814665b49d755a52db4146c875969be7621539892f72df6ef9c4186be05373230b48369f1e2e85aee8e97cb829afe3618b9507170c4a8ca1a0 SHA512 67edb7e45e257c2cdf53d7adb2b29eed8cb3a1ac42dcec41bd555d553c60e4fc9806c6ad51b5cc183abb1d3967a4f43ab0e4ce0d317f77eb4d7cdedb9ea39834
-EBUILD vertico-0.23.ebuild 520 BLAKE2B edbaf5bc705dfd6c08b2ba2a253ed15c0e7293de324d27bc9745a85417dc49fe4a483a0e6f89d15b7eb4b624f90e9b56dc8adbef7db4975320cac08f9a3baf6b SHA512 4e5554b24d22b0efdc3122b35c9d5717e3a44ece867eb99cd257b270b14b10c277de23a3f8d9463c2e11f9dedb2c02c030f3274ee522310188afc97a9951fecc
+DIST vertico-0.25.tar.gz 42765 BLAKE2B cb87a0226b741f2e7b1e90b339debfef3caa4abc89dc5aecaee1c7a76ac7db6fdc4f13019ba6993f696735d4b020aa06caabf497f6e9b2047b24dd4e434a176a SHA512 aa2ae45f93412e45ed9da0382ce69a2a7a18196f80789915bfbf9edb1593f5d5ae3370d2f0c03059ef7eb38cb664052fb0a49172f51e304bc389df439a51ad61
 EBUILD vertico-0.24.ebuild 520 BLAKE2B edbaf5bc705dfd6c08b2ba2a253ed15c0e7293de324d27bc9745a85417dc49fe4a483a0e6f89d15b7eb4b624f90e9b56dc8adbef7db4975320cac08f9a3baf6b SHA512 4e5554b24d22b0efdc3122b35c9d5717e3a44ece867eb99cd257b270b14b10c277de23a3f8d9463c2e11f9dedb2c02c030f3274ee522310188afc97a9951fecc
+EBUILD vertico-0.25.ebuild 520 BLAKE2B edbaf5bc705dfd6c08b2ba2a253ed15c0e7293de324d27bc9745a85417dc49fe4a483a0e6f89d15b7eb4b624f90e9b56dc8adbef7db4975320cac08f9a3baf6b SHA512 4e5554b24d22b0efdc3122b35c9d5717e3a44ece867eb99cd257b270b14b10c277de23a3f8d9463c2e11f9dedb2c02c030f3274ee522310188afc97a9951fecc
 MISC metadata.xml 359 BLAKE2B d5d9e7f1c0ec1dc75d7fde73aa75f364f15740857e6a2bf39b3374424c3fcff4e79ceda481141598fee17c694b4c3538059f5bf95186aad6d535eacabcdb3341 SHA512 93e435f0f7bdb4d26a48525109688b964049a0b61d4b5633bd61dfd14ab68a5bd7e367d0cb7e45f5f1a57d73b8b63a9b2f8b0da9ac289bd4242da3b6f434b987
diff --git a/app-emacs/vertico/vertico-0.23.ebuild b/app-emacs/vertico/vertico-0.25.ebuild
index d2415e174e28..d2415e174e28 100644
--- a/app-emacs/vertico/vertico-0.23.ebuild
+++ b/app-emacs/vertico/vertico-0.25.ebuild
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index b09200cf1ae9..cdc99f6111d2 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest
index df3917f21eae..bd896209f313 100644
--- a/app-emulation/xen-tools/Manifest
+++ b/app-emulation/xen-tools/Manifest
@@ -35,7 +35,7 @@ DIST xen-gentoo-patches-4.16.1-gentoo-patchset-0.tar.gz 5289 BLAKE2B 4946056ee63
 DIST xen-gentoo-patches-4.16.1-gentoo-patchset-1.tar.bz2 4351 BLAKE2B 1ba306fbc4a55aa1fea71139f7a900c8c363cf948f34a2aabd1ff6f8a68f2e632154ea0e0289580c84328b372c4f8cfdb2879bc63ae3ec163bfb29487783a758 SHA512 8d8198fbf8d9d4b46a83cf46c965448cb47b30438518a70c9b552c7cd1b23616e50f615206ddb18603e8482d19b25ccb611904c404d445898928ecf88051b70d
 DIST xen-upstream-patches-4.16.2-pre-patchset-0.tar.bz2 40645 BLAKE2B 198beb134604b221bc81fb4d32daec074a7c088c7f9bf99c2a9e98bdab2d8bf7e10c0fea9106d039de255fb209a8ac2955d1e724325a5016e6ecbdd94fbb9584 SHA512 d849418fb215a5bb9ea31ea03de6fbb8b1834d9a8e9face0bd3f20ab7bbd3a17cb13e9b3b653a3a5f06fad609b01dbcaa16f7377ead015a9d97cb8f960d0de49
 EBUILD xen-tools-4.15.2-r2.ebuild 17828 BLAKE2B dd49a8492b9b2b27eaea3702aba04d663a8f4eb052e4d92f34b8ffd3165ef23d6d20b024a5894ac5ff9555cecb0efacb785d6a70a9393c564862e1e8a3b7e267 SHA512 1955d40d91295250d173568c80dea737c082e17c4e90e5c980158fea90384b6705cca5911207d23da67b9eed6779f8a558e848322b495dbb42e1b0ae890f9884
-EBUILD xen-tools-4.15.3.ebuild 16675 BLAKE2B 0343e102f9531f96a245c5de0d3cdcc611c77994f4749b43552ebdc439f798f457e02e36096ef6839618985cb5dcd743aac5a8a825e856b7bd0fd71da21708bd SHA512 297941822cb2b439366a076f013a0fd261d8e0ee5f3db14cb667d9f911f7bb8ff80f6bf1202b6e0c4dbdfba89ee3341bddef3dbaa22bf95370a4085d6fa08e24
+EBUILD xen-tools-4.15.3.ebuild 16674 BLAKE2B f46069a7e22d990a5afa8700241d420f99b4d1306aa12d146b3528016f4d2654fdf6b23bd5397621c806a4ece794b7102c3e18d2b34a71673b3b0a0a8544a799 SHA512 e7fe61daefbc84ed277581eae742e158cb8ee488c9a5a1a6d2ca59492805773941ccfbc986b0f756ec6b917d7cc68e0c455c380e530ef5ec23e48add0de9418b
 EBUILD xen-tools-4.16.1.ebuild 16548 BLAKE2B e16e6217d6573365bac929c0c796232876ff480bb53d46bea52e707158f582566543ee1688b161f1c95e9a45818c30d82e98b0fb003acb1239440d1b5dd3e984 SHA512 83dc4460ede881c701641d700dbd938d42f7b6bec2e9c2674e4d925ffbd61d25f7a1e3ef11a17547101011f293c9bd1da97514b6bc16f31cd57141593519832e
 EBUILD xen-tools-4.16.2_pre1.ebuild 16785 BLAKE2B fcb88e3b26c6fab27fa3f82c4f5684044087cb1479e470bdc5ed1985016cb3cf44c41733b7eb06f5bb9648d2c46dcbd456f0938439ab3eac357281c7e6dc66f9 SHA512 911c6e0731ddc7b6bc7a567e25155ab0d05ad537e970cdda961f3904b9ca73696698c7b5c9ae7d4669cd2e4fab8e9b40f2e7f22c85eae6e77c7e49c20fb2afca
 MISC metadata.xml 1562 BLAKE2B a619e34e6fec4c6ffc00fd098dc040c5bb464ed7f2032db2e933fada0614e82c21269175f37720a123404551474e2aeeb2728b405ff93f9b4d9d092d027e0839 SHA512 f45c793a4b4819f0e50501ddc85acdaf99e4d675530712f8dccfb5166d071ae8ed07917a61d56037d6ba3a54123f72f4512d8c11643ea8c6e507feb9d29594e7
diff --git a/app-emulation/xen-tools/xen-tools-4.15.3.ebuild b/app-emulation/xen-tools/xen-tools-4.15.3.ebuild
index 60ce532a0998..3c52b578af80 100644
--- a/app-emulation/xen-tools/xen-tools-4.15.3.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.15.3.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="git://xenbits.xen.org/${REPO}"
 	S="${WORKDIR}/${REPO}"
 else
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~x86"
 
 	SEABIOS_VER="1.14.0"
 	EDK2_COMMIT="7b4a99be8a39c12d3a7fc4b8db9f0eab4ac688d5"
diff --git a/app-emulation/xen/Manifest b/app-emulation/xen/Manifest
index 303d453b62ed..f4ecd12f2933 100644
--- a/app-emulation/xen/Manifest
+++ b/app-emulation/xen/Manifest
@@ -10,7 +10,7 @@ DIST xen-gentoo-patches-4.16.1-gentoo-patchset-0.tar.gz 5289 BLAKE2B 4946056ee63
 DIST xen-gentoo-patches-4.16.1-gentoo-patchset-1.tar.bz2 4351 BLAKE2B 1ba306fbc4a55aa1fea71139f7a900c8c363cf948f34a2aabd1ff6f8a68f2e632154ea0e0289580c84328b372c4f8cfdb2879bc63ae3ec163bfb29487783a758 SHA512 8d8198fbf8d9d4b46a83cf46c965448cb47b30438518a70c9b552c7cd1b23616e50f615206ddb18603e8482d19b25ccb611904c404d445898928ecf88051b70d
 DIST xen-upstream-patches-4.16.2-pre-patchset-0.tar.bz2 40645 BLAKE2B 198beb134604b221bc81fb4d32daec074a7c088c7f9bf99c2a9e98bdab2d8bf7e10c0fea9106d039de255fb209a8ac2955d1e724325a5016e6ecbdd94fbb9584 SHA512 d849418fb215a5bb9ea31ea03de6fbb8b1834d9a8e9face0bd3f20ab7bbd3a17cb13e9b3b653a3a5f06fad609b01dbcaa16f7377ead015a9d97cb8f960d0de49
 EBUILD xen-4.15.2-r2.ebuild 4405 BLAKE2B 0090bf96c539f0ec10bdded08f4a67d5413bfed25e9f85b68c65e7c49bd4c220d493b45800b3515c81c8bde3670a29cc34a6d079b9429ade6ed69e0ee47ad0c8 SHA512 355a160d6326367eb12ca7c0492b324e35d8b635e295e5a8b0c431ca44bdded9e7c2160592fdc4327ad1473a593d03f9e6d71e80ddc2734aa9ed87b6319da6d3
-EBUILD xen-4.15.3.ebuild 4725 BLAKE2B d0438340e0d61dcb8cafa07346e2fd361159e837e5fc1bd03b4f883c4078a26cdbc26c513e5e8300df0b836792572933e934ac0c6631861bc1985e44a794e43f SHA512 af40801d682f55e21d0a17b4c9fa5a2f947104a04d4ca9b393fe6244effecda2eb94112e3708fdc89ddd0f34e0d5bede582063e0593ee40b262f83af3da7a2e7
+EBUILD xen-4.15.3.ebuild 4724 BLAKE2B d8cea46c30edb523780e7e6bcd2bfa0d45e5c3cd025341228aeaa24b8d5f26587f48a18372f3794f1bc635363391c793d77b63c14de574b239e19f74a4f3a17e SHA512 5167e60d83e9765391d6281cef6dab12145e71ed96a3f6f48139ae9e6d823dd1af0c0becd95d80e84a50a3e978416862232996b34213eaeec55544e0c21b57f3
 EBUILD xen-4.16.1.ebuild 4832 BLAKE2B 2a9fc53ee631e5ccd502f419ea1437dc1988b801812a83a21f1ff04a2b71e85046c24030843c77d580e5cdf6dc4edf6961678ce33b77495ead4e3e51c4aa5c59 SHA512 fb7dec4bbc69f85e8824f984a6acb49b94be2192403ef8ea57dc3b13868e61044a274045ceeb2c0ded3e09d0776bc7c30cbb448359e9af35ad777079d93de533
 EBUILD xen-4.16.2_pre1.ebuild 4761 BLAKE2B fe2c436fca2d516c4ee588c265898b62278636609119768d7ec4319ad2a011cd91c8224d289384ea9fc2f38006437134a96b028d78846488badfea0a2313efe7 SHA512 600b693dd83b464fe57229b3ba3bd9acb42c88ea9b207f78694bf31d61e59ce407c675dd968e2222ffdfc7f8227f8a58a65be951dcb321481eb49eabd7818e75
 MISC metadata.xml 773 BLAKE2B 3d0c64f8bfaf753ee92681f9da2dfabd6196952b5694244b806cb6cdac02fedd10d8c8defb4f4211664e135cce38c671f543faab58575ae2d603efcb9b2a48b8 SHA512 16993794d7f578562112533f97bb76d1a2fafd0dce038dbd879a4a65d5fc893251f1d188cdc1a2b9f955a27581f76a26409cc0c90706c86514c05e81501966b9
diff --git a/app-emulation/xen/xen-4.15.3.ebuild b/app-emulation/xen/xen-4.15.3.ebuild
index be0c811dcf7f..ff611b2ed315 100644
--- a/app-emulation/xen/xen-4.15.3.ebuild
+++ b/app-emulation/xen/xen-4.15.3.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="git://xenbits.xen.org/xen.git"
 	SRC_URI=""
 else
-	KEYWORDS="~amd64 ~arm -x86"
+	KEYWORDS="amd64 ~arm -x86"
 
 	XEN_PRE_PATCHSET_NUM=
 	XEN_GENTOO_PATCHSET_NUM=
diff --git a/app-eselect/Manifest.gz b/app-eselect/Manifest.gz
index 949b9148ab5b..8af1405ccfe9 100644
--- a/app-eselect/Manifest.gz
+++ b/app-eselect/Manifest.gz
diff --git a/app-eselect/eselect-timidity/Manifest b/app-eselect/eselect-timidity/Manifest
index 3f51e15ea04e..45963d7c8b12 100644
--- a/app-eselect/eselect-timidity/Manifest
+++ b/app-eselect/eselect-timidity/Manifest
@@ -1,3 +1,3 @@
 DIST timidity.eselect-20110513.bz2 1689 BLAKE2B 80d99984f3407a8130969626e12212f4c62f1587ef3ed4a0b953d480286f87fa32c57cf84a5794d8effef4690bdfc1d8b7c9c0031919b61ba4e123544bd2df5f SHA512 9af37f195dde3595cb55e3ca467928fd04b5f755545cf41ce0b3198a21107ad35e28365c1d310a77561f8ffcb1b10909b618fbdc55ca06b77492711b48c17afe
-EBUILD eselect-timidity-20110513.ebuild 541 BLAKE2B 155c03035601a051f89d046cde1cc6f6a6c220dcf5b879b6e7f3b85e348e93bf40f85bc0a85a08fef3326a364350df850949e366bfd2301fb40078e42a61d3ed SHA512 97e72e879ac51694462612fb30c7ef50ec2adba7544f828796fcd38b1bd6688512b5141d4a3a25a487e51e7ff52812cb584ba4342b2d120ab5f921df5830b1e2
+EBUILD eselect-timidity-20110513-r1.ebuild 539 BLAKE2B 9409370f0b371b558a3b4f61db3251b844d748b6b916a321734d09a69de835e1c33ccba1ac100f7c58648677f8929ffde085368d9b72a209a1bec7cad60a45ae SHA512 fdf3b05a59f002312a2f2403490c1aef713126347e75a962b57a4e07fba74b54ae9160c6bc6a3aaf0b4ba79e32387129995b4c9ff082e41fcba81deecccc1cc4
 MISC metadata.xml 278 BLAKE2B da5e1399154ec68205d578543dc3a2501d07d8f850be2129b9ab387bea29d8e72035b830ac352812c2dd9cc4eaa839006453639bd5d0b91ed84fa8bc710a7a02 SHA512 824860972fb61eaae09916cd512bcdd8463a120385763bdfa95570644e36cac0eddf2c2d2893cf36fd80ff6b82ebae679ac45e50ca91076edc3c6d1c3ff73a33
diff --git a/app-eselect/eselect-timidity/eselect-timidity-20110513.ebuild b/app-eselect/eselect-timidity/eselect-timidity-20110513-r1.ebuild
index d033658d49e8..885170c412e5 100644
--- a/app-eselect/eselect-timidity/eselect-timidity-20110513.ebuild
+++ b/app-eselect/eselect-timidity/eselect-timidity-20110513-r1.ebuild
@@ -1,20 +1,20 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DESCRIPTION="Manages configuration of TiMidity++ patchsets"
 HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-SRC_URI="mirror://gentoo/timidity.eselect-${PVR}.bz2"
+SRC_URI="mirror://gentoo/timidity.eselect-${PV}.bz2"
+S="${WORKDIR}"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86"
 
 RDEPEND=">=app-admin/eselect-1.2.3"
-S="${WORKDIR}"
 
 src_install() {
 	insinto /usr/share/eselect/modules
-	newins "${WORKDIR}/timidity.eselect-${PVR}" timidity.eselect
+	newins "${WORKDIR}/timidity.eselect-${PV}" timidity.eselect
 }
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index d25777b8e6e4..669d54f409cf 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/scrub/Manifest b/app-misc/scrub/Manifest
index ae509a6d373f..d28833f5b9ab 100644
--- a/app-misc/scrub/Manifest
+++ b/app-misc/scrub/Manifest
@@ -1,3 +1,6 @@
+AUX scrub-2.6.1-bashism-tests.patch 2064 BLAKE2B da474dc7501fb9b7c1b93a69b938b9d4b09643e2149a355696828c84a62c364ff8fff75a18d28a8ad110bbaa12beb780a62722550d33ead7359b36230bff7370 SHA512 b5fdcf71f862c633f86fdc5f96c68c2d88f256f3a685f655919e4524705bc74ed9e96dcfdd672741fcc9252cfcc55e4fb3afaad5c246b763ff3f8ff9ba92c442
+AUX scrub-2.6.1-implicit-function-declaration-test.patch 594 BLAKE2B 824a8a3d1801a22c090fea14c917e4f9eb5a662d51981d26317ca57cb90003cbc51768bdfb628483e906150d385e66ec7ee7a505c78bf11edf5771a9595fbe90 SHA512 efc0874b03c52591e24035d914093d12f8894272cb9a0bc7e212385f44a8a624f50f933db0412d64595613cfb43fbff37540cc8327ca15471aad57d264b75451
 DIST scrub-2.6.1.tar.gz 362536 BLAKE2B 5342f0b6ffc361e7f581f80f5fd721cd7ed0ccab4591a0c1442476847a51182d869794e5543b06af9f834ebf87ab963c7ce771a6aceef6983c91e814ab86b4fd SHA512 6e434b9d81c5ac473188c37af790c808771204203b3f04a5ca316c6a890f872d1beb73ce4713546e14ae91287d7adaf2fbfa44a30af634c2b3af890e2a0e8640
+EBUILD scrub-2.6.1-r1.ebuild 489 BLAKE2B 388e129579074b030f49671762dcfef0131683a76026348c1723a2a6dbd17b7d732cc6dae75f264bba51eea1fda0adf5fe7b1b86c121201050ea993e2ef7c52b SHA512 2e602ce7ca40276b45e18a58d6beccdd03ad3d1af410b324dd652b8b91e6ed6932a684dbcd266f36597e902a23b5cf45cc3fec0251a59fb767f758c736cd12cc
 EBUILD scrub-2.6.1.ebuild 397 BLAKE2B ed880d7b83b0e71346cecaea24edc4ae795918bf1d990cc57602179c18db28f7ccaabe2e3722bf73d817c51cb3e04f0356216edde8c13e1c994ab5df603fc9d1 SHA512 9b6b275fb38e9de843335f27d8fb41cb07ba67f38fef39c64ac8f99ce0c6d51fc5410e1a24cf51295cb17af8523b4ddfe024f2f0040222532f79751c9567d153
 MISC metadata.xml 428 BLAKE2B 3b0dafd4c5c4c5f8b1f630ae20e6a33f1858e1465e20c920487fb1ade63de415787ac2e405cc1652c21508bb012a0333e810cb58d7610f02a684fcf1794e9915 SHA512 5868d55250b339a6cf8835f95efc6dbbcad2ee323415a910d78f261964ab3968708841f5ee9a649493c7e8446560037d0516e0c109a86b89ad943c404eaf3b62
diff --git a/app-misc/scrub/files/scrub-2.6.1-bashism-tests.patch b/app-misc/scrub/files/scrub-2.6.1-bashism-tests.patch
new file mode 100644
index 000000000000..17999f341cd2
--- /dev/null
+++ b/app-misc/scrub/files/scrub-2.6.1-bashism-tests.patch
@@ -0,0 +1,85 @@
+https://github.com/chaos/scrub/pull/31
+
+From 545d1b9cae8da18864277ca14a227d4adfafdc32 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Sun, 10 Jul 2022 10:23:09 +0100
+Subject: [PATCH] test: fix bashisms in tests
+
+We're using a /bin/sh shebang but the tests aren't
+compatible with a POSIX-compliant /bin/sh (like dash,
+instead of the usual bash).
+
+Switch to = instead of == which works the same but
+works with both Bash and dash.
+
+If desired, we could switch the shebangs to
+/bin/bash which would work.
+
+(Notably, Debian defaults to dash as /bin/sh).
+--- a/test/t09
++++ b/test/t09
+@@ -4,7 +4,7 @@
+ 
+ TEST=`basename $0 | cut -d- -f1`
+ # Test requires root
+-test `id -u` == 0 || exit 77
++test `id -u` = 0 || exit 77
+ 
+ EXPFILE=${TEST}-`hostname`.exp
+ TESTDEV=/dev/scrub-testdisk
+--- a/test/t10
++++ b/test/t10
+@@ -4,7 +4,7 @@
+ 
+ TEST=`basename $0 | cut -d- -f1`
+ # Test requires root
+-test `id -u` == 0 || exit 77
++test `id -u` = 0 || exit 77
+ 
+ EXPFILE=${TEST}-`hostname`.exp
+ test -f $EXPFILE || exit 77
+--- a/test/t18
++++ b/test/t18
+@@ -1,7 +1,7 @@
+ #!/bin/sh
+ TEST=`basename $0 | cut -d- -f1`
+ # Test requires root
+-test `id -u` == 0 || exit 77
++test `id -u` = 0 || exit 77
+ 
+ TMPLATE="${TMPDIR:-/tmp}/tmp.XXXXXXXXXX"
+ TESTDIR=`mktemp -d $TMPLATE` || exit 1
+--- a/test/t19
++++ b/test/t19
+@@ -1,7 +1,7 @@
+ #!/bin/sh
+ TEST=`basename $0 | cut -d- -f1`
+ # Test requires root
+-test `id -u` == 0 || exit 77
++test `id -u` = 0 || exit 77
+ LOOPFILE=`losetup -f` || exit 77
+ TMPLATE="${TMPDIR:-/tmp}/tmp.XXXXXXXXXX"
+ TESTFILE=`mktemp $TMPLATE` || exit 1
+--- a/test/t20
++++ b/test/t20
+@@ -1,7 +1,7 @@
+ #!/bin/sh
+ TEST=`basename $0 | cut -d- -f1`
+ # Test requires root
+-test `id -u` == 0 || exit 77
++test `id -u` = 0 || exit 77
+ LOOPFILE=`losetup -f` || exit 77
+ TMPLATE="${TMPDIR:-/tmp}/tmp.XXXXXXXXXX"
+ TESTFILE=`mktemp $TMPLATE` || exit 1
+--- a/test/t21
++++ b/test/t21
+@@ -1,7 +1,7 @@
+ #!/bin/sh
+ TEST=`basename $0 | cut -d- -f1`
+ # Test requires root
+-test `id -u` == 0 || exit 77
++test `id -u` = 0 || exit 77
+ 
+ TMPLATE="${TMPDIR:-/tmp}/tmp.XXXXXXXXXX"
+ 
+
diff --git a/app-misc/scrub/files/scrub-2.6.1-implicit-function-declaration-test.patch b/app-misc/scrub/files/scrub-2.6.1-implicit-function-declaration-test.patch
new file mode 100644
index 000000000000..8d6b40a97536
--- /dev/null
+++ b/app-misc/scrub/files/scrub-2.6.1-implicit-function-declaration-test.patch
@@ -0,0 +1,22 @@
+https://github.com/chaos/scrub/commit/188d999e2fb038dc702b47750d235ffd284dd518
+
+From 188d999e2fb038dc702b47750d235ffd284dd518 Mon Sep 17 00:00:00 2001
+From: Jim Garlick <garlick.jim@gmail.com>
+Date: Wed, 21 Jul 2021 13:09:57 -0700
+Subject: [PATCH] test: fix missing include in test program
+
+Problem: tgetsize emits a compiler warning because
+strerror() is not defined.
+
+Include string.h to get the definition of strerror.
+--- a/test/tgetsize.c
++++ b/test/tgetsize.c
+@@ -20,6 +20,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <libgen.h>
++#include <string.h>
+ 
+ #include "getsize.h"
+ 
+
diff --git a/app-misc/scrub/scrub-2.6.1-r1.ebuild b/app-misc/scrub/scrub-2.6.1-r1.ebuild
new file mode 100644
index 000000000000..a7c1ab7b6ea6
--- /dev/null
+++ b/app-misc/scrub/scrub-2.6.1-r1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Overwrite files with iterative patterns"
+HOMEPAGE="https://github.com/chaos/scrub"
+SRC_URI="https://github.com/chaos/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~sparc ~x86"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-implicit-function-declaration-test.patch
+	"${FILESDIR}"/${PN}-2.6.1-bashism-tests.patch
+)
diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index 8ba99f2c426c..656ff7ca21af 100644
--- a/app-shells/Manifest.gz
+++ b/app-shells/Manifest.gz
diff --git a/app-shells/push/Manifest b/app-shells/push/Manifest
index e377b88d5107..261c6b1568c3 100644
--- a/app-shells/push/Manifest
+++ b/app-shells/push/Manifest
@@ -1,5 +1,3 @@
-DIST push-2.0.tar.gz 2211 BLAKE2B 5875962c3aaa2e3eec2dcd3b70a0b5325684dffaf0b01b8f336db835bcfc4b24fc5d28817eb9032d8a10c5759089e2bbf42fba058403ebf420a77bb7d2754c95 SHA512 03c40bd8b3b09473952ecf13edd622533616de47638741214b40856b33993f9310d62be34fac6f68b950f58167c3111082554961a800a43a3ecf8a7d138ffdff
 DIST push-3.4.tar.gz 2839 BLAKE2B cc7dcdb0208b1eb9d36963acbbc1e0c852c4164d5ba2a35bd52848338bab7f66073c9c780c82e28b3f1bdd55d81f26f5281694ba76214fd7631f946e0fdc199c SHA512 aa118f42210b40d790c0b274045ff45c2067cf894731228f5065eb44a723fd813549204797c365329f409e36f564ec22f6d956341b1f2b62964b918e76991344
-EBUILD push-2.0-r1.ebuild 621 BLAKE2B e39739ad26722cbfb26638d9a896f84d3edc82968c9ca181c165c9cc6cfa025c043d1acc2f6051ad3c16bcf66d960c5eaf7ce7ae031ac6d24f0fe755653d1269 SHA512 604731f23b1d82090668971c46030e31c891e049899c87b8d5944905e9ca47e03c8e06febad7847693e406410d93344d823f11e82a8662e3254d5f8555dda214
 EBUILD push-3.4.ebuild 645 BLAKE2B b4ec1a727489729476b1a32ce909e74360b9b833d53ab98d055c3c6f8c74f8779073e440d8ef2ccc8e2fefcb288158e324873581b18ef7a3bbd4376df55688a2 SHA512 5655cd8a396720f8650add55874dfa01f38cfb06e8c7af014a15a3a89c14925e730f8607ae89bd42d10cbd2a04ba3678f8a25c2cc66b3d395d6d0178895495e6
 MISC metadata.xml 738 BLAKE2B 51c77214d55a2855cf33d25a191c51638fbd34cf4fe9938ba4395ac00272dc9da820ffeb0a8b356bb7a051bddcc1d9d9bdb76ac1f33cae56b1efd70db2dffe5a SHA512 a415c3878bd94c10d242f8ad51820793cbdc7b5103ba7e2a6c6c47674987ffbda48604122893c5ef8a7f754ccdf53e9b7d5839e26b27773dbbb7d570fc502bc4
diff --git a/app-shells/push/push-2.0-r1.ebuild b/app-shells/push/push-2.0-r1.ebuild
deleted file mode 100644
index 0b0c030545bc..000000000000
--- a/app-shells/push/push-2.0-r1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A POSIX shell function to treat a variable like an array, quoting args"
-HOMEPAGE="https://github.com/vaeth/push/"
-SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
-IUSE=""
-
-src_install() {
-	insinto /usr/share/${PN}
-	doins bin/push.sh
-	dodoc README
-}
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 554dd568d933..54f73851440c 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/t1utils/Manifest b/app-text/t1utils/Manifest
index ef098e18c731..9861e7830f56 100644
--- a/app-text/t1utils/Manifest
+++ b/app-text/t1utils/Manifest
@@ -1,6 +1,3 @@
-AUX t1utils-1.41-memmem.patch 703 BLAKE2B 3d7801d11e9120701c3229bb495d5cbef8b538a1486bcbe40039b2915af9ed11c444f20914d8e678af4a8beb9db999052c53d7bb04ea912f0c665871ec7848fb SHA512 ab7a8f5273aaf478c4e2fd9aa201d5b081adfa431e147ccd429ca5eaefca1858008e09dbe62d7847ae3fe307d5b1f72a16093d026f7d73f665531abde5f5c60b
-DIST t1utils-1.41.tar.gz 176552 BLAKE2B 69ccc07a3b98de18355b09532129f80e4188d64817a1ad4e8439b3a0e37917a63b9e187a25fedfc5aba486b2e60279586a425992e9f25a111ba9c77ed3863f6e SHA512 b532d3af38a73903a512eb1297ba7510747dcbe8362acc4a0f20f2a3c786d82d8f5b22997ed3867114f33153a34cdd71c4c8e6a093db3cecc3825b6e4725a00b
 DIST t1utils-1.42.tar.gz 184666 BLAKE2B 63ebb856b7bd69751242b9858c47562fd720f098bda2dca694a13cf192e6970ae11d43cc2b2c0a1dde0a46d9d1762baf04ab279907a26270cae8ab04f2af02da SHA512 507b3179dad9479948331fc655d8d6d970a77923f55f5bee4ed5ae9c2222e27f410e62d96c4f27ecae9392335ca1df1f8bbb7ba7087a6268aeeee99d40aa42ed
-EBUILD t1utils-1.41-r2.ebuild 647 BLAKE2B af44e224f01fe627267a3b5a5054a4ea6cd22dd602a4d6091db1eac73da73ed8b911609b67a35e6469b7cdd7132ef56eda107a6254cc53f7bcfda22b2faed394 SHA512 49bbd7b7fc14ceb3583d3b4277d0e225a883b0873b69c159e709cea02236c6f5c82a2cb26668d2d92cd76a67ee98640ff3826c4686f1485f00e308cf26f6b4c0
 EBUILD t1utils-1.42.ebuild 542 BLAKE2B 78c6a5a00b3b177744434ba10111082b46ebd8e136a89d9ddd56a888a9f9d586180ba7fc316cab810c21036755663072d482cd7ae789b263ece81873b6bd73cf SHA512 2de00f97e597e2c1aa7bb89db448381d5155b178c01dd781e60db94bb6da88e3b66573c1e76b37745b04d615f63b082d9b2d0b70bff8511928e17f6395a5c197
 MISC metadata.xml 348 BLAKE2B 6bfc533631d2566e3ee69cd2984da33fc89afe690b4501ed2a1e40b8f961fde4e9049f67a3a32de0cfb54fccae798f29c24f86c3d57854ddfa904bacc275d702 SHA512 b329f25a743f60cacddf37ab7ec8c22cc64a2bf06c02f3115e46a80974a761e456d8ded059e8a8ec09abcd8653a16e6fd81fcf2af7d11f3c479716d69f556fbc
diff --git a/app-text/t1utils/files/t1utils-1.41-memmem.patch b/app-text/t1utils/files/t1utils-1.41-memmem.patch
deleted file mode 100644
index db6f19549e5e..000000000000
--- a/app-text/t1utils/files/t1utils-1.41-memmem.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-commit 3f1ddda424353f0f926dd28efa47b0ac61556ce8
-Author: Eddie Kohler <ekohler@gmail.com>
-Date:   Wed Aug 16 12:37:34 2017 -0400
-
-    Check for memmem declaration; sometimes it is not declared by default.
-
-diff --git a/configure.ac b/configure.ac
-index 5b4e3ff..b4dc4fb 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -19,6 +19,7 @@ dnl strerror()?
- dnl
- 
- AC_REPLACE_FUNCS([strerror memmem])
-+AC_CHECK_DECLS([memmem])
- 
- 
- dnl
-@@ -88,7 +89,7 @@ char* strerror(int errno);
- #endif
- 
- /* Prototype memmem if we don't have it. */
--#if !HAVE_MEMMEM
-+#if !HAVE_MEMMEM || !HAVE_DECL_MEMMEM
- void* memmem(const void* haystack, size_t haystack_len,
-              const void* needle, size_t needle_len);
- #endif
diff --git a/app-text/t1utils/t1utils-1.41-r2.ebuild b/app-text/t1utils/t1utils-1.41-r2.ebuild
deleted file mode 100644
index 072c9c1ef29f..000000000000
--- a/app-text/t1utils/t1utils-1.41-r2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="Type 1 Font utilities"
-SRC_URI="http://www.lcdf.org/type/${P}.tar.gz"
-HOMEPAGE="http://www.lcdf.org/type/#t1utils"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-LICENSE="BSD"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	!<media-libs/freetype-1.4_pre20080316"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-memmem.patch
-)
-DOCS=( NEWS.md README.md )
-
-src_prepare() {
-	default
-	eautoreconf
-}
diff --git a/app-text/wdiff/Manifest b/app-text/wdiff/Manifest
index 614147cc1f78..c80186287d49 100644
--- a/app-text/wdiff/Manifest
+++ b/app-text/wdiff/Manifest
@@ -1,3 +1,3 @@
 DIST wdiff-1.2.2.tar.gz 1478567 BLAKE2B 80de7ecdd8fef1a4c9e6e0830e1af52d5087abc235dbe2bcf7542c0f017c1a21036243162fa6f70e714f3544d74e9a1add70dc22e69f306a17ce9bdd49c5bc15 SHA512 9272c225f4f61612197fe151cf8c913107169ac9fcd6c9f8472a0f56d9124d78a060944cea1b51489ca34311220f23638d043d43c733a3252cdbb7cceb1085ed
-EBUILD wdiff-1.2.2-r1.ebuild 868 BLAKE2B 0ac7ddaa3e76beb71c015caee820e09d484ffd4bfcc96c40213f3761d0e7745ff2447196a69439451e3f518022f0c20c46ce28be0a2402c66205173b9c24515c SHA512 2c382c2869049ab9881283b90814c9352a2a707a54e53ab924a5eb03d1c747c88606b05e9b5182fbf8fe68dd5ac376c0e9917f5e74a84ab7cb88770d634e464b
+EBUILD wdiff-1.2.2-r2.ebuild 877 BLAKE2B 4b52042a689f1cff350530def560e77363c5be4f24299bf337643069266dc9c6d6b693077708e9b3d9581827d69c0b4c25935901665ecf78a494e122662988cc SHA512 d1a7c44fe9514907f5487d82f6db161e7a7e16fe94c03195aa6286443c399ba6a88e88bc42a658bd3191f056091f9dc124dd7e4ed6b2b664df42232a52f333f5
 MISC metadata.xml 378 BLAKE2B 95e3d451a7fd7af4da58c03b88615a0547c6063c0e4601dde7781db46f0805b06a76d900a0407ace672cf76c2b6c481f775c2b1d7da5653418e26ad71ae7ec32 SHA512 1da43e6a6e6907de98682dcb9221b33327d2fec70675452e40262eada16d7c94f312a1dbe40a770b064d4034848d84801f3a9c5f887a669664722198cadfea6b
diff --git a/app-text/wdiff/wdiff-1.2.2-r1.ebuild b/app-text/wdiff/wdiff-1.2.2-r2.ebuild
index 9f0af0d46f14..4418e21d3f05 100644
--- a/app-text/wdiff/wdiff-1.2.2-r1.ebuild
+++ b/app-text/wdiff/wdiff-1.2.2-r2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DESCRIPTION="Create a diff disregarding formatting"
 HOMEPAGE="https://www.gnu.org/software/wdiff/"
@@ -16,14 +16,16 @@ RESTRICT="!test? ( test )"
 RDEPEND="
 	sys-apps/diffutils
 	sys-apps/less
-	sys-libs/ncurses:0="
-DEPEND="${RDEPEND}
+	sys-libs/ncurses:=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
 	sys-apps/texinfo
-	test? ( app-misc/screen )"
+	test? ( app-misc/screen )
+"
 
 src_configure() {
-	econf \
-		$(use_enable experimental)
+	econf $(use_enable experimental)
 }
 
 src_test() {
@@ -31,5 +33,6 @@ src_test() {
 	# when an incompatible screenrc is found
 	touch tests/screenrc || die
 	export SYSSCREENRC=tests/screenrc SCREENRC=tests/screenrc
+
 	default
 }
diff --git a/dev-embedded/Manifest.gz b/dev-embedded/Manifest.gz
index f7f5e76522fe..5365c3b69d9a 100644
--- a/dev-embedded/Manifest.gz
+++ b/dev-embedded/Manifest.gz
diff --git a/dev-embedded/avrdude/Manifest b/dev-embedded/avrdude/Manifest
index ae0830ab8683..08fc8550117a 100644
--- a/dev-embedded/avrdude/Manifest
+++ b/dev-embedded/avrdude/Manifest
@@ -1,7 +1,9 @@
 DIST avrdude-6.3.tar.gz 909744 BLAKE2B 3c253571a50c423989fc3fd9c5d6fe11b67fad9ca0d94f4bee0de7309fc22ccfe64102fff74fad47ffcb1874870c0aafd0c003df63285bd05c30efd384f5ef9e SHA512 b671008388d6a552e71066fec46429bc7f6639e8eac41113bcbba5a56212b78be31fcf04956b31e11c6b14888b0f6e825f7458395b9ff4fc28406074c7ded2b2
+DIST avrdude-7.0.tar.gz 2354082 BLAKE2B 44cc6cb82abd4e44f9e7f72901cd9b2a13c9e7635582993ea9a01ea482709ca6a8a3454980446d1196a67cec19a021133d5821731618350336f81fce09d7c049 SHA512 ca3338e6f2f0efc102e70f72531efbd237c5f7bc282d8db5530038f9e20b18a7c2682343bb2baff08c81f8959b066323a444dd64c2362a340a9d9708f90770e0
 DIST avrdude-doc-6.3.pdf 255521 BLAKE2B 3b6a3485b996f0923c00c54970e86c3ab9f40e8a5bd962f5d3e4f87c23c90b61f002b46af9766cc0f117583a54d519c5d8739cb5f8bca0776320243679989716 SHA512 f33b15f6a9247f6646ba8a861f1e86f5d43b1b44438fb95bd53764a73f0c450f669dcb43b6b587390ddbc22dafa02758ddc330a7aab1651ccca7c8da8e00b755
 DIST avrdude-doc-6.3.tar.gz 39823 BLAKE2B 170ad1eab743435eb414a2d6547be6c86e4d75aed83836eb29285a8d11a43f7eb878104b3b7a70b528522a415a96a841686d07e82b151fc6f726c1f56d54e801 SHA512 b7abd9d0068d2933a1907655832930c455093b4ffbdc2b6fb2405a821cad0ba1c4de3aa5fa0ea7c9b53d06cfa6d5b5658d30a18a4f5c3884d0e15c171a097b29
 EBUILD avrdude-6.3-r1.ebuild 1604 BLAKE2B ee08eb332a7c39e4c6fe962b385feed5194ce7ccbf3fee00735e71525f9034de3cb501cb2073ceb27cdfc9c6e1bd8d0d33971f0b126cf336e304d353ab460230 SHA512 cff807fb969f08f298692ca01d62420f76c59a36b986c58c951e0625384077857f6ce7e3516b6a4622709f2c0655302a378f92ba4fcfde01844eb172ed8ada0e
 EBUILD avrdude-6.3.ebuild 1502 BLAKE2B 514c81ae042089508addc0799707b8c42b3ed042d94a5d301b2d80a8f390a653dce24f770dae0d13a0837a7df37ad237ac8d8625429019537e5038cfd78e8c0e SHA512 9b4e51be693bb57def7829575bf828c8932c7d957152fd3e624a608d0aee2a632026d376fbbe73ef7c1fc4cd8d79fe529b9804693654791719670588a28597d3
+EBUILD avrdude-7.0.ebuild 1757 BLAKE2B b68ffa56d1ee92eabcd40ef6d1f970cce0ef3108c8926c9f73b9bc359420ee22dc87b4e9268a5210f648d92fca6cfa9825a28f8453e43f412be7c4dff58305c6 SHA512 e5ef9a966e0f937c15899d82d1f1423c8981bb6c23cdd122120597eaf408a8c0f9c2c800ff64214cf6086075ee94541be1c9da7a8d523ca63e98799fa3ca1243
 EBUILD avrdude-9999.ebuild 1609 BLAKE2B 155fc4a9215f1e17f2ce9543a039a551caa918137b318d0f2d5ffd10ff86563df51b2bb729b0a49b28bf4fd425baaaf8b5f5f73e6762286ca2cd4df6d44dd02d SHA512 cb02fd8b464d8a2bf4f2e2696c2aed1e4e334a668a53db79d268a13d193041929b00c09bfbcfd839b16c89a1f155df7fd98d062cc29be0afdddb84cf5e1d71f4
-MISC metadata.xml 364 BLAKE2B de7d28e39ecb3d05075b85fd66181ffe3a874623efd4cb9a99f9a16b467ca0c1a3d8fa7895b7e33c75162428b08774f5f89474e5b6f167817f5a384b8d9ceb88 SHA512 d15e0de55e3b8e8878ffdcde4fd7a6ae06a8fcd2e30ed0aa7fc5480a8b987edadafa6fc20e4b683c4c8d121192284c7daba4ace47f39c0713f4f0e6fe728924c
+MISC metadata.xml 445 BLAKE2B 022417895def5659b262f5b522881b7c3cd9d45129e3adb8bfe598b8301591f6367595ec529ad812c3d814e801939a0f7b41d7dedf101cdd487741f43a2d5a72 SHA512 2d68e3db08f4a8d74b03cdac07ad45c00fe37794fd7cdaeb8ccd0a9dd0972fb0a60e37c8f37f4801b657ee415f4966d591854fc7176a4e274e9ad60b3cbba012
diff --git a/dev-embedded/avrdude/avrdude-7.0.ebuild b/dev-embedded/avrdude/avrdude-7.0.ebuild
new file mode 100644
index 000000000000..be2345c4ae9f
--- /dev/null
+++ b/dev-embedded/avrdude/avrdude-7.0.ebuild
@@ -0,0 +1,64 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="AVR Downloader/UploaDEr"
+HOMEPAGE="https://avrdudes.github.io/avrdude https://github.com/avrdudes/avrdude"
+SRC_URI="https://github.com/avrdudes/avrdude/archive/refs/tags/v${PV}.tar.gz -> avrdude-${PV}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="ftdi readline"
+
+RDEPEND="
+	dev-libs/hidapi
+	virtual/libelf:=
+	virtual/libusb:0
+	virtual/libusb:1
+	ftdi? ( dev-embedded/libftdi:1= )
+	readline? ( sys-libs/readline:0= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-devel/bison
+	sys-devel/flex
+"
+
+src_prepare() {
+	cmake_src_prepare
+
+	# CMAKE_INSTALL_LIBDIR is not respected. Fixed in the next release.
+	sed -i "s@DESTINATION lib@DESTINATION $(get_libdir)@g" \
+		src/CMakeLists.txt || die
+
+	# For some reason 'TYPE SYSCONF' and 'CMAKE_INSTALL_SYSCONFDIR'
+	# prepends '/usr' so the config ends up getting installed as
+	# '/usr/etc/avrdude.conf' which is not correct.
+	sed -i 's@TYPE SYSCONF@DESTINATION ${CMAKE_INSTALL_FULL_SYSCONFDIR}@' \
+		src/CMakeLists.txt || die
+}
+
+src_configure() {
+	# Optional libraries like libftdi aren't gated behind options and
+	# find_package calls, but find_library is called directly
+	# instead.
+	#
+	# Set the cache variable to an empty string if we do not want a
+	# library to be automatically detected.
+	local mycmakeargs=(
+		-DBUILD_DOC=OFF # This currently does nothing...
+		-DBUILD_SHARED_LIBS=ON
+		-DDEBUG_CMAKE=ON
+		-DHAVE_LIBFTDI=''
+		-DHAVE_LIBHID=''
+		-DHAVE_LINUXGPIO=ON # Seems like there is no reason to have this off.
+		-DHAVE_LINUXSPI=ON # Ditto.
+	)
+	use ftdi || mycmakeargs+=( -DHAVE_LIBFTDI1='' )
+	use readline || mycmakeargs+=( -DHAVE_LIBREADLINE='' )
+	cmake_src_configure
+}
diff --git a/dev-embedded/avrdude/metadata.xml b/dev-embedded/avrdude/metadata.xml
index 130f6cdf00c7..b9a0b133cefe 100644
--- a/dev-embedded/avrdude/metadata.xml
+++ b/dev-embedded/avrdude/metadata.xml
@@ -8,4 +8,7 @@
 	<use>
 		<flag name="ftdi">Enable support for USB FTDI chips via <pkg>dev-embedded/libftdi</pkg></flag>
 	</use>
+	<upstream>
+		<remote-id type="github">avrdudes/avrdude</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 49d57556b2e4..f2052d179035 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/swig/Manifest b/dev-lang/swig/Manifest
index 94ae9b98a384..396bd65121cb 100644
--- a/dev-lang/swig/Manifest
+++ b/dev-lang/swig/Manifest
@@ -1,5 +1,3 @@
-DIST swig-3.0.12.tar.gz 8149820 BLAKE2B 05ce913dedbbde26592619e0edc65050cb31a517f309c1188252cb8c276147cb28ebf4d8534c31b75c4ed8be5d42223b432a7318bf8eb5b2d4d528e5ff9a781b SHA512 5eaa2e06d8e4197fd02194051db1e518325dbb074a4c55a91099ad9c55193874f577764afc9029409a41bd520a95154095f26e33ef5add5c102bb2c1d98d33eb
 DIST swig-4.0.2.tar.gz 8097014 BLAKE2B 4c36b7e9b9bf1663779aa31b0eda8a1fe443695d945bcc1642c3404b22e45440def85e58dd65dc18a2ca8c00ffdcfe0f1d75373b7becc0b0e5402fda90b8c29a SHA512 05e7da70ce6d9a733b96c0bcfa3c1b82765bd859f48c74759bbf4bb1467acb1809caa310cba5e2b3280cd704fca249eaa0624821dffae1d2a75097c7f55d14ed
-EBUILD swig-3.0.12.ebuild 819 BLAKE2B bbc1eac8ae5f8736c8ccbe030ac7b8a09a20a499fefdcc9e4f036a7ed396214e5d1e0e64dbd05ec44b27db046b06ed83471c3e26bf8fee1d20dc99eed5e23771 SHA512 3f3dbd99405f91a1adb610a5950e8aa845a4c7857031dcf523abcd5781def93ae21f74b7fe65303ea68f637e754697904d23a12e20703663f4b90d11e3444d7f
 EBUILD swig-4.0.2.ebuild 954 BLAKE2B dfdf0c2db27888d3d4cfe83522e58bd9eeafce29ed01e2834f8e9b74ec1a699b55286f5945b020915c34e6d4aac3d4627eafd7e1be0e8e2effa1476065b768dc SHA512 1e04c8f7c2d2edb34cc082d21dfee6e24324392c598fcf6e91c8cae52b4df0ee18ea4e95611e19c1ba84b589949aee9f2f6e7a517dec5a9d025854be9eb7801a
 MISC metadata.xml 1019 BLAKE2B 1f6a79945d3bb92bd9b5c06f7b4e96c8c9f8f6e68d5c13890247d2c08adf46409a194e3198fb3df19f699a176fe92bebc1e7ba6eb0944a0db12c5e3271043552 SHA512 5ba26e3670ba852648a243f14efe096e52781418eb4d07cabc1bcf46efcd098d099ecbb3d504862540db796279fd855a581d60dd3b1de2f60e9d542e3ccb9b00
diff --git a/dev-lang/swig/swig-3.0.12.ebuild b/dev-lang/swig/swig-3.0.12.ebuild
deleted file mode 100644
index fc8b43deec07..000000000000
--- a/dev-lang/swig/swig-3.0.12.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Simplified Wrapper and Interface Generator"
-HOMEPAGE="http://www.swig.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+ BSD BSD-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="ccache doc pcre"
-RESTRICT="test"
-
-DEPEND="pcre? ( dev-libs/libpcre )
-	ccache? ( sys-libs/zlib )"
-RDEPEND="${DEPEND}"
-
-DOCS=( ANNOUNCE CHANGES CHANGES.current README TODO )
-
-src_configure() {
-	econf \
-		$(use_enable ccache) \
-		$(use_with pcre)
-}
-
-src_install() {
-	default
-
-	if use doc; then
-		docinto html
-		dodoc -r Doc/{Devel,Manual}
-	fi
-}
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 7a69778713e0..069140f96d88 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/mimalloc/Manifest b/dev-libs/mimalloc/Manifest
index c2bcb61975fe..8dc3884c815a 100644
--- a/dev-libs/mimalloc/Manifest
+++ b/dev-libs/mimalloc/Manifest
@@ -1,5 +1,3 @@
-DIST mimalloc-2.0.5.tar.gz 1125567 BLAKE2B 9148ba4af7620eec36e1dde0f6fd2d1e3e9937bd2286ac790a727052402c3286b55387236de3a77e4405983c080bb7acae8deb3334cf9103fcf3f90250080204 SHA512 d164392ace523a3fa0aa00fc58d8a9e8fbe913f07957e19ca977675b389e6d2a2eaf4772e72cae0d87aabb960f3fd6ea3923a066ece4ba4fdaa0c6860cfa414d
 DIST mimalloc-2.0.6.tar.gz 1127052 BLAKE2B bd8a38cc0eab6ad950a63f494f24e6a91c50d2104335e9ce70963a7baadd26c7a2b7440b2fcabe502d9961549222873d017cb525bf5b32da967cf51aa167603c SHA512 f2fc0fbfb6384e85959897f129e5d5d9acc51bda536d5cabcd7d4177dbda9fb735b8a8c239b961f8bea31d37c9ae10f66da23aa91d497f95393253d4ac792bb3
-EBUILD mimalloc-2.0.5-r2.ebuild 691 BLAKE2B 623b98c9393d1ad2c377e95908f962f221f884448cde7a92c139abc98443a3e3d1bccf00e1d9cdb6ca3f94ce9721a60cffe6ebc7355ab2b0e2ba299a48cc2160 SHA512 35824f644c31590359072a350ca33daf11566b33b40d26ff76986ed5860a8fa5762b9018753c8630662d0e6abed4844574c672f9b6b4d9d046e20d2c59837635
 EBUILD mimalloc-2.0.6.ebuild 698 BLAKE2B 3eb6400c93be33c1f752156d6e851ae072fcf9029b0d56709e793b84a65d8543c8a6ec729887f10b1d3d0b2982e2a7c789c3279962161725c01c474e91dac547 SHA512 4b6fa39b2283504cf306463614b3d6700ec0170b4c02317911056133c2cef9a7e106c1a874f86d555f0aaeadb01755e0961c905bc3510ad5172dce94c0e33b4d
 MISC metadata.xml 431 BLAKE2B 6b4122d0fc6609b5ee6d4fd345727301fdf1bf0943507240002d4a574aeb84622a1be6af2f095d231c9d3da303de39485234b7136a91a2d819a5434859eeea35 SHA512 9506d3cd5946abbad9a051e8cda535d361040d015e57b3b0f73a7a144e63d88e972aa427d52373ddc96b60868ee5d21e0f74b6001332343f2f57971ee27e5ab4
diff --git a/dev-libs/mimalloc/mimalloc-2.0.5-r2.ebuild b/dev-libs/mimalloc/mimalloc-2.0.5-r2.ebuild
deleted file mode 100644
index 8710584db2d5..000000000000
--- a/dev-libs/mimalloc/mimalloc-2.0.5-r2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake-multilib
-
-DESCRIPTION="A compact general purpose allocator with excellent performance"
-HOMEPAGE="https://github.com/microsoft/mimalloc"
-SRC_URI="https://github.com/microsoft/mimalloc/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/2"
-KEYWORDS="amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-src_configure() {
-	local mycmakeargs=(
-		# TODO: build hardened variant?
-		#-DMI_SECURE=$(usex hardened)
-
-		-DMI_INSTALL_TOPLEVEL=ON
-		-DMI_BUILD_TESTS=$(usex test)
-
-		-DMI_BUILD_OBJECT=OFF
-		-DMI_BUILD_STATIC=OFF
-	)
-
-	cmake-multilib_src_configure
-}
diff --git a/dev-libs/ossp-uuid/Manifest b/dev-libs/ossp-uuid/Manifest
index c7aa570e04a1..e8e63b7f1ecb 100644
--- a/dev-libs/ossp-uuid/Manifest
+++ b/dev-libs/ossp-uuid/Manifest
@@ -6,6 +6,5 @@ AUX ossp-uuid-1.6.2-hwaddr.patch 4535 BLAKE2B e91cb616e6f60f410e6d214359da6f785d
 AUX ossp-uuid-1.6.2-manfix.patch 539 BLAKE2B 040ee470f34d74ed076264310898697a6ee6a624dc96e226f9f696e5db9380b5132a0b3b0fae528fdcd6d8281f60fc94c34d4f67a4525399ff85310c243b0d72 SHA512 d0467ab931e153b10ac95a45830d55848fd40f23704bcf9bdb9445effa5056c164c966cb84f883c6c290cd1a711f1ea821ef0fff6e027e6fbd4008e9feee8bae
 AUX ossp-uuid-1.6.2-uuid-preserve-m-option-status-in-v-option-handling.patch 2535 BLAKE2B b5d2aa2673ec14779f4bda0c28609c807071eaf88a876d472bbc19de891b04aad47bdd4105712e28e604a968062ffdf199b60f1903fd89dd4caabd919bac2348 SHA512 64634327b2095bac0f8f9778b5c6e09edbaf3f6993aea344e3d8ff0bb661d0e0afae9806a364a33c3be6ca7dd7a23b9b8a501c742e99ad88fbefb88d0c4cfe8c
 DIST uuid-1.6.2.tar.gz 397048 BLAKE2B 2240c2e19a09c7b7df0428fc316b46a69b3476ec852321f1ca43c0688b73da647cebf06e8efd8a89f55c11108ef4b9627a33ae1ec235cdda1ac7922389903c3c SHA512 16c7e016ce08d7679cc6ee7dec43a886a8c351960acdde99f8f9b590c7232d521bc6e66e4766d969d22c3f835dcc2814fdecc44eef1cd11e7b9b0f9c41b5c03e
-EBUILD ossp-uuid-1.6.2-r6.ebuild 2173 BLAKE2B 4b519dfedca832601ec5c253f3c05bc9f591116dc651fe7d4b2ae77f6a77a44bb10acfb512164e5cf43ecb4bd86270116e8ed4c77979d4411021da03c7d5f958 SHA512 b01c2e04a003a85a469417c973bbfd03f2a1d164003a50c137c8f08e37cafbb8f9260086edcae22c6f8045cf55c2787e649ceb285ab7bbafe8998b5910fba78a
-EBUILD ossp-uuid-1.6.2-r7.ebuild 2180 BLAKE2B 44776a7c4da5d2c4dd9c2285d6f1a42c15fe6ab2c3939edfd1479985f91abfb7b7ae394504cba433d2a8d50c5ad6efe34828cf324b89d7989aa1fd254dd39302 SHA512 dda413f7fb52f9bce8e267ba2ae29d10f551fe180562f7559f5d66991244a0d4e4329fb58edb5bfb508cc77c005e2ec62ceca67c3eef79eaea413f69f54ca3a3
+EBUILD ossp-uuid-1.6.2-r7.ebuild 2176 BLAKE2B 1ad5acdcea2441b0871535f059ab129017bdd92ac5f5d58012d67320f53feba0097a7bdb4cd5b239d2ab304a9290394e7703dd8a64c59376a2bed0177ff0f3a5 SHA512 2d5edd80e85d22fd4294acc193387a62534d7ad7d8eafb43db88839fc08bdf4aea822e23a75a746a64fda0f2e85a2746d543f3843fddf81c82a7e911f9f6f72d
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r6.ebuild b/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r6.ebuild
deleted file mode 100644
index 7afc78c9b5c8..000000000000
--- a/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r6.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-MY_P="uuid-${PV}"
-
-GENTOO_DEPEND_ON_PERL="no"
-
-inherit perl-module
-
-DESCRIPTION="An ISO-C:1999 API with CLI for generating DCE, ISO/IEC and RFC compliant UUID"
-HOMEPAGE="http://www.ossp.org/pkg/lib/uuid/"
-SRC_URI="ftp://ftp.ossp.org/pkg/lib/uuid/${MY_P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="+cxx perl static-libs"
-
-DEPEND="perl? ( dev-lang/perl:= )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-
-	eapply \
-		"${FILESDIR}/${P}-gentoo-r1.patch" \
-		"${FILESDIR}/${P}-gentoo-perl.patch" \
-		"${FILESDIR}/${P}-hwaddr.patch" \
-		"${FILESDIR}/${P}-manfix.patch" \
-		"${FILESDIR}/${P}-uuid-preserve-m-option-status-in-v-option-handling.patch" \
-		"${FILESDIR}/${P}-fix-whatis-entries.patch" \
-		"${FILESDIR}/${P}-fix-data-uuid-from-string.patch"
-
-	eapply_user
-}
-
-src_configure() {
-	# Notes:
-	# * collides with e2fstools libs and includes if not moved around
-	# * pgsql-bindings need PostgreSQL-sources and are included since PostgreSQL 8.3
-	econf \
-		--includedir="${EPREFIX}"/usr/include/ossp \
-		--with-dce \
-		--without-pgsql \
-		--without-perl \
-		--without-php \
-		$(use_with cxx) \
-		$(use_enable static-libs static)
-}
-
-src_compile() {
-	default
-
-	if use perl; then
-		cd perl
-		# configure needs the ossp-uuid.la generated by `make` in $S
-		perl-module_src_configure
-		perl-module_src_compile
-	fi
-}
-
-src_install() {
-	local DOCS=( AUTHORS BINDINGS ChangeLog HISTORY NEWS OVERVIEW PORTING README SEEALSO THANKS TODO USERS )
-	default
-	unset DOCS #unset so that other eclasses don't try to install them and possibly fail
-	if use perl ; then
-		cd perl
-		perl-module_src_install
-	fi
-
-	use static-libs || rm -rf "${ED}"/usr/lib*/*.la
-
-	mv "${ED}/usr/$(get_libdir)/pkgconfig"/{,ossp-}uuid.pc
-	mv "${ED}/usr/share/man/man3"/uuid.3{,ossp}
-	mv "${ED}/usr/share/man/man3"/uuid++.3{,ossp}
-}
-
-src_test() {
-	export LD_LIBRARY_PATH="${S}/.libs" # required for the perl-bindings to load the (correct) library
-	default
-
-	use perl && emake -C perl test
-}
diff --git a/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r7.ebuild b/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r7.ebuild
index 7a9a0a1c12aa..6aa8c6c2d688 100644
--- a/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r7.ebuild
+++ b/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r7.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="+cxx perl static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/tree-sitter-python/Manifest b/dev-libs/tree-sitter-python/Manifest
index ea6da0643df9..3e07e2ce0412 100644
--- a/dev-libs/tree-sitter-python/Manifest
+++ b/dev-libs/tree-sitter-python/Manifest
@@ -1,3 +1,5 @@
 DIST tree-sitter-python-0.19.1_p20211112.tar.gz 141155 BLAKE2B ee524faca6bebf6c7f27d34ba418c4494877d6cf33a17b4ac0e5c148db58a8e17b2ec8ba992139b72e1fc88c9c93bcdb6a8cbd4a47b9cc65ad3097e08b4ee339 SHA512 25d5b3f8bac1daf8c9971278b8c209f2d953310cd31afd2e375d48354845930e553d0067dd9c0e93565d1996a803d0b5445f48720b0bc7f3d38e73f40cdbbc90
+DIST tree-sitter-python-0.20.0.tar.gz 155192 BLAKE2B 1b81eb80dc5a69124ba8579f905b83290b233b7aa7f41b13ead293ade576b4c2f4cb4ca52d34f1bd59131e6b0ff2a3058d8119bedc235fe6a8afd49b0856580e SHA512 6eff62f40a0cf95c9acb8bd571ed5d74ab9db7d15104a039273861c28f932c79d5e4d32e3017ed38fe35a8e92660f46bcdab8091a2dd2cc0d9699598a6d46606
 EBUILD tree-sitter-python-0.19.1_p20211112.ebuild 340 BLAKE2B 8c8f3adf3cde7fecc1228886b2e9bde51e36a16b0bbcf5027c8763666d6ae1748c7f3345ff5ad3308fe7f293a9a964fb00b7f5d6771c2aa01be798ddaf6ab8a8 SHA512 7ef197eeb4080aa48f9576e182381fce2b728a696fc3cb3c1473d0277fb7436e90628b128678d4071586a3a5d299abe81d2c05e24e1c06e0dc8d7f4a072d2ecc
+EBUILD tree-sitter-python-0.20.0.ebuild 290 BLAKE2B 684139dc89752f3e9610de4b72ed0c5e327ec1cec4fe9f6ecc22bafc1e9853f508dfd415f7cb868d91519c5c1605dba9d4aea9fa12dc41539dd055695b292058 SHA512 fa9ed2ea177cc82b4fc4f0102cf9950cf57d8c2515a218494fdc5ed77329aa4a63fded54fa47bfffd93d1cca4423bfcdec030cd2ba5f946ff5b16697eab7e0ac
 MISC metadata.xml 561 BLAKE2B 940672a7aee286697c4ce7511e489d0eb01be80fe5814bfc46d8dffa16c628618691a9d613782c88066b54ee961e050b200763af88539918a2c953a501ddc99c SHA512 c3e7a47cd19750d2d2d8d1cbf800fc92ce9166bd2babf0704743a41c2415eb7d9023ae0f1fe8c9e555e785d75794b821f63b09c75ef9b9c0e982434d6dbe1c1b
diff --git a/dev-libs/tree-sitter-python/tree-sitter-python-0.20.0.ebuild b/dev-libs/tree-sitter-python/tree-sitter-python-0.20.0.ebuild
new file mode 100644
index 000000000000..8088400764ad
--- /dev/null
+++ b/dev-libs/tree-sitter-python/tree-sitter-python-0.20.0.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit tree-sitter-grammar
+
+DESCRIPTION="Python grammar for Tree-sitter"
+HOMEPAGE="https://github.com/tree-sitter/tree-sitter-python"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 676ad5ae3897..768a97d9dd7c 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/aesara/Manifest b/dev-python/aesara/Manifest
index b9f7765296d5..4e90c7e0c099 100644
--- a/dev-python/aesara/Manifest
+++ b/dev-python/aesara/Manifest
@@ -3,8 +3,10 @@ DIST aesara-rel-2.6.6.tar.gz 7847814 BLAKE2B e4edd575d49f548fab0ef971dbab88beeb4
 DIST aesara-rel-2.7.0.gh.tar.gz 7854953 BLAKE2B 0daee9dcad9c39d1eddd469930cb540369f9463f947d706691fe1552b8e39340743aa8d8a809fe8b7943bba253ef1b93018738ca13be7147114ab6cf77a3ee37 SHA512 b03a182f366624b496bee46b86d43c68b94d840503317af74113bd5b1c6fefc31e4e4d96d6c5dd129212904729127da949cebf05c5a162711d3872e1747c93a8
 DIST aesara-rel-2.7.1.gh.tar.gz 7857341 BLAKE2B edc31030810ec4193901d258c8666080219befccca17bc6165968f959bd57661f92de86720561ab54266906e2be1a83e0fef3e81a62c2810f0b78cda1dbc5265 SHA512 85a4b24a5f58cbb95db448d01140ff64f9ea39242b204a49ddbb2ff8827a16d0ba454764ed3ce9d2b6ed58a7494c452cda39582ae89691d44d8f91ec43e1f50d
 DIST aesara-rel-2.7.3.gh.tar.gz 7918433 BLAKE2B 5f0eaa5cb241db3fb59bfd5fda0566811cb72e5dc902e15aaa269aa5fea35be1c5c51ef7515a386aa9cb20f769ad793a005e85e9b14d10b8be046788842ee496 SHA512 ffd1a830b69196537c62b21d6307f6d0f0a93f0a23fb0bacbf17934d2e5a454a93d72d33d0e28eec6b49e917770df5fc43134453e0bf1bd8433ee52ce22935be
+DIST aesara-rel-2.7.5.gh.tar.gz 7920343 BLAKE2B 04f7c1cf587799b915a54067a98608cee49de8ab8a50c6d8434aa7ad6bd27b547f9e4a4f71d459d8fca9805f97232a9ba4a1beb5240a8e89dd19f807da2b2957 SHA512 c68dc6e2893d2749d6ec3a74b850979f0766ac65c34bf07af3c0f1a16874e44f5102e1d036a88a7a43f51a44d3fffd65babf67373982362b034a2410124d4aad
 EBUILD aesara-2.6.6.ebuild 2596 BLAKE2B 8559deaccfe85f53d5889c98a2eac4d43c94862e1c24e13a3470057d6c4737f906e7b0351bc0cc2d8c61bbd1210d655dcf2c9c51cf2c8eb4a06f6aa2ca4cbdfc SHA512 37f6ea5bf1920441f3780dcb85129f73c3954413ca87929d6cda3c5d0bd928748f3143649ddee08dda109fe418c2ff0b6cf8ef55bd69f2569a44000770624225
 EBUILD aesara-2.7.0.ebuild 2601 BLAKE2B 004be043e44f1ae16fe8c502114ac47f7e5e818c1a705b8b0a0198fda0ad367ecba4a57aed86bd20b870d52e8d44ec69afb5f7e36f72342d77bc98aed53bd29e SHA512 7bc13b8cf04c7bda7feb91632a3b4126765d2c0b3fa750c69248cc4d4597cfee1753d9425d6c6044facb090e5f46030026a3735f6361871bda1655d806b06ef0
 EBUILD aesara-2.7.1.ebuild 2581 BLAKE2B 4f17dcfeda1e40e614b1df46fccea04e6342620b95624e8252e133cd9b777add9e915e9b1b37814f06967f70119c2da572b37b0f11caa3cefb4aae253bbddebe SHA512 869ce185fba22ccce6ead914f9246cc286c1a146fe3b74ea6b87521bcdc7dac90541d041f3d4f832fd1e9d301bf48bd563ceb8ee1283984aa3c88ff857e03b74
 EBUILD aesara-2.7.3.ebuild 2619 BLAKE2B 02da2de77c42a74b30e752dfede9e87ca023c5efa34f0088e6ba1b680addc342987a0a47be372ff9eab456074a4aeb0c509971ef12cc8c8701e8c5ac089a3bf9 SHA512 2e2caec60b3af8812367f7ab1538fd6ebdcb4e42d4492cf7e8128a840425203a4a9d3aa8c54f0b7fdae53394f3a7152d0b891edd645f88f64224c5e815691935
+EBUILD aesara-2.7.5.ebuild 2616 BLAKE2B 827420e734f8ec6771c1ee54124dd50a34dcaffb267509e762bc3d1b38d327385b53d60edd239ec404bf4d1a9ce4e80462e65e79dd5b0bd7a8c35376ed013ae9 SHA512 5d2b17595a3086483f2443e5d3608117d2e10fb5e64d0b33f2c2b26a346868abaa8ea09c08ba8beff734ee1ae1d0a878e064f2f8862b3f5838883d449bb0efa1
 MISC metadata.xml 506 BLAKE2B be65b6be62282fa47152985d79892fd04105a47e00a427ee8341d27aeff21b144bee7e7d0f16b2f4b617c941bdf5ebd9de37a42c39d117cdfd579c3035d35a74 SHA512 a207ec3db85a8e6f03feabd14da588f0b9ca9a88ab2495ade0f40b516b3bbd20fe78b14698d28da7ceed238737a9f4d63f587156ef609e846b485132d598c6bb
diff --git a/dev-python/aesara/aesara-2.7.5.ebuild b/dev-python/aesara/aesara-2.7.5.ebuild
new file mode 100644
index 000000000000..5dfa54ec6053
--- /dev/null
+++ b/dev-python/aesara/aesara-2.7.5.ebuild
@@ -0,0 +1,92 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1 multiprocessing optfeature
+
+MY_P=aesara-rel-${PV}
+DESCRIPTION="Library for operating on mathematical expressions with multi-dimensional arrays"
+HOMEPAGE="
+	https://github.com/aesara-devs/aesara/
+	https://pypi.org/project/aesara/
+"
+SRC_URI="
+	https://github.com/aesara-devs/aesara/archive/rel-${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	dev-python/cons[${PYTHON_USEDEP}]
+	dev-python/etuples[${PYTHON_USEDEP}]
+	dev-python/logical-unification[${PYTHON_USEDEP}]
+	dev-python/minikanren[${PYTHON_USEDEP}]
+	dev-python/filelock[${PYTHON_USEDEP}]
+	<dev-python/numpy-1.23[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/scipy[${PYTHON_USEDEP}]
+	dev-python/typing-extensions[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/aesara-2.6.5-compiledir-tid.patch
+)
+
+distutils_enable_sphinx doc 'dev-python/sphinx_rtd_theme'
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# speed tests are unreliable
+		tests/scan/test_basic.py::test_speed
+		tests/scan/test_basic.py::test_speed_rnn
+		tests/scan/test_basic.py::test_speed_batchrnn
+		tests/link/test_vm.py::test_speed
+		tests/link/test_vm.py::test_speed_lazy
+		tests/tensor/test_gc.py::test_merge_opt_runtime
+
+		# rounding problem?
+		# https://github.com/aesara-devs/aesara/issues/477
+		tests/tensor/test_math_scipy.py::TestGammaUBroadcast::test_good
+		tests/tensor/test_math_scipy.py::TestGammaUInplaceBroadcast::test_good
+	)
+	local EPYTEST_IGNORE=(
+		# we do not package numba
+		tests/link/test_numba.py
+		tests/link/test_numba_performance.py
+		# ..or jax
+		tests/link/test_jax.py
+	)
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x AESARA_FLAGS="cxx=${CXX}"
+	AESARA_FLAGS+=",config.gcc__cxxflags=\"${CXXFLAGS}\""
+	AESARA_FLAGS+=',compiledir_format="compiledir_%(thread_id)s"'
+
+	epytest -p xdist.plugin -n "$(makeopts_jobs)"
+	# clean up the compiledir, as it can grow pretty large
+	rm -r "${HOME}"/.aesara || die
+}
+
+python_compile() {
+	distutils-r1_python_compile
+	rm "${BUILD_DIR}/install$(python_get_sitedir)/bin/__init__.py" || die
+}
+
+pkg_postinst() {
+	optfeature "GPU code generation/execution on NVIDIA gpus" dev-util/nvidia-cuda-toolkit dev-util/nvidia-cuda-sdk
+	optfeature "GPU/CPU code generation on CUDA and OpenCL devices" dev-libs/libgpuarray dev-python/pycuda
+}
diff --git a/dev-python/ecdsa/Manifest b/dev-python/ecdsa/Manifest
index 664cd9902f70..35b0d3d0b05f 100644
--- a/dev-python/ecdsa/Manifest
+++ b/dev-python/ecdsa/Manifest
@@ -1,3 +1,5 @@
 DIST ecdsa-0.17.0.tar.gz 158486 BLAKE2B 45a27aaf362853bd39052a78a7f86b6d2fd220c165724b088cc5285977013b354f5373bcf8295258e9121da2fe6a4b79625afbc097cca756c688afbd542f647c SHA512 23acf993ce4f7f832674a3b70ab870c20172816e27adc836d4c6a876e72a488a830895d63ab6af67cc7cbc83c71f7097d0d530bf67d24c84e69e9fa87031f6fd
+DIST ecdsa-0.18.0.tar.gz 197938 BLAKE2B d4f55591d58a998e69c070983d6cc45720677f83dc6149bd95938c79391df85fe5ce8fe059e961d23b8334d9ac4ef4972bff91a6e9537affc9ddd75c7cbce4f7 SHA512 f26dbeccd8e6ec832405d419b7244ca97b43a2811513493913a4f2f2fd1d2f453068fe0ba7b90b972f42a0d7b9834212fbd4d4559475cffeb1d80075fa954d78
 EBUILD ecdsa-0.17.0.ebuild 778 BLAKE2B 71ee14deaf7622086379397dd83681ddc8c6cbc86cc0192d9d13ebefeb7e2b130a307375e0a306bb0bf43491216d619c43718358b693caabdda4f2750a70500d SHA512 1cad3382bcba9be8424d0e69dbae70eeb78bb8e52d1e243eca13f725213c7cb768b1c5a470fd6cb6be0d85431d48d0e93fcb97d59f239756e16dedb4160e7670
+EBUILD ecdsa-0.18.0.ebuild 780 BLAKE2B 2c4ae2533edb77634fbb5708a6e056f16c146219e8dc62ad772b1876871815bd5bf1a7bb3ecfb8b7a8910e0c58c2069e7ac54b132c632ab80c6011b9070845e3 SHA512 b9c12539ca50ba0078ac5aea6569cc02b1db522d83c0e3c6ae2dab80782016c56fd8c3ca7a7de3f331c4652f97990bde34d7904b68befc68278a93c54ceba9d3
 MISC metadata.xml 408 BLAKE2B c3ccca8cd48352945025d466f06c143e78923085d82bc219087e1015c3e8219ff5f397739420e588a57a47136da6c4adb905d12fad8d06803b2f33688150b1fc SHA512 12f542d7bf34cf1cd3334cb076490ed04b3a484f0aed3896fd02fd049f371a46f11e078253b3f8d4a3165c8893692e4fcc496b61a9aadbaad570e7f194bee22a
diff --git a/dev-python/ecdsa/ecdsa-0.18.0.ebuild b/dev-python/ecdsa/ecdsa-0.18.0.ebuild
new file mode 100644
index 000000000000..3920d4122ee6
--- /dev/null
+++ b/dev-python/ecdsa/ecdsa-0.18.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="ECDSA cryptographic signature library in pure Python"
+HOMEPAGE="
+	https://github.com/tlsfuzzer/python-ecdsa/
+	https://pypi.org/project/ecdsa/
+"
+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 ~ppc-macos ~x64-macos"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/gmpy[${PYTHON_USEDEP}]
+	' 'python*')
+	dev-python/six[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pdm-pep517/Manifest b/dev-python/pdm-pep517/Manifest
index db215bb22b0e..109dbefacf7b 100644
--- a/dev-python/pdm-pep517/Manifest
+++ b/dev-python/pdm-pep517/Manifest
@@ -1,7 +1,5 @@
-DIST pdm-pep517-0.12.7.gh.tar.gz 304959 BLAKE2B 0571a77803b999f88f38da843c5fcf126eeb538c6812c3e245be2fc14d6cd19929559985efba2d245bbf0efb00e412b2133fca6bbe9e63317e6b7311867e0072 SHA512 45da8ab31071a57062fac5b89abe7d912d787d647eda1b45fe3941c43687fe0fe5c8d11e539290035375e17eef808489000513e3128708fcefd851e792757b8f
-DIST pdm-pep517-1.0.0.gh.tar.gz 307117 BLAKE2B 6af1cbeb10bfcf040aaaaf60535d660c00ad84f0a186b508112e224df7eed417ce97ec1bdbf2764549172ecbededf4e9b17b6ae915b71599f04d09f2103c0a7c SHA512 cb8c02af8c4f00cf68e6379c2e93aa0ab7d30f4405debb62f7c46afc10596ab440128f1a7444fe6989d5eafb462bbbe0cfc83325bc1aba92268498a3d96332e8
 DIST pdm-pep517-1.0.1.gh.tar.gz 307357 BLAKE2B f833179b0ea011c4304625f08d3eca85b17163d4af6144f72e6faa2fe1091f9607f53ae051fca4e837009c3132ad6f06ae69cc5288ca8731ffb1ff2ef555d0d0 SHA512 7d90829a351e95f7b53f53d356a60cb170036059f5e6311df46989253b33f126f384a93cd6aa22c95b1ec7aa501e13773ccafabbb41e5237e84537b73dc43f58
-EBUILD pdm-pep517-0.12.7.ebuild 1291 BLAKE2B 6089f1611fc324431bbbf3beaa921932bc04b2383457b511fdeca14c963e3e50a5c0fcdb80d80606870bccdb75072f02b08aea1c8a3e2461175c8ef6001849fd SHA512 d94576e6ef3ad7154ea8d7ea494402e514f54e153d21e9e98bdc8220193750d76bb6719400c56a5fc62a4b1c27e0b5ba24de41f090c0a7f4876031c2ba716241
-EBUILD pdm-pep517-1.0.0.ebuild 1291 BLAKE2B 6089f1611fc324431bbbf3beaa921932bc04b2383457b511fdeca14c963e3e50a5c0fcdb80d80606870bccdb75072f02b08aea1c8a3e2461175c8ef6001849fd SHA512 d94576e6ef3ad7154ea8d7ea494402e514f54e153d21e9e98bdc8220193750d76bb6719400c56a5fc62a4b1c27e0b5ba24de41f090c0a7f4876031c2ba716241
+DIST pdm-pep517-1.0.2.gh.tar.gz 307938 BLAKE2B 711cc77c4ec4a3002557b5537c931215254d6fd724bf80f5457750100d55aba580b0f5fdbf8b17a31e5b02b42a94b62bc72eb99693fb59c3ab76364666b51b15 SHA512 bb827a6130299acab18714c7380f81fa530b95e3bc1e78bca810c116472269f050df45d04ef69d90a1ad96dd6bc965a50edc01bc9c429b96eefb76d62c66b8ae
 EBUILD pdm-pep517-1.0.1.ebuild 1291 BLAKE2B 6089f1611fc324431bbbf3beaa921932bc04b2383457b511fdeca14c963e3e50a5c0fcdb80d80606870bccdb75072f02b08aea1c8a3e2461175c8ef6001849fd SHA512 d94576e6ef3ad7154ea8d7ea494402e514f54e153d21e9e98bdc8220193750d76bb6719400c56a5fc62a4b1c27e0b5ba24de41f090c0a7f4876031c2ba716241
+EBUILD pdm-pep517-1.0.2.ebuild 1291 BLAKE2B 6089f1611fc324431bbbf3beaa921932bc04b2383457b511fdeca14c963e3e50a5c0fcdb80d80606870bccdb75072f02b08aea1c8a3e2461175c8ef6001849fd SHA512 d94576e6ef3ad7154ea8d7ea494402e514f54e153d21e9e98bdc8220193750d76bb6719400c56a5fc62a4b1c27e0b5ba24de41f090c0a7f4876031c2ba716241
 MISC metadata.xml 400 BLAKE2B 0882adff4040585d2881a8712b035a5204909639f80f637526b793fd9e31e9d6cda6119cc069d8ff2e768b9d5807eab16bc27bfd35beb5a613722afead2d8b0c SHA512 484e17561642cf1d26d61a1d95554614b9e77b1ee985cba61ad35dad9c9470d0f64e99385200b8eb7e2cdd5e1427cf7835d6e39c10dece1fb90dd6e81cd15d91
diff --git a/dev-python/pdm-pep517/pdm-pep517-1.0.0.ebuild b/dev-python/pdm-pep517/pdm-pep517-1.0.0.ebuild
deleted file mode 100644
index 65915f36678c..000000000000
--- a/dev-python/pdm-pep517/pdm-pep517-1.0.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=standalone
-PYTHON_COMPAT=( python3_{8..11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A PEP 517 backend for PDM that supports PEP 621 metadata"
-HOMEPAGE="
-	https://pypi.org/project/pdm-pep517/
-	https://github.com/pdm-project/pdm-pep517/
-"
-SRC_URI="
-	https://github.com/pdm-project/pdm-pep517/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-RDEPEND="
-	>=dev-python/cerberus-1.3.4[${PYTHON_USEDEP}]
-	dev-python/license-expression[${PYTHON_USEDEP}]
-	>=dev-python/packaging-21.0[${PYTHON_USEDEP}]
-	>=dev-python/tomli-2[${PYTHON_USEDEP}]
-	dev-python/tomli-w[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	${RDEPEND}
-	test? (
-		dev-vcs/git
-	)
-"
-# setuptools are used to build C extensions
-RDEPEND+="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	rm -r pdm/pep517/_vendor || die
-	find -name '*.py' -exec sed \
-		-e 's:from pdm\.pep517\._vendor\.:from :' \
-		-e 's:from pdm\.pep517\._vendor ::' \
-		-i {} + || die
-	distutils-r1_src_prepare
-}
-
-src_test() {
-	git config --global user.email "test@example.com" || die
-	git config --global user.name "Test User" || die
-	distutils-r1_src_test
-}
diff --git a/dev-python/pdm-pep517/pdm-pep517-0.12.7.ebuild b/dev-python/pdm-pep517/pdm-pep517-1.0.2.ebuild
index 65915f36678c..65915f36678c 100644
--- a/dev-python/pdm-pep517/pdm-pep517-0.12.7.ebuild
+++ b/dev-python/pdm-pep517/pdm-pep517-1.0.2.ebuild
diff --git a/dev-python/toolz/Manifest b/dev-python/toolz/Manifest
index 511b09d0cd66..d6ba118b7d83 100644
--- a/dev-python/toolz/Manifest
+++ b/dev-python/toolz/Manifest
@@ -1,3 +1,5 @@
 DIST toolz-0.11.2.tar.gz 65928 BLAKE2B 3a2baddae437272e8f3efb665b63df127b3ec6bc2a68f3381651a1a3a3b45e4de6e575a328306fac95e9261228ee91193effd4aeca8d115f1608cb2561d50f13 SHA512 67e8aaea3f9fb8811027f19aa9cf56ab980e4f9cea43978ed9515662c78a7bea12314054b2c26da483b055382d4b080125c011fc43bc48b0965a6ff8415f7168
+DIST toolz-0.12.0.tar.gz 66264 BLAKE2B a68bd895a4d500baebae02dce389adabbebe3eaa103ed2753ebd42d84dba54d9ef0b1467738b6a2eed14af24e197a12ef6b6c6907bcf4633252256793e1eac5f SHA512 6c1376f978a1ab469a6fcca9a5ccaf8b8f1bdf92e4484ff0bad947d6727f390ed6571426070a81a0e123725269043ded28294e57921bde2bb9ff87b048a5405f
 EBUILD toolz-0.11.2-r1.ebuild 516 BLAKE2B 6edf754fc8464671be8cc7d9a11ad178ce4f96eb6679f026d51de8fe587b27a400dc7bf28d8a0f53b5bfe2f2d6defb1c16461896370a40a1933fa2289d68d09e SHA512 eec8fe965902bd8d44afcf13effbefb005aa9d2c7012663ef42464a98bacfebcf8ae2fb63cc6e2d3b55d15996bb1dacd141b50781e9f3b6456279e313eae08aa
+EBUILD toolz-0.12.0.ebuild 632 BLAKE2B 2f6da5d62f32c1f6392122d431ce062bfd0762f8f5e41410a9c8c2ea82a6eafb8d47a5cc5849857a60364da7f1fc28d37ee988bfc50ad2a83f98f8d3183ed044 SHA512 caeeb14faf76e24bc6f9f7b986639108b6d6ce72cbaec9cd6f6703aa5afd6fc3d2c506e3a62c0f84b8ef5baa3d74c88546d7b50e407f88238969b1b5c113879a
 MISC metadata.xml 333 BLAKE2B eb9425478d9c8d007d609994b4cb8eb6b6a71dc4ba5f6c25252575a9eb43a8415457e4d51051a65bf1d5a4cfd638a1467258849da0314d5ec54ee3c7e4a7b331 SHA512 9e29b105592f2c423ac284af853060343d60f491f9e468a44859ba2fe491db835fb3fe18ffe74b3135b56b015234c37e824ca6953e56db1cb5c811409f730bc5
diff --git a/dev-python/toolz/toolz-0.12.0.ebuild b/dev-python/toolz/toolz-0.12.0.ebuild
new file mode 100644
index 000000000000..85ec887510f1
--- /dev/null
+++ b/dev-python/toolz/toolz-0.12.0.ebuild
@@ -0,0 +1,27 @@
+# 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="List processing tools and functional utilities"
+HOMEPAGE="
+	https://github.com/pytoolz/toolz/
+	https://pypi.org/project/toolz/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest
+}
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 3a4d2932eadb..c69d0ba3211f 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/redis/Manifest b/dev-ruby/redis/Manifest
index 076d8d83337e..dbe1a400568e 100644
--- a/dev-ruby/redis/Manifest
+++ b/dev-ruby/redis/Manifest
@@ -1,4 +1,4 @@
-AUX redis-4.1.4-local-redis-server.patch 1454 BLAKE2B cfbb707109cac75fb38a614c41b3cd0cb9b9f70bc9e62a2fcdcf9208e7b1b0c3709101d788d1158b0cc3c4e47f9817a82e88ea2165b85304474f47cd1d1cdac6 SHA512 903d186c9a834208f89b06c4ea2ae2d8e8559e0d8d5d0e71a0c7ab8ffd212463e34b1da551b5ad1267a3283eb4c735fb85a94b696d403399368d3d97a2b50abb
-DIST redis-rb-4.1.4.tar.gz 125556 BLAKE2B c1a9e7a365bb12c4aaacfdaff776e370c715a594a05c4270c2dfe85bdc540e915f797fbfa1dc87e10fb03faa56ff572b7e24f7a1244166ea1e1b611900bf22bb SHA512 6c12a75832e8493891ba50ca452960b5748593334287a93c40f117b0e522d483ca0af9a6510271c19f306dfb89a71dd9a7d02c1c8ad3ad82e1d4b31f0b51adad
-EBUILD redis-4.1.4.ebuild 1243 BLAKE2B 0ecf01be3d4fed5e69d23bcbc4aa142141649f8a545b7b900fe0eea26480f431f4a9fad81ea028a9bf528ce2b6fe01b3fb661318c6da2d190eb913e9862aa01a SHA512 930a2c96ed342c158dd2b090bb2bede4cf79823ca10db3ec0ee3a7781daa4f7091cdad6662250896605a2bacada0610b75245a6cd7d0b153e159a035bfbc9f80
+AUX redis-4.7.1-local-redis-server.patch 1475 BLAKE2B 46a5703b463372ef30184a1108b3128672bcd2bb7c77b9b268ae336199d113ccdd439718ede4ec066f1659d262ad2404f2c01419efec08c214a2c045f68ac118 SHA512 6271610c96a006c26e2e1a4a7ea272ff3feac94f86538ee206e83ed8fde5082334b8c8a0decf584084a38b31551456ab80fd6b8ae1cc5ad3660e6a447f70878e
+DIST redis-rb-4.7.1.tar.gz 142130 BLAKE2B 12c9bdafe32e80e2c8f515a437f44a3673381ee6257bf4eb95395e7229134e54706a1c7eefa880397e3b2a10cce6c70856b30108f1c941fc9ee6307989ba4be1 SHA512 33aba308a501593b9d442f346d5654a734a889a45ee581092684b9aba5eccfd4efb790c8dcbb73a83e626b8b2da07d2a4535d698fd2d2696efb217ac522ccd89
+EBUILD redis-4.7.1.ebuild 1109 BLAKE2B 3091c263e18078f17253a7f43203c77ed368e455ed7145c2d69a4e062db07775fedb77162cb3671a9cfa0478eae1b7840569b9f0a0ecfb25343be79add53e8fc SHA512 94c9f0d9860f74951216b378a610d77484b9c3a435b50c2d0503ef787ac1a8c15954d1aecdfbb29b97b10a857f429220c6efdbc88a424e5bc99d6915f1297c18
 MISC metadata.xml 341 BLAKE2B 2a18679e5570f1b5ef6e1fd5d449a75872c223d2e228bba1ee6390d90136f2156f964e77380d722f71d0c2334dc17b490b9b45b452ae7ada2609dab0543e1591 SHA512 faea0064c473d0ef90303d9299d5ea9dd91fd7ce4be7e28a28bee9f5d8bf25d5a880f6cd3990c2c6c7d183a43aa1a26050e360fdd1ffcbc086bd81a45c51258f
diff --git a/dev-ruby/redis/files/redis-4.1.4-local-redis-server.patch b/dev-ruby/redis/files/redis-4.7.1-local-redis-server.patch
index b9db61a0a6a7..e220d62e35db 100644
--- a/dev-ruby/redis/files/redis-4.1.4-local-redis-server.patch
+++ b/dev-ruby/redis/files/redis-4.7.1-local-redis-server.patch
@@ -1,7 +1,9 @@
---- a/makefile	2019-06-29 08:02:02.519804948 +0200
-+++ b/makefile	2019-06-29 08:03:43.125559643 +0200
+diff --git a/makefile b/makefile
+index c803066..d50ee93 100644
+--- a/makefile
++++ b/makefile
 @@ -1,16 +1,15 @@
- REDIS_BRANCH       ?= 5.0
+ REDIS_BRANCH       ?= 6.2
 -TMP                := tmp
  BUILD_DIR          := ${TMP}/cache/redis-${REDIS_BRANCH}
  TARBALL            := ${TMP}/redis-${REDIS_BRANCH}.tar.gz
@@ -20,10 +22,10 @@
 -SLAVE_SOCKET_PATH  := ${BUILD_DIR}/redis_slave.sock
 +SLAVE_PID_PATH     := ${TMP}/redis_slave.pid
 +SLAVE_SOCKET_PATH  := ${TMP}/redis_slave.sock
+ HA_GROUP_NAME      := master1
  SENTINEL_PORTS     := 6400 6401 6402
  SENTINEL_PID_PATHS := $(addprefix ${TMP}/redis,$(addsuffix .pid,${SENTINEL_PORTS}))
- CLUSTER_PORTS      := 7000 7001 7002 7003 7004 7005
-@@ -43,11 +43,11 @@
+@@ -32,11 +31,11 @@ stop_all: stop_sentinel stop_slave stop stop_cluster
  ${TMP}:
  	@mkdir -p $@
  
@@ -32,7 +34,7 @@
 +#${BINARY}: ${TMP}
 +#	@bin/build ${REDIS_BRANCH} $<
  
- test: 
+ test:
 -	@env SOCKET_PATH=${SOCKET_PATH} bundle exec rake test
 +	@env SOCKET_PATH=${SOCKET_PATH} ${RUBY} -S rake test
  
diff --git a/dev-ruby/redis/redis-4.1.4.ebuild b/dev-ruby/redis/redis-4.7.1.ebuild
index 18843a889001..723a96dd0e6e 100644
--- a/dev-ruby/redis/redis-4.1.4.ebuild
+++ b/dev-ruby/redis/redis-4.7.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 MY_P="redis-rb-${PV}"
 
@@ -24,20 +24,18 @@ SLOT="4"
 KEYWORDS="~amd64 ~arm64"
 IUSE="doc test"
 
-DEPEND="test? ( =dev-db/redis-5* )"
+DEPEND="test? ( <dev-db/redis-7 )"
 
 RUBY_S="${MY_P}"
 
-PATCHES=( "${FILESDIR}/${PN}-4.1.4-local-redis-server.patch" )
+PATCHES=( "${FILESDIR}/${PN}-4.7.1-local-redis-server.patch" )
 
-ruby_add_bdepend "test? ( dev-ruby/mocha )"
+ruby_add_bdepend "test? (
+	dev-ruby/minitest
+	dev-ruby/mocha
+)"
 
 all_ruby_prepare() {
-	# call me impatient, but this way we don't need netcat
-	sed -i \
-		-e '/test_subscribe_past_a_timeout/,+18d' \
-		test/publish_subscribe_test.rb || die "sed failed"
-
 	sed -i -e 's/git ls-files --/echo/' ${RUBY_FAKEGEM_GEMSPEC} || die
 
 	sed -i -e '/test_connection_timeout/askip "requires network"' test/internals_test.rb || die
@@ -46,7 +44,7 @@ all_ruby_prepare() {
 }
 
 each_ruby_test() {
-	RUBY=${RUBY} TMP=${T} MT_NO_PLUGINS=true emake -j1 all
+	RUBY=${RUBY} TMP=${T} MT_NO_PLUGINS=true VERBOSE=true emake -j1 all
 	einfo "Wait 5 seconds for servers to stop"
 	sleep 5
 }
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index a3c412952b05..d8cf6f69d95a 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/potrace/Manifest b/media-gfx/potrace/Manifest
index 8a620ae589a5..87923cb9bb98 100644
--- a/media-gfx/potrace/Manifest
+++ b/media-gfx/potrace/Manifest
@@ -1,5 +1,3 @@
-DIST potrace-1.15.tar.gz 650840 BLAKE2B 1a2074ff0ff958e1c9cbcd35a6267ef7f4bdfa5ba9b511413fa2c5db16a7263ed27291a0bf7c76feb25abd59db099e1096b736eab28a6397accfce88f42fdeff SHA512 c9a8edd4f3339da587b9b32e12c83c8f7b993c7c23f551fa267545d9411679bc024924e23596ed1c83985693fc894b65dfa9f860275de395d9e0a88da37a4f02
 DIST potrace-1.16.tar.gz 657314 BLAKE2B ee6b04f355d593dd1ebcc4833b244e25eaaa69c91f90987d530a4e5a454668dff6ecfb7a5d8270ebbd9e7c177fd447d1b3fe2a343fc4b9413dd3f507c0c6e417 SHA512 10d85ed3fada80951223c65e923b5e6ee3e76e071575971d5b09b996b477ec5ff2403e0337c44963c6b441cc3ba6c4f7009541124a25c16b7721fdebd1f774b9
-EBUILD potrace-1.15.ebuild 796 BLAKE2B 3ca9c7636ce5e73b43a0f0b283702baecd5c2c9679bb748154f4b9628b8a5c0da1313541b765a5c6b29c90e2b5ba83983b70baf9f7be9d4e95879f45698148d7 SHA512 fa276bfc2dfe220688168102a2e04118611014b9511b0af6a8a1d38bde81fedac7365a928db71336b9db3b0cd28bd93dce6bab4da3dd4444dc4995f3e4e0fc7c
 EBUILD potrace-1.16.ebuild 859 BLAKE2B 7b34c9346834b7aa1433187306a64a193fffd94e46522add9c9ae7be004d24f0945e4d8c348d3a1e7aa93ec912ea2e936b8c31e0e79da4abb1d66199cf781bce SHA512 1dcb9cc7b86cfc3f0e68be8d8e02edd956adcb78cdace2a534f3512d9310b64549d41cfe17c4303ec56526c7147a87ed3a0e6f56aabe53ad719038b5d2e16bf1
 MISC metadata.xml 415 BLAKE2B cceb9f3de95f70ee185a8044e965b34efc776df761be895541066c1dfeacd855330e27260c70790996caa0cac4c8ed9f662c61fb327217c58733f3dd268a2775 SHA512 4769d99d39b5f4dde3de07c14f99e8cfe7968dbceb826b111eabb39ec06de29505766657285f85233f0077e790360aac2ffd92a974f0bd02968fff2e1e22c978
diff --git a/media-gfx/potrace/potrace-1.15.ebuild b/media-gfx/potrace/potrace-1.15.ebuild
deleted file mode 100644
index cd386d37305b..000000000000
--- a/media-gfx/potrace/potrace-1.15.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="Transforming bitmaps into vector graphics"
-HOMEPAGE="http://potrace.sourceforge.net/"
-SRC_URI="http://potrace.sourceforge.net/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="metric static-libs"
-
-RDEPEND="sys-libs/zlib"
-DEPEND="${RDEPEND}"
-
-DOCS=( AUTHORS ChangeLog NEWS README )
-
-src_configure() {
-	tc-export CC # bug 610098
-	local myeconfargs=(
-		--enable-shared
-		--enable-zlib
-		--with-libpotrace
-		$(use_enable metric a4)
-		$(use_enable metric)
-		$(use_enable static-libs static)
-	)
-	econf "${myeconfargs[@]}"
-}
diff --git a/media-gfx/renderdoc/Manifest b/media-gfx/renderdoc/Manifest
index b2ab5ac6744a..eab45fdf09e2 100644
--- a/media-gfx/renderdoc/Manifest
+++ b/media-gfx/renderdoc/Manifest
@@ -5,13 +5,8 @@ AUX renderdoc-1.18-env-home.patch 832 BLAKE2B f994893dceded797646b51f7e1a54cbd91
 AUX renderdoc-1.18-system-compress.patch 4699 BLAKE2B 4f37058deef1773a4a35b64415a8c8133b232374e419e490d81864ab0d1600b84a6f15a4760530078c489c97f7e12baff331cb845cdaced2fad4b2525987876d SHA512 08c38cbadb4cce24036dd22b185a78d4bca074c0d8caa44c1567aca414bc00a60a8adf73a2430930a620b624689be31f690fee92919d9245211f1189493ea091
 AUX renderdoc-1.18-system-flags.patch 845 BLAKE2B 0d4aae31af353b2d199ae66ec999beefa04e2105e6368305bb89359806fa99f4b7048c3d6c30a2787a3125718d3cbd7c97d3381f61f4f98a2e08730b5a22db02 SHA512 bd2692f14729360983f5ca4fb8af87085ab5bd209d82f3cfd99e7753d0dd406905a6280051aa5d1476b863566b385cdc28fbe9120d0d6f5efd78411af15b68ef
 AUX renderdoc-1.18-system-glslang.patch 9100 BLAKE2B a033377083705bbbccaa56657eccf632bcc5093bc86f319d3d30e94eed41bf849fe8e983dd9085b1628ecaed9ab0b358a487b40c8672239d4b32ee83e24ab1df SHA512 a0eea5b3c24092f30b2ec5c9fde327b4683839a34a5f11a64fb85b54d645f50b8e87f8fc59cb87450566caa3ad87aadc6baa7c8843256726cb8bd71fb0444dd0
-DIST renderdoc-1.18.tar.gz 46372788 BLAKE2B 3f07e29770e033d96f202fa143c7dd2e422750b28f33d14736c43f667fd45ec1b899e66136e415a2b947fbba7cdf0f822fe1dc6978c5146ae5432b44ed497a75 SHA512 4f7baba39ee8e346d00c2d80b5bf7370adebe0200ea2a95a339b3d207fc58f42bff109ffe922604ad49bcd3b5ff8d1ef2a282dd4aa16f09fd6b57aba06aa493d
-DIST renderdoc-1.19.tar.gz 46514201 BLAKE2B 32027b743afd75797b393194f1c0a1864985ce4a7eb419d47bd3665000b77e3460d5501b555d4206f332db9894d2697a00bae79d831d7f7724737d889a85ff64 SHA512 d3a3d0ec9e5782dea27e00f8eb26e9fbcb764e9ccfca230846fad229ce7f2db48d442365d530ebb4e1f50eb44d596a5c18f269ef635c9d5ae4b9275e676a92eb
-DIST renderdoc-1.19.tar.gz.asc 833 BLAKE2B 809e1db20625ad26f2d4b1d13e1bce67133311072ca314a1f662f2fa46b28e5ced976513f1d7b112266cfe2dbe59cec82e1cc556116b1cb5f47d31e834df8073 SHA512 4897b041dbf697d3255986eb58d5142ead52afeff1761185d13fdfbbb0caee077bb7d485a0527a4d921e141ad8eaf414d9d2db38bdd157937620bb15da2320ec
 DIST renderdoc-1.20.tar.gz 46744415 BLAKE2B 574933653fa37e8a8a4dac4ec1e4156a9761fe3bf086ecf2a5125b51c368dc885f9c27f47fb9f7ddd4318e627431583be1371b92fbd5a5a8ed9f04ed90cc3498 SHA512 5c395cdd68fcacd7d728f4793301a7c11d11bbc09bc1f168d91b18964756f01bd702c0ffda53f3156ee48c06cc2e8c3b2f7ad8da49146e151d8ff6cb7290ed2e
 DIST renderdoc-1.20.tar.gz.asc 833 BLAKE2B 233875056eff2858054566900a3198e857a6970454e4671f57703c5a8a8e1daff3c5d069cba5293791787e7da7db0a40aab17f26df044ed09ca9113c453f8bf6 SHA512 1ccfe4cb190c1c578abbf5e3f0264a00cb6054333f6829e726c2659c352b3ece585a1f3d55e4602908c737a349020c4fd2edc906cf225519ae049338876e0632
 DIST swig-renderdoc-7.tar.gz 4006241 BLAKE2B 619f41239f4aef496264d61f44ae042cf80d3ff28491d452cf11ad07e898554c4a32df6119ee0e8e3de36e6bee61855358cd968ad01c9281976e24e9a6cac839 SHA512 5285a65924c069cfb9f73104ad8a95251badac4001293a1757b97ebead5953730c03289159741f82da4c5afe4f61f7c826b105eaf82df044ed2fa21810242c86
-EBUILD renderdoc-1.18-r2.ebuild 5060 BLAKE2B ae86523a747f334c2167f82dd79edbd379b324f2575126243d1f5d282a8f147eb8a8c58413ce066965bf697bf6b1abf19607ca643cd45227dd4b16d4e5dce803 SHA512 747b1ca95cdeb3f7c93b3a3e488ba964fcf215d1bad15c36cf94442f00697dbca527fc5b31936f8d0432b213f1985490e7e650d7e84e88658e96f5950bcd5f73
-EBUILD renderdoc-1.19.ebuild 5229 BLAKE2B a5eaadd2acc80c490ec955007b06e45f51ddfca2036b2b6c513a0ea29e950ade975aadb42194cb7a414f91be6683dae6a2c345bc34b36b47a00170d8d95779cb SHA512 cdb9a12d97390bd67a2d17723a6fffe9d5706bcebf1069ae02c4cb81f308c6eebffeaf8f3715ccdedac4fb3b9fba5e6678a5afd0b475f65a795f73906e53d06f
 EBUILD renderdoc-1.20.ebuild 5229 BLAKE2B a5eaadd2acc80c490ec955007b06e45f51ddfca2036b2b6c513a0ea29e950ade975aadb42194cb7a414f91be6683dae6a2c345bc34b36b47a00170d8d95779cb SHA512 cdb9a12d97390bd67a2d17723a6fffe9d5706bcebf1069ae02c4cb81f308c6eebffeaf8f3715ccdedac4fb3b9fba5e6678a5afd0b475f65a795f73906e53d06f
 MISC metadata.xml 551 BLAKE2B 6b04ab731ce0f9c836b958914e25fcd4a4b76032fd97ba41f6bda742e99a4b7404de51acac99fe4736ba87e488300e94dc1ef7621a780d0a8e453d0fde0430f2 SHA512 a1c2b5260d0265efe2e1294cb88aa1c43618654c7d989cd8f4bd6e919082ea1d37fed4df8a601a702b5b120d5fb5f6658d3e155c5346dacb17249fed629c04d0
diff --git a/media-gfx/renderdoc/renderdoc-1.18-r2.ebuild b/media-gfx/renderdoc/renderdoc-1.18-r2.ebuild
deleted file mode 100644
index d76b6eb4fa6c..000000000000
--- a/media-gfx/renderdoc/renderdoc-1.18-r2.ebuild
+++ /dev/null
@@ -1,191 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# The swig fork is required for compatibility with both provided and
-# 3rd-party Python scripts.  Required patch was sent to upstream in
-# 2014: https://github.com/swig/swig/pull/251
-MY_SWIG_VER=7
-MY_SWIG=swig-${PN}-${MY_SWIG_VER}
-
-AUTOTOOLS_AUTO_DEPEND="no"
-DOCS_BUILDER="sphinx"
-DOCS_DIR="docs"
-PYTHON_COMPAT=( python3_{9,10} )
-inherit autotools cmake optfeature python-single-r1 docs qmake-utils xdg
-
-DESCRIPTION="A stand-alone graphics debugging tool"
-HOMEPAGE="https://renderdoc.org https://github.com/baldurk/renderdoc"
-SRC_URI="
-	https://github.com/baldurk/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
-	qt5? ( https://github.com/baldurk/swig/archive/${PN}-modified-${MY_SWIG_VER}.tar.gz -> ${MY_SWIG}.tar.gz )
-"
-
-# renderdoc: MIT
-#   + cmdline: BSD (not compatible with upstream lib)
-#   + farm fresh icons: CC-BY-3.0
-#   + half: MIT (not compatible with system dev-libs/half)
-#   + include-bin ZLIB (upstream doesn't exist anymore, maintained in tree)
-#   + md5: public-domain
-#   + plthook: BSD-2
-#   + pugixml: MIT
-#   + radeon gpu analyzer: MIT
-#   + source code pro: OFL-1.1
-#   + stb: public-domain
-#   + tinyfiledialogs: ZLIB
-#   + docs? ( sphinx.paramlinks: MIT )
-# swig: GPL-3+ BSD BSD-2
-LICENSE="BSD BSD-2 CC-BY-3.0 GPL-3+ MIT OFL-1.1 public-domain ZLIB"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="pyside2 qt5"
-REQUIRED_USE="doc? ( qt5 ) pyside2? ( qt5 ) qt5? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	app-arch/lz4:=
-	app-arch/zstd:=
-	dev-libs/miniz:=
-	dev-util/glslang
-	x11-libs/libX11
-	x11-libs/libxcb:=
-	x11-libs/xcb-util-keysyms
-	virtual/opengl
-	pyside2? (
-		$(python_gen_cond_dep '
-			dev-python/pyside2[${PYTHON_USEDEP}]
-		')
-	)
-	qt5? (
-		${PYTHON_DEPS}
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtnetwork:5[ssl]
-		dev-qt/qtsvg:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtx11extras:5
-	)
-"
-DEPEND="${RDEPEND}"
-# qtcore provides qmake, which is required to build the qrenderdoc gui.
-BDEPEND="
-	x11-base/xorg-proto
-	virtual/pkgconfig
-	qt5? (
-		${AUTOTOOLS_DEPEND}
-		${PYTHON_DEPS}
-		dev-libs/libpcre
-		dev-qt/qtcore:5
-		sys-devel/bison
-	)
-"
-
-PATCHES=(
-	# The analytics seem very reasonable, and even without this patch
-	# they are NOT sent before the user accepts.  But default the
-	# selection to off, just in case.
-	"${FILESDIR}"/${PN}-1.18-analytics-off.patch
-
-	# Only search for PySide2 if pyside2 USE flag is set.
-	# Bug #833627
-	"${FILESDIR}"/${PN}-1.18-conditional-pyside.patch
-
-	# Pass CXXFLAGS and LDFLAGS through to qmake when qrenderdoc is
-	# built.
-	"${FILESDIR}"/${PN}-1.18-system-flags.patch
-
-	# Needed to prevent sandbox violations during build.
-	"${FILESDIR}"/${PN}-1.18-env-home.patch
-
-	"${FILESDIR}"/${PN}-1.18-system-glslang.patch
-	"${FILESDIR}"/${PN}-1.18-system-compress.patch
-
-	# Check physical device API version and supported extensions.  Fixes
-	# segfault on some GPU/driver combinations.  Will be in release 1.19
-	"${FILESDIR}"/${PN}-1.18-check-api-ver.patch
-)
-
-DOCS=( util/LINUX_DIST_README )
-
-pkg_setup() {
-	use qt5 && python-single-r1_pkg_setup
-}
-
-src_unpack() {
-	# Do not unpack the swig sources here.  CMake will do that if
-	# required.
-	unpack ${P}.tar.gz
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	# Remove the calls to install the documentation files.  Instead,
-	# install them with einstalldocs.
-	sed -i '/share\/doc\/renderdoc/d' \
-		"${S}"/CMakeLists.txt "${S}"/qrenderdoc/CMakeLists.txt \
-		|| die 'sed remove doc install failed'
-
-	# Assumes that the build directory is "${S}"/build, which it is not.
-	sed -i "s|../build/lib|${BUILD_DIR}/lib|" \
-		"${S}"/docs/conf.py \
-		|| die 'sed patch doc sys.path failed'
-
-	# Bug #836235
-	sed -i '/#include <stdarg/i #include <time.h>' \
-		"${S}"/renderdoc/os/os_specific.h \
-		|| die 'sed include time.h failed'
-}
-
-src_configure() {
-	local mycmakeargs=(
-		# Build system does not know that this is a tagged release, as
-		# we just have the tarball and not the git repository.
-		-DBUILD_VERSION_STABLE=ON
-
-		-DENABLE_EGL=ON
-		-DENABLE_GL=ON
-		-DENABLE_GLES=ON
-		-DENABLE_PYRENDERDOC=$(usex qt5)
-		-DENABLE_QRENDERDOC=$(usex qt5)
-		-DENABLE_VULKAN=ON
-
-		# Upstream says that this option is unsupported and should not
-		# be used yet.
-		-DENABLE_WAYLAND=OFF
-
-		-DENABLE_XCB=ON
-		-DENABLE_XLIB=ON
-
-		# Path to glslang*.cmake.
-		-DGLSLANG_TARGET_DIR="${ESYSROOT}"/usr/$(get_libdir)/cmake
-
-		# renderdoc_capture.json is installed here
-		-DVULKAN_LAYER_FOLDER="${EPREFIX}"/etc/vulkan/implicit_layer.d
-	)
-
-	use qt5 && mycmakeargs+=(
-		-DPython3_EXECUTABLE="${PYTHON}"
-		-DRENDERDOC_SWIG_PACKAGE="${DISTDIR}"/${MY_SWIG}.tar.gz
-
-		# Needed after qtchooser removal, bug #836474.
-		-DQMAKE_QT5_COMMAND="$(qt5_get_bindir)"/qmake
-
-		-DQRENDERDOC_ENABLE_PYSIDE2=$(usex pyside2)
-	)
-
-	use pyside2 && mycmakeargs+=( -DPYTHON_CONFIG_SUFFIX=-${EPYTHON} )
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	docs_compile
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	optfeature "android remote contexts" dev-util/android-tools
-	optfeature "vulkan contexts" media-libs/vulkan-loader
-}
diff --git a/media-gfx/renderdoc/renderdoc-1.19.ebuild b/media-gfx/renderdoc/renderdoc-1.19.ebuild
deleted file mode 100644
index 1503f8651e20..000000000000
--- a/media-gfx/renderdoc/renderdoc-1.19.ebuild
+++ /dev/null
@@ -1,195 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# The swig fork is required for compatibility with both provided and
-# 3rd-party Python scripts.  Required patch was sent to upstream in
-# 2014: https://github.com/swig/swig/pull/251
-MY_SWIG_VER=7
-MY_SWIG=swig-${PN}-${MY_SWIG_VER}
-
-AUTOTOOLS_AUTO_DEPEND="no"
-DOCS_BUILDER="sphinx"
-DOCS_DIR="docs"
-PYTHON_COMPAT=( python3_{9,10} )
-inherit autotools cmake optfeature python-single-r1 docs qmake-utils verify-sig xdg
-
-DESCRIPTION="A stand-alone graphics debugging tool"
-HOMEPAGE="https://renderdoc.org https://github.com/baldurk/renderdoc"
-SRC_URI="
-	https://github.com/baldurk/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
-	qt5? ( https://github.com/baldurk/swig/archive/${PN}-modified-${MY_SWIG_VER}.tar.gz -> ${MY_SWIG}.tar.gz )
-	verify-sig? ( https://github.com/baldurk/renderdoc/releases/download/v${PV}/v${PV}.tar.gz.asc -> ${P}.tar.gz.asc )
-"
-
-# renderdoc: MIT
-#   + cmdline: BSD (not compatible with upstream lib)
-#   + farm fresh icons: CC-BY-3.0
-#   + half: MIT (not compatible with system dev-libs/half)
-#   + include-bin ZLIB (upstream doesn't exist anymore, maintained in tree)
-#   + md5: public-domain
-#   + plthook: BSD-2
-#   + pugixml: MIT
-#   + radeon gpu analyzer: MIT
-#   + source code pro: OFL-1.1
-#   + stb: public-domain
-#   + tinyfiledialogs: ZLIB
-#   + docs? ( sphinx.paramlinks: MIT )
-# swig: GPL-3+ BSD BSD-2
-LICENSE="BSD BSD-2 CC-BY-3.0 GPL-3+ MIT OFL-1.1 public-domain ZLIB"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="pyside2 qt5"
-REQUIRED_USE="doc? ( qt5 ) pyside2? ( qt5 ) qt5? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	app-arch/lz4:=
-	app-arch/zstd:=
-	dev-libs/miniz:=
-	dev-util/glslang
-	x11-libs/libX11
-	x11-libs/libxcb:=
-	x11-libs/xcb-util-keysyms
-	virtual/opengl
-	pyside2? (
-		$(python_gen_cond_dep '
-			dev-python/pyside2[${PYTHON_USEDEP}]
-		')
-	)
-	qt5? (
-		${PYTHON_DEPS}
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtnetwork:5[ssl]
-		dev-qt/qtsvg:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtx11extras:5
-	)
-"
-DEPEND="${RDEPEND}"
-# qtcore provides qmake, which is required to build the qrenderdoc gui.
-BDEPEND="
-	x11-base/xorg-proto
-	virtual/pkgconfig
-	qt5? (
-		${AUTOTOOLS_DEPEND}
-		${PYTHON_DEPS}
-		dev-libs/libpcre
-		dev-qt/qtcore:5
-		sys-devel/bison
-	)
-	verify-sig? ( sec-keys/openpgp-keys-baldurkarlsson )
-"
-
-PATCHES=(
-	# The analytics seem very reasonable, and even without this patch
-	# they are NOT sent before the user accepts.  But default the
-	# selection to off, just in case.
-	"${FILESDIR}"/${PN}-1.18-analytics-off.patch
-
-	# Only search for PySide2 if pyside2 USE flag is set.
-	# Bug #833627
-	"${FILESDIR}"/${PN}-1.18-conditional-pyside.patch
-
-	# Pass CXXFLAGS and LDFLAGS through to qmake when qrenderdoc is
-	# built.
-	"${FILESDIR}"/${PN}-1.18-system-flags.patch
-
-	# Needed to prevent sandbox violations during build.
-	"${FILESDIR}"/${PN}-1.18-env-home.patch
-
-	"${FILESDIR}"/${PN}-1.18-system-glslang.patch
-	"${FILESDIR}"/${PN}-1.18-system-compress.patch
-)
-
-DOCS=( util/LINUX_DIST_README )
-
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/baldurkarlsson.gpg
-
-pkg_setup() {
-	use qt5 && python-single-r1_pkg_setup
-}
-
-src_unpack() {
-	if use verify-sig; then
-	   verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.asc}
-	fi
-
-	# Do not unpack the swig sources here.  CMake will do that if
-	# required.
-	unpack ${P}.tar.gz
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	# Remove the calls to install the documentation files.  Instead,
-	# install them with einstalldocs.
-	sed -i '/share\/doc\/renderdoc/d' \
-		"${S}"/CMakeLists.txt "${S}"/qrenderdoc/CMakeLists.txt \
-		|| die 'sed remove doc install failed'
-
-	# Assumes that the build directory is "${S}"/build, which it is not.
-	sed -i "s|../build/lib|${BUILD_DIR}/lib|" \
-		"${S}"/docs/conf.py \
-		|| die 'sed patch doc sys.path failed'
-
-	# Bug #836235
-	sed -i '/#include <stdarg/i #include <time.h>' \
-		"${S}"/renderdoc/os/os_specific.h \
-		|| die 'sed include time.h failed'
-}
-
-src_configure() {
-	local mycmakeargs=(
-		# Build system does not know that this is a tagged release, as
-		# we just have the tarball and not the git repository.
-		-DBUILD_VERSION_STABLE=ON
-
-		-DENABLE_EGL=ON
-		-DENABLE_GL=ON
-		-DENABLE_GLES=ON
-		-DENABLE_PYRENDERDOC=$(usex qt5)
-		-DENABLE_QRENDERDOC=$(usex qt5)
-		-DENABLE_VULKAN=ON
-
-		# Upstream says that this option is unsupported and should not
-		# be used yet.
-		-DENABLE_WAYLAND=OFF
-
-		-DENABLE_XCB=ON
-		-DENABLE_XLIB=ON
-
-		# Path to glslang*.cmake.
-		-DGLSLANG_TARGET_DIR="${ESYSROOT}"/usr/$(get_libdir)/cmake
-
-		# renderdoc_capture.json is installed here
-		-DVULKAN_LAYER_FOLDER="${EPREFIX}"/etc/vulkan/implicit_layer.d
-	)
-
-	use qt5 && mycmakeargs+=(
-		-DPython3_EXECUTABLE="${PYTHON}"
-		-DRENDERDOC_SWIG_PACKAGE="${DISTDIR}"/${MY_SWIG}.tar.gz
-
-		# Needed after qtchooser removal, bug #836474.
-		-DQMAKE_QT5_COMMAND="$(qt5_get_bindir)"/qmake
-
-		-DQRENDERDOC_ENABLE_PYSIDE2=$(usex pyside2)
-	)
-
-	use pyside2 && mycmakeargs+=( -DPYTHON_CONFIG_SUFFIX=-${EPYTHON} )
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	docs_compile
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	optfeature "android remote contexts" dev-util/android-tools
-	optfeature "vulkan contexts" media-libs/vulkan-loader
-}
diff --git a/media-gfx/ristretto/Manifest b/media-gfx/ristretto/Manifest
index 7dfa6fcd5a00..7f6f35e56f84 100644
--- a/media-gfx/ristretto/Manifest
+++ b/media-gfx/ristretto/Manifest
@@ -1,3 +1,5 @@
 DIST ristretto-0.12.2.tar.bz2 612128 BLAKE2B d845da75f5139ca73702b2ea2154026ecadacc72587d81a22564d0c0ae84e605303a368ee42a9c915c3d00a0b8471f6a6e1a6c6c2f7d7626f766602a29022ee0 SHA512 39fc5868c3858e3667660b6411b3d39c19a2306be3d169e499aa11aff34a24e0ee8e745e15dfe301be48e1c6adce30129ed76270b025f5160cfa773467764379
+DIST ristretto-0.12.3.tar.bz2 616251 BLAKE2B 0f64918bae8511259acc90ce8851be0067ce635416fa908fde5a1e1fe9ae895b18cda06505c82cfae0aaf89fce41a56f80d5c2bcd4ad6cd3e93a95ef5cfb9037 SHA512 c78ec55196fbf3bcb843b240faea1f7eb532bfdc519c125337ebb61d20ab8e01c818920c9ec1bdd97035f8b5ce9bcd2ffb338a91b8919ca48ab1010828a8d49d
 EBUILD ristretto-0.12.2.ebuild 891 BLAKE2B 0a1ad5b7e052921e9f49504488e42ed4db81d275d1186df39c8717fc92cd57d3bcb875dd15a952d231f0d9b03fa70d7153c6b6a339d1c433ff01046167862b53 SHA512 7148b68f84c0a9c9c07605cc3763b13940eaaa56e703445ef179e2280fb340afec7343884987779e40a4c4f42ce4b38a50cc6d520d24e1f2408784000050eeb2
+EBUILD ristretto-0.12.3.ebuild 901 BLAKE2B afef4ea16caefcfa6bcf4a7ee7d90e248a83b01e2b38334ba1a162282cec3eade650fc3bba183cef732b5173461ff3d092629d24b9d7b3b838ab8504468c521c SHA512 539bf9d2e0428f5652163653be67b39496e6c9e0312939640214b13d45709ddd6bb42699f638eeb8e39e910c90db33cb1b032c9dd66f7610195aef2c5772cdc0
 MISC metadata.xml 248 BLAKE2B 83bf47dc3dbedea8a88932e922075f0ba8fd841433c4ab750e2ab61c22e8cbfaa1acb04a903d89ef5140a75dfc4c4899354623e0160df5b7c178c190f8494515 SHA512 b5200cfe30adef8e869fada87f1b4171210b2427cd3ac12edef70948f305d5e612ca5f24d377f9823a6022c8867db635db50ddd3d6cb362d6b0137c299fe07e5
diff --git a/media-gfx/ristretto/ristretto-0.12.3.ebuild b/media-gfx/ristretto/ristretto-0.12.3.ebuild
new file mode 100644
index 000000000000..70f85279a0a5
--- /dev/null
+++ b/media-gfx/ristretto/ristretto-0.12.3.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit xdg-utils
+
+DESCRIPTION="A fast and lightweight picture viewer for Xfce"
+HOMEPAGE="https://docs.xfce.org/apps/ristretto/start"
+SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-libs/glib-2.46:2
+	media-libs/libexif:0=
+	sys-apps/file
+	x11-libs/cairo:0
+	>=x11-libs/gtk+-3.22:3
+	x11-libs/libX11:0=
+	>=xfce-base/libxfce4ui-4.16:0=
+	>=xfce-base/libxfce4util-4.16:0=
+	>=xfce-base/xfconf-4.12.1:0=
+"
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	dev-util/intltool
+	virtual/pkgconfig
+	sys-devel/gettext
+"
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 4c605fe3c285..83edb73c72cb 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/alsa-ucm-conf/Manifest b/media-libs/alsa-ucm-conf/Manifest
index 56a54b76b38d..a8eb7ca61b2b 100644
--- a/media-libs/alsa-ucm-conf/Manifest
+++ b/media-libs/alsa-ucm-conf/Manifest
@@ -1,7 +1,9 @@
 DIST alsa-ucm-conf-1.2.6.3.tar.bz2 28153 BLAKE2B c14e50f2bcf95fbc038d3b2b5801850d4d22ab041fdb57dd9f4b161a748326671687585279801a9d3f803abd3d253d86b6b3e891e8c3024c5641f8a24ccccbb7 SHA512 14031173dd9b44c506f13172fcf89d1119e4b2d409a749ec8ef4948e75231a5e5091206e826dff9e70f1f803de8cfb9fd94886ef70764c705f65c1c7ebdf649f
 DIST alsa-ucm-conf-1.2.7.1.tar.bz2 32566 BLAKE2B 72a58b3eb927549ca1433d1249cb43723dd26bf6ce2e72713859c81d2b56388c99d03e028f0e27952dad6296e7efe7e94744cb37150b56b9985d99cee8d53388 SHA512 e2ade1b4f4d26cfb77fb423b82b7eea1b51bbb4857b771acb845da3f3f99c846ec28a415eb184c7d79ffbe1edf21f026951778f905e23658d78deaebb1315759
+DIST alsa-ucm-conf-1.2.7.2.tar.bz2 33011 BLAKE2B af8ce94b5eebb84e2420e96f9052e9ed1055f3c37aca088add6f98d562bba67b856ac5ec16adb3f1893fd612eeadd9d342b83ea615b213ce7d9ac010a0f5d4cb SHA512 b6866f1ca6a3f4d69d7923bc1107a64b49944a3a8756f129f39034e5390e08db1c295669e54dfe1437ca934cc11abf407f60fc8319f5cba3f021966e8654c2db
 DIST alsa-ucm-conf-1.2.7.tar.bz2 31282 BLAKE2B e214e0957493a977d7016180a8b1ea26f91f568944e2b9fc65779d63f3f4317016d183c35bd07b7efc818bd875d904c4b308de240b60275d6b025b66ac134e73 SHA512 3f69343213632ca4196d83f2713302ff9839d9c5fcdf9e0c0be4d358a854844085f9c18acad01dfdf492eda203e2bd5d40939b09074e9c0b57692732bb3136ae
 EBUILD alsa-ucm-conf-1.2.6.3.ebuild 517 BLAKE2B 41ab7ee7c44597bdc2ccf4d3d213deb759cc17d5d5fc0802c582dacd5c26a1ed44b3005e805b74fb5473144e82a28726e982d47268a159b42d07cdcd6ad55cd1 SHA512 82a04a52b13ded3d16f122a24c57526626139f40793704b7dadd6187029b3884f3b517e9d50c333752d18d25192a5a196d0013dad1b22aa426103c0a2671c0fe
 EBUILD alsa-ucm-conf-1.2.7.1.ebuild 525 BLAKE2B b2e68ca5e1ddcdf6188d247e7ce6fe38421acb48815307b4c244baa6b744099ae90549e4f54a277abb1da052bf0b6511241427ce15c7ef63e876789e1bcec56b SHA512 57e6cde5a7c35091daa7246e3648e2bf0312a1c5f0fd3ca27592707c80428f451bad4441c60a858c77694614708bd6314c63ea9335605fc69950f3d7d29202ac
+EBUILD alsa-ucm-conf-1.2.7.2.ebuild 525 BLAKE2B b2e68ca5e1ddcdf6188d247e7ce6fe38421acb48815307b4c244baa6b744099ae90549e4f54a277abb1da052bf0b6511241427ce15c7ef63e876789e1bcec56b SHA512 57e6cde5a7c35091daa7246e3648e2bf0312a1c5f0fd3ca27592707c80428f451bad4441c60a858c77694614708bd6314c63ea9335605fc69950f3d7d29202ac
 EBUILD alsa-ucm-conf-1.2.7.ebuild 525 BLAKE2B b2e68ca5e1ddcdf6188d247e7ce6fe38421acb48815307b4c244baa6b744099ae90549e4f54a277abb1da052bf0b6511241427ce15c7ef63e876789e1bcec56b SHA512 57e6cde5a7c35091daa7246e3648e2bf0312a1c5f0fd3ca27592707c80428f451bad4441c60a858c77694614708bd6314c63ea9335605fc69950f3d7d29202ac
 MISC metadata.xml 325 BLAKE2B 02b18895e880cd1da866d0290d992a060c3a6fb797df776ea270be86b0c32e9c712536efb1ef91c0a69e78238cf5898ef1b737826cf7e9f9ac57cdd8dfba5162 SHA512 f444b018e6d93287bcbc7d886e0962ab3e0fb67b387fe4f0f31f2ba7cc6706d760a2e9db0f29318ca2211cb14cadf2ff4b8e0fa0bb72ff5e238c81996cbd29e2
diff --git a/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.7.2.ebuild b/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.7.2.ebuild
new file mode 100644
index 000000000000..69d00e46df60
--- /dev/null
+++ b/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.7.2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="ALSA ucm configuration files"
+HOMEPAGE="https://alsa-project.org/wiki/Main_Page"
+SRC_URI="https://www.alsa-project.org/files/pub/lib/${P}.tar.bz2"
+LICENSE="BSD"
+SLOT="0"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE=""
+
+RDEPEND="!<media-libs/alsa-lib-1.2.1"
+DEPEND="${RDEPEND}"
+
+src_install() {
+	insinto /usr/share/alsa
+	doins -r ucm{,2}
+}
diff --git a/media-libs/libdvbpsi/Manifest b/media-libs/libdvbpsi/Manifest
index 7fdeb98114fe..babc1b794244 100644
--- a/media-libs/libdvbpsi/Manifest
+++ b/media-libs/libdvbpsi/Manifest
@@ -1,5 +1,3 @@
-DIST libdvbpsi-1.3.2.tar.bz2 487807 BLAKE2B ea8d1e121e47d2257d8537beac792e3a420ac957dbf3ec6d89f0c4d063e249616bbc8f3e14ed37769b676ed18d5d4c3c6a33e2a706217854eb2ded91e7c503db SHA512 cb59c2e66a214cad7bb96aa1f80a178399fcd80da9fc05b22c72763f2cd818bfab3724d36eee4c6467fb8bc8bae18b1d8afec64c02e8e47cd7a6e887f0230309
 DIST libdvbpsi-1.3.3.tar.bz2 488020 BLAKE2B 923d58012dfdbbd5d2807a186f36c58826199f27a89b750669273b741333ab5c23781b7e992a380ba6e283c357d4e3081d397a1980c21b7568e12ecfb2a3cac2 SHA512 70f9e783a947e026ea50afe98ad2b3bfce075bd8d76932f73a6253b077a3a180aa632e9a1fff20308e2f0f3f881d727b4e4aad9b8da2b384edf9a3a0f9eacc69
-EBUILD libdvbpsi-1.3.2.ebuild 936 BLAKE2B a174ce8218ecb469431fc2b1bb1795b47c328c193814ef230ff65977134d64bbf50ede8220748709f90d805668a8a07f4fba6b31ce1a196f7fc845357901e4a5 SHA512 7c0f8ed4a3d19edddd8e0d971b84aa83d50fe6f920333a9dd99395ee5357fdc789464914271719ab41772bc371a84c5be7da3a521d9dddb0b69ef3845d206948
 EBUILD libdvbpsi-1.3.3.ebuild 941 BLAKE2B 468320e504c4ced70dc6c45aaba4f579dbfe9fcae9cded64979413efdbd676987106597be5f15a2a97bfa7fac63c78f7d8812ed59ed6f91caf168b4452d53903 SHA512 b65957df3b32eb11e20f951a5c9126727d09bc4576a332681be2126f08b9b9499191b8916dd730198c8aef54b1ff9716af19d9a3600966498ba3e39e1c4d3e5a
 MISC metadata.xml 259 BLAKE2B 3d6e2c71a67eb6eec74e229e746e4ca8c32878d251276044aeacfc21afb48be29752d2257e41ab4ffefbd061fb05929b17237905dd4fd01c65c24e61e464a681 SHA512 ceb54d3784d2abce86137f25059dba4f90ebba03e31dae56d2b8acbc515d9c0d7ed909f46c569a73e929cbe9dac2caef440e9c52b0518d37c081e03be471fa4c
diff --git a/media-libs/libdvbpsi/libdvbpsi-1.3.2.ebuild b/media-libs/libdvbpsi/libdvbpsi-1.3.2.ebuild
deleted file mode 100644
index f9e41b1f8950..000000000000
--- a/media-libs/libdvbpsi/libdvbpsi-1.3.2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="library for MPEG TS/DVB PSI tables decoding and generation"
-HOMEPAGE="https://www.videolan.org/libdvbpsi"
-SRC_URI="https://download.videolan.org/pub/${PN}/${PV}/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-# Sublot == libdvbpsi.so major
-SLOT="0/10"
-KEYWORDS="~alpha amd64 arm arm64 ppc ppc64 sparc x86"
-IUSE="doc static-libs"
-
-RDEPEND=""
-DEPEND="
-	doc? (
-		app-doc/doxygen
-		>=media-gfx/graphviz-2.26
-	)"
-
-DOCS=( AUTHORS ChangeLog NEWS README )
-
-src_prepare() {
-	sed -e '/CFLAGS/s:-O2::' -e '/CFLAGS/s:-O6::' -e '/CFLAGS/s:-Werror::' -i configure || die
-	default
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		--enable-release
-}
-
-src_compile() {
-	default
-	use doc && emake doc
-}
-
-src_install() {
-	use doc && local HTML_DOCS=( doc/doxygen/html/. )
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 52d7c4f7f1fe..6b2a927c6a1a 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/alsaplayer/Manifest b/media-sound/alsaplayer/Manifest
index cd3f2cc9f0c5..695589ba6d27 100644
--- a/media-sound/alsaplayer/Manifest
+++ b/media-sound/alsaplayer/Manifest
@@ -1,3 +1,4 @@
 DIST alsaplayer-0.99.81.tar.bz2 806906 BLAKE2B 6b37aaa65f6426a43483c3fa7e077ca89ce553655587e0f44ac61ade5d4f5467a304e18ef0142336b0cc94311498ccaa16d9ed2d6eb8109474626c6d1a4ca97d SHA512 6723b36837d01f14645bb1d43ec7c54c85e8afed9b020f56dc81b4de64b74e4da2504507fe83954c7b26817e90510c585d09e759fc11e731d4d27e86f3932650
-EBUILD alsaplayer-0.99.81-r2.ebuild 2019 BLAKE2B e3f5efd733fab5ee7d6078e176f506912b868f3a9d10675a3c003056e4ccee92381816536ef3e456f5bd11c701bbd467eaff91cc5925ce799b7a04b8efeeca8f SHA512 c6b2869f0366f409674cda5a68d59b4d112f3845522a60896131ad85fa9a2db3e7d0409009c92837be8d6edc1464b67842096bfb837d711766c7684d86257c79
+EBUILD alsaplayer-0.99.81-r3.ebuild 1859 BLAKE2B e48439e1b06b72f6022e2db06c504ea0a671b9aebb4d555a272eaa904b61ca76e8c8ac38c15d72ad023e2c30c19c6501bd29cc9615a0c8f882fd0ff2dede03a3 SHA512 bedfe341424bcda1eb6673331886b94dea3cd3df086d9865af02b772025f245c8ac2813fa84ef58e1aa4a033411b110238fe7985551c53d8fef180b22afc765e
+EBUILD files/alsaplayer-0.99.81-autotools.ebuild 943 BLAKE2B 0f51ca345e6ccadd25f28ae1961af3ea70055297ad020aa232b9604ffb80c68de79ce42b231a3f8e3bf66ba0c92cd9759b604eab3aae09c9e7b61ab96b0da047 SHA512 a0c55913e8f52578f441229ed3cab999416732b45dc5019965fc32635cb5b9f7fb603ef23eacc5b22da9d423d751a12a448f1f9293e929a303673d28a33d0ae5
 MISC metadata.xml 338 BLAKE2B 10b361f79fc3faabd4f58308beb752d40d950e963b754519fb78503c0b7bb36492473b4c5ead9624e6e82d1c47d658237eab69a38dce4647cffd73c8738e21cd SHA512 af01ff0b9d7267d8a730ad734d51c6339dfa81eb4d0a2b41eb85d5f52a8fb10db872f1ea2df4b6450b0a89020884470daa28bfd1288aaeff6671c88b7972626e
diff --git a/media-sound/alsaplayer/alsaplayer-0.99.81-r2.ebuild b/media-sound/alsaplayer/alsaplayer-0.99.81-r3.ebuild
index 098fdbbe3336..70ee1adcfa99 100644
--- a/media-sound/alsaplayer/alsaplayer-0.99.81-r2.ebuild
+++ b/media-sound/alsaplayer/alsaplayer-0.99.81-r3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit autotools desktop xdg
 
@@ -13,6 +13,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~mips ~ppc ~riscv ~sparc x86"
 IUSE="+alsa audiofile doc flac gtk id3tag jack mad mikmod nas nls ogg opengl oss vorbis xosd"
+REQUIRED_USE="|| ( alsa jack nas oss )"
 
 RDEPEND="
 	media-libs/libsndfile:=
@@ -31,27 +32,17 @@ RDEPEND="
 	vorbis? ( media-libs/libvorbis )
 	xosd? ( x11-libs/xosd )"
 DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	nls? ( sys-devel/gettext )
 	oss? ( virtual/os-headers )"
-REQUIRED_USE="|| ( alsa jack nas oss )"
+BDEPEND="
+	sys-devel/gettext
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )"
+
+PATCHES=( "${FILESDIR}"/${P}-autotools.ebuild )
 
 src_prepare() {
 	default
-
-	sed -i \
-		-e 's:AM_CFLAGS = $(AM_CXXFLAGS)::' \
-		output/jack/Makefile.am || die
-
-	sed -i \
-		-e 's:-O2 -funroll-loops -finline-functions -ffast-math::' \
-		configure.ac || die
-
-	sed -i \
-		-e "s:/usr/lib:/usr/$(get_libdir):" \
-		configure.ac config.rpath || die
-
+	cp "${BROOT}"/usr/share/gettext/config.rpath . || die
 	eautoreconf
 }
 
@@ -83,5 +74,5 @@ src_install() {
 
 	newicon interface/gtk2/pixmaps/logo.xpm ${PN}.xpm
 
-	find "${D}" -name '*.la' -delete || die
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/media-sound/alsaplayer/files/alsaplayer-0.99.81-autotools.ebuild b/media-sound/alsaplayer/files/alsaplayer-0.99.81-autotools.ebuild
new file mode 100644
index 000000000000..b51277317e0f
--- /dev/null
+++ b/media-sound/alsaplayer/files/alsaplayer-0.99.81-autotools.ebuild
@@ -0,0 +1,37 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -82,11 +82,6 @@
+ dnl PKGCONFIG preparations
+ dnl ======================
+ 
+-if test -z $PKG_CONFIG_PATH; then
+-	PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:/usr/lib/pkgconfig
+-fi
+-
+-export PKG_CONFIG_PATH
+ 
+ 
+ dnl ===============
+@@ -639,10 +634,10 @@
+ 
+ AC_MSG_CHECKING(for gcc optimization flags)
+ old_cflags=$CFLAGS
+-CFLAGS="$CFLAGS -O2 -funroll-loops -finline-functions -ffast-math -Wall"
++CFLAGS="$CFLAGS -Wall"
+ AC_TRY_COMPILE([#include <stdio.h>],
+ [ printf ("hello, world"); ],
+-[ EXTRA_OPT_CFLAGS="$CFLAGS -O2 -funroll-loops -finline-functions -ffast-math -Wall"],[ EXTRA_OPT_CFLAGS=""])
++[ EXTRA_OPT_CFLAGS="$CFLAGS -Wall"],[ EXTRA_OPT_CFLAGS=""])
+ CFLAGS=$old_cflags
+ AC_MSG_RESULT([$EXTRA_OPT_CFLAGS])
+ 
+--- a/output/jack/Makefile.am
++++ b/output/jack/Makefile.am
+@@ -24,7 +24,6 @@
+ 
+ AM_CXXFLAGS = $(COMMON_FLAGS) $(JACK_CFLAGS)
+ 
+-AM_CFLAGS = $(AM_CXXFLAGS)
+ 
+ libdir = $(ADDON_DIR)/output
+ 
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 5545b816f71b..e7275d10b29c 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 2404352a6f1a..447aea7db1c6 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Sun, 10 Jul 2022 05:39:44 +0000
+Sun, 10 Jul 2022 11:39:44 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index dacf614802f2..0f28ec25aedd 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 518604 BLAKE2B 771190ff87bcfe6702a19150591bf573a429c51546ab7bd3ae25f101a4ec657d93d6fb83f7cb3aa4055e581eab5fde9d88a73a604dc34f426cb30ebb4385af9b SHA512 0b5d0f14e5d6ec3ff896d9d472edea00620a08f552ffc5516b0264e609527cf65471ee37a5002559add52d5c1898b2b60d48c9e97e6d2451bd84bf24fd112ab4
-TIMESTAMP 2022-07-10T05:39:47Z
+TIMESTAMP 2022-07-10T11:39:48Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLKZiNfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLKuoRfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDZQA//bZRYnpouVDlncFGOQ0lfI5neo757DSvCrfiCvJ9EaDjMpF11Wgf4WWl8
-ZvlqvOQFD04IZ5erhs5nKOtlI1FeEflnOYr4NkrBsbhLvpHJanZuPwP1s8ROYv6I
-qI0aHSVTbkcu/3HFIig2cXHcnwAa7Szfsm/UzGZM5j2WhcZrtMtG2Fz15a+vX9P+
-O/TbgzS43rYqKO14G5wj+UDrsuYyvnJ34bkBkk+arNPeylEFkc6mzSp36dSDPAiK
-nKTS2vNQzBbfgxxZn7Zt0cuSTbx/UZiD1Z/xuNEHgM5PvuzGe9xHWwKa+2K10wZJ
-pOEopdkYyzDLlbBIBrzOPy8GixC7p9vcqWpYUiTuRuFe8FWCjEvkqXMsMna7g3RZ
-rXtPw8H9beivOoBwuS1HQ57wAxfOOl/tR24e47YIjg81sh7op+z1nQHJGe3YaEK5
-LcfZywExmbOt+05dTttWGNGpjKP0lP9y2EQv7mLy5gkvZ4UrP17ZycjJhZtbdFK+
-KLK0/Tjo7Idxr9y4lhWvaGy5/tRGJa5CwYnfgcI8EuBT36izDesfGQbirJ/BkTXM
-um4Qu3WqtI72W61Lx79h3t2VPjtndiEvGbOG09blkIbrYITqku9vehNZ3oxev2wt
-wZybn+tFVQTHW+ZsXCnlUDAvyOP6QDMOqHKvTotO4yzxQzBDK6Q=
-=6Ckq
+klDZQA/9HAzyQg3LARKidCSo4hlADeeX+sLdPa89IIFn9R6l0NzcJ01b2g08dVRi
+FKikeEkOgJPrTmDtDt3uGoPVgOllVzW+RZFg+4+iGQmr3HkwAbW7lglrNxIkQ57Q
+a8cbK9NDrlzA6w6+Kc7CWdZVZjUpQoiJ8/ROEiIqVj6OXtEBm76Wbn/EUHOTIsvv
+4q37kVr6xk6cz9zKRGVQalaPWhjTbjEjXvckzCzCmjaUKOmpKobveoHBrGJEJzbd
+FEubgNJ7RCLPOkekCKx+dvC0c3nxcYIJsoq8P8l+MbHW7s7fFFfQ0Io7U/Wy3JrR
+lGHay6J2RGj+s7O8S8syf2S2Wgr/gguuG9Nuh8GEV2XGSv7DSOLnziMOjbZqrVjz
+A6bBb2+8a61cSMHV6/plxCkDgP5/NTbAjydOAhoe85PbZwpRs0xkuTI0LW993e2F
+mNTixGsdH2Ah5ycBkNU3Inj+YHj0UXkzm437TfSyBsnpCIlO+iyxFKOTLzVz6mEb
+d1eI8q+95cMVOaMr9kbE5Fw4Tc6coU3B+E43YUmexIvFPRxZNZFmMFfptjMwWEHS
+NCNhuNt5Xt6NoOMmbEsYzAPLzvCCc08273SJo52COTEd6TVZz3LdsmK5C0R0Wdat
+FLgwxunsc1IIi6RE7NR3fb6jGG65GFt5gmx7BikPffKk6G5P9yc=
+=vNA0
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 2404352a6f1a..447aea7db1c6 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Sun, 10 Jul 2022 05:39:44 +0000
+Sun, 10 Jul 2022 11:39:44 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 10cdaaa11b67..ef7aa012ffad 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 c4fe144d661f..67b8aaeb00fc 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.12-r1 b/metadata/md5-cache/app-admin/awscli-1.25.12-r1
deleted file mode 100644
index 6bb2b0ab7e91..000000000000
--- a/metadata/md5-cache/app-admin/awscli-1.25.12-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-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.12[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !app-admin/awscli-bin >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/gpep517-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.3.3[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.12[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.12.tar.gz -> aws-cli-1.25.12.gh.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	64c5b9cc381383c9c1ef74fb199293ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=3e9bea6751f29667f4e645e0d0fa1458
diff --git a/metadata/md5-cache/app-admin/awscli-1.25.17-r1 b/metadata/md5-cache/app-admin/awscli-1.25.17-r1
index 8d1cf261ec1c..6d7b89d375f6 100644
--- a/metadata/md5-cache/app-admin/awscli-1.25.17-r1
+++ b/metadata/md5-cache/app-admin/awscli-1.25.17-r1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/aws/aws-cli/ https://pypi.org/project/awscli/
 INHERIT=bash-completion-r1 distutils-r1 multiprocessing
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/botocore-1.27.17[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 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/aws/aws-cli/archive/1.25.17.tar.gz -> aws-cli-1.25.17.gh.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	64c5b9cc381383c9c1ef74fb199293ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=0fd6a2cdd4f5b854d8449e5fd0580e2b
+_md5_=3e9bea6751f29667f4e645e0d0fa1458
diff --git a/metadata/md5-cache/app-admin/awscli-1.25.20 b/metadata/md5-cache/app-admin/awscli-1.25.20
deleted file mode 100644
index df311c001f61..000000000000
--- a/metadata/md5-cache/app-admin/awscli-1.25.20
+++ /dev/null
@@ -1,16 +0,0 @@
-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.20[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !app-admin/awscli-bin >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/gpep517-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.3.3[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.20[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.20.tar.gz -> aws-cli-1.25.20.gh.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	64c5b9cc381383c9c1ef74fb199293ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=0fd6a2cdd4f5b854d8449e5fd0580e2b
diff --git a/metadata/md5-cache/app-admin/awscli-1.25.21 b/metadata/md5-cache/app-admin/awscli-1.25.21
deleted file mode 100644
index ede2915e7741..000000000000
--- a/metadata/md5-cache/app-admin/awscli-1.25.21
+++ /dev/null
@@ -1,16 +0,0 @@
-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.21[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !app-admin/awscli-bin >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/gpep517-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.3.3[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.21[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.21.tar.gz -> aws-cli-1.25.21.gh.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	64c5b9cc381383c9c1ef74fb199293ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=0fd6a2cdd4f5b854d8449e5fd0580e2b
diff --git a/metadata/md5-cache/app-admin/awscli-1.25.23 b/metadata/md5-cache/app-admin/awscli-1.25.23
deleted file mode 100644
index 71e40119901f..000000000000
--- a/metadata/md5-cache/app-admin/awscli-1.25.23
+++ /dev/null
@@ -1,16 +0,0 @@
-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.23[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !app-admin/awscli-bin >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/gpep517-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.3.3[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.23[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.23.tar.gz -> aws-cli-1.25.23.gh.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	64c5b9cc381383c9c1ef74fb199293ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=0fd6a2cdd4f5b854d8449e5fd0580e2b
diff --git a/metadata/md5-cache/app-admin/awscli-1.25.24 b/metadata/md5-cache/app-admin/awscli-1.25.24
deleted file mode 100644
index 028eb5f9d46d..000000000000
--- a/metadata/md5-cache/app-admin/awscli-1.25.24
+++ /dev/null
@@ -1,16 +0,0 @@
-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.24[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !app-admin/awscli-bin >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/gpep517-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.3.3[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.24[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.24.tar.gz -> aws-cli-1.25.24.gh.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	64c5b9cc381383c9c1ef74fb199293ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=0fd6a2cdd4f5b854d8449e5fd0580e2b
diff --git a/metadata/md5-cache/app-admin/awscli-1.25.25 b/metadata/md5-cache/app-admin/awscli-1.25.25
deleted file mode 100644
index 9e23f2f1a85e..000000000000
--- a/metadata/md5-cache/app-admin/awscli-1.25.25
+++ /dev/null
@@ -1,16 +0,0 @@
-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.25[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !app-admin/awscli-bin >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/gpep517-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.3.3[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.25[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.25.tar.gz -> aws-cli-1.25.25.gh.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	64c5b9cc381383c9c1ef74fb199293ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=0fd6a2cdd4f5b854d8449e5fd0580e2b
diff --git a/metadata/md5-cache/app-admin/needrestart-3.3 b/metadata/md5-cache/app-admin/needrestart-3.3
deleted file mode 100644
index 6119e3f714da..000000000000
--- a/metadata/md5-cache/app-admin/needrestart-3.3
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=>=sys-apps/sed-4.2.2 dev-lang/perl:= dev-perl/libintl-perl dev-perl/Module-Find dev-perl/Module-ScanDeps dev-perl/Proc-ProcessTable dev-perl/Sort-Naturally dev-perl/TermReadKey sys-apps/init-system-helpers sys-devel/gettext
-DESCRIPTION=Restart daemons after library updates
-EAPI=6
-HOMEPAGE=https://fiasko-nw.net/~thomas/tag/needrestart.html https://github.com/liske/needrestart
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+
-RDEPEND=>=sys-apps/sed-4.2.2 dev-lang/perl:= dev-perl/libintl-perl dev-perl/Module-Find dev-perl/Module-ScanDeps dev-perl/Proc-ProcessTable dev-perl/Sort-Naturally dev-perl/TermReadKey sys-apps/init-system-helpers
-SLOT=0
-SRC_URI=https://github.com/liske/needrestart/archive/v3.3.tar.gz -> needrestart-3.3.tar.gz
-_md5_=347da772ae31f9ccd63018ce18ecc5a6
diff --git a/metadata/md5-cache/app-admin/pwgen-2.08-r1 b/metadata/md5-cache/app-admin/pwgen-2.08-r1
new file mode 100644
index 000000000000..92bc4540577b
--- /dev/null
+++ b/metadata/md5-cache/app-admin/pwgen-2.08-r1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=configure install
+DESCRIPTION=Password Generator
+EAPI=8
+HOMEPAGE=https://sourceforge.net/projects/pwgen/
+IUSE=livecd
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=mirror://sourceforge/pwgen/pwgen-2.08.tar.gz
+_md5_=95a4aada4d7f926236c62ed2df362f2f
diff --git a/metadata/md5-cache/app-arch/Manifest.gz b/metadata/md5-cache/app-arch/Manifest.gz
index 2b7aa89ee78f..3d30732c871f 100644
--- a/metadata/md5-cache/app-arch/Manifest.gz
+++ b/metadata/md5-cache/app-arch/Manifest.gz
diff --git a/metadata/md5-cache/app-arch/unace-2.5-r5 b/metadata/md5-cache/app-arch/unace-2.5-r6
index c9f23c9273d0..267de6c4263e 100644
--- a/metadata/md5-cache/app-arch/unace-2.5-r5
+++ b/metadata/md5-cache/app-arch/unace-2.5-r6
@@ -1,6 +1,6 @@
 DEFINED_PHASES=configure install
 DESCRIPTION=ACE unarchiver
-EAPI=6
+EAPI=8
 HOMEPAGE=http://www.winace.com/
 INHERIT=toolchain-funcs
 KEYWORDS=~alpha amd64 arm ~hppa ppc ppc64 ~s390 x86 ~amd64-linux ~x86-linux ~sparc-solaris
@@ -8,4 +8,4 @@ LICENSE=freedist
 SLOT=1
 SRC_URI=mirror://debian/pool/non-free/u/unace-nonfree/unace-nonfree_2.5.orig.tar.gz mirror://debian/pool/non-free/u/unace-nonfree/unace-nonfree_2.5-9.debian.tar.xz
 _eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=6344c1ebea53b490a72542a581286c98
+_md5_=32387e68a7b21e8eeabc9e500a688b08
diff --git a/metadata/md5-cache/app-arch/unadf-0.7.12-r1 b/metadata/md5-cache/app-arch/unadf-0.7.12-r1
deleted file mode 100644
index 545c6c7d5500..000000000000
--- a/metadata/md5-cache/app-arch/unadf-0.7.12-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
-DESCRIPTION=Extract files from Amiga adf disk images
-EAPI=6
-HOMEPAGE=http://lclevy.free.fr/adflib/
-INHERIT=autotools
-IUSE=static-libs
-KEYWORDS=amd64 ~hppa ppc x86 ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://lclevy.free.fr/adflib/adflib-0.7.12.tar.bz2
-_eclasses_=autotools	2fd69a56a527d12409ba43c733b7ac8f	desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	28f0f3c0226306ec5f49e13bf851f171	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=21f6b67ace0e0bdac02a2dcec29ff3f3
diff --git a/metadata/md5-cache/app-arch/unadf-0.7.12-r2 b/metadata/md5-cache/app-arch/unadf-0.7.12-r2
new file mode 100644
index 000000000000..00adf54214a4
--- /dev/null
+++ b/metadata/md5-cache/app-arch/unadf-0.7.12-r2
@@ -0,0 +1,12 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+DEFINED_PHASES=install prepare
+DESCRIPTION=Extract files from Amiga adf disk images
+EAPI=8
+HOMEPAGE=http://lclevy.free.fr/adflib/
+INHERIT=autotools
+KEYWORDS=amd64 ~hppa ppc x86 ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=http://lclevy.free.fr/adflib/adflib-0.7.12.tar.bz2
+_eclasses_=autotools	2fd69a56a527d12409ba43c733b7ac8f	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=1971e3fa2348e81e0a5f10b9345a5623
diff --git a/metadata/md5-cache/app-arch/zpaq-7.15 b/metadata/md5-cache/app-arch/zpaq-7.15
deleted file mode 100644
index 4150e578315d..000000000000
--- a/metadata/md5-cache/app-arch/zpaq-7.15
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst test
-DEPEND=app-arch/unzip dev-lang/perl
-DESCRIPTION=Journaling incremental deduplicating archiving compressor
-EAPI=6
-HOMEPAGE=http://mattmahoney.net/dc/zpaq.html
-INHERIT=flag-o-matic pax-utils toolchain-funcs
-IUSE=debug +jit
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=Unlicense
-SLOT=0
-SRC_URI=http://mattmahoney.net/dc/zpaq715.zip
-_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	28f0f3c0226306ec5f49e13bf851f171	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	pax-utils	91d47e5d20627c717aa878b9167c62a8	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=4fc6ac2a45b5c344b488fad5876ad3c9
diff --git a/metadata/md5-cache/app-arch/zpaq-7.15-r1 b/metadata/md5-cache/app-arch/zpaq-7.15-r1
new file mode 100644
index 000000000000..7173a640c150
--- /dev/null
+++ b/metadata/md5-cache/app-arch/zpaq-7.15-r1
@@ -0,0 +1,13 @@
+BDEPEND=app-arch/unzip dev-lang/perl
+DEFINED_PHASES=compile install postinst test
+DESCRIPTION=Journaling incremental deduplicating archiving compressor
+EAPI=8
+HOMEPAGE=http://mattmahoney.net/dc/zpaq.html
+INHERIT=flag-o-matic pax-utils toolchain-funcs
+IUSE=debug +jit
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Unlicense
+SLOT=0
+SRC_URI=http://mattmahoney.net/dc/zpaq715.zip
+_eclasses_=flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=d84f85299f177fe204dc0471fbada244
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index 139cedf61afd..a360a428107f 100644
--- a/metadata/md5-cache/app-crypt/Manifest.gz
+++ b/metadata/md5-cache/app-crypt/Manifest.gz
diff --git a/metadata/md5-cache/app-crypt/age-1.0.0 b/metadata/md5-cache/app-crypt/age-1.0.0
index 87620ac79b28..303ad84dcbb6 100644
--- a/metadata/md5-cache/app-crypt/age-1.0.0
+++ b/metadata/md5-cache/app-crypt/age-1.0.0
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile install test unpack
 DESCRIPTION=A simple, modern and secure encryption tool (and Go library)
 EAPI=7
 HOMEPAGE=https://github.com/FiloSottile/age
-KEYWORDS=~amd64
+INHERIT=go-module
+KEYWORDS=amd64
 LICENSE=BSD
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/FiloSottile/age/archive/v1.0.0.tar.gz -> age-1.0.0.tar.gz mirror://goproxy//filippo.io/edwards25519/@v/v1.0.0-rc.1.zip -> filippo.io%2Fedwards25519%2F@v%2Fv1.0.0-rc.1.zip mirror://goproxy//filippo.io/edwards25519/@v/v1.0.0-rc.1.mod -> filippo.io%2Fedwards25519%2F@v%2Fv1.0.0-rc.1.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20210817164053-32db794688a5.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210817164053-32db794688a5.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20210817164053-32db794688a5.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210817164053-32db794688a5.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210226172049-e18ecbb05110.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210226172049-e18ecbb05110.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201119102817-f84b799fce68.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201119102817-f84b799fce68.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210615035016-665e8c7367d1.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210615035016-665e8c7367d1.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210903071746-97244b99971b.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210903071746-97244b99971b.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210903071746-97244b99971b.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210903071746-97244b99971b.mod mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201126162022-7de9c90e9dd1.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201126162022-7de9c90e9dd1.mod mirror://goproxy//golang.org/x/term/@v/v0.0.0-20210615171337-6886f2dfbf5b.zip -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20210615171337-6886f2dfbf5b.zip mirror://goproxy//golang.org/x/term/@v/v0.0.0-20210615171337-6886f2dfbf5b.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20210615171337-6886f2dfbf5b.mod mirror://goproxy//golang.org/x/text/@v/v0.3.3.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod
 _eclasses_=go-module	a13d34fe4e2996720e1ca6c53b9ea95a
-_md5_=43ba97f0e533278d8ced8634b8991149
+_md5_=7ef4f97b7bbcd2fb8fdae613584f1e33
diff --git a/metadata/md5-cache/app-emacs/Manifest.gz b/metadata/md5-cache/app-emacs/Manifest.gz
index 115edd3c71fc..3414899db9ac 100644
--- a/metadata/md5-cache/app-emacs/Manifest.gz
+++ b/metadata/md5-cache/app-emacs/Manifest.gz
diff --git a/metadata/md5-cache/app-emacs/corfu-0.26 b/metadata/md5-cache/app-emacs/corfu-0.26
new file mode 100644
index 000000000000..7900ae7c6725
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/corfu-0.26
@@ -0,0 +1,13 @@
+BDEPEND=>=app-editors/emacs-27:*
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DESCRIPTION=Completion Overlay Region FUnction
+EAPI=8
+HOMEPAGE=https://github.com/minad/corfu
+INHERIT=elisp
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=>=app-editors/emacs-27:*
+SLOT=0
+SRC_URI=https://github.com/minad/corfu/archive/refs/tags/0.26.tar.gz -> corfu-0.26.tar.gz
+_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	e7aaa047873789f549ea3df2f04b2145
+_md5_=696d4a3283d8b7451a1c7a0820dc74be
diff --git a/metadata/md5-cache/app-emacs/vertico-0.23 b/metadata/md5-cache/app-emacs/vertico-0.25
index 9b77679cfbf1..fe93a82dfedd 100644
--- a/metadata/md5-cache/app-emacs/vertico-0.23
+++ b/metadata/md5-cache/app-emacs/vertico-0.25
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-27:*
 SLOT=0
-SRC_URI=https://github.com/minad/vertico/archive/refs/tags/0.23.tar.gz -> vertico-0.23.tar.gz
+SRC_URI=https://github.com/minad/vertico/archive/refs/tags/0.25.tar.gz -> vertico-0.25.tar.gz
 _eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	e7aaa047873789f549ea3df2f04b2145
 _md5_=a21f11f2d111ef98b890cc7961a8bb1a
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index a69144c82a5c..de96f0525549 100644
--- a/metadata/md5-cache/app-emulation/Manifest.gz
+++ b/metadata/md5-cache/app-emulation/Manifest.gz
diff --git a/metadata/md5-cache/app-emulation/xen-4.15.3 b/metadata/md5-cache/app-emulation/xen-4.15.3
index 49faee8e1934..c55589870cfa 100644
--- a/metadata/md5-cache/app-emulation/xen-4.15.3
+++ b/metadata/md5-cache/app-emulation/xen-4.15.3
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://xenproject.org
 INHERIT=flag-o-matic mount-boot python-any-r1 toolchain-funcs
 IUSE=debug efi flask
-KEYWORDS=~amd64 ~arm -x86
+KEYWORDS=amd64 ~arm -x86
 LICENSE=GPL-2
 PDEPEND=~app-emulation/xen-tools-4.15.3
 REQUIRED_USE=arm? ( debug )
@@ -13,4 +13,4 @@ RESTRICT=test splitdebug strip
 SLOT=0
 SRC_URI=https://downloads.xenproject.org/release/xen/4.15.3/xen-4.15.3.tar.gz
 _eclasses_=flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=305825fa43b435a77479fbec9fc0328a
+_md5_=3e29fe1d9bddf026428dc88f61d2dbce
diff --git a/metadata/md5-cache/app-emulation/xen-tools-4.15.3 b/metadata/md5-cache/app-emulation/xen-tools-4.15.3
index 494695385629..35d1dabb5eb0 100644
--- a/metadata/md5-cache/app-emulation/xen-tools-4.15.3
+++ b/metadata/md5-cache/app-emulation/xen-tools-4.15.3
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://xenproject.org
 INHERIT=bash-completion-r1 flag-o-matic multilib python-single-r1 toolchain-funcs
 IUSE=api debug doc +hvm +ipxe lzma ocaml ovmf pygrub python +qemu +qemu-traditional +rombios screen selinux sdl static-libs system-ipxe system-qemu system-seabios python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~x86
 LICENSE=GPL-2
 RDEPEND=lzma? ( app-arch/xz-utils ) qemu? ( dev-libs/glib:2 sys-libs/pam ) app-arch/bzip2 dev-libs/libnl:3 dev-libs/lzo:2 dev-libs/yajl sys-apps/util-linux sys-fs/e2fsprogs sys-libs/ncurses sys-libs/zlib python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8[ncurses,xml,threads(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9[ncurses,xml,threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10[ncurses,xml,threads(+)] ) sys-apps/iproute2[-minimal] net-misc/bridge-utils screen? ( app-misc/screen app-admin/logrotate ) selinux? ( sec-policy/selinux-xen )
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) ipxe? ( rombios ) ovmf? ( hvm ) pygrub? ( python ) rombios? ( hvm ) system-ipxe? ( rombios ) ?? ( ipxe system-ipxe ) ?? ( qemu system-qemu )
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0/4.15
 SRC_URI=https://downloads.xenproject.org/release/xen/4.15.3/xen-4.15.3.tar.gz https://www.seabios.org/downloads/seabios-1.14.0.tar.gz ipxe? ( https://xenbits.xen.org/xen-extfiles/ipxe-git-3c040ad387099483102708bb1839110bc788cefb.tar.gz ) ovmf? ( https://github.com/tianocore/edk2/archive/7b4a99be8a39c12d3a7fc4b8db9f0eab4ac688d5.tar.gz -> edk2-7b4a99be8a39c12d3a7fc4b8db9f0eab4ac688d5.tar.gz https://github.com/openssl/openssl/archive/OpenSSL_1_1_1j.tar.gz https://github.com/ucb-bar/berkeley-softfloat-3/archive/b64af41c3276f97f0e181920400ee056b9c88037.tar.gz -> berkeley-softfloat-b64af41c3276f97f0e181920400ee056b9c88037.tar.gz https://github.com/google/brotli/archive/666c3280cc11dc433c303d79a83d4ffbdd12cc8d.tar.gz -> brotli-666c3280cc11dc433c303d79a83d4ffbdd12cc8d.tar.gz ) https://gitweb.gentoo.org/proj/xen-gentoo-patches.git/snapshot/xen-gentoo-patches-4.15.3-gentoo-patchset-2.tar.bz2
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=4251f3e116653fab30335f73b20862a3
+_md5_=c78add70cb483f09dd532dba06d330f9
diff --git a/metadata/md5-cache/app-eselect/Manifest.gz b/metadata/md5-cache/app-eselect/Manifest.gz
index 0b879ca60e48..c62d5ce389f3 100644
--- a/metadata/md5-cache/app-eselect/Manifest.gz
+++ b/metadata/md5-cache/app-eselect/Manifest.gz
diff --git a/metadata/md5-cache/app-eselect/eselect-timidity-20110513 b/metadata/md5-cache/app-eselect/eselect-timidity-20110513-r1
index fea585d358a1..f941ffbcc940 100644
--- a/metadata/md5-cache/app-eselect/eselect-timidity-20110513
+++ b/metadata/md5-cache/app-eselect/eselect-timidity-20110513-r1
@@ -1,10 +1,10 @@
 DEFINED_PHASES=install
 DESCRIPTION=Manages configuration of TiMidity++ patchsets
-EAPI=6
+EAPI=8
 HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86
 LICENSE=GPL-2
 RDEPEND=>=app-admin/eselect-1.2.3
 SLOT=0
 SRC_URI=mirror://gentoo/timidity.eselect-20110513.bz2
-_md5_=b27e45a501891ea929f683be48f2f2a0
+_md5_=3b3e48f691a7e49376944bfa41c8eb2a
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index 54f41b4a41ae..5aaecc752dae 100644
--- a/metadata/md5-cache/app-misc/Manifest.gz
+++ b/metadata/md5-cache/app-misc/Manifest.gz
diff --git a/metadata/md5-cache/app-misc/scrub-2.6.1-r1 b/metadata/md5-cache/app-misc/scrub-2.6.1-r1
new file mode 100644
index 000000000000..2d62fcd1d284
--- /dev/null
+++ b/metadata/md5-cache/app-misc/scrub-2.6.1-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=-
+DESCRIPTION=Overwrite files with iterative patterns
+EAPI=8
+HOMEPAGE=https://github.com/chaos/scrub
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~sparc ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=https://github.com/chaos/scrub/releases/download/2.6.1/scrub-2.6.1.tar.gz
+_md5_=6a1688fbe758a426b4dd8357ebf1c8c4
diff --git a/metadata/md5-cache/app-shells/Manifest.gz b/metadata/md5-cache/app-shells/Manifest.gz
index 4259aeea569b..47f86d0b9f49 100644
--- a/metadata/md5-cache/app-shells/Manifest.gz
+++ b/metadata/md5-cache/app-shells/Manifest.gz
diff --git a/metadata/md5-cache/app-shells/push-2.0-r1 b/metadata/md5-cache/app-shells/push-2.0-r1
deleted file mode 100644
index 7f99bfa1c91c..000000000000
--- a/metadata/md5-cache/app-shells/push-2.0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=A POSIX shell function to treat a variable like an array, quoting args
-EAPI=6
-HOMEPAGE=https://github.com/vaeth/push/
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris
-LICENSE=BSD
-SLOT=0
-SRC_URI=https://github.com/vaeth/push/archive/v2.0.tar.gz -> push-2.0.tar.gz
-_md5_=907072c9ef7fe500ed6df61318f995bc
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index f3c558046278..d36eccb61f22 100644
--- a/metadata/md5-cache/app-text/Manifest.gz
+++ b/metadata/md5-cache/app-text/Manifest.gz
diff --git a/metadata/md5-cache/app-text/t1utils-1.41-r2 b/metadata/md5-cache/app-text/t1utils-1.41-r2
deleted file mode 100644
index 17528644f107..000000000000
--- a/metadata/md5-cache/app-text/t1utils-1.41-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=prepare
-DEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
-DESCRIPTION=Type 1 Font utilities
-EAPI=6
-HOMEPAGE=http://www.lcdf.org/type/#t1utils
-INHERIT=autotools
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=BSD
-RDEPEND=!<media-libs/freetype-1.4_pre20080316
-SLOT=0
-SRC_URI=http://www.lcdf.org/type/t1utils-1.41.tar.gz
-_eclasses_=autotools	2fd69a56a527d12409ba43c733b7ac8f	desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	28f0f3c0226306ec5f49e13bf851f171	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=e28e30ad4cecb7b681c8b1947ae6e85f
diff --git a/metadata/md5-cache/app-text/wdiff-1.2.2-r1 b/metadata/md5-cache/app-text/wdiff-1.2.2-r2
index 885b91c66dc0..2eb00249d8bf 100644
--- a/metadata/md5-cache/app-text/wdiff-1.2.2-r1
+++ b/metadata/md5-cache/app-text/wdiff-1.2.2-r2
@@ -1,13 +1,14 @@
+BDEPEND=sys-apps/texinfo test? ( app-misc/screen )
 DEFINED_PHASES=configure test
-DEPEND=sys-apps/diffutils sys-apps/less sys-libs/ncurses:0= sys-apps/texinfo test? ( app-misc/screen )
+DEPEND=sys-apps/diffutils sys-apps/less sys-libs/ncurses:=
 DESCRIPTION=Create a diff disregarding formatting
-EAPI=6
+EAPI=8
 HOMEPAGE=https://www.gnu.org/software/wdiff/
 IUSE=experimental test
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris
 LICENSE=GPL-3
-RDEPEND=sys-apps/diffutils sys-apps/less sys-libs/ncurses:0=
+RDEPEND=sys-apps/diffutils sys-apps/less sys-libs/ncurses:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnu/wdiff/wdiff-1.2.2.tar.gz
-_md5_=bfcc8f8315333079e01577427976eac5
+_md5_=f0b285807e6a2f8a267c64e27d09168c
diff --git a/metadata/md5-cache/dev-embedded/Manifest.gz b/metadata/md5-cache/dev-embedded/Manifest.gz
index 7ed3cecc1e3c..8bf757e8fb85 100644
--- a/metadata/md5-cache/dev-embedded/Manifest.gz
+++ b/metadata/md5-cache/dev-embedded/Manifest.gz
diff --git a/metadata/md5-cache/dev-embedded/avrdude-7.0 b/metadata/md5-cache/dev-embedded/avrdude-7.0
new file mode 100644
index 000000000000..274145f72861
--- /dev/null
+++ b/metadata/md5-cache/dev-embedded/avrdude-7.0
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/bison sys-devel/flex >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/hidapi virtual/libelf:= virtual/libusb:0 virtual/libusb:1 ftdi? ( dev-embedded/libftdi:1= ) readline? ( sys-libs/readline:0= )
+DESCRIPTION=AVR Downloader/UploaDEr
+EAPI=8
+HOMEPAGE=https://avrdudes.github.io/avrdude https://github.com/avrdudes/avrdude
+INHERIT=cmake
+IUSE=ftdi readline
+KEYWORDS=~amd64
+LICENSE=GPL-2+
+RDEPEND=dev-libs/hidapi virtual/libelf:= virtual/libusb:0 virtual/libusb:1 ftdi? ( dev-embedded/libftdi:1= ) readline? ( sys-libs/readline:0= )
+SLOT=0
+SRC_URI=https://github.com/avrdudes/avrdude/archive/refs/tags/v7.0.tar.gz -> avrdude-7.0.tar.gz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=3b32a6830c39eb7fa84b3a603421fa40
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index 62e1f2c987f7..09643aedcce4 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/swig-3.0.12 b/metadata/md5-cache/dev-lang/swig-3.0.12
deleted file mode 100644
index ba20c36b7f1f..000000000000
--- a/metadata/md5-cache/dev-lang/swig-3.0.12
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=pcre? ( dev-libs/libpcre ) ccache? ( sys-libs/zlib )
-DESCRIPTION=Simplified Wrapper and Interface Generator
-EAPI=6
-HOMEPAGE=http://www.swig.org/
-IUSE=ccache doc pcre
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-3+ BSD BSD-2
-RDEPEND=pcre? ( dev-libs/libpcre ) ccache? ( sys-libs/zlib )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://sourceforge/swig/swig-3.0.12.tar.gz
-_md5_=d7540a6e2890e75b4f47290a04ab5a21
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index c0e4c38a070b..eb05c618ef88 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/mimalloc-2.0.5-r2 b/metadata/md5-cache/dev-libs/mimalloc-2.0.5-r2
deleted file mode 100644
index 0ff1e275001b..000000000000
--- a/metadata/md5-cache/dev-libs/mimalloc-2.0.5-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A compact general purpose allocator with excellent performance
-EAPI=8
-HOMEPAGE=https://github.com/microsoft/mimalloc
-INHERIT=cmake-multilib
-IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 ~x86
-LICENSE=MIT
-RESTRICT=!test? ( test )
-SLOT=0/2
-SRC_URI=https://github.com/microsoft/mimalloc/archive/refs/tags/v2.0.5.tar.gz -> mimalloc-2.0.5.tar.gz
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=2442b3f6ea90c2606ae1ca28723aed56
diff --git a/metadata/md5-cache/dev-libs/ossp-uuid-1.6.2-r6 b/metadata/md5-cache/dev-libs/ossp-uuid-1.6.2-r6
deleted file mode 100644
index c909dc7a4b44..000000000000
--- a/metadata/md5-cache/dev-libs/ossp-uuid-1.6.2-r6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=perl? ( dev-lang/perl:= )
-DESCRIPTION=An ISO-C:1999 API with CLI for generating DCE, ISO/IEC and RFC compliant UUID
-EAPI=6
-HOMEPAGE=http://www.ossp.org/pkg/lib/uuid/
-INHERIT=perl-module
-IUSE=+cxx perl static-libs
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=ISC
-RDEPEND=perl? ( dev-lang/perl:= )
-SLOT=0
-SRC_URI=ftp://ftp.ossp.org/pkg/lib/uuid/uuid-1.6.2.tar.gz
-_eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	95b2df43c5f3057b6e77bd00b4d953da	perl-module	f2c1b0dd41761ffc8441cd041e4bb7ec
-_md5_=41cdfcfb75635665ebed4be9e37d69a9
diff --git a/metadata/md5-cache/dev-libs/ossp-uuid-1.6.2-r7 b/metadata/md5-cache/dev-libs/ossp-uuid-1.6.2-r7
index ed520b6c9669..00f391210534 100644
--- a/metadata/md5-cache/dev-libs/ossp-uuid-1.6.2-r7
+++ b/metadata/md5-cache/dev-libs/ossp-uuid-1.6.2-r7
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=http://www.ossp.org/pkg/lib/uuid/
 INHERIT=perl-module
 IUSE=+cxx perl static-libs test
-KEYWORDS=~alpha ~amd64 arm ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=ISC
 RDEPEND=perl? ( dev-lang/perl:= )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=ftp://ftp.ossp.org/pkg/lib/uuid/uuid-1.6.2.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	95b2df43c5f3057b6e77bd00b4d953da	perl-module	f2c1b0dd41761ffc8441cd041e4bb7ec	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
-_md5_=1e7bca7de7104b28c48d7e3e7aa3488f
+_md5_=ce35c2f0981da98f6ef46b3ca8ac03dc
diff --git a/metadata/md5-cache/dev-libs/tree-sitter-python-0.20.0 b/metadata/md5-cache/dev-libs/tree-sitter-python-0.20.0
new file mode 100644
index 000000000000..19cf06203405
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/tree-sitter-python-0.20.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install
+DEPEND=dev-libs/tree-sitter
+DESCRIPTION=Python grammar for Tree-sitter
+EAPI=8
+HOMEPAGE=https://github.com/tree-sitter/tree-sitter-python
+INHERIT=tree-sitter-grammar
+KEYWORDS=~amd64
+LICENSE=MIT
+SLOT=0
+SRC_URI=https://github.com/tree-sitter/tree-sitter-python/archive/v0.20.0.tar.gz -> tree-sitter-python-0.20.0.tar.gz
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	tree-sitter-grammar	a3a9088088917825fa24975b21938a86
+_md5_=2a54e74dc69b0bea5f46546af0c09922
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 1519f14222b3..0a18690f7f95 100644
--- a/metadata/md5-cache/dev-python/Manifest.gz
+++ b/metadata/md5-cache/dev-python/Manifest.gz
diff --git a/metadata/md5-cache/dev-python/aesara-2.7.5 b/metadata/md5-cache/dev-python/aesara-2.7.5
new file mode 100644
index 000000000000..146f2f66cdf8
--- /dev/null
+++ b/metadata/md5-cache/dev-python/aesara-2.7.5
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( >=dev-lang/python-3.10.4:3.10 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_10(-)] dev-python/sphinx_rtd_theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)] ) ) ) test? ( dev-python/cons[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/etuples[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/logical-unification[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/minikanren[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/filelock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/numpy-1.23[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/gpep517-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.3.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=Library for operating on mathematical expressions with multi-dimensional arrays
+EAPI=8
+HOMEPAGE=https://github.com/aesara-devs/aesara/ https://pypi.org/project/aesara/
+INHERIT=distutils-r1 multiprocessing optfeature
+IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
+LICENSE=BSD
+RDEPEND=dev-python/cons[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/etuples[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/logical-unification[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/minikanren[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/filelock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/numpy-1.23[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/aesara-devs/aesara/archive/rel-2.7.5.tar.gz -> aesara-rel-2.7.5.gh.tar.gz
+_eclasses_=distutils-r1	64c5b9cc381383c9c1ef74fb199293ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=a011f3c513e689a2d2981dee08c28f9c
diff --git a/metadata/md5-cache/dev-python/ecdsa-0.18.0 b/metadata/md5-cache/dev-python/ecdsa-0.18.0
new file mode 100644
index 000000000000..4d846541f9fe
--- /dev/null
+++ b/metadata/md5-cache/dev-python/ecdsa-0.18.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/hypothesis[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/gmpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( dev-python/gmpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( dev-python/gmpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( dev-python/gmpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) dev-python/six[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=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_beta3:3.11 ) >=dev-python/gpep517-6[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.3.3[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=ECDSA cryptographic signature library in pure Python
+EAPI=8
+HOMEPAGE=https://github.com/tlsfuzzer/python-ecdsa/ https://pypi.org/project/ecdsa/
+INHERIT=distutils-r1
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos
+LICENSE=MIT
+RDEPEND=python_targets_python3_8? ( dev-python/gmpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( dev-python/gmpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( dev-python/gmpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( dev-python/gmpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) dev-python/six[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] 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_beta3: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/e/ecdsa/ecdsa-0.18.0.tar.gz
+_eclasses_=distutils-r1	64c5b9cc381383c9c1ef74fb199293ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=be5529ccbb6ead19e80abeb2c6465a03
diff --git a/metadata/md5-cache/dev-python/pdm-pep517-0.12.7 b/metadata/md5-cache/dev-python/pdm-pep517-0.12.7
deleted file mode 100644
index 46c312e337a5..000000000000
--- a/metadata/md5-cache/dev-python/pdm-pep517-0.12.7
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-python/cerberus-1.3.4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/license-expression[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-21.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tomli-w[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-vcs/git ) test? ( >=dev-python/cerberus-1.3.4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/license-expression[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-21.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tomli-w[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/setuptools[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_beta3:3.11 ) >=dev-python/gpep517-6[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A PEP 517 backend for PDM that supports PEP 621 metadata
-EAPI=8
-HOMEPAGE=https://pypi.org/project/pdm-pep517/ https://github.com/pdm-project/pdm-pep517/
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/cerberus-1.3.4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/license-expression[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-21.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tomli-w[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/setuptools[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_beta3: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/pdm-project/pdm-pep517/archive/0.12.7.tar.gz -> pdm-pep517-0.12.7.gh.tar.gz
-_eclasses_=distutils-r1	64c5b9cc381383c9c1ef74fb199293ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=2b622916e9d3550a8c50e44c0654077c
diff --git a/metadata/md5-cache/dev-python/pdm-pep517-1.0.0 b/metadata/md5-cache/dev-python/pdm-pep517-1.0.2
index 92a59f493ef1..9ddb3a8fbe2d 100644
--- a/metadata/md5-cache/dev-python/pdm-pep517-1.0.0
+++ b/metadata/md5-cache/dev-python/pdm-pep517-1.0.2
@@ -11,6 +11,6 @@ RDEPEND=>=dev-python/cerberus-1.3.4[python_targets_pypy3(-)?,python_targets_pyth
 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/pdm-project/pdm-pep517/archive/1.0.0.tar.gz -> pdm-pep517-1.0.0.gh.tar.gz
+SRC_URI=https://github.com/pdm-project/pdm-pep517/archive/1.0.2.tar.gz -> pdm-pep517-1.0.2.gh.tar.gz
 _eclasses_=distutils-r1	64c5b9cc381383c9c1ef74fb199293ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=2b622916e9d3550a8c50e44c0654077c
diff --git a/metadata/md5-cache/dev-python/toolz-0.12.0 b/metadata/md5-cache/dev-python/toolz-0.12.0
new file mode 100644
index 000000000000..2f9f3c4f957e
--- /dev/null
+++ b/metadata/md5-cache/dev-python/toolz-0.12.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=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_beta3:3.11 ) >=dev-python/gpep517-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.3.3[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=List processing tools and functional utilities
+EAPI=8
+HOMEPAGE=https://github.com/pytoolz/toolz/ https://pypi.org/project/toolz/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta3:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/t/toolz/toolz-0.12.0.tar.gz
+_eclasses_=distutils-r1	64c5b9cc381383c9c1ef74fb199293ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=f29701953e62171fe5da283bb541c0a3
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index 1428faa8befb..96ef586dc371 100644
--- a/metadata/md5-cache/dev-ruby/Manifest.gz
+++ b/metadata/md5-cache/dev-ruby/Manifest.gz
diff --git a/metadata/md5-cache/dev-ruby/redis-4.1.4 b/metadata/md5-cache/dev-ruby/redis-4.1.4
deleted file mode 100644
index e3b0ce7d0060..000000000000
--- a/metadata/md5-cache/dev-ruby/redis-4.1.4
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=ruby_targets_ruby26? ( test? ( dev-ruby/mocha[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/mocha[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/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[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(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( =dev-db/redis-5* ) 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 Ruby client library for Redis
-EAPI=7
-HOMEPAGE=https://github.com/redis/redis-rb
-INHERIT=ruby-fakegem
-IUSE=doc test ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~amd64 ~arm64
-LICENSE=MIT
-RDEPEND=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(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=4
-SRC_URI=https://github.com/redis/redis-rb/archive/v4.1.4.tar.gz -> redis-rb-4.1.4.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=3e8d9f37c34a6d3f3164c6136e23ea28
diff --git a/metadata/md5-cache/dev-ruby/redis-4.7.1 b/metadata/md5-cache/dev-ruby/redis-4.7.1
new file mode 100644
index 000000000000..7b198814ebc9
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/redis-4.7.1
@@ -0,0 +1,17 @@
+BDEPEND=ruby_targets_ruby26? ( test? ( dev-ruby/minitest[ruby_targets_ruby26(-)] dev-ruby/mocha[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/minitest[ruby_targets_ruby27(-)] dev-ruby/mocha[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/minitest[ruby_targets_ruby30(-)] dev-ruby/mocha[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/minitest[ruby_targets_ruby31(-)] dev-ruby/mocha[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( <dev-db/redis-7 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+DESCRIPTION=A Ruby client library for Redis
+EAPI=8
+HOMEPAGE=https://github.com/redis/redis-rb
+INHERIT=ruby-fakegem
+IUSE=doc test ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
+KEYWORDS=~amd64 ~arm64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=4
+SRC_URI=https://github.com/redis/redis-rb/archive/v4.7.1.tar.gz -> redis-rb-4.7.1.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=d17ae4f3195e4f0d2f0abdb62b5bdc0d
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index d90d6c0f7f46..8f9d07841286 100644
--- a/metadata/md5-cache/media-gfx/Manifest.gz
+++ b/metadata/md5-cache/media-gfx/Manifest.gz
diff --git a/metadata/md5-cache/media-gfx/potrace-1.15 b/metadata/md5-cache/media-gfx/potrace-1.15
deleted file mode 100644
index b8f1e278cf3c..000000000000
--- a/metadata/md5-cache/media-gfx/potrace-1.15
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure
-DEPEND=sys-libs/zlib
-DESCRIPTION=Transforming bitmaps into vector graphics
-EAPI=6
-HOMEPAGE=http://potrace.sourceforge.net/
-INHERIT=toolchain-funcs
-IUSE=metric static-libs
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
-LICENSE=GPL-2
-RDEPEND=sys-libs/zlib
-SLOT=0
-SRC_URI=http://potrace.sourceforge.net/download/1.15/potrace-1.15.tar.gz
-_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=536114de09e500f97514732053b8ff93
diff --git a/metadata/md5-cache/media-gfx/renderdoc-1.18-r2 b/metadata/md5-cache/media-gfx/renderdoc-1.18-r2
deleted file mode 100644
index 5e418fe2529a..000000000000
--- a/metadata/md5-cache/media-gfx/renderdoc-1.18-r2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=x11-base/xorg-proto virtual/pkgconfig qt5? ( || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) dev-libs/libpcre dev-qt/qtcore:5 sys-devel/bison ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 doc? ( python_single_target_python3_9? ( dev-python/sphinx[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/sphinx[python_targets_python3_10(-)] ) )
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=app-arch/lz4:= app-arch/zstd:= dev-libs/miniz:= dev-util/glslang x11-libs/libX11 x11-libs/libxcb:= x11-libs/xcb-util-keysyms virtual/opengl pyside2? ( python_single_target_python3_9? ( dev-python/pyside2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pyside2[python_targets_python3_10(-)] ) ) qt5? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 )
-DESCRIPTION=A stand-alone graphics debugging tool
-EAPI=8
-HOMEPAGE=https://renderdoc.org https://github.com/baldurk/renderdoc
-INHERIT=autotools cmake optfeature python-single-r1 docs qmake-utils xdg
-IUSE=pyside2 qt5 python_single_target_python3_9 python_single_target_python3_10 doc
-KEYWORDS=amd64
-LICENSE=BSD BSD-2 CC-BY-3.0 GPL-3+ MIT OFL-1.1 public-domain ZLIB
-RDEPEND=app-arch/lz4:= app-arch/zstd:= dev-libs/miniz:= dev-util/glslang x11-libs/libX11 x11-libs/libxcb:= x11-libs/xcb-util-keysyms virtual/opengl pyside2? ( python_single_target_python3_9? ( dev-python/pyside2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pyside2[python_targets_python3_10(-)] ) ) qt5? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 )
-REQUIRED_USE=doc? ( qt5 ) pyside2? ( qt5 ) qt5? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 ) )
-SLOT=0
-SRC_URI=https://github.com/baldurk/renderdoc/archive/refs/tags/v1.18.tar.gz -> renderdoc-1.18.tar.gz qt5? ( https://github.com/baldurk/swig/archive/renderdoc-modified-7.tar.gz -> swig-renderdoc-7.tar.gz )
-_eclasses_=autotools	2fd69a56a527d12409ba43c733b7ac8f	cmake	44afbf15c35884f7c840470f1cf05d0d	docs	8ed2a8a28ff109e7a3582c9abb7fe327	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=e9de4599727bcb53f394f19299ace464
diff --git a/metadata/md5-cache/media-gfx/renderdoc-1.19 b/metadata/md5-cache/media-gfx/renderdoc-1.19
deleted file mode 100644
index e8f280dbc3a5..000000000000
--- a/metadata/md5-cache/media-gfx/renderdoc-1.19
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=x11-base/xorg-proto virtual/pkgconfig qt5? ( || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) dev-libs/libpcre dev-qt/qtcore:5 sys-devel/bison ) verify-sig? ( sec-keys/openpgp-keys-baldurkarlsson ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 doc? ( python_single_target_python3_9? ( dev-python/sphinx[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/sphinx[python_targets_python3_10(-)] ) ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=app-arch/lz4:= app-arch/zstd:= dev-libs/miniz:= dev-util/glslang x11-libs/libX11 x11-libs/libxcb:= x11-libs/xcb-util-keysyms virtual/opengl pyside2? ( python_single_target_python3_9? ( dev-python/pyside2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pyside2[python_targets_python3_10(-)] ) ) qt5? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 )
-DESCRIPTION=A stand-alone graphics debugging tool
-EAPI=8
-HOMEPAGE=https://renderdoc.org https://github.com/baldurk/renderdoc
-INHERIT=autotools cmake optfeature python-single-r1 docs qmake-utils verify-sig xdg
-IUSE=pyside2 qt5 python_single_target_python3_9 python_single_target_python3_10 doc verify-sig
-KEYWORDS=amd64
-LICENSE=BSD BSD-2 CC-BY-3.0 GPL-3+ MIT OFL-1.1 public-domain ZLIB
-RDEPEND=app-arch/lz4:= app-arch/zstd:= dev-libs/miniz:= dev-util/glslang x11-libs/libX11 x11-libs/libxcb:= x11-libs/xcb-util-keysyms virtual/opengl pyside2? ( python_single_target_python3_9? ( dev-python/pyside2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pyside2[python_targets_python3_10(-)] ) ) qt5? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 )
-REQUIRED_USE=doc? ( qt5 ) pyside2? ( qt5 ) qt5? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 ) )
-SLOT=0
-SRC_URI=https://github.com/baldurk/renderdoc/archive/refs/tags/v1.19.tar.gz -> renderdoc-1.19.tar.gz qt5? ( https://github.com/baldurk/swig/archive/renderdoc-modified-7.tar.gz -> swig-renderdoc-7.tar.gz ) verify-sig? ( https://github.com/baldurk/renderdoc/releases/download/v1.19/v1.19.tar.gz.asc -> renderdoc-1.19.tar.gz.asc )
-_eclasses_=autotools	2fd69a56a527d12409ba43c733b7ac8f	cmake	44afbf15c35884f7c840470f1cf05d0d	docs	8ed2a8a28ff109e7a3582c9abb7fe327	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	verify-sig	0748d665fa664a87add00152ed046e16	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=c20e8b9980959bae9c0687d86b4d4eca
diff --git a/metadata/md5-cache/media-gfx/ristretto-0.12.3 b/metadata/md5-cache/media-gfx/ristretto-0.12.3
new file mode 100644
index 000000000000..d8ab6b3d0063
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/ristretto-0.12.3
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/intltool virtual/pkgconfig sys-devel/gettext
+DEFINED_PHASES=postinst postrm
+DEPEND=>=dev-libs/glib-2.46:2 media-libs/libexif:0= sys-apps/file x11-libs/cairo:0 >=x11-libs/gtk+-3.22:3 x11-libs/libX11:0= >=xfce-base/libxfce4ui-4.16:0= >=xfce-base/libxfce4util-4.16:0= >=xfce-base/xfconf-4.12.1:0=
+DESCRIPTION=A fast and lightweight picture viewer for Xfce
+EAPI=8
+HOMEPAGE=https://docs.xfce.org/apps/ristretto/start
+INHERIT=xdg-utils
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/glib-2.46:2 media-libs/libexif:0= sys-apps/file x11-libs/cairo:0 >=x11-libs/gtk+-3.22:3 x11-libs/libX11:0= >=xfce-base/libxfce4ui-4.16:0= >=xfce-base/libxfce4util-4.16:0= >=xfce-base/xfconf-4.12.1:0=
+SLOT=0
+SRC_URI=https://archive.xfce.org/src/apps/ristretto/0.12/ristretto-0.12.3.tar.bz2
+_eclasses_=xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=141d1bae87954cbaef74f9bd29070034
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index 32cda6f70eb1..cb3649edbfcd 100644
--- a/metadata/md5-cache/media-libs/Manifest.gz
+++ b/metadata/md5-cache/media-libs/Manifest.gz
diff --git a/metadata/md5-cache/media-libs/alsa-ucm-conf-1.2.7.2 b/metadata/md5-cache/media-libs/alsa-ucm-conf-1.2.7.2
new file mode 100644
index 000000000000..33b106a2b56a
--- /dev/null
+++ b/metadata/md5-cache/media-libs/alsa-ucm-conf-1.2.7.2
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DEPEND=!<media-libs/alsa-lib-1.2.1
+DESCRIPTION=ALSA ucm configuration files
+EAPI=8
+HOMEPAGE=https://alsa-project.org/wiki/Main_Page
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=BSD
+RDEPEND=!<media-libs/alsa-lib-1.2.1
+SLOT=0
+SRC_URI=https://www.alsa-project.org/files/pub/lib/alsa-ucm-conf-1.2.7.2.tar.bz2
+_md5_=e73e19644467ea04d203459687f659fd
diff --git a/metadata/md5-cache/media-libs/libdvbpsi-1.3.2 b/metadata/md5-cache/media-libs/libdvbpsi-1.3.2
deleted file mode 100644
index 0a8f50d1bec0..000000000000
--- a/metadata/md5-cache/media-libs/libdvbpsi-1.3.2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=doc? ( app-doc/doxygen >=media-gfx/graphviz-2.26 )
-DESCRIPTION=library for MPEG TS/DVB PSI tables decoding and generation
-EAPI=6
-HOMEPAGE=https://www.videolan.org/libdvbpsi
-IUSE=doc static-libs
-KEYWORDS=~alpha amd64 arm arm64 ppc ppc64 sparc x86
-LICENSE=LGPL-2.1
-SLOT=0/10
-SRC_URI=https://download.videolan.org/pub/libdvbpsi/1.3.2/libdvbpsi-1.3.2.tar.bz2
-_md5_=0bdcb993e227f2685d80bf31aaaf73da
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index 5d90d17fb440..822cdb733252 100644
--- a/metadata/md5-cache/media-sound/Manifest.gz
+++ b/metadata/md5-cache/media-sound/Manifest.gz
diff --git a/metadata/md5-cache/media-sound/alsaplayer-0.99.81-r2 b/metadata/md5-cache/media-sound/alsaplayer-0.99.81-r3
index 31dd3e7a8a95..a499771da207 100644
--- a/metadata/md5-cache/media-sound/alsaplayer-0.99.81-r2
+++ b/metadata/md5-cache/media-sound/alsaplayer-0.99.81-r3
@@ -1,7 +1,8 @@
+BDEPEND=sys-devel/gettext virtual/pkgconfig doc? ( app-doc/doxygen ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install postinst postrm preinst prepare
-DEPEND=media-libs/libsndfile:= sys-libs/zlib:= alsa? ( media-libs/alsa-lib ) audiofile? ( media-libs/audiofile:= ) flac? ( media-libs/flac ) gtk? ( >=x11-libs/gtk+-2.10:2 ) id3tag? ( media-libs/libid3tag:= ) jack? ( virtual/jack ) mad? ( media-libs/libmad ) mikmod? ( media-libs/libmikmod:0 ) nas? ( media-libs/nas ) ogg? ( media-libs/libogg ) opengl? ( virtual/opengl ) vorbis? ( media-libs/libvorbis ) xosd? ( x11-libs/xosd ) virtual/pkgconfig doc? ( app-doc/doxygen ) nls? ( sys-devel/gettext ) oss? ( virtual/os-headers ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=media-libs/libsndfile:= sys-libs/zlib:= alsa? ( media-libs/alsa-lib ) audiofile? ( media-libs/audiofile:= ) flac? ( media-libs/flac ) gtk? ( >=x11-libs/gtk+-2.10:2 ) id3tag? ( media-libs/libid3tag:= ) jack? ( virtual/jack ) mad? ( media-libs/libmad ) mikmod? ( media-libs/libmikmod:0 ) nas? ( media-libs/nas ) ogg? ( media-libs/libogg ) opengl? ( virtual/opengl ) vorbis? ( media-libs/libvorbis ) xosd? ( x11-libs/xosd ) oss? ( virtual/os-headers )
 DESCRIPTION=A heavily multi-threaded pluggable audio player
-EAPI=6
+EAPI=8
 HOMEPAGE=http://www.alsaplayer.org/
 INHERIT=autotools desktop xdg
 IUSE=+alsa audiofile doc flac gtk id3tag jack mad mikmod nas nls ogg opengl oss vorbis xosd
@@ -11,5 +12,5 @@ RDEPEND=media-libs/libsndfile:= sys-libs/zlib:= alsa? ( media-libs/alsa-lib ) au
 REQUIRED_USE=|| ( alsa jack nas oss )
 SLOT=0
 SRC_URI=http://www.alsaplayer.org/alsaplayer-0.99.81.tar.bz2
-_eclasses_=autotools	2fd69a56a527d12409ba43c733b7ac8f	desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	28f0f3c0226306ec5f49e13bf851f171	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=afe1e2bf12ba4091cf0ae07fa14498de
+_eclasses_=autotools	2fd69a56a527d12409ba43c733b7ac8f	desktop	22952d8f27cac191d75529d4c38e6bfa	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=87d5d694adaf3dc1218137bdfe06032c
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index 13a7dcf9b758..b74e15e55eb5 100644
--- a/metadata/md5-cache/net-analyzer/Manifest.gz
+++ b/metadata/md5-cache/net-analyzer/Manifest.gz
diff --git a/metadata/md5-cache/net-analyzer/netselect-0.4-r1 b/metadata/md5-cache/net-analyzer/netselect-0.4-r1
deleted file mode 100644
index 4c37f38b8b7e..000000000000
--- a/metadata/md5-cache/net-analyzer/netselect-0.4-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DESCRIPTION=Ultrafast implementation of ping
-EAPI=6
-HOMEPAGE=http://apenwarr.ca/netselect/
-INHERIT=toolchain-funcs
-IUSE=ipv6
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=BSD
-SLOT=0
-SRC_URI=https://github.com/apenwarr/netselect/archive/netselect-0.4.tar.gz ipv6? ( https://dev.gentoo.org/~jsmolic/distfiles/netselect-0.4-ipv6.patch.xz )
-_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=1249a2a3ca9d765c30c79981244c46d8
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index 1d3bfdd41a9f..e489c5e59e5c 100644
--- a/metadata/md5-cache/net-libs/Manifest.gz
+++ b/metadata/md5-cache/net-libs/Manifest.gz
diff --git a/metadata/md5-cache/net-libs/rpcsvc-proto-0 b/metadata/md5-cache/net-libs/rpcsvc-proto-0-r1
index ce90e9ca4ae1..49fe3a529baa 100644
--- a/metadata/md5-cache/net-libs/rpcsvc-proto-0
+++ b/metadata/md5-cache/net-libs/rpcsvc-proto-0-r1
@@ -1,10 +1,10 @@
 DEFINED_PHASES=-
 DEPEND=elibc_glibc? ( sys-libs/glibc[rpc(-)] )
 DESCRIPTION=rpcsvc protocol definitions from glibc
-EAPI=6
+EAPI=8
 HOMEPAGE=https://github.com/thkukuk/rpcsvc-proto
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1+ BSD
 RDEPEND=elibc_glibc? ( sys-libs/glibc[rpc(-)] )
 SLOT=0
-_md5_=e0f17524aaaa2b09b34d46123dc72c2d
+_md5_=14f1c568197e245e287356aeb950e09c
diff --git a/metadata/md5-cache/net-libs/rpcsvc-proto-1.4.3 b/metadata/md5-cache/net-libs/rpcsvc-proto-1.4.3-r1
index cc07e6708066..07badddffceb 100644
--- a/metadata/md5-cache/net-libs/rpcsvc-proto-1.4.3
+++ b/metadata/md5-cache/net-libs/rpcsvc-proto-1.4.3-r1
@@ -1,11 +1,11 @@
 BDEPEND=sys-devel/gettext
 DEFINED_PHASES=install prepare
 DESCRIPTION=rpcsvc protocol definitions from glibc
-EAPI=7
+EAPI=8
 HOMEPAGE=https://github.com/thkukuk/rpcsvc-proto
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=LGPL-2.1+ BSD
 RDEPEND=!<sys-libs/glibc-2.26 virtual/libintl
 SLOT=0
 SRC_URI=https://github.com/thkukuk/rpcsvc-proto/releases/download/v1.4.3/rpcsvc-proto-1.4.3.tar.xz
-_md5_=00117afd6b55392fa7f8fa4f6ae045cf
+_md5_=7b398f0d682bff8a5b827d04c752a2b9
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index 10dd2e45dbde..b68644f410e0 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/felix-3.1.3 b/metadata/md5-cache/net-misc/felix-3.1.3
index 7d8fceec81bf..299f986599c0 100644
--- a/metadata/md5-cache/net-misc/felix-3.1.3
+++ b/metadata/md5-cache/net-misc/felix-3.1.3
@@ -1,9 +1,9 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=>=dev-libs/protobuf-3 dev-go/gogo-protobuf >=dev-lang/go-1.10 virtual/pkgconfig
+DEPEND=>=dev-libs/protobuf-3 dev-go/gogo-protobuf >=dev-lang/go-1.10
 DESCRIPTION=Calico's per-host agent, responsible for programming routes and security policy
 EAPI=6
 HOMEPAGE=https://github.com/projectcalico/felix
-INHERIT=golang-vcs-snapshot systemd user
+INHERIT=golang-vcs-snapshot
 IUSE=+bird
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
@@ -11,5 +11,5 @@ RDEPEND=net-firewall/ipset bird? ( net-misc/bird )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/projectcalico/felix/archive/3.1.3.tar.gz -> felix-3.1.3.tar.gz https://github.com/GoogleCloudPlatform/gcloud-golang/archive/3b1ae45394a234c385be014e9a488f2bb6eef821.tar.gz -> github.com-GoogleCloudPlatform-gcloud-golang-3b1ae45394a234c385be014e9a488f2bb6eef821.tar.gz https://github.com/Azure/go-autorest/archive/58f6f26e200fa5dfb40c9cd1c83f3e2c860d779d.tar.gz -> github.com-Azure-go-autorest-58f6f26e200fa5dfb40c9cd1c83f3e2c860d779d.tar.gz https://github.com/beorn7/perks/archive/3a771d992973f24aa725d07868b467d1ddfceafb.tar.gz -> github.com-beorn7-perks-3a771d992973f24aa725d07868b467d1ddfceafb.tar.gz https://github.com/containernetworking/cni/archive/137b4975ecab6e1f0c24c1e3c228a50a3cfba75e.tar.gz -> github.com-containernetworking-cni-137b4975ecab6e1f0c24c1e3c228a50a3cfba75e.tar.gz https://github.com/coreos/etcd/archive/c23606781f63d09917a1e7abfcefeb337a9608ea.tar.gz -> github.com-coreos-etcd-c23606781f63d09917a1e7abfcefeb337a9608ea.tar.gz https://github.com/davecgh/go-spew/archive/782f4967f2dc4564575ca782fe2d04090b5faca8.tar.gz -> github.com-davecgh-go-spew-782f4967f2dc4564575ca782fe2d04090b5faca8.tar.gz https://github.com/dgrijalva/jwt-go/archive/01aeca54ebda6e0fbfafd0a524d234159c05ec20.tar.gz -> github.com-dgrijalva-jwt-go-01aeca54ebda6e0fbfafd0a524d234159c05ec20.tar.gz https://github.com/docopt/docopt-go/archive/784ddc588536785e7299f7272f39101f7faccc3f.tar.gz -> github.com-docopt-docopt-go-784ddc588536785e7299f7272f39101f7faccc3f.tar.gz https://github.com/emicklei/go-restful/archive/777bb3f19bcafe2575ffb2a3e46af92509ae9594.tar.gz -> github.com-emicklei-go-restful-777bb3f19bcafe2575ffb2a3e46af92509ae9594.tar.gz https://github.com/emicklei/go-restful-swagger12/archive/dcef7f55730566d41eae5db10e7d6981829720f6.tar.gz -> github.com-emicklei-go-restful-swagger12-dcef7f55730566d41eae5db10e7d6981829720f6.tar.gz https://github.com/ghodss/yaml/archive/0ca9ea5df5451ffdf184b4428c902747c2c11cd7.tar.gz -> github.com-ghodss-yaml-0ca9ea5df5451ffdf184b4428c902747c2c11cd7.tar.gz https://github.com/go-ini/ini/archive/06f5f3d67269ccec1fe5fe4134ba6e982984f7f5.tar.gz -> github.com-go-ini-ini-06f5f3d67269ccec1fe5fe4134ba6e982984f7f5.tar.gz https://github.com/go-openapi/jsonpointer/archive/46af16f9f7b149af66e5d1bd010e3574dc06de98.tar.gz -> github.com-go-openapi-jsonpointer-46af16f9f7b149af66e5d1bd010e3574dc06de98.tar.gz https://github.com/go-openapi/jsonreference/archive/13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272.tar.gz -> github.com-go-openapi-jsonreference-13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272.tar.gz https://github.com/go-openapi/spec/archive/6aced65f8501fe1217321abf0749d354824ba2ff.tar.gz -> github.com-go-openapi-spec-6aced65f8501fe1217321abf0749d354824ba2ff.tar.gz https://github.com/go-openapi/swag/archive/1d0bd113de87027671077d3c71eb3ac5d7dbba72.tar.gz -> github.com-go-openapi-swag-1d0bd113de87027671077d3c71eb3ac5d7dbba72.tar.gz https://github.com/gogo/protobuf/archive/342cbe0a04158f6dcb03ca0079991a51a4248c02.tar.gz -> github.com-gogo-protobuf-342cbe0a04158f6dcb03ca0079991a51a4248c02.tar.gz https://github.com/golang/glog/archive/44145f04b68cf362d9c4df2182967c2275eaefed.tar.gz -> github.com-golang-glog-44145f04b68cf362d9c4df2182967c2275eaefed.tar.gz https://github.com/golang/protobuf/archive/4bd1920723d7b7c925de087aa32e2187708897f7.tar.gz -> github.com-golang-protobuf-4bd1920723d7b7c925de087aa32e2187708897f7.tar.gz https://github.com/google/btree/archive/7d79101e329e5a3adf994758c578dab82b90c017.tar.gz -> github.com-google-btree-7d79101e329e5a3adf994758c578dab82b90c017.tar.gz https://github.com/google/gofuzz/archive/44d81051d367757e1c7c6a5a86423ece9afcf63c.tar.gz -> github.com-google-gofuzz-44d81051d367757e1c7c6a5a86423ece9afcf63c.tar.gz https://github.com/googleapis/gnostic/archive/0c5108395e2debce0d731cf0287ddf7242066aba.tar.gz -> github.com-googleapis-gnostic-0c5108395e2debce0d731cf0287ddf7242066aba.tar.gz https://github.com/gophercloud/gophercloud/archive/2bf16b94fdd9b01557c4d076e567fe5cbbe5a961.tar.gz -> github.com-gophercloud-gophercloud-2bf16b94fdd9b01557c4d076e567fe5cbbe5a961.tar.gz https://github.com/gregjones/httpcache/archive/787624de3eb7bd915c329cba748687a3b22666a6.tar.gz -> github.com-gregjones-httpcache-787624de3eb7bd915c329cba748687a3b22666a6.tar.gz https://github.com/gxed/eventfd/archive/80a92cca79a8041496ccc9dd773fcb52a57ec6f9.tar.gz -> github.com-gxed-eventfd-80a92cca79a8041496ccc9dd773fcb52a57ec6f9.tar.gz https://github.com/gxed/GoEndian/archive/0f5c6873267e5abf306ffcdfcfa4bf77517ef4a7.tar.gz -> github.com-gxed-GoEndian-0f5c6873267e5abf306ffcdfcfa4bf77517ef4a7.tar.gz https://github.com/hashicorp/golang-lru/archive/a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4.tar.gz -> github.com-hashicorp-golang-lru-a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4.tar.gz https://github.com/howeyc/gopass/archive/bf9dde6d0d2c004a008c27aaee91170c786f6db8.tar.gz -> github.com-howeyc-gopass-bf9dde6d0d2c004a008c27aaee91170c786f6db8.tar.gz https://github.com/imdario/mergo/archive/6633656539c1639d9d78127b7d47c622b5d7b6dc.tar.gz -> github.com-imdario-mergo-6633656539c1639d9d78127b7d47c622b5d7b6dc.tar.gz https://github.com/ipfs/go-log/archive/b9df188d0fae32d69c1a519fa81741668a12f55a.tar.gz -> github.com-ipfs-go-log-b9df188d0fae32d69c1a519fa81741668a12f55a.tar.gz https://github.com/jbenet/go-reuseport/archive/7eed93a5b50b20c209baefe9fafa53c3d965a33c.tar.gz -> github.com-jbenet-go-reuseport-7eed93a5b50b20c209baefe9fafa53c3d965a33c.tar.gz https://github.com/jbenet/go-sockaddr/archive/2e7ea655c10e4d4d73365f0f073b81b39cb08ee1.tar.gz -> github.com-jbenet-go-sockaddr-2e7ea655c10e4d4d73365f0f073b81b39cb08ee1.tar.gz https://github.com/json-iterator/go/archive/36b14963da70d11297d313183d7e6388c8510e1e.tar.gz -> github.com-json-iterator-go-36b14963da70d11297d313183d7e6388c8510e1e.tar.gz https://github.com/juju/ratelimit/archive/5b9ff866471762aa2ab2dced63c9fb6f53921342.tar.gz -> github.com-juju-ratelimit-5b9ff866471762aa2ab2dced63c9fb6f53921342.tar.gz https://github.com/kardianos/osext/archive/ae77be60afb1dcacde03767a8c37337fad28ac14.tar.gz -> github.com-kardianos-osext-ae77be60afb1dcacde03767a8c37337fad28ac14.tar.gz https://github.com/kelseyhightower/envconfig/archive/f611eb38b3875cc3bd991ca91c51d06446afa14c.tar.gz -> github.com-kelseyhightower-envconfig-f611eb38b3875cc3bd991ca91c51d06446afa14c.tar.gz https://github.com/mailru/easyjson/archive/d5b7844b561a7bc640052f1b935f7b800330d7e0.tar.gz -> github.com-mailru-easyjson-d5b7844b561a7bc640052f1b935f7b800330d7e0.tar.gz https://github.com/mattn/go-colorable/archive/efa589957cd060542a26d2dd7832fd6a6c6c3ade.tar.gz -> github.com-mattn-go-colorable-efa589957cd060542a26d2dd7832fd6a6c6c3ade.tar.gz https://github.com/mattn/go-isatty/archive/6ca4dbf54d38eea1a992b3c722a76a5d1c4cb25c.tar.gz -> github.com-mattn-go-isatty-6ca4dbf54d38eea1a992b3c722a76a5d1c4cb25c.tar.gz https://github.com/matttproud/golang_protobuf_extensions/archive/fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a.tar.gz -> github.com-matttproud-golang_protobuf_extensions-fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a.tar.gz https://github.com/Microsoft/go-winio/archive/78439966b38d69bf38227fbf57ac8a6fee70f69a.tar.gz -> github.com-Microsoft-go-winio-78439966b38d69bf38227fbf57ac8a6fee70f69a.tar.gz https://github.com/Microsoft/hcsshim/archive/34a629f78a5d50f7de07727e41a948685c45e026.tar.gz -> github.com-Microsoft-hcsshim-34a629f78a5d50f7de07727e41a948685c45e026.tar.gz https://github.com/mipearson/rfw/archive/6f0a6f3266ba1058df9ef0c94cda1cecd2e62852.tar.gz -> github.com-mipearson-rfw-6f0a6f3266ba1058df9ef0c94cda1cecd2e62852.tar.gz https://github.com/onsi/ginkgo/archive/fa5fabab2a1bfbd924faf4c067d07ae414e2aedf.tar.gz -> github.com-onsi-ginkgo-fa5fabab2a1bfbd924faf4c067d07ae414e2aedf.tar.gz https://github.com/onsi/gomega/archive/62bff4df71bdbc266561a0caee19f0594b17c240.tar.gz -> github.com-onsi-gomega-62bff4df71bdbc266561a0caee19f0594b17c240.tar.gz https://github.com/opentracing/opentracing-go/archive/6c572c00d1830223701e155de97408483dfcd14a.tar.gz -> github.com-opentracing-opentracing-go-6c572c00d1830223701e155de97408483dfcd14a.tar.gz https://github.com/pborman/uuid/archive/ca53cad383cad2479bbba7f7a1a05797ec1386e4.tar.gz -> github.com-pborman-uuid-ca53cad383cad2479bbba7f7a1a05797ec1386e4.tar.gz https://github.com/peterbourgon/diskv/archive/5f041e8faa004a95c88a202771f4cc3e991971e6.tar.gz -> github.com-peterbourgon-diskv-5f041e8faa004a95c88a202771f4cc3e991971e6.tar.gz https://github.com/projectcalico/go-json/archive/6219dc7339ba20ee4c57df0a8baac62317d19cb1.tar.gz -> github.com-projectcalico-go-json-6219dc7339ba20ee4c57df0a8baac62317d19cb1.tar.gz https://github.com/projectcalico/go-yaml/archive/955bc3e451ef0c9df8b9113bf2e341139cdafab2.tar.gz -> github.com-projectcalico-go-yaml-955bc3e451ef0c9df8b9113bf2e341139cdafab2.tar.gz https://github.com/projectcalico/go-yaml-wrapper/archive/598e54215bee41a19677faa4f0c32acd2a87eb56.tar.gz -> github.com-projectcalico-go-yaml-wrapper-598e54215bee41a19677faa4f0c32acd2a87eb56.tar.gz https://github.com/projectcalico/libcalico-go/archive/0417ab6e1ea49be2abb978df365b25f20fdb3c6f.tar.gz -> github.com-projectcalico-libcalico-go-0417ab6e1ea49be2abb978df365b25f20fdb3c6f.tar.gz https://github.com/projectcalico/typha/archive/5374e9f32bde159a4aa19c821618920f491004be.tar.gz -> github.com-projectcalico-typha-5374e9f32bde159a4aa19c821618920f491004be.tar.gz https://github.com/prometheus/client_golang/archive/967789050ba94deca04a5e84cce8ad472ce313c1.tar.gz -> github.com-prometheus-client_golang-967789050ba94deca04a5e84cce8ad472ce313c1.tar.gz https://github.com/prometheus/client_model/archive/6f3806018612930941127f2a7c6c453ba2c527d2.tar.gz -> github.com-prometheus-client_model-6f3806018612930941127f2a7c6c453ba2c527d2.tar.gz https://github.com/prometheus/common/archive/7600349dcfe1abd18d72d3a1770870d9800a7801.tar.gz -> github.com-prometheus-common-7600349dcfe1abd18d72d3a1770870d9800a7801.tar.gz https://github.com/prometheus/procfs/archive/f98634e408857669d61064b283c4cde240622865.tar.gz -> github.com-prometheus-procfs-f98634e408857669d61064b283c4cde240622865.tar.gz https://github.com/PuerkitoBio/purell/archive/8a290539e2e8629dbc4e6bad948158f790ec31f4.tar.gz -> github.com-PuerkitoBio-purell-8a290539e2e8629dbc4e6bad948158f790ec31f4.tar.gz https://github.com/PuerkitoBio/urlesc/archive/5bd2802263f21d8788851d5305584c82a5c75d7e.tar.gz -> github.com-PuerkitoBio-urlesc-5bd2802263f21d8788851d5305584c82a5c75d7e.tar.gz https://github.com/satori/go.uuid/archive/f58768cc1a7a7e77a3bd49e98cdd21419399b6a3.tar.gz -> github.com-satori-go.uuid-f58768cc1a7a7e77a3bd49e98cdd21419399b6a3.tar.gz https://github.com/sirupsen/logrus/archive/d682213848ed68c0a260ca37d6dd5ace8423f5ba.tar.gz -> github.com-sirupsen-logrus-d682213848ed68c0a260ca37d6dd5ace8423f5ba.tar.gz https://github.com/spf13/pflag/archive/9ff6c6923cfffbcd502984b8e0c80539a94968b7.tar.gz -> github.com-spf13-pflag-9ff6c6923cfffbcd502984b8e0c80539a94968b7.tar.gz https://github.com/vishvananda/netlink/archive/dc00cf9d5c07f9a1e0ccb307443b2194ca1aaacb.tar.gz -> github.com-vishvananda-netlink-dc00cf9d5c07f9a1e0ccb307443b2194ca1aaacb.tar.gz https://github.com/vishvananda/netns/archive/8ba1072b58e0c2a240eb5f6120165c7776c3e7b8.tar.gz -> github.com-vishvananda-netns-8ba1072b58e0c2a240eb5f6120165c7776c3e7b8.tar.gz https://github.com/whyrusleeping/go-logging/archive/0457bb6b88fc1973573aaf6b5145d8d3ae972390.tar.gz -> github.com-whyrusleeping-go-logging-0457bb6b88fc1973573aaf6b5145d8d3ae972390.tar.gz https://github.com/golang/crypto/archive/ab813273cd59e1333f7ae7bff5d027d4aadf528c.tar.gz -> github.com-golang-crypto-ab813273cd59e1333f7ae7bff5d027d4aadf528c.tar.gz https://github.com/golang/net/archive/66aacef3dd8a676686c7ae3716979581e8b03c47.tar.gz -> github.com-golang-net-66aacef3dd8a676686c7ae3716979581e8b03c47.tar.gz https://github.com/golang/oauth2/archive/a6bd8cefa1811bd24b86f8902872e4e8225f74c4.tar.gz -> github.com-golang-oauth2-a6bd8cefa1811bd24b86f8902872e4e8225f74c4.tar.gz https://github.com/golang/sys/archive/88d2dcc510266da9f7f8c7f34e1940716cab5f5c.tar.gz -> github.com-golang-sys-88d2dcc510266da9f7f8c7f34e1940716cab5f5c.tar.gz https://github.com/golang/text/archive/4ee4af566555f5fbe026368b75596286a312663a.tar.gz -> github.com-golang-text-4ee4af566555f5fbe026368b75596286a312663a.tar.gz https://github.com/golang/appengine/archive/b1f26356af11148e710935ed1ac8a7f5702c7612.tar.gz -> github.com-golang-appengine-b1f26356af11148e710935ed1ac8a7f5702c7612.tar.gz https://github.com/google/go-genproto/archive/09f6ed296fc66555a25fe4ce95173148778dfa85.tar.gz -> github.com-google-go-genproto-09f6ed296fc66555a25fe4ce95173148778dfa85.tar.gz https://github.com/grpc/grpc-go/archive/5b3c4e850e90a4cf6a20ebd46c8b32a0a3afcb9e.tar.gz -> github.com-grpc-grpc-go-5b3c4e850e90a4cf6a20ebd46c8b32a0a3afcb9e.tar.gz https://github.com/go-playground/validator/archive/5f57d2222ad794d0dffb07e664ea05e2ee07d60c.tar.gz -> github.com-go-playground-validator-5f57d2222ad794d0dffb07e664ea05e2ee07d60c.tar.gz https://github.com/go-inf/inf/archive/3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4.tar.gz -> github.com-go-inf-inf-3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4.tar.gz https://github.com/go-yaml/yaml/archive/53feefa2559fb8dfa8d81baad31be332c97d6c77.tar.gz -> github.com-go-yaml-yaml-53feefa2559fb8dfa8d81baad31be332c97d6c77.tar.gz https://github.com/kubernetes/api/archive/a315a049e7a93e5455f7fefce1ba136d85054687.tar.gz -> github.com-kubernetes-api-a315a049e7a93e5455f7fefce1ba136d85054687.tar.gz https://github.com/kubernetes/apimachinery/archive/40eaf68ee1889b1da1c528b1a075ecfe94e66837.tar.gz -> github.com-kubernetes-apimachinery-40eaf68ee1889b1da1c528b1a075ecfe94e66837.tar.gz https://github.com/kubernetes/client-go/archive/82aa063804cf055e16e8911250f888bc216e8b61.tar.gz -> github.com-kubernetes-client-go-82aa063804cf055e16e8911250f888bc216e8b61.tar.gz https://github.com/kubernetes/kube-openapi/archive/0c329704159e3b051aafac400b15baacf2a94a04.tar.gz -> github.com-kubernetes-kube-openapi-0c329704159e3b051aafac400b15baacf2a94a04.tar.gz
-_eclasses_=golang-base	9f0e420ab37bc55a318d74bab3aae891	golang-vcs-snapshot	6864f899c6843043ba23620fcd4a908c	multilib	4fbbbc98f236f1b43acd99476bc3cd85	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
-_md5_=38433d7e4c34ce525f37136a4086f717
+_eclasses_=golang-base	9f0e420ab37bc55a318d74bab3aae891	golang-vcs-snapshot	6864f899c6843043ba23620fcd4a908c
+_md5_=0c8827362ea8be65b6b477717e37c11d
diff --git a/metadata/md5-cache/net-misc/keychain-2.8.5-r1 b/metadata/md5-cache/net-misc/keychain-2.8.5-r1
new file mode 100644
index 000000000000..bb87baed5a99
--- /dev/null
+++ b/metadata/md5-cache/net-misc/keychain-2.8.5-r1
@@ -0,0 +1,10 @@
+BDEPEND=dev-lang/perl
+DEFINED_PHASES=install
+DESCRIPTION=Agent manager for OpenSSH, ssh.com, Sun SSH, and GnuPG
+EAPI=8
+HOMEPAGE=https://www.funtoo.org/Keychain
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=https://github.com/funtoo/keychain/archive/2.8.5.tar.gz -> keychain-2.8.5.tar.gz
+_md5_=ac75ddfcad328a19a7bbe5eb7f2d4657
diff --git a/metadata/md5-cache/net-misc/putty-0.76 b/metadata/md5-cache/net-misc/putty-0.76
index 212cf718686b..b54d65c53b42 100644
--- a/metadata/md5-cache/net-misc/putty-0.76
+++ b/metadata/md5-cache/net-misc/putty-0.76
@@ -11,6 +11,6 @@ LICENSE=MIT
 RDEPEND=!net-misc/pssh gtk? ( dev-libs/glib:2 x11-libs/gdk-pixbuf x11-libs/libX11 x11-libs/pango gtk2? ( x11-libs/gtk+:2 ) !gtk2? ( x11-libs/gtk+:3[X] ) ) gssapi? ( virtual/krb5 )
 REQUIRED_USE=gtk2? ( gtk )
 SLOT=0
-SRC_URI=https://dev.gentoo.org/~polynomial-c/putty-icons.tar.bz2 https://the.earth.li/~sgtatham/putty/0.76/putty-0.76.tar.gz
+SRC_URI=https://dev.gentoo.org/~matthew/distfiles/putty-icons.tar.bz2 https://the.earth.li/~sgtatham/putty/0.76/putty-0.76.tar.gz
 _eclasses_=autotools	2fd69a56a527d12409ba43c733b7ac8f	desktop	22952d8f27cac191d75529d4c38e6bfa	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=0d9bddedd24cfdf79e67f9822b36eaa5
+_md5_=b6ef734a4b27b81b25b8fbf64acf8d25
diff --git a/metadata/md5-cache/net-misc/putty-0.77 b/metadata/md5-cache/net-misc/putty-0.77-r1
index ca8ee5b35398..29f6d54ca2c4 100644
--- a/metadata/md5-cache/net-misc/putty-0.77
+++ b/metadata/md5-cache/net-misc/putty-0.77-r1
@@ -1,16 +1,16 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+BDEPEND=dev-lang/perl virtual/pkgconfig doc? ( app-doc/halibut ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
 DEPEND=!net-misc/pssh gtk? ( dev-libs/glib:2 x11-libs/gdk-pixbuf x11-libs/libX11 x11-libs/pango gtk2? ( x11-libs/gtk+:2 ) !gtk2? ( x11-libs/gtk+:3[X] ) ) gssapi? ( virtual/krb5 )
 DESCRIPTION=A Free Telnet/SSH Client
 EAPI=8
 HOMEPAGE=https://www.chiark.greenend.org.uk/~sgtatham/putty/
 INHERIT=cmake desktop xdg-utils
-IUSE=debug +gtk gtk2 ipv6 gssapi
+IUSE=debug doc +gtk gtk2 ipv6 gssapi
 KEYWORDS=~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
 LICENSE=MIT
 RDEPEND=!net-misc/pssh gtk? ( dev-libs/glib:2 x11-libs/gdk-pixbuf x11-libs/libX11 x11-libs/pango gtk2? ( x11-libs/gtk+:2 ) !gtk2? ( x11-libs/gtk+:3[X] ) ) gssapi? ( virtual/krb5 )
 REQUIRED_USE=gtk2? ( gtk )
 SLOT=0
-SRC_URI=https://dev.gentoo.org/~polynomial-c/putty-icons.tar.bz2 https://the.earth.li/~sgtatham/putty/0.77/putty-0.77.tar.gz
+SRC_URI=https://dev.gentoo.org/~matthew/distfiles/putty-icons.tar.bz2 https://the.earth.li/~sgtatham/putty/0.77/putty-0.77.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	desktop	22952d8f27cac191d75529d4c38e6bfa	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=6253432cc6e83eaa71c818fff90dd91f
+_md5_=0e9c64b82b20c654e8afa550f896f4a5
diff --git a/metadata/md5-cache/net-misc/putty-9999 b/metadata/md5-cache/net-misc/putty-9999
index e0343ef01286..f52a7b39aaab 100644
--- a/metadata/md5-cache/net-misc/putty-9999
+++ b/metadata/md5-cache/net-misc/putty-9999
@@ -1,16 +1,16 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=dev-lang/perl virtual/pkgconfig doc? ( app-doc/halibut ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
 DEPEND=!net-misc/pssh gtk? ( dev-libs/glib:2 x11-libs/gdk-pixbuf x11-libs/libX11 x11-libs/pango gtk2? ( x11-libs/gtk+:2 ) !gtk2? ( x11-libs/gtk+:3[X] ) ) gssapi? ( virtual/krb5 )
 DESCRIPTION=A Free Telnet/SSH Client
 EAPI=8
 HOMEPAGE=https://www.chiark.greenend.org.uk/~sgtatham/putty/
 INHERIT=cmake desktop xdg-utils git-r3
-IUSE=debug +gtk gtk2 ipv6 gssapi
+IUSE=debug doc +gtk gtk2 ipv6 gssapi
 LICENSE=MIT
 PROPERTIES=live
 RDEPEND=!net-misc/pssh gtk? ( dev-libs/glib:2 x11-libs/gdk-pixbuf x11-libs/libX11 x11-libs/pango gtk2? ( x11-libs/gtk+:2 ) !gtk2? ( x11-libs/gtk+:3[X] ) ) gssapi? ( virtual/krb5 )
 REQUIRED_USE=gtk2? ( gtk )
 SLOT=0
-SRC_URI=https://dev.gentoo.org/~polynomial-c/putty-icons.tar.bz2
+SRC_URI=https://dev.gentoo.org/~matthew/distfiles/putty-icons.tar.bz2
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	desktop	22952d8f27cac191d75529d4c38e6bfa	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=6253432cc6e83eaa71c818fff90dd91f
+_md5_=0e9c64b82b20c654e8afa550f896f4a5
diff --git a/metadata/md5-cache/net-misc/rclone-1.59.0 b/metadata/md5-cache/net-misc/rclone-1.59.0
new file mode 100644
index 000000000000..d5554ffbfc7e
--- /dev/null
+++ b/metadata/md5-cache/net-misc/rclone-1.59.0
@@ -0,0 +1,13 @@
+BDEPEND=>=dev-lang/go-1.16 app-arch/unzip
+DEFINED_PHASES=compile install test unpack
+DESCRIPTION=A program to sync files to and from various cloud storage providers
+EAPI=8
+HOMEPAGE=https://rclone.org/
+INHERIT=bash-completion-r1 go-module
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://github.com/rclone/rclone/archive/v1.59.0.tar.gz -> rclone-1.59.0.tar.gz https://dev.gentoo.org/~slashbeast/distfiles/rclone/rclone-1.59.0-deps.tar.xz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	go-module	a13d34fe4e2996720e1ca6c53b9ea95a	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=c215c3b9ce3f033ddec6f2f5181c7e3e
diff --git a/metadata/md5-cache/net-proxy/Manifest.gz b/metadata/md5-cache/net-proxy/Manifest.gz
index fe306459f38a..6466e6b50de4 100644
--- a/metadata/md5-cache/net-proxy/Manifest.gz
+++ b/metadata/md5-cache/net-proxy/Manifest.gz
diff --git a/metadata/md5-cache/net-proxy/mitmproxy-7.0.4 b/metadata/md5-cache/net-proxy/mitmproxy-7.0.4
deleted file mode 100644
index b0aec40d497a..000000000000
--- a/metadata/md5-cache/net-proxy/mitmproxy-7.0.4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/hypothesis-5.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/parver-0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-asyncio-0.10.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-2.9.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=app-arch/brotli-1.0.0[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/asgiref-3.2.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/blinker-1.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/certifi-2015.11.20.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/click-7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cryptography-3.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/flask-1.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/h2-4.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/hyperframe-6.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/kaitaistruct-0.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ldap3-2.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/msgpack-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/passlib-1.6.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/protobuf-python-3.14.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/publicsuffix-2.20190205[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyasn1-0.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyopenssl-20.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyparsing-2.4.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyperclip-1.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ruamel-yaml-0.16[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sortedcontainers-2.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=www-servers/tornado-4.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/urwid-2.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/wsproto-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/zstandard-0.11.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-libs/openssl:0 >=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[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[sqlite] ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=An interactive, SSL-capable, man-in-the-middle HTTP proxy
-EAPI=8
-HOMEPAGE=https://mitmproxy.org/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm64 ~x86
-LICENSE=MIT
-RDEPEND=>=app-arch/brotli-1.0.0[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/asgiref-3.2.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/blinker-1.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/certifi-2015.11.20.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/click-7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cryptography-3.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/flask-1.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/h2-4.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/hyperframe-6.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/kaitaistruct-0.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ldap3-2.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/msgpack-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/passlib-1.6.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/protobuf-python-3.14.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/publicsuffix-2.20190205[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyasn1-0.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyopenssl-20.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyparsing-2.4.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyperclip-1.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ruamel-yaml-0.16[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sortedcontainers-2.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=www-servers/tornado-4.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/urwid-2.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/wsproto-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/zstandard-0.11.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-libs/openssl:0 python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[sqlite] )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/mitmproxy/mitmproxy/archive/v7.0.4.tar.gz -> mitmproxy-7.0.4.tar.gz
-_eclasses_=distutils-r1	64c5b9cc381383c9c1ef74fb199293ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=5e5528ebb93943e1594249df37077ba5
diff --git a/metadata/md5-cache/net-proxy/mitmproxy-8.0.0 b/metadata/md5-cache/net-proxy/mitmproxy-8.0.0
deleted file mode 100644
index 0fc09a55843a..000000000000
--- a/metadata/md5-cache/net-proxy/mitmproxy-8.0.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/click-7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/hypothesis-5.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/parver-0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-asyncio-0.17.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-2.9.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=app-arch/brotli-1.0.0[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/asgiref-3.2.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/blinker-1.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/certifi-2015.11.20.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cryptography-37.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/flask-1.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/h2-4.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/hyperframe-6.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/kaitaistruct-0.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ldap3-2.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/msgpack-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/passlib-1.6.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/protobuf-python-3.14.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/publicsuffix-2.20190205[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyasn1-0.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyopenssl-22.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyparsing-2.4.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyperclip-1.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ruamel-yaml-0.16[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sortedcontainers-2.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/urwid-2.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/wsproto-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/zstandard-0.11.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-libs/openssl:0 >=www-servers/tornado-6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[sqlite] ) >=dev-python/gpep517-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.3.3[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=An interactive, SSL-capable, man-in-the-middle HTTP proxy
-EAPI=8
-HOMEPAGE=https://mitmproxy.org/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=MIT
-RDEPEND=>=app-arch/brotli-1.0.0[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/asgiref-3.2.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/blinker-1.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/certifi-2015.11.20.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cryptography-37.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/flask-1.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/h2-4.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/hyperframe-6.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/kaitaistruct-0.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ldap3-2.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/msgpack-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/passlib-1.6.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/protobuf-python-3.14.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/publicsuffix-2.20190205[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyasn1-0.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyopenssl-22.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyparsing-2.4.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyperclip-1.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ruamel-yaml-0.16[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sortedcontainers-2.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/urwid-2.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/wsproto-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/zstandard-0.11.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-libs/openssl:0 >=www-servers/tornado-6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[sqlite] )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/mitmproxy/mitmproxy/archive/v8.0.0.tar.gz -> mitmproxy-8.0.0.tar.gz
-_eclasses_=distutils-r1	64c5b9cc381383c9c1ef74fb199293ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=3daca681f630aabd86ea0eb8c1af43a0
diff --git a/metadata/md5-cache/net-proxy/mitmproxy-8.1.0 b/metadata/md5-cache/net-proxy/mitmproxy-8.1.0
index ec38a34d9092..e8778b4681fb 100644
--- a/metadata/md5-cache/net-proxy/mitmproxy-8.1.0
+++ b/metadata/md5-cache/net-proxy/mitmproxy-8.1.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://mitmproxy.org/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 ~x86
 LICENSE=MIT
 RDEPEND=>=app-arch/brotli-1.0.0[python,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/asgiref-3.2.10[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/blinker-1.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/certifi-2015.11.20.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cryptography-37.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/flask-1.1.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/h2-4.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/hyperframe-6.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/kaitaistruct-0.7[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ldap3-2.8[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/msgpack-1.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/passlib-1.6.5[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/protobuf-python-3.14.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/publicsuffix-2.20190205[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyasn1-0.3.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyopenssl-22.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyparsing-2.4.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyperclip-1.6.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ruamel-yaml-0.16[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sortedcontainers-2.3.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/urwid-2.1.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/wsproto-1.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/zstandard-0.11.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-libs/openssl:0 >=www-servers/tornado-6.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[sqlite] )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mitmproxy/mitmproxy/archive/v8.1.0.tar.gz -> mitmproxy-8.1.0.tar.gz
 _eclasses_=distutils-r1	64c5b9cc381383c9c1ef74fb199293ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=c9160e6dc9e3fb25bade1f2dcc45fdfa
+_md5_=856bd44722d2034466ad188dafaf2e5f
diff --git a/metadata/md5-cache/net-proxy/mitmproxy-8.1.1 b/metadata/md5-cache/net-proxy/mitmproxy-8.1.1
new file mode 100644
index 000000000000..260328cc96ce
--- /dev/null
+++ b/metadata/md5-cache/net-proxy/mitmproxy-8.1.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/click-7.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/hypothesis-5.8[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/parver-0.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-asyncio-0.17.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-2.9.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=app-arch/brotli-1.0.0[python,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/asgiref-3.2.10[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/blinker-1.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/certifi-2015.11.20.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cryptography-37.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/flask-1.1.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/h2-4.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/hyperframe-6.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/kaitaistruct-0.7[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ldap3-2.8[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/msgpack-1.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/passlib-1.6.5[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/protobuf-python-3.14.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/publicsuffix-2.20190205[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyasn1-0.3.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyopenssl-22.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyparsing-2.4.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyperclip-1.6.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ruamel-yaml-0.16[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sortedcontainers-2.3.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/urwid-2.1.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/wsproto-1.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/zstandard-0.11.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-libs/openssl:0 >=www-servers/tornado-6.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[sqlite] ) >=dev-python/gpep517-6[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.3.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=An interactive, SSL-capable, man-in-the-middle HTTP proxy
+EAPI=8
+HOMEPAGE=https://mitmproxy.org/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=MIT
+RDEPEND=>=app-arch/brotli-1.0.0[python,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/asgiref-3.2.10[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/blinker-1.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/certifi-2015.11.20.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cryptography-37.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/flask-1.1.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/h2-4.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/hyperframe-6.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/kaitaistruct-0.7[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ldap3-2.8[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/msgpack-1.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/passlib-1.6.5[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/protobuf-python-3.14.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/publicsuffix-2.20190205[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyasn1-0.3.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyopenssl-22.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyparsing-2.4.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyperclip-1.6.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ruamel-yaml-0.16[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sortedcontainers-2.3.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/urwid-2.1.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/wsproto-1.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/zstandard-0.11.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-libs/openssl:0 >=www-servers/tornado-6.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[sqlite] )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/mitmproxy/mitmproxy/archive/v8.1.1.tar.gz -> mitmproxy-8.1.1.gh.tar.gz
+_eclasses_=distutils-r1	64c5b9cc381383c9c1ef74fb199293ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=e30bd95660c393f76477c95de52bd96a
diff --git a/metadata/md5-cache/net-vpn/Manifest.gz b/metadata/md5-cache/net-vpn/Manifest.gz
index 481267c52726..0c741393a1d0 100644
--- a/metadata/md5-cache/net-vpn/Manifest.gz
+++ b/metadata/md5-cache/net-vpn/Manifest.gz
diff --git a/metadata/md5-cache/net-vpn/i2p-1.7.0 b/metadata/md5-cache/net-vpn/i2p-1.7.0
index eafc16c01037..186862b11f42 100644
--- a/metadata/md5-cache/net-vpn/i2p-1.7.0
+++ b/metadata/md5-cache/net-vpn/i2p-1.7.0
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://geti2p.net
 INHERIT=java-pkg-2 java-ant-2 systemd
 IUSE=nls test
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm ~x86
 LICENSE=Apache-2.0 Artistic BSD CC-BY-2.5 CC-BY-3.0 CC-BY-SA-3.0 EPL-1.0 GPL-2 GPL-3 LGPL-2.1 LGPL-3 MIT public-domain WTFPL-2
 RDEPEND=dev-java/java-service-wrapper:0 acct-user/i2p acct-group/i2p net-libs/nativebiginteger:0 || ( virtual/jre:1.8 virtual/jre:11 ) >=dev-java/java-config-2.2.0-r3
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.i2p-projekt.de/1.7.0/i2psource_1.7.0.tar.bz2
 _eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	c0a9bd68d938ab2d3a7e237fd05f1dd8	multilib	4fbbbc98f236f1b43acd99476bc3cd85	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=a34b89a497e21f3ce1fca4e3b0adcee3
+_md5_=c8e4551ce027b15f334b022bb47ab847
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index 097244a6c605..1745b1abb8b0 100644
--- a/metadata/md5-cache/sci-libs/Manifest.gz
+++ b/metadata/md5-cache/sci-libs/Manifest.gz
diff --git a/metadata/md5-cache/sci-libs/linux-gpib-4.3.4 b/metadata/md5-cache/sci-libs/linux-gpib-4.3.4
deleted file mode 100644
index aa9f90389a6d..000000000000
--- a/metadata/md5-cache/sci-libs/linux-gpib-4.3.4
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup unpack
-DEPEND=sys-libs/readline:= tcl? ( dev-lang/tcl:0= ) guile? ( dev-scheme/guile:12 ) perl? ( dev-lang/perl:= ) php? ( dev-lang/php:= ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) ) firmware? ( sys-apps/fxload ) virtual/pkgconfig doc? ( app-text/docbook-sgml-utils ) perl? ( virtual/perl-ExtUtils-MakeMaker ) 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
-DESCRIPTION=Driver library for GPIB (IEEE 488.2) hardware
-EAPI=6
-HOMEPAGE=https://linux-gpib.sourceforge.io/
-INHERIT=readme.gentoo-r1 autotools perl-functions python-single-r1 toolchain-funcs udev
-IUSE=pcmcia static guile perl php python tcl doc firmware python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=sys-libs/readline:= tcl? ( dev-lang/tcl:0= ) guile? ( dev-scheme/guile:12 ) perl? ( dev-lang/perl:= ) php? ( dev-lang/php:= ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) ) firmware? ( sys-apps/fxload ) acct-group/gpib ~sci-libs/linux-gpib-modules-4.3.4
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) )
-SLOT=0
-SRC_URI=mirror://sourceforge/linux-gpib/linux-gpib-4.3.4.tar.gz firmware? ( https://linux-gpib.sourceforge.io/firmware/gpib_firmware-2006-11-12.tar.gz )
-_eclasses_=autotools	2fd69a56a527d12409ba43c733b7ac8f	desktop	22952d8f27cac191d75529d4c38e6bfa	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	28f0f3c0226306ec5f49e13bf851f171	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	95b2df43c5f3057b6e77bd00b4d953da	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	udev	f3a0a3964e2028a140c181f00eea9712	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=437a98abe4f3499cec140d4b161656ba
diff --git a/metadata/md5-cache/sci-libs/linux-gpib-4.3.4-r1 b/metadata/md5-cache/sci-libs/linux-gpib-4.3.4-r1
index aa16ac03489d..7b2f741cde1b 100644
--- a/metadata/md5-cache/sci-libs/linux-gpib-4.3.4-r1
+++ b/metadata/md5-cache/sci-libs/linux-gpib-4.3.4-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://linux-gpib.sourceforge.io/
 INHERIT=readme.gentoo-r1 autotools perl-functions python-single-r1 udev
 IUSE=pcmcia static guile perl php python tcl doc firmware python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm ~x86
 LICENSE=GPL-2
 RDEPEND=sys-libs/readline:= tcl? ( dev-lang/tcl:0= ) guile? ( dev-scheme/guile:12 ) perl? ( dev-lang/perl:= ) php? ( dev-lang/php:= ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta3:3.11 ) ) firmware? ( sys-apps/fxload ) acct-group/gpib ~sci-libs/linux-gpib-modules-4.3.4
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/linux-gpib/linux-gpib-4.3.4.tar.gz firmware? ( https://linux-gpib.sourceforge.io/firmware/gpib_firmware-2008-08-10.tar.gz )
 _eclasses_=autotools	2fd69a56a527d12409ba43c733b7ac8f	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	95b2df43c5f3057b6e77bd00b4d953da	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	udev	f3a0a3964e2028a140c181f00eea9712
-_md5_=cb16fa65dfbdf3af46f554b6c7d0ffc2
+_md5_=789145d87727f3fb3e5d29d3b65de991
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index 89f718266cdd..fd880934e8ec 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/init-system-helpers-1.49-r1 b/metadata/md5-cache/sys-apps/init-system-helpers-1.49-r1
deleted file mode 100644
index 799840b311cd..000000000000
--- a/metadata/md5-cache/sys-apps/init-system-helpers-1.49-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Helper scripts useful for both OpenRC and systemd
-EAPI=6
-HOMEPAGE=https://packages.debian.org/sid/init-system-helpers
-KEYWORDS=~alpha amd64 ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86
-LICENSE=BSD GPL-2+
-RDEPEND=!<sys-apps/openrc-0.33
-SLOT=0
-SRC_URI=http://http.debian.net/debian/pool/main/i/init-system-helpers/init-system-helpers_1.49.tar.xz
-_md5_=e0640fba15061ad10107cd67c5b2c59d
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index d65b6d1b38b3..c2b09a377441 100644
--- a/metadata/md5-cache/sys-devel/Manifest.gz
+++ b/metadata/md5-cache/sys-devel/Manifest.gz
diff --git a/metadata/md5-cache/sys-devel/gcc-10.4.1_p20220707 b/metadata/md5-cache/sys-devel/gcc-10.4.1_p20220707
new file mode 100644
index 000000000000..33ea2843d13f
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/gcc-10.4.1_p20220707
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/binutils sys-devel/gnuconfig >=app-portage/elt-patches-20170815 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 )
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
+DEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) sanitize? ( virtual/libcrypt ) systemtap? ( dev-util/systemtap ) zstd? ( app-arch/zstd:= )
+DESCRIPTION=The GNU Compiler Collection
+EAPI=8
+HOMEPAGE=https://gcc.gnu.org/
+INHERIT=toolchain
+IUSE=test vanilla +nls debug +cxx +nptl +fortran doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go +sanitize graphite ada vtv jit +pie +ssp +pch systemtap d lto cet zstd
+LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
+PDEPEND=>=sys-devel/gcc-config-2.3
+RDEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) zstd? ( app-arch/zstd:= )
+RESTRICT=!test? ( test )
+SLOT=10
+SRC_URI=https://gcc.gnu.org/pub/gcc/snapshots/10-20220707/gcc-10-20220707.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-10.4.0-patches-2.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-10.4.0-musl-patches-1.tar.xz
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	eccf486f1d6fc9b9ccc7a21320b6df93	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=f9494e9ea2250da4afa1087c0a916a9f
diff --git a/metadata/md5-cache/sys-devel/gcc-11.3.1_p20220708 b/metadata/md5-cache/sys-devel/gcc-11.3.1_p20220708
new file mode 100644
index 000000000000..c599a47aa2b8
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/gcc-11.3.1_p20220708
@@ -0,0 +1,16 @@
+BDEPEND=>=sys-devel/binutils-2.30[cet(-)?] sys-devel/gnuconfig >=app-portage/elt-patches-20170815 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) valgrind? ( dev-util/valgrind )
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
+DEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) sanitize? ( virtual/libcrypt ) systemtap? ( dev-util/systemtap ) zstd? ( app-arch/zstd:= )
+DESCRIPTION=The GNU Compiler Collection
+EAPI=8
+HOMEPAGE=https://gcc.gnu.org/
+INHERIT=toolchain
+IUSE=test vanilla +nls debug +cxx +nptl +fortran doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go +sanitize graphite ada vtv jit +pie +ssp +pch systemtap d lto cet zstd valgrind custom-cflags
+LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
+PDEPEND=>=sys-devel/gcc-config-2.3
+RDEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) zstd? ( app-arch/zstd:= )
+RESTRICT=!test? ( test )
+SLOT=11
+SRC_URI=https://gcc.gnu.org/pub/gcc/snapshots/11-20220708/gcc-11-20220708.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-11.4.0-patches-1.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-11.4.0-musl-patches-0.tar.xz
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	eccf486f1d6fc9b9ccc7a21320b6df93	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=06647a8d13e5a26b05ccceb62d37a26d
diff --git a/metadata/md5-cache/sys-devel/gcc-12.1.1_p20220709 b/metadata/md5-cache/sys-devel/gcc-12.1.1_p20220709
new file mode 100644
index 000000000000..e89d4bece451
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/gcc-12.1.1_p20220709
@@ -0,0 +1,17 @@
+BDEPEND=>=sys-devel/binutils-2.30[cet(-)?] sys-devel/gnuconfig >=app-portage/elt-patches-20170815 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) valgrind? ( dev-util/valgrind ) d? ( || ( sys-devel/gcc[d(-)] <sys-devel/gcc-12[d(-)] ) )
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
+DEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) sanitize? ( virtual/libcrypt ) systemtap? ( dev-util/systemtap ) zstd? ( app-arch/zstd:= )
+DESCRIPTION=The GNU Compiler Collection
+EAPI=8
+HOMEPAGE=https://gcc.gnu.org/
+INHERIT=toolchain
+IUSE=test vanilla +nls debug +cxx +nptl +fortran doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go +sanitize graphite ada vtv jit +pie +ssp +pch systemtap d lto cet zstd valgrind custom-cflags
+KEYWORDS=~loong
+LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
+PDEPEND=>=sys-devel/gcc-config-2.3
+RDEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) zstd? ( app-arch/zstd:= )
+RESTRICT=!test? ( test )
+SLOT=12
+SRC_URI=https://gcc.gnu.org/pub/gcc/snapshots/12-20220709/gcc-12-20220709.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-12.1.0-patches-9.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-12.1.0-musl-patches-6.tar.xz
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	eccf486f1d6fc9b9ccc7a21320b6df93	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=0d7a92302649bc2c9b79b7eef60af7b2
diff --git a/metadata/md5-cache/virtual/Manifest.gz b/metadata/md5-cache/virtual/Manifest.gz
index 40c695fcd791..1a0c6f188156 100644
--- a/metadata/md5-cache/virtual/Manifest.gz
+++ b/metadata/md5-cache/virtual/Manifest.gz
diff --git a/metadata/md5-cache/virtual/libelf-2 b/metadata/md5-cache/virtual/libelf-2-r1
index 89963715e7b3..9a103c5ddcef 100644
--- a/metadata/md5-cache/virtual/libelf-2
+++ b/metadata/md5-cache/virtual/libelf-2-r1
@@ -1,10 +1,10 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for libelf.so.0 provider dev-libs/libelf
-EAPI=6
+EAPI=8
 INHERIT=multilib-build
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha amd64 arm arm64 hppa ~mips ppc ppc64 sparc x86 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=>=dev-libs/libelf-0.8.13-r2:0/0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0/0
 _eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=c55bf46a6dcb584ec070b588c5bfe99e
+_md5_=3359eb61dc7070c05cb923d32407e8b2
diff --git a/metadata/md5-cache/virtual/libelf-3 b/metadata/md5-cache/virtual/libelf-3-r1
index 8f29ba317c66..aa9949c410c7 100644
--- a/metadata/md5-cache/virtual/libelf-3
+++ b/metadata/md5-cache/virtual/libelf-3-r1
@@ -1,10 +1,10 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for libelf.so.1 provider dev-libs/elfutils
-EAPI=7
+EAPI=8
 INHERIT=multilib-build
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 RDEPEND=>=dev-libs/elfutils-0.155-r1:0/0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0/1
 _eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=d9b48b64e232269d98a7c4282a461788
+_md5_=8398ecb5307568aa39e921ff0c1d2724
diff --git a/metadata/md5-cache/www-apps/Manifest.gz b/metadata/md5-cache/www-apps/Manifest.gz
index f71f39b3592c..694752d12650 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/nanoc-4.12.7 b/metadata/md5-cache/www-apps/nanoc-4.12.7
new file mode 100644
index 000000000000..f1fb420ed231
--- /dev/null
+++ b/metadata/md5-cache/www-apps/nanoc-4.12.7
@@ -0,0 +1,17 @@
+BDEPEND=test? ( ruby_targets_ruby27? ( !minimal? ( dev-ruby/mime-types:*[ruby_targets_ruby27(-)] dev-ruby/rack:*[ruby_targets_ruby27(-)] www-servers/adsf[ruby_targets_ruby27(-)] ) >=dev-ruby/addressable-2.5[ruby_targets_ruby27(-)] >=dev-ruby/colored-1.2:0[ruby_targets_ruby27(-)] >=www-apps/nanoc-checking-1.0.2:1[ruby_targets_ruby27(-)] ~www-apps/nanoc-cli-4.12.7[ruby_targets_ruby27(-)] ~www-apps/nanoc-core-4.12.7[ruby_targets_ruby27(-)] www-apps/nanoc-deploying:1[ruby_targets_ruby27(-)] >=dev-ruby/parallel-1.12:1[ruby_targets_ruby27(-)] >=dev-ruby/tty-command-0.8:0[ruby_targets_ruby27(-)] >=dev-ruby/tty-which-0.4:0[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( !minimal? ( dev-ruby/mime-types:*[ruby_targets_ruby30(-)] dev-ruby/rack:*[ruby_targets_ruby30(-)] www-servers/adsf[ruby_targets_ruby30(-)] ) >=dev-ruby/addressable-2.5[ruby_targets_ruby30(-)] >=dev-ruby/colored-1.2:0[ruby_targets_ruby30(-)] >=www-apps/nanoc-checking-1.0.2:1[ruby_targets_ruby30(-)] ~www-apps/nanoc-cli-4.12.7[ruby_targets_ruby30(-)] ~www-apps/nanoc-core-4.12.7[ruby_targets_ruby30(-)] www-apps/nanoc-deploying:1[ruby_targets_ruby30(-)] >=dev-ruby/parallel-1.12:1[ruby_targets_ruby30(-)] >=dev-ruby/tty-command-0.8:0[ruby_targets_ruby30(-)] >=dev-ruby/tty-which-0.4:0[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] dev-ruby/asciidoctor[ruby_targets_ruby27(-)] dev-ruby/fuubar[ruby_targets_ruby27(-)] dev-ruby/haml[ruby_targets_ruby27(-)] dev-ruby/maruku[ruby_targets_ruby27(-)] >=dev-ruby/mocha-0.13[ruby_targets_ruby27(-)] dev-ruby/minitest[ruby_targets_ruby27(-)] dev-ruby/mustache[ruby_targets_ruby27(-)] dev-ruby/pry[ruby_targets_ruby27(-)] dev-ruby/rdoc[ruby_targets_ruby27(-)] >=dev-ruby/rouge-3.5.1:2[ruby_targets_ruby27(-)] dev-ruby/rubypants[ruby_targets_ruby27(-)] dev-ruby/systemu[ruby_targets_ruby27(-)] dev-ruby/timecop[ruby_targets_ruby27(-)] dev-ruby/vcr[ruby_targets_ruby27(-)] dev-ruby/webmock[ruby_targets_ruby27(-)] dev-ruby/yard[ruby_targets_ruby27(-)] ) doc? ( dev-ruby/kramdown[ruby_targets_ruby27(-)] dev-ruby/rdiscount[ruby_targets_ruby27(-)] dev-ruby/yard[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] dev-ruby/asciidoctor[ruby_targets_ruby30(-)] dev-ruby/fuubar[ruby_targets_ruby30(-)] dev-ruby/haml[ruby_targets_ruby30(-)] dev-ruby/maruku[ruby_targets_ruby30(-)] >=dev-ruby/mocha-0.13[ruby_targets_ruby30(-)] dev-ruby/minitest[ruby_targets_ruby30(-)] dev-ruby/mustache[ruby_targets_ruby30(-)] dev-ruby/pry[ruby_targets_ruby30(-)] dev-ruby/rdoc[ruby_targets_ruby30(-)] >=dev-ruby/rouge-3.5.1:2[ruby_targets_ruby30(-)] dev-ruby/rubypants[ruby_targets_ruby30(-)] dev-ruby/systemu[ruby_targets_ruby30(-)] dev-ruby/timecop[ruby_targets_ruby30(-)] dev-ruby/vcr[ruby_targets_ruby30(-)] dev-ruby/webmock[ruby_targets_ruby30(-)] dev-ruby/yard[ruby_targets_ruby30(-)] ) doc? ( dev-ruby/kramdown[ruby_targets_ruby30(-)] dev-ruby/rdiscount[ruby_targets_ruby30(-)] dev-ruby/yard[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( app-text/asciidoc app-text/highlight ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+DESCRIPTION=nanoc is a simple but very flexible static site generator written in Ruby
+EAPI=8
+HOMEPAGE=https://nanoc.ws/
+INHERIT=ruby-fakegem
+IUSE=minimal test ruby_targets_ruby27 ruby_targets_ruby30 doc test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby27? ( !minimal? ( dev-ruby/mime-types:*[ruby_targets_ruby27(-)] dev-ruby/rack:*[ruby_targets_ruby27(-)] www-servers/adsf[ruby_targets_ruby27(-)] ) >=dev-ruby/addressable-2.5[ruby_targets_ruby27(-)] >=dev-ruby/colored-1.2:0[ruby_targets_ruby27(-)] >=www-apps/nanoc-checking-1.0.2:1[ruby_targets_ruby27(-)] ~www-apps/nanoc-cli-4.12.7[ruby_targets_ruby27(-)] ~www-apps/nanoc-core-4.12.7[ruby_targets_ruby27(-)] www-apps/nanoc-deploying:1[ruby_targets_ruby27(-)] >=dev-ruby/parallel-1.12:1[ruby_targets_ruby27(-)] >=dev-ruby/tty-command-0.8:0[ruby_targets_ruby27(-)] >=dev-ruby/tty-which-0.4:0[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( !minimal? ( dev-ruby/mime-types:*[ruby_targets_ruby30(-)] dev-ruby/rack:*[ruby_targets_ruby30(-)] www-servers/adsf[ruby_targets_ruby30(-)] ) >=dev-ruby/addressable-2.5[ruby_targets_ruby30(-)] >=dev-ruby/colored-1.2:0[ruby_targets_ruby30(-)] >=www-apps/nanoc-checking-1.0.2:1[ruby_targets_ruby30(-)] ~www-apps/nanoc-cli-4.12.7[ruby_targets_ruby30(-)] ~www-apps/nanoc-core-4.12.7[ruby_targets_ruby30(-)] www-apps/nanoc-deploying:1[ruby_targets_ruby30(-)] >=dev-ruby/parallel-1.12:1[ruby_targets_ruby30(-)] >=dev-ruby/tty-command-0.8:0[ruby_targets_ruby30(-)] >=dev-ruby/tty-which-0.4:0[ruby_targets_ruby30(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/nanoc/nanoc/archive/4.12.7.tar.gz -> nanoc-4.12.7.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=26a7ab651d65bb88a50538ffa23ece0c
diff --git a/metadata/md5-cache/www-apps/nanoc-cli-4.12.7 b/metadata/md5-cache/www-apps/nanoc-cli-4.12.7
new file mode 100644
index 000000000000..cedb7e4911db
--- /dev/null
+++ b/metadata/md5-cache/www-apps/nanoc-cli-4.12.7
@@ -0,0 +1,17 @@
+BDEPEND=test? ( ruby_targets_ruby27? ( >=dev-ruby/cri-2.15:0[ruby_targets_ruby27(-)] >=dev-ruby/diff-lcs-1.3:0[ruby_targets_ruby27(-)] ~www-apps/nanoc-core-4.12.7[ruby_targets_ruby27(-)] >=dev-ruby/zeitwerk-2.1:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/cri-2.15:0[ruby_targets_ruby30(-)] >=dev-ruby/diff-lcs-1.3:0[ruby_targets_ruby30(-)] ~www-apps/nanoc-core-4.12.7[ruby_targets_ruby30(-)] >=dev-ruby/zeitwerk-2.1:2[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/bundler[ruby_targets_ruby27(-)] dev-ruby/rspec:3[ruby_targets_ruby27(-)] dev-ruby/rspec-its[ruby_targets_ruby27(-)] dev-ruby/fuubar[ruby_targets_ruby27(-)] dev-ruby/minitest[ruby_targets_ruby27(-)] dev-ruby/timecop[ruby_targets_ruby27(-)] dev-ruby/tty-command[ruby_targets_ruby27(-)] dev-ruby/yard[ruby_targets_ruby27(-)] www-apps/nanoc-spec[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/bundler[ruby_targets_ruby30(-)] dev-ruby/rspec:3[ruby_targets_ruby30(-)] dev-ruby/rspec-its[ruby_targets_ruby30(-)] dev-ruby/fuubar[ruby_targets_ruby30(-)] dev-ruby/minitest[ruby_targets_ruby30(-)] dev-ruby/timecop[ruby_targets_ruby30(-)] dev-ruby/tty-command[ruby_targets_ruby30(-)] dev-ruby/yard[ruby_targets_ruby30(-)] www-apps/nanoc-spec[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+DESCRIPTION=nanoc is a simple but very flexible static site generator written in Ruby
+EAPI=8
+HOMEPAGE=https://nanoc.ws/
+INHERIT=ruby-fakegem
+IUSE=minimal test ruby_targets_ruby27 ruby_targets_ruby30 doc test test
+KEYWORDS=~amd64 ~riscv
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby27? ( >=dev-ruby/cri-2.15:0[ruby_targets_ruby27(-)] >=dev-ruby/diff-lcs-1.3:0[ruby_targets_ruby27(-)] ~www-apps/nanoc-core-4.12.7[ruby_targets_ruby27(-)] >=dev-ruby/zeitwerk-2.1:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/cri-2.15:0[ruby_targets_ruby30(-)] >=dev-ruby/diff-lcs-1.3:0[ruby_targets_ruby30(-)] ~www-apps/nanoc-core-4.12.7[ruby_targets_ruby30(-)] >=dev-ruby/zeitwerk-2.1:2[ruby_targets_ruby30(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/nanoc/nanoc/archive/4.12.7.tar.gz -> nanoc-4.12.7.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=a085fc69d60885d53c151f7710f7fa6b
diff --git a/metadata/md5-cache/www-apps/nanoc-core-4.12.7 b/metadata/md5-cache/www-apps/nanoc-core-4.12.7
new file mode 100644
index 000000000000..4084ffe1d9fd
--- /dev/null
+++ b/metadata/md5-cache/www-apps/nanoc-core-4.12.7
@@ -0,0 +1,17 @@
+BDEPEND=test? ( ruby_targets_ruby27? ( >=dev-ruby/concurrent-ruby-1.1:1[ruby_targets_ruby27(-)] dev-ruby/ddmetrics:1[ruby_targets_ruby27(-)] dev-ruby/ddplugin:1[ruby_targets_ruby27(-)] =dev-ruby/hamster-3*[ruby_targets_ruby27(-)] >=dev-ruby/json_schema-0.19:0[ruby_targets_ruby27(-)] >=dev-ruby/memo_wise-1.5:1[ruby_targets_ruby27(-)] dev-ruby/psych:0[ruby_targets_ruby27(-)] dev-ruby/slow_enumerator_tools:1[ruby_targets_ruby27(-)] >=dev-ruby/tty-platform-0.2:0[ruby_targets_ruby27(-)] >=dev-ruby/zeitwerk-2.1:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/concurrent-ruby-1.1:1[ruby_targets_ruby30(-)] dev-ruby/ddmetrics:1[ruby_targets_ruby30(-)] dev-ruby/ddplugin:1[ruby_targets_ruby30(-)] =dev-ruby/hamster-3*[ruby_targets_ruby30(-)] >=dev-ruby/json_schema-0.19:0[ruby_targets_ruby30(-)] >=dev-ruby/memo_wise-1.5:1[ruby_targets_ruby30(-)] dev-ruby/psych:0[ruby_targets_ruby30(-)] dev-ruby/slow_enumerator_tools:1[ruby_targets_ruby30(-)] >=dev-ruby/tty-platform-0.2:0[ruby_targets_ruby30(-)] >=dev-ruby/zeitwerk-2.1:2[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/bundler[ruby_targets_ruby27(-)] dev-ruby/rspec:3[ruby_targets_ruby27(-)] dev-ruby/rspec-its[ruby_targets_ruby27(-)] dev-ruby/fuubar[ruby_targets_ruby27(-)] dev-ruby/minitest[ruby_targets_ruby27(-)] dev-ruby/timecop[ruby_targets_ruby27(-)] dev-ruby/tty-command[ruby_targets_ruby27(-)] dev-ruby/yard[ruby_targets_ruby27(-)] www-apps/nanoc-spec[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/bundler[ruby_targets_ruby30(-)] dev-ruby/rspec:3[ruby_targets_ruby30(-)] dev-ruby/rspec-its[ruby_targets_ruby30(-)] dev-ruby/fuubar[ruby_targets_ruby30(-)] dev-ruby/minitest[ruby_targets_ruby30(-)] dev-ruby/timecop[ruby_targets_ruby30(-)] dev-ruby/tty-command[ruby_targets_ruby30(-)] dev-ruby/yard[ruby_targets_ruby30(-)] www-apps/nanoc-spec[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( app-text/asciidoc app-text/highlight ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+DESCRIPTION=nanoc is a simple but very flexible static site generator written in Ruby
+EAPI=8
+HOMEPAGE=https://nanoc.ws/
+INHERIT=ruby-fakegem
+IUSE=minimal test ruby_targets_ruby27 ruby_targets_ruby30 doc test test
+KEYWORDS=~amd64 ~riscv
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby27? ( >=dev-ruby/concurrent-ruby-1.1:1[ruby_targets_ruby27(-)] dev-ruby/ddmetrics:1[ruby_targets_ruby27(-)] dev-ruby/ddplugin:1[ruby_targets_ruby27(-)] =dev-ruby/hamster-3*[ruby_targets_ruby27(-)] >=dev-ruby/json_schema-0.19:0[ruby_targets_ruby27(-)] >=dev-ruby/memo_wise-1.5:1[ruby_targets_ruby27(-)] dev-ruby/psych:0[ruby_targets_ruby27(-)] dev-ruby/slow_enumerator_tools:1[ruby_targets_ruby27(-)] >=dev-ruby/tty-platform-0.2:0[ruby_targets_ruby27(-)] >=dev-ruby/zeitwerk-2.1:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/concurrent-ruby-1.1:1[ruby_targets_ruby30(-)] dev-ruby/ddmetrics:1[ruby_targets_ruby30(-)] dev-ruby/ddplugin:1[ruby_targets_ruby30(-)] =dev-ruby/hamster-3*[ruby_targets_ruby30(-)] >=dev-ruby/json_schema-0.19:0[ruby_targets_ruby30(-)] >=dev-ruby/memo_wise-1.5:1[ruby_targets_ruby30(-)] dev-ruby/psych:0[ruby_targets_ruby30(-)] dev-ruby/slow_enumerator_tools:1[ruby_targets_ruby30(-)] >=dev-ruby/tty-platform-0.2:0[ruby_targets_ruby30(-)] >=dev-ruby/zeitwerk-2.1:2[ruby_targets_ruby30(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/nanoc/nanoc/archive/4.12.7.tar.gz -> nanoc-core-4.12.7.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=3dfbb73f34a8ef4a7f758d435d11b953
diff --git a/metadata/md5-cache/xfce-base/Manifest.gz b/metadata/md5-cache/xfce-base/Manifest.gz
index 2d0186ed11b4..d5fdd565da24 100644
--- a/metadata/md5-cache/xfce-base/Manifest.gz
+++ b/metadata/md5-cache/xfce-base/Manifest.gz
diff --git a/metadata/md5-cache/xfce-base/xfce4-panel-4.17.2 b/metadata/md5-cache/xfce-base/xfce4-panel-4.17.2
new file mode 100644
index 000000000000..82aa85d9995b
--- /dev/null
+++ b/metadata/md5-cache/xfce-base/xfce4-panel-4.17.2
@@ -0,0 +1,16 @@
+BDEPEND=vala? ( || ( dev-lang/vala:0.56 dev-lang/vala:0.54 dev-lang/vala:0.52 dev-lang/vala:0.50 ) ) dev-lang/perl dev-util/gdbus-codegen dev-util/gtk-doc-am dev-util/intltool sys-devel/gettext virtual/pkgconfig
+DEFINED_PHASES=configure install postinst postrm
+DEPEND=>=dev-libs/glib-2.66 >=x11-libs/cairo-1 >=x11-libs/gtk+-3.22:3[introspection?] x11-libs/libX11 x11-libs/libwnck:3 >=xfce-base/exo-0.11.2:= >=xfce-base/garcon-4.17.0:= >=xfce-base/libxfce4ui-4.17.1:= >=xfce-base/libxfce4util-4.17.2:=[introspection?,vala?] >=xfce-base/xfconf-4.13:= dbusmenu? ( >=dev-libs/libdbusmenu-16.04.0[gtk3] ) introspection? ( dev-libs/gobject-introspection:= )
+DESCRIPTION=Panel for the Xfce desktop environment
+EAPI=8
+HOMEPAGE=https://www.xfce.org/projects/
+INHERIT=vala xdg-utils
+IUSE=+dbusmenu introspection vala
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=dev-libs/glib-2.66 >=x11-libs/cairo-1 >=x11-libs/gtk+-3.22:3[introspection?] x11-libs/libX11 x11-libs/libwnck:3 >=xfce-base/exo-0.11.2:= >=xfce-base/garcon-4.17.0:= >=xfce-base/libxfce4ui-4.17.1:= >=xfce-base/libxfce4util-4.17.2:=[introspection?,vala?] >=xfce-base/xfconf-4.13:= dbusmenu? ( >=dev-libs/libdbusmenu-16.04.0[gtk3] ) introspection? ( dev-libs/gobject-introspection:= )
+REQUIRED_USE=vala? ( introspection )
+SLOT=0
+SRC_URI=https://archive.xfce.org/src/xfce/xfce4-panel/4.17/xfce4-panel-4.17.2.tar.bz2
+_eclasses_=vala	9badd41d5aab740ae5ac301c4416c5f8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=bc79a8fe93c6e15d796d269054608f59
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 3204845c20f3..0cc5c3cd9525 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 17708 BLAKE2B 4ce2223644596204d9c2bb3f48afce531273d698d0831b6c63489b590dab9b0f76b97e01974eb386fd4ee731e91da53e23679e783c4d88a79a610f95158b28ce SHA512 a1f139db9aee3a21dedb41e88e0ac33c6c041d7b8c88c3e9baf0cdb441d1f610d920165d40c97cd51b23366513243ae6bbe2d000a224c900523cffd5ea695cf8
-TIMESTAMP 2022-07-10T05:39:47Z
+TIMESTAMP 2022-07-10T11:39:48Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLKZiNfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLKuoRfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBwqhAAkDCYdG6dRF9Husq9oejLFU5Ip0B2XDBbPTSR9QiRfrq10RGGvSmL7ACX
-Tva3K37TJLui3C17A+dUsBCajhT5aGOg8fvyq+jMe5f5fx0XDaPwKmBmUXXWT7BB
-B84A4JHaZtKWZhNo5D1Ygwo7nBNtb47Tb5sN/U9cl2LASKBuGrOEsuNDmC5Kiatj
-5Tmv4ul10TTwfFBeXJYENg/ZfQm8gb9q/yvtW3vRcAiy4L8ljC+5Xq7qKPAxJVoD
-kVD5fZQYI+0xg++ZlYTcOJFO9uyOr8Pn8G9Yc1+psBMaEkF3jRpkcvC6PAOUagGJ
-U5Ay+K8lcKEgmIBaqE6TCfLwFZzpvWwxUWOU5nicJAD4ey+hJV2XJgELXGTRiChk
-f2Y80E4sOnnKpqfQTuzFX/KO+OiwhZd5+5exgx+Wm+b1NOS9Qf6NZfmUa+l9/e1S
-hrhDd+wAEBi1Ixtc3N6az+3ZkdoHRUt7gioksp2I36AX0w92a1M9LY7TQhRrk245
-fJxrLjAE6xjjSmR6NU8467A9E5FCJnOeX6HEMGuko657sp9m20isu5UebrhMI7MR
-Orvmc2PEkKehSjuqYYxBzRygHWbzTTDFk/HvgjnjbMHDVzHz4Ugi6MUgtmUE2U/U
-+g1SVlmNYPRB0EphXIbnEpktQoBpKSkYBnj5Q0X4UcegNXQN1bA=
-=FAl3
+klA07w//QC2PYR9LUZ9WovOA1TuqtqFV3c8/d+49ISygd6ldO5zQK6lVWAzSkVML
+XgeWiA4ZZWPnepbeB18impYbN7ix9p+tFf2DRXYJ+I+ABloyDaqMpojTjx56KjoA
+ineNWel2M04lMd/ccnJ9+V9/YOf8D0pr7VCQ5/devqFFALyXQSDRt9A5HQG5Vi67
+Z56VyChgz4onrUKqbOGMO3ySCBOMw4ZKkI0c9MoQTfuxmZigtEcjh88lQ6SIRelk
+Vgc2QLNIGVT54kUV/xh2+QqVNIuadwuqbiKxKOvS4CdqD3bBAUE8yKaHz/wElgh9
+EcUKbqc30WRNkFoySihZBiwrdYZRRy2BcwWEd6CmirlZ1K2evl4gFht/fyFpDHAa
+0jPMsro5pt0UuQymQiddB2qqRyKO0rADJrktliHdyrEhI11Xezpio4TCCWnm8+Ss
+tqd9zGRQJixH/ilD6ie+maFzJGuqKbvkxF1t/WH4dp1hrammv+VZDuIg8qKwdtPa
+HVhHD36SAasw5nC0vBq4wXVjiQhMgy6jhg+vDjZFNYFWL9Fy5QS38nEalmvT46fo
+haMJdJOGcJkPQ3fGsRFerFUNSJN57J7v1CjU/t+nCfsr7HWD2OvhxZd7dU6WXRQ7
+nsgKFhiz52fRCqeDFp0pfxJY6aCoz7RzjVQJ1vRc3Ilr4Q0TQto=
+=DacW
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 2404352a6f1a..447aea7db1c6 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Sun, 10 Jul 2022 05:39:44 +0000
+Sun, 10 Jul 2022 11:39:44 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index b49606da9f4f..74eb960c9194 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Sun Jul 10 05:39:44 AM UTC 2022
+Sun Jul 10 11:39:44 AM UTC 2022
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 78b0d280cb24..0f62b5811124 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Sun, 10 Jul 2022 05:45:01 +0000
+Sun, 10 Jul 2022 11:45:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 89549201239f..fdceccdb5511 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-b587cb9a0755a0c2ef9deb90b7d82cea08b2debd 1657422747 2022-07-10T03:12:27+00:00
+28955479d2f24b646ecb5dd866d4a0bae609f05e 1657452887 2022-07-10T11:34:47+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index a8b02ba8e607..5f2c09d266d8 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1657431601 Sun 10 Jul 2022 05:40:01 AM UTC
+1657453201 Sun 10 Jul 2022 11:40:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 2404352a6f1a..447aea7db1c6 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Sun, 10 Jul 2022 05:39:44 +0000
+Sun, 10 Jul 2022 11:39:44 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 6357b09d04c6..60c035d81ee2 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/netselect/Manifest b/net-analyzer/netselect/Manifest
index 9b51127e2326..33a849b3b66a 100644
--- a/net-analyzer/netselect/Manifest
+++ b/net-analyzer/netselect/Manifest
@@ -2,7 +2,6 @@ AUX netselect-0.4-bsd.patch 1573 BLAKE2B 62405aa2962ffe74fce014341433d114f6785fd
 AUX netselect-0.4-flags.patch 172 BLAKE2B 17acc10b64404c9d8525147f5ca526f661a2b2c2b7e7ae31b19186784ef4b4714b14e43ccb77d318016b60c6ff80e381acf9b006487f0d9ebed06e70cb026a3a SHA512 3f665743859e243126de95340da5b9dd42ff671d82f3809e294b752a568b7ede96b13f6a63e18cc522ce19d1537b137d5c05e0e49ce533e8fc337922e18ea74a
 DIST netselect-0.4-ipv6.patch.xz 18272 BLAKE2B 6197057085e892c156a9fb3a82ac0030a2ff1b4276dde48405de2d2bcfdcef066c4f3eeff174f766af23d2807085f97e459dbffc87b2a2950a472e7964f2e3fc SHA512 422b54df5be45379fe7d6776b6e653a8e49df6fb77421527f2eb6c687597f36cccc7ab5cc5206e9823c318f6facd84fb4e8c0dbffbf9641cee593401cb73abea
 DIST netselect-0.4.tar.gz 22095 BLAKE2B 1dd83c4dcd38ab7b987ead76f4e7e727980bbad91b59c56948e13540307e685984cc11ea94292d38959c8253f1f6ec2e6e6e044302f26b09153717d6e29e96be SHA512 eee9639122b7cc89218c610794d090582aecb3df138bcef41472c8d40c0f7e998b2c4b04aace13795fda5c710ee28cc2c0784a680ad6d1aa6a14eb441a408bfa
-EBUILD netselect-0.4-r1.ebuild 967 BLAKE2B 4edc8e62bd917b2ab07b025dc1fd1bc2915f8b0c99c392e79c5bea64099f30f00ddbbcf84fb0d740d574867f10ef1b14318efa415510ef2d1defb993bb36b0e4 SHA512 fe9e8346cfdaf06fd8f99e46e0dda904ed4a293b3be6a0075d70554f185ba73057907f6297585dd294f70f06f5429a392b4809c0a538eccf11a7a4d24279b283
 EBUILD netselect-0.4-r2.ebuild 1224 BLAKE2B f156f57386f65207949afd2c8e3fbf9ff3e1ae3470f8c1e85e7c7c2d9e8b819ad052cda0f930513f3e6c70f87b71ce7f966185bf1c31d2c83ee27d7097569961 SHA512 f7c2ed0e5adc4bc77289897a5bc62e5b394558ba35acd769abe0307fdc60cc1fae2738a5817eb15ccaa0820156308a707840499dc20caa13d00ba04b6c7104f1
 EBUILD netselect-9999.ebuild 1158 BLAKE2B bbfb32456f76e7a360e5b796c5bd6cda89cff53e3bbdefd37038655d38da420bb29d1b2e6179acb57c1c74c4ed1d48b23ae12e91177de1388d48887986394858 SHA512 928a53ecf818469203ee1d674d264ba7dd9f74206dd45f0d811b144f148ceb29e0c5016cd49d11f2db4ed8e6f81f7772333674d4fc9951ca391168737944ef81
 MISC metadata.xml 364 BLAKE2B 488b33eefda9653419ada58299197665494566461fbb659916e6d345007c21262567f5953525e3f0eafcc45427e252cf54ad85a2f2cfa07d3ab535ac63238a4a SHA512 eaa99f81f964c01dacdbb0eaf29bff94ee589a42023031bad6d24d15e23515c15ade496383726bfb543e3f6d66636b0822968425820fa472a4c7094fdb15903a
diff --git a/net-analyzer/netselect/netselect-0.4-r1.ebuild b/net-analyzer/netselect/netselect-0.4-r1.ebuild
deleted file mode 100644
index 80066a138a33..000000000000
--- a/net-analyzer/netselect/netselect-0.4-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="Ultrafast implementation of ping"
-HOMEPAGE="http://apenwarr.ca/netselect/"
-SRC_URI="
-	https://github.com/apenwarr/${PN}/archive/${P}.tar.gz
-	ipv6? ( https://dev.gentoo.org/~jsmolic/distfiles/${P}-ipv6.patch.xz )
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="ipv6"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.4-bsd.patch
-	"${FILESDIR}"/${PN}-0.4-flags.patch
-)
-S=${WORKDIR}/${PN}-${P}
-
-src_prepare() {
-	use ipv6 && eapply "${WORKDIR}"/${PN}-0.4-ipv6.patch
-
-	default
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" LDFLAGS="${CFLAGS} ${LDFLAGS}"
-}
-
-src_install() {
-	dobin netselect
-
-	if ! use prefix ; then
-		fowners root:wheel /usr/bin/netselect
-		fperms 4711 /usr/bin/netselect
-	fi
-
-	dodoc HISTORY README
-
-	doman netselect.1
-}
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index a56c841d6cac..40fcfed641ac 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/rpcsvc-proto/Manifest b/net-libs/rpcsvc-proto/Manifest
index c245879f733f..6e11651c4ae0 100644
--- a/net-libs/rpcsvc-proto/Manifest
+++ b/net-libs/rpcsvc-proto/Manifest
@@ -1,4 +1,4 @@
 DIST rpcsvc-proto-1.4.3.tar.xz 167964 BLAKE2B dc15392fd68b76ffa92c08039076aed293834b047ebea4a418dc767ea13e3a04b19e5108ebda808dfa4356ca426db610847758d69b23cc66981eb4ea844eb218 SHA512 e46ba9ccdd6c520128bf3a154db90742f288a4d593b094a630141cdc5aeb834ffebf9b0eb6d5d0aad9faef3c445c75e2355cbc3e1382b50d29f4d2799441c6e9
-EBUILD rpcsvc-proto-0.ebuild 479 BLAKE2B d02a2aa983d5e6d8dd4820ff83620738db7b90232a13779b30c8d1d496a1e470438cef75a7b6c2022bcaa49e78cc78423160d04a2c753e79225c1103d47fd744 SHA512 8ac3092ffbeaf07868ae78ae28a490812cc2c2a8902de71c7701ff89107f97a42d6be5699285af02d8b0767315c2b5ca5951d2d44542065464d5ed951dd70538
-EBUILD rpcsvc-proto-1.4.3.ebuild 918 BLAKE2B aa283b93c91a501d2a3d33132c297c7da09fe0a4f64ab96b75138c1035e7a739c0322f2534d45d85b4bcc7f24a0aef1cf0db171d1cc5087960b0a6e64863123e SHA512 c534448ed72ff1dc792ff450c030acc1d644ed32ad264b585f220bc42ebdf82fe4ff340e22a217c7fbbb5b0222d3530b382805b245dc5868dfe4966d527479d4
+EBUILD rpcsvc-proto-0-r1.ebuild 471 BLAKE2B b0b4ceaa115b11ede6f31697b22ef19201a61918b8b64efa5e46e859f9e566459e3d9e3e12199eb93075d7d01b3fa21b0b81155f1ebbd3ecf85ac2ba212b2f1e SHA512 2259a0d8b0a1357c882de4d3d1db7cb95cc2756e8d83a2677e42418a5c6549a90e6da0a870cc04935951623cb713c9eb15077f5680e011087e78ef0d14ca80f0
+EBUILD rpcsvc-proto-1.4.3-r1.ebuild 918 BLAKE2B 6e063eb95e89bdc5a6d7b6d3ff89c0c92fefc9d289568d21d1a281d99d5203707b766ae37c4a89ff4793248e077643bacd9116ef6ea6e6edfe7c30261809d990 SHA512 4eafdad8e473e4def38e4283db924d32f1489992f6a7cd5468bdfa2abda014c397f0fe6c443765e8e0bdbcfe2eddd49cba4659df9174dfb27c6677cd04e7526a
 MISC metadata.xml 380 BLAKE2B fa4dc82ad37eb111b813c74a2f06e2afc3205abf41fc2287490a5542ea82e49096f6c4fba6ca284b318679d1962e4b32cb1e9c0e29027b04b56019ed4ed0d98e SHA512 f8e686cb3c4d25abe584f58ccb47b9265eaea8ae35ed5beabdb40158f35ffcec8263045d113e782a41791840530c8dd53dfab03ec916a38edfd573a5fb94e2af
diff --git a/net-libs/rpcsvc-proto/rpcsvc-proto-0.ebuild b/net-libs/rpcsvc-proto/rpcsvc-proto-0-r1.ebuild
index 865a87574ece..95113756b22c 100644
--- a/net-libs/rpcsvc-proto/rpcsvc-proto-0.ebuild
+++ b/net-libs/rpcsvc-proto/rpcsvc-proto-0-r1.ebuild
@@ -1,17 +1,16 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DESCRIPTION="rpcsvc protocol definitions from glibc"
 HOMEPAGE="https://github.com/thkukuk/rpcsvc-proto"
 
 # Fake version to help portage upgrading.
 
-SLOT="0"
 LICENSE="LGPL-2.1+ BSD"
+SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
 
 DEPEND="elibc_glibc? ( sys-libs/glibc[rpc(-)] )"
 RDEPEND="${DEPEND}"
diff --git a/net-libs/rpcsvc-proto/rpcsvc-proto-1.4.3.ebuild b/net-libs/rpcsvc-proto/rpcsvc-proto-1.4.3-r1.ebuild
index 01335e46d021..68a3bdb3e02f 100644
--- a/net-libs/rpcsvc-proto/rpcsvc-proto-1.4.3.ebuild
+++ b/net-libs/rpcsvc-proto/rpcsvc-proto-1.4.3-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 DESCRIPTION="rpcsvc protocol definitions from glibc"
 HOMEPAGE="https://github.com/thkukuk/rpcsvc-proto"
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 355129380db8..9116690169ac 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/felix/Manifest b/net-misc/felix/Manifest
index 6581c3f696fc..b9067f842579 100644
--- a/net-misc/felix/Manifest
+++ b/net-misc/felix/Manifest
@@ -81,5 +81,5 @@ DIST github.com-spf13-pflag-9ff6c6923cfffbcd502984b8e0c80539a94968b7.tar.gz 3892
 DIST github.com-vishvananda-netlink-dc00cf9d5c07f9a1e0ccb307443b2194ca1aaacb.tar.gz 122308 BLAKE2B 3b7e1486b64c0dfd9658b7e7e631b1fc4ae19155dee5392ab57929a51e0734b744399c7902ff558091046ea64f5f1ecacfb2594011d3077880356d659a42c9c7 SHA512 65251591bec228edadf1b0193d4b47f97cefd8eac1a54edd623d20186c70dbf49631562826bc193e81f3af3262a0211dde9b9638ee5a9ca7ded6841a2ebe65ec
 DIST github.com-vishvananda-netns-8ba1072b58e0c2a240eb5f6120165c7776c3e7b8.tar.gz 7725 BLAKE2B 360167d6e282d32331b580218a63e934b85a61e23f728e6393459f7d58e85fe97a070e6e5e476e34a19190606581dcfaedd844898415ebba9557afb75a4b1d0c SHA512 420f4acbc26c04defcf279dfe3a754964087ec3eb6daa563a2054fa31a1b9ede67531bbe26a9dd2d358012adf30cec66db1ee1eae8cf75062ffe7b3a5a40be86
 DIST github.com-whyrusleeping-go-logging-0457bb6b88fc1973573aaf6b5145d8d3ae972390.tar.gz 34843 BLAKE2B ec139b3eb8f034ca9243c99497380097056a19e3fa8541e2075c1c7e108c96b4e97004fd47f1590dad0ad155db6c33ecdb5ea1162498f343c9c07c2f73d3476b SHA512 29ac7f9ebc485fd09d1c65c71457add052c7faa975591a0be1ffb20608cdcad61ed427b284d99340d1ac647d0a3bf99938522d90299a26172e74bac2d7f3e498
-EBUILD felix-3.1.3.ebuild 7540 BLAKE2B 1cd40ccecd40be6f6bc9aff34776571b99c229b8ea44b803f820ad6f60b86c5828e41e7535357079bb95b281ddfd2d74a2153c36be1519044474031255e46e45 SHA512 4a5c4b808b405c34dacf87a629b6ae58d610a8c172dd91621c1f8979967a7100998a84b926bea3f32c5d2adc6a160df481dc08259dcd7835eaf22d2fa60d89eb
+EBUILD felix-3.1.3.ebuild 7524 BLAKE2B e8124857b3e2f48ee794d80f61fbfb374e466a1c677331bf5f36ce38c15f8f07ee6f12dd7ec3aad6f646841311758f573b33dbb9ec771ec15e9138814f345294 SHA512 63222c6201fb55cee9b581a791250f45ae526e85ef7a287fe044b48b2105830183ae418f2e3a137f51264a4657d652e02e94e7efab1612485f759d9632466a3a
 MISC metadata.xml 329 BLAKE2B d1519b0d8947e214420ce53c575326e638af2760cf461680650c9f7a2d2ce014bf247c1b65ccc487ecdbf4deb8eb65e8780ba0eecf827aacc36e79a35f71f3ba SHA512 dce6476c97c4da696a941cccfba1f183e237fdddfeba36fdc38a105dd3e1031b28c954a4558d62f24fa437a0cc067f0df1cc839691e6a0f7f678397ce1cb14cf
diff --git a/net-misc/felix/felix-3.1.3.ebuild b/net-misc/felix/felix-3.1.3.ebuild
index 97d86ba45d4a..33172bc354ba 100644
--- a/net-misc/felix/felix-3.1.3.ebuild
+++ b/net-misc/felix/felix-3.1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -86,7 +86,7 @@ EGO_VENDOR=(
 "k8s.io/kube-openapi 0c329704159e3b051aafac400b15baacf2a94a04 github.com/kubernetes/kube-openapi"
 )
 
-inherit golang-vcs-snapshot systemd user
+inherit golang-vcs-snapshot
 
 FELIX_COMMIT="dba3279377fd6ec7baf0ee560bcaec685f25fa86"
 
diff --git a/net-misc/keychain/Manifest b/net-misc/keychain/Manifest
index 66f1ee5b2b38..d94a5237bb32 100644
--- a/net-misc/keychain/Manifest
+++ b/net-misc/keychain/Manifest
@@ -1,3 +1,4 @@
 DIST keychain-2.8.5.tar.gz 66446 BLAKE2B a81d746aef5210f8f66d86c00ea693a0e2a8427cf853690065ed86c30baf70f23894faaca5cde7d46378405e074641ed3d641dae7bd818b7e9fc1585ad6348a0 SHA512 2b98a9937b058267150d62d4f95653c4bbab6117a0774ac266abf95020c41905412b1522a82abf71722f25f6af31ba3498f6d54622009498c845802bf2df6024
+EBUILD keychain-2.8.5-r1.ebuild 626 BLAKE2B cc711e15b2939e9019ba8a3c58bc4645ef0d31f02eee15514f93322bc137a4e23f6372ba710b0c59e2e3eb1d2284ad3cf739279727181306428ab5d877ab77f9 SHA512 b2013441f598a56f33672be6177dd895f99d1bf47dcc740a3042b9fe857aa74e0df59da38d38956bc3479abb8031b5ed55ee8c5c41a1d1f6857a2c308771bfc5
 EBUILD keychain-2.8.5.ebuild 637 BLAKE2B 8a6dec9e1536bf5df5cd6ac2e07c816862a9ce5cd85ac40e725b3a8f7b6827a6f31eaa70981fde85d697a29e06a8e08b83bc1d9099d444a293aa63bbec52bc63 SHA512 f6f714cd2f9f55cced05171c046ad88166ee79edfd1b7cf793a6cc02687f91a54f5aa434e0b99450dab94aa2b233cfb8936e4ddd5e2c3b62498bb0d765d3bb4d
 MISC metadata.xml 527 BLAKE2B 244df1b2a5ab0820d287c8cd2b56829cab27026eca673cffc5191f945bdc9cea69fe65d5de87ef147d9060a01a044110176d8377835775cbe5425796b671f836 SHA512 90e1a381903b19a64317859afcc629a22ac9c414bb61ce333966c8d2f39fc728e98d21e2695df130da645802daafa146649fa2a5a03720b53e8e3d110f589d6b
diff --git a/net-misc/keychain/keychain-2.8.5-r1.ebuild b/net-misc/keychain/keychain-2.8.5-r1.ebuild
new file mode 100644
index 000000000000..3432617c3dee
--- /dev/null
+++ b/net-misc/keychain/keychain-2.8.5-r1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Agent manager for OpenSSH, ssh.com, Sun SSH, and GnuPG"
+HOMEPAGE="https://www.funtoo.org/Keychain"
+SRC_URI="https://github.com/funtoo/keychain/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+BDEPEND="dev-lang/perl"
+
+src_install() {
+	dobin ${PN}
+	doman ${PN}.1
+	dodoc ChangeLog README.md
+}
diff --git a/net-misc/putty/Manifest b/net-misc/putty/Manifest
index c99bbe87d180..1b376b4a6207 100644
--- a/net-misc/putty/Manifest
+++ b/net-misc/putty/Manifest
@@ -1,7 +1,7 @@
 DIST putty-0.76.tar.gz 2735687 BLAKE2B 7994a8ea4eb735091e92438fd9558b1047b2ddffe53e3cd2ae7c182e333d21482de7c1a549b738d00af1e592e078648b153fa095a9e5310ee4a884c0cc9fb896 SHA512 4576b359593928c6eba923f2d7b66ac0f2cf00e0c217cdbbb124471c3b35feb090e623847bfc507a4ef106cb3067aac47419e241b11dd8bf4ae554061fa93c25
 DIST putty-0.77.tar.gz 2619481 BLAKE2B 83b0838a3923c93f95020297d6402872605609da81d33f864d72074d1e5cae2fcf2710a038aef1de56077de2e296f4c5e573af077f4b55e433563f680cd9cc4b SHA512 35eb1e3f98a07611365bedc492c69a5475ce9b3d920ecebc78c76813505684c16cfcbfbb2306c1106fb5a9b72ca3dd52cbd39b9e9805c6689c9a9464910c0e7d
 DIST putty-icons.tar.bz2 4878 BLAKE2B 589f1bace82e3fd202b70bd35661d2ec4ef383363f8ae6716d4a6828bd822ef624b0acde39354d3d837e2d2bb49a34dbb89e031c64c520cbc675cad79813acff SHA512 4e419a71e26770e159221f6b516e7210d29272917b4b9a9e0b67c72e73508b97278e56c82111b02e106c5d513c2561fec6da372b4b18246f29372ae618ff5f71
-EBUILD putty-0.76.ebuild 1702 BLAKE2B bf252a9a45fd62cd5c791c99ecfd055e2343ccdb75ab5dc3a21f7738aa2ad2014b7a8e203dbd4030aae05311ad87394af83eb9efe8c0bb65d563383e9bb59beb SHA512 0e5d4e5507610e9d905e5e9c0304747d07002618c698c6b73413e82302c3b12c4ce8b66dd1aa9101c36e39d1bcc63185d124a7e81657f9900193574d19b93883
-EBUILD putty-0.77.ebuild 1836 BLAKE2B 371707bb25ee6363fe7a2744762fa5d3b53201845d77c6f4df977e56b547ae54ac7639d2489f46931f42660e31773a3463a6f4508ca018ddb4c9821526e26f80 SHA512 3d1c3b6e2112d31c4c872eb1dec125dc3643e662729702d8d355687809224c29edb3da90c65fdb5e9e536f5f27b4c554af14bcf521383c79f9315d501d2abe0f
-EBUILD putty-9999.ebuild 1836 BLAKE2B 371707bb25ee6363fe7a2744762fa5d3b53201845d77c6f4df977e56b547ae54ac7639d2489f46931f42660e31773a3463a6f4508ca018ddb4c9821526e26f80 SHA512 3d1c3b6e2112d31c4c872eb1dec125dc3643e662729702d8d355687809224c29edb3da90c65fdb5e9e536f5f27b4c554af14bcf521383c79f9315d501d2abe0f
-MISC metadata.xml 927 BLAKE2B b16050f046b27ee7798fe2a59f80cb5d0b6e76e0facef049d17b67c955986af99fa16d705ee22bba3282ee968e3b1986fdfead3ba51664e9eacbbb8c0e4dba62 SHA512 6241b2e460a8b7bb195712f3cdd2200984e7e2e185c73e9630badca12ff2e01d345467d97c93d8ba79a801d14eb906fc9dfdbc0ef9c7f411fa2cd33abff752fe
+EBUILD putty-0.76.ebuild 1707 BLAKE2B 5da5dbaf196d105ffcdeac1fba6b49f0be19d69d851bfbb0e79812aabc3573d717a440c693ffd96df62d8290c43581b08130c794f0000ed66c7018bbcc10e038 SHA512 93f499eb5fe6fbf3844cbc8a3c970d5329660d85da134b2811de6f9be0c930951057445cc7e663c91467e4e4646cf4f8e1c11d7f3f4de1ebce5a1ea5295d7161
+EBUILD putty-0.77-r1.ebuild 1851 BLAKE2B 81beaf794457204d0e8cd5c54d11b61a47cc2541abf8722677727859ac2977d145645a317eb01254d248ee4e7dde5162edb131f435a0102b7a1a853fbe0cbd2d SHA512 e08e2470968a83cef9a8f225dcf316e00db231a4ce2f43dec93894735dbef3e8571d08b5c569bfb5888017e1d9b3ae91f56b8f69b7542f6503d53120c58b105d
+EBUILD putty-9999.ebuild 1851 BLAKE2B 81beaf794457204d0e8cd5c54d11b61a47cc2541abf8722677727859ac2977d145645a317eb01254d248ee4e7dde5162edb131f435a0102b7a1a853fbe0cbd2d SHA512 e08e2470968a83cef9a8f225dcf316e00db231a4ce2f43dec93894735dbef3e8571d08b5c569bfb5888017e1d9b3ae91f56b8f69b7542f6503d53120c58b105d
+MISC metadata.xml 1007 BLAKE2B 358ab09685c2020a9d0bd49a7c4845cf3b0f31776d7ad9d11c99b70b325b9d902bad73690e68aa991b0123a3a720eb55f50d07f6df35e7142ddddb5146b92ed8 SHA512 45ed3f5781db722328f6101496538c2d920c6cfe5f9422ba838e4d723b9ca53ad2fa783a6c0dd36557e7d0008071d7886bd7e5f1ca76e1b83465a6312c01d772
diff --git a/net-misc/putty/metadata.xml b/net-misc/putty/metadata.xml
index d1187ee7285b..ba7ec402bc1d 100644
--- a/net-misc/putty/metadata.xml
+++ b/net-misc/putty/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>matthew@gentoo.org</email>
+		<name>Matthew Smith</name>
+	</maintainer>
 	<longdescription lang="en">
 		PuTTY is a free implementation of Telnet and SSH for Windows and Unix
 		platforms, along with an xterm terminal emulator. It supports flexible terminal
diff --git a/net-misc/putty/putty-0.76.ebuild b/net-misc/putty/putty-0.76.ebuild
index c793525eff4f..49c3ca73ee4d 100644
--- a/net-misc/putty/putty-0.76.ebuild
+++ b/net-misc/putty/putty-0.76.ebuild
@@ -11,7 +11,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm64 ~hppa ppc ppc64 sparc x86"
 SRC_URI="
-	https://dev.gentoo.org/~polynomial-c/${PN}-icons.tar.bz2
+	https://dev.gentoo.org/~matthew/distfiles/${PN}-icons.tar.bz2
 	https://the.earth.li/~sgtatham/${PN}/${PV}/${P}.tar.gz
 "
 IUSE="doc +gtk gtk2 ipv6 gssapi"
diff --git a/net-misc/putty/putty-0.77.ebuild b/net-misc/putty/putty-0.77-r1.ebuild
index a09ae7ae4600..be3a4064accf 100644
--- a/net-misc/putty/putty-0.77.ebuild
+++ b/net-misc/putty/putty-0.77-r1.ebuild
@@ -6,7 +6,7 @@ inherit cmake desktop xdg-utils
 
 DESCRIPTION="A Free Telnet/SSH Client"
 HOMEPAGE="https://www.chiark.greenend.org.uk/~sgtatham/putty/"
-SRC_URI="https://dev.gentoo.org/~polynomial-c/${PN}-icons.tar.bz2"
+SRC_URI="https://dev.gentoo.org/~matthew/distfiles/${PN}-icons.tar.bz2"
 if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://git.tartarus.org/simon/putty.git"
@@ -17,7 +17,7 @@ fi
 LICENSE="MIT"
 
 SLOT="0"
-IUSE="debug +gtk gtk2 ipv6 gssapi"
+IUSE="debug doc +gtk gtk2 ipv6 gssapi"
 
 RDEPEND="
 	!net-misc/pssh
@@ -37,8 +37,8 @@ DEPEND="
 BDEPEND="
 	dev-lang/perl
 	virtual/pkgconfig
+	doc? ( app-doc/halibut )
 "
-#[[ ${PV} == *9999 ]] && BDEPEND+=" doc? ( app-doc/halibut )"
 
 REQUIRED_USE="
 	gtk2? ( gtk )
@@ -60,15 +60,19 @@ src_configure() {
 	cmake_src_configure
 }
 
+src_compile() {
+	cmake_src_compile all doc
+}
+
 src_install() {
 	cmake_src_install
 
 	doman "${BUILD_DIR}"/doc/*.1
 
-	#if use doc ; then
-	#	docinto html
-	#	dodoc "${BUILD_DIR}"/doc/html/*.html
-	#fi
+	if use doc ; then
+		docinto html
+		dodoc "${BUILD_DIR}"/doc/html/*.html
+	fi
 
 	if use gtk ; then
 		local i
diff --git a/net-misc/putty/putty-9999.ebuild b/net-misc/putty/putty-9999.ebuild
index a09ae7ae4600..be3a4064accf 100644
--- a/net-misc/putty/putty-9999.ebuild
+++ b/net-misc/putty/putty-9999.ebuild
@@ -6,7 +6,7 @@ inherit cmake desktop xdg-utils
 
 DESCRIPTION="A Free Telnet/SSH Client"
 HOMEPAGE="https://www.chiark.greenend.org.uk/~sgtatham/putty/"
-SRC_URI="https://dev.gentoo.org/~polynomial-c/${PN}-icons.tar.bz2"
+SRC_URI="https://dev.gentoo.org/~matthew/distfiles/${PN}-icons.tar.bz2"
 if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://git.tartarus.org/simon/putty.git"
@@ -17,7 +17,7 @@ fi
 LICENSE="MIT"
 
 SLOT="0"
-IUSE="debug +gtk gtk2 ipv6 gssapi"
+IUSE="debug doc +gtk gtk2 ipv6 gssapi"
 
 RDEPEND="
 	!net-misc/pssh
@@ -37,8 +37,8 @@ DEPEND="
 BDEPEND="
 	dev-lang/perl
 	virtual/pkgconfig
+	doc? ( app-doc/halibut )
 "
-#[[ ${PV} == *9999 ]] && BDEPEND+=" doc? ( app-doc/halibut )"
 
 REQUIRED_USE="
 	gtk2? ( gtk )
@@ -60,15 +60,19 @@ src_configure() {
 	cmake_src_configure
 }
 
+src_compile() {
+	cmake_src_compile all doc
+}
+
 src_install() {
 	cmake_src_install
 
 	doman "${BUILD_DIR}"/doc/*.1
 
-	#if use doc ; then
-	#	docinto html
-	#	dodoc "${BUILD_DIR}"/doc/html/*.html
-	#fi
+	if use doc ; then
+		docinto html
+		dodoc "${BUILD_DIR}"/doc/html/*.html
+	fi
 
 	if use gtk ; then
 		local i
diff --git a/net-misc/rclone/Manifest b/net-misc/rclone/Manifest
index c6c0ac0b6d5e..6c1e410b53e9 100644
--- a/net-misc/rclone/Manifest
+++ b/net-misc/rclone/Manifest
@@ -1401,6 +1401,8 @@ DIST rclone-1.53.3.tar.gz 14714224 BLAKE2B 0669bd046484867febe6ae201153540c40ce2
 DIST rclone-1.57.0.tar.gz 15443082 BLAKE2B 35b930d1a2234d3887e046f676850e88c07b2fcddaec3d1f44be52cebe2f79cf76bfb2ecce1081e4f3448be505d0e5eddd98f6481c43c4512cab6f160b50261c SHA512 d0428263b8ee1779f96176574dc17adb73668d56b9dcf6894a0aae4db2990148d785226defa520143df788d4401e1f297faa5c5c645d3c8503c796c06a1d3229
 DIST rclone-1.58.1-deps.tar.xz 201798856 BLAKE2B e739b038953292e78161a40c3bd2753e4172b1e330109a4ad0aa5a10255a165c2ae1a4cbd191aeff3bee98c2b2ffd5c9f142bd290ef41fe0ab560baf43cb9702 SHA512 f40f00da9da7b6535ee1de2a120e047522e50e9341bf30ca8f0b01559621ed7474a59d925a88393600a90120818233eaa45ee44727b12336a7d48f3e2dfe550b
 DIST rclone-1.58.1.tar.gz 15696598 BLAKE2B 601d60c5a1facc18bd6c157bf017ff8c0793fe4ca0bd8e8b719ad457882829919b18085c54a606c8880b60199c50b4a8f8fb7e73ca2c200efa899b8bcb7e0b63 SHA512 104ff2e743374ad3d0f3c517e34ac068d6439445732bc3ce4ffe8fbc13e7d2b4285518e8037c5600589425e001c26e334c7e31d12f9a476af958cb47097c4e00
+DIST rclone-1.59.0-deps.tar.xz 301036992 BLAKE2B f5acc3d1ec96e27a96343712595974827ebdb2a10c4d45bbd323228a47a097f9fdc71d439b0881dbee75a6406015ba5fcaccb616482333dd4c5df1cc32d84bc2 SHA512 41a3edbaeb6da5252f4eeb04cf3eb0ec1882de32c2ae5ffff5a659db6a841446ab756197b20878fc9a7053d687ce05b42ea45c30207cdbb16d8ba8a98256ea38
+DIST rclone-1.59.0.tar.gz 15940750 BLAKE2B d6923e766e78a88714b9ebbc146947421e5c9f327b2a6ea8f173d203e3cc952439408622bdc07a98ceb473131d338ca8246614e808e26085f829c971eccd32fe SHA512 a6cb27687b5d4ca6f2a3597b16d6b00d212bbe0bc8542c399c597bc52d827254d41fa0aa67457677cc4ae53d5b264aef09aaa74d80d5a84e4efe9d40f3042b61
 DIST rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.mod 36 BLAKE2B 61110bed2b9e99e0250cf6e8b842257202c89b3462edf9368b73cab29f9dbd4dcc66c3e290a1d6329b7d62321eecc52082a8c4c0797eac743a29a8a00910a93f SHA512 db50ff677b0bdccbc1a1ad3df7c5cc76f2fcccf3ab99d08d1c2868440eb9b893fe89452f4286f7d42f2f16abf0f4acda67fe86e174dcfa730a743aafcc166774
 DIST rsc.io%2Fquote%2Fv3%2F@v%2Fv3.1.0.mod 55 BLAKE2B f1f0ba35f0ffd200ed37c06b2025c1fd436e3fd857bd525b9295c0cbcade7e1f037e3f566124a7ef428384d50525426f0d40468c967e39bac6057174710e2566 SHA512 e6357ddd7d09692c60e59e6cb80469ade8284052cdd3ea520ec4dbcb42c1cabe045c599e43cce94bec022bd82e87a554ecac42f8c917cf2ff44daff9c1a147d5
 DIST rsc.io%2Fsampler%2F@v%2Fv1.3.0.mod 88 BLAKE2B c2ac3c9619e396db470c9951dfc11cdacccd56ae09b3b353015ee7e5fbb023df288dbf48d81b44c309241d1ea89a2e0ee42ee1d17e536fcfa531aaee0e651ab7 SHA512 2137507eb25fbae419605e0cd6bca4cfa584110eebc276cd759a4dcb6f97e52928e5b2d9b276e76bcabcec3bbfc2c42f97fa29f54695d27fb00f9423e1638863
@@ -1423,5 +1425,6 @@ DIST storj.io%2Fuplink%2F@v%2Fv1.4.6.zip 122968 BLAKE2B 0b84c24ee6e79338bb7925c2
 EBUILD rclone-1.53.3.ebuild 43482 BLAKE2B 12c4a443fcc7dcf11efe23572f59a65f66731382e99442681ca413007b116c0a566558692ed9fe12143a982bb12693478ab6991b25c79b38fdae4e740eaf9acb SHA512 bb5850a4cf44f0661db46c0a3e4a1ed8bc1358fe832e2fd068036a0f61f8eff1cf9c5bd64406057b7e43c3fd2f1f47b542af039f3de4702acfe7f2c22c349a7b
 EBUILD rclone-1.57.0.ebuild 65784 BLAKE2B 36b63186dfa0a301a61e82aac7237f627c6fb36f15e33cebc69fd6d2f8f395110fe0adc4645238ab4207c0009b4f2fb9164c5b157012494d7281bc32cfa436bd SHA512 b4581d54a1d18cca093b91b4b758f4b57a9f76c7735727eb57f09927640377b23f4cb5e5224eb5c7800c03bbb20bfa3032f6fcd8afcaca36574f9c1b566ee803
 EBUILD rclone-1.58.1.ebuild 1074 BLAKE2B ca47c040ff9a63dc00578909465952c2249f569722fdfe545bce41b08d31eb7a7cb93526cd13d48f992e225371c2d175b533aa83b40cd1f88817bd5f7feaf307 SHA512 cae04594405b3286e63616f8825ba03c86d412d8545e900293ff2894a4901f7ac5bd2eaf9f2302fd39c98dea1b449561558afa435e724b898bda867bd4159a9a
+EBUILD rclone-1.59.0.ebuild 1074 BLAKE2B ca47c040ff9a63dc00578909465952c2249f569722fdfe545bce41b08d31eb7a7cb93526cd13d48f992e225371c2d175b533aa83b40cd1f88817bd5f7feaf307 SHA512 cae04594405b3286e63616f8825ba03c86d412d8545e900293ff2894a4901f7ac5bd2eaf9f2302fd39c98dea1b449561558afa435e724b898bda867bd4159a9a
 EBUILD rclone-9999.ebuild 43484 BLAKE2B 1e9456708ccaf5b2e510a3d56cd5dd565c089fafb343a739e379572197c5a1460693e2dd6d9b2b0bf1d2f4405f01a922fdd069bff9b39561b73f4536b801eee8 SHA512 f7109a557e3a0ce2073f578f12414795c4d4002965b8d7e9fa6bd401d3afcf796837dd77f27b42bc9801d24fa3252836368be814fc23ec6b1222e17d4eaf5cf5
 MISC metadata.xml 361 BLAKE2B 9543147863f95ab48ae7f30ae94e33460cdae92bb641a5756d0f62f03a23fc56d84fc21a4c3f0d3d4700c585c165219a87bfea9398b03041cde84e3366ddcf1e SHA512 8d536ab26cfb37cf5e56fc73219ec97acf079732c8a521d38b5277d63fbc43931b546c42cfee7672e1fda127d912ad215546a37ac0b28a72a59a9641091a924d
diff --git a/net-misc/rclone/rclone-1.59.0.ebuild b/net-misc/rclone/rclone-1.59.0.ebuild
new file mode 100644
index 000000000000..7c77180a06c2
--- /dev/null
+++ b/net-misc/rclone/rclone-1.59.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit bash-completion-r1 go-module
+
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+SRC_URI="
+	https://github.com/rclone/rclone/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://dev.gentoo.org/~slashbeast/distfiles/${PN}/${P}-deps.tar.xz
+"
+
+DESCRIPTION="A program to sync files to and from various cloud storage providers"
+HOMEPAGE="https://rclone.org/"
+
+LICENSE="Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0"
+SLOT="0"
+IUSE=""
+
+src_compile() {
+	go build -mod=readonly . || die "compile failed"
+}
+
+src_test() {
+	# Setting CI skips unreliable tests, see fstest/testy/testy.go
+	# TestAddPlugin and TestRemovePlugin fail
+	RCLONE_CONFIG="/notfound" CI="true" go test -mod=readonly -v -run "!Test.*Plugin" ./... || die "test failed"
+}
+
+src_install() {
+	dobin ${PN}
+	doman ${PN}.1
+	dodoc README.md
+
+	./rclone genautocomplete bash ${PN}.bash || die
+	newbashcomp ${PN}.bash ${PN}
+
+	./rclone genautocomplete zsh ${PN}.zsh || die
+	insinto /usr/share/zsh/site-functions
+	newins ${PN}.zsh _${PN}
+}
diff --git a/net-proxy/Manifest.gz b/net-proxy/Manifest.gz
index 7c452a70af44..f7cf2f67a386 100644
--- a/net-proxy/Manifest.gz
+++ b/net-proxy/Manifest.gz
diff --git a/net-proxy/mitmproxy/Manifest b/net-proxy/mitmproxy/Manifest
index 8128b71bf5f6..122e82f6186d 100644
--- a/net-proxy/mitmproxy/Manifest
+++ b/net-proxy/mitmproxy/Manifest
@@ -1,7 +1,5 @@
-DIST mitmproxy-7.0.4.tar.gz 27312748 BLAKE2B a23db472adab33db615b0daa93694211450e8899885dc75601d40a4964cc505437db6a106622eb8051263db23280261134937b6567482dd584eed29cc592e42b SHA512 4224b44e609f84b974b5419c6ceb576845957968c786ee437bffb5fa5df685ce0712d5ef8c402d40c568406242f44692cc7f04037fadd19ecece8b112d73b7ae
-DIST mitmproxy-8.0.0.tar.gz 27902148 BLAKE2B 73ef46fea3a668cb4cf9992e8de969c7ccac78ac84997a82aa59c841d7b5d1dfc6df5a3bd76f910f318c191421a99bb7a24fd53b50e8529968acdae1e934f322 SHA512 abb0855322ca74ef34756db860f491b49057fd8d4fb26ffafc4038e40fe30444c6736fcff7b683e32c21a2d7339ebfeeb6eaf7b9e586b965d191a59eddfe15b6
 DIST mitmproxy-8.1.0.tar.gz 27940706 BLAKE2B 6d4293f30257e88eafea21127d4f499a7734f3d450c07114f83652d73a8aaadf1523737fee96e04b1bd39d47b73263d7f62f177b5c02357b258c898ccc58a9d1 SHA512 47e0924b1fc2999cbc038295dbb43a78eef4120a31c9445aba7b1f31e90aa4d859c5e2665a429f16c5cf7a6f9f29a7d6a50bb09a1e54c2e1693714c28d5153e1
-EBUILD mitmproxy-7.0.4.ebuild 2170 BLAKE2B bcefd4ae98b9dec6093f5e937e70ea3c0284a2e47be80260670712054c530f1d3074fa44a41fd72554ad7da9ca1886b84c7af6bbb1b249f65d73cc10f2a9e7f5 SHA512 a64e9ce2244eaa1e899baa37e2c5bb39ba1deb1dc8d0aa366a1af79381b09fab405d4cb44b3c3505dc3679ec11d1a13db2797489b194751e1b608ffb92be363d
-EBUILD mitmproxy-8.0.0.ebuild 2207 BLAKE2B c7788d0cb1b6f96984eb29566f164ba7e9756a901114c4ae28a0efb140bb85a16e03a91bf27229b336a4305192c51178a1f9c03837e414335daa9d39d24d1a2b SHA512 d60faa509bc7132c3924c6b2fee8eaa6b692b9e3976849ca2fae25dc21f625ac00076aa07461cdeba5a4d53f684cfd9525a6d0048f6247aed38da9a544b56e15
-EBUILD mitmproxy-8.1.0.ebuild 2205 BLAKE2B 88f42abc8e8c97b912f7b8e5e9ef4bca0ff26a75eee3cc77a33d88f31bd618e5cef2fce5997c16240857149533280e2701631a7481b28d0071354897d59d7e26 SHA512 bbedfeb5813a5163f2a0c317f2af5684e4a8d43164b8bc09a5a06f8d0b965b40964037365d149bac813f3515d79ab0de52aecc43756cec73d29c399e634cfdf9
+DIST mitmproxy-8.1.1.gh.tar.gz 27943959 BLAKE2B e920ee016f3c2c1ece08924e895848d6716c60ed65ba3b0b3ac6c966cf4ac4245a31b31365d248f4b88130f787c65183943eec3611db900a4f5c2e16709c775c SHA512 a62a45f8991819202115ab8f43d1c113df88504c494c73917ec2e3c52999dbe3ac596444a4c096619d4285f2e26a91ec715d6894fc4d7768bac1a2c3c4c268bc
+EBUILD mitmproxy-8.1.0.ebuild 2204 BLAKE2B e8ae2b6dc4a77e1f642b9c9ad4b1bb5139b0a96545e45513f8243509aeafcbe24731b460171d635f6124363b3ccfce9eaf6e4bf06611829e4e5ee9b9ff84c848 SHA512 ca90b85197b481a41d8cb0958bb1f936bda17a01b041b16739be266851ed3352edae3ef47ff7198f607a2fab7dc65e44e6d6d628bf2c77a91aec870c77ffb024
+EBUILD mitmproxy-8.1.1.ebuild 2208 BLAKE2B 9bac60f812f36a2077c46cdbc52cf0499967cead89dea2cc25971f80786acd9a0e171f8a8683fdb4aaf9cd4c43d3f8f6303a33714c79582af991986cea2a7719 SHA512 5c2bdbac586ab7af1f9fa73c76c08819256cbd254de2e1ee086108aedf35b653a1ba7ba509c14cc051b0bfa28af88fe3a16649d1c4b694a7162c13d8e0e9705c
 MISC metadata.xml 923 BLAKE2B 00d3790b8e1810b193babedab5b14f35c1275c5d544b4ae031cab41e886bb55130a5187a02a0adab6b00c1ad6d38ba485f9ebd68422549e4e4b62a21b7bcdc13 SHA512 50d52876c7f9d71b2cc31a697cec73c8cce041076c8057e9e3e1f0b2218b883898735f545f85f4e28ab1bd2f8091b764ebc6c92e98c291962cb6f1d52e5aa605
diff --git a/net-proxy/mitmproxy/mitmproxy-7.0.4.ebuild b/net-proxy/mitmproxy/mitmproxy-7.0.4.ebuild
deleted file mode 100644
index 1c941837097b..000000000000
--- a/net-proxy/mitmproxy/mitmproxy-7.0.4.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8,9,10} )
-PYTHON_REQ_USE="sqlite"
-inherit distutils-r1
-
-DESCRIPTION="An interactive, SSL-capable, man-in-the-middle HTTP proxy"
-HOMEPAGE="https://mitmproxy.org/"
-SRC_URI="https://github.com/mitmproxy/mitmproxy/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
-
-RDEPEND="
-	>=app-arch/brotli-1.0.0[python,${PYTHON_USEDEP}]
-	>=dev-python/asgiref-3.2.10[${PYTHON_USEDEP}]
-	>=dev-python/blinker-1.4[${PYTHON_USEDEP}]
-	>=dev-python/certifi-2015.11.20.1[${PYTHON_USEDEP}]
-	>=dev-python/click-7.0[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-3.3[${PYTHON_USEDEP}]
-	>=dev-python/flask-1.1.1[${PYTHON_USEDEP}]
-	>=dev-python/h2-4.0.0[${PYTHON_USEDEP}]
-	>=dev-python/hyperframe-6.0.0[${PYTHON_USEDEP}]
-	>=dev-python/kaitaistruct-0.7[${PYTHON_USEDEP}]
-	>=dev-python/ldap3-2.8[${PYTHON_USEDEP}]
-	>=dev-python/msgpack-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/passlib-1.6.5[${PYTHON_USEDEP}]
-	>=dev-python/protobuf-python-3.14.0[${PYTHON_USEDEP}]
-	>=dev-python/publicsuffix-2.20190205[${PYTHON_USEDEP}]
-	>=dev-python/pyasn1-0.3.1[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-20.0[${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-2.4.2[${PYTHON_USEDEP}]
-	>=dev-python/pyperclip-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/ruamel-yaml-0.16[${PYTHON_USEDEP}]
-	>=dev-python/sortedcontainers-2.3.0[${PYTHON_USEDEP}]
-	>=www-servers/tornado-4.3[${PYTHON_USEDEP}]
-	>=dev-python/urwid-2.1.1[${PYTHON_USEDEP}]
-	>=dev-python/wsproto-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/zstandard-0.11.0[${PYTHON_USEDEP}]
-	dev-libs/openssl:0
-"
-
-BDEPEND="
-	test? (
-		>=dev-python/hypothesis-5.8[${PYTHON_USEDEP}]
-		>=dev-python/parver-0.1[${PYTHON_USEDEP}]
-		>=dev-python/pytest-asyncio-0.10.0[${PYTHON_USEDEP}]
-		>=dev-python/requests-2.9.1[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# loosen dependencies
-	sed -i \
-		-e '/>/s/>.*/",/g' \
-		-e '/python_requires/d' \
-		setup.py || die
-
-	# remove failing test
-	sed -i 's/test_get_version/_&/g' test/mitmproxy/test_version.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/net-proxy/mitmproxy/mitmproxy-8.1.0.ebuild b/net-proxy/mitmproxy/mitmproxy-8.1.0.ebuild
index c30ef41ab876..2bb96ea6369f 100644
--- a/net-proxy/mitmproxy/mitmproxy-8.1.0.ebuild
+++ b/net-proxy/mitmproxy/mitmproxy-8.1.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/mitmproxy/mitmproxy/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 
 RDEPEND="
 	>=app-arch/brotli-1.0.0[python,${PYTHON_USEDEP}]
diff --git a/net-proxy/mitmproxy/mitmproxy-8.0.0.ebuild b/net-proxy/mitmproxy/mitmproxy-8.1.1.ebuild
index f8b403ee6b30..8c38bade37bd 100644
--- a/net-proxy/mitmproxy/mitmproxy-8.0.0.ebuild
+++ b/net-proxy/mitmproxy/mitmproxy-8.1.1.ebuild
@@ -4,13 +4,13 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8,9,10} )
+PYTHON_COMPAT=( python3_{9,10} )
 PYTHON_REQ_USE="sqlite"
 inherit distutils-r1
 
 DESCRIPTION="An interactive, SSL-capable, man-in-the-middle HTTP proxy"
 HOMEPAGE="https://mitmproxy.org/"
-SRC_URI="https://github.com/mitmproxy/mitmproxy/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/mitmproxy/mitmproxy/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index d88d559ca095..14700cf9df34 100644
--- a/net-vpn/Manifest.gz
+++ b/net-vpn/Manifest.gz
diff --git a/net-vpn/i2p/Manifest b/net-vpn/i2p/Manifest
index 2126bcfb6a7a..6951cae5c512 100644
--- a/net-vpn/i2p/Manifest
+++ b/net-vpn/i2p/Manifest
@@ -3,5 +3,5 @@ AUX i2p.service 253 BLAKE2B 2647a1920083fedf88b351b084d3a4d177393065da3dc7aecbeb
 DIST i2psource_1.6.1.tar.bz2 33043548 BLAKE2B dd7394ec596b016e76e9d74ee06c5db12bce50a859b0bd1194b0d3dd30cb1c2b9116abf3fdf9847c0b89b71a2a2b553f999fd29901567ddd5e4462c43d25c866 SHA512 c7c26ce10e159bc1f46b55ad2ef9773f24cb647d2ac01ff6acbb08c7020cb488fd1aeb9bb2d50122d2e87e0606f8fe46d2cc4360fa5df62bb1e9af0ce5e9a52a
 DIST i2psource_1.7.0.tar.bz2 33300522 BLAKE2B dcb83477f6d066b707632f8db44bc811558b0bc52368ce992aaf14d0d21acc1fb9bce1dfa8171fca8cf3819765f0b7993ae4a2566a6f65786cca84c02ea4336a SHA512 a27c448246538f152355ecfdf781e39bf9e57b5d0f7ea139ce06d800ce3eed7fa4e375210e6545da2a75245b45282bc8d8e7453d96729f940c34daa75bdc588f
 EBUILD i2p-1.6.1.ebuild 4460 BLAKE2B 787d90534c98d4fb6b399151a71bff687d623080f4b102112c1a86471c2e682f8f182b924237207b5cadc92633bc65ddba9bd261ebff02239d46469606002657 SHA512 18463baab09b5b06bf6077df16c70efd1b67731cb6f7a6e11b9d6be3ff574a3190405528476e23709d7cdc7f372025e1d2109a7be242ce527efffb71ad61feda
-EBUILD i2p-1.7.0.ebuild 4310 BLAKE2B 9fea6d6616647951eec0b18826a6132475f3bf1111106de9bce970989c4ae5e323e4b8519d27b2c65c70a213f6597e628801d3ed812cbd8c338a3ee7116fcf84 SHA512 c8c9ea75c7230d61f3883fa252fc51e1018c6ad30f3814b06bdb2ce4c6a9a2452e640dd62a8e6403100a14e4024f711ac904645ba3d18fae1795bd821f60984a
+EBUILD i2p-1.7.0.ebuild 4309 BLAKE2B 7a17e63badb7ddf0acbbfbd28e5edffd602b872797ae96be16ab50aedac9d4eb88244e156798c853ccea567c9bcb23cce0669b4f5913208e365880160e1f0f0e SHA512 93b5cbc1a7bf69ea9efdcda9f2daaee55a66ba84ab6448e01b40dd72e1c0f4621e62669d9674937ad841e3f2c1ff71756f30536c52b722b48f4f6a8f54e06fb8
 MISC metadata.xml 740 BLAKE2B 06a3a1b273cd25dacdedfb1e9dbb1a1ef5c32cf44bb76101ba521ac3b387533c10e111b76182a04e55d50a9bdf7e03f15101db768a63d03c02190c5aebe1f4ac SHA512 b598a77193edf843a205f4fdf22e779b978e26d1b3fcec9adc19e78783bbda15d53c66a55ef0b14fe3c25601f167e5f5f299fa0472ef3620dc46fd47c97ff909
diff --git a/net-vpn/i2p/i2p-1.7.0.ebuild b/net-vpn/i2p/i2p-1.7.0.ebuild
index edc82ec59148..9c4491ff3d78 100644
--- a/net-vpn/i2p/i2p-1.7.0.ebuild
+++ b/net-vpn/i2p/i2p-1.7.0.ebuild
@@ -13,7 +13,7 @@ LICENSE="Apache-2.0 Artistic BSD CC-BY-2.5 CC-BY-3.0 CC-BY-SA-3.0 EPL-1.0 GPL-2
 SLOT="0"
 
 # Until the deps reach other arches
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 IUSE="nls test"
 RESTRICT="!test? ( test )"
 
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 63a5ada5e56e..e23bc16e1541 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/arch/alpha/package.use.mask b/profiles/arch/alpha/package.use.mask
index de7ba0224b4d..f8d75f42430c 100644
--- a/profiles/arch/alpha/package.use.mask
+++ b/profiles/arch/alpha/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Matthew Smith <matthew@gentoo.org> (2022-07-10)
+# Needs unkeyworded app-doc/halibut
+>=net-misc/putty-0.77 doc
+
 # Sergey Torokhov <torokhov-s-a@yandex.ru> (2022-06-22)
 # media-libs/libjxl is not keyworded
 # bug https://bugs.gentoo.org/853628
diff --git a/profiles/arch/arm64/package.use.mask b/profiles/arch/arm64/package.use.mask
index f4cb7901cf98..7e87677f4ecd 100644
--- a/profiles/arch/arm64/package.use.mask
+++ b/profiles/arch/arm64/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Matthew Smith <matthew@gentoo.org> (2022-07-10)
+# Needs unkeyworded app-doc/halibut
+>=net-misc/putty-0.77 doc
+
 # Sam James <sam@gentoo.org> (2022-07-08)
 # Unmask galera for dev-db/mariadb
 >=dev-db/mariadb-10.1.0 -galera
diff --git a/profiles/arch/hppa/package.use.mask b/profiles/arch/hppa/package.use.mask
index 804f970f43a9..ace034545eeb 100644
--- a/profiles/arch/hppa/package.use.mask
+++ b/profiles/arch/hppa/package.use.mask
@@ -4,6 +4,10 @@
 # NOTE: When masking a USE flag due to missing keywords, please file a keyword
 # request bug for the hppa arch.
 
+# Matthew Smith <matthew@gentoo.org> (2022-07-10)
+# Needs unkeyworded app-doc/halibut
+>=net-misc/putty-0.77 doc
+
 # Sergey Torokhov <torokhov-s-a@yandex.ru> (2022-06-22)
 # media-libs/libjxl is not keyworded
 # bug https://bugs.gentoo.org/853628
diff --git a/profiles/arch/powerpc/ppc64/package.use.mask b/profiles/arch/powerpc/ppc64/package.use.mask
index 7a09c8b58c7c..a4b2648bd7b7 100644
--- a/profiles/arch/powerpc/ppc64/package.use.mask
+++ b/profiles/arch/powerpc/ppc64/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Matthew Smith <matthew@gentoo.org> (2022-07-10)
+# Needs unkeyworded app-doc/halibut
+>=net-misc/putty-0.77 doc
+
 # Jimi Huotari <chiitoo@gentoo.org> (2022-05-08)
 # Not keyworded here yet.
 lxqt-base/lxqt-meta desktop-portal
diff --git a/profiles/arch/sparc/package.use.mask b/profiles/arch/sparc/package.use.mask
index 6298a47b94a1..72517fbad896 100644
--- a/profiles/arch/sparc/package.use.mask
+++ b/profiles/arch/sparc/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Matthew Smith <matthew@gentoo.org> (2022-07-10)
+# Needs unkeyworded app-doc/halibut
+>=net-misc/putty-0.77 doc
+
 # Matt Turner <mattst88@gentoo.org> (2022-06-25)
 # net-libs/libqrtr-glib not keyworded
 net-misc/modemmanager qrtr
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index f330981de478..3c098b4384f1 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/linux-gpib/Manifest b/sci-libs/linux-gpib/Manifest
index 94669c24657b..3550ae768ac7 100644
--- a/sci-libs/linux-gpib/Manifest
+++ b/sci-libs/linux-gpib/Manifest
@@ -1,7 +1,5 @@
 AUX linux-gpib-4.3.0-perl.patch 546 BLAKE2B 9695c1a9f48a2a8bcb5f5998c40eb909e6b1b3624defe87a08bc4b91b34f53e8176531678dff3d4810b0b85b811eb477795c0dffe0275b864c0e4d4bac9b0ea9 SHA512 21bf64366d4b68dcfc2f4fa932480f8ff6af62bf792fe90c0dd0330606c3b95c073040dfa87bd1e277391a02ad324612d58b6d618d83c637b3df60c638289d06
-DIST gpib_firmware-2006-11-12.tar.gz 169357 BLAKE2B 05f1be78545e025d76e2b9819a5dcac5a6715dfbb6df5c6fbe8b78900adf8ca7b1c28db350674ff1dd9c77e24507e98b536ca1af8b558c9a46ef8c25034c9769 SHA512 164d6fcfb3af43933f0a16645276f7d527a7aa24ef311f6ae3dcd7f45c41f92c855cf221bc946772f43fc2f9524057abc34bbd7d805c89b33ed7e111bc6870af
 DIST gpib_firmware-2008-08-10.tar.gz 173004 BLAKE2B 05fcde09de5246b86004c263c733d64316511bdb0b84dfbd9b94cb78e2909c0d191ff21ee0d77e7f0947e9231bd4cd62d6348e8f9beefd6d201b473732ff23d2 SHA512 f2a0ee3316b75ac36ed88568e45ca4c69935a6d10783c65582003ab39686f2a69d3002901866065f4f5efa9fdd4c779e038d1d7ce24bba266a619c164d5ac10d
 DIST linux-gpib-4.3.4.tar.gz 1395770 BLAKE2B 3c7182ac127851ebf0f5416ea639d7f858c160ba00f01aa7f7e423f6fb7b3be5b089424d3a473497562d040c194483ebc93d8a2a0f64582fb8907b42e2c4b832 SHA512 397ad86883bf562b004673ae47218108d392f2a15121c95926ea38764e7a76b382cb199fd48c35c9777f34c8eb99965e3d4ea2028e86ce02bcda4bd23127cbd5
-EBUILD linux-gpib-4.3.4-r1.ebuild 4985 BLAKE2B 7a6509bcae552683696d0e6cf31e5f03f547038bfaf215809a4f67550ad06c5fcd1e2fe37df689e7c9320c95f222cb873ff0b32cbfc85150a020fe514e5f01b5 SHA512 fbb969ef412db9656ec279d87749bea111280d000e7a2f4a5721fa08e13f7b1d8b4d91ac1412090b8260a5d0f2a40b6942eed6b5ad328b2e0ca4ab9ddc6ed5b7
-EBUILD linux-gpib-4.3.4.ebuild 4797 BLAKE2B 0016f765269875faedfac78d04a99e39860396b5fe01d78487a72f0b12d8b0cf4202ecb1ee5c08dc6be50183a3adeca78af240d3f07203268610213787fc9661 SHA512 f3e020026a4b0b63be4988492f05ad3f27251f9d87b8e56c184a815449448aa45c3806d8c9881892b72c8b1683c8130f271d84427e9f213a593d9774c61a0184
+EBUILD linux-gpib-4.3.4-r1.ebuild 4984 BLAKE2B 6763fe0259a9281776564f82013bb7a27351d8fd68399396e4b9d8096c9aae4e3137ae86cccbf984bc5a03618f6fc0de8f4a9992baa03c6d08a5c2271189e057 SHA512 7d1af7aff13e9aa3b47ead8aca9af0aedad31f1eda985f7fbafb8e19f4cb29199bd65aa3e3a1120cfe9cc015936371dc3d93ba681605744c48e431e66c40133f
 MISC metadata.xml 548 BLAKE2B c976143b910efb6a8920f064f35fdac9cb325ff272aca8a7644511300f4dfe9232c280577a90eae225ca4f88bc2b4cd09d175d4190bc13513d89457f57c9bb52 SHA512 c611a420ab28d623b5b9167bd59c04c2fe27404a7fd85de72a555f99ef8bad4383702482ae808d4eb66014a9e63ca057aa7195748f9c230f0778fcbde07fb71f
diff --git a/sci-libs/linux-gpib/linux-gpib-4.3.4-r1.ebuild b/sci-libs/linux-gpib/linux-gpib-4.3.4-r1.ebuild
index 0584a67f9064..84a82c400b76 100644
--- a/sci-libs/linux-gpib/linux-gpib-4.3.4-r1.ebuild
+++ b/sci-libs/linux-gpib/linux-gpib-4.3.4-r1.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/${PN}-user-${PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 IUSE="pcmcia static guile perl php python tcl doc firmware"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/sci-libs/linux-gpib/linux-gpib-4.3.4.ebuild b/sci-libs/linux-gpib/linux-gpib-4.3.4.ebuild
deleted file mode 100644
index 76557cd82d74..000000000000
--- a/sci-libs/linux-gpib/linux-gpib-4.3.4.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit readme.gentoo-r1 autotools perl-functions python-single-r1 toolchain-funcs udev
-
-DESCRIPTION="Driver library for GPIB (IEEE 488.2) hardware"
-HOMEPAGE="https://linux-gpib.sourceforge.io/"
-SRC_URI="mirror://sourceforge/linux-gpib/${P}.tar.gz
-	firmware? ( https://linux-gpib.sourceforge.io/firmware/gpib_firmware-2006-11-12.tar.gz )
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~x86"
-IUSE="pcmcia static guile perl php python tcl doc firmware"
-
-S="${WORKDIR}/${PN}-user-${PV}"
-
-COMMONDEPEND="
-	sys-libs/readline:=
-	tcl? ( dev-lang/tcl:0= )
-	guile? ( dev-scheme/guile:12 )
-	perl? ( dev-lang/perl:= )
-	php? ( dev-lang/php:= )
-	python? ( ${PYTHON_DEPS} )
-	firmware? ( sys-apps/fxload )"
-RDEPEND="${COMMONDEPEND}
-	acct-group/gpib
-	~sci-libs/linux-gpib-modules-${PV}
-"
-DEPEND="${COMMONDEPEND}
-	virtual/pkgconfig
-	doc? ( app-text/docbook-sgml-utils )
-	perl? ( virtual/perl-ExtUtils-MakeMaker )"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.3.0-perl.patch
-)
-
-pkg_setup() {
-	use perl && perl_set_version
-	use python && python_setup
-}
-
-src_unpack() {
-	default
-	unpack "${WORKDIR}/${P}/${PN}-user-${PV}.tar.gz"
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable static) \
-		$(use_enable guile guile-binding) \
-		$(use_enable perl perl-binding) \
-		$(use_enable php php-binding) \
-		$(use_enable python python-binding) \
-		$(use_enable tcl tcl-binding) \
-		$(use_enable doc documentation)
-}
-
-src_compile() {
-	FIRM_DIR=/usr/share/usb
-	emake \
-		DESTDIR="${D}" \
-		INSTALL_MOD_PATH="${D}" \
-		HOTPLUG_USB_CONF_DIR=/etc/hotplug/usb \
-		UDEV_RULES_DIR="$(get_udevdir)"/rules.d \
-		USB_FIRMWARE_DIR=${FIRM_DIR} \
-		docdir=/usr/share/doc/${PF}/html
-}
-
-src_install() {
-	FIRM_DIR=/usr/share/usb
-	emake \
-		DESTDIR="${D}" \
-		INSTALL_MOD_PATH="${D}" \
-		HOTPLUG_USB_CONF_DIR=/etc/hotplug/usb \
-		UDEV_RULES_DIR="$(get_udevdir)"/rules.d \
-		USB_FIRMWARE_DIR=${FIRM_DIR} \
-		docdir=/usr/share/doc/${PF}/html install
-
-	if use perl; then
-		einfo "Installing perl module"
-		cd "${S}"/language/perl || die
-		DESTDIR=${D} emake install
-		perl_fix_packlist
-		perl_delete_emptybsdir
-		cd "${S}" || die
-	fi
-
-	echo "KERNEL==\"gpib[0-9]*\",	MODE=\"0660\", GROUP=\"gpib\"" >> 99-gpib.rules
-	udev_dorules 99-gpib.rules
-
-	dodoc doc/linux-gpib.pdf ChangeLog AUTHORS README* NEWS
-
-	insinto /etc
-	newins util/templates/gpib.conf gpib.conf
-	newins util/templates/gpib.conf gpib.conf.example
-
-	if use pcmcia; then
-		insinto /etc/pcmcia
-		doins "${S}"/etc/pcmcia/*
-	fi
-
-	# fix rules files
-	local f
-	find "${D}$(get_udevdir)"/rules.d -type f -print0 | while read -rd '' f ; do
-		grep -q "${D}" "${f}" && einfo "File ${f} contains a temporary path, fixing."
-		sed -i -e "s:${D}:/:g" "${f}"
-	done
-
-	DOC_CONTENTS="
-As the udev rules were changed and refactored in this release it is
-necessary to remove any manually installed pre-4.3.0 gpib udev rules files
-in /etc/udev/rules.d/. The files to remove are:
-\n
-	99-agilent_82357a.rules\n
-	99-gpib-generic.rules\n
-	99-ni_usb_gpib.rules\n
-\n
-You need to run the 'gpib_config' utility to setup the driver before
-you can use it. In order to do it automatically you can add to your
-start script something like this (supposing the appropriate driver
-is loaded on the startup):
-\n
-		gpib_config --minor 0
-\n
-To give a user access to the computer's gpib board you will have to add
-them to the group 'gpib' or, you could change the permissions on the device
-files /dev/gpib[0-15] to something you like better, using 'chmod'
-\n
-Edit /etc/gpib.conf to match your interface board, and any devices you wish
-to open via ibfind().  See the documentation in /usr/share/linux-gpib/html for
-more information.
-\n
-"
-
-	if use pcmcia; then
-		DOC_CONTENTS+='
-For PCMCIA cards:\n
-All files needed for a PCMCIA board were copied to /etc/pcmcia.
-You may wish to edit the options passed to the gpib_config call in the
-/etc/pcmcia/linux-gpib-pcmcia script.
-You may need to send a SIGHUP signal to the cardmgr daemon to force it
-to reload the files in /etc/pcmcia \(alternatively you could use your
-pcmcia init.d script to restart the cardmgr, or you could just reboot\).
-The driver module will be loaded as needed by the cardmgr.
-
-'
-	fi
-
-	if use firmware; then
-		DOC_CONTENTS+='
-For Agilent \(HP\) 82341C and 82341D cards:
-The firmware for these boards is uploaded by passing the appropriate
-firmware file from /usr/share/linux-gpib/hp_82341 directory to
-gpib_config using the -I or --init-data command line option. Example:\n
-gpib_config --minor 0 --init-data /usr/share/linux-gpib/hp_82341/hp_82341c_fw.bin
-'
-	fi
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index c90e31bf808b..3a24b0f2d8d5 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/init-system-helpers/Manifest b/sys-apps/init-system-helpers/Manifest
index 0b01d2a66bc7..10e89329743f 100644
--- a/sys-apps/init-system-helpers/Manifest
+++ b/sys-apps/init-system-helpers/Manifest
@@ -1,6 +1,4 @@
 AUX revert-openrc-management.patch 929 BLAKE2B 58d0fa10956bf930c176a84573a5b780fa4bcb87f6df180a179f0cbac93ede8f2147fe620007f68e563ec4a3e86228efacc2ca33dce135c5d1fa1d639cd7fc82 SHA512 ba046ae948f93d0d861fd70637c2b1acaa37ba3ef225453162eb19ae854504f518a1024c484118b86bde3f57099bb7a44d46e3765bca4b1766bf2565c990f356
-DIST init-system-helpers_1.49.tar.xz 42660 BLAKE2B 548711283b04e3df13e9287154e2648b99ac80c2cdc71a428b4496220cd7c319f8f7afccb1e611c07b9d801837ef8799a3295a0490aa62812d47b728ba5ddba9 SHA512 bd612207e51e18a44f9c90e1e5b069ab39e06c776b8a0d6c9ecb367890d4a44ff02b3028418ac10a688782745331f39bb9299ba836f333b712e6fdd7ddc8da16
 DIST init-system-helpers_1.60.tar.xz 40584 BLAKE2B ad21a65ef3c4bcec16b14fc4db890fb7f83df625d1038fe217c20e9391404914df189ae31506b9bbef0442cdd333f46bd9c4d9009b7d671d9ae2deb6b05eee8e SHA512 3739613fa8afa1fa6032f47f8cec67c526171987a7d1eae31d479db9cc1e49ae3cd397a858130c17680d62becb9c6499bd1da1268e9ed25b044337ab69f0dd88
-EBUILD init-system-helpers-1.49-r1.ebuild 880 BLAKE2B c09d877d803227f4fad496a7792f572815d4e1672db33039eccdc4035c3bbc27ce793cf38b2e7f9cc5e70680842bbc55d6a7afaf714400389106eccae146f1ee SHA512 d55404655ef89bc03a2fb2a10467cbe529287969ac9ff530a563899f660fdd18c18b6eb0caaff1a529d2a003212e519be5959062567a61cabb2981b5ad56e293
 EBUILD init-system-helpers-1.60.ebuild 982 BLAKE2B 3e7ac774e12f8c037a1308407d8b1e13911834906261504227193348c02d5d46f60011b1d47b20c1419c4f63da4562a20bb67b73ebd12ddb29e5cfba3ec90242 SHA512 51d60e207c837ef1dc974dd440f0e4dafc6d85f1837eef9bfcba52b4a650d3ffd1e9f22ddad47a441d9e3079b375b28abaceef51536cda94c2675590fb3d6839
 MISC metadata.xml 192 BLAKE2B fef49cb9e1dda8063c379e650d4897670410d2c0641f469b8a200d5e7ec8d3f505e692277d03b583790cb1340ece9c2e8f7e7c9ff5080d42a2e0ef3fc7138a44 SHA512 bece454b8da734c7a28ce25f8080b3fca56332e57cde854c50f0b884ba3836f1af7782a1ee9f63e6aeff4830e2bca71c5c466471fc82eee75339565aab6495d5
diff --git a/sys-apps/init-system-helpers/init-system-helpers-1.49-r1.ebuild b/sys-apps/init-system-helpers/init-system-helpers-1.49-r1.ebuild
deleted file mode 100644
index 9ab7497a653a..000000000000
--- a/sys-apps/init-system-helpers/init-system-helpers-1.49-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Helper scripts useful for both OpenRC and systemd"
-HOMEPAGE="https://packages.debian.org/sid/init-system-helpers"
-# git repo: https://anonscm.debian.org/git/collab-maint/init-system-helpers.git
-SRC_URI="http://http.debian.net/debian/pool/main/i/${PN}/${PN}_${PV}.tar.xz"
-
-LICENSE="BSD GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="!<sys-apps/openrc-0.33"
-
-PATCHES=( "${FILESDIR}/revert-openrc-management.patch" )
-
-src_install() {
-	# We only care about 'service' script/manpage:
-	exeinto /sbin/
-	doexe script/service
-
-	# FIXME: need to patch to remove *rc.d references, which we don't ship
-	# And should probably add a list of supported options (e.g., start/stop/etc.)
-	doman man8/service.8
-}
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index 6cc53af73711..0f54fd389d43 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index 9cf22e1d02c2..8e7473face33 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -4,6 +4,7 @@ AUX gcc-configure-texinfo.patch 341 BLAKE2B d2ea3b2ea08f5d3a498ba27d0fb95e325097
 DIST gcc-10-20211126.tar.xz 71674848 BLAKE2B 81f4a572e973db7a3701601e66ea58c8e535a55d4d4ac164de00bdb06f7f265585f45d46171cf40d42ebcd3fb02ac81b643398c560912698eb6c008ac6e09518 SHA512 db887184c649ebeede5a1b9f13c00fe425012434cb93ec960c3ca50c0bcdeab04a1cc13b20de21b940e5d6a09c3b1c7fc415110a0e990ec1d938627bf97b9342
 DIST gcc-10-20220623.tar.xz 71747668 BLAKE2B 3849182a188f4a3b5f19e66008a23ab50ff5bf933d28254432d62ce880b7921124302658553c7bc1e8756c430d11b5d577685d1d70b9851b714d1e15b1d7b4ac SHA512 294093cdd0949238e903f91c4ed28b2fd063d25aa6aa7947acdb318350c582e43d15b98a78756da692d0625c6d190c67b62f215ac865594712d6f8efe298831b
 DIST gcc-10-20220630.tar.xz 71753264 BLAKE2B 19179c6ff805dd280835176955995e6a402705d69120023e3b472b4290b29babc9184a07e35c0e780aed6f4b6505c9b8e9c0fd020d251755f73c8f802c65947d SHA512 8c5f9c3a8c8f9b0d3b8236b41fb6cc1facc01bd3c1b3882a68f61ed7e9bb84ac2a478f52ac17e4a7af488970aa5935faa0635158b51edffeb2784d1dbf0407cf
+DIST gcc-10-20220707.tar.xz 71750512 BLAKE2B 147e4771b7909aabcf9de0d87fa411f3fb60fcded024f45208867a87d686b98a6a3644a2af180552369b0a7cbb559c4eb6bd64ee3a06c0c253eef5554b77df4b SHA512 33fcb7348d3b3f02c3fdeb79764eefa505cfbccac308bf8566123f075a75f0d5b2d20f8d861c5a6959464be90b167b10b9e609c3f0d5e0d4b95604f1c2e5dbe8
 DIST gcc-10.3.0-musl-patches-1.tar.bz2 2999 BLAKE2B 3e36bbf2f93fdce15e20f807fa262f7a7abbde85b6f6b4e1383f6eccd8a53d876687d56cde83a80cde8a50e15bec407a1212aa0c85520892563e3d5ef7aaca98 SHA512 21483912a7b152f27db82d837a4cf91f2552d5fe238702aeca0c0dd8c7d3695bc70d8794c94a19106df28e053baf14c38433ca8e38e849082b76273cb51f2384
 DIST gcc-10.3.0-patches-3.tar.bz2 18935 BLAKE2B 13eaf1e055b5b63069aed1575ed93f6bc822b5e3f2181ddfc88f4e7ff801f58997cd131b2efd79b90469b1f861db994feb2adcaecacf165442078f76e233fd9a SHA512 c3d6a6f32863cc0ff7c877314ff0c00a892e473f64d16b82d46b4a77aa97c3e7a575492d27f0d423acb2621c86c9a49bca0e26e45bda9e697495444fcac85084
 DIST gcc-10.3.0.tar.xz 76692288 BLAKE2B ac7898f5eb8a7c5f151a526d1bb38913a68b50a65e4d010ac09fa20b6c801c671c790d780f23ccb8e4ecdfc686f4aa588082ccc9eb5c80c7b0e30788f824c1eb SHA512 2b2dd7453d48a398c29eaebd1422b70341001b8c90a62aee51e83344e7fdd8a8e45f82a4a9165bd7edc76dada912c932f4b6632c5636760fec4c5d7e402b3f86
@@ -15,6 +16,7 @@ DIST gcc-10.4.0.tar.xz 75018092 BLAKE2B ec1169025d3896b70ab80a4b8ce5040763a95529
 DIST gcc-11-20220115.tar.xz 75676672 BLAKE2B 12171fd97731dbca67f13cc2a3a3a3989c22d628b289cbd3d46080f77a8d951f15c1e54e83a2e62ab41b69221f9784e970799a11a9ed5b224a77ba4b1b081f07 SHA512 7455b3b29d3c64df9123afef82faf922d97e08a3ea30fbc2d9286d4f6ed2fafbfc0f9d94ae1b9eee45329e95a27bd642b3aa679d83a0c27a3e30967d49e0728c
 DIST gcc-11-20220624.tar.xz 75765436 BLAKE2B 642bbda212f31344822ec90bce1422146515b153ddb306c5fd1bcf25be25fea7ed5bc1aa6f5987755969e73af5de1484fb79a805e87428bcfa0b13257b9c35df SHA512 736a71de166851816914561bfbe7c00110b32f8b7e1666176babdfcfbdef4410ba07c8e2d912da2830fa14c6732f9ca555cae127481b07a85f7e689d87f9d509
 DIST gcc-11-20220701.tar.xz 75776176 BLAKE2B 958ba928ba6094e947990ef834f397d94a1f2bb0319aca77cab2d53c1eb12fce8b03d8e1b1fecc0be39f5154fb10126faf5667d6c345e65fb932a3680b55f8dd SHA512 ca378e8cb427c098099192aaa9441a2e85acc38f9a7309d56ef252e7434f7869df8f2af932f0ddc2d3c9e44341092ef05f284fed6a21b56c7c93faff68949709
+DIST gcc-11-20220708.tar.xz 75778420 BLAKE2B 77929d46f542258ca8288acf4cfedf44051303ffe952838da4ee29fb1611dc3bc474c5cc9900ff43d7ae512cdb1348aea7b45b175c9b392c90d96c07b21bd026 SHA512 7ad7d72e40114fd625878ed9b3b0e76a8ec97946cb8d0ede9353d8278e311fc3c873671a54479fe4c5ff4524b86752d7e5e92e485a07e6b59c6e9b07832a8e7c
 DIST gcc-11.2.0-musl-patches-1.tar.bz2 2999 BLAKE2B 3e36bbf2f93fdce15e20f807fa262f7a7abbde85b6f6b4e1383f6eccd8a53d876687d56cde83a80cde8a50e15bec407a1212aa0c85520892563e3d5ef7aaca98 SHA512 21483912a7b152f27db82d837a4cf91f2552d5fe238702aeca0c0dd8c7d3695bc70d8794c94a19106df28e053baf14c38433ca8e38e849082b76273cb51f2384
 DIST gcc-11.2.0-patches-1.tar.bz2 11537 BLAKE2B 9dd791ada244c9b70b8b99f9f305a688c248134715ed1b26d406e53b114983faae6873cdc521497164388d24d5f61c199e98df146bc02f5578e877295bcf5c82 SHA512 6539efc60c656d0798a5896dc1b944ed69914b815102c7a1c10bdba4ef935abd326b01309f38316e121f1ed90ceb2abcaf65df6af116892daad829ac2623cefc
 DIST gcc-11.2.0.tar.xz 80888824 BLAKE2B 69b61234ac436edfea2933df68c434a2ce7aa4454ef4da573e82587e1a42dc420189e949cfdadaf4cb37fc0de9674822210a95b77ff03aca0dbedfe67df19cc6 SHA512 d53a0a966230895c54f01aea38696f818817b505f1e2bfa65e508753fcd01b2aedb4a61434f41f3a2ddbbd9f41384b96153c684ded3f0fa97c82758d9de5c7cf
@@ -28,6 +30,7 @@ DIST gcc-11.4.0-patches-1.tar.xz 13956 BLAKE2B ff6ee1b81ad214e74a49c00b15767086c
 DIST gcc-12-20220528.tar.xz 79096228 BLAKE2B 9c06ce85c6302bd43e06d35d5d5cc9e81268d368484bd60af707e6dbbe791d85ec2a177fe7deae1379d313269fcaea2ff5245e20e54ca667f452c27efb738c13 SHA512 498be61fcae7e4ec55e1f270e1d02fadfe9069692afab6442dac0b7ab480ad7112121f4728a9f99c7868e7373b2c770ad4833a3b4a1a8a43b3417e79f286c28c
 DIST gcc-12-20220625.tar.xz 79092788 BLAKE2B 491da523abc0a63bbceaa6c76b251a5b6c224e1684b5db4e6155fdcab4b0d8d505376d30a13e1b0331f37558aac311477bbb3179b63da850acae436b642c9ee1 SHA512 0527c6d69cd53e8aba3464746b7989e3128af74818864a2e5b4be66313203d32a84201440a254da8de72842b0ebbbccf1ec14c6a121cb09f9454358b0a37b8f9
 DIST gcc-12-20220702.tar.xz 79091468 BLAKE2B a15363dbab5f331b2e5ee6362ef6701307513bca211cacdee2bf17cf50cf88a019110c2b2412939b614c3346b5ec3823ee5b1bca19db526693149a163e5b98fe SHA512 e5ab44e79f641ace6d9d77ffb176f3309d35e8f36b6bdd42f09e29fcc82766933e0fb8f86be84bf7419fe9918c554544d34c448b706ec0cb052e738e5594683c
+DIST gcc-12-20220709.tar.xz 79104468 BLAKE2B 23606ba389d1e7bdcb737eae79f743f80249ad2d50c18648fbc292f00c9709263e2d865aad5fced5ca36de7843d96592eddd1f717e6c3d4c4db5d6aae8acbe49 SHA512 5601266ab1ef2afe1322d4a3c0a402ad04247510c11f3eb59102825ca4e37f41a6d187eae3b5731315ade3b49753f47fbaff84d22c39c16d3b02b9739618536a
 DIST gcc-12.0.0-musl-patches-4.tar.xz 4456 BLAKE2B 80ae755b52c31d57eb737b3ec5e70d96e7e20f6720664cd94573b1c6cd079a0e29f73277c27b2f2570706da5239006dabd44f834824c515f6615ed5dc39c273f SHA512 cf917f40133d2b8090e98880e6c87d38129f44bcb454f4d707ef57967635a6fb571d7b85b7cb854421bc9aa88e48767a47aad99c767f9415899f97922d61c497
 DIST gcc-12.0.0-patches-5.tar.xz 9820 BLAKE2B cdebb6fa59e594f95cc4b028d329c0fed3ffa1731a4ca1a2954b7760f4a674e773cfe5888fb2c63a619d5d80ec464d98a94870bfe2e3ea34370afce7f67526bb SHA512 a9c27b0188fd842e88d6a831cdf1f9c6d0cada4ec260b5f7e67f3d8fe0f439fb0d2c82469de9fecebd657043babf3e63a24ee53776be2617bb90e1d3dd3f521e
 DIST gcc-12.1.0-musl-patches-4.tar.xz 4448 BLAKE2B ddad7bccea7474a0552e069df25e66b4af68470da655aaf7669c2ceca7d0588cebb171e8a949c8935eeadff23af4d3de41d44245c06d48044cfc1d1fadc6540a SHA512 bb3b9e4a81efd2d0ceb405220a9c15453d780d8bc01ed5ebf4837a318e0f8ad8cc36d6ad3f2eed5051bb6dc82f223d8b61321b8f602890a770eefd69c0c144b9
@@ -47,17 +50,20 @@ EBUILD gcc-10.3.1_p20211126.ebuild 542 BLAKE2B 43170f8b81699ab102c389f42313ab6d4
 EBUILD gcc-10.3.1_p20220623.ebuild 1456 BLAKE2B 1df37bdd7187d54fbdf615aac27ff9c72ede314cb90aa7ceb0b468f270e05e86a40dce77c9b762734df50658e9e5948344fcd3491b314987ca6117922c660e27 SHA512 f761cd77c9129bb0ed0acefdaa091ff40d025178e3e79027acc457ee2355aa9cba94c610d298cf24faee2c2c79a081615e92aa03011100e0c8cb8216e8460676
 EBUILD gcc-10.4.0.ebuild 1453 BLAKE2B ea3baac2dc8a51dfb959ad222a708268b860149fe932ef9774f828a678cf329d0c32f8059957645d453f32569ea099488df631bbcf063b298f7f40966129f049 SHA512 7f05c517cee21a55187d8f19a4ab5886201a2999d830011a97e7443bed4619e96c12bf877bc6bc30b783e2eefb0e94706c387030d676a61ecc2d5e49fc0c5471
 EBUILD gcc-10.4.1_p20220630.ebuild 1456 BLAKE2B 10e4d926dd4555636a040655834bcae3260fb5177c69cb7242c7dbba29123a1fa8570e31c81996e0e01a409c61bc02a1ce2d3bb836b37d88c915b122209baea8 SHA512 ad64e2e13b4f8f4c96a6670e9f4cd8986e81769fa879be4419347bc4ada6092daa09fcf3bb9c2c177f44d4e4d426dba105e94b50497e7ff30be707d81da906ea
+EBUILD gcc-10.4.1_p20220707.ebuild 1456 BLAKE2B 10e4d926dd4555636a040655834bcae3260fb5177c69cb7242c7dbba29123a1fa8570e31c81996e0e01a409c61bc02a1ce2d3bb836b37d88c915b122209baea8 SHA512 ad64e2e13b4f8f4c96a6670e9f4cd8986e81769fa879be4419347bc4ada6092daa09fcf3bb9c2c177f44d4e4d426dba105e94b50497e7ff30be707d81da906ea
 EBUILD gcc-10.5.9999.ebuild 1108 BLAKE2B af5f165e046455efaaaca747c1deb018b0f43dad720129f72821879fe61790b9d2c233ae9ac0e8d11911b92d390c7a8b082b5dba5a771716f7d9b0aeeb1c6a3b SHA512 905b1f6108ac0608c077e940570829bf9c1e5bde5d852cdbae2b5fddaa304df76dd5bd4499dfb5d26667ced09b3a772567dd850169cec8799731d1cc0abb125c
 EBUILD gcc-11.2.0.ebuild 495 BLAKE2B 122998d820667dbf776aaa7f48a79b3c127f1558f8ec811543e83d3f8534be368749e388254ff14139076baabdcc7ead4be8c5d8f23b3c764ad721cf0478265d SHA512 65a1c11c97d4bde439abad6cd68ee97dd04e8750f4728c3588e923f32eb56b61afa0243570b8c66599e6fe9f6d122113c00c5c1cdf9b7869f01c1564a6c21707
 EBUILD gcc-11.2.1_p20220115.ebuild 688 BLAKE2B c85314316bd63ceae85eaf1ae501932be00c2f5b80092ec4a894aa221e015daceb6687dbf962089b39195ae6470665e7faf09fe9600ae0c74e4d94fcd903e789 SHA512 59d147c88bf9e2a3779320ee89145f01f2acd1110efffc9f967a0c7fee3d910218424b48bf2166c06662a0b1b545b996869f5060ee23da54e8a10f1a0afc3477
 EBUILD gcc-11.3.0.ebuild 688 BLAKE2B 0ccbaaf3da7e4055de8e53ea5827bf787e85d8eec34a99235c4bf8014aea731932d20fc7d9d1b08b8520da0b0056e3c2dcbaebc5829b01b082d58ac03c51b7b5 SHA512 1de6d9ffb858daa7472813cac4fa8451d4cd4c8f8bca40878cbe25473cc3277bbc0cc708dcb8089bf3e621cd923b069b5397dccb46474cd6a68d13ed510834f5
 EBUILD gcc-11.3.1_p20220624.ebuild 1304 BLAKE2B 30a6a634b9752f514e1c1529e43d7b6cb842f44cb0a99cb9ae95a543ad9d0a783208f2639c19d577e7806b5dea120327f24893ea91f0de04160fc50184d97423 SHA512 bb90a6e3c2cb8fa31bdb2fcff26c0defe4d4d784ccea2c24169413b70540c4916d802eb21617339dd9d814cf946b8f32b379b4212a5cb2a653bff4e62e337077
 EBUILD gcc-11.3.1_p20220701.ebuild 1304 BLAKE2B edb9cfd2518e934014e6c6a7966b86a3d4fd83bd1f733a86428ff094e9aa5868e2dbcaf046e2a83483c77afd50ce5d778ee2ab03eb0216f404721242b231251a SHA512 4e4c92e175879fb813c26b910d3d9d8571e6dd96505e99e8f3127799b0f2dad5dba47b32b5a3cee502c9340efb11c417b7559d2118d49a212c5ad5f6e05b8691
+EBUILD gcc-11.3.1_p20220708.ebuild 1304 BLAKE2B edb9cfd2518e934014e6c6a7966b86a3d4fd83bd1f733a86428ff094e9aa5868e2dbcaf046e2a83483c77afd50ce5d778ee2ab03eb0216f404721242b231251a SHA512 4e4c92e175879fb813c26b910d3d9d8571e6dd96505e99e8f3127799b0f2dad5dba47b32b5a3cee502c9340efb11c417b7559d2118d49a212c5ad5f6e05b8691
 EBUILD gcc-11.4.9999.ebuild 1267 BLAKE2B 09a26812068945e11164d0a4f8f5cc10dc261a20a647fd4102decc83eecbbe8fcc7f38093609314fa1f26c46164e8248aede741880f7cff64dd5a94836765fa2 SHA512 4ecf698cd6e96dc08683a0e9b69936cdd9085c300d330fb9830cee0e38783e0a1fc8409db39159f9b247f28fc5d7d7572ad3e975f3951f1cb8537f49886bdcde
 EBUILD gcc-12.1.0.ebuild 819 BLAKE2B edb479f30802d9ac62555dc535d388f7630572f44d462d249758f4de5ce62f43c7664cdfe304e48e2009442ff5e8f687ae729947d5e16f8b8dc78d459b74b1b4 SHA512 fa31a6780c63b1ca4f63fb547059528da4f0180c4be307281e54ea06bc0fd8d23599000c166fbdbfc5f618d0ffaf007ac37152efb857f5cb0d2b794a2dd4e9c1
 EBUILD gcc-12.1.1_p20220528-r1.ebuild 819 BLAKE2B c1398689a1f30a4ee55875e289ea81fc63c8a0e5624b29104a370b57e54d7edad1c6c40126f252e74a4c0ff4f1f9ae62ddd79ba900ce5d8e8762c870f8194943 SHA512 56b8adbc634f2138b7fec66379b7e6f6d886ddf53f1dc7ab2dad4c30bf7606cca4c3000173d10ec705cef8a899fc5414cabc0cdedf6b64295bffb494bb707f4b
 EBUILD gcc-12.1.1_p20220625.ebuild 799 BLAKE2B 82f30877d60dd0c8b9313c46e1b790748e920ea1e05ce6b9e76d33b6d9539f09ed37687265aa752fc496e61890ce5acba7765b16c793708a7564bea6df144d23 SHA512 818bea94f67785be1f2a390afcaf1550167c508cc4546047c4823189ce1b58111314c78cb13c91cdcd18463cfaec2aa882d738bd32367e43840d3c1bffdcbd8f
 EBUILD gcc-12.1.1_p20220702.ebuild 819 BLAKE2B 8f40ffd8a2c9215c7de90cf40c5b4b0a2afcd66b7648699ab440bcbcdf20013395d4d03ce12c00021309aaba0978d3bdf7b42efe4f5189e4e6169dc84a044a46 SHA512 c3b4ca416d0d65ff8eafbe95b8ba2e894312003be0da5660af1904960504027ad76c8f1c6af4d212cb30116d2f1ca3c261f361f96770eacaee2d4ebfc173fe64
+EBUILD gcc-12.1.1_p20220709.ebuild 819 BLAKE2B 8f40ffd8a2c9215c7de90cf40c5b4b0a2afcd66b7648699ab440bcbcdf20013395d4d03ce12c00021309aaba0978d3bdf7b42efe4f5189e4e6169dc84a044a46 SHA512 c3b4ca416d0d65ff8eafbe95b8ba2e894312003be0da5660af1904960504027ad76c8f1c6af4d212cb30116d2f1ca3c261f361f96770eacaee2d4ebfc173fe64
 EBUILD gcc-12.2.9999.ebuild 1246 BLAKE2B a88a884f288177dc3e3264000a67bf29efd2913e1b92cc845604695035e2a6524802320549b281d62f7aa47d1e18f5a9a6b9af24551ddcc6d2489c8a03674074 SHA512 65110d465341c4d1ef7ca020b51ec90a17430b73c435a7310863a3c9ba1e6a01ea2902273d02eb6d008c334dfa954f92f2474293850a2615498f4d8023d4b52b
 EBUILD gcc-13.0.0_pre20220619.ebuild 1282 BLAKE2B 7f715b88b5cc957b71daf625d6cbdc23fe50ee9ea28e149f2aae381d09f35aa732458eb118b632f7ebf1903d0c8784f8aa339a9ed525a40a4fa06a879d32cfe8 SHA512 ee4d2134d47b67e40db2a3a4daa78d5fa8d8e9fa4eb3f04555e726b0a8174935bb14d7f147bf9bd81d2ffe9a1ac7ad1b693d4c5dc6d08855fb08897d22c525e2
 EBUILD gcc-13.0.9999.ebuild 1252 BLAKE2B dbc0cdcbb6bae2177185c41fa014a0c98e05a8101f33e12975e2af951e25539117b9279573770b5d17261032b0c51d80864140417a13b152aa34739c28c0f0c3 SHA512 96e940c83f9e58b7b929c5293ca44582c266d3e10615f6aded5cd0b11cb1d46306382fea04227040a7d7cbfdc0f042e3b1c89a0e617193bbfadea50a4732e9a2
diff --git a/sys-devel/gcc/gcc-10.4.1_p20220707.ebuild b/sys-devel/gcc/gcc-10.4.1_p20220707.ebuild
new file mode 100644
index 000000000000..b2fac30d2ffc
--- /dev/null
+++ b/sys-devel/gcc/gcc-10.4.1_p20220707.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+TOOLCHAIN_PATCH_SUFFIX="xz"
+TOOLCHAIN_PATCH_DEV="sam"
+#TOOLCHAIN_GCC_RC=1
+PATCH_GCC_VER="10.4.0"
+PATCH_VER="2"
+MUSL_VER="1"
+MUSL_GCC_VER="10.4.0"
+
+if [[ $(ver_cut 3) == 9999 ]] ; then
+	MY_PV_2=$(ver_cut 2)
+	if [[ ${MY_PV_2} == 0 ]] ; then
+		MY_PV_2=0
+	else
+		MY_PV_2=$(($(ver_cut 2) - 1))
+	fi
+
+	# e.g. 12.2.9999 -> 12.1.1
+	TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.$(($(ver_cut 3) - 9998))
+elif [[ -n ${TOOLCHAIN_GCC_RC} ]] ; then
+	# Cheesy hack for RCs
+	MY_PV=$(ver_cut 1).$((($(ver_cut 2) + 1))).$((($(ver_cut 3) - 1)))-RC-$(ver_cut 5)
+	MY_P=${PN}-${MY_PV}
+	GCC_TARBALL_SRC_URI="https://gcc.gnu.org/pub/gcc/snapshots/${MY_PV}/${MY_P}.tar.xz"
+	TOOLCHAIN_SET_S=no
+	S="${WORKDIR}"/${MY_P}
+fi
+
+inherit toolchain
+# Needs to be after inherit (for now?), bug #830908
+EGIT_BRANCH=releases/gcc-$(ver_cut 1)
+
+# Don't keyword live ebuilds
+#if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
+#	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+#fi
+
+RDEPEND=""
+BDEPEND="${CATEGORY}/binutils"
+
+src_prepare() {
+	local p upstreamed_patches=(
+		# add them here
+	)
+	for p in "${upstreamed_patches[@]}"; do
+		rm -v "${WORKDIR}/patch/${p}" || die
+	done
+
+	if has_version '>=sys-libs/glibc-2.32-r1'; then
+		rm -v "${WORKDIR}/patch/23_all_disable-riscv32-ABIs.patch" || die
+	fi
+
+	toolchain_src_prepare
+}
diff --git a/sys-devel/gcc/gcc-11.3.1_p20220708.ebuild b/sys-devel/gcc/gcc-11.3.1_p20220708.ebuild
new file mode 100644
index 000000000000..fec8a9f96524
--- /dev/null
+++ b/sys-devel/gcc/gcc-11.3.1_p20220708.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+TOOLCHAIN_PATCH_SUFFIX="xz"
+TOOLCHAIN_PATCH_DEV="sam"
+PATCH_VER="1"
+PATCH_GCC_VER="11.4.0"
+MUSL_VER="0"
+MUSL_GCC_VER="11.4.0"
+
+if [[ $(ver_cut 3) == 9999 ]] ; then
+	MY_PV_2=$(ver_cut 2)
+	if [[ ${MY_PV_2} == 0 ]] ; then
+		MY_PV_2=0
+	else
+		MY_PV_2=$(($(ver_cut 2) - 1))
+	fi
+
+	# e.g. 12.2.9999 -> 12.1.1
+	TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.$(($(ver_cut 3) - 9998))
+fi
+
+inherit toolchain
+# Needs to be after inherit (for now?), bug #830908
+EGIT_BRANCH=releases/gcc-$(ver_cut 1)
+
+# Don't keyword live ebuilds
+#if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
+#        KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+#fi
+
+# Technically only if USE=hardened *too* right now, but no point in complicating it further.
+# If GCC is enabling CET by default, we need glibc to be built with support for it.
+# bug #830454
+RDEPEND="elibc_glibc? ( sys-libs/glibc[cet(-)?] )"
+DEPEND="${RDEPEND}"
+BDEPEND=">=${CATEGORY}/binutils-2.30[cet(-)?]"
+
+src_prepare() {
+	local p upstreamed_patches=(
+		# add them here
+	)
+	for p in "${upstreamed_patches[@]}"; do
+		rm -v "${WORKDIR}/patch/${p}" || die
+	done
+
+	toolchain_src_prepare
+
+	eapply_user
+}
diff --git a/sys-devel/gcc/gcc-12.1.1_p20220709.ebuild b/sys-devel/gcc/gcc-12.1.1_p20220709.ebuild
new file mode 100644
index 000000000000..4ce888a6319a
--- /dev/null
+++ b/sys-devel/gcc/gcc-12.1.1_p20220709.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+TOOLCHAIN_PATCH_DEV="sam"
+PATCH_VER="9"
+PATCH_GCC_VER="12.1.0"
+MUSL_VER="6"
+MUSL_GCC_VER="12.1.0"
+
+inherit toolchain
+
+# Don't keyword live ebuilds
+if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
+	#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~loong"
+fi
+
+# Technically only if USE=hardened *too* right now, but no point in complicating it further.
+# If GCC is enabling CET by default, we need glibc to be built with support for it.
+# bug #830454
+RDEPEND="elibc_glibc? ( sys-libs/glibc[cet(-)?] )"
+DEPEND="${RDEPEND}"
+BDEPEND=">=${CATEGORY}/binutils-2.30[cet(-)?]"
+
+src_prepare() {
+	toolchain_src_prepare
+
+	eapply_user
+}
diff --git a/virtual/Manifest.gz b/virtual/Manifest.gz
index 9f9d63eb4b81..b948218e5f71 100644
--- a/virtual/Manifest.gz
+++ b/virtual/Manifest.gz
diff --git a/virtual/libelf/Manifest b/virtual/libelf/Manifest
index e1c368f39fa0..fbfe3546f7b2 100644
--- a/virtual/libelf/Manifest
+++ b/virtual/libelf/Manifest
@@ -1,3 +1,3 @@
-EBUILD libelf-2.ebuild 397 BLAKE2B 7ac26c8a33689a7dca2fd93df491796c6e5931542a1d345bdba98a0c4fd09d0ccc366df8419d468ea2562cf110160c3187ef261ca74da1d3f6229fc1f480c962 SHA512 d21df3673a0023a6bb2b41c9f03664b9c41336fe3402c23810e4b039c10f517a48d4548f92fcb4bfe71cd5151a81e0bfdeba75038ab709a6d456a2c673f869bd
-EBUILD libelf-3.ebuild 399 BLAKE2B 356b1ea67432a19a69a9eb0116dac16cf1dd443a1963f85fe0389817860c5d60bab4169bcfb5e6ad3fbfb7ecc45ebfc1e3dcead05985f7ae2165902747c062be SHA512 91dac88b8f8ba9953233471b0f9cb1d3f141bbe8957ebf4b4ac34fb61288b573edd70f779ce70db5d60d910b6f9f351ba3b85ba35af4bf716e2875c8a3ec50da
+EBUILD libelf-2-r1.ebuild 397 BLAKE2B 0f5f92e83e45fcda3b85123fc64c5787c2ce68b77687cc24b34856d29c668175dcfc89e195e106c51d59e43d9f5dc611adc6380417cbbd2c9b6bde042ab176a6 SHA512 5d2726520d6092a868009df6af87cf2c2e287930f7179029fbf3fa2b646c5c7bf77a10af63fa5661551f1c29c8bca99893e80bfa2ad19432e37d171c4fb7521b
+EBUILD libelf-3-r1.ebuild 399 BLAKE2B 5c5731ed476b5c0e8e0464c8b818afe9364c8d104c586bedc06a3cd2bbc5af74a28540bc0ada1b507e153a7055c242a455b4f5dbac26f4967711b807130bd799 SHA512 7450acea945f646924765286489dd46f5dea4e6dc166af2f5bfa066f20b1b717cb98d6f59fba2a2272f1cc9460d746238c3af538f3e3262a905ead77abaf8a07
 MISC metadata.xml 277 BLAKE2B 424c3611f6f418785b1dafe230de60c8e2ef3ae41cbdeaf9e037b7ff279f2e86728f000c9ddb27794814293b7845a3e563c02ee635918cf133338c06c9d473b6 SHA512 0119efd75b63b2d10e30cea58f04e6fb7434691cb3a78801d8922c73b3fed4ff2b642d14bae37f7805457e95ae092d49712147bf4b339a3b268656ca15d7a23a
diff --git a/virtual/libelf/libelf-2.ebuild b/virtual/libelf/libelf-2-r1.ebuild
index 165ad0fa2bb0..644892ce4f82 100644
--- a/virtual/libelf/libelf-2.ebuild
+++ b/virtual/libelf/libelf-2-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit multilib-build
 
diff --git a/virtual/libelf/libelf-3.ebuild b/virtual/libelf/libelf-3-r1.ebuild
index 431493d0acd8..c1ec5f6ba871 100644
--- a/virtual/libelf/libelf-3.ebuild
+++ b/virtual/libelf/libelf-3-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit multilib-build
 
diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index 012240e82380..c45cddce9f99 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
diff --git a/www-apps/nanoc-cli/Manifest b/www-apps/nanoc-cli/Manifest
index 647852665b05..5160f47d26de 100644
--- a/www-apps/nanoc-cli/Manifest
+++ b/www-apps/nanoc-cli/Manifest
@@ -2,8 +2,10 @@ DIST nanoc-4.12.2.tar.gz 331400 BLAKE2B f7a22b05a4805f15a8e93601ae21bffdc19fe17c
 DIST nanoc-4.12.3.tar.gz 332692 BLAKE2B 8ae106366c66500ed06be841382bc1cc52c68ebc7ebec47a3f9dab278c7e17f886d0ce18c81ff73a83ec672353503155b447dfff5ba46f16bc2bfe891bb028a5 SHA512 737ce993c529643440d74e5072e2d63c2ce970d4d7637e7f225a79d3ac38907ced84928340d7bf5f11bcd02188b5cb1df0d4b03a8e000878ed924ab943db33a2
 DIST nanoc-4.12.5.tar.gz 333312 BLAKE2B bdc50ba2868313f7b427a8292c8614230e9dcf472c5290e8fff39917cd5cedad217acbc36ef8524254c9839d965d824a98c99f9effa1e8cfb549e387d69f1032 SHA512 2e533076f62605a701275fd7813b6dbe09c2530ad38fb86db3a5d999bccd8f5ac93cf684ac882f00d81bbe1ec8cce69d45ecef1488efe3caf22f6a6ffca300e2
 DIST nanoc-4.12.6.tar.gz 333932 BLAKE2B f5ff12ddd583c4a672c34a63b7f325a3ef6c18713f4e351482eb3c2a3dd5999b67ee0e1b7e8ab85899591824d8c47f19f3aa074790ae15f4616d589f762f2bb8 SHA512 343ec620d96ca086612c4babcadf33c4edcc39a02082f762568feaf226566c6d9b5441f53355ea03544b285e9a5ddc32aae0e67cc321b28336665d453f47b070
+DIST nanoc-4.12.7.tar.gz 333669 BLAKE2B cd222df8f68b2ead8bfb324079b2e46ca76bc427d50e97ffbcebffbd79135d6f4349a1e6922f0cb37f49b1c306ac3eb4f34f2b2c3569768b95041e8129f4e9a8 SHA512 1f5b2595f2d95b291bad30a40e8753d83c9bfa8468c6b119d0c213a385f4568fa87af5a69ea1d3487dc3331ba71ecf956dabd84b79a9e8cc01b569efc3b57140
 EBUILD nanoc-cli-4.12.2.ebuild 2029 BLAKE2B fda269aacc8243a30aebe529c8b0d8cadb2db6f06408c47dd9cfe11714cbebf11ba83d646f5d4319776636add2c24dec403864ae4a49b990bc5a82aecd8b6d12 SHA512 ca60a110fa12c27a43ff232785db3a94c9121b6a86b5e6508f06ffcf3f96fffe8db077030b691e0e238099c838acbe1a049042b04ab97e5a81d98fbf2e6fc33c
 EBUILD nanoc-cli-4.12.3.ebuild 2036 BLAKE2B e621d893406f3d5140b434e8a015117265352ead95b9f5659db812dd3e5342f36ab5c4579b828a716876e7dfd7f2ff3a992e6dc4e3d1d9e681bbff17c39c4f80 SHA512 32f48b02456d3b31c716ef2cd155cc8868c89cf3c64b204c19dd9549c0b15d083d234f7565c7985028a340ec9410a4d38bdada505440504b56c86a4a3369f252
 EBUILD nanoc-cli-4.12.5.ebuild 2036 BLAKE2B e621d893406f3d5140b434e8a015117265352ead95b9f5659db812dd3e5342f36ab5c4579b828a716876e7dfd7f2ff3a992e6dc4e3d1d9e681bbff17c39c4f80 SHA512 32f48b02456d3b31c716ef2cd155cc8868c89cf3c64b204c19dd9549c0b15d083d234f7565c7985028a340ec9410a4d38bdada505440504b56c86a4a3369f252
 EBUILD nanoc-cli-4.12.6.ebuild 2043 BLAKE2B 1885ff99301bde74b7fc5c7819e59ab8fa584d7275e11f731029c603c9c795ba1175aa3ba353fa73960567331fd5e3ab81aae5faa9ded36c2a54a01b0ac31c67 SHA512 2406ffaaa872e8846f48720db03521132eb2f90892c1af67e5060dde5a5a6d59aec3c8cbfb360ba7b4e3439b1a60233d6e40feaca0bf288ed6f96f8eb8120890
+EBUILD nanoc-cli-4.12.7.ebuild 2036 BLAKE2B be05e190d692090ece34dd814414da563bd739f9eeb8ea2e806dfdf2176fea165d8927cc27b0b4aa542b71585aff395c69078809c9884314471b621c23407f88 SHA512 bef20f2c36b78aacd787f2f9c2be1601ed5c10da733260dc1388043cfcbca8c9a4071c7c7814a90395ca9468e3843817a100f9a79f7029d02667f591cbe520fe
 MISC metadata.xml 318 BLAKE2B 62f33f86cd5bcb675e9ac02fef339514b88000be788a7037416bf6594e3f27bb07c5f7b49adbc39aa6aae4fdc7f076ebbb7f0fe897807a8e4a0b2252d5238546 SHA512 1098cd34add4d21c0c10aa42a539cec14c56b1835701b73346a57cac7ea3964b776b95d76cdffd6300577682e3a29976d9b65a0e2b8f984ee1bfb7601f2d7ef2
diff --git a/www-apps/nanoc-cli/nanoc-cli-4.12.7.ebuild b/www-apps/nanoc-cli/nanoc-cli-4.12.7.ebuild
new file mode 100644
index 000000000000..60b0b6fc39b2
--- /dev/null
+++ b/www-apps/nanoc-cli/nanoc-cli-4.12.7.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby27 ruby30"
+
+RUBY_FAKEGEM_EXTRADOC="NEWS.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="nanoc is a simple but very flexible static site generator written in Ruby"
+HOMEPAGE="https://nanoc.ws/"
+SRC_URI="https://github.com/nanoc/nanoc/archive/${PV}.tar.gz -> nanoc-${PV}.tar.gz"
+LICENSE="MIT"
+
+KEYWORDS="~amd64 ~riscv"
+SLOT="0"
+IUSE="${IUSE} minimal"
+
+RUBY_S="nanoc-${PV}/nanoc-cli"
+
+ruby_add_rdepend "
+	>=dev-ruby/cri-2.15:0
+	>=dev-ruby/diff-lcs-1.3:0
+	~www-apps/nanoc-core-${PV}
+	>=dev-ruby/zeitwerk-2.1:2
+"
+
+ruby_add_bdepend "test? (
+	dev-ruby/bundler
+	dev-ruby/rspec:3
+	dev-ruby/rspec-its
+	dev-ruby/fuubar
+	dev-ruby/minitest
+	dev-ruby/timecop
+	dev-ruby/tty-command
+	dev-ruby/yard
+	www-apps/nanoc-spec
+)
+"
+
+all_ruby_prepare() {
+	# Avoid unneeded development dependencies
+	sed -i -e '/simplecov/I s:^:#:' \
+		-e '/codecov/I s:^:#:' ../common/spec/spec_helper_head_core.rb || die
+	sed -i -e '/coverall/I s:^:#:' \
+		-e '/rubocop/ s:^:#:' Rakefile || die
+	sed -i -e '2i require "tmpdir"; require "pathname"' spec/spec_helper.rb || die
+
+	echo "-r ./spec/spec_helper.rb" > .rspec || die
+
+	sed -i -e "s:require_relative 'lib:require './lib:" ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Avoid error handler specs failing due to different (rubygems?)
+	# output, meta_spec is affected by this.
+	rm -f spec/nanoc/cli/error_handler_spec.rb spec/meta_spec.rb || die
+
+	# Avoid test requiring a network interface
+	sed -i -e '/does not listen on non-local interfaces/askip "Needs network"' spec/nanoc/cli/commands/view_spec.rb || die
+
+	# Avoid tests requiring an additional dependency on nanoc-live
+	sed -i -e '/--live-reload is given/askip "Unpackaged nanoc-live"' spec/nanoc/cli/commands/view_spec.rb || die
+	sed -i -e '/watches with --watch/askip "Unpackaged nanoc-live"' spec/nanoc/cli/commands/compile_spec.rb || die
+}
+
+each_ruby_test() {
+	RUBYLIB="${S}/lib" ${RUBY} -S rake spec || die
+}
diff --git a/www-apps/nanoc-core/Manifest b/www-apps/nanoc-core/Manifest
index 6dc4fefb2fdf..0eda336a8537 100644
--- a/www-apps/nanoc-core/Manifest
+++ b/www-apps/nanoc-core/Manifest
@@ -3,8 +3,10 @@ DIST nanoc-core-4.12.2.tar.gz 331400 BLAKE2B f7a22b05a4805f15a8e93601ae21bffdc19
 DIST nanoc-core-4.12.3.tar.gz 332692 BLAKE2B 8ae106366c66500ed06be841382bc1cc52c68ebc7ebec47a3f9dab278c7e17f886d0ce18c81ff73a83ec672353503155b447dfff5ba46f16bc2bfe891bb028a5 SHA512 737ce993c529643440d74e5072e2d63c2ce970d4d7637e7f225a79d3ac38907ced84928340d7bf5f11bcd02188b5cb1df0d4b03a8e000878ed924ab943db33a2
 DIST nanoc-core-4.12.5.tar.gz 333312 BLAKE2B bdc50ba2868313f7b427a8292c8614230e9dcf472c5290e8fff39917cd5cedad217acbc36ef8524254c9839d965d824a98c99f9effa1e8cfb549e387d69f1032 SHA512 2e533076f62605a701275fd7813b6dbe09c2530ad38fb86db3a5d999bccd8f5ac93cf684ac882f00d81bbe1ec8cce69d45ecef1488efe3caf22f6a6ffca300e2
 DIST nanoc-core-4.12.6.tar.gz 333932 BLAKE2B f5ff12ddd583c4a672c34a63b7f325a3ef6c18713f4e351482eb3c2a3dd5999b67ee0e1b7e8ab85899591824d8c47f19f3aa074790ae15f4616d589f762f2bb8 SHA512 343ec620d96ca086612c4babcadf33c4edcc39a02082f762568feaf226566c6d9b5441f53355ea03544b285e9a5ddc32aae0e67cc321b28336665d453f47b070
+DIST nanoc-core-4.12.7.tar.gz 333669 BLAKE2B cd222df8f68b2ead8bfb324079b2e46ca76bc427d50e97ffbcebffbd79135d6f4349a1e6922f0cb37f49b1c306ac3eb4f34f2b2c3569768b95041e8129f4e9a8 SHA512 1f5b2595f2d95b291bad30a40e8753d83c9bfa8468c6b119d0c213a385f4568fa87af5a69ea1d3487dc3331ba71ecf956dabd84b79a9e8cc01b569efc3b57140
 EBUILD nanoc-core-4.12.2.ebuild 1920 BLAKE2B 54f3f3f9651061564e236ebd37a5d48d84f3dfb37849d4c2872454ee376e478132baeddf2d78488507633ac16ffbdcb440e3e3a414f4a31c17c1ca509586a9f8 SHA512 98dff23360020f0d0ef1e351f15f4c9270b9d4d6a77b5e5fbad019c2b1134b5a795d34c9b71339fb02244c2e654b6252365ab65f485c9a6e8319fbfdca192fc9
 EBUILD nanoc-core-4.12.3.ebuild 1935 BLAKE2B e41f23641b20bbd234c59981df1bdb968764fea169c48e058886c3f81d32684f8fa09e2f1aa7a92194d936c8807cd5494b71ad06122984f0e61dbd0a055f8b52 SHA512 6f076de31c575e20d9b71703ad99bdd080adb9b3e103655ff11591a766461a36d20085c7acd37a8afe846a4365ea23b58d3f467755ef5696548d66c178c4e977
 EBUILD nanoc-core-4.12.5.ebuild 1941 BLAKE2B 703e9b630a575007537b6060daa44e1f3a6505a324d1106fc5cfabc68e61a39c420ab888d6434e6a78c2a08152a436ee79ffce9b63efd8a29f35060d8c0b638f SHA512 b6b4afb7493fc4631754f9b7fa70ca78cee405e5958cdb5c8decb22ac5544a2d8f61798c640d87267adfecad47699fc137606459b083feb2bbc36affba166f85
 EBUILD nanoc-core-4.12.6.ebuild 1948 BLAKE2B 2c4dbfba45b230a1b5c4178e8c568cdc6e0fe6d77b0f43438ded6fdbf88806ef66d179737751ce7bb9d6e33ed742697a0662ce490272b4fd10f901b52cd7b638 SHA512 208d52ca383c3cedf47272243c7855bd0dd111d705c4a554d088eb0bdf532fe38bd666706b298fc2b527f2ec7b577828afd8bb8f693e6d31881fa6a0f0cb3d59
+EBUILD nanoc-core-4.12.7.ebuild 1959 BLAKE2B 4a4df5d441b8f38c5d3e30acf4fde7e983d92f86f5ebc50b00fc397e6b9e881660ba15a26c2522bdb8a301683e588805f60c4b9ee382b3715b017bbe235b8f49 SHA512 f4ca1e068c3b5082f94104bfd0ee30be240d7a139431b69599cf693fdfe1e998757c8324a28f47f7a58a0e97c5581bb1772eddd7f3372174a5e2b9ed571a4e8f
 MISC metadata.xml 318 BLAKE2B 62f33f86cd5bcb675e9ac02fef339514b88000be788a7037416bf6594e3f27bb07c5f7b49adbc39aa6aae4fdc7f076ebbb7f0fe897807a8e4a0b2252d5238546 SHA512 1098cd34add4d21c0c10aa42a539cec14c56b1835701b73346a57cac7ea3964b776b95d76cdffd6300577682e3a29976d9b65a0e2b8f984ee1bfb7601f2d7ef2
diff --git a/www-apps/nanoc-core/nanoc-core-4.12.7.ebuild b/www-apps/nanoc-core/nanoc-core-4.12.7.ebuild
new file mode 100644
index 000000000000..f3f122387474
--- /dev/null
+++ b/www-apps/nanoc-core/nanoc-core-4.12.7.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby27 ruby30"
+
+RUBY_FAKEGEM_EXTRADOC="NEWS.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="nanoc is a simple but very flexible static site generator written in Ruby"
+HOMEPAGE="https://nanoc.ws/"
+SRC_URI="https://github.com/nanoc/nanoc/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MIT"
+
+KEYWORDS="~amd64 ~riscv"
+SLOT="0"
+IUSE="${IUSE} minimal"
+
+DEPEND+="test? ( app-text/asciidoc app-text/highlight )"
+
+RUBY_S="nanoc-${PV}/nanoc-core"
+
+ruby_add_rdepend "
+	>=dev-ruby/concurrent-ruby-1.1:1
+	dev-ruby/ddmetrics:1
+	dev-ruby/ddplugin:1
+	=dev-ruby/hamster-3*
+	>=dev-ruby/json_schema-0.19:0
+	>=dev-ruby/memo_wise-1.5:1
+	dev-ruby/psych:0
+	dev-ruby/slow_enumerator_tools:1
+	>=dev-ruby/tty-platform-0.2:0
+	>=dev-ruby/zeitwerk-2.1:2
+"
+
+ruby_add_bdepend "test? (
+	dev-ruby/bundler
+	dev-ruby/rspec:3
+	dev-ruby/rspec-its
+	dev-ruby/fuubar
+	dev-ruby/minitest
+	dev-ruby/timecop
+	dev-ruby/tty-command
+	dev-ruby/yard
+	www-apps/nanoc-spec
+)
+"
+
+PATCHES=( "${FILESDIR}/${PN}-4.12.2-contracts.patch" )
+
+all_ruby_prepare() {
+	# Avoid unneeded development dependencies
+	sed -i -e '/simplecov/I s:^:#:' \
+		-e '/codecov/I s:^:#:' ../common/spec/spec_helper_head_core.rb || die
+	sed -i -e '/coverall/I s:^:#:' \
+		-e '/rubocop/ s:^:#:' Rakefile || die
+	sed -i -e '1i require "tmpdir"; require "pathname"' spec/spec_helper.rb || die
+
+	echo "-r ./spec/spec_helper.rb" > .rspec || die
+
+	sed -i -e "s:require_relative 'lib:require './lib:" ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Use useable tmp dir
+	sed -i -e 's:/tmp/whatever:'${T}'/whatever:' spec/nanoc/core/checksummer_spec.rb || die
+
+	# Avoid circular dependency on www-apps/nanoc
+	sed -i -e '/.all_outdated/,/^  end/ s:^:#:' spec/nanoc/core/feature_spec.rb || die
+	rm -f spec/nanoc/core_spec.rb || die
+}
+
+each_ruby_test() {
+	RUBYLIB="${S}/lib" ${RUBY} -S rake spec || die
+}
diff --git a/www-apps/nanoc/Manifest b/www-apps/nanoc/Manifest
index 7f6b706f4c28..e269e1b18f29 100644
--- a/www-apps/nanoc/Manifest
+++ b/www-apps/nanoc/Manifest
@@ -2,8 +2,10 @@ DIST nanoc-4.12.2.tar.gz 331400 BLAKE2B f7a22b05a4805f15a8e93601ae21bffdc19fe17c
 DIST nanoc-4.12.3.tar.gz 332692 BLAKE2B 8ae106366c66500ed06be841382bc1cc52c68ebc7ebec47a3f9dab278c7e17f886d0ce18c81ff73a83ec672353503155b447dfff5ba46f16bc2bfe891bb028a5 SHA512 737ce993c529643440d74e5072e2d63c2ce970d4d7637e7f225a79d3ac38907ced84928340d7bf5f11bcd02188b5cb1df0d4b03a8e000878ed924ab943db33a2
 DIST nanoc-4.12.5.tar.gz 333312 BLAKE2B bdc50ba2868313f7b427a8292c8614230e9dcf472c5290e8fff39917cd5cedad217acbc36ef8524254c9839d965d824a98c99f9effa1e8cfb549e387d69f1032 SHA512 2e533076f62605a701275fd7813b6dbe09c2530ad38fb86db3a5d999bccd8f5ac93cf684ac882f00d81bbe1ec8cce69d45ecef1488efe3caf22f6a6ffca300e2
 DIST nanoc-4.12.6.tar.gz 333932 BLAKE2B f5ff12ddd583c4a672c34a63b7f325a3ef6c18713f4e351482eb3c2a3dd5999b67ee0e1b7e8ab85899591824d8c47f19f3aa074790ae15f4616d589f762f2bb8 SHA512 343ec620d96ca086612c4babcadf33c4edcc39a02082f762568feaf226566c6d9b5441f53355ea03544b285e9a5ddc32aae0e67cc321b28336665d453f47b070
+DIST nanoc-4.12.7.tar.gz 333669 BLAKE2B cd222df8f68b2ead8bfb324079b2e46ca76bc427d50e97ffbcebffbd79135d6f4349a1e6922f0cb37f49b1c306ac3eb4f34f2b2c3569768b95041e8129f4e9a8 SHA512 1f5b2595f2d95b291bad30a40e8753d83c9bfa8468c6b119d0c213a385f4568fa87af5a69ea1d3487dc3331ba71ecf956dabd84b79a9e8cc01b569efc3b57140
 EBUILD nanoc-4.12.2.ebuild 2602 BLAKE2B 3d4ea73021b5fbff30c9ace8db0419a47be7017fd7770ea8e3596c1ff8408fabf45b5998bd3f86553a9d24393b75ffbc96363ed6981c80f2c0fd4bb8c7d68dd7 SHA512 55c25a24e2c0593cf8c18fcb574648cdf03e9f2470ab899b68dfaa4b5b3d36c3e7bbe526b43756863da5e90451129e7d55cd7b3dd69d40b5a4116cc71e648a14
 EBUILD nanoc-4.12.3.ebuild 2526 BLAKE2B 7d4e688c97a6128c88998e58cea369c2c477758abf1e14c46e181784789ba7aecee6e73f46eed152dad0b874193cc0f614d0ef037d12a82f14b062efd1ec10ea SHA512 01ef7a2360d5911ea712c5cb6ad037f322803669de85495c5bb18fbaad00f5b8957f6105b7e8a80d5b4705092bf1f3bf2ead1ce9c18dd1186fd14f74a8959a59
 EBUILD nanoc-4.12.5.ebuild 2534 BLAKE2B b050122de47295ece8340b901d0c5659af8d21fb8ca1c8c82e7177de75817ac0dbbae5b44531ce48719439e96e9b44442757961381464171102b071a95bfae42 SHA512 6254cd60fd6c6cdf4bc50e2f46540f7cd61d699f3f50012a0081320f1463899d9ce24765d1775238febdae83388a9e0198273b9c375ebd7a0658111880b556e1
 EBUILD nanoc-4.12.6.ebuild 2556 BLAKE2B a7fdfdc2dcf4363155c13a07cad0c1d2330d4847b209aa39f353eadf086321cc42e92abf2490ce2d95e31d2f39b757163a0119d04ba78a49ae87cecab09a6b95 SHA512 37d42b65c527a777c7877d730b1d84cbdd94d150f695863493d3f098624570236342744c727cc211ccebf3b06c604df76420ce852b38120e07aa5e481c090039
+EBUILD nanoc-4.12.7.ebuild 2549 BLAKE2B f911f259343b6ba211b8ee31d1e413b22f74035f3de3381e9848c371bd9f6e3824680bec2be814d6455ce9414115180ae8ca5f221ef3b373597643240165d596 SHA512 0fe78098357653d9458d81af5a7608646f7829fe55e708d1a90462b7cadff9fb70124d1e710ad52f5e2c19b892ccc74571c836db968bdb397d4e7d314392b677
 MISC metadata.xml 318 BLAKE2B 62f33f86cd5bcb675e9ac02fef339514b88000be788a7037416bf6594e3f27bb07c5f7b49adbc39aa6aae4fdc7f076ebbb7f0fe897807a8e4a0b2252d5238546 SHA512 1098cd34add4d21c0c10aa42a539cec14c56b1835701b73346a57cac7ea3964b776b95d76cdffd6300577682e3a29976d9b65a0e2b8f984ee1bfb7601f2d7ef2
diff --git a/www-apps/nanoc/nanoc-4.12.7.ebuild b/www-apps/nanoc/nanoc-4.12.7.ebuild
new file mode 100644
index 000000000000..32ef4db37598
--- /dev/null
+++ b/www-apps/nanoc/nanoc-4.12.7.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby27 ruby30"
+
+RUBY_FAKEGEM_EXTRADOC="NEWS.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="nanoc.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="nanoc is a simple but very flexible static site generator written in Ruby"
+HOMEPAGE="https://nanoc.ws/"
+SRC_URI="https://github.com/nanoc/nanoc/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MIT"
+
+KEYWORDS="~amd64"
+SLOT="0"
+IUSE="${IUSE} minimal"
+
+DEPEND+="test? ( app-text/asciidoc app-text/highlight )"
+
+RUBY_S="${P}/nanoc"
+
+ruby_add_rdepend "!minimal? (
+	dev-ruby/mime-types:*
+	dev-ruby/rack:*
+	www-servers/adsf
+)
+	>=dev-ruby/addressable-2.5
+	>=dev-ruby/colored-1.2:0
+	>=www-apps/nanoc-checking-1.0.2:1
+	~www-apps/nanoc-cli-${PV}
+	~www-apps/nanoc-core-${PV}
+	www-apps/nanoc-deploying:1
+	>=dev-ruby/parallel-1.12:1
+	>=dev-ruby/tty-command-0.8:0
+	>=dev-ruby/tty-which-0.4:0
+"
+
+ruby_add_bdepend "test? (
+	dev-ruby/rspec:3
+	dev-ruby/asciidoctor
+	dev-ruby/fuubar
+	dev-ruby/haml
+	dev-ruby/maruku
+	>=dev-ruby/mocha-0.13
+	dev-ruby/minitest
+	dev-ruby/mustache
+	dev-ruby/pry
+	dev-ruby/rdoc
+	>=dev-ruby/rouge-3.5.1:2
+	dev-ruby/rubypants
+	dev-ruby/systemu
+	dev-ruby/timecop
+	dev-ruby/vcr
+	dev-ruby/webmock
+	dev-ruby/yard
+)
+doc? (
+	dev-ruby/kramdown
+	dev-ruby/rdiscount
+	dev-ruby/yard
+)"
+
+all_ruby_prepare() {
+	# Avoid unneeded development dependencies
+	sed -i -e '/simplecov/I s:^:#:' \
+		-e '/codecov/I s:^:#:' test/helper.rb ../common/spec/spec_helper_head_core.rb || die
+	sed -i -e '/coverall/I s:^:#:' \
+		-e '/rubocop/ s:^:#:' Rakefile || die
+
+	echo "-r ./spec/spec_helper.rb" > .rspec || die
+
+	# Avoid basepath issues when generating gemspec
+	sed -i -e "s:require_relative ':require './:" ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Avoid tests requiring a network connection or make assumptions
+	# about the local network environment.
+	rm -f test/checking/checks/test_{css,html}.rb spec/nanoc/cli/commands/view_spec.rb || die
+
+	# Avoid tests for unpackaged dependencies
+	rm spec/nanoc/filters/less_spec.rb \
+	   test/filters/test_{markaby,rainpress}.rb || die
+
+	# Avoid non-fatal failing tests due to specifics in the environment
+	#sed -i -e '145askip "gentoo"' spec/nanoc/cli/error_handler_spec.rb || die
+	#sed -i -e '/watches with --watch/askip "gentoo"' spec/nanoc/cli/commands/compile_spec.rb || die
+	sed -i -e '124askip "ordering issues"' -e '168askip "ordering issues"' spec/nanoc/data_sources/filesystem_spec.rb || die
+}
+
+each_ruby_test() {
+	RUBYLIB="${S}/lib" ${RUBY} -S rake spec test_all || die
+}
diff --git a/xfce-base/Manifest.gz b/xfce-base/Manifest.gz
index befb55297274..769cd91d44f9 100644
--- a/xfce-base/Manifest.gz
+++ b/xfce-base/Manifest.gz
diff --git a/xfce-base/xfce4-panel/Manifest b/xfce-base/xfce4-panel/Manifest
index 2af481d2673a..092f64c27bba 100644
--- a/xfce-base/xfce4-panel/Manifest
+++ b/xfce-base/xfce4-panel/Manifest
@@ -1,5 +1,7 @@
 DIST xfce4-panel-4.16.4.tar.bz2 1383630 BLAKE2B e370fc286f5b035671e059e81a5c890842949c60a8aa1ae4cb06ded7f1e538d90bf633efd7e3e2b7642eb1b490a48eda3cabd1a967930cb63cd423fb5b807e22 SHA512 a1ad5a528968c4b1a5d2fb1537f7774aeeb525d7cb2f77e261b187b94e9de22f018bbd47d462ce4ad09b360126548d5848e46643df40549f9f8a3c44a4a14564
 DIST xfce4-panel-4.17.1.tar.bz2 1400182 BLAKE2B 02dc05aa6abf7a294c90aae2bfc9cd65a2ecadc78d99e7d530a96941a671b789d21b68295c34b8395e8215bacc209a3b262b7db1d44d30a1006033c73747d3bb SHA512 0070c5af1cc708ce808edc7a77171254cbf38d2e6d518d62a3eaa28223793a32bb9ad1b098a6a9c6f6f42c321ec007eac6ffd247ec0ca51a5045bf819e1471cc
+DIST xfce4-panel-4.17.2.tar.bz2 1408821 BLAKE2B db607dc1d35e746608ffe1484f2484589ae81d5d58387c8ae8c9fde9d9fdf0747f6746838290dcf1f6c9f6d1bb3efc130ec14445e6d48ac014bc114afe001f71 SHA512 a1d34d7ecdb196ba7095e613010e576daa809f0a94d48546a27731dc617a26318e7cc72204a26d9f788e744498ba58bc0f2f374260aca9bd2ad697ceddf36bbd
 EBUILD xfce4-panel-4.16.4.ebuild 1505 BLAKE2B 53dccf21ec9f185be56fac924ef8c2746728f154eb93535d4a91bf70a07929ffc6998e0f3765c472a2e2d36d5f8fd981a565ed9837909776ad1e30cb923eefba SHA512 cc50480cd4b67dc69e8b7a84f7a4710c53b2dac803b38130317fa732e0cfc06db7d0a50802ded311768a99c7d67271baa0a33dc09446a9d513be820b3368d764
 EBUILD xfce4-panel-4.17.1.ebuild 1514 BLAKE2B 8f337f1f973ecb11069d36664168905a2ff30e9ed60bcc533220ea0eb6db4aafa382ba24205972a47f307a30f766c4356a0628c9be73f63423f35209b8f76adc SHA512 dc144ea24018d779112cdfdae2bbd917bf46fa92cde8f5f481cf75f37e105b7da2c2b1129fa75ea8335cf9c1d317f0fa317526cb856ce8a9eafef8edbee9eb7a
+EBUILD xfce4-panel-4.17.2.ebuild 1514 BLAKE2B 43335a4a947059c056c68f26b87ad94fa8e6a5220ba8d0d41cb047a082688259c09b4309bdce07f1824b5d23f891019ee6d738c390720994e0337656cc7e8072 SHA512 bfc75e2dd5b868a880d7a859bf3e66f5e2f2595e09258b8f06f8aad5d2509f88b2ae50cb0ef843d7eff3a8f8219daa9fdbd2f4638a5ad4b94bf3655f4f6397b6
 MISC metadata.xml 377 BLAKE2B a9ab246bf0acb1731905d6f7aaa6d558204ca06138e0f531b76570f1477353a636b504ccab11ed861044faa5d02fefa43c5cc08f8d6c742851f1e8976e08f3d6 SHA512 9269670fb22fc1179cbc6f4a3f7f160bd1164ab470f6bbfa4875d85d7c0fb29ac7ae05d46daaaba097a418890961e568ce249e60329ed0325ba3f5dc976946f8
diff --git a/xfce-base/xfce4-panel/xfce4-panel-4.17.2.ebuild b/xfce-base/xfce4-panel/xfce4-panel-4.17.2.ebuild
new file mode 100644
index 000000000000..1779f20fe84f
--- /dev/null
+++ b/xfce-base/xfce4-panel/xfce4-panel-4.17.2.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit vala xdg-utils
+
+DESCRIPTION="Panel for the Xfce desktop environment"
+HOMEPAGE="https://www.xfce.org/projects/"
+SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="+dbusmenu introspection vala"
+REQUIRED_USE="vala? ( introspection )"
+
+RDEPEND="
+	>=dev-libs/glib-2.66
+	>=x11-libs/cairo-1
+	>=x11-libs/gtk+-3.22:3[introspection?]
+	x11-libs/libX11
+	x11-libs/libwnck:3
+	>=xfce-base/exo-0.11.2:=
+	>=xfce-base/garcon-4.17.0:=
+	>=xfce-base/libxfce4ui-4.17.1:=
+	>=xfce-base/libxfce4util-4.17.2:=[introspection?,vala?]
+	>=xfce-base/xfconf-4.13:=
+	dbusmenu? ( >=dev-libs/libdbusmenu-16.04.0[gtk3] )
+	introspection? ( dev-libs/gobject-introspection:= )
+"
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	vala? ( $(vala_depend) )
+	dev-lang/perl
+	dev-util/gdbus-codegen
+	dev-util/gtk-doc-am
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local myconf=(
+		$(use_enable introspection)
+		$(use_enable dbusmenu dbusmenu-gtk3)
+		$(use_enable vala)
+	)
+
+	use vala && vala_setup
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}