gentoo auto-resync : 10:09:2022 - 10:42:05

author: V3n3RiX <venerix@koprulu.sector> 2022-09-10 10:42:05 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2022-09-10 10:42:05 +0100
commit: 946859e0e36904cffb3e0ccbccb6b7b1347c1cc8 (patch)
tree: 0acec77e64f765c013ceda868659a8e125e429df
parent: b9baffd9af9383cc886b1583814fe15163017d80 (diff)
212 files changed, 2198 insertions, 1827 deletions
diff --git a/Manifest b/Manifest
index fc15e31cae3e..0a741a70b94c 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29610 BLAKE2B 6549f8edfbc6e3b04491d9239e5b85ee22e842c5f33ea102ece7039a7efccaba85c6176481b32f2422ede7598d81b1039ce5fe3497db51e67c136be19fd8195a SHA512 a1b835b88b41b45a277b2dfb803ad177edbd9d06ecbfcb64e94fda17fd9cd7bf6926934d9a03d6f8ae323e750242afbbde414195e22d99c5dce3ecb94d2116e9
-TIMESTAMP 2022-09-10T02:40:09Z
+MANIFEST Manifest.files.gz 29613 BLAKE2B b73e0e8fc1601955138f8e0d4b3e6c93a01d1335e227c13ed17acd53d96a9718452f2f88e36204bd0013d5c11725b3dbbf79c7a777da5a307d09e4a2a0aa4636 SHA512 f6eefcb0cfece10f39c0165f5f51aefd34f64d474b1d393f3dde70f854d928b2a07804344ce7ae88900ddfb605f1df4cc182e173bb49d72a962f9a00a2279435
+TIMESTAMP 2022-09-10T08:40:05Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmMb+QlfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmMcTWVfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAn8g/8CnikbZVo6fZIn3vbGAFhyqsiZYbd+rKTK+uc3XyLgISUg3/gw/SAQJsY
-GWv9qBTLLqgKYiMpd6IPwIcPJC1Ru3GbgiWSiVOs5l7BN53r5tuF+Y8XEHi/7bta
-Hq2RsmQYhx3QdnCi5JLrdwiWoN9VVQXdf2sGqDuqRIy6KFBGDpfA5ajDIuGD/K21
-fzbJWzW1zAegjezK4XqL3l5prrFZyTXVarPgvdQUxtB+5O17EHf5SZB2DPcsAXRb
-HGGRRXEsfqE+k5/3GhSlESHxlMiMtD5gMHPxuc3ZFJd8ofsczFQo55WndP/dyzoi
-CH24R7Zg6AFepev7eKlAanOZmN6s86r8qkOw0cHJZvBuOp1kj/DRbfdSNC0f1Cdt
-hBJdV9nCl7mlrasHSVSXJrPIJTAgENVCHpwaseE7poRrWp68e6mvlTP8kazVvGQb
-ZnTC8XLN6elBs1hyRbfbxCX3ZlhUH/IHK1qHmrHkDeyR8JzaXX8EXQFnSrx673Wr
-u7UEQtpfBhUS8Xt4yjShhuiaVblZzSmFrcsnhmXog3yB0x7QTivvLCiSks19Dlrk
-mVGUkbac0OV0+YoZbLoRJYQELHVDz4rfALWhTpd4VtS6vdYifDDqLmjQ90n3Wbcx
-KR+bfISuJsP+m9rg5EfVv1kZn9weGFgdSe1Ukput0T4McjDeWfI=
-=tevK
+klDX3Q/8CMAF0dpIg3GLp36Nz6JRyqW5NxZMo+IEqQAIKHntinz+zxj92D8Sku6P
+ym1teQKDpGPKgHw5NLBOVuGn0xe49GvMDqw8wflXtKMOxl4i0kcIlkSiAnMLvn5R
+44sQ9MqEx9Q4uDp4tEaFEYrRmCAR7bzEMmZGrZRIzsocJcUiQIvlKxMSNHw3LjZ/
+kXS8zhfx0CWm3MVqxEOC1ZpdEG0V5/4idCAhAxxNqthQ5t1dKH2gkBjO5n1BBEnE
+afEzZ2EmMqyOAr8DMFVOi8iUQ8AEXdETOe+SR7Dzh0eivVcFiSk/F7gfQNqkeCNx
+XWYm2K3kulJXmWjZO/bT5VaFqOZSIql6wUjdzkUdf2y5GrPKE7XVuGaGye+IEPqs
+y3vSJVLc+Of87kWbyL2NLAe9D0eTmYHh2XxYDeychXH5Srufh2fP6L5DwlcnGq5P
+mixQPuiSk4vZHfT1jWQJFEgaQrS07SFg7h+Cgw1suKV4Zz3UV8twOIPkG3cjDuNu
+Qsl2G6tRK5OPaFg2mQ+9CmZ+x4MsvmziH2M67fg4ZwVwSz8qVpiWWdkZsCXIW5Zp
+EycOsyDfNsO0cwcDwPnhXdA5puOfaK/vHKvwf/54cL7Fv+TUhB1l/vBLpEPN6iw5
+islyBCE5vVFzEyYD8eDE2TPEWDSg3WBP5ec/QDls1GlDmpE35XI=
+=vtUs
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index ab70092508d8..1c8d03f78460 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index b8dede2228c5..72bdbe9db999 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index c487118fa29b..3de26aed8bb5 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -5,6 +5,7 @@ DIST aws-cli-1.25.65.gh.tar.gz 2263933 BLAKE2B 5c516e6a95a333073cf7200eff476e625
 DIST aws-cli-1.25.66.gh.tar.gz 2264111 BLAKE2B 7aaa42d654a873fea44fe64e0805c240700830c653ecfbfab4bf8838ba2aca5ec9508241e9fd9329b546d098eb4c68f886dac1afc31e12cea4779cc35ec091fb SHA512 dcddfebf2051fad23208c2617596c6aa4462e940056f5963526983c15b6c33bb118a769f139a8c8297d413e9a6ae129d7e14a6ffa56aa595dcde0128ea10d5c2
 DIST aws-cli-1.25.67.gh.tar.gz 2264702 BLAKE2B 88bdeab8fe85d17d7aa78ff00125e1c3e1d098093d68b7e7213896d101bff443cb2ed23b8ed9245eb3727b41abd34a8047616eee777f802d52b3a26594e214c5 SHA512 a01b333d36160a43c1f28d01600e1f1d095e4713500bac3b13fc336bf790943251fefb72dc7bc177eaf4265b794658d62ff72ee00abd348c1265d04b58564136
 DIST aws-cli-1.25.70.gh.tar.gz 2267239 BLAKE2B e20606c8b3df77698f6ad67eb28a63d8ddb5750782a5ca5a690d36bf5ec5d171aebda115a3c828fbae948037d71e11ead73e163fdaa55e81614ea245a51f54e5 SHA512 7984a56f4e224389822ebb6aa56927cc669630ba8fbebbb59178406ce1dcbb298ef0f83353c02ab37eaf4e0bfcd6b86363712d3f711540993044fa6517b84364
+DIST aws-cli-1.25.71.gh.tar.gz 2267936 BLAKE2B a44cc3995335d2556e919879127ebac77c274d6a1f55a390acb85d59d1ee3850826a9d0cc1b7d4e86cb7a5abf9ebac00a1a62aa0d0846a06c04166fa40b18abf SHA512 8c0f235a8f16404ca770ff8c157b52981bd808c25c045e39f7cca6b35d992caa921ac84f82309323b1b742ff783296a1d9ca51cb154704270940ce8a900c09b0
 EBUILD awscli-1.25.56.ebuild 1841 BLAKE2B 8e87e521eb4464071ec89abd904be4b8056e6be8ed6a4b9aee005c952d5ef4da7e0468e0827e99cf1e460068fa9cff9b974cce96c0e0b87798e5a15f602ec600 SHA512 244149f5d56a3d1f5b4e8fdc3c2a15a4c6357998237cb5a8dc39e66af7aac968d61ba7a5873a10548af57bd08058b18ef3a97b335b42270fa896ecf7bc502f79
 EBUILD awscli-1.25.61.ebuild 1843 BLAKE2B 66c1d54d4e61960ab8a897b3b33818dd6266aa1b0bdd52126942546e1eff2a234bbb2f884a21643fac176af1bd26bf068211f788079dcce78177a5dddc6d05f6 SHA512 fac1bd2328e655695a83ea34d19371c2f632386e4a1a12b0ccb05ab3521b932e28bf4deac0aec9c83bbbec17338d2077e841bd0f93315a0c97286ebe21b3d020
 EBUILD awscli-1.25.64.ebuild 1858 BLAKE2B 46c882fef4c264e87ed8b0f6eb7ca14d5d352bbe14173f73f2705a73ad8665ce0e42c83e043010da16267a444c7ba7b92198867698407f2eea244693c41ed142 SHA512 805599b5cc4f26ff5eb666d0ca1cb4dd27afcfe8ba3b29d6ce54da89347752c4dbbed39f7b6ab5c7f8f7aed8f145eafa62293431f02ca55209fc603a87b19272
@@ -12,4 +13,5 @@ EBUILD awscli-1.25.65.ebuild 1858 BLAKE2B 46c882fef4c264e87ed8b0f6eb7ca14d5d352b
 EBUILD awscli-1.25.66.ebuild 1858 BLAKE2B 46c882fef4c264e87ed8b0f6eb7ca14d5d352bbe14173f73f2705a73ad8665ce0e42c83e043010da16267a444c7ba7b92198867698407f2eea244693c41ed142 SHA512 805599b5cc4f26ff5eb666d0ca1cb4dd27afcfe8ba3b29d6ce54da89347752c4dbbed39f7b6ab5c7f8f7aed8f145eafa62293431f02ca55209fc603a87b19272
 EBUILD awscli-1.25.67.ebuild 1858 BLAKE2B 46c882fef4c264e87ed8b0f6eb7ca14d5d352bbe14173f73f2705a73ad8665ce0e42c83e043010da16267a444c7ba7b92198867698407f2eea244693c41ed142 SHA512 805599b5cc4f26ff5eb666d0ca1cb4dd27afcfe8ba3b29d6ce54da89347752c4dbbed39f7b6ab5c7f8f7aed8f145eafa62293431f02ca55209fc603a87b19272
 EBUILD awscli-1.25.70.ebuild 1858 BLAKE2B 46c882fef4c264e87ed8b0f6eb7ca14d5d352bbe14173f73f2705a73ad8665ce0e42c83e043010da16267a444c7ba7b92198867698407f2eea244693c41ed142 SHA512 805599b5cc4f26ff5eb666d0ca1cb4dd27afcfe8ba3b29d6ce54da89347752c4dbbed39f7b6ab5c7f8f7aed8f145eafa62293431f02ca55209fc603a87b19272
+EBUILD awscli-1.25.71.ebuild 1858 BLAKE2B 46c882fef4c264e87ed8b0f6eb7ca14d5d352bbe14173f73f2705a73ad8665ce0e42c83e043010da16267a444c7ba7b92198867698407f2eea244693c41ed142 SHA512 805599b5cc4f26ff5eb666d0ca1cb4dd27afcfe8ba3b29d6ce54da89347752c4dbbed39f7b6ab5c7f8f7aed8f145eafa62293431f02ca55209fc603a87b19272
 MISC metadata.xml 334 BLAKE2B 84c9f50e6c0d015aad36a7f625cddf90cf1137a8c2d445cc641cd4890d64261187c10fde59ee1a6c19b98cfdb6ff534c66ae7a7a48a00ec62d6984c9a1891750 SHA512 a845de531df2cd75abf23cdbfa613e586855b95ac4e96566ef193708d7ecf2ec7f7db72fd31b8af0ac4ccd57e51da9c6d129d426bfdc6c4feb57d7df8647f160
diff --git a/app-admin/awscli/awscli-1.25.71.ebuild b/app-admin/awscli/awscli-1.25.71.ebuild
new file mode 100644
index 000000000000..3d5bba5c1200
--- /dev/null
+++ b/app-admin/awscli/awscli-1.25.71.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit bash-completion-r1 distutils-r1 multiprocessing
+
+MY_P=aws-cli-${PV}
+DESCRIPTION="Universal Command Line Environment for AWS"
+HOMEPAGE="
+	https://github.com/aws/aws-cli/
+	https://pypi.org/project/awscli/
+"
+SRC_URI="
+	https://github.com/aws/aws-cli/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+
+# botocore is x.(y+2).(z-1)
+BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(( $(ver_cut 3-) - 1 ))"
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	dev-python/colorama[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/rsa[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	!app-admin/awscli-bin
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-forked[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+	# strip overzealous upper bounds on requirements
+	sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# integration tests require AWS credentials and Internet access
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)" --forked
+}
+
+python_install_all() {
+	newbashcomp bin/aws_bash_completer aws
+
+	insinto /usr/share/zsh/site-functions
+	newins bin/aws_zsh_completer.sh _aws
+
+	distutils-r1_python_install_all
+
+	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
+}
diff --git a/app-containers/Manifest.gz b/app-containers/Manifest.gz
index f27b75fb21a8..0a2dfe9fe09d 100644
--- a/app-containers/Manifest.gz
+++ b/app-containers/Manifest.gz
diff --git a/app-containers/lxc/Manifest b/app-containers/lxc/Manifest
index ce170628ac47..60096b3a3e30 100644
--- a/app-containers/lxc/Manifest
+++ b/app-containers/lxc/Manifest
@@ -1,14 +1,9 @@
-AUX lxc-2.0.5-omit-sysconfig.patch 259 BLAKE2B 977e151fbb8c9d98e89aaa5ee0426e64ab4286b4440af1582086a0ced8c6568efb470ccf68786da6ea52c82d1f4e81feac45bec411febc04fc31d108f05ccde2 SHA512 0aed9aca687accc6df79e97f48ab333043256e8ae68c8643f2b2452cc8013191238867d64ec71f7d399c59a43d3ba698b35d965090c5cb149b4f41302432e6e7
 AUX lxc-monitord.service.5.0.0 219 BLAKE2B 5be0ec2b7bd19d661dac97e5d067f0e6d1e297c22c4a642a0b2258003f632263e25349c6d190438f2886064f3202018a452a481e0fb9c9614a5eec5ffa306e39 SHA512 ab63db7a5e0470ac1001e7b05fcbcde3adbe422bdd1030c9e55cd3b1e69855efcf141174f48102ab304035cc4b3497bc569b0f7bc4b231851880872258b28e95
 AUX lxc-net.service.5.0.0 304 BLAKE2B bd7125d2f1401d249946f89e0f58966bc426adc09d5759564174d6a666797d687eb85e4b235ff761e1c1b9d87d133cd28fb12f27092da1b0bff2633d4f4fd704 SHA512 06bf3d233cc152d1b67f6c687c9b31bdd5f60e8664e6bcf4234e878cbf840437b82c1e1cf21cc4847f56b57d3ae664f9557264da4d3b3603bef8945a86658be9
 AUX lxc.initd.8 3669 BLAKE2B 50d41e0923ba26b9653ca3b5b559dd0905e61ec81969e709650fe7f1b26a4dcdc17158b7e449d666e2103047d9f196e53df8beca15fffd529fa8e743de97bd82 SHA512 1182b53a65399746f6d6bced0df5c1fde09c1ede4a28bfe95b5ed0bbd969d6f6423f63021d4b6f1dc62c7b2703f6963c03d881291650bdf21cfcf8432586c1b4
 AUX lxc.service-5.0.0 527 BLAKE2B 44d1fca919615c1acb672baa7b77bd43680975782683addb4b918b763f14923c070567cec18659892d7629dff2ea717258ee339d00ce9f8b12fe29349a85b645 SHA512 a56e44ba983d1c9ec7e0e2080e46537fe11c0e92422f1bb46476434d3ebe1a8ac4af7ae1c574bde57a56709541a611eed1123f9a21d9f54aceeaff935da9cc0e
-AUX lxc_at.service.4.0.0 284 BLAKE2B 1adc76b9861f2499b7b703f7076782a258f9b21a3d1e32b69334f753faca9ecd8c6fb2a03baf04698e765f079e73ee683434d8c7c6d3b3082427a6af74ab33b1 SHA512 4c2f9846ca60bb78df7e652309900c0e788b45d569f268a9e5b98842518542b35fce253e2aedeb0eded3d37274390988ef887b01d1d37859ccddf6225286b4bb
 AUX lxc_at.service.5.0.0 395 BLAKE2B b4a329964041a9b3017df80aedb73f296d60e0b78097c72e52b921de939246a45d07591535d3971458cee38bf4ddf84021af3f325bffac6db9ba7c4c78a48a5b SHA512 d896c2eb889b83a77041fcd51604bea11db65b8b494c9c063a72ed182006577ed49e2e2c0842353de4676b3fc1246508e5b7c669d797929818cccf485282d85c
-DIST lxc-4.0.12.tar.gz 1565070 BLAKE2B 819b5140b641dbc1ed6cf5f2840bb0ee6d3ab8c687f4f8064e42d347113bdf50fcbb653a6fb26598db0daab0c83ad88fe0d27fd2842fac9d7f5fef73656d7976 SHA512 04437d9c891cd3a22f756c42f05e97398772587175d65aff9d394f0f3e810efc5c1fe7077c39573de3ec259e0605bc2a7ea51093613b2cef908372ae338df19d
-DIST lxc-4.0.12.tar.gz.asc 833 BLAKE2B 2fca60b5ac267a893f70875ccdbe39db6b98b5fe51fe396692449e310b6e680e7b142380e193f5d8299f18e796ed2fd0e08cd186859069877fcca6bc26e44717 SHA512 4f2912879e6f3bf5fdbebb902cf16ca6b766b5720b817c4b4996e62098a1d282327d330ffd9768d45d69aeddb50184dc8485b0ef75b046449ce4c544cdc43c9b
 DIST lxc-5.0.1.tar.gz 973206 BLAKE2B 6d5cb1a03eb2612d0f8cb59783a64ec42bedd560cacfebf76383d9599dfc153e381f0e584a1c8c9a0b5b18a46bfb01863649dc5a019546e9ded6079b5ec69ddd SHA512 c87563b556aec83c93a7c62932217791e92da950cc76983f0d5e1d603fe1ae298a63fb5e88ec9ef5173846d579babb5acd0836679b915de00844bb9edf9c8d7e
 DIST lxc-5.0.1.tar.gz.asc 833 BLAKE2B f85df5fc5bd88a738042f622ee4191b99e0a8e07db7ceb5824d634bc451f4bf93c8b64d1c72d4899f639ad30bbc9ee82be292dbe310218fa20566ee00f9bb752 SHA512 09de4e74d174b54cf9240ca4ef4793b9f63355c65f610abffb40e6dc2dc9130380761a50725e4dcee39b421e4b51c874d141fe22d5ecfd7ad3af35f7ebec09a0
-EBUILD lxc-4.0.12.ebuild 5184 BLAKE2B 1c3a59f4bb1b43c66acae7de91014ea3aea152d3595e2e6431f30e56d99a2316b2c1d73bcb975371f84273b88282c22eda1691f798a4d3a373a3873596bfdb74 SHA512 a5435cfc04ead876fe7c3e7931307ebdd18057849e7cfd9e0b18073a5aff73e03e4f3b9f7cbf4efe608f4ba1502dde59195ebde8a6591c566cb2ac16ae1ba456
 EBUILD lxc-5.0.1.ebuild 4748 BLAKE2B 1fa18490e2fc1284ce509a04f5ca8c81802db2a3b479decc626470e775530e8b37a743133c1a8b8f82a25ec7f18c2c313bad43bf6fe2e7732c5bd3f608c81f53 SHA512 4aeb0b7179039fcb20198086cfcbdfa07bd20b8776b373c4c50baf1039b70f2c2004b5ce1471189d19d286a823be140ef3941c4b33a55f3de40346ae16a21686
 MISC metadata.xml 713 BLAKE2B 982d13dbe2adffcdb473804981effa8eabc89ca95dc2f39ae6ebdbdce0f786311333c8f9cbfe2105faf55dcbaf7a63a09b46e6b7c7987ba629f5e87de24a348c SHA512 4c9d018afe1967708c18747f504b98487f110b6a021cd97c94693fa4b39d892b148ad19ae64399396b34502ed6f598d7515418b69d0b22031776366a9f172f3b
diff --git a/app-containers/lxc/files/lxc-2.0.5-omit-sysconfig.patch b/app-containers/lxc/files/lxc-2.0.5-omit-sysconfig.patch
deleted file mode 100644
index 3ec81356499e..000000000000
--- a/app-containers/lxc/files/lxc-2.0.5-omit-sysconfig.patch
+++ /dev/null
@@ -1,5 +0,0 @@
---- /config/Makefile.am.orig	2016-05-19 02:56:11.891113982 +0000
-+++ /config/Makefile.am	2016-05-19 02:56:32.596115476 +0000
-@@ -1 +1 @@
--SUBDIRS = apparmor bash etc init selinux templates yum sysconfig
-+SUBDIRS = apparmor bash etc init selinux templates yum
diff --git a/app-containers/lxc/files/lxc_at.service.4.0.0 b/app-containers/lxc/files/lxc_at.service.4.0.0
deleted file mode 100644
index b354bc53e080..000000000000
--- a/app-containers/lxc/files/lxc_at.service.4.0.0
+++ /dev/null
@@ -1,15 +0,0 @@
-[Unit]
-Description=Linux Container %i
-After=network.target
-Wants=lxcfs.service
-
-[Service]
-Type=forking
-ExecStart=/usr/bin/lxc-start -d -n %i -p /run/lxc-%i.pid
-PIDFile=/run/lxc-%i.pid
-ExecStop=/usr/bin/lxc-stop -n %i
-Delegate=true
-TasksMax=32768
-
-[Install]
-WantedBy=multi-user.target
diff --git a/app-containers/lxc/lxc-4.0.12.ebuild b/app-containers/lxc/lxc-4.0.12.ebuild
deleted file mode 100644
index 961d8c51761d..000000000000
--- a/app-containers/lxc/lxc-4.0.12.ebuild
+++ /dev/null
@@ -1,184 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools bash-completion-r1 linux-info flag-o-matic optfeature pam readme.gentoo-r1 systemd verify-sig
-
-DESCRIPTION="A userspace interface for the Linux kernel containment features"
-HOMEPAGE="https://linuxcontainers.org/ https://github.com/lxc/lxc"
-SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz
-	verify-sig? ( https://linuxcontainers.org/downloads/lxc/${P}.tar.gz.asc )"
-
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
-
-LICENSE="GPL-2 LGPL-2.1 LGPL-3"
-SLOT="0"
-IUSE="apparmor +caps doc io-uring man pam seccomp selinux +ssl +tools verify-sig"
-
-RDEPEND="acct-group/lxc
-	acct-user/lxc
-	app-misc/pax-utils
-	sys-apps/util-linux
-	sys-libs/libcap
-	virtual/awk
-	caps? ( sys-libs/libcap )
-	io-uring? ( >=sys-libs/liburing-2:= )
-	pam? ( sys-libs/pam )
-	seccomp? ( sys-libs/libseccomp )
-	selinux? ( sys-libs/libselinux )
-	ssl? (
-		dev-libs/openssl:0=
-	)"
-DEPEND="${RDEPEND}
-	>=sys-kernel/linux-headers-4
-	apparmor? ( sys-apps/apparmor )"
-BDEPEND="virtual/pkgconfig
-	doc? ( app-doc/doxygen[dot] )
-	man? ( app-text/docbook-sgml-utils )
-	verify-sig? ( sec-keys/openpgp-keys-linuxcontainers )"
-
-CONFIG_CHECK="~!NETPRIO_CGROUP
-	~CGROUPS
-	~CGROUP_CPUACCT
-	~CGROUP_DEVICE
-	~CGROUP_FREEZER
-
-	~CGROUP_SCHED
-	~CPUSETS
-	~IPC_NS
-	~MACVLAN
-
-	~MEMCG
-	~NAMESPACES
-	~NET_NS
-	~PID_NS
-
-	~POSIX_MQUEUE
-	~USER_NS
-	~UTS_NS
-	~VETH"
-
-ERROR_CGROUP_FREEZER="CONFIG_CGROUP_FREEZER: needed to freeze containers"
-ERROR_MACVLAN="CONFIG_MACVLAN: needed for internal (inter-container) networking"
-ERROR_MEMCG="CONFIG_MEMCG: needed for memory resource control in containers"
-ERROR_NET_NS="CONFIG_NET_NS: needed for unshared network"
-ERROR_POSIX_MQUEUE="CONFIG_POSIX_MQUEUE: needed for lxc-execute command"
-ERROR_UTS_NS="CONFIG_UTS_NS: needed to unshare hostnames and uname info"
-ERROR_VETH="CONFIG_VETH: needed for internal (host-to-container) networking"
-
-DOCS=( AUTHORS CONTRIBUTING MAINTAINERS NEWS README doc/FAQ.txt )
-
-pkg_setup() {
-	linux-info_pkg_setup
-}
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.0.5-omit-sysconfig.patch # bug 558854
-)
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/linuxcontainers.asc
-
-src_prepare() {
-	default
-
-	export bashcompdir="/etc/bash_completion.d"
-	eautoreconf
-}
-
-src_configure() {
-	append-flags -fno-strict-aliasing
-
-	local myeconfargs=(
-		--bindir=/usr/bin
-		--localstatedir=/var
-		--sbindir=/usr/bin
-
-		--with-config-path=/var/lib/lxc
-		--with-distro=gentoo
-		--with-init-script=systemd
-		--with-rootfs-path=/var/lib/lxc/rootfs
-		--with-runtime-path=/run
-		--with-systemdsystemunitdir=$(systemd_get_systemunitdir)
-
-		--disable-coverity-build
-		--disable-dlog
-		--disable-fuzzers
-		--disable-mutex-debugging
-		--disable-no-undefined
-		--disable-rpath
-		--disable-sanitizers
-		--disable-tests
-		--disable-werror
-
-		--enable-bash
-		--enable-commands
-		--enable-memfd-rexec
-		--enable-thread-safety
-
-		$(use_enable apparmor)
-		$(use_enable caps capabilities)
-		$(use_enable doc api-docs)
-		$(use_enable doc examples)
-		$(use_enable io-uring liburing)
-		$(use_enable man doc)
-		$(use_enable pam)
-		$(use_enable seccomp)
-		$(use_enable selinux)
-		$(use_enable ssl openssl)
-		$(use_enable tools)
-
-		$(use_with pam pamdir $(getpam_mod_dir))
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	# The main bash-completion file will collide with lxd, need to relocate and update symlinks.
-	mkdir -p "${ED}"/$(get_bashcompdir) || die "Failed to create bashcompdir."
-	mv "${ED}"/etc/bash_completion.d/lxc "${ED}"/$(get_bashcompdir)/lxc-start || die "Failed to relocate lxc bash-completion file."
-	rm -r "${ED}"/etc/bash_completion.d || die "Failed to remove wrong bash_completion.d content."
-
-	if use tools; then
-		bashcomp_alias lxc-start lxc-{attach,cgroup,copy,console,create,destroy,device,execute,freeze,info,monitor,snapshot,stop,unfreeze,usernsexec,wait}
-	else
-		bashcomp_alias lxc-start lxc-usernsexec
-	fi
-
-	keepdir /etc/lxc /var/lib/lxc/rootfs /var/log/lxc
-	rmdir "${D}"/var/cache/lxc "${D}"/var/cache || die "rmdir failed"
-
-	find "${D}" -name '*.la' -delete -o -name '*.a' -delete || die
-
-	# Gentoo-specific additions!
-	newinitd "${FILESDIR}/lxc.initd.8" lxc
-
-	# Remember to compare our systemd unit file with the upstream one
-	# config/init/systemd/lxc.service.in
-	systemd_newunit "${FILESDIR}"/lxc_at.service.4.0.0 "lxc@.service"
-
-	DOC_CONTENTS="
-		For openrc, there is an init script provided with the package.
-		You should only need to symlink /etc/init.d/lxc to
-		/etc/init.d/lxc.configname to start the container defined in
-		/etc/lxc/configname.conf.
-
-		Correspondingly, for systemd a service file lxc@.service is installed.
-		Enable and start lxc@configname in order to start the container defined
-		in /etc/lxc/configname.conf."
-	DISABLE_AUTOFORMATTING=true
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-
-	elog "Please run 'lxc-checkconfig' to see optional kernel features."
-	elog
-	optfeature "automatic template scripts" app-containers/lxc-templates
-	optfeature "Debian-based distribution container image support" dev-util/debootstrap
-	optfeature "snapshot & restore functionality" sys-process/criu
-}
diff --git a/app-doc/Manifest.gz b/app-doc/Manifest.gz
index bbe617a90169..1a9a5cc2a814 100644
--- a/app-doc/Manifest.gz
+++ b/app-doc/Manifest.gz
diff --git a/app-doc/halibut/Manifest b/app-doc/halibut/Manifest
index 88808cd0031c..3d1dda962651 100644
--- a/app-doc/halibut/Manifest
+++ b/app-doc/halibut/Manifest
@@ -1,3 +1,3 @@
 DIST halibut-1.3.tar.gz 995916 BLAKE2B 78a4409ff1f787134f7cd4eb307e77c81865a2591b55b359b0ef7a45b303cd361f85d344972714dfe8b3e823345de715d99ea542bf3cdf63d6d92548d027c27b SHA512 872f0cdb398002843d7e1b19f6eaf80ff848ce5ffee8653fa88da63c57e89efcbfaadc09b476280d25d38136f7d8af286fa98b9b36598515e0eb50f1945ee34a
-EBUILD halibut-1.3.ebuild 413 BLAKE2B 6cde425a7161550a4e8db0ff7edb0b6e3e144897ca385d9f476f12e4f17b7a8301428f5e47ac5046d3afa4840af106a9be4b2b6d1aa46b904b66dec08b1449bc SHA512 a4c76159deb92b27f907513440dfe7ce17534b38ab9e34d1e05ddecdfe60ac999007f26b03aab819c4df68a52ec50aa8d07a33df3f539dbba0e25a61c274eccf
+EBUILD halibut-1.3.ebuild 412 BLAKE2B 516ff1d539ed13fad7a8eea48e916e4361412b159cea278092f8fb1c41a62f79b6bc5c187246d8935d226390198549acc43a61713455ca109810d0577ccb9c29 SHA512 e81b29c1f11e077a26a299f527e8e0d8a655be5842c282843f961e410915e5f8bee473c5e1ec72fb7dff5b75768ccd606a3943ef23f4cea9571cb8ffa813b23c
 MISC metadata.xml 249 BLAKE2B 5e71cf7a2f9476509b6ac566cec5ef6e688f8a4ffa7246050e3ee32a1560f3cadd71b358f695416e707da471c5edaa5cbad2b4276cc9e1c2640f3b3f76ab2eee SHA512 34b65b47ef81671f908505ccd62ba01f34286951f221a9e6c1b65dd94b4c4e461b8705a5c7f95063bda37bcbe7c16b04b4cff473b7e0a12d3239ab0516d1e84a
diff --git a/app-doc/halibut/halibut-1.3.ebuild b/app-doc/halibut/halibut-1.3.ebuild
index e21b799610c2..6a663e01a2d2 100644
--- a/app-doc/halibut/halibut-1.3.ebuild
+++ b/app-doc/halibut/halibut-1.3.ebuild
@@ -11,4 +11,4 @@ SRC_URI="https://www.chiark.greenend.org.uk/~sgtatham/${PN}/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~hppa ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 ~arm64 ~hppa ppc ~ppc64 ~riscv sparc x86"
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 94b8d105775e..dd52d35bd359 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/erlang/Manifest b/dev-lang/erlang/Manifest
index 6ace03251956..1e8689ff17ff 100644
--- a/dev-lang/erlang/Manifest
+++ b/dev-lang/erlang/Manifest
@@ -21,5 +21,5 @@ EBUILD erlang-24.3.3-r1.ebuild 4783 BLAKE2B db44c0614d88101ffc13edb07ca6b2dd7c11
 EBUILD erlang-24.3.4.2.ebuild 4788 BLAKE2B a770984061152835a9452bd8d57f13394d6af4198d4291d6b78d14a03b48d5ef886fa696b5372e32e7927e6bd7466a2be1a505922ea1b7772e1bad69f35a622c SHA512 60f3edf46bf5169b0c205bafa1bb9858dbc3e1cc190616111bdb7950139e9a6adba3d61aa11f490ba98406a7a2b02d261a86b1583474a5ac48b339bcf4ab4125
 EBUILD erlang-25.0.2.ebuild 4783 BLAKE2B db44c0614d88101ffc13edb07ca6b2dd7c119b0ddb0c099b18ad37fd751596fbeb5f982712e8cd69e9a2cb000f5d3aded0197d4fab8d512ca4d4d9349a9de4e6 SHA512 e2cc06e3c2e11d874b135a4c2dcc2dcd84592d32964f22a68ce25dd45b7a36143e691c39e350227ce284b5964cb6f00b961c08f30916e540338e5f12801fb7bd
 EBUILD erlang-25.0.3.ebuild 4970 BLAKE2B a956aa549e09eed55901972ff211d542f6a6f51d330e42925fee1d028ccd2f97d4754d8bdcb6439df282c458e8854f87d8cc7122fc4d811c161c7c08f1ffacc2 SHA512 63b75adc44342017727236021034fc0ca198f6466627f85047794102937e1c598b6361c3ce59db2184b279b33aee173103a1c85148b25741907d9e769d946526
-EBUILD erlang-25.0.4.ebuild 4969 BLAKE2B 19d92006eb4859d81d5c203b37aba9b08da39fbe1728e4bff4b791d6d3dd4b55302f6ecfa569219fa78968f3795045c556c55870a3514bb7b4ac4c74f7e2591b SHA512 38854e614111f72e657f02701712715ad4446df629e1fef7461db7769bcda1d2b6da2c296baf882035ddf128e6bf6771fdb674ef95e67d0634a1824c47645d6f
+EBUILD erlang-25.0.4.ebuild 4967 BLAKE2B 3358d2434c9db397868ea568319739b6e0b7a051161915167c1d35ce7bb9e265dd8fa8bc10fdaf3664defba52f1779e90cde27dbb4cf5a56ee29617a43661139 SHA512 0acaaa1691c648954145c963e689e96147690f9b3ded831f033627605e866daf069d9e519d41d7a9a29d4eb663435125f48626a2cd2745e56728675821dfa343
 MISC metadata.xml 674 BLAKE2B a5ba4a16a6fc7cc3300471f3415c87b5563aca5af2392194401092a6c8a7888ee024526f25cd5ca20c754ced631444e49d51cad001dc4e985ef95a6aacac7164 SHA512 a830c15318fc227627aac8537d42a5ecccebd7e3cf1837d4d13cd10367a0f48d99d08480aff3e1491919dcbb42c29b38aa28b44435d50f1397e6b6aaf6fb053b
diff --git a/dev-lang/erlang/erlang-25.0.4.ebuild b/dev-lang/erlang/erlang-25.0.4.ebuild
index a803ac6744af..3c48e377568b 100644
--- a/dev-lang/erlang/erlang-25.0.4.ebuild
+++ b/dev-lang/erlang/erlang-25.0.4.ebuild
@@ -22,7 +22,7 @@ LICENSE="Apache-2.0"
 # same build of ERTS that was used when compiling the code.  See
 # http://erlang.org/doc/system_principles/misc.html for more information.
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="doc emacs java +kpoll odbc sctp ssl systemd tk wxwidgets"
 
 RDEPEND="
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 83a7fc8edaa9..856523691f33 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/double-conversion/Manifest b/dev-libs/double-conversion/Manifest
index 6b79bbfe5c6e..6bee7f01db19 100644
--- a/dev-libs/double-conversion/Manifest
+++ b/dev-libs/double-conversion/Manifest
@@ -1,5 +1,5 @@
 DIST double-conversion-3.2.0.tar.gz 7031760 BLAKE2B 971c06121e64c4d78a1f9bce9b206a079ea72fb82072f5db10f9b50516ecc178ade9d5ae2d6d024fdb78607d8a1c0d9d48380acabc529eb498e37ff38297aa00 SHA512 0670ee70ed2662c6795ec6cf144e0915d805940ea0f49633d17500c496fb241788a0de6f0a9f8eaed5cb74a376f64fe590fa0d883d0676dc2bd2dab288b85e00
 DIST double-conversion-3.2.1.tar.gz 7032718 BLAKE2B 4f6fe334388b6cb0ba5edbbef761764bfe36feb83cf73281a4f5e8bb64c96923f3e33919678fe29885de0bc3b388a6e0e91f871808c215d8a3e5cc778325fa01 SHA512 d2feb3098a1d4d6baab5f89bcc29ac2e06d314d552b8c747c6eb6dba5dd165a15dc71200191edb7f05d521c349e12d59cddba3c5db101e1623e0e76e19f21a49
 EBUILD double-conversion-3.2.0.ebuild 626 BLAKE2B b7b682e635a574ec80aa781c7c99b05608cc2f39e0558107c99340b1c1b1317d48fab19b5cb906b552d2d69bab78ebcbdcd9136e1fdb090c8d138619df7f17f1 SHA512 978463432c90bf1df3507abecca9aeeb715240e17068788e30f5e796e616a7a15f6521a1c3854c7691b8f6952271077ec7a39a8c136375da70891c5282ac56c7
-EBUILD double-conversion-3.2.1.ebuild 629 BLAKE2B 26a8e95c668544ef715440908d03b03429e371ce345fa8026eb6663c6d88fa7ae96b57319f27d22259deb17498742adf154d71698a13a600f404223d6fd9095f SHA512 d09167150c0d5ec591a1b0c08c2bc156851c2f20d36e59dd534fecf4d58a4188229e115128fe73f2c3739c268e3361cd2576254910c871aeb945c3972e08efe8
+EBUILD double-conversion-3.2.1.ebuild 628 BLAKE2B abfecbada5f13f3babc4dc3f0b162792aa2feeb6b4ab1917d2487aa647a12ea1697dfd642136083305fad1d77380fdd1dda962407c1b0b7ee3d5a74f1fe8eaea SHA512 beab962f247a494053f238faab2eec224bb969db3fe88ed542fc6e0c62560d93a44d7afac69024b2b54368589a8f4f04c0937e57defabff5702535ea099cb1bf
 MISC metadata.xml 682 BLAKE2B d16297d56e3609d9c14023e754fbdfd4a41d1ac91eb9e66e9b5122bfe7758d59d1b1ce92845d866e989baf8716bc425a6229098868ecdd2d8ce10c0af7808860 SHA512 f2c25b81770d33fe86231cb4c80cbfd5495d9ef493f6710c96732c4ad72523b362bd1c22316e326c500afc0f5c4ca22e77f07601a552b52ab71f24ceb4ca7e71
diff --git a/dev-libs/double-conversion/double-conversion-3.2.1.ebuild b/dev-libs/double-conversion/double-conversion-3.2.1.ebuild
index 5fb85383657e..d8afd74afbd7 100644
--- a/dev-libs/double-conversion/double-conversion-3.2.1.ebuild
+++ b/dev-libs/double-conversion/double-conversion-3.2.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/3"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/foma/Manifest b/dev-libs/foma/Manifest
index 3e4c11394600..31e028041436 100644
--- a/dev-libs/foma/Manifest
+++ b/dev-libs/foma/Manifest
@@ -1,6 +1,3 @@
-AUX foma-0.9.18-clean-makefile.patch 1349 BLAKE2B 7f0dfb37d72ab9db835eff35dd5b79dca40c02c305cba23d89e2495c34592e5e4033b091763dcdb1eb64b7d4845868bf58c4754609e19a2f7ce2cef1ce7b749d SHA512 513ca1681e50c9ca7763364a510a28d86196f0685fc98842078a0b258d72cfbf4fb702e681d1433f242d7079ff4a78541a0765e261a12d7b7c2868fc15c3a7a3
 DIST foma-0.10.0_p20220612.tar.gz 179778 BLAKE2B f96bf46404ead44725b609953a01a3966506af98d82e925e981cef65b3f0dc7ae3414ad96df911e380f1f565f9c11ea3f85e93fa5962cc52db5e451d2f39d37c SHA512 4539c937bd20f74dee5274126cc3a950873a87364d0fcbf02e674eca5ef049badb1b2774c2975ec7969f7f24ccffb7dd17842840e3a818b1503957374ceff048
-DIST foma-0.9.18.tar.gz 337134 BLAKE2B b7f1eeaeaa21096f8077f0e81f3c57c49bbba30afe8db280089c40ed6cf475df33a6899fd2b6929d3f58fe8b3660a92566ae41f2bd5d8a46dacc073b48caf030 SHA512 17df4c070d1460855804aa63f97cc4a0d9568755e93de0de80821625faab7a3994a260650c5e8f43f80b5a0702dadb0cfe57136ab50eb2a9946f118991205b1a
-EBUILD foma-0.10.0_p20220612.ebuild 664 BLAKE2B 918090da7c53cb4673da318cf826f6fee4c2c920a8400862839fccf8511d4938cc88aa73bf1863a886946e41485d07122eae050cc47a213c58bbdeaaa46f14de SHA512 7e0b97cb8eb83cac8d046518f57043872b0f0e1fa9a5b2df6a4c9bf5a1b788b92eda43a313bd1323b61d6037184f4ae78998c59d88b7f785c1aa0985c4fd8058
-EBUILD foma-0.9.18-r1.ebuild 1043 BLAKE2B b7ae4ba2f23b105dc836063083df247d1c2501b78222782c60d1f3a48d9e2eb99ae70800c9b93898e97f22616c7d7c2bc946cf46db879c6501bbaaaca90de170 SHA512 47652a80ca89e70e776b539969b5b55b1f26cebd024c30d682a268fb14f563c51b0f41f168d9ec948de6fbf9eb12cdbc2a7e14ddfb8321a709fc01f353b2ed37
+EBUILD foma-0.10.0_p20220612.ebuild 662 BLAKE2B c3f567d4e713b4a34390b956dcd1d8e4cdf2d07f685a988e21132324661c8e8f247d99ab70113fb056e6b42d252575251aa3153f8c6a38e5e603c9e542e99143 SHA512 01c53216f2fb10852a88cef8d597bcff87dff5d5cb538433ed1fb89cdab550d647d2763cfd12858ba333d4d2455da5178c11d25cacb832d013877d38239c289d
 MISC metadata.xml 255 BLAKE2B 6fe10a1f843a8b2494606052a69206e32fdd5edf3ca6bdfb661cf6f8e39c0e16fb652acb8697d339770f3559c56a4ba964a0e959b3e0bb456d09ee7570f0d9e9 SHA512 235170971553178916cc484a07e1c665c94cd0a7ec442d2190d3608f7a3441dd2fe08fea666ca23d151077c10c908bc1da0e57355fab43be02711be35531b362
diff --git a/dev-libs/foma/files/foma-0.9.18-clean-makefile.patch b/dev-libs/foma/files/foma-0.9.18-clean-makefile.patch
deleted file mode 100644
index 0ed1b811fc67..000000000000
--- a/dev-libs/foma/files/foma-0.9.18-clean-makefile.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -Naur a/Makefile b/Makefile
---- a/Makefile	2015-06-13 06:24:02.000000000 +0300
-+++ b/Makefile	2019-09-08 09:24:22.127655912 +0300
-@@ -1,21 +1,16 @@
--prefix = /usr/local
-+prefix = /usr
- exec_prefix = $(prefix)
- libdir = $(exec_prefix)/lib
- bindir = $(exec_prefix)/bin
- includedir = $(prefix)/include
- 
- VERSION = 0.9.18
--CC = gcc
--RANLIB = ranlib
- YACC = bison -v
- LEX = flex -8
- LEXCLEX = flex -8 --prefix=lexc
- LEXIFACE = flex -8 --prefix=interface
- LEXCMATRIX = flex -8 --prefix=cmatrix
- RM = /bin/rm -f
--LDFLAGS = -lreadline -lz -ltermcap
--FLOOKUPLDFLAGS = libfoma.a -lz
--CFLAGS = -O3 -Wall -D_GNU_SOURCE -std=c99 -fvisibility=hidden -fPIC
- FOMAOBJS = foma.o stack.o iface.o lex.interface.o
- LIBOBJS = int_stack.o define.o determinize.o apply.o rewrite.o lexcread.o topsort.o flags.o minimize.o reverse.o extract.o sigma.o io.o structures.o constructions.o coaccessible.o utf8.o spelling.o dynarray.o mem.o stringhash.o trie.o lex.lexc.o lex.yy.o lex.cmatrix.o regex.o
- 
-@@ -82,7 +77,7 @@
- 	if test -f $(libdir)/$(SHAREDLIB); then rm  $(libdir)/$(SHAREDLIB); fi
- 	if test -f $(libdir)/$(SHAREDLIBM); then rm  $(libdir)/$(SHAREDLIBM); fi
- 	cd $(libdir); ln -s $(SHAREDLIBV) $(SHAREDLIB); cd $(libdir);	\
--	ln -s $(SHAREDLIBV) $(SHAREDLIBM); (ldconfig || true)		\
-+	ln -s $(SHAREDLIBV) $(SHAREDLIBM); \
- 	>/dev/null 2>&1; \
- 
- $(OBJS): foma.h
diff --git a/dev-libs/foma/foma-0.10.0_p20220612.ebuild b/dev-libs/foma/foma-0.10.0_p20220612.ebuild
index eeada44575e2..1ba9f8a3597f 100644
--- a/dev-libs/foma/foma-0.10.0_p20220612.ebuild
+++ b/dev-libs/foma/foma-0.10.0_p20220612.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/mhulden/foma/archive/${MY_COMMIT}.tar.gz -> ${P}.tar
 
 LICENSE="Apache-2.0"
 SLOT="0/0.10"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 BDEPEND="sys-devel/bison
 	sys-devel/flex"
diff --git a/dev-libs/foma/foma-0.9.18-r1.ebuild b/dev-libs/foma/foma-0.9.18-r1.ebuild
deleted file mode 100644
index bc5c9d290e3c..000000000000
--- a/dev-libs/foma/foma-0.9.18-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="A set of utilities for constructing finite-state automata and transducers"
-HOMEPAGE="https://github.com/mhulden/foma"
-SRC_URI="https://bitbucket.org/mhulden/foma/downloads/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-DEPEND="sys-libs/readline:=
-	sys-libs/zlib"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/foma-0.9.18-clean-makefile.patch" )
-
-src_prepare() {
-	default
-
-	# Install to correct libdir
-	sed "s|/lib|/$(get_libdir)|" -i Makefile || die
-
-	append-cflags -fcommon
-}
-
-src_compile() {
-	export CC="$(tc-getCC)"
-	export RANLIB="$(tc-getRANLIB)"
-
-	export CFLAGS="${CFLAGS} -Wl,--as-needed -D_GNU_SOURCE -std=c99 -fvisibility=hidden -fPIC"
-	export FLOOKUPLDFLAGS="${LDFLAGS} libfoma.a -lz"
-	export LDFLAGS="${LDFLAGS} -lreadline -lz -lncurses"
-
-	default
-}
-
-src_install() {
-	emake prefix="${D}"/usr install
-	einstalldocs
-	find "${D}" -name '*.a' -delete || die
-}
diff --git a/dev-libs/modsecurity/Manifest b/dev-libs/modsecurity/Manifest
index 0cd443a8be11..e9346bc92f3e 100644
--- a/dev-libs/modsecurity/Manifest
+++ b/dev-libs/modsecurity/Manifest
@@ -1,3 +1,3 @@
 DIST modsecurity-v3.0.7.tar.gz 3333372 BLAKE2B f391e2057b95a26a16efaa5f9d86acdd030b2f32d3da3ebac4e5eccdae7c9c6453bdb6b4e2d7f49ce189760d5c5de7d656aa5796fe2723e2e6f5493c93420913 SHA512 d8caf5946b598b16c4481938f22c1116595286811cfdb01d95db95ab061f7045751f2aa98e515df239bceb3f1a6dce2ecd5b24c954bddc27997fa64e9e429730
-EBUILD modsecurity-3.0.7.ebuild 1941 BLAKE2B 37e05e6e7b4859b12e7e507b73309f6995c7b2c5cf729f6d00f506365fc7991fa1ac533df0504cdb63ad0f957f974e6cc118648888102120251887ae9c9249c6 SHA512 25c9d30c8dc13a3e263f7cad5f7d4a14e4136edf3479b9bc1ac67772a9db828ab953b617e1d762c01f01f4f5131a06da6d796272a97b2fa8a99463afde64d6fa
+EBUILD modsecurity-3.0.7.ebuild 1940 BLAKE2B 0e1b1b024e4e1be46d22f1515834cb6f764c55ed2f26f4fcb17bd35d8427092a82606603994dac978382f99f9d898578c77efa86f0f7c7076cde312be35f96f0 SHA512 f31dac3be38f46f8bff64dc4413283bd9577b9354d5fa528b80b197e03efe369bb6d8a93288a54a97da170ca5e14fbd199ad055de926a56e40f39ec3a581a039
 MISC metadata.xml 1019 BLAKE2B 0873fbb1c328dea3378abbe280dc7adacf389a9f1085614057e328ca7258afb4553c2a37bb527eb80b995d69e428ac7fcb3306e65a84c0e3d17acb6ace270b0b SHA512 549b1dc80684fff950148598807b866ab9400c619d2ecb32f2e7f90f8f298dd47daadd4c33f76af40983ed22ffbbb017c110253d810bab931344dd6f80d8f2ce
diff --git a/dev-libs/modsecurity/modsecurity-3.0.7.ebuild b/dev-libs/modsecurity/modsecurity-3.0.7.ebuild
index ca8015c34eda..bdd4786e7842 100644
--- a/dev-libs/modsecurity/modsecurity-3.0.7.ebuild
+++ b/dev-libs/modsecurity/modsecurity-3.0.7.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86"
 IUSE="doc fuzzyhash geoip geoip2 json lmdb lua pcre2"
 
 REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
diff --git a/dev-libs/nspr/Manifest b/dev-libs/nspr/Manifest
index ac9cb2717eb3..e843ce1648e4 100644
--- a/dev-libs/nspr/Manifest
+++ b/dev-libs/nspr/Manifest
@@ -8,6 +8,6 @@ AUX nspr-4.8.9-link-flags.patch 931 BLAKE2B 6aa6aa1cf3b856a95b7baa20f58e9ed83b8b
 AUX nspr-4.9.5_nspr_config.patch 251 BLAKE2B 65ae8b981e758e2955b7a3358f24b7b17dc1ef59f0e78f9fd9ddee740a4da3825bafea34f3900200b3f6edefed7d0797c194cb0339d4e36551615d599156108d SHA512 3f118b7142a19dcc7e26b348cec6029c78d585a57cc2bfc2ab7ca13d2ef953e576dab0ac044316e3165d0201bf27253afa732109f914da6f7a39f19facff8310
 DIST nspr-4.34.1.tar.gz 1096874 BLAKE2B be12bda63a72d25a60542c5cdadaa7dc59ad2d40d41affc0af5eab07659129ff235a62227a78285e4c00bc72a365b49691658aee7818ffc4c5d014aa0c2b0df7 SHA512 b77226c3fbba6fc9acc90deb8496370dba1384de72ce564524c03bc239846fd17c27d7e1fd7ce99161faafdd8c92413ee58ce1a74a41c786759210bbab478991
 DIST nspr-4.34.tar.gz 1096407 BLAKE2B 61199c1319578570f9569011a2fea8ec6b8c4e8337b03517d1b0e1a22749a7449feb2152c348f3a1d73fefa7aa5067be460f4cbc1728c479309f4a2592424fdf SHA512 4cfac886c14cf7df4c4b79fa1c3bc92e1b14260c9c3018fa2562060d62fecb4e66c0b4e8f7edf4f4823def784a919d99dde88a89674f0cd8a644310b0569ead4
-EBUILD nspr-4.34.1.ebuild 4865 BLAKE2B 4aa657562d9386fcb4cac872466d1f1f7c224474144440cc947502ab0d3155aedd0bf3fb79628b51f31ad4a8f75d1ed5ea258fc57f2b2f749ba404080a6d8e3c SHA512 d948441898313d428059e37c0ac21cded2ba07a74b6b8137b642a0e8d1f37fc8df110397916e0a45c6ebb70fd9ede3c5c8cf6c95bce7821934c190c6d44482b1
+EBUILD nspr-4.34.1.ebuild 4864 BLAKE2B 867b7f356ec292fa620376019567cb3678c4f701df12d7621e2457b397a3da06b49bfc9d9c6e2c0f9b7b6ebdc2ebabf780e7dddc6e57d5cb486189609a655c4e SHA512 bd08eb30b66d80b1eda075c778ff24f514da5799e2d73e3beff19a5c6e764c33c4a8714d887be8f5c27288212b784c78152983c8f58263820f9bb4f32375e45b
 EBUILD nspr-4.34.ebuild 4860 BLAKE2B 9cc8a8f045aa6f69987d7285927566dcc4578c1a9d16ae52de238462936565459e5f4a5dec655c4fa70dcb95dcdae461464422b10bf54feacaa2676825743520 SHA512 9e3f5aa90aea50e0c3b5e350d841f5c18a1dd41afa5aa80807454f18c339aa3d95b3e717b77fd1747de5c46f0cf118d1f7efe1ea496259d7a053f76e3a19d60c
 MISC metadata.xml 350 BLAKE2B 0f4d7850a3ca725af4e01a47e4db4219d2465b6d4db8c44e12b8f57d2064fd3c6ddbeec16888a316627f96e1f9415777f3fedecbd7065e4d13516bbed473a6f6 SHA512 2cc7f3e6eefcb5ba16c4b2127e751c47ea7a6822eb71080c96c6850ef741acff8d424c520eb60288ca32ccdbe825568d7aced9f57148e304dddd0afb7f4a8883
diff --git a/dev-libs/nspr/nspr-4.34.1.ebuild b/dev-libs/nspr/nspr-4.34.1.ebuild
index b8b31eab2c63..1155e9e13110 100644
--- a/dev-libs/nspr/nspr-4.34.1.ebuild
+++ b/dev-libs/nspr/nspr-4.34.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://archive.mozilla.org/pub/nspr/releases/v${PV}/src/${P}.tar.gz"
 
 LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE="debug"
 
 MULTILIB_CHOST_TOOLS=(
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index fba868d8e2c4..8678b75de941 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/PyPDF2/Manifest b/dev-python/PyPDF2/Manifest
index f2dcbb377663..8580ada4d87d 100644
--- a/dev-python/PyPDF2/Manifest
+++ b/dev-python/PyPDF2/Manifest
@@ -3,6 +3,7 @@ DIST PyPDF2-2.10.2.gh.tar.gz 6434051 BLAKE2B 36778692fc8fff4c4dba16e94128b09d366
 DIST PyPDF2-2.10.3.gh.tar.gz 6435551 BLAKE2B 2907ef5f8fb7117d895d87326fd8281154cb5a78be54e832489c211f10a2cb2762051eff419279e2f3e70ed773645b08b59d598c9c7edba575c06d9e34fcefa6 SHA512 a8b05f280e8aecd9b54a143dc77c6aa5e095485e4d9c38c3d2ab62855e004d4c8333b88c7b663cf282d7a7eeac920595d94e6c3ba7524850272d82cb504a4f7c
 DIST PyPDF2-2.10.4.gh.tar.gz 6435008 BLAKE2B 00f4b2f65198026715186dbf1ced15e825cb061873f3b8d3d7716d81439d3d44b392ea90d886ce8aad45b1fd29fafcbb917e9aed795d311c98e2752643ae40be SHA512 ac865096ae370626ad7ab243a5c95fafc95e71c31e79c4f89be919205d956726d0147a7b4cf5a2bcddb021999261fa0a73942df64763cf3c8b30620274ea518d
 DIST PyPDF2-2.10.5.gh.tar.gz 6443691 BLAKE2B 6b60ea4d1a044ee5f20718744118f5739a4271a0552960e2760c4904f57201ed8426d4cb81ce5f5d2170b84958e1b17ea3de843137e669ed7b202a49db8654c2 SHA512 cf07448b2ea4397f1bf5b2d563956bda218e9031b4396e86c2d689d518c7c2b17920771dbdf0e5ed6013dd96d957add12d3f4fbdf3a8bd3262a1fae38ae741d8
+DIST PyPDF2-2.10.6.gh.tar.gz 6443648 BLAKE2B 4b5282363dea4bcec65ee6fddec787a95055ae900636b75c118fa3f2a4f5afc73807425b611c81cff6a580d4109c4df14083a1f64d7d6c373a1cd6ff9cb92fb3 SHA512 c158e6eec44429bdc103cd7f0e358289a14de92dc1d23b77f58e45a7a9851e9072fab3c8c5710f1755fdc5093380d3756db4fd12d0bdc8461cb9119d499fe012
 DIST PyPDF2-2.9.0.gh.tar.gz 5877910 BLAKE2B afea03f9ac21e4b39cd39ce03adf70a8e08b80315f7cdd81440e371396ba48939560a3835de9587be8020e1aab75726409ecec753ef0fb042d69fe7fc6755e80 SHA512 fefbc6e6eb7ac0a0154f662044acb66f1c034efc114e878ced109d54a3e5427bb73088cb88d765c4576c2d67459a2daf64415789f8efe9b66cf8ed2bb78ff297
 DIST PyPDF2-sample-files-b6f4ff3de00745783d79f25cb8803901d1f20d28.gh.tar.gz 5522867 BLAKE2B 9a6cb3b92032f9ec697b972b1a257b2c2528d36cd4a7e40092ac6dbf0a4955c5b204b8c82d37f9bad4a19fccddf0070b095ee2f3b56de22d738ed3d8a3b555c0 SHA512 74aad38060f441ace87f6650de152a28f4a251e4f47574a8d46066857c8fbbb187cd3cd275caa198dce2c1557e90664b288f071995c2bbb9bf13a341210313e8
 DIST PyPDF2-sample-files-bedcbe077c4898e1b97c6c6f81d937f5048b4630.gh.tar.gz 7198720 BLAKE2B 91d177e7329fd137322972a3a38841cb0611de7f839071fe2fa5ecff0343cbffdf6976f42f4a779f520a8a2bac2d6573c5cd65bf2f1bc68395077e6e9c7322d9 SHA512 0cdaee85f1da12cf678165f06c8d351aa0808137d25f68c07f19f1bd3c929eeb52e604041dfaa0df94665379aeb7d19a43426d724a5e6602b7e4fbe7a62e753d
@@ -11,5 +12,6 @@ EBUILD PyPDF2-2.10.2.ebuild 4733 BLAKE2B 5f901f05563a6ee94ba1aa7db40471ac8c82ccf
 EBUILD PyPDF2-2.10.3.ebuild 4772 BLAKE2B 15b4a4f906fc7db6f4dfa3557a7ac9c8f33118c00c7cbae05176811fc5dfe2ab522133724c1fcad4ca4c089e8b86b5aafb4e2e56a9e5b34c32cdd6bd390e98e5 SHA512 f72e0319449865ea8bf6f6894e0967272ecd20a3012c74b1cd955d07620928aba9fea396023af66e90d6932376ed4864f64844d0932a32be9eab788ad31c6786
 EBUILD PyPDF2-2.10.4.ebuild 4772 BLAKE2B 15b4a4f906fc7db6f4dfa3557a7ac9c8f33118c00c7cbae05176811fc5dfe2ab522133724c1fcad4ca4c089e8b86b5aafb4e2e56a9e5b34c32cdd6bd390e98e5 SHA512 f72e0319449865ea8bf6f6894e0967272ecd20a3012c74b1cd955d07620928aba9fea396023af66e90d6932376ed4864f64844d0932a32be9eab788ad31c6786
 EBUILD PyPDF2-2.10.5.ebuild 1260 BLAKE2B b26dabdaa3cd175093c5fdca86afeebab8502152c59b54b066787c1eadfb6633543492a25bdc160c1397895559f17267025caaac2b959f1e3efa8528b8712f66 SHA512 f015b0bfaf7b51eb2463ac2e57f331519c9d43447449a7623ffbfa274acc935ebdaf04e7b9d02d85b312ee1451f67db692f6067f9141072b216fb31a5c279f67
+EBUILD PyPDF2-2.10.6.ebuild 1260 BLAKE2B b26dabdaa3cd175093c5fdca86afeebab8502152c59b54b066787c1eadfb6633543492a25bdc160c1397895559f17267025caaac2b959f1e3efa8528b8712f66 SHA512 f015b0bfaf7b51eb2463ac2e57f331519c9d43447449a7623ffbfa274acc935ebdaf04e7b9d02d85b312ee1451f67db692f6067f9141072b216fb31a5c279f67
 EBUILD PyPDF2-2.9.0.ebuild 4692 BLAKE2B 60e995d9d8805aa4b65056536a54c35a5e1c9be5392a196f29970c70bb5ffe7c59db1d6936ff2b183a4280e3978fce6969630d312d33fc79508518f18eb3a7b0 SHA512 c30258d00a84e4f277a1939a137f980d375aa3898bf997967bd1561e2abc83ff1351f85237c657ffb5dd441021b09f947c0d4eac8f0ae299864a05b277acbff1
 MISC metadata.xml 375 BLAKE2B 2493f7d2ef79342af0ef890e3683fa55255d869c684bba7224ab3afab61e77a239e323c8e63138ce4fea23c32348458cd27a0c58a3b6640854ec27b26cdb40cb SHA512 5e0d6e18e0005e4f323468b8fbfa26dc7ba33d26a94d5fda11c40f62ece84578c1f08843c9f0cf96f0d918d22063f494d486a6d692cecb5b407efaaf92aa9b8b
diff --git a/dev-python/PyPDF2/PyPDF2-2.10.6.ebuild b/dev-python/PyPDF2/PyPDF2-2.10.6.ebuild
new file mode 100644
index 000000000000..66b49dd2cca4
--- /dev/null
+++ b/dev-python/PyPDF2/PyPDF2-2.10.6.ebuild
@@ -0,0 +1,58 @@
+# 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
+
+SAMPLE_COMMIT=bedcbe077c4898e1b97c6c6f81d937f5048b4630
+DESCRIPTION="Python library to work with PDF files"
+HOMEPAGE="
+	https://pypi.org/project/PyPDF2/
+	https://github.com/py-pdf/PyPDF2/
+"
+SRC_URI="
+	https://github.com/py-pdf/PyPDF2/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+	test? (
+		https://github.com/py-pdf/sample-files/archive/${SAMPLE_COMMIT}.tar.gz
+			-> ${PN}-sample-files-${SAMPLE_COMMIT}.gh.tar.gz
+	)
+"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+RESTRICT="test"
+# 150+ tests require network, too many to deselect
+PROPERTIES="test_network"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+	' 3.8 3.9)
+"
+BDEPEND="
+	dev-python/pillow[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pycryptodome[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# rely on -Werror
+	tests/test_utils.py::test_deprecate_no_replacement
+	tests/test_workflows.py::test_orientations
+)
+
+src_unpack() {
+	default
+	if use test; then
+		mv "sample-files-${SAMPLE_COMMIT}"/* "${P}"/sample-files/ || die
+	fi
+}
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 2f2184d156e2..494387dc9559 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -5,6 +5,7 @@ DIST boto3-1.24.64.gh.tar.gz 533638 BLAKE2B 1cf4774e17226b453aec3203eea6f343e092
 DIST boto3-1.24.65.gh.tar.gz 533830 BLAKE2B 10ff261500c010449f281bdd6c2767910519026b8e6a9ef93a36a2d6c9fdb39b1d8b15585a3eae615d96a8b19c63c9eecd88a8c08dca974ff5b233933bb72fdd SHA512 588426a35b4764d05434593538afb245fbfb9e1626e0f0fc86741e83c9662331930bfd4e267f132a01742304bbf70fc71998b61146bee4e215600d6ac26a7afa
 DIST boto3-1.24.66.gh.tar.gz 534375 BLAKE2B 3a922be7a1736af8d37a11b62f444601e8e822b2ccb937e2e295332a102abd3def304a80c432664504f81bbf1a95aad635226073ad93c194ff96a99ad4ad60d4 SHA512 ae11b8a5247f7a9ad2c222e5e52bae27e7686ad2228e815e9c5f755ec57d1d3e2f805b6f4875edc791dfd4e783f80e0045ca34ceb2cf3dfd5831a086d9a8eb20
 DIST boto3-1.24.69.gh.tar.gz 536008 BLAKE2B 2a7c031423bac668110c0fdc17c66085c81cf79646c4b8c4e7442a5451cbb9b828208ebfff576d4b50e9e9ca763af1b78631be5bb6126b20b2497e98982e674b SHA512 b6529bc1a73816057bfb900b29f72cd20bdd828c033137c4280cec20d174bf3d27fbf48333672a6e9d5481ca0b70ac6b2ae7fc11a7a8b0e773cc1df7ae63c491
+DIST boto3-1.24.70.gh.tar.gz 536364 BLAKE2B b93c882f93093e453c82ea0cea298ccaeb9159271b8fc933bc884f1cc2fae14131a28cacfecf0c0f931c77d03d92acdac23a16acbdf4ceb1da0dca6859048616 SHA512 d7fbf4fdf44adf723d1325cb80c44c3e78df4d8c30b106d8256cdaf39bab442498c40624e2d9fb8f53af278518bb897bb9b2b040552f5420a82914f9083ec6bf
 EBUILD boto3-1.24.56.ebuild 1579 BLAKE2B 394d8a1bb7a1036ab4821bc789c9eea285f8a6a7c21e751d60c94a53d5fdd37119eab54bfd19bfe0856b7557df04340f50c7cebbe631234e8f582e7d62af13ec SHA512 beee3b634e3b1d66365beb2e97b9d09188fa795e00d9d05f2101de423128741ee1f8ad8ae4b0c35f1e6c6473ce73cc3acf47d9141029b4435d39a9803a5fe1b2
 EBUILD boto3-1.24.61.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
 EBUILD boto3-1.24.63.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
@@ -12,5 +13,6 @@ EBUILD boto3-1.24.64.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd536
 EBUILD boto3-1.24.65.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
 EBUILD boto3-1.24.66.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
 EBUILD boto3-1.24.69.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
+EBUILD boto3-1.24.70.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
 EBUILD boto3-9999.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
 MISC metadata.xml 493 BLAKE2B 7d6324fc877ffe1d20c5369c2af0b09a7028f94d28f1841188913d0d8be7ea699c9d3f92c624992c4c96bd69615d3a1211a2483c76c56b7d3082492e43512523 SHA512 44420d8c03d5986f990b76369edfa8dfd7659b4952db3ad946fd05392ec594628a28745ad888d055d4f074d5214f61fcffafe6c04c4ab54109d45ac0371582bd
diff --git a/dev-python/boto3/boto3-1.24.70.ebuild b/dev-python/boto3/boto3-1.24.70.ebuild
new file mode 100644
index 000000000000..6edcc751d54b
--- /dev/null
+++ b/dev-python/boto3/boto3-1.24.70.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="
+	https://github.com/boto/boto3/
+	https://pypi.org/project/boto3/
+"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/boto3"
+	inherit git-r3
+	BOTOCORE_PV=${PV}
+else
+	SRC_URI="
+		https://github.com/boto/boto3/archive/${PV}.tar.gz
+			-> ${P}.gh.tar.gz
+	"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+	# botocore is x.(y+3).z
+	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index a204e24957e4..a755dd3592b1 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -5,6 +5,7 @@ DIST botocore-1.27.64.gh.tar.gz 9588817 BLAKE2B 2479d7f6565a78baf7b9504bfdbba74f
 DIST botocore-1.27.65.gh.tar.gz 9592250 BLAKE2B 7ecb6d13c061100d101b5c3fdf84b25a74137ee49efda86b13549341f6a6932d07ddf0858bd436e0de4719617f2352b423757fd618501ccd1a37b74b9bb5f358 SHA512 cc3ea5329c41e6b0ffc55f170feadc1550e5ca3656c59d809600148cc2268cb2bace6d0b95dfb9031338c90fe3c2e89081bfeb100903c0eed7249612e539c522
 DIST botocore-1.27.66.gh.tar.gz 9595449 BLAKE2B 861421948b9ab5d80e77805f6bab8a013005ed89912084bc436cdd3d0ca00d4e94f82f0928a0a3c9833135ce5b91395f36d5d29633fb38355da4e23c03d4699e SHA512 163059aac7d75182ba85017f96be75ab556dbedda54ca51221530c51ee795e51fda0b5a0d59a42a4554a7059396d53f1f83a96fd16b90d738773cc97dfce4000
 DIST botocore-1.27.69.gh.tar.gz 9598373 BLAKE2B 678cfea9cee9c9dbdae1fc7d23ef8530de122fc6443d5531fbcc458015d12f03e2ca21efd7103d014db541a5b064210ac85d1a7a182d00caa5d3c61c6fbb74af SHA512 856d0a5e75b929f5ccea31aa0f164db6c2c402edd6070f92b2a1c3b794eb0189be677dc0f527315af9b0d788e3e6247b8402d6e60749faf147aca6b559d0ad7c
+DIST botocore-1.27.70.gh.tar.gz 9601647 BLAKE2B 2d980a26ee0ebf6ead3a8c41f69ae02726e5984948c20855dc2428c0f0c5c775ef6cdc38544aba3e4abad7ed69b9e1929103cc990d0d2ceb95c547d7c17b0b9d SHA512 24a3066abd1b57060d4ddf89b011a238ae3bdb65b08bb1f6ea6de7e54ddc78d809d7f7ec532b95ac9583f5ffec83e7d40a531fd088a486b132fe1fb044b4ebbb
 EBUILD botocore-1.27.56.ebuild 1610 BLAKE2B 19f47b6c38de4ffc3a0623bc006b257260abb255ab63d084bcea3552b403d504ddfbe7191494aa8dba8d19a445b55c9dc6c977bf5f0877dba72a3ca69cdbff43 SHA512 fcc38a1393610e2eb729cfbf3a9f579ca840a8e712fe2123235cec4aefc68c96b099821282a68de737bef5e2d1f1f4b00e64e1665985f718201909e1b56994bb
 EBUILD botocore-1.27.61.ebuild 1617 BLAKE2B d33413fa74479d5ca72e82609b4b1c57a33f6953d5acb82db1e2f9de7599190c69d8e633ac0da8417121a9959346723f509d5bb8945d1de63689046756ba303a SHA512 20aeccea53aa2e5d294739c9256fb590d21a89c216411383b1bc8c1ee25528ce4ac94fe3a210a1a6ff173b81c1d97b0972d611772963592a9c8be8039c12717a
 EBUILD botocore-1.27.63.ebuild 1808 BLAKE2B 720965dfc40c51389a8ca4ac210039f79bbe3047f583cb1bd4d52bdb9720cb2283a13a9f4337a62aca6869cd75d78dac6cc07436524e9720386177c733d686f3 SHA512 d3a3fbc0f957b58e8161ae3fffedb44462000077aa368dd2fb183bf6a084771bff4db46344a4d0b451833ea05d326b452155af92d190c313e1d982da7d72fc10
@@ -12,5 +13,6 @@ EBUILD botocore-1.27.64.ebuild 1808 BLAKE2B 720965dfc40c51389a8ca4ac210039f79bbe
 EBUILD botocore-1.27.65.ebuild 1808 BLAKE2B 720965dfc40c51389a8ca4ac210039f79bbe3047f583cb1bd4d52bdb9720cb2283a13a9f4337a62aca6869cd75d78dac6cc07436524e9720386177c733d686f3 SHA512 d3a3fbc0f957b58e8161ae3fffedb44462000077aa368dd2fb183bf6a084771bff4db46344a4d0b451833ea05d326b452155af92d190c313e1d982da7d72fc10
 EBUILD botocore-1.27.66.ebuild 1808 BLAKE2B 720965dfc40c51389a8ca4ac210039f79bbe3047f583cb1bd4d52bdb9720cb2283a13a9f4337a62aca6869cd75d78dac6cc07436524e9720386177c733d686f3 SHA512 d3a3fbc0f957b58e8161ae3fffedb44462000077aa368dd2fb183bf6a084771bff4db46344a4d0b451833ea05d326b452155af92d190c313e1d982da7d72fc10
 EBUILD botocore-1.27.69.ebuild 1808 BLAKE2B 720965dfc40c51389a8ca4ac210039f79bbe3047f583cb1bd4d52bdb9720cb2283a13a9f4337a62aca6869cd75d78dac6cc07436524e9720386177c733d686f3 SHA512 d3a3fbc0f957b58e8161ae3fffedb44462000077aa368dd2fb183bf6a084771bff4db46344a4d0b451833ea05d326b452155af92d190c313e1d982da7d72fc10
+EBUILD botocore-1.27.70.ebuild 1808 BLAKE2B 720965dfc40c51389a8ca4ac210039f79bbe3047f583cb1bd4d52bdb9720cb2283a13a9f4337a62aca6869cd75d78dac6cc07436524e9720386177c733d686f3 SHA512 d3a3fbc0f957b58e8161ae3fffedb44462000077aa368dd2fb183bf6a084771bff4db46344a4d0b451833ea05d326b452155af92d190c313e1d982da7d72fc10
 EBUILD botocore-9999.ebuild 1808 BLAKE2B 720965dfc40c51389a8ca4ac210039f79bbe3047f583cb1bd4d52bdb9720cb2283a13a9f4337a62aca6869cd75d78dac6cc07436524e9720386177c733d686f3 SHA512 d3a3fbc0f957b58e8161ae3fffedb44462000077aa368dd2fb183bf6a084771bff4db46344a4d0b451833ea05d326b452155af92d190c313e1d982da7d72fc10
 MISC metadata.xml 499 BLAKE2B e5aaa7da26f200c09adfdf38b68f656bbccbec627cb5d966b280ac2165334e7eec659c89075bcace748f58e2ec3e7d2998e54a688d56ecea2d30653c67dfd35a SHA512 103c554d5dbd967bf9b6e418b3913d9235e7e910d012160909ce0715134ed2e37b06e6a345395f9d16ce08d1cf51f3ce458bce93c6a978fd3dca6610f2acdbd0
diff --git a/dev-python/botocore/botocore-1.27.70.ebuild b/dev-python/botocore/botocore-1.27.70.ebuild
new file mode 100644
index 000000000000..d1a6948e70e5
--- /dev/null
+++ b/dev-python/botocore/botocore-1.27.70.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="
+	https://github.com/boto/botocore/
+	https://pypi.org/project/botocore/
+"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="
+		https://github.com/boto/botocore/archive/${PV}.tar.gz
+			-> ${P}.gh.tar.gz
+	"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	<dev-python/jmespath-2[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests pytest
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+
+	# unbundle deps
+	rm -r botocore/vendored || die
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# rely on bundled six
+		tests/functional/test_six_imports.py::test_no_bare_six_imports
+		tests/functional/test_six_threading.py::test_six_thread_safety
+		# fails on unrelated warnings
+		tests/unit/test_client.py::TestAutoGeneratedClient::test_BOTO_DISABLE_COMMONNAME
+		tests/unit/test_client.py::TestClientErrors::test_BOTO_DISABLE_COMMONNAME
+	)
+
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/hatchling/Manifest b/dev-python/hatchling/Manifest
index 0c0730424712..5171a8d53d9b 100644
--- a/dev-python/hatchling/Manifest
+++ b/dev-python/hatchling/Manifest
@@ -2,8 +2,10 @@ DIST hatch-hatchling-v1.6.0.gh.tar.gz 233428 BLAKE2B 5ce5a2a94c9021919f50f90a96f
 DIST hatch-hatchling-v1.7.1.gh.tar.gz 1471608 BLAKE2B 52d7d1f8a45f5dd6573676b8f6946b843c5368ba0b0a53d1a30d48c1087350eea54335fbc76816f334526238451ab8075586212386bb18edc0c3b3cfc5224b3c SHA512 dfffc8586ee3ff5c7f1f277be1e653efef70fca5377c12c16bb05c1deeb5cf5eccc5cd58d0923a32c7a8b3701621f6be881709bb836734170a08b103b841107f
 DIST hatch-hatchling-v1.8.0.gh.tar.gz 1524674 BLAKE2B a23e2e4c40dda4df45a2124499f1f566038a1a6b5631f453a1631fc322474a536e7d8bd0972d315c38a7a3cf97ef2839c998bb4310fc6123dc154d597e75eda3 SHA512 14772c8d6d3408f66e755b59d58f4c67e12c96665d556f647261dfa60e250c1b586bea2731aedcf24c6ede4c0dae132ea205516735509e9e1ccc9ef4bbd84a15
 DIST hatch-hatchling-v1.8.1.gh.tar.gz 1525669 BLAKE2B d1c33648eb202d57448f4f01d724361bce0db2ca25b1445f2c5bdec5f517f0ddfa961d07ff6d76ba7f326d1feae524a1f6600b563ad6f8bd504c7d00e1b1316d SHA512 d1878085adfd00e4efe7bbd5d70bf76e2d34bd42f0ef4dfc813088025dcc9d180605013a0acd9e24b3da86087dcf9bbb37be76528001034282f7a30a6ccbc20b
+DIST hatch-hatchling-v1.9.0.gh.tar.gz 252859 BLAKE2B 7fe0e06b26808ab47c8deead09744c32b2806327944ca799fe1b919ffe34227b7f51c0c5c7a7cad5b3a08b61acc10a0f9528048f3a4a45cf53efece64005fe9d SHA512 b99de517e6a049910e119fea9de667dc87782ff6400a8b730bb402c6337176f39a8e956d69e71561e413b80710b651421eb320d2b1b747b1818c97607c456c78
 EBUILD hatchling-1.6.0.ebuild 1980 BLAKE2B 0c537198ec4cead26561b0781f68f6062ba8845cc56e68ba482ebead4618ab86cb5418234524939c1fb69b09a44993fdf2bf222e75f254b0139c66669ca38d59 SHA512 6036e99f5bc40b79197476c7e3201b6b003fa36269d63b36a1f40db9f912dc1467b037a891292d586b36cc0c79a8999ce3bf7f3dc82cecbff0cb7d4d149be316
 EBUILD hatchling-1.7.1.ebuild 1988 BLAKE2B 7e6587bd516b6bf64cdf96c07a3c58c277755b51ac02ce13c12608bc78d9ce75bc4e49cbcee4fb6144f7bdbe76aaadfb4289b28cf5064328d1ad0d4a2f84e9b7 SHA512 1cd12a200fe2a227d42879f8ace9bf6f2f230aee02559ccb6d03de8bcb8b935d78a593cd41615ef8c8a712d9b170c6a3db15341d3e588a861577b65401be3845
 EBUILD hatchling-1.8.0.ebuild 1988 BLAKE2B 7e6587bd516b6bf64cdf96c07a3c58c277755b51ac02ce13c12608bc78d9ce75bc4e49cbcee4fb6144f7bdbe76aaadfb4289b28cf5064328d1ad0d4a2f84e9b7 SHA512 1cd12a200fe2a227d42879f8ace9bf6f2f230aee02559ccb6d03de8bcb8b935d78a593cd41615ef8c8a712d9b170c6a3db15341d3e588a861577b65401be3845
 EBUILD hatchling-1.8.1.ebuild 1988 BLAKE2B 7e6587bd516b6bf64cdf96c07a3c58c277755b51ac02ce13c12608bc78d9ce75bc4e49cbcee4fb6144f7bdbe76aaadfb4289b28cf5064328d1ad0d4a2f84e9b7 SHA512 1cd12a200fe2a227d42879f8ace9bf6f2f230aee02559ccb6d03de8bcb8b935d78a593cd41615ef8c8a712d9b170c6a3db15341d3e588a861577b65401be3845
+EBUILD hatchling-1.9.0.ebuild 1988 BLAKE2B 7e6587bd516b6bf64cdf96c07a3c58c277755b51ac02ce13c12608bc78d9ce75bc4e49cbcee4fb6144f7bdbe76aaadfb4289b28cf5064328d1ad0d4a2f84e9b7 SHA512 1cd12a200fe2a227d42879f8ace9bf6f2f230aee02559ccb6d03de8bcb8b935d78a593cd41615ef8c8a712d9b170c6a3db15341d3e588a861577b65401be3845
 MISC metadata.xml 365 BLAKE2B 5a40a6cf6df042e6e8387830babd0171c9d8bc5d490fe2175b83d1588d827e826b49044ef29de48553515996b742fc475bb9699dcfa8ec05229162b22e0ed317 SHA512 f11bb25bc12c2bb0b0a0a4691115b9a2af525d9e44b33e0d6db98c7fcef0b49b5989fb7574ee8b27bc88f1dd2543bfdd492a6614de172e2c4edabbee8bf6161e
diff --git a/dev-python/hatchling/hatchling-1.9.0.ebuild b/dev-python/hatchling/hatchling-1.9.0.ebuild
new file mode 100644
index 000000000000..868dd0172a97
--- /dev/null
+++ b/dev-python/hatchling/hatchling-1.9.0.ebuild
@@ -0,0 +1,74 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=standalone
+PYTHON_TESTED=( pypy3 python3_{8..11} )
+PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" )
+
+inherit distutils-r1
+
+TAG=${P/-/-v}
+MY_P=hatch-${TAG}
+DESCRIPTION="Modern, extensible Python build backend"
+HOMEPAGE="
+	https://pypi.org/project/hatchling/
+	https://github.com/pypa/hatch/
+"
+SRC_URI="
+	https://github.com/pypa/hatch/archive/${TAG}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}/backend
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/editables-0.2[${PYTHON_USEDEP}]
+	>=dev-python/packaging-21.3[${PYTHON_USEDEP}]
+	>=dev-python/pathspec-0.9[${PYTHON_USEDEP}]
+	>=dev-python/pluggy-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/tomli-1.2.2[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	${RDEPEND}
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/atomicwrites[${PYTHON_USEDEP}]
+			dev-python/click[${PYTHON_USEDEP}]
+			dev-python/httpx[${PYTHON_USEDEP}]
+			dev-python/platformdirs[${PYTHON_USEDEP}]
+			dev-python/rich[${PYTHON_USEDEP}]
+			dev-python/tomli-w[${PYTHON_USEDEP}]
+			dev-python/virtualenv[${PYTHON_USEDEP}]
+		' "${PYTHON_TESTED[@]}")
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then
+		einfo "Skipping tests on ${EPYTHON}"
+		return
+	fi
+
+	local -x EPYTEST_DESELECT=(
+		# these run pip to install stuff
+		tests/backend/dep/test_core.py::test_dependency_found
+		tests/backend/dep/test_core.py::test_extra_met
+		tests/backend/dep/test_core.py::test_extra_no_dependencies
+		tests/backend/dep/test_core.py::test_extra_unmet
+		tests/backend/dep/test_core.py::test_unknown_extra
+		tests/backend/dep/test_core.py::test_version_unmet
+	)
+
+	# top-level "tests" directory contains tests both for hatch
+	# and hatchling
+	cd "${WORKDIR}/${MY_P}" || die
+	local -x PYTHONPATH="src:${PYTHONPATH}"
+	epytest tests/backend
+}
diff --git a/dev-python/jsonschema/Manifest b/dev-python/jsonschema/Manifest
index 3e7b5b9848c6..b0a7837e4ed7 100644
--- a/dev-python/jsonschema/Manifest
+++ b/dev-python/jsonschema/Manifest
@@ -4,6 +4,7 @@ DIST jsonschema-4.12.1.tar.gz 287475 BLAKE2B 78f4e6fa120eef9ac3fead84fa28b16a8f4
 DIST jsonschema-4.13.0.tar.gz 288024 BLAKE2B 1d3a08626c2c24b5a35f69500fdafcb7acdda1f6c4830b0e601776118c760774626c85516e0e4b99e31cfedab6b6e2ac7dde9b1ff57f726b236aa45daff34701 SHA512 11de8bbdd0723f7ebf8dacabcdb9ad59e909ebf096c3864259cbd151281f3306cb1cd2b76a74c84e84cdb8cb5263e62d7e63e2b0f4d55065dc50e7e2c7de29ad
 DIST jsonschema-4.14.0.tar.gz 288641 BLAKE2B d2da24ce7da041238060d20fe6aa1a86be9a6f0b7986d7def641b4c09a39b196d10e40808d8f2ec80f8e43ad9f54bf2df2ff127624f5a7cceef6d4800cd2a9bc SHA512 b999db155ba6b4a3fd1c3650182d519c49d4f12c3ed64c6806e7dffd97e4c8c7ea129f0b6c5965b7e61a8e5589e12d554f2f7fd8ce90029bcd25ce97cd5ed72f
 DIST jsonschema-4.15.0.tar.gz 290458 BLAKE2B 5b43f5ceb6c02a82a9440dc0009123131d225e1aecd0ecb3e434f90f18192e5911916fba018ec1f636751bc019eef2840816d70cc53e7a84e82a149e66b99134 SHA512 8293b1dd7b16eb77b19ce89608384b3d97c1523ba080f38e6293390ba1b326d970721fdd6966623fc8a94b2b3357d1a68e1cc40b16eed037979fe6eb5684fa3f
+DIST jsonschema-4.16.0.tar.gz 292399 BLAKE2B b1a78bc7dbc7cd10324638b57ebe4593afbdcbeb8d4b247aa127f41d5f6cce5e7970f5db1576e6a761357d8efe453ef514ae49f58b6624a05c4b7771daff3721 SHA512 c84abc992f410e9d558e2ce06c7172e9e2d298cff469baf8a23b1ea5b4777e6addfa757c5cc62b2e28e257721ee55e04bec0852e5f525adfa87392cbf712828f
 DIST jsonschema-4.8.0.tar.gz 279424 BLAKE2B 9e8936bde13841f9edf42ffe214ce8d1aaae8b9be4c3040871f228399a31b4292e8cfbf4bf4261822ca1b88622cb69cdf0d55bd2cc51bf191f6e364e9bfb94f8 SHA512 75a7593eb8b0163ba428f507ed4fd9fa6d51567f284776af96f4d79cb507a69666cc048034bfa3a401f960295779e935562dde4e97cf3f7b3b4571bc28b9dde7
 DIST jsonschema-4.9.0.tar.gz 281100 BLAKE2B 5a1c387fc33735ffd39342f3e62600aea721a51be0995d10aa1726e8e4c3bf93694a7844410c0b245c699880d6642a6903525b3637883f5e662086b53deb0948 SHA512 73fc9958f37802c4558ea6893386810784d2b577c04423b7090fce4cd052e3af078f0b0c46b2b16f96bb49820047f1ec5d96cf6c6cb822fca1d988cf1d70209f
 DIST jsonschema-4.9.1.tar.gz 281177 BLAKE2B 210308d140b39f5a5506a3561b8eaa211fbc9a0eb0576975125fa998bf9a507221b5ab75bd4d0f5bcd6d2e3b70a1a07ef4bcfb1d0b88b29a218b074b7d5649a1 SHA512 d63b927c183077d0fe6978536416523229be0ce3a393e6cbc12fd9229bfa45ba035fd721a7722042d7cb6bcf4c720485d7ff877aae93cd62c9c48b984e802267
@@ -13,6 +14,7 @@ EBUILD jsonschema-4.12.1.ebuild 1597 BLAKE2B 8c683db7166917b40283069726e3fbeee0b
 EBUILD jsonschema-4.13.0.ebuild 1597 BLAKE2B 8c683db7166917b40283069726e3fbeee0bd7377cdbc653f9fa78c54d11e1fc38423da5c2da0f56cc6851029a14d756f8b44b6adde5657e6494d58a22d306b00 SHA512 7c261b89468f12bc7e5f8c3ce38ed437d5fb7c1fc0847b26ccd65764c0244a0c43c58c6e9c9fb49703c7858bbf22c28bd66c8699adf3fe2e4249eb08200b335c
 EBUILD jsonschema-4.14.0.ebuild 1630 BLAKE2B e2cab72bfdc72e91b82528da0aa2420260e506a3200b6d9463edf67687e5ad660cd4fa4467a68dd3cda9989ce3c56f960e29a7ad45a0872d4baae333ce206ddc SHA512 4236c2dc7d91f200dc4625b385013711bba71fbeafb1aca42be7caba353152e051073813dd2e9067933185294660e3c79ac48fd88f7f52d367c7a337af26311b
 EBUILD jsonschema-4.15.0.ebuild 1635 BLAKE2B 2f34f261c0c72140e505307af23d4b8153915b4292daedd6225df68c0e971e58045fcf74f278308dcfb9fb5e0eabe884979b8cb0b207252481cd6b84a29164bd SHA512 3e34fcfc80ebe224f24421d270afea1aad3a504ab08418d98a9ede1509c0a534f511b315fb4df5adbe2ea6d3d280d698b516c305821a1ba3a0dfede15715e8dd
+EBUILD jsonschema-4.16.0.ebuild 1635 BLAKE2B 2f34f261c0c72140e505307af23d4b8153915b4292daedd6225df68c0e971e58045fcf74f278308dcfb9fb5e0eabe884979b8cb0b207252481cd6b84a29164bd SHA512 3e34fcfc80ebe224f24421d270afea1aad3a504ab08418d98a9ede1509c0a534f511b315fb4df5adbe2ea6d3d280d698b516c305821a1ba3a0dfede15715e8dd
 EBUILD jsonschema-4.8.0.ebuild 1470 BLAKE2B 83d64bd08bf75a1a8a37dc993658b3f235a6a83ec0c35b5ab25ac165cafc4a8e5d70855fdecef07b40d788ca699d9a01514a2e1a3050d7d457ea71c2527fdcb0 SHA512 16dfb19e0f76c4895172f529ed19c1e467fc7101543c913f467832c2cd45fbd23f7e8e59a07301b07381c3e8e86f68b0930555dde52973af3622e7b3e65862cf
 EBUILD jsonschema-4.9.0.ebuild 1504 BLAKE2B aa9b279331f3b6a70a45689ae877831c2fc4adf91faa5322fb67807bd2bb2181f74ce0de649da5e7df813934409b5d9b0ead05af3c4eba4d7f52cf98b295dfd8 SHA512 e13292a358daf85b43d82abe65a0123ac4971dcaaf50f70cde560a62e93d2227ec6064f97088a2c112cacb8ad18a3b636c000b54897e4e1ab3de0ab475362f60
 EBUILD jsonschema-4.9.1.ebuild 1514 BLAKE2B 19d8e4a089123ff41759d592d0dfe3026142fec387ff1febb996daada9d3072a462dc5cfe5f14c2c7cbfe5951b84ae6f62f23fdc70c054002813746d1a006f99 SHA512 2f95a3267ba7998648a4ddfbb2bf99d910e7e6cdc5401cd5da45d322150778273bc7b5f49972e6304ae2cf561f15cd9149d8b1f208502f2d17b8a4b00198251b
diff --git a/dev-python/jsonschema/jsonschema-4.16.0.ebuild b/dev-python/jsonschema/jsonschema-4.16.0.ebuild
new file mode 100644
index 000000000000..ad9472cc3b95
--- /dev/null
+++ b/dev-python/jsonschema/jsonschema-4.16.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="An implementation of JSON-Schema validation for Python"
+HOMEPAGE="
+	https://pypi.org/project/jsonschema/
+	https://github.com/python-jsonschema/jsonschema/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/attrs-17.4.0[${PYTHON_USEDEP}]
+	>=dev-python/pyrsistent-0.18.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_resources-1.4.0[${PYTHON_USEDEP}]
+		dev-python/pkgutil_resolve_name[${PYTHON_USEDEP}]
+	' 3.8)
+"
+BDEPEND="
+	dev-python/hatch-vcs[${PYTHON_USEDEP}]
+	dev-python/hatch-fancy-pypi-readme[${PYTHON_USEDEP}]
+"
+
+# formatter deps
+RDEPEND+="
+	dev-python/fqdn[${PYTHON_USEDEP}]
+	dev-python/idna[${PYTHON_USEDEP}]
+	dev-python/isoduration[${PYTHON_USEDEP}]
+	>=dev-python/jsonpointer-1.13[${PYTHON_USEDEP}]
+	dev-python/rfc3339-validator[${PYTHON_USEDEP}]
+	dev-python/rfc3986-validator[${PYTHON_USEDEP}]
+	dev-python/rfc3987[${PYTHON_USEDEP}]
+	dev-python/uri_template[${PYTHON_USEDEP}]
+	>=dev-python/webcolors-1.11[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# requires pip, does not make much sense for the users
+	jsonschema/tests/test_cli.py::TestCLIIntegration::test_license
+	# wtf?
+	jsonschema/tests/test_deprecations.py::TestDeprecations::test_version
+	jsonschema/tests/test_jsonschema_test_suite.py::test_suite_bug
+)
diff --git a/dev-python/nbclient/Manifest b/dev-python/nbclient/Manifest
index 01f62fb6b05d..bd6c55aa7df1 100644
--- a/dev-python/nbclient/Manifest
+++ b/dev-python/nbclient/Manifest
@@ -1,5 +1,7 @@
 DIST nbclient-0.6.6.gh.tar.gz 78247 BLAKE2B 06793fe792dcb8606d74e85a7a5c4d8f3ba850f81191bf205706e404e67bfe3d6914dff5790c5d6dca62d7797482518b5d87b06da34f06a5cb44a8a0ff6855e4 SHA512 8ca0333a47920994d8afe7c8943b366d4669e7ad91daab1a36c57480b70e51dfd05c7cd44acd2a2005b8c0a6b41c4fe6be0fc22b75a3efe291e9c35dd334643c
 DIST nbclient-0.6.7.gh.tar.gz 78345 BLAKE2B dba9c98ab7d0b65470268dabc5d7dbee65e9c800252e61de6e9fe28a59a2da5c9b2046b7835468a8807445bb657152071cad7a28c717049d5762c13634175e34 SHA512 67fc7a6685df783a0d3af728e18ad2ff7a46d17c66a8e23f651a4d329896ee84d7dda8fcc62c94e277a742c74fe51b9f15f415add747a346ddf3d29056382f23
+DIST nbclient-0.6.8.gh.tar.gz 78431 BLAKE2B a59490a42af5fb6090b7e4ddd8c469ddce015ca47ceca51290d9b3b2173d93d2a2d13839b227a78cdd72afdada1f305f810337dcc7aa08818afa78bbc96c4a1d SHA512 2393085e52e2e34574b6f60cff82317caf3b636f8476af20765282f0ebf158104fed3bb7fc8e8f800ff42f7eddc226cf7d9575c2043628fd926708ef71306c04
 EBUILD nbclient-0.6.6.ebuild 1144 BLAKE2B 73fc09af64e28fb76e971b9bce6850bf52dff38c0156640c64c1238fb4a1748942327407ac6487b6f8096122a0645ce96aec1e58d6f9862675d7a42fa1d8ae1d SHA512 74335ca36c54eab4e040e4f8146388055a94eb5abc486baa94fc005091a5eaf840129f15e058f1ef8f6db8072a5b896860adf084d20531730d5462b20866a066
 EBUILD nbclient-0.6.7.ebuild 1152 BLAKE2B 19fd773a0fb377cb4c48f94ea21682d850095ec7a72acdc8fa16e6fb8b67f354720d00e3290da2ad274204024415f5ff60a5ebfa996a35392ccabc9752dfa285 SHA512 2ee5cc22265d688fbad357d4a811efc6aa53add711ff9c7f1b7874dd72453f9df28da23a42e046e3b58b890ae70abe6647141686f79f641907615344e17da277
+EBUILD nbclient-0.6.8.ebuild 1213 BLAKE2B 5db80b727992fe41dbf27102e4689d9c878f823c0d3da38742eff5fccd185730b0ba183996694f681f2036f6eee289b501c17328d37067fd0ac105eb3a459e84 SHA512 d6a92fbc5424eb8e80168b411789bb7f02c41a6dc8da19189ede1150c400ef671324f2167aea5104fc52b63d80866909295a685a43628e3b14e852832bde1aa1
 MISC metadata.xml 405 BLAKE2B d1efa5f7bb2a959bdbc6093b1bd3930e6cdb9bffbe872c6775c15dfc1024ae24d6bcb4651c8e1fb06242b17d6a86f683de3b528bbf1a60b5656a90c1f4ac81b7 SHA512 5b0de690d37dd5928e3bfd0b380336d154cced094e342b41dfd16d0caddd2b792a2158b209404a36461cf4d1b12d836024eae2aedf15093b90f4e363382b38bf
diff --git a/dev-python/nbclient/nbclient-0.6.8.ebuild b/dev-python/nbclient/nbclient-0.6.8.ebuild
new file mode 100644
index 000000000000..343192040c27
--- /dev/null
+++ b/dev-python/nbclient/nbclient-0.6.8.ebuild
@@ -0,0 +1,47 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="A client library for executing Jupyter notebooks"
+HOMEPAGE="
+	https://nbclient.readthedocs.io/en/latest/
+	https://github.com/jupyter/nbclient/
+	https://pypi.org/project/nbclient/
+"
+SRC_URI="
+	https://github.com/jupyter/nbclient/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/jupyter_client-6.1.5[${PYTHON_USEDEP}]
+	>=dev-python/nbformat-5.0[${PYTHON_USEDEP}]
+	dev-python/nest_asyncio[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-5.2.2[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/ipython[${PYTHON_USEDEP}]
+		dev-python/ipykernel[${PYTHON_USEDEP}]
+		dev-python/ipywidgets[${PYTHON_USEDEP}]
+		dev-python/testpath[${PYTHON_USEDEP}]
+		dev-python/xmltodict[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	nbclient/tests/test_client.py::test_many_parallel_notebooks
+	'nbclient/tests/test_client.py::test_run_all_notebooks[Interrupt.ipynb-opts6]'
+)
diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index b5a068a3075c..5c736231a90f 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -12,6 +12,7 @@ DIST numpy-1.22.4.zip 11458830 BLAKE2B c999a42119e8d71942e4df4802ea22eef6c1ab65e
 DIST numpy-1.23.0.tar.gz 10714532 BLAKE2B 8b7784adfe4aba8a21a50b460b908cd20eede912f46cc6840a65c03f4f128123ead64e61768ff839a6a79797680a5189ff39284be5819bacb6eb7e1902a09656 SHA512 899d0ca062b676b64de0da204339694dcb7e52f257625e971f9a8ad7267206a6ad2924353e4dd1e153b4a64ae318380899c9e1ee7a6f53fdeba4c19b34917583
 DIST numpy-1.23.1.tar.gz 10716841 BLAKE2B c8b17bc6f1626a32fd62ac3e952f6ee4a5886ba9ab9721be540831d3cdb19c4ea7cefcb422b12384fd4804d12f6f4b0d8f1e0110306e426a2b92d5f98acd62f7 SHA512 b34fb627e0e548bae3cf4555c4c71ab4a170ade86a9ff4011a5dfac6aba29e2e04b1151b9364cd1efff004efc1c04b3bab111facbcdc3297f8c38d7a09c83e17
 DIST numpy-1.23.2.tar.gz 10719306 BLAKE2B d9f41d34331a3b5690e0bd4eedf050c31e088e1d6b01af6fed7e2bacc281ba7587975c5fda690c8b8f392ddef1a2ab2b6a18f6098d55876485eae58d36f98212 SHA512 ac5ed21887d41c94d395bfee2bb5492453b375344e43a9944224dac2eb13c6ad7477aa7a626d032d27b1c610e269232998ecc77a327da887748e794bf28c3feb
+DIST numpy-1.23.3.tar.gz 10726039 BLAKE2B 4b6d38fc0363ea89f173a0cd65368b7c154b45f7f661098378f7ef31208008d5ff17ae58eab72bed921d166d630a4eca3441fc3097cd41a4a945b8f8180375cc SHA512 e690ea2906c91e567df2c801fbfe41652dabd37208faa99d6e068bda423dcc9f88be013478e9b6c1a339c36ef4c44b07a067d44e4e9c4b2e4f1344cbcb0598a9
 DIST numpy-html-1.21.0.zip 24270531 BLAKE2B 8a7a531afa559aebeb7a7b7ef94b2248df60a60fdfc190ca002dda625003df8b432fed393d6dd0c0c00fafbeb5064a61e3d99bba1a6c41e1e6e34ce091a43c89 SHA512 a165b95729a13806a03464cf39c20a0e18cfcf7701f05cd7777cd115bfaf0972f7155d201c7bd8d4177c5761f8800c982b3e3c29729a5e9ed356059842a44dcc
 DIST numpy-html-1.21.5.zip 24270531 BLAKE2B 8a7a531afa559aebeb7a7b7ef94b2248df60a60fdfc190ca002dda625003df8b432fed393d6dd0c0c00fafbeb5064a61e3d99bba1a6c41e1e6e34ce091a43c89 SHA512 a165b95729a13806a03464cf39c20a0e18cfcf7701f05cd7777cd115bfaf0972f7155d201c7bd8d4177c5761f8800c982b3e3c29729a5e9ed356059842a44dcc
 DIST numpy-html-1.22.1.zip 23724824 BLAKE2B 44ea3da0a703a024a629c8413dfffaf760458b185d19452da0e7e23c819e19833291e10ebd07bdda794077574b8852a368036dda8335c2753cd481740497502a SHA512 4077d9974bfd7f2c189025c3740350652e6f8e0b5727fbc9711a1c0118c1e4ecc281d4876baf1c6a5dc802d20178d6b04a2922f14e9c321cd3b68228b1e295c3
@@ -21,6 +22,7 @@ DIST numpy-html-1.22.4.zip 23724824 BLAKE2B 44ea3da0a703a024a629c8413dfffaf76045
 DIST numpy-html-1.23.0.zip 27964271 BLAKE2B 0aa26d7c39f2d6b119e404dfb9642967770881ee0d640157a9ed11d16f21cd43109bed3c08f89fda457ec470292d945e2bf8b2dab56e4b36192d5e8eb3757b44 SHA512 218a2e893816af767c7cedd1f2256e05f68e59491c29277c95de653a206aaff35c5fe3bc6afd6d6d5ea7957748ec565593eb30d004e36e94c894ea4a6884902a
 DIST numpy-html-1.23.1.zip 27964271 BLAKE2B 0aa26d7c39f2d6b119e404dfb9642967770881ee0d640157a9ed11d16f21cd43109bed3c08f89fda457ec470292d945e2bf8b2dab56e4b36192d5e8eb3757b44 SHA512 218a2e893816af767c7cedd1f2256e05f68e59491c29277c95de653a206aaff35c5fe3bc6afd6d6d5ea7957748ec565593eb30d004e36e94c894ea4a6884902a
 DIST numpy-html-1.23.2.zip 27964271 BLAKE2B 0aa26d7c39f2d6b119e404dfb9642967770881ee0d640157a9ed11d16f21cd43109bed3c08f89fda457ec470292d945e2bf8b2dab56e4b36192d5e8eb3757b44 SHA512 218a2e893816af767c7cedd1f2256e05f68e59491c29277c95de653a206aaff35c5fe3bc6afd6d6d5ea7957748ec565593eb30d004e36e94c894ea4a6884902a
+DIST numpy-html-1.23.3.zip 27964271 BLAKE2B 0aa26d7c39f2d6b119e404dfb9642967770881ee0d640157a9ed11d16f21cd43109bed3c08f89fda457ec470292d945e2bf8b2dab56e4b36192d5e8eb3757b44 SHA512 218a2e893816af767c7cedd1f2256e05f68e59491c29277c95de653a206aaff35c5fe3bc6afd6d6d5ea7957748ec565593eb30d004e36e94c894ea4a6884902a
 DIST numpy-ref-1.21.0.pdf 7326979 BLAKE2B 3c1130a576c46e0705ca1f12e7a3345beb1acdd23de2a81448e4e9755636dec313e277a0d3167dc3b211332b3fc415ac0d96e7c99e859b51a16a589426814182 SHA512 5dd37ca03f1f098fffce80aa6a1a6eb8ec66df4322da1c620bd1f507e89ee2ceb222de32c9b7974f085ddf146f0a789ea8eb27d792a13c1aa8a893c00f94f75f
 DIST numpy-ref-1.21.5.pdf 7326979 BLAKE2B 3c1130a576c46e0705ca1f12e7a3345beb1acdd23de2a81448e4e9755636dec313e277a0d3167dc3b211332b3fc415ac0d96e7c99e859b51a16a589426814182 SHA512 5dd37ca03f1f098fffce80aa6a1a6eb8ec66df4322da1c620bd1f507e89ee2ceb222de32c9b7974f085ddf146f0a789ea8eb27d792a13c1aa8a893c00f94f75f
 DIST numpy-ref-1.22.1.pdf 7537013 BLAKE2B 702398fddde349901f9303f4788a3ae3cc4bb78b4d310e169fcc6193fd62b33947c89ede45ba9aaea55e74f6a6abc755d3d94428adce9a8163678c6718aec2da SHA512 c1617817f94ccdfe2bbdebdc9c6869beefa1369d5ab0897c1573d8fb5cb3de153f90d5588aae84a0f498fba57ad6bc5c0c5c2c3aefb119e2913e4ddf007cc8e1
@@ -30,6 +32,7 @@ DIST numpy-ref-1.22.4.pdf 7537013 BLAKE2B 702398fddde349901f9303f4788a3ae3cc4bb7
 DIST numpy-ref-1.23.0.pdf 7715485 BLAKE2B 7fbb0ce29e86fc7cd4932a6a9f0221b579b6cae695231edfebf863e5b4c2920796d802ccf9ae3e05b331964ac7c4f51099578d91b6b7fb357c6de2110a5f7cba SHA512 6036c6a36f332b83f371c7530a6ba6f354b1334d667d2a52993a1e52aa9d94d524e216f768928a006c717ed4b4131879f6e491a294ecfd3a0d1b0f9f937a887a
 DIST numpy-ref-1.23.1.pdf 7715485 BLAKE2B 7fbb0ce29e86fc7cd4932a6a9f0221b579b6cae695231edfebf863e5b4c2920796d802ccf9ae3e05b331964ac7c4f51099578d91b6b7fb357c6de2110a5f7cba SHA512 6036c6a36f332b83f371c7530a6ba6f354b1334d667d2a52993a1e52aa9d94d524e216f768928a006c717ed4b4131879f6e491a294ecfd3a0d1b0f9f937a887a
 DIST numpy-ref-1.23.2.pdf 7715485 BLAKE2B 7fbb0ce29e86fc7cd4932a6a9f0221b579b6cae695231edfebf863e5b4c2920796d802ccf9ae3e05b331964ac7c4f51099578d91b6b7fb357c6de2110a5f7cba SHA512 6036c6a36f332b83f371c7530a6ba6f354b1334d667d2a52993a1e52aa9d94d524e216f768928a006c717ed4b4131879f6e491a294ecfd3a0d1b0f9f937a887a
+DIST numpy-ref-1.23.3.pdf 7715485 BLAKE2B 7fbb0ce29e86fc7cd4932a6a9f0221b579b6cae695231edfebf863e5b4c2920796d802ccf9ae3e05b331964ac7c4f51099578d91b6b7fb357c6de2110a5f7cba SHA512 6036c6a36f332b83f371c7530a6ba6f354b1334d667d2a52993a1e52aa9d94d524e216f768928a006c717ed4b4131879f6e491a294ecfd3a0d1b0f9f937a887a
 DIST numpy-user-1.21.0.pdf 5142404 BLAKE2B d670f1eb0f060599a640c52bdeba53b1758007fc2090a5b8fb6e135e71114149a0085811e4bc21396eabb1123ffb9edd39f8192d0165ab42dd066a9747eb3a3f SHA512 dde264abff1787efd50e913b6facf83522b3344ed88fd15d6fe73ecd44c6a3db1e4ce4251c9674bbcb122f72ab86c64142b2f4f992a6449405041f8e1f5f1ace
 DIST numpy-user-1.21.5.pdf 5142404 BLAKE2B d670f1eb0f060599a640c52bdeba53b1758007fc2090a5b8fb6e135e71114149a0085811e4bc21396eabb1123ffb9edd39f8192d0165ab42dd066a9747eb3a3f SHA512 dde264abff1787efd50e913b6facf83522b3344ed88fd15d6fe73ecd44c6a3db1e4ce4251c9674bbcb122f72ab86c64142b2f4f992a6449405041f8e1f5f1ace
 DIST numpy-user-1.22.1.pdf 3978348 BLAKE2B 87cc73cb1c406446eb9d86ea6cbaeac6ba13c7d2b2ffd47524483af1698c3efdfaafe61e987624c5ce01939494861413b271e9a96f49abbbe69d634b9be55c95 SHA512 8e04c0c90255038471de6ef0f8f4ed9e356d646b028bb16f667f3c59170eddaa0d86d48226462c5c17b8123b2a28a09982764979e9e76658b4e26cd0a976f3a1
@@ -39,6 +42,7 @@ DIST numpy-user-1.22.4.pdf 3978348 BLAKE2B 87cc73cb1c406446eb9d86ea6cbaeac6ba13c
 DIST numpy-user-1.23.0.pdf 4123384 BLAKE2B d4587c9f979e1ef4734768598d6e106f2b4b0c8222f901a6c4caf0920e41622201252c5bd172b16346e0357138b5ff27c59e56c851be5ae3b7712624bd9cc5b4 SHA512 58e1ab96d2cfbd96df205c86f0a1a09e204349f70d21df7f8481c21ded8b46f4b9ede3216d5cce6c2b9bfc0aacbecdfa198bdb2d4c258a0dd4acb6e3ba421f9c
 DIST numpy-user-1.23.1.pdf 4123384 BLAKE2B d4587c9f979e1ef4734768598d6e106f2b4b0c8222f901a6c4caf0920e41622201252c5bd172b16346e0357138b5ff27c59e56c851be5ae3b7712624bd9cc5b4 SHA512 58e1ab96d2cfbd96df205c86f0a1a09e204349f70d21df7f8481c21ded8b46f4b9ede3216d5cce6c2b9bfc0aacbecdfa198bdb2d4c258a0dd4acb6e3ba421f9c
 DIST numpy-user-1.23.2.pdf 4123384 BLAKE2B d4587c9f979e1ef4734768598d6e106f2b4b0c8222f901a6c4caf0920e41622201252c5bd172b16346e0357138b5ff27c59e56c851be5ae3b7712624bd9cc5b4 SHA512 58e1ab96d2cfbd96df205c86f0a1a09e204349f70d21df7f8481c21ded8b46f4b9ede3216d5cce6c2b9bfc0aacbecdfa198bdb2d4c258a0dd4acb6e3ba421f9c
+DIST numpy-user-1.23.3.pdf 4123384 BLAKE2B d4587c9f979e1ef4734768598d6e106f2b4b0c8222f901a6c4caf0920e41622201252c5bd172b16346e0357138b5ff27c59e56c851be5ae3b7712624bd9cc5b4 SHA512 58e1ab96d2cfbd96df205c86f0a1a09e204349f70d21df7f8481c21ded8b46f4b9ede3216d5cce6c2b9bfc0aacbecdfa198bdb2d4c258a0dd4acb6e3ba421f9c
 EBUILD numpy-1.21.5.ebuild 4250 BLAKE2B 566a16851c2b64a2960c578dd462380573c861ce31aae4ae04f298caa7be278a1d81bb315ae45d6d616d9169ce8c83c4e8308e979149b069f7aee909ef114fa5 SHA512 73185b6fb426e2c0851796ec9487992dfc5655f7b2e862ee881e9af2b9e8121beab5b81f315c91faf287f8aa50215956f5ae9298c8a16e7ad0ba8f5fd675bc50
 EBUILD numpy-1.22.0-r1.ebuild 4230 BLAKE2B 25c3b4283ea4a58cbcd8c1ef2ea539fa0d378c00a873a633bb81a40d146eb43bda016d98689e9306e4050cab65a265ad5908e8a8a3bbc755d82e42c99a68aa77 SHA512 9aeda8408565e61c7f1b18b909fac304f13b3ab59606a5f5957cc19905803b62656d3035cb7c4588ac37ca150b3d6d2fa1c06c5c882fc02b65d15b418778a750
 EBUILD numpy-1.22.1.ebuild 4475 BLAKE2B ee6d48a454d685da1ee4715391c0ca9dbe4072980c09bfa9c21e217a6a94509c3172828f76f0c408ce8c6c3655842a184c1636bf3d923a2bdfb35b6f0667345a SHA512 9f2898c9ab8bb3b2a7007ebd0f7094b844c74b05f64e62418a6ac9ba27f96f7eb7bfaeb480b267f615b4406040e651f16d254afd9db4a2f3e8381e545d341f89
@@ -48,4 +52,5 @@ EBUILD numpy-1.22.4.ebuild 5018 BLAKE2B a3295f9dad57cd39b62c9095bc5c1e51274821e9
 EBUILD numpy-1.23.0.ebuild 5073 BLAKE2B 32f377be0893beec58c4074d5514ae8bfefaf0a458f398bd481222c5f06045580c3cb21d963d06b8af8203f2d666f630e26ed313e8a1792e05ef5cd4b93af2e2 SHA512 b31aae22b0569df0e9871bf32c80fb7d273c90e05f04d2645c873a5fdc3a5d00150623b49e49a06d18dbe52859ec559d72dec07cf6215a4d6cad639400a05ab6
 EBUILD numpy-1.23.1.ebuild 5066 BLAKE2B 4f5adb42a2631323eb676097ef6cfa343bd53944de342f382e76d4c93e7b9578dbe2f04959a00d17bb8b1a58ea08c4af2503e19bda6f6c1f1b5caab21a33e514 SHA512 d8d3e30fb62933b0907ef322bf5dec7331077cba94fc7cfe32dffdacf3f187d2575ccb85f3bc86eb34d4a085692f4f753153364ec05dbca734f369ffd943d734
 EBUILD numpy-1.23.2.ebuild 4904 BLAKE2B dc24a0d2a22d985086a49bdaf0333cdae749fa6ea344252636eb0279dfb6a706cf9574cff1529b64918bc99b0bf0184f76fad4228aa25df22c34dae8ac328a73 SHA512 c4771518334b27985b86b1fc41d322e4523b8a35309052a07a506400b1355e48abe88667550dd69e8c0e6fb9d6481eb1c24cd6edd1aa08b603dc1bd433de087e
+EBUILD numpy-1.23.3.ebuild 4904 BLAKE2B dc24a0d2a22d985086a49bdaf0333cdae749fa6ea344252636eb0279dfb6a706cf9574cff1529b64918bc99b0bf0184f76fad4228aa25df22c34dae8ac328a73 SHA512 c4771518334b27985b86b1fc41d322e4523b8a35309052a07a506400b1355e48abe88667550dd69e8c0e6fb9d6481eb1c24cd6edd1aa08b603dc1bd433de087e
 MISC metadata.xml 930 BLAKE2B 8731116ae6d997dc77539b6ff9a8aff2466986888e3fc2c2a77499522360ba5ba11ec61e4eb6756b7cdbb9d7dafe05a862708dcc0735260e8af038a42dea3419 SHA512 1db89ba1a99457bef29a9501e2d14c11904251163172604fe58001048beb477eba5b1e4784c8636d0eb6767614b80a7341823a9d264a5663cc055a5a2c437390
diff --git a/dev-python/numpy/numpy-1.23.3.ebuild b/dev-python/numpy/numpy-1.23.3.ebuild
new file mode 100644
index 000000000000..18d0a7787bc5
--- /dev/null
+++ b/dev-python/numpy/numpy-1.23.3.ebuild
@@ -0,0 +1,187 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+PYTHON_REQ_USE="threads(+)"
+
+FORTRAN_NEEDED=lapack
+
+inherit distutils-r1 flag-o-matic fortran-2 toolchain-funcs
+
+DOC_PV=${PV}
+# For when docs aren't ready yet, set to last version
+#DOC_PV=1.23.0
+DESCRIPTION="Fast array and numerical python library"
+HOMEPAGE="
+	https://numpy.org/
+	https://github.com/numpy/numpy/
+	https://pypi.org/project/numpy/
+"
+SRC_URI="
+	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+	doc? (
+		https://numpy.org/doc/$(ver_cut 1-2 ${DOC_PV})/numpy-html.zip -> numpy-html-${DOC_PV}.zip
+		https://numpy.org/doc/$(ver_cut 1-2 ${DOC_PV})/numpy-ref.pdf -> numpy-ref-${DOC_PV}.pdf
+		https://numpy.org/doc/$(ver_cut 1-2 ${DOC_PV})/numpy-user.pdf -> numpy-user-${DOC_PV}.pdf
+	)
+"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc lapack"
+
+RDEPEND="
+	lapack? (
+		>=virtual/cblas-3.8
+		>=virtual/lapack-3.8
+	)
+"
+BDEPEND="
+	${RDEPEND}
+	>=dev-python/cython-0.29.30[${PYTHON_USEDEP}]
+	lapack? (
+		virtual/pkgconfig
+	)
+	doc? (
+		app-arch/unzip
+	)
+	test? (
+		>=dev-python/hypothesis-5.8.0[${PYTHON_USEDEP}]
+		>=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
+		>=dev-python/cffi-1.14.0[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/numpy-1.22.0-no-hardcode-blasv2.patch
+)
+
+distutils_enable_tests pytest
+
+src_unpack() {
+	default
+	if use doc; then
+		unzip -qo "${DISTDIR}"/numpy-html-${DOC_PV}.zip -d html || die
+	fi
+}
+
+python_prepare_all() {
+	# Allow use with setuptools 60.x
+	# See numpy-1.22.1-revert-setuptools-upper-bound.patch for details
+	export SETUPTOOLS_USE_DISTUTILS=stdlib
+
+	if use lapack; then
+		local incdir="${EPREFIX}"/usr/include
+		local libdir="${EPREFIX}"/usr/$(get_libdir)
+		cat >> site.cfg <<-EOF || die
+			[blas]
+			include_dirs = ${incdir}
+			library_dirs = ${libdir}
+			blas_libs = cblas,blas
+			[lapack]
+			library_dirs = ${libdir}
+			lapack_libs = lapack
+		EOF
+	else
+		export {ATLAS,PTATLAS,BLAS,LAPACK,MKL}=None
+	fi
+
+	export CC="$(tc-getCC) ${CFLAGS}"
+
+	append-flags -fno-strict-aliasing
+
+	# See progress in http://projects.scipy.org/scipy/numpy/ticket/573
+	# with the subtle difference that we don't want to break Darwin where
+	# -shared is not a valid linker argument
+	if [[ ${CHOST} != *-darwin* ]]; then
+		append-ldflags -shared
+	fi
+
+	# only one fortran to link with:
+	# linking with cblas and lapack library will force
+	# autodetecting and linking to all available fortran compilers
+	append-fflags -fPIC
+	if use lapack; then
+		NUMPY_FCONFIG="config_fc --noopt --noarch"
+		# workaround bug 335908
+		[[ $(tc-getFC) == *gfortran* ]] && NUMPY_FCONFIG+=" --fcompiler=gnu95"
+	fi
+
+	# don't version f2py, we will handle it.
+	sed -i -e '/f2py_exe/s: + os\.path.*$::' numpy/f2py/setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	export MAKEOPTS=-j1 #660754
+
+	distutils-r1_python_compile ${NUMPY_FCONFIG}
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# very disk- and memory-hungry
+		numpy/lib/tests/test_io.py::test_large_zip
+
+		# precision problems
+		numpy/core/tests/test_umath_accuracy.py::TestAccuracy::test_validate_transcendentals
+
+		# runs the whole test suite recursively, that's just crazy
+		numpy/core/tests/test_mem_policy.py::test_new_policy
+
+		# very slow, unlikely to be practically useful
+		numpy/typing/tests/test_typing.py
+	)
+
+	if use arm && [[ $(uname -m || echo "unknown") == "armv8l" ]] ; then
+		# Degenerate case. arm32 chroot on arm64.
+		# bug #774108
+		EPYTEST_DESELECT+=(
+			numpy/core/tests/test_cpu_features.py::Test_ARM_Features::test_features
+		)
+	fi
+
+	if use x86 ; then
+		EPYTEST_DESELECT+=(
+			# https://github.com/numpy/numpy/issues/18388
+			numpy/core/tests/test_umath.py::TestRemainder::test_float_remainder_overflow
+			# https://github.com/numpy/numpy/issues/18387
+			numpy/random/tests/test_generator_mt19937.py::TestRandomDist::test_pareto
+			# more precision problems
+			numpy/core/tests/test_einsum.py::TestEinsum::test_einsum_sums_int16
+		)
+	fi
+	if use arm || use x86 ; then
+		EPYTEST_DESELECT+=(
+			# too large for 32-bit platforms
+			numpy/core/tests/test_ufunc.py::TestUfunc::test_identityless_reduction_huge_array
+		)
+	fi
+
+	distutils_install_for_testing --single-version-externally-managed \
+		--record "${TMPDIR}/record.txt" ${NUMPY_FCONFIG}
+
+	cd "${TEST_DIR}/lib" || die
+	epytest -k "not _fuzz"
+}
+
+python_install() {
+	# https://github.com/numpy/numpy/issues/16005
+	local mydistutilsargs=( build_src )
+	distutils-r1_python_install ${NUMPY_FCONFIG}
+	python_optimize
+}
+
+python_install_all() {
+	local DOCS=( LICENSE.txt README.md THANKS.txt )
+
+	if use doc; then
+		local HTML_DOCS=( "${WORKDIR}"/html/. )
+		DOCS+=( "${DISTDIR}"/${PN}-{user,ref}-${DOC_PV}.pdf )
+	fi
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/oauthlib/Manifest b/dev-python/oauthlib/Manifest
index 68956d069b80..8d2f89d5b516 100644
--- a/dev-python/oauthlib/Manifest
+++ b/dev-python/oauthlib/Manifest
@@ -1,3 +1,5 @@
 DIST oauthlib-3.2.0.tar.gz 163829 BLAKE2B cf14aeea253bc25f696bb638f364ff74d1a695a0f72dc8a77e2a5433e20672a5cf4a7b25f222940a08a5a26b503e671258ef26ee96e121fa016fbec3d6c5c874 SHA512 abb052cbaccb00a61e9a6c0028102927310d2d864d853cd0826c9a8eae8a9e921da33b79be554a3c6f6067cbcf43b25140f5224c8ab1e7f0a4eb6ab227d418a3
+DIST oauthlib-3.2.1.tar.gz 176109 BLAKE2B 69da6e8ae0efac3928b0e8ee0be1eb57f0871b4a9361f7347a0abfabf183f82bf8431d0247168531dd5fb12c6df2e8a55e5f95f3df1da2d3c8931a6b1751fe4c SHA512 87fa320f3a660337a2d4da03c4b5f2345f7e907c1acf8fff93cf13095ceb699e282dc458fb03350b0da371c7b2af875925e808bccab6d8549f7ce2847e69aba3
 EBUILD oauthlib-3.2.0.ebuild 778 BLAKE2B 78d49ad3b200f7e8e7a5b5bca319f266b19f6f9e2b086e86831647d5173bbee3b2eae5aca9eb59e7b1fde6d90a76f9791906034b2cc0c98c5dab736151ab6703 SHA512 b42208f8e63460039795b492452a791890ef8015aa0c23db2ea880a4ce58e23037fb475b4116d8b67fd5b117cf79701495dfe30a3c299dd4aee490bdbc05cbdb
+EBUILD oauthlib-3.2.1.ebuild 722 BLAKE2B ccaec213ea3af631901601eecb817694674414510fefa1d7eb088d7e607f6d46831ed71dcb3dd3298155a53402384fc19f97f58d6a5ecd85afb1ee865f5f1c99 SHA512 f991d2b6a6edb8bf5ec7fe9b437e974dcadedce9e620dc7093080bce7f4928ae07cf6d5f67e53c076432b4c35cd8e26e4df2fa16342d01fa28c1dc231bedc7d3
 MISC metadata.xml 393 BLAKE2B 7b784c5d6a94cb2eee22f2b92b154fb6a975d752a6af15822fbbd055175078ca3070a75ae575ce65619b9a09420ad5197f320f117a60e72db2ce47fef16ebf34 SHA512 30ceec289fd200942c38e63e9ac46e2caed0db9e990f89b3c04484cf11b8c584040bfb58c827d6a4d3425071b66b099e6dd7ac99397edbd2d58e943e04c2d9e6
diff --git a/dev-python/oauthlib/oauthlib-3.2.1.ebuild b/dev-python/oauthlib/oauthlib-3.2.1.ebuild
new file mode 100644
index 000000000000..c9f783b21010
--- /dev/null
+++ b/dev-python/oauthlib/oauthlib-3.2.1.ebuild
@@ -0,0 +1,26 @@
+# 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="Spec-compliant and thorough implementation of the OAuth request-signing logic"
+HOMEPAGE="https://github.com/oauthlib/oauthlib https://pypi.org/project/oauthlib/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+# optional extras hard set as RDEPs. See setup.py
+RDEPEND="
+	>=dev-python/pyjwt-1.0.0[${PYTHON_USEDEP}]
+	dev-python/blinker[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests unittest
diff --git a/dev-python/phonenumbers/Manifest b/dev-python/phonenumbers/Manifest
index 2f3c47f1fba6..1f7e30e84f1e 100644
--- a/dev-python/phonenumbers/Manifest
+++ b/dev-python/phonenumbers/Manifest
@@ -1,5 +1,7 @@
 DIST python-phonenumbers-8.12.53.gh.tar.gz 4904940 BLAKE2B c8da67f781c71265faa4d24e5cadf7d2c4e707de6f6fc2efae37f0b846cafd6c00814188c2d89d98ec0fb7dbeef9fedc45dc908adf117643bc2b2a0ab56a4496 SHA512 aa699e5df1b612bbcf384e01b80251099872e67fd5632dab35e53861ab6b28157266ac0a1700f4371a0a2975f0484256fb46b6287b87dc8e69aca85323475490
 DIST python-phonenumbers-8.12.54.gh.tar.gz 4905001 BLAKE2B 5fc206b3dd5f5cc96ecfc91b33369fb12d8a11245f846039478bf77f9dbc8e1bfe0e169eb6f1c360ac2a730f79b512178b115f82434790baeb3b2d26d5eaa370 SHA512 0da4f3ffa57f0c2ddaf843eea1440b33844be7ee45122a21d00b5630b720eac059777dca2051e00baf39158737478d5077f97ec6b9293528b11a9844294a621c
+DIST python-phonenumbers-8.12.55.gh.tar.gz 4905987 BLAKE2B 3c05fbe261f9c347bdccb9e664f0005f3f67120df5a494b105780ac5f00a407289bd6be6bbaefbf843937193b760b772e1d8c298a6676770f97d7e6a3d16f25a SHA512 f1aaecd70d761aaa2b6b53d5dc03624f1a64cfb8733b2ac3260bb295be527238755659b55b5d79b6a49a06c56616517afb2cd56b3f39f5eba8dcc27b61e4a6b5
 EBUILD phonenumbers-8.12.53.ebuild 808 BLAKE2B ef45a7f57cab5aa38bb958cae5b0bb0bbca327073d8d4bc41aa56552037a2ae91e5e01b3e6af6e9d948ad4f7edd5ff7fd0808c2a7d742845040fbcd55a6b3b77 SHA512 2786479b7b053e0c900d5548a1339a0d81c0d4c44a25d0b33ce6058e06a872710d7c887d4ee20b7c705065e2a2e4eee6519bb76960902afc45f86c3806819108
 EBUILD phonenumbers-8.12.54.ebuild 810 BLAKE2B 3b18782b7466900c6dcf66ada03d333fefd3df0a6a02bc1417de82a4e692e0baf316db5d1b4bf070d4a73b7f8b5133018c22587f5549fbe8863b8e3ec6859441 SHA512 9f1fc8118ab9fc7284723238e398f9152d6e491bfe0be97fa5b181f1bb30a0d96900c1e1674b6ca325daefb8813bc25dfae44f1ab172361e367725c5a040ba4e
+EBUILD phonenumbers-8.12.55.ebuild 810 BLAKE2B 3b18782b7466900c6dcf66ada03d333fefd3df0a6a02bc1417de82a4e692e0baf316db5d1b4bf070d4a73b7f8b5133018c22587f5549fbe8863b8e3ec6859441 SHA512 9f1fc8118ab9fc7284723238e398f9152d6e491bfe0be97fa5b181f1bb30a0d96900c1e1674b6ca325daefb8813bc25dfae44f1ab172361e367725c5a040ba4e
 MISC metadata.xml 413 BLAKE2B 4fa9965e76205ab35de37314b8c06fae26ccf34a944401e672487d7ad42b0046b4de85c8dd4c500d2703b5ecca49755b3f6d9047a20d7226fdbdf63e0aca3220 SHA512 de88d4162ba8f97748a1d2a17a8bea48f59b84f67c76aec11a9bad8ab0d0b66bc9cc2395dfff446bbad591f52f755a38ccd0daf2480b4f2e22e80ce5d44a42c1
diff --git a/dev-python/phonenumbers/phonenumbers-8.12.55.ebuild b/dev-python/phonenumbers/phonenumbers-8.12.55.ebuild
new file mode 100644
index 000000000000..baab22b23fc7
--- /dev/null
+++ b/dev-python/phonenumbers/phonenumbers-8.12.55.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+MY_P=python-${P}
+DESCRIPTION="Python port of Google's libphonenumber"
+HOMEPAGE="
+	https://github.com/daviddrysdale/python-phonenumbers/
+	https://pypi.org/project/phonenumbers/
+"
+SRC_URI="
+	https://github.com/daviddrysdale/python-phonenumbers/archive/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}/python
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~riscv ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	test? (
+		dev-python/protobuf-python[${PYTHON_USEDEP}]
+	)
+"
+
+DOCS=( ../README.md )
+
+python_test() {
+	"${EPYTHON}" testwrapper.py -v || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/pyproj/Manifest b/dev-python/pyproj/Manifest
index 596df84e2a6a..091eadc552f8 100644
--- a/dev-python/pyproj/Manifest
+++ b/dev-python/pyproj/Manifest
@@ -1,3 +1,5 @@
 DIST pyproj-3.3.1.gh.tar.gz 238373 BLAKE2B 7996d253a35e3d64a343141179a88d2ab97e88f96447f3daf14c9f8d731099b506228c163fe460d3be30ae69c87e908879b3c0fe31eb7624c3bb8da157838337 SHA512 7175479f4ec526ada830d178bea77552d66aace4c7f6cde584aebef5fc4c6b7a46272eea2bd95f71910411c9ac8d8832d350891ffffda8a86eabb5449177a5eb
+DIST pyproj-3.4.0.gh.tar.gz 231365 BLAKE2B a62e02a33424583ffec1e1de603a0162ea187b4eb093be51b957fb720b3625c7e4b65162f1272fb4a057edfd92f8146d74c17f1ad68a3beb0ae199df8641e03b SHA512 d0e9425ea5a10ce1620c2a2b3279be786741e75ad698a2430e38237acb73e2cd7dbd16dbb4cf952f52c38810526f4528c08f9bb0795a34fdab2f39686e6914c9
 EBUILD pyproj-3.3.1.ebuild 917 BLAKE2B a68f8b2ae45515fed681b2e17f510187753e9b34fef78122f1d08ca541e8ec1b9139fffb61a80a97cc3b513a86268336a53046c05768ebd36fb4a14eb497ead0 SHA512 50e98ad158e47af5488161d92c8feb90e2a30888c341df9f2a251407495b702cee5b75c5503f8f9591cf0e495351814e1446115bd6ed1e7ebf53a01ba0de11e4
+EBUILD pyproj-3.4.0.ebuild 947 BLAKE2B 7557c6f8522e525e6eafb9175f8196889b1d560a11f6f7d2be44f061bcb255af62dc772f7c54d920952a4901a990860b0ced10a402b65066b1b7c1832adbc92d SHA512 be28c92f6ac6122bc92eaf65e1bc631eab53a10f1d2f651859511640e4014d32fd3b280845e2ec64357509b9007c7e5eda79b2098bc85f1862d48dcf261f24a1
 MISC metadata.xml 415 BLAKE2B 4f3ab70bc72ca97a428c357257d3a59591b410f12276a42e141cd0a43072b79107529c95c6a313906129e8893c75b63a6ef11ddc2f3842a7f5e5e7f7349ec38e SHA512 7ca8a01534471dff67c42a96c524d166278e26da309b2c4d766045e38086cc0e52ccc990881ebed7ca81219d705d9e4a9c16e86b052a50867bb032457e354903
diff --git a/dev-python/pyproj/pyproj-3.4.0.ebuild b/dev-python/pyproj/pyproj-3.4.0.ebuild
new file mode 100644
index 000000000000..aa7eb95785a6
--- /dev/null
+++ b/dev-python/pyproj/pyproj-3.4.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python interface to the PROJ library"
+HOMEPAGE="
+	https://github.com/pyproj4/pyproj/
+	https://pypi.org/project/pyproj/
+"
+SRC_URI="
+	https://github.com/pyproj4/pyproj/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
+
+RDEPEND="
+	>=sci-libs/proj-8.2.0:=
+	dev-python/certifi[${PYTHON_USEDEP}]
+"
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	test? (
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pandas[${PYTHON_USEDEP}]
+		dev-python/shapely[${PYTHON_USEDEP}]
+		dev-python/xarray[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs \
+	dev-python/furo
+distutils_enable_tests pytest
+
+python_test() {
+	rm -rf pyproj || die
+	epytest -m "not network" test
+}
diff --git a/dev-python/pyroute2/Manifest b/dev-python/pyroute2/Manifest
index ffa4ca78a72b..5e99ee95043f 100644
--- a/dev-python/pyroute2/Manifest
+++ b/dev-python/pyroute2/Manifest
@@ -1,3 +1,5 @@
 DIST pyroute2-0.7.2.gh.tar.gz 469459 BLAKE2B 06aa7640bb21c0a7b8035723069d78b28ca39b554b5bdc0a031dbc7376251265b118b222cb4283156c02136e63de4b77103c02a88b700ac5f49fa8ceac28528a SHA512 6c032b39675d539958642bb16b3b964e78613cdd2d49e2e206a13d5256872e3800de5c73cff761e4a756d31df0e07f18f08d193a0543c87be89da348662e6dbd
+DIST pyroute2-0.7.3.gh.tar.gz 484152 BLAKE2B 4f0cd0fc000c7bd3baffaa2ed25468bc28806fef2f9bc96e39606afe46e616d85865f497df6d1e3e4b2e5e3956b5fca22af273140bbb38954c6f0c0f86c386a6 SHA512 c8aeddaeaa014bcf8c4b831cb5b4080db5c99b582f3999fdbdd840b9448e032fbbf64ce5707ebc0795765138d8e89cde830efb2469c827ed8d4e63dd1beafe62
 EBUILD pyroute2-0.7.2.ebuild 692 BLAKE2B 9abd75ab7aa8090d94b51a17158d723a27b3e91dee25b30bdeea6c5a5e908c5ef51294e29bfa3af15b95f1b8d20e8d9b1a308f81216c0c0816b585d3f377cb1b SHA512 c34194ebe87d95471cd9579c09cf6e0f9e8cbd3039b0830651254850b795176ed4d0e6df73201bd36e48da6469ea411e3a90f9ad07f2fa1feaabe46b9c77a712
+EBUILD pyroute2-0.7.3.ebuild 694 BLAKE2B 76eb16089d7b7bc6e661e6bd4dd6534faaf92ea6503d87bfce00f8da083c23e9602c95e284e26fea7c4d42311deaef1531ecfcaede2f125afcd4f3083a8b9499 SHA512 bd661bc98d24d3e2ec872717f39782deed39b56332fc5cc7a4052e7a030ba8273230373bfcf7083ed4ec1cafe5f32f058b8e8fcb89655091c2b9e9a46425b8d7
 MISC metadata.xml 547 BLAKE2B 1d256c8d9bb8cc039853ff12c15d7c2747822ff95e3ae7f3e7c1600498c7b886a341a03327992e3a7933592eba0094eec6fba519b0d9f2b2f0ece57eb515ea4a SHA512 e845b3e319e9d60b1dcbf9ab66681b886b0c517a5a72288aaf9ccb97d5018dc3b01b8d921b8a9fcd3538cec96e9a7e1c452a704c8c422ef6e6fa6069a7ae56ef
diff --git a/dev-python/pyroute2/pyroute2-0.7.3.ebuild b/dev-python/pyroute2/pyroute2-0.7.3.ebuild
new file mode 100644
index 000000000000..791e7e0b54d8
--- /dev/null
+++ b/dev-python/pyroute2/pyroute2-0.7.3.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8,9,10} pypy3 )
+PYTHON_REQ_USE="sqlite"
+
+inherit distutils-r1
+
+DESCRIPTION="A pure Python netlink and Linux network configuration library"
+HOMEPAGE="https://github.com/svinota/pyroute2"
+
+SRC_URI="
+	https://github.com/svinota/${PN}/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/wheel[${PYTHON_USEDEP}]
+"
+
+# tests need root access
+RESTRICT="test"
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 41aab02fb4fa..2bf4d41e5b27 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/kramdown/Manifest b/dev-ruby/kramdown/Manifest
index 1f4e85fcc97b..77534203261c 100644
--- a/dev-ruby/kramdown/Manifest
+++ b/dev-ruby/kramdown/Manifest
@@ -1,7 +1,3 @@
-DIST kramdown-2.3.1.gem 122368 BLAKE2B 731e20904f238f44db594c7b8efac858187c935d9fbf8a421ddceeb1aa486f0980b502953f8eaa7e3100f7b7722d09b1da35091d28977c70cfd1ef24a080c3e1 SHA512 d1955065e3c5d7a60e595b647d5e453cf07a08fe25d40c67cf6f32d30f704a2c653a52959f8c71b3290e6da74836a085fa6bf8201c878303ad572dee8cc64496
-DIST kramdown-2.3.2.gem 122368 BLAKE2B cfed374793257a152e99a0417997c39de943ae8d31b178715355841248789f3986b1bee455396a5ac8ad2d6784a5fd33e82effb8430230cddec83579cb8ca2d9 SHA512 268b55b45ad2c6dd02776abd5777c7f51ea8724c64b03d8a859bd809b54b181e018fcf5ca38170c89acfac5cef2e6de253f1c6037fe642c6c093e339fd8f4d1b
 DIST kramdown-2.4.0.gem 122368 BLAKE2B 86b1232583dc88f8a576fb17e3e2ee756f109700634783815e8ba1f722dd8c872f2f6a978d33e1970814530090665eba3693206e57d3f274bb39655a7ac2d208 SHA512 8e52c5cc53d2f0085e30188aa7bf67f92dfe7f0801297c6a45293cca307e3442baa06443638c1161dad4a4aa332cbc5b4f9b6281ba4c6346122a9fff5a3743c7
-EBUILD kramdown-2.3.1-r1.ebuild 1313 BLAKE2B 110409f7322502af0149257ae6be6575e021a73aba3fb101392102da462d92a067f9c0308973e03769f43e5a8227b2464ad2c62bdf7c7eceace438630dc5d535 SHA512 ae53453e6ecdbc2848ea3b514536c64170d50e4d129b8e90bd78c1f244c2c4de780f4091dbab44d55460755a1cd43cd395fb01932e6e34364c8ea551dfdd2f6a
-EBUILD kramdown-2.3.2.ebuild 1306 BLAKE2B cb088a2bed4eaf01043d3cf1fb41fba774b1fc27e1af1c4581228768568e51d25d898897d24cbe95da3656cb69123fd7c3e7964873c3430ac449b675ba405c95 SHA512 c1ac8328f0540f78ceb1d43df6946e5ccddcd926bda8298da15fa1c3f68426696734757512d04b6e3feac95d97e0720fefc20055ef3337ab41a331cbd58623cc
 EBUILD kramdown-2.4.0.ebuild 1323 BLAKE2B 059fd2c567d847a278195d76a5eb7f55681a456c443ca0cbca9929de483309d90eef8550f4159502743664bbeb884285c1bf30c803cf205f79bf346046e070c2 SHA512 5658669f555dba22943996753a6ae391fbe5a0506f94e4c03b8896dc71cb3f79c244ccde69c80fbd05d89805c1f10f8bc60b4ae796d77980047b85cf9bcfdfe7
 MISC metadata.xml 252 BLAKE2B 77e9556ac1d210367a95f4c47816618b685c707cf01d1543d988338e14794fb9ccfb9976ebd11f389db618616d91ee024d8e46dc3a1a356ba7a017a7796b44d1 SHA512 0a970a16d73747993198dd301a3127cef7e65a9f46816b40ca149669ba617826c1d81bac1e5ecf93d16079922964923d37301cd8160f22c823c1ec3b79ee56f1
diff --git a/dev-ruby/kramdown/kramdown-2.3.1-r1.ebuild b/dev-ruby/kramdown/kramdown-2.3.1-r1.ebuild
deleted file mode 100644
index d41f19d16265..000000000000
--- a/dev-ruby/kramdown/kramdown-2.3.1-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="README.md AUTHORS CONTRIBUTERS"
-
-RUBY_FAKEGEM_EXTRAINSTALL="data"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Yet-another-markdown-parser but fast, pure Ruby, using strict syntax definition"
-HOMEPAGE="https://kramdown.gettalong.org/"
-
-LICENSE="MIT"
-
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE="latex"
-
-LATEX_DEPS="latex? ( dev-texlive/texlive-latex dev-texlive/texlive-latexextra )"
-RDEPEND+=" ${LATEX_DEPS}"
-DEPEND+=" test? (
-	${LATEX_DEPS}
-	>=app-text/htmltidy-5.0.0
-)"
-
-ruby_add_rdepend "
-	dev-ruby/rexml
-	>=dev-ruby/rouge-1.8
-	>=dev-ruby/stringex-1.5.1
-	!!<dev-ruby/kramdown-1.17.0-r2:0"
-
-ruby_add_bdepend "doc? ( dev-ruby/rdoc )
-	test? ( >=dev-ruby/minitest-5.0 )"
-
-all_ruby_prepare() {
-	if ! use latex; then
-		# Remove latex tests. They will fail gracefully when latex isn't
-		# present at all, but not when components are missing (most
-		# notable ucs.sty).
-		sed -i -e '/latex -v/,/^  end/ s:^:#:' test/test_files.rb || die
-	fi
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:. -e "Dir['test/test_*.rb'].each{|f| require f}" || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	doman man/man1/kramdown.1
-}
diff --git a/dev-ruby/kramdown/kramdown-2.3.2.ebuild b/dev-ruby/kramdown/kramdown-2.3.2.ebuild
deleted file mode 100644
index d6208fd4678a..000000000000
--- a/dev-ruby/kramdown/kramdown-2.3.2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_EXTRADOC="README.md AUTHORS CONTRIBUTERS"
-
-RUBY_FAKEGEM_EXTRAINSTALL="data"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Yet-another-markdown-parser but fast, pure Ruby, using strict syntax definition"
-HOMEPAGE="https://kramdown.gettalong.org/"
-
-LICENSE="MIT"
-
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~s390 ~sparc ~x86"
-IUSE="latex"
-
-LATEX_DEPS="latex? ( dev-texlive/texlive-latex dev-texlive/texlive-latexextra )"
-RDEPEND+=" ${LATEX_DEPS}"
-DEPEND+=" test? (
-	${LATEX_DEPS}
-	>=app-text/htmltidy-5.0.0
-)"
-
-ruby_add_rdepend "
-	dev-ruby/rexml
-	>=dev-ruby/rouge-3.26.0:2
-	>=dev-ruby/stringex-1.5.1
-	!!<dev-ruby/kramdown-1.17.0-r2:0"
-
-ruby_add_bdepend "doc? ( dev-ruby/rdoc )
-	test? ( >=dev-ruby/minitest-5.0 )"
-
-all_ruby_prepare() {
-	if ! use latex; then
-		# Remove latex tests. They will fail gracefully when latex isn't
-		# present at all, but not when components are missing (most
-		# notable ucs.sty).
-		sed -i -e '/latex -v/,/^  end/ s:^:#:' test/test_files.rb || die
-	fi
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:. -e "Dir['test/test_*.rb'].each{|f| require f}" || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	doman man/man1/kramdown.1
-}
diff --git a/dev-ruby/rack-test/Manifest b/dev-ruby/rack-test/Manifest
index 80ed426a7756..cd797e906379 100644
--- a/dev-ruby/rack-test/Manifest
+++ b/dev-ruby/rack-test/Manifest
@@ -1,5 +1,5 @@
 DIST rack-test-1.1.0.tar.gz 27035 BLAKE2B 640de2303850662c3b6a8fc17f2344223c9928b48abde6d1b251a634689793158f35498c4736e4e2d069efa921d37bc32da92a7e17c0761a6f6111b345b54c1a SHA512 36d947d9b13d33ee8322e5b9d18fe8266787ccb7703f1fafadc040123e34dd44e98e7faf8b6dd816e51ed167065b2ffe79e9bcee74564dc324ba2b7dba76f82a
 DIST rack-test-2.0.2.tar.gz 30651 BLAKE2B 82ffa59cca24cbb42a885bf05792cb603c44881886b716698a1ebd6857231bfdfafd9a8e68f2fd2e1d795c167886db44db5a620eac35e3824c8fe7fa1148718a SHA512 de91787563546a3f12da15f665975bf3d68f7633e277c86a529a728cb8ba9d78bac5c30c2ec1ece9aab5341571ceb23d8089d0da542409bdba23ebe93d75e2a5
 EBUILD rack-test-1.1.0-r1.ebuild 1069 BLAKE2B 07c2f65bd1508d1452f2452fc1f5a4fd42473521b44067d20635954fae76dab4fceb83b225b3105e84d82e65fb26bd87a23ab1a6d3dc43657a5e158d9b70d0b4 SHA512 7e6d15f29a800ce10d9c8233171b1ea68e0263d2688fd4f897740a123928a1ab38cbb94bd1b2e054bce12aa66faf47fe99633a79283f2a5d0a7fa647ea71a966
-EBUILD rack-test-2.0.2.ebuild 866 BLAKE2B ecfe081f652fca3617fac0665f5133ea403eda022a2f4ddd549deb77117bb78abaa41b26b0cd3a15fa1a0502856661fd6b5989d353636f6f8437d6b4912e1117 SHA512 c9063dcc27d2fccc232fa758eb5c80ac0f1c9888d2fcf6f2e0a1c6742523c45263fae6e2ec1b54c22c3a3baa771fa0d3744944339fa7185c0202cbae8bc0929c
+EBUILD rack-test-2.0.2.ebuild 875 BLAKE2B aadf359ffca68edc6faec0d15f30263e77eec1b35ac51df1e5ba86c084c90b885acf184819c7c7f55064deedecf043dbedf20f9ada2dad32dad2dc76e2437275 SHA512 d88073cbda41abccd802007e5487b05e79387fa08771cd47f98e6c0d22a70e5fd779c558f8c81ca0fbe96019d92b13754af9b6a38d9731338d7079fbedf8e0b4
 MISC metadata.xml 344 BLAKE2B e30c148bc0cfee01a015a9f33b641e93cafb8791f46ea7c1ec56942da88eec469d0259780c697b3bae0cbaf806dc47f919b78f2aca4d7565effd47a630f6485b SHA512 93102d50461492b9a866f74783d9d6c3d04698a8766535064d1b3c2600c11f1002b3a8bba79c81b4294e19a33cb06f8b407442c73d24fd2efcf361e39623ad9e
diff --git a/dev-ruby/rack-test/rack-test-2.0.2.ebuild b/dev-ruby/rack-test/rack-test-2.0.2.ebuild
index d4c143fc00ca..15c959648795 100644
--- a/dev-ruby/rack-test/rack-test-2.0.2.ebuild
+++ b/dev-ruby/rack-test/rack-test-2.0.2.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/rack-test/rack-test"
 SRC_URI="https://github.com/rack-test/rack-test/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
-SLOT="1.0"
+SLOT="$(ver_cut 1)"
 KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE=""
 
diff --git a/dev-ruby/stringex/Manifest b/dev-ruby/stringex/Manifest
index 6041661a6889..cbb3b0ecd898 100644
--- a/dev-ruby/stringex/Manifest
+++ b/dev-ruby/stringex/Manifest
@@ -1,4 +1,3 @@
 DIST stringex-2.8.5.gem 130048 BLAKE2B c07eaaee07bf348690166b41b0846bc49eb49c5ba9e39c7eaeea2a3a60d6089edd7c7d1d75fd9a5208c9883c4bff8840ccf56c6f186daeabcf79e7f4fb6b4d25 SHA512 53f9908f176f465d2e884e92dffb26abcdf75593c94ee8250253da0eb29eddf489cf5b3f539135659ad4c0e2dd738d2affff6a946c50abd5f36517148d8338ce
-EBUILD stringex-2.8.5-r1.ebuild 993 BLAKE2B 9dafdea9b3d68d9db55c55ff4cc3f438263d785f8584f79b214403279b1088272c95cbef3fdde2cac85783d79142ba0fd312dfb7524305ae57a2517f5c7078b0 SHA512 194d063cf19eec3c19944d797b63c425831d3bdfc023daa69aee684bc8dc513f6b3b61d6736f17de49eb5b3513b9b77678c7a4f9361898a005927b71ac770894
 EBUILD stringex-2.8.5-r2.ebuild 830 BLAKE2B ef72f0b14b07459edd428ff8a44be3e48706fd92e7d4ca7a1ab939a5f7baf759ed1b435502ef919f7eb71949bf51a07b1032ef5d02e66d00a39eaefe63185584 SHA512 100975ea1747e7f657581d186c7bc839daf060c3e508e15dd5241dc4156fe945876bcaadb4be344498239271ecda47f7a716484198cf31ad7888ebff3f04c5a0
 MISC metadata.xml 339 BLAKE2B f73c3a0f80358652d11426529ad603b32ea4ef3b882be5d1862ffa94d35fc49a154406d66eff59d61544d6c35a8aaf841f553f689e4fdedffd88337d2be3ce4c SHA512 87d2f65efec8bab706894e788d2c6ac548221684034bc93cf43efc104fd2340188ad8aaf1e9e484ab40475aee38a7bd9227b55f73e8ae31c39548c297bb18d32
diff --git a/dev-ruby/stringex/stringex-2.8.5-r1.ebuild b/dev-ruby/stringex/stringex-2.8.5-r1.ebuild
deleted file mode 100644
index 665397c975fd..000000000000
--- a/dev-ruby/stringex/stringex-2.8.5-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Extensions for Ruby's String class"
-HOMEPAGE="https://github.com/rsl/stringex"
-LICENSE="MIT"
-
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="test"
-
-# we could rely on activerecord[sqlite3], but since we do not remove the
-# sqlite3 adapter from activerecord when building -sqlite3, it's easier
-# to just add another dependency, so the user doesn't have to change the
-# USE flags at all.
-ruby_add_bdepend "
-	test? (
-		dev-ruby/i18n:1
-		dev-ruby/redcloth
-		dev-ruby/test-unit:2
-		|| ( dev-ruby/activerecord:7.0[sqlite] dev-ruby/activerecord:6.1[sqlite] dev-ruby/activerecord:6.0[sqlite] dev-ruby/activerecord:5.2[sqlite] )
-		)"
-
-all_ruby_prepare() {
-	# Let tests work with newer rails versions
-	sed -i -e 's/update_attributes/update/' test/unit/acts_as_url/adapter/* || die
-}
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 4b8e9dae74c9..3c8c2b7077dc 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/clion/Manifest b/dev-util/clion/Manifest
index 7a65ca411d93..25fb31d99ed1 100644
--- a/dev-util/clion/Manifest
+++ b/dev-util/clion/Manifest
@@ -1,3 +1,5 @@
 DIST CLion-2022.1.3.tar.gz 785987464 BLAKE2B 5b23d54f260a8e6023cce936ba50320c9c815d7024495d4a28a6fe9fa795d9944cce36fedd7b619ccf8188750708eb3bca887f9fc856d2d4defe096505742852 SHA512 5caabc409e9e22e59a26886cb5a5785cc0f2c193e7548a9757d11b4e2b7dad5af7545f3c71b83e3111deb0e0c90507eb5ee6020dcba40e413c0882f2743ac49d
+DIST CLion-2022.2.1.tar.gz 893465319 BLAKE2B c60242c3912b7fbda601e06f6191162da42e3255ed8a3b8eeeab0d910f0d2aac767fa9bc9a4096114c2110f9104604d7294f2e97c4d67004f1c234040d45a6f3 SHA512 b48d8ef74b19e9ba1b75fc9c01ab052a2fbe0a7c1eab086fc0ab9551eabdcb878e478a6c7793bd2bc455453425313b2caa8e884f5ef0a6468ca73fa3877bf892
 EBUILD clion-2022.1.3.ebuild 2941 BLAKE2B 5f903ef1c2c15357fd0cc234d452f66424c69a773b0f960d27f38eeb06c6fcbe78b770a10b026698886d2c82b6adc3f29f317fd00818ff82169adceffb83c80a SHA512 7b5095bf9e4f04931e61567610b7e51e1e89237996a7c9be843c10c1dba00b2db78a0caee2d4c6ac119aac2e359057c1ab90c15c9c080cc962a3d64134030a05
+EBUILD clion-2022.2.1.ebuild 2910 BLAKE2B b38bd89a291ae273b23ff572e0145308320b9ac1f7a3b2314b181685898e7bbfe4a449b1338d817b402f0901795ec74fc6d5ff4497ae00bb0065f2348d413ea5 SHA512 5260d53265f0a9060bcb15959811d57451e2dac47b27ce282bd30b22199c17265487f0e7ae207302ba9422778c14af6c1385fa52956b4ef6a466a9a3eca4d15c
 MISC metadata.xml 402 BLAKE2B a74ce91089fa83dc91f1878f17b0e2adc483fdfdd987eb2dd4b184b2a98b8f1d995ab5d2c4dca2d7f25d3a8e1dfec711625e980feb5a0422fe5635c5816ef4fe SHA512 6d425358265cac8deb12c18632cfe520d82a733e4caab71eeb89b6d6643eddbfa27df03fcd8111477a77efea136aca1093c84024c89b85dc66ce1b92633709c6
diff --git a/dev-util/clion/clion-2022.2.1.ebuild b/dev-util/clion/clion-2022.2.1.ebuild
new file mode 100644
index 000000000000..30e78ada931f
--- /dev/null
+++ b/dev-util/clion/clion-2022.2.1.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop wrapper
+
+DESCRIPTION="A complete toolset for C and C++ development"
+HOMEPAGE="https://www.jetbrains.com/clion"
+SRC_URI="https://download.jetbrains.com/cpp/CLion-${PV}.tar.gz"
+
+LICENSE="|| ( IDEA IDEA_Academic IDEA_Classroom IDEA_OpenSource IDEA_Personal )
+	Apache-1.1 Apache-2.0 BSD BSD-2 CC0-1.0 CDDL-1.1 CPL-0.5 CPL-1.0
+	EPL-1.0 EPL-2.0 GPL-2 GPL-2-with-classpath-exception GPL-3 ISC JDOM
+	LGPL-2.1+ LGPL-3 MIT MPL-1.0 MPL-1.1 OFL public-domain PSF-2 UoI-NCSA ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="bindist mirror splitdebug"
+
+BDEPEND="dev-util/patchelf"
+
+# RDEPENDS may cause false positives in repoman.
+# clion requires cmake and gdb at runtime to build and debug C/C++ projects
+RDEPEND="
+	app-accessibility/at-spi2-atk:2
+	app-accessibility/at-spi2-core:2
+	dev-libs/atk
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	dev-util/cmake
+	dev-util/ninja
+	media-libs/alsa-lib
+	media-libs/freetype:2
+	media-libs/mesa
+	net-print/cups
+	sys-apps/dbus
+	sys-devel/gdb
+	x11-libs/cairo
+	x11-libs/pango
+	sys-libs/zlib
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/libXxf86vm
+	x11-libs/libdrm
+	x11-libs/libxcb
+	x11-libs/libxkbcommon"
+
+QA_PREBUILT="opt/${P}/*"
+
+src_prepare() {
+	default
+
+	local remove_me=(
+		bin/cmake
+		bin/lldb/linux
+		bin/gdb/linux
+		bin/ninja
+		license/CMake*
+		lib/pty4j-native/linux/aarch64
+		lib/pty4j-native/linux/arm
+		lib/pty4j-native/linux/mips64el
+		lib/pty4j-native/linux/ppc64le
+		plugins/remote-dev-server/selfcontained
+	)
+
+	use amd64 || remove_me+=( lib/pty4j-native/linux/x86_64 )
+	use x86 || remove_me+=( lib/pty4j-native/linux/x86 )
+
+	rm -rv "${remove_me[@]}" || die
+
+	for file in "jbr/lib/"/{libjcef.so,jcef_helper}
+	do
+		if [[ -f "${file}" ]]; then
+			patchelf --set-rpath '$ORIGIN' ${file} || die
+		fi
+	done
+}
+
+src_install() {
+	local dir="/opt/${P}"
+
+	insinto "${dir}"
+	doins -r *
+	fperms 755 "${dir}"/bin/{clion.sh,fsnotifier,inspect.sh,ltedit.sh,repair,clang/linux/{clangd,clang-tidy,clazy-standalone,llvm-symbolizer}}
+
+	if [[ -d jbr ]]; then
+		fperms 755 "${dir}"/jbr/bin/{java,javac,jdb,jrunscript,keytool,rmiregistry,serialver}
+		# Fix #763582
+		fperms 755 "${dir}"/jbr/lib/{chrome-sandbox,jcef_helper,jexec,jspawnhelper}
+	fi
+	dosym -r "${EPREFIX}/usr/bin/ninja" "${dir}"/bin/ninja/linux/ninja
+
+	make_wrapper "${PN}" "${dir}/bin/${PN}.sh"
+	newicon "bin/${PN}.svg" "${PN}.svg"
+	make_desktop_entry "${PN}" "CLion" "${PN}" "Development;IDE;"
+
+	# recommended by: https://confluence.jetbrains.com/display/IDEADEV/Inotify+Watches+Limit
+	dodir /usr/lib/sysctl.d/
+	echo "fs.inotify.max_user_watches = 524288" > "${D}/usr/lib/sysctl.d/30-clion-inotify-watches.conf" || die
+}
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index 7a9b3dcd7a11..d17f60f6018a 100644
--- a/eclass/Manifest.gz
+++ b/eclass/Manifest.gz
diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index 4a91f0d3dee0..4e023ffb65d0 100644
--- a/eclass/toolchain.eclass
+++ b/eclass/toolchain.eclass
@@ -288,6 +288,13 @@ BDEPEND="
 	)"
 DEPEND="${RDEPEND}"
 
+if [[ ${PN} == gcc && ${PV} == *_p* ]] ; then
+	# Snapshots don't contain info pages.
+	# If they start to, adjust gcc_cv_prog_makeinfo_modern logic in toolchain_src_configure.
+	# Needed unless/until https://gcc.gnu.org/bugzilla/show_bug.cgi?id=106899 is fixed
+	BDEPEND+=" sys-apps/texinfo"
+fi
+
 if tc_has_feature gcj ; then
 	DEPEND+="
 		gcj? (
@@ -1417,9 +1424,22 @@ toolchain_src_configure() {
 		)
 	fi
 
-	# Disable gcc info regeneration -- it ships with generated info pages
-	# already.  Our custom version/urls/etc... trigger it. bug #464008
-	export gcc_cv_prog_makeinfo_modern=no
+	if [[ ${PV} != *_p* && -f "${S}"/gcc/doc/gcc.info ]] ; then
+		# Disable gcc info regeneration -- it ships with generated info pages
+		# already.  Our custom version/urls/etc... trigger it. bug #464008
+		export gcc_cv_prog_makeinfo_modern=no
+	else
+		# Allow a fallback so we don't accidentally install no docs
+		# bug #834845
+		ewarn "No pre-generated info pages in tarball. Allowing regeneration with texinfo..."
+
+		if [[ ${PV} == *_p* && -f "${S}"/gcc/doc/gcc.info ]] ; then
+			# Safeguard against https://gcc.gnu.org/bugzilla/show_bug.cgi?id=106899 being fixed
+			# without corresponding ebuild changes.
+			eqawarn "Snapshot release with pre-generated info pages found!"
+			eqawarn "The BDEPEND in the ebuild should be updated to drop texinfo."
+		fi
+	fi
 
 	# Do not let the X detection get in our way.  We know things can be found
 	# via system paths, so no need to hardcode things that'll break multilib.
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 1fede629aac7..3b65be0c06c9 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/renderdoc/Manifest b/media-gfx/renderdoc/Manifest
index 725487722dbf..6472e98fbab0 100644
--- a/media-gfx/renderdoc/Manifest
+++ b/media-gfx/renderdoc/Manifest
@@ -4,11 +4,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.20-system-glslang.patch 8281 BLAKE2B 3bd15c373de0f37831c2d8a03d9c5c4f14684aea2e1d2e350e6300cce7c2182427014f2607199bbe913d460f113faa352dc882ec40a56403f91d87ce0afe4df4 SHA512 7503a5241aa79c241d300f4a758338d0ae511ee2ce9582b5f3720939f9ee71c149614244a0facc620ba2f2da46ceb7dcf7298440c5cd4b528be96245cafc01fa
-DIST renderdoc-1.20.tar.gz 46744415 BLAKE2B 574933653fa37e8a8a4dac4ec1e4156a9761fe3bf086ecf2a5125b51c368dc885f9c27f47fb9f7ddd4318e627431583be1371b92fbd5a5a8ed9f04ed90cc3498 SHA512 5c395cdd68fcacd7d728f4793301a7c11d11bbc09bc1f168d91b18964756f01bd702c0ffda53f3156ee48c06cc2e8c3b2f7ad8da49146e151d8ff6cb7290ed2e
-DIST renderdoc-1.20.tar.gz.asc 833 BLAKE2B 233875056eff2858054566900a3198e857a6970454e4671f57703c5a8a8e1daff3c5d069cba5293791787e7da7db0a40aab17f26df044ed09ca9113c453f8bf6 SHA512 1ccfe4cb190c1c578abbf5e3f0264a00cb6054333f6829e726c2659c352b3ece585a1f3d55e4602908c737a349020c4fd2edc906cf225519ae049338876e0632
 DIST renderdoc-1.21.tar.gz 46911586 BLAKE2B 4d4a38de38837c29e005f6c576a3de9edd221eb1dceda7e65fad65ccc6d672f2de0ebb008a9c0440f61647996f30189ffb71f2379aa04a20e68386416b6f4b35 SHA512 9386a42a1ceeb4712d43c18c699a0234ef7f55f6ca03c7a0537cd97dc76fa1429220b95d8f66c5007dfc92535ff552fdb8b3b755aa8e6ce159aa1e98c6fbce5b
 DIST renderdoc-1.21.tar.gz.asc 833 BLAKE2B baa858de1915a2e4e69bf1fdf21271fe39d0e768100330db3b0a9f312235a0253c8289265dedb6d458a2c829c3058dca74166269b08c8639ecec2d049a7193e5 SHA512 a2197421d004aa7b86672824fd61261ed91d802e1eb2319e1d5ba5d0c32c58dd61a7916ec41dc9a3b8661e24bd9d3f6da70d44e6ebe4a8e6a7dafe4f83ae5338
 DIST swig-renderdoc-7.tar.gz 4006241 BLAKE2B 619f41239f4aef496264d61f44ae042cf80d3ff28491d452cf11ad07e898554c4a32df6119ee0e8e3de36e6bee61855358cd968ad01c9281976e24e9a6cac839 SHA512 5285a65924c069cfb9f73104ad8a95251badac4001293a1757b97ebead5953730c03289159741f82da4c5afe4f61f7c826b105eaf82df044ed2fa21810242c86
-EBUILD renderdoc-1.20-r1.ebuild 5441 BLAKE2B e92947959aed6e9557b53f88b63d0e3515f146c2e2acb61f84f90714d6bb8176fc9b582d8347d28a16174480392c0d5b1c06db01b049c305642e2b9b8de73c51 SHA512 4b62fc9e1424284e285ed031b3d1120964412abda30295238506136dfcb9201ac0a9fa771b69274a4f8386446459b263c0adfbe320d40b47efeb8186208f3ca0
 EBUILD renderdoc-1.21.ebuild 5441 BLAKE2B e92947959aed6e9557b53f88b63d0e3515f146c2e2acb61f84f90714d6bb8176fc9b582d8347d28a16174480392c0d5b1c06db01b049c305642e2b9b8de73c51 SHA512 4b62fc9e1424284e285ed031b3d1120964412abda30295238506136dfcb9201ac0a9fa771b69274a4f8386446459b263c0adfbe320d40b47efeb8186208f3ca0
 MISC metadata.xml 551 BLAKE2B 6b04ab731ce0f9c836b958914e25fcd4a4b76032fd97ba41f6bda742e99a4b7404de51acac99fe4736ba87e488300e94dc1ef7621a780d0a8e453d0fde0430f2 SHA512 a1c2b5260d0265efe2e1294cb88aa1c43618654c7d989cd8f4bd6e919082ea1d37fed4df8a601a702b5b120d5fb5f6658d3e155c5346dacb17249fed629c04d0
diff --git a/media-gfx/renderdoc/renderdoc-1.20-r1.ebuild b/media-gfx/renderdoc/renderdoc-1.20-r1.ebuild
deleted file mode 100644
index 547e21513366..000000000000
--- a/media-gfx/renderdoc/renderdoc-1.20-r1.ebuild
+++ /dev/null
@@ -1,202 +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 flag-o-matic 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.20-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
-
-	# Ensure that we use the system glslang headers instead of the
-	# vendored copy.
-	rm -r renderdoc/3rdparty/glslang || die 'rm vendored glslang failed'
-
-	# 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} )
-
-	# Lots of type mismatch issues.
-	filter-lto
-
-	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-libs/Manifest.gz b/media-libs/Manifest.gz
index fdbd1d4b8dce..55144ff8d5d9 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/flac/Manifest b/media-libs/flac/Manifest
index 5de79e0ad0bd..330fbe5eead9 100644
--- a/media-libs/flac/Manifest
+++ b/media-libs/flac/Manifest
@@ -1,3 +1,5 @@
 DIST flac-1.3.4.tar.xz 1038356 BLAKE2B 0553cd42705f31d6a98d10e8b73953265e97c6b1e46bb59c7d97d12ec1b4aae4c3d6f5e85b9e5d1513f7efac82a65ea9dc59d89d8df0254ff3ab1188039c55c5 SHA512 4a626e8a1bd126e234c0e5061e3b46f3a27c2065fdfa228fd8cf00d3c7fa2c05fafb5cec36acce7bfce4914bfd7db0b2a27ee15decf2d8c4caad630f62d44ec9
+DIST flac-1.4.0.tar.xz 783372 BLAKE2B 69fd756ae6a41bdf84a1237cb24949ae24126a66432a0ecf1d9943a9ddd082629aa9ff480bf77ff60fcfc2401a4942bdc4549e22378841997e0d1a83f8f18f25 SHA512 b7310de7bcf49584c0a1fdc6d5ee7216a8ab3e2b1af85366fa0905752da13e1cbb9638e0d92f3b756568a69848abf4d5c2fe0d21a86c6fdb4840f2678daf0f8d
 EBUILD flac-1.3.4.ebuild 1564 BLAKE2B 8bd7aef1a3ad5d9d4acdb92d19df3b6c3d667c4614d9263d59e345a3683bd8e24adf72129be46e355266ec33ff2239efcede265bba8874a1f251b8f5a21ed085 SHA512 cd7b12fd21f8d09b09028c5fd1d128f2826f3894ef3072328e0e6f51d5c62220493f1f4ec953128354369f3aa3e6f9e2a00a301766be43724657d0c72f3deab8
+EBUILD flac-1.4.0.ebuild 1571 BLAKE2B 9fa21240605737670f50c3f655ec3af2441b3ad840b83c564af4801a3d43aa0fc5e4ce2ad1aaa6a067090c4a88224f4791b032b76a383ffee3759ef94bb7d760 SHA512 0bb85b285e8d003ab1c43ee66c871c35348d072ba537b6b0901419ef57f56fe32389d68f009fb754b77a097346d2d703487a73e60aa7f89257a1759b191665ff
 MISC metadata.xml 328 BLAKE2B f204d66e57846152c096064928450d390da7ef9ff2c5b67b4cdd8b83638174363dff11f282e9a604159ec8713afcac56114b6705051af6b353dee5201526682c SHA512 a742889e639181db89974299b09a205320021bb577c55e467dc969950520f61981918f1ff2a990d788f73fda106aecf3cabe70fd40d0b0269038c16e9d08541e
diff --git a/media-libs/flac/flac-1.4.0.ebuild b/media-libs/flac/flac-1.4.0.ebuild
new file mode 100644
index 000000000000..2a50c9496016
--- /dev/null
+++ b/media-libs/flac/flac-1.4.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multilib-minimal
+
+DESCRIPTION="free lossless audio encoder and decoder"
+HOMEPAGE="https://xiph.org/flac/"
+SRC_URI="https://downloads.xiph.org/releases/${PN}/${P}.tar.xz"
+
+LICENSE="BSD FDL-1.2 GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="+cxx debug ogg cpu_flags_ppc_altivec cpu_flags_ppc_vsx cpu_flags_x86_sse static-libs"
+
+RDEPEND="ogg? ( media-libs/libogg[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-arch/xz-utils
+	sys-devel/gettext
+	virtual/pkgconfig
+	abi_x86_32? ( dev-lang/nasm )"
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--disable-doxygen-docs
+		--disable-examples
+		--disable-xmms-plugin
+		$([[ ${CHOST} == *-darwin* ]] && echo "--disable-asm-optimizations")
+		$(use_enable cpu_flags_ppc_altivec altivec)
+		$(use_enable cpu_flags_ppc_vsx vsx)
+		$(use_enable cpu_flags_x86_sse sse)
+		$(use_enable cxx cpplibs)
+		$(use_enable debug)
+		$(use_enable ogg)
+		$(use_enable static-libs static)
+
+		# cross-compile fix (bug #521446)
+		# no effect if ogg support is disabled
+		--with-ogg
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_test() {
+	if [[ ${UID} != 0 ]]; then
+		emake -j1 check
+	else
+		ewarn "Tests will fail if ran as root, skipping."
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -type f -name '*.la' -delete || die
+}
diff --git a/media-libs/libaom/Manifest b/media-libs/libaom/Manifest
index c976f9bec9fe..a124b8a5c723 100644
--- a/media-libs/libaom/Manifest
+++ b/media-libs/libaom/Manifest
@@ -1,6 +1,8 @@
+AUX libaom-3.4.0-posix-c-source-ftello.patch 429 BLAKE2B 3e6ff2b95dbf39d2d90a46c9189abf160d3460e247446db4ad0e534bde7f382aeaa4e1457c0a4ddb7cf3c9666fd173efa1955a22fc4d3708a93dcd6b7c160f07 SHA512 30cc17c38219e81f92f1f034786d5d4096a0e657c86dfe581f84d18fc201a0e34bd331e98271f92c07e5dc49740e164a983b3316fc57599b98aea2615f7cf107
 DIST libaom-3.3.0.tar.gz 4768475 BLAKE2B 22060694019bcd925cb38c365063b8f2be60aed4cc6f9b0aa95cf8b4c4c5b40f5c603359d8c0728c5650fe9f7eea7573b8fd4a93975481c67409b201b4c48428 SHA512 9bd118bf46d777da4e85f348fed95510ce583d16d005d062d33e2899f16f24bdb8b120792a7c77ccb64b4e1ff5b3d934342fb1b356bb426693ef69220f138c5f
 DIST libaom-3.4.0.tar.gz 5175838 BLAKE2B 7a38cc1a1871f044018a8ebf5022810b753b099ad61e0c6e2625a0480946e8b5e066fd1e1abc5523e817025c8a59d6f1092c12d632c5b602cf3a80f6ef8daa0e SHA512 8de5e7eae96b182ceb33ce2c66fde784349a7a117371177102c358cc9b2cad75bebe2849fdf8ce57ae149a38b43419b51e54e5475cb781ed3d5953081127b478
 EBUILD libaom-3.3.0.ebuild 3231 BLAKE2B 3ad7ddf62b2aad9be9401ac792241cc162be618d8f1c4a35e015479f5736a6970ae48b99ab2e950a890f5bddb6f44ee50edf421e46f8c072ccd82a0bf6d5dbb3 SHA512 aba993a08e60d01e6d904ba4103a761d6dcaf9290f6af726c4c0dc98eeb0644a1cd2167ade6357b0382f5629b7065d595b5bd634705fec89bf7330f364132f0e
+EBUILD libaom-3.4.0-r1.ebuild 3320 BLAKE2B 67bb1e13449421ebef4f28456c8095c3765e3b24b0a2c8d884055447251f2568d7a310b9142ee45d9f0fcf41c3b190510053faf2c17948d41c7964eb465e0d24 SHA512 388d0ddbc9538c070a6fd5280644865b452f32926a2cba8012a16ea8cf0a962419edba5642811176633c55c3a98032e2b5e9ebeee4611e95d09fe55c4427dde4
 EBUILD libaom-3.4.0.ebuild 3249 BLAKE2B f4f278e68c492fb87625ddff065cfe0096dc60473069fcb164a824eaaa07fc0d20e2256d5a5fafc3abad17fdef2ce2b08a956cc4e5d8c97d1b29e6f137f56356 SHA512 f96e63a0c1d0521d43bd41a850d4decb9ffb71c562baf6ad0e8159b24330c979a638b52c6ee5100e99acca2df96e15c8c0cc6c3f8252fbc2ffe3964ea284cc18
 EBUILD libaom-9999.ebuild 2454 BLAKE2B a886edfc976e058ac5c05aad0371771d4fe9417fa16126c19627885e0df84ab22d8b76304e43e6b70d13031dd54dd28d2da5c0576fa6fbef2b9f61755c7b8ca6 SHA512 0733ee09d7c66aa7c1ca09f9c2c91dfb840cdfe12a461cd2f23dff6977493c628133bea3ead2055c1551808490c6bcf00ef4853404f164e2f23ecfd693a45eb2
 MISC metadata.xml 224 BLAKE2B a8fa831654345ddf74b54f53fdc27d128ff6896378c8aa2dcb27139a4382f63efd0cac17f94ee420932e2855042c94e32fe534c99a977698953aaab4c51c31d0 SHA512 0b59f17151d352f25e3b073a3ee388d0189e1caddf0d97142851a19df433d082e3eead9f5aae07f4beb247861d90f02ae217514d02445703b95ee6ff62d967b8
diff --git a/media-libs/libaom/files/libaom-3.4.0-posix-c-source-ftello.patch b/media-libs/libaom/files/libaom-3.4.0-posix-c-source-ftello.patch
new file mode 100644
index 000000000000..6e910b3f732c
--- /dev/null
+++ b/media-libs/libaom/files/libaom-3.4.0-posix-c-source-ftello.patch
@@ -0,0 +1,13 @@
+https://bugs.gentoo.org/869419
+
+POSIX_C_SOURCE is needed for ftello.
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -266,6 +266,7 @@ add_library(aom_rtcd OBJECT ${AOM_RTCD_SOURCES})
+ add_dependencies(aom_rtcd aom_version)
+ 
+ if(ENABLE_EXAMPLES)
++  add_definitions(-D_POSIX_C_SOURCE=200112L)
+   add_library(aom_encoder_stats OBJECT ${AOM_ENCODER_STATS_SOURCES})
+   set(AOM_LIB_TARGETS ${AOM_LIB_TARGETS} aom_encoder_stats)
+ endif()
diff --git a/media-libs/libaom/libaom-3.4.0-r1.ebuild b/media-libs/libaom/libaom-3.4.0-r1.ebuild
new file mode 100644
index 000000000000..7c969b44ed77
--- /dev/null
+++ b/media-libs/libaom/libaom-3.4.0-r1.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+inherit cmake-multilib python-any-r1
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://aomedia.googlesource.com/aom"
+else
+	SRC_URI="https://storage.googleapis.com/aom-releases/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+DESCRIPTION="Alliance for Open Media AV1 Codec SDK"
+HOMEPAGE="https://aomedia.org https://aomedia.googlesource.com/aom/"
+
+LICENSE="BSD-2"
+SLOT="0/3"
+IUSE="doc +examples test"
+IUSE="${IUSE} cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3"
+IUSE="${IUSE} cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2"
+IUSE="${IUSE} cpu_flags_arm_neon"
+# Tests need more wiring up
+RESTRICT="!test? ( test ) test"
+
+REQUIRED_USE="
+	cpu_flags_x86_sse2? ( cpu_flags_x86_mmx )
+	cpu_flags_x86_ssse3? ( cpu_flags_x86_sse2 )
+"
+
+BDEPEND="${PYTHON_DEPS}
+	dev-lang/perl
+	abi_x86_32? ( dev-lang/yasm )
+	abi_x86_64? ( dev-lang/yasm )
+	abi_x86_x32? ( dev-lang/yasm )
+	doc? ( app-doc/doxygen )
+"
+
+# The PATENTS file is required to be distributed with this package, bug #682214
+DOCS=( PATENTS )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.4.0-posix-c-source-ftello.patch
+)
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DENABLE_CCACHE=OFF
+		-DENABLE_DOCS=$(multilib_native_usex doc ON OFF)
+		-DENABLE_EXAMPLES=$(multilib_native_usex examples ON OFF)
+		-DENABLE_NASM=OFF
+		-DENABLE_TESTS=$(usex test)
+		-DENABLE_TOOLS=ON
+		-DENABLE_WERROR=OFF
+
+		# Needs libjxl, currently unpackaged.
+		-DCONFIG_TUNE_BUTTERAUGLI=0
+
+		# neon support is assumed to be always enabled on arm64
+		-DENABLE_NEON=$(usex cpu_flags_arm_neon ON $(usex arm64 ON OFF))
+		# ENABLE_DSPR2 / ENABLE_MSA for mips
+		-DENABLE_MMX=$(usex cpu_flags_x86_mmx ON OFF)
+		-DENABLE_SSE=$(usex cpu_flags_x86_sse ON OFF)
+		-DENABLE_SSE2=$(usex cpu_flags_x86_sse2 ON OFF)
+		-DENABLE_SSE3=$(usex cpu_flags_x86_sse3 ON OFF)
+		-DENABLE_SSSE3=$(usex cpu_flags_x86_ssse3 ON OFF)
+		-DENABLE_SSE4_1=$(usex cpu_flags_x86_sse4_1 ON OFF)
+		-DENABLE_SSE4_2=$(usex cpu_flags_x86_sse4_2 ON OFF)
+		-DENABLE_AVX=$(usex cpu_flags_x86_avx ON OFF)
+		-DENABLE_AVX2=$(usex cpu_flags_x86_avx2 ON OFF)
+	)
+
+	# For 32-bit multilib builds, force some intrinsics on to work around
+	# bug #816027. libaom seems to do runtime detection for some targets
+	# at least, so this isn't an issue.
+	if ! multilib_is_native_abi && use amd64 ; then
+		mycmakeargs+=(
+			-DENABLE_SSE3=ON
+			-DENABLE_SSSE3=ON
+		)
+	fi
+
+	# On ARM32-on-ARM64, things end up failing if NEON is off, bug #835456
+	# Just force generic, given it's a niche situation.
+	# TODO: could try forcing armv7 or similar?
+	if use arm && ! use cpu_flags_arm_neon && [[ $(uname -p) == "aarch64" ]] ; then
+		ewarn "Forcing generic for arm32-on-arm64 build (bug #835456)"
+		mycmakeargs+=(
+			-DAOM_TARGET_CPU=generic
+		)
+	fi
+
+	cmake_src_configure
+}
+
+multilib_src_test() {
+	"${BUILD_DIR}"/test_libaom || die
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi && use doc ; then
+		local HTML_DOCS=( "${BUILD_DIR}"/docs/html/. )
+	fi
+
+	cmake_src_install
+}
+
+multilib_src_install_all() {
+	find "${ED}" -type f \( -name "*.a" -o -name "*.la" \) -delete || die
+}
diff --git a/media-libs/raptor/Manifest b/media-libs/raptor/Manifest
index f55c860cf746..ec2c354531e2 100644
--- a/media-libs/raptor/Manifest
+++ b/media-libs/raptor/Manifest
@@ -7,6 +7,6 @@ AUX raptor-2.0.15-use-pkg-config-libxml2.patch 1479 BLAKE2B 8b2f1d1a10b04d6c67b8
 AUX raptor-2.0.15-use-pkg-config-libxslt.patch 3514 BLAKE2B 5bcdb3fecf1149ad60387bc4c485d42fd9f764556ebf383201baa3d18426a85ca76a3f29723a8f74be71a58fcfba9f5263a1b1681d012ea4cc0167260702d111 SHA512 0eef2e55e8f77ceb8ac1dc639eea7cb7ee53e53d0ad8058af8b52d44d9f5a5a4e027c7c90360b950469f0c632721c8be068fde7f7fdb8e93aab06b56d3845150
 DIST raptor2-2.0.15.tar.gz 1886657 BLAKE2B 0a39c7b5705bfbf2daa0ca633f79693953b4dfe24c144008d1646a9840a36d4d7ce153b527450647127ec2522047dbd0a6e71f307ee5656951f7e4b610adfd22 SHA512 563dd01869eb4df8524ec12e2c0a541653874dcd834bd1eb265bc2943bb616968f624121d4688579cdce11b4f00a8ab53b7099f1a0850e256bb0a2c16ba048ee
 EBUILD raptor-2.0.15-r4.ebuild 1889 BLAKE2B a8dc0c30e446f6831ee8a913ea47a2d96e677aa951a690a1c7ac06fbf04e07e7fa0a8f09cb102bd8e09c4eb0e06638741328bddc8b80da68e0b591deb16b49d7 SHA512 ff38ff843d268fc14fdba779c0d2b32bb4882c85c09048b3e632c303c7770722a6d1384fb003f8cb1dfe53410dd7dbbf9435a0c9dcd0c193671d2b29aac89d48
-EBUILD raptor-2.0.15-r5.ebuild 1954 BLAKE2B 9a0e881c02f72d50b3584acb5eba0f7447bdfb626c2b23c2fbcaeab43ac8a8dd33b61ac00c7e948f41fd7e49eeeba3799317fff81ccd732611c8e666df151b63 SHA512 d4eb4b1a8710556d22af3456b17f5b0c7a6b385ccb106a413810e58d3bb9b42f2b8d5ca4a0dec2b98fb40c4d699cbd3965b6cefdc38cfd688d6ec164576f8a38
+EBUILD raptor-2.0.15-r5.ebuild 1949 BLAKE2B ce0ab02f134064d49805a6ff7236d35f43c6f0bece7a77c6a08eeb065b2404267a86d9e4dff820673e2a21fc51d0974da2707a8ad91b28e8717e05b6954b3d69 SHA512 0de41b447426a3ef41c10941a4ee4d6dd879b4db36ffdb2b4bc3d7513911736795ce80c2db0ac3f4551f226c509ca250593fecf3e9f4547d718194d2f672cc9d
 EBUILD raptor-2.0.15-r6.ebuild 2010 BLAKE2B 47979c08e6a884ac26795d1ed9020686a271d9d464f21b378390e9cf9537d84f99bae4943494c14d1eb8e4fb0233f506bf328e9f62a6ab503ed3529247253dc2 SHA512 0a87e6304aee78589ec11d23654f16544313f4a7e6772c46d5b9b898ce578dba2b20d442763f5ac65179860fcaddbe71798b425c821a9037f3387b4ee4fa63f6
 MISC metadata.xml 406 BLAKE2B 00da42e759d35fc777ebbce9df89b600758104eb240cbecff33df51779ac9f565a3f7ee35a89a7fb91fd234c1a19b89ff96416189a5015e5563cbd4f420f616a SHA512 1855a61f21b684e5abbf35c3276dc8185eb805574c65e84593eed08d1598d213ca99c17bfe86be3db3172dc103b1dd2b8524e22aeeaf912afa097d022ad0c5d2
diff --git a/media-libs/raptor/raptor-2.0.15-r5.ebuild b/media-libs/raptor/raptor-2.0.15-r5.ebuild
index 3699299b34cc..657b4c984401 100644
--- a/media-libs/raptor/raptor-2.0.15-r5.ebuild
+++ b/media-libs/raptor/raptor-2.0.15-r5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://download.librdf.org/source/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0 GPL-2 LGPL-2.1"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+curl debug json static-libs"
 
 DEPEND="
diff --git a/media-libs/sratom/Manifest b/media-libs/sratom/Manifest
index 7f7368ff84cd..4bc77f2dfc9c 100644
--- a/media-libs/sratom/Manifest
+++ b/media-libs/sratom/Manifest
@@ -1,5 +1,7 @@
 DIST sratom-0.6.10.tar.bz2 327047 BLAKE2B 6205a0269216099556556cd251649eba58fdf1a2c8a80611367f3b9564fe410ed7ff1c565ab7b628743fa99ca893eb7a86fed631872eff86e19de9ba534fae49 SHA512 cc5d2848d61de45a37d1f844b2c741016decf065bcac975214dd01108171ba332f0a51526f2f1078d5f501055af0a48716704515cbe7a9f73526fd878621ca4b
 DIST sratom-0.6.12.tar.xz 23328 BLAKE2B 76a01c84e418ee3ffeb1e0e44214e9b02ab58b9b572372ee43309650a7a674a55e49384e8b62657af30933b7bdb02faf38ff100030e2ec86947972cacf32db69 SHA512 e677945f59494970c8c723319216cf6543ed38c590b6db94e5e928e830004e96dc957a2cf2fb0b76278cf55f0d62ea03ba705fbc449424c467e29593eaa948dc
+DIST sratom-0.6.14.tar.xz 24252 BLAKE2B 6f468e9a0de97cf83a4f3faeb8ceff8a5502da7f0dff6b5721ef985df352057cda0dbbf13656471ef7f3103a891570e3462ed6bf4517dbc546d9f83115db433b SHA512 3647ccca3ac98299a0bcc30d540788c627445c9a55f0b68a53e08ee45b15138c7a5466c92d1c10eac614325718d4f59eff6f0664f99891e8349e613be675c87d
 EBUILD sratom-0.6.10.ebuild 1278 BLAKE2B e1b8bd5bc3dd4c6ba7d922b3f7a021023c048c7efeba7f246e7eb12fd9a2ebb1c1996e8f3b713fc6748b8a10c08eca3966217ebb61c5559129125f9ebb58567b SHA512 79cd92b9ee933fdcea36374c4d8b7754176f084b9e6906e8603d3f929b7bf2467da5e4f22cb1c519c83b383e4b3492c8894f6c4730c61d9be71bc74d539875e8
 EBUILD sratom-0.6.12-r1.ebuild 1140 BLAKE2B 7d0a34f5ecb76c9d7cf7e32cfd35833f4516e91396704860654ca5eadb29803e60cf3069c0a983ef54cd831552d67f46f408835d006080cc352dcc420cfda6ab SHA512 85bed3f5d72b26687d9997cdd111fcbc042366892264088e4b38932aefb9cdf48d0c02d6c052f5c341c8cdcd4bee304da80b851198ee51bc104f63db7a8c57d0
+EBUILD sratom-0.6.14.ebuild 1140 BLAKE2B 7d0a34f5ecb76c9d7cf7e32cfd35833f4516e91396704860654ca5eadb29803e60cf3069c0a983ef54cd831552d67f46f408835d006080cc352dcc420cfda6ab SHA512 85bed3f5d72b26687d9997cdd111fcbc042366892264088e4b38932aefb9cdf48d0c02d6c052f5c341c8cdcd4bee304da80b851198ee51bc104f63db7a8c57d0
 MISC metadata.xml 256 BLAKE2B 211ca90d8f704be5ca8a1994f0e8f1adbe1fd4937a10a301ced0b9be171dfdabb223661d168535cd7f5edfe0c8edca4620945e13dc3c43b5832ac183913188f0 SHA512 fde3b658512fa6742886d7dd84efc906331b43f5b0f8fdca353fe2280653381716d7143473c9237b9fe58b9df5889b38b008da34f6ce4b64336f38642d78e3dd
diff --git a/media-libs/sratom/sratom-0.6.14.ebuild b/media-libs/sratom/sratom-0.6.14.ebuild
new file mode 100644
index 000000000000..7a0ecfc1b275
--- /dev/null
+++ b/media-libs/sratom/sratom-0.6.14.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+PYTHON_REQ_USE='threads(+)'
+inherit meson-multilib python-any-r1
+
+DESCRIPTION="Library for serialising LV2 atoms to/from RDF, particularly the Turtle syntax"
+HOMEPAGE="http://drobilla.net/software/sratom/"
+SRC_URI="http://download.drobilla.net/${P}.tar.xz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	virtual/pkgconfig
+	doc? (
+		app-doc/doxygen
+		dev-python/sphinx
+		dev-python/sphinx_lv2_theme
+)
+"
+RDEPEND="
+	dev-libs/serd
+	dev-libs/sord
+	media-libs/lv2
+"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+"
+
+src_prepare() {
+	default
+
+	# fix doc installation path
+	sed -iE "s%install_dir: docdir / 'sratom-0',%install_dir: docdir / '${PF}',%g" doc/c/meson.build || die
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		$(meson_native_use_feature doc docs)
+		$(meson_feature test tests)
+	)
+
+	meson_src_configure
+}
+
+multilib_src_install_all() {
+	local DOCS=( NEWS README.md )
+	einstalldocs
+}
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 47cd5e18c16a..cd2754b6493d 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/exaile/Manifest b/media-sound/exaile/Manifest
index 6923cc93f1cf..26ef5fa91466 100644
--- a/media-sound/exaile/Manifest
+++ b/media-sound/exaile/Manifest
@@ -2,6 +2,6 @@ AUX exaile-4.1.1-metainfo.patch 1472 BLAKE2B 5c466aa63e8fc4538d53f07fcb5c943bbab
 DIST exaile-4.1.1.tar.gz 3641073 BLAKE2B 34222ddba782dd51897c017d7a77da9a796e45dad69983f934e76cc559c2e52f2173ee418004943ca087fd894439bc42a6eff2a5d6146e6189ec1cd478f5d08b SHA512 babf37253054fbeb6dad33aedafe969201860d4f35222d577343256730be943682c1a5f2f7cec7c574695624cb2b7abbdff4e6eaada848d22fea073c2c44bd23
 DIST exaile-4.1.2.tar.gz 3708188 BLAKE2B 859d77bac62df0843291fdc0de4888079c8f103da3cdf3417d0cd5ba67cf5199a8a1e89d20403efbc6793dfcd7b8333708df74ff535e0912fb02502a13702a0a SHA512 7711f9e062088b02362bbd404f7c61a0f1c128e29e42ce657dc092cac351641f6000846c9da843866bf28ccbd68cf1b07731ba1c9854d52b33c0448e87d0e93b
 EBUILD exaile-4.1.1-r1.ebuild 1662 BLAKE2B 21a6b213f5f35d79d145e22fbc23ce4688aa296b5c7bc68cb3a742cd5b529aab9d5dea42da4352f26859dd4dfc6129f5017978fa2c8ee6d9c8529fe47999223e SHA512 f6c837c994063cb2ef07c4bbdd933f0793f37811809f9e876669b01e94c6fe4454be3dbe3afcb2786fa4f19183ede20de41d193262c3089b32298584ff2964c3
-EBUILD exaile-4.1.2.ebuild 1615 BLAKE2B 549c178edf176ec29f30d65664bc32a11d495a5f339dddddb352573e4f62370028bca85dec9827bf01366b2a694ff15fbbd63f269e1aa8b3e170b1c2fbf81efc SHA512 e3cba337f8a82e226b8c3c95c30372faadf5bd9348bfdc8333b9d4cb83f2ff0fe77e5da52621cccb5f9cf982958fe95f9a8d32f8c7ffddbcd9034dc62a3cbdf8
+EBUILD exaile-4.1.2.ebuild 1614 BLAKE2B 6b4d14de4c564827f1cc8d21f6870065fe6f5bc899ca154748505e6ac26984010472b488cd8df7c2838f6fc96e0a1130d0565c0bff5d96c69e0e8d71bdc4574f SHA512 9d384293121b889472423cea9cdfc574610884227282b74273007176b33a949c1eae420d1306b87074d5dae5069829ae871cba148efcd8bb421c58c77340caf2
 EBUILD exaile-9999.ebuild 1615 BLAKE2B 549c178edf176ec29f30d65664bc32a11d495a5f339dddddb352573e4f62370028bca85dec9827bf01366b2a694ff15fbbd63f269e1aa8b3e170b1c2fbf81efc SHA512 e3cba337f8a82e226b8c3c95c30372faadf5bd9348bfdc8333b9d4cb83f2ff0fe77e5da52621cccb5f9cf982958fe95f9a8d32f8c7ffddbcd9034dc62a3cbdf8
 MISC metadata.xml 466 BLAKE2B 8c2ae9dfde18d1976a3c38a77de336e5f0489879adcdb030c9c6b3cb765e440d8bf908c57b2fe1670b090d90c570b3219201319d81319dda87c92c777c82757e SHA512 5bdedc04863ba9c8632a818d8f7a834687e3474cfe906b0ee82378f6c957ecc9778206f8b7f7abefda5cba06c4c0df930e5e170754fa8c59467dd4f1857be4f8
diff --git a/media-sound/exaile/exaile-4.1.2.ebuild b/media-sound/exaile/exaile-4.1.2.ebuild
index 5fd5b6a75bca..27c4ab99ab06 100644
--- a/media-sound/exaile/exaile-4.1.2.ebuild
+++ b/media-sound/exaile/exaile-4.1.2.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/exaile/exaile.git"
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV/_/-}/${PN}-${PV/_/}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 	S="${WORKDIR}/${PN}-${PV/_/-}"
 fi
 
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index d777a991cda7..f4fcb3674d31 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index d269ee0247b7..f771435339c5 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Sat, 10 Sep 2022 02:40:05 +0000
+Sat, 10 Sep 2022 08:40:01 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index cbd4afa783d2..4efe04293c13 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 525759 BLAKE2B 487aaba91a7a713d59ac9586bbe0ffaeb7bf01fde9781422d78f1d1e009e745a8cea346fbefedc07f275060c3798240f56799ae9f182d10305c04a36eac8db25 SHA512 9ad37d1ae3ef248f0c465e37bce58b95e6f9da024c5d52c9ede183ff971546b15abed0e4dd4ca83a4f69fd2c722ad188eb583dd8d8337d8d99ae3e7c776b7da4
-TIMESTAMP 2022-09-10T02:40:08Z
+TIMESTAMP 2022-09-10T08:40:05Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmMb+QhfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmMcTWVfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCY3w/9GA2yEBnoL+vpuPAPuCkQdGPwXZE15Pv7cNeAz0zyUhtcVXzS6uG4A3wc
-lbdwqxPiGgFtbn8bXTKpVjYv9V87UYwwUHddV46pm1qOhYLT7XzobqfdQ4+bRfUr
-ONXFarWPyArjuY8kzONTxAChxGWSvv8hkG5yijHwpOshLoQqJY4Kcz2QFh3G+grl
-lH8EsA97ufnllU5IWVkgEfJE7dozg+iDj9RPqMJ7LSH8KpoNJX+rONdgJaMVv7Z1
-9w7rXm1r2pBdo4eb4U0rME+RKAiEb+Jzu0utKCII1Y/YWIOJWkZBWdsg+jfAws53
-xFTzZtl41T6+9BKpQ2tByH8Pf/6jnPy4VOevqXW82ZmaACXbnn4oacaHBUZoc8PX
-cUEyPoPf6miG/e2y8lcyjU/fw8s8ZEhhYWVzVs1XMiCV9SKZDh4E/q17nx4k2BjW
-+jERro0f2WQcx/qTkJvvOOTWz/31EFPuDMj+9X8MsEZKUtpD3syOTJx7D0CYcFQd
-OVfP6C2jWngcLy/ytxA+NM5rb7KqDtQVlltocYuMVLVnz+HcQiCtljtwYtARqOSi
-0kFzNAp2HI+sM+n9VG4cZyiJAa40yzD2Qjc7qfrdlS+Lo8efaPiHcqB9CFAkoGOS
-D0+dtLBOhs4fEljyoe0FScaETK2hzK0g3BzT0Ujk3iLdjI5xAbY=
-=CkIM
+klCrYw//REhXpE2lnrrRnelC4PQigXQ7QbEeKFD+V0VSrYSdoefo6z005TeE+TdV
+tNo9yx6au5YUoIdfHdy7d0UjX0Tv0cMPTQSvsV3bWXPbSUEfh/L8lf9HbNyfJOsB
+QqvFVTJ3YSggoL9YFq8+kOh0+EVeffQSjdapU5tHDbUDNY3lqDgBtjV52j1eVfyY
+Da2cZJ+8aKMCNXEGuF4eSgbPTaeGgkdw7TtFOZBsDQia34Adyl1DQzd9QQoq6/f7
+Ptkr7hvE2vOkWcAIXcxjIEIU73c/W5DUyrz2ZpOWcP3cvgW4v5Rrg/Ac1IGkEOjr
+/e1I+U7jUDMIYi951pdj7BHPD8t8ZNsqF6ngC3M0znuwe9TmYqdmV3a0bya23VKu
+ZZ2ZfnnwvWNXN2P0lgJXF+DAptjFdw3P9J/p/9+MnPbjzmJHJnQ/8jWo2cqhJBA2
+8w02jPDO2zq/Ddu/GpjW242KVAbIBv3mU/3mZwEJHvDepasIRYS0Xvf7uTgMo8RV
+yRzsLU5JiLNZTsK7QaE2cHCSrIa1dQIPw/ViZlz7NOiGpfWqxK3DJ28KnnOmJrHS
++dv7b15q5/DPiHDdVWiD+0bVi80qnzKh9so1rW2U2+8iTRPgFY82AKNJJb2wvOoH
+iJN+lpOC0DytGENa2Lfeo3e+D9piObiGv9feqY+Pmk/vVTFNFg4=
+=c+ot
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index d269ee0247b7..f771435339c5 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Sat, 10 Sep 2022 02:40:05 +0000
+Sat, 10 Sep 2022 08:40:01 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 73a7671a025f..ac00cfb6e0d0 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 2509067650cf..a7798e97ffea 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.71 b/metadata/md5-cache/app-admin/awscli-1.25.71
new file mode 100644
index 000000000000..5bac578187a0
--- /dev/null
+++ b/metadata/md5-cache/app-admin/awscli-1.25.71
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/pytest-forked[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/botocore-1.27.70[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !app-admin/awscli-bin >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Universal Command Line Environment for AWS
+EAPI=8
+HOMEPAGE=https://github.com/aws/aws-cli/ https://pypi.org/project/awscli/
+INHERIT=bash-completion-r1 distutils-r1 multiprocessing
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm64 ~riscv ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/botocore-1.27.70[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.71.tar.gz -> aws-cli-1.25.71.gh.tar.gz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=67114db7b01ea6d3574947c0412bcfc4
diff --git a/metadata/md5-cache/app-containers/Manifest.gz b/metadata/md5-cache/app-containers/Manifest.gz
index 77217945875d..c3a018f4cbc5 100644
--- a/metadata/md5-cache/app-containers/Manifest.gz
+++ b/metadata/md5-cache/app-containers/Manifest.gz
diff --git a/metadata/md5-cache/app-containers/lxc-4.0.12 b/metadata/md5-cache/app-containers/lxc-4.0.12
deleted file mode 100644
index fec57a2a2150..000000000000
--- a/metadata/md5-cache/app-containers/lxc-4.0.12
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen[dot] ) man? ( app-text/docbook-sgml-utils ) verify-sig? ( sec-keys/openpgp-keys-linuxcontainers ) 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 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=configure install postinst prepare setup unpack
-DEPEND=acct-group/lxc acct-user/lxc app-misc/pax-utils sys-apps/util-linux sys-libs/libcap virtual/awk caps? ( sys-libs/libcap ) io-uring? ( >=sys-libs/liburing-2:= ) pam? ( sys-libs/pam ) seccomp? ( sys-libs/libseccomp ) selinux? ( sys-libs/libselinux ) ssl? ( dev-libs/openssl:0= ) >=sys-kernel/linux-headers-4 apparmor? ( sys-apps/apparmor )
-DESCRIPTION=A userspace interface for the Linux kernel containment features
-EAPI=7
-HOMEPAGE=https://linuxcontainers.org/ https://github.com/lxc/lxc
-INHERIT=autotools bash-completion-r1 linux-info flag-o-matic optfeature pam readme.gentoo-r1 systemd verify-sig
-IUSE=apparmor +caps doc io-uring man pam seccomp selinux +ssl +tools verify-sig verify-sig
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv x86
-LICENSE=GPL-2 LGPL-2.1 LGPL-3
-RDEPEND=acct-group/lxc acct-user/lxc app-misc/pax-utils sys-apps/util-linux sys-libs/libcap virtual/awk caps? ( sys-libs/libcap ) io-uring? ( >=sys-libs/liburing-2:= ) pam? ( sys-libs/pam ) seccomp? ( sys-libs/libseccomp ) selinux? ( sys-libs/libselinux ) ssl? ( dev-libs/openssl:0= )
-SLOT=0
-SRC_URI=https://linuxcontainers.org/downloads/lxc/lxc-4.0.12.tar.gz verify-sig? ( https://linuxcontainers.org/downloads/lxc/lxc-4.0.12.tar.gz.asc )
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	bbfa385d6907d7948d49a5e107bd654d	multilib	5ca4e49abed8e3a2f7b56920eadee157	optfeature	1a2157392a869265b2afcb63a26c12ac	pam	e44a1dd98f13e1ad76de01e919bde1f1	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=2017d070bf38d1c63a37656dda523393
diff --git a/metadata/md5-cache/app-doc/Manifest.gz b/metadata/md5-cache/app-doc/Manifest.gz
index ceddac1813dc..52f73363b201 100644
--- a/metadata/md5-cache/app-doc/Manifest.gz
+++ b/metadata/md5-cache/app-doc/Manifest.gz
diff --git a/metadata/md5-cache/app-doc/halibut-1.3 b/metadata/md5-cache/app-doc/halibut-1.3
index d81dfef194d7..5eff5f612266 100644
--- a/metadata/md5-cache/app-doc/halibut-1.3
+++ b/metadata/md5-cache/app-doc/halibut-1.3
@@ -4,9 +4,9 @@ DESCRIPTION=yet another free document preparation system
 EAPI=8
 HOMEPAGE=https://www.chiark.greenend.org.uk/~sgtatham/halibut/
 INHERIT=cmake
-KEYWORDS=amd64 ~arm64 ~hppa ppc ~ppc64 ~riscv ~sparc x86
+KEYWORDS=amd64 ~arm64 ~hppa ppc ~ppc64 ~riscv sparc x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://www.chiark.greenend.org.uk/~sgtatham/halibut/halibut-1.3/halibut-1.3.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=df0032791cab055bee41cf55b042c4dc
+_md5_=3a401077cb2003fd64a8f5d1314272b3
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index 87a9c0146a75..4f6b89c67b4e 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/erlang-25.0.4 b/metadata/md5-cache/dev-lang/erlang-25.0.4
index 3ab87de94848..a542b3fb61fa 100644
--- a/metadata/md5-cache/dev-lang/erlang-25.0.4
+++ b/metadata/md5-cache/dev-lang/erlang-25.0.4
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://www.erlang.org/
 INHERIT=elisp-common flag-o-matic java-pkg-opt-2 systemd toolchain-funcs wxwidgets
 IUSE=doc emacs java +kpoll odbc sctp ssl systemd tk wxwidgets java
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=Apache-2.0
 RDEPEND=acct-group/epmd acct-user/epmd sys-libs/ncurses:0 sys-libs/zlib emacs? ( >=app-editors/emacs-23.1:* ) java? ( >=virtual/jdk-1.8:* ) odbc? ( dev-db/unixODBC ) sctp? ( net-misc/lksctp-tools ) ssl? ( >=dev-libs/openssl-0.9.7d:0= ) systemd? ( sys-apps/systemd ) wxwidgets? ( x11-libs/wxGTK:3.0-gtk3[X,opengl] ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0/25.0.4
 SRC_URI=https://github.com/erlang/otp/archive/OTP-25.0.4.tar.gz -> erlang-25.0.4.tar.gz https://github.com/erlang/otp/releases/download/OTP-25.0/otp_doc_man_25.0.tar.gz -> erlang_doc_man_25.0.tar.gz doc? ( https://github.com/erlang/otp/releases/download/OTP-25.0/otp_doc_html_25.0.tar.gz -> erlang_doc_html_25.0.tar.gz )
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	wxwidgets	c09e9b94378cadaf6ef86ec1534c0fd6
-_md5_=0ff2fd641fe6aba10714f096e4a376c6
+_md5_=defe14ca93c7bb06d856b460106a0d34
diff --git a/metadata/md5-cache/dev-lang/gnat-gpl-2020 b/metadata/md5-cache/dev-lang/gnat-gpl-2020
index 985bf609b490..d7e7a2084de2 100644
--- a/metadata/md5-cache/dev-lang/gnat-gpl-2020
+++ b/metadata/md5-cache/dev-lang/gnat-gpl-2020
@@ -13,5 +13,5 @@ RDEPEND=!sys-devel/gcc:9.3.1 sys-libs/zlib virtual/libiconv nls? ( virtual/libin
 RESTRICT=test
 SLOT=9.3.1
 SRC_URI=https://community.download.adacore.com/v1/649a561ec6de9e476c54b02715b79f7503600ce5?filename=gnat-2020-20200429-19B04-src.tar.gz -> gnat-2020-20200429-19B04-src.tar.gz https://community.download.adacore.com/v1/e6b6a3e318e13248456bd37b758435e602b367da?filename=gcc-9-2020-20200429-19AA7-src.tar.gz -> gcc-9-2020-20200429-19AA7-src.tar.gz https://community.download.adacore.com/v1/c7a97636b31f3575df85f1eb0965462a353630dd?filename=gcc-interface-9-2020-20200429-19B10-src.tar.gz -> gcc-interface-9-2020-20200429-19B10-src.tar.gz bootstrap? ( amd64? ( http://mirrors.cdn.adacore.com/art/564b3ebec8e196b040fbe66c -> gnat-gpl-2014-x86_64-linux-bin.tar.gz ) x86? ( http://mirrors.cdn.adacore.com/art/564b3e9dc8e196b040fbe248 -> gnat-gpl-2014-x86-linux-bin.tar.gz ) ) https://dev.gentoo.org/~soap/distfiles/gcc-9.3.0-patches-5.tar.bz2 https://dev.gentoo.org/~sam/distfiles/gcc-9.3.0-patches-5.tar.bz2 https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-9.3.0-patches-5.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-9.3.0-patches-5.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-9.3.0-patches-5.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-9.3.0-patches-5.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-9.3.0-patches-5.tar.bz2 mirror://gentoo/gcc-9.3.0-patches-5.tar.bz2
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	97cbb6eb8c334c62a408019524b38cba	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	d9dfd70ca57bd981112e88d2a4cc166e	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=9204bdac5e41aa901db39c4a1f328db2
diff --git a/metadata/md5-cache/dev-lang/gnat-gpl-2021-r1 b/metadata/md5-cache/dev-lang/gnat-gpl-2021-r1
index 28bb15fdabde..162584049d8f 100644
--- a/metadata/md5-cache/dev-lang/gnat-gpl-2021-r1
+++ b/metadata/md5-cache/dev-lang/gnat-gpl-2021-r1
@@ -13,5 +13,5 @@ RDEPEND=!~sys-devel/gcc-10.3.1 sys-libs/zlib virtual/libiconv nls? ( virtual/lib
 RESTRICT=test
 SLOT=10
 SRC_URI=https://community.download.adacore.com/v1/005d2b2eff627177986d2517eb31e1959bec6f3a?filename=gnat-2021-20210519-19A70-src.tar.gz -> gnat-2021-20210519-19A70-src.tar.gz https://community.download.adacore.com/v1/44cd393be0b468cc253bf2cf9cf7804c993e7b5b?filename=gcc-10-2021-20210519-19A74-src.tar.gz -> gcc-10-2021-20210519-19A74-src.tar.gz https://community.download.adacore.com/v1/8ace7d06e469d36d726cc8badb0ed78411e727f3?filename=gcc-interface-10-2021-20210519-19A75-src.tar.gz -> gcc-interface-10-2021-20210519-19A75-src.tar.gz bootstrap? ( amd64? ( https://community.download.adacore.com/v1/6eb6eef6bb897e4c743a519bfebe0b1d6fc409c6?filename=gnat-gpl-2014-x86_64-linux-bin.tar.gz&rand=1193 -> gnat-gpl-2014-x86_64-linux-bin.tar.gz ) x86? ( https://community.download.adacore.com/v1/c5e9e6fdff5cb77ed90cf8c62536653e27c0bed6?filename=gnat-gpl-2014-x86-linux-bin.tar.gz&rand=436 -> gnat-gpl-2014-x86-linux-bin.tar.gz ) ) https://dev.gentoo.org/~soap/distfiles/gcc-10.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~sam/distfiles/gcc-10.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-10.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-10.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-10.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-10.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-10.3.0-patches-3.tar.bz2 mirror://gentoo/gcc-10.3.0-patches-3.tar.bz2
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	97cbb6eb8c334c62a408019524b38cba	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	d9dfd70ca57bd981112e88d2a4cc166e	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=fa8fd8a43d3d6b6035abb3fd96dd4496
diff --git a/metadata/md5-cache/dev-lang/gnat-gpl-2021-r3 b/metadata/md5-cache/dev-lang/gnat-gpl-2021-r3
index fd86e9b32dac..13a6b17805ac 100644
--- a/metadata/md5-cache/dev-lang/gnat-gpl-2021-r3
+++ b/metadata/md5-cache/dev-lang/gnat-gpl-2021-r3
@@ -13,5 +13,5 @@ RDEPEND=!=sys-devel/gcc-10.3.1* sys-libs/zlib virtual/libiconv nls? ( virtual/li
 RESTRICT=test
 SLOT=10
 SRC_URI=https://community.download.adacore.com/v1/005d2b2eff627177986d2517eb31e1959bec6f3a?filename=gnat-2021-20210519-19A70-src.tar.gz -> gnat-2021-20210519-19A70-src.tar.gz https://community.download.adacore.com/v1/44cd393be0b468cc253bf2cf9cf7804c993e7b5b?filename=gcc-10-2021-20210519-19A74-src.tar.gz -> gcc-10-2021-20210519-19A74-src.tar.gz https://community.download.adacore.com/v1/8ace7d06e469d36d726cc8badb0ed78411e727f3?filename=gcc-interface-10-2021-20210519-19A75-src.tar.gz -> gcc-interface-10-2021-20210519-19A75-src.tar.gz bootstrap? ( amd64? ( https://community.download.adacore.com/v1/6eb6eef6bb897e4c743a519bfebe0b1d6fc409c6?filename=gnat-gpl-2014-x86_64-linux-bin.tar.gz&rand=1193 -> gnat-gpl-2014-x86_64-linux-bin.tar.gz ) x86? ( https://community.download.adacore.com/v1/c5e9e6fdff5cb77ed90cf8c62536653e27c0bed6?filename=gnat-gpl-2014-x86-linux-bin.tar.gz&rand=436 -> gnat-gpl-2014-x86-linux-bin.tar.gz ) ) https://dev.gentoo.org/~soap/distfiles/gcc-10.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~sam/distfiles/gcc-10.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-10.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-10.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-10.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-10.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-10.3.0-patches-3.tar.bz2 mirror://gentoo/gcc-10.3.0-patches-3.tar.bz2
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	97cbb6eb8c334c62a408019524b38cba	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	d9dfd70ca57bd981112e88d2a4cc166e	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=c354ac5fa7f6f003792af2ba1a9b5549
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 5e8b82cc670c..4ba862a33e32 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/double-conversion-3.2.1 b/metadata/md5-cache/dev-libs/double-conversion-3.2.1
index 15990b874c03..d50644b6122d 100644
--- a/metadata/md5-cache/dev-libs/double-conversion-3.2.1
+++ b/metadata/md5-cache/dev-libs/double-conversion-3.2.1
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://github.com/google/double-conversion
 INHERIT=cmake
 IUSE=test
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RESTRICT=!test? ( test )
 SLOT=0/3
 SRC_URI=https://github.com/google/double-conversion/archive/v3.2.1.tar.gz -> double-conversion-3.2.1.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=e26650ae7877f924a945f46b1988c6f7
+_md5_=cce7902a8e4335c6cce1fe29080db47e
diff --git a/metadata/md5-cache/dev-libs/foma-0.10.0_p20220612 b/metadata/md5-cache/dev-libs/foma-0.10.0_p20220612
index 0fcdc50730b6..91156020d44b 100644
--- a/metadata/md5-cache/dev-libs/foma-0.10.0_p20220612
+++ b/metadata/md5-cache/dev-libs/foma-0.10.0_p20220612
@@ -5,10 +5,10 @@ DESCRIPTION=Multi-purpose finite-state toolkit
 EAPI=8
 HOMEPAGE=https://fomafst.github.io/ https://github.com/mhulden/foma
 INHERIT=cmake
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
 RDEPEND=sys-libs/readline:= sys-libs/zlib
 SLOT=0/0.10
 SRC_URI=https://github.com/mhulden/foma/archive/9e8c3df573015a26c84e113ba710ef3d57c8e777.tar.gz -> foma-0.10.0_p20220612.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=2abfab5b6117af1f949ef745e90c7ad8
+_md5_=ea56d768088fe823beb150e96c90e2ba
diff --git a/metadata/md5-cache/dev-libs/foma-0.9.18-r1 b/metadata/md5-cache/dev-libs/foma-0.9.18-r1
deleted file mode 100644
index ce75e711d7b6..000000000000
--- a/metadata/md5-cache/dev-libs/foma-0.9.18-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=sys-libs/readline:= sys-libs/zlib
-DESCRIPTION=A set of utilities for constructing finite-state automata and transducers
-EAPI=7
-HOMEPAGE=https://github.com/mhulden/foma
-INHERIT=flag-o-matic toolchain-funcs
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=sys-libs/readline:= sys-libs/zlib
-SLOT=0
-SRC_URI=https://bitbucket.org/mhulden/foma/downloads/foma-0.9.18.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=664c1eb82c2a3a46472fc62ca308a81c
diff --git a/metadata/md5-cache/dev-libs/modsecurity-3.0.7 b/metadata/md5-cache/dev-libs/modsecurity-3.0.7
index 4d6a3387a582..bb50a0bb2453 100644
--- a/metadata/md5-cache/dev-libs/modsecurity-3.0.7
+++ b/metadata/md5-cache/dev-libs/modsecurity-3.0.7
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/SpiderLabs/ModSecurity
 INHERIT=lua-single
 IUSE=doc fuzzyhash geoip geoip2 json lmdb lua pcre2 lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4
-KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 ~riscv x86
 LICENSE=Apache-2.0
 RDEPEND=dev-libs/libpcre:= dev-libs/libxml2 net-misc/curl fuzzyhash? ( app-crypt/ssdeep ) geoip? ( dev-libs/geoip ) geoip2? ( dev-libs/libmaxminddb ) json? ( dev-libs/yajl ) lmdb? ( dev-db/lmdb ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) pcre2? ( dev-libs/libpcre2:= )
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 ) )
 SLOT=0
 SRC_URI=https://github.com/SpiderLabs/ModSecurity/releases/download/v3.0.7/modsecurity-v3.0.7.tar.gz
 _eclasses_=lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=e66a218c9b963ce7557a71922021c6b0
+_md5_=57f9da3cccbd1f2aa62eeda986698fd2
diff --git a/metadata/md5-cache/dev-libs/nspr-4.34.1 b/metadata/md5-cache/dev-libs/nspr-4.34.1
index 99a07b54184b..69d0921d3af0 100644
--- a/metadata/md5-cache/dev-libs/nspr-4.34.1
+++ b/metadata/md5-cache/dev-libs/nspr-4.34.1
@@ -5,9 +5,9 @@ EAPI=8
 HOMEPAGE=https://www.mozilla.org/projects/nspr/
 INHERIT=autotools toolchain-funcs multilib-minimal
 IUSE=debug abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris
 LICENSE=|| ( MPL-2.0 GPL-2 LGPL-2.1 )
 SLOT=0
 SRC_URI=https://archive.mozilla.org/pub/nspr/releases/v4.34.1/src/nspr-4.34.1.tar.gz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=7c871a859fb22d41862d0a6409f967e1
+_md5_=4e495ce6938b18b796172af193be647c
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 72a2a72a53ec..ef7fad3becac 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/PyPDF2-2.10.6 b/metadata/md5-cache/dev-python/PyPDF2-2.10.6
new file mode 100644
index 000000000000..195d1eb08594
--- /dev/null
+++ b/metadata/md5-cache/dev-python/PyPDF2-2.10.6
@@ -0,0 +1,17 @@
+BDEPEND=dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/pycryptodome[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( python_targets_python3_8? ( dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test unpack
+DESCRIPTION=Python library to work with PDF files
+EAPI=8
+HOMEPAGE=https://pypi.org/project/PyPDF2/ https://github.com/py-pdf/PyPDF2/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=BSD-2
+PROPERTIES=test_network
+RDEPEND=python_targets_python3_8? ( dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=test !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/py-pdf/PyPDF2/archive/2.10.6.tar.gz -> PyPDF2-2.10.6.gh.tar.gz test? ( https://github.com/py-pdf/sample-files/archive/bedcbe077c4898e1b97c6c6f81d937f5048b4630.tar.gz -> PyPDF2-sample-files-bedcbe077c4898e1b97c6c6f81d937f5048b4630.gh.tar.gz )
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=0e2fba81614dd4a24df52327edb65665
diff --git a/metadata/md5-cache/dev-python/boto3-1.24.70 b/metadata/md5-cache/dev-python/boto3-1.24.70
new file mode 100644
index 000000000000..ce3c6725c97b
--- /dev/null
+++ b/metadata/md5-cache/dev-python/boto3-1.24.70
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_11(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-)] ) ) ) test? ( >=dev-python/botocore-1.27.70[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=The AWS SDK for Python
+EAPI=8
+HOMEPAGE=https://github.com/boto/boto3/ https://pypi.org/project/boto3/
+INHERIT=distutils-r1 multiprocessing
+IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/botocore-1.27.70[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/boto/boto3/archive/1.24.70.tar.gz -> boto3-1.24.70.gh.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=50e9b19da5bcce80f05fd9be69fe0ff8
diff --git a/metadata/md5-cache/dev-python/botocore-1.27.70 b/metadata/md5-cache/dev-python/botocore-1.27.70
new file mode 100644
index 000000000000..338edeae0ac3
--- /dev/null
+++ b/metadata/md5-cache/dev-python/botocore-1.27.70
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/jsonschema[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_11(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-)] ) ) ) test? ( dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jmespath-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Low-level, data-driven core of boto 3
+EAPI=8
+HOMEPAGE=https://github.com/boto/botocore/ https://pypi.org/project/botocore/
+INHERIT=distutils-r1 multiprocessing
+IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jmespath-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/boto/botocore/archive/1.27.70.tar.gz -> botocore-1.27.70.gh.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=bb152b00283104522fdf392996d7badc
diff --git a/metadata/md5-cache/dev-python/hatchling-1.9.0 b/metadata/md5-cache/dev-python/hatchling-1.9.0
new file mode 100644
index 000000000000..cfde71744e8f
--- /dev/null
+++ b/metadata/md5-cache/dev-python/hatchling-1.9.0
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-python/editables-0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-21.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pathspec-0.9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pluggy-1.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-1.2.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( python_targets_pypy3? ( dev-python/atomicwrites[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/click[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/httpx[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/platformdirs[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rich[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/virtualenv[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( dev-python/atomicwrites[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/click[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/httpx[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/platformdirs[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rich[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/virtualenv[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( dev-python/atomicwrites[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/click[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/httpx[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/platformdirs[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rich[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/virtualenv[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( dev-python/atomicwrites[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/click[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/httpx[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/platformdirs[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rich[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/virtualenv[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( dev-python/atomicwrites[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/click[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/httpx[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/platformdirs[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rich[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/virtualenv[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ) test? ( >=dev-python/editables-0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-21.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pathspec-0.9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pluggy-1.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-1.2.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Modern, extensible Python build backend
+EAPI=8
+HOMEPAGE=https://pypi.org/project/hatchling/ https://github.com/pypa/hatch/
+INHERIT=distutils-r1
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/editables-0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-21.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pathspec-0.9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pluggy-1.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-1.2.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/pypa/hatch/archive/hatchling-v1.9.0.tar.gz -> hatch-hatchling-v1.9.0.gh.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=53f3da12c31bc9ea210115b30aded090
diff --git a/metadata/md5-cache/dev-python/jsonschema-4.16.0 b/metadata/md5-cache/dev-python/jsonschema-4.16.0
new file mode 100644
index 000000000000..4e3fac271fa6
--- /dev/null
+++ b/metadata/md5-cache/dev-python/jsonschema-4.16.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/hatch-vcs[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/hatch-fancy-pypi-readme[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( >=dev-python/attrs-17.4.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyrsistent-0.18.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-python/importlib_resources-1.4.0[python_targets_python3_8(-)?] dev-python/pkgutil_resolve_name[python_targets_python3_8(-)?] ) dev-python/fqdn[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/idna[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/isoduration[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonpointer-1.13[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rfc3339-validator[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rfc3986-validator[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rfc3987[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/uri_template[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/webcolors-1.11[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/hatchling-1.3.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=An implementation of JSON-Schema validation for Python
+EAPI=8
+HOMEPAGE=https://pypi.org/project/jsonschema/ https://github.com/python-jsonschema/jsonschema/
+INHERIT=distutils-r1
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/attrs-17.4.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyrsistent-0.18.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-python/importlib_resources-1.4.0[python_targets_python3_8(-)?] dev-python/pkgutil_resolve_name[python_targets_python3_8(-)?] ) dev-python/fqdn[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/idna[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/isoduration[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonpointer-1.13[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rfc3339-validator[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rfc3986-validator[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rfc3987[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/uri_template[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/webcolors-1.11[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/j/jsonschema/jsonschema-4.16.0.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=27f2970ad6b8c97507371ea8cda4d597
diff --git a/metadata/md5-cache/dev-python/nbclient-0.6.8 b/metadata/md5-cache/dev-python/nbclient-0.6.8
new file mode 100644
index 000000000000..5a69b02df993
--- /dev/null
+++ b/metadata/md5-cache/dev-python/nbclient-0.6.8
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/ipython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ipykernel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ipywidgets[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/testpath[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/xmltodict[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/jupyter_client-6.1.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nbformat-5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/nest_asyncio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/traitlets-5.2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A client library for executing Jupyter notebooks
+EAPI=8
+HOMEPAGE=https://nbclient.readthedocs.io/en/latest/ https://github.com/jupyter/nbclient/ https://pypi.org/project/nbclient/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=BSD
+RDEPEND=>=dev-python/jupyter_client-6.1.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nbformat-5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/nest_asyncio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/traitlets-5.2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/jupyter/nbclient/archive/v0.6.8.tar.gz -> nbclient-0.6.8.gh.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=0939de623329bd14ec9738aa5f82e85b
diff --git a/metadata/md5-cache/dev-python/numpy-1.23.3 b/metadata/md5-cache/dev-python/numpy-1.23.3
new file mode 100644
index 000000000000..e1b35ac7d5b1
--- /dev/null
+++ b/metadata/md5-cache/dev-python/numpy-1.23.3
@@ -0,0 +1,17 @@
+BDEPEND=lapack? ( >=virtual/cblas-3.8 >=virtual/lapack-3.8 ) >=dev-python/cython-0.29.30[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] lapack? ( virtual/pkgconfig ) doc? ( app-arch/unzip ) test? ( >=dev-python/hypothesis-5.8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytz-2019.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cffi-1.14.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( lapack? ( >=virtual/cblas-3.8 >=virtual/lapack-3.8 ) >=dev-python/pytest-7.1.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[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[threads(+)] ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] lapack? ( virtual/fortran )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=lapack? ( virtual/fortran )
+DESCRIPTION=Fast array and numerical python library
+EAPI=8
+HOMEPAGE=https://numpy.org/ https://github.com/numpy/numpy/ https://pypi.org/project/numpy/
+INHERIT=distutils-r1 flag-o-matic fortran-2 toolchain-funcs
+IUSE=doc lapack test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=BSD
+RDEPEND=lapack? ( >=virtual/cblas-3.8 >=virtual/lapack-3.8 ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[threads(+)] ) lapack? ( virtual/fortran )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/n/numpy/numpy-1.23.3.tar.gz doc? ( https://numpy.org/doc/1.23/numpy-html.zip -> numpy-html-1.23.3.zip https://numpy.org/doc/1.23/numpy-ref.pdf -> numpy-ref-1.23.3.pdf https://numpy.org/doc/1.23/numpy-user.pdf -> numpy-user-1.23.3.pdf )
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	flag-o-matic	29a755b1291d64133634d80b0328f153	fortran-2	72d28c6872beb1e7cb99684b0ae4715d	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=a8acf3156bdc74432fa7ce88eb7e38e3
diff --git a/metadata/md5-cache/dev-python/oauthlib-3.2.1 b/metadata/md5-cache/dev-python/oauthlib-3.2.1
new file mode 100644
index 000000000000..99d820bb8983
--- /dev/null
+++ b/metadata/md5-cache/dev-python/oauthlib-3.2.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/pyjwt-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/blinker[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Spec-compliant and thorough implementation of the OAuth request-signing logic
+EAPI=8
+HOMEPAGE=https://github.com/oauthlib/oauthlib https://pypi.org/project/oauthlib/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=BSD
+RDEPEND=>=dev-python/pyjwt-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/blinker[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/o/oauthlib/oauthlib-3.2.1.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=3d5468d377de75da90747ebb496a23ac
diff --git a/metadata/md5-cache/dev-python/phonenumbers-8.12.55 b/metadata/md5-cache/dev-python/phonenumbers-8.12.55
new file mode 100644
index 000000000000..737426be9bbb
--- /dev/null
+++ b/metadata/md5-cache/dev-python/phonenumbers-8.12.55
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/protobuf-python[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Python port of Google's libphonenumber
+EAPI=8
+HOMEPAGE=https://github.com/daviddrysdale/python-phonenumbers/ https://pypi.org/project/phonenumbers/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~ppc64 ~riscv ~x86
+LICENSE=Apache-2.0
+RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/daviddrysdale/python-phonenumbers/archive/v8.12.55.tar.gz -> python-phonenumbers-8.12.55.gh.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=ace22bdcc29265ea793f8ce1640c3bd8
diff --git a/metadata/md5-cache/dev-python/pyproj-3.4.0 b/metadata/md5-cache/dev-python/pyproj-3.4.0
new file mode 100644
index 000000000000..e329713215d3
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pyproj-3.4.0
@@ -0,0 +1,17 @@
+BDEPEND=dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pandas[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/shapely[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/xarray[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( >=dev-lang/python-3.10.4:3.10 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_10(-)] dev-python/furo[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_9(-)] dev-python/furo[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_8(-)] dev-python/furo[python_targets_python3_8(-)] ) ) ) test? ( >=sci-libs/proj-8.2.0:= dev-python/certifi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=sci-libs/proj-8.2.0:= dev-python/certifi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DESCRIPTION=Python interface to the PROJ library
+EAPI=8
+HOMEPAGE=https://github.com/pyproj4/pyproj/ https://pypi.org/project/pyproj/
+INHERIT=distutils-r1
+IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86 ~amd64-linux
+LICENSE=MIT
+RDEPEND=>=sci-libs/proj-8.2.0:= dev-python/certifi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/pyproj4/pyproj/archive/3.4.0.tar.gz -> pyproj-3.4.0.gh.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=949c44e871cbb56872491203c984dc76
diff --git a/metadata/md5-cache/dev-python/pyroute2-0.7.3 b/metadata/md5-cache/dev-python/pyroute2-0.7.3
new file mode 100644
index 000000000000..93f25b5cdd6e
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pyroute2-0.7.3
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0=[sqlite] ) 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-8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.6.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A pure Python netlink and Linux network configuration library
+EAPI=8
+HOMEPAGE=https://github.com/svinota/pyroute2
+INHERIT=distutils-r1
+IUSE=python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0=[sqlite] ) 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_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/svinota/pyroute2/archive/0.7.3.tar.gz -> pyroute2-0.7.3.gh.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=c77d46a0c5b87a3da6434b03953c8ad3
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index b8eda7bcc26d..b7f21688389d 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/kramdown-2.3.1-r1 b/metadata/md5-cache/dev-ruby/kramdown-2.3.1-r1
deleted file mode 100644
index 4416b7e5713b..000000000000
--- a/metadata/md5-cache/dev-ruby/kramdown-2.3.1-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( dev-ruby/rexml[ruby_targets_ruby27(-)] >=dev-ruby/rouge-1.8[ruby_targets_ruby27(-)] >=dev-ruby/stringex-1.5.1[ruby_targets_ruby27(-)] !!<dev-ruby/kramdown-1.17.0-r2:0[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) test? ( >=dev-ruby/minitest-5.0[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( latex? ( dev-texlive/texlive-latex dev-texlive/texlive-latexextra ) >=app-text/htmltidy-5.0.0 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=Yet-another-markdown-parser but fast, pure Ruby, using strict syntax definition
-EAPI=7
-HOMEPAGE=https://kramdown.gettalong.org/
-INHERIT=ruby-fakegem
-IUSE=latex test ruby_targets_ruby27 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=MIT
-RDEPEND=latex? ( dev-texlive/texlive-latex dev-texlive/texlive-latexextra ) ruby_targets_ruby27? ( dev-ruby/rexml[ruby_targets_ruby27(-)] >=dev-ruby/rouge-1.8[ruby_targets_ruby27(-)] >=dev-ruby/stringex-1.5.1[ruby_targets_ruby27(-)] !!<dev-ruby/kramdown-1.17.0-r2:0[ruby_targets_ruby27(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=2
-SRC_URI=https://rubygems.org/gems/kramdown-2.3.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	32c657868f5d944ede724c36996ec27a	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=4cca4f64f6125574fcc9ad986298d690
diff --git a/metadata/md5-cache/dev-ruby/kramdown-2.3.2 b/metadata/md5-cache/dev-ruby/kramdown-2.3.2
deleted file mode 100644
index c8a32c901592..000000000000
--- a/metadata/md5-cache/dev-ruby/kramdown-2.3.2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( dev-ruby/rexml[ruby_targets_ruby27(-)] >=dev-ruby/rouge-3.26.0:2[ruby_targets_ruby27(-)] >=dev-ruby/stringex-1.5.1[ruby_targets_ruby27(-)] !!<dev-ruby/kramdown-1.17.0-r2:0[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/rexml[ruby_targets_ruby30(-)] >=dev-ruby/rouge-3.26.0:2[ruby_targets_ruby30(-)] >=dev-ruby/stringex-1.5.1[ruby_targets_ruby30(-)] !!<dev-ruby/kramdown-1.17.0-r2:0[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) test? ( >=dev-ruby/minitest-5.0[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) test? ( >=dev-ruby/minitest-5.0[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? ( latex? ( dev-texlive/texlive-latex dev-texlive/texlive-latexextra ) >=app-text/htmltidy-5.0.0 ) 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=Yet-another-markdown-parser but fast, pure Ruby, using strict syntax definition
-EAPI=8
-HOMEPAGE=https://kramdown.gettalong.org/
-INHERIT=ruby-fakegem
-IUSE=latex test ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~s390 ~sparc ~x86
-LICENSE=MIT
-RDEPEND=latex? ( dev-texlive/texlive-latex dev-texlive/texlive-latexextra ) ruby_targets_ruby27? ( dev-ruby/rexml[ruby_targets_ruby27(-)] >=dev-ruby/rouge-3.26.0:2[ruby_targets_ruby27(-)] >=dev-ruby/stringex-1.5.1[ruby_targets_ruby27(-)] !!<dev-ruby/kramdown-1.17.0-r2:0[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/rexml[ruby_targets_ruby30(-)] >=dev-ruby/rouge-3.26.0:2[ruby_targets_ruby30(-)] >=dev-ruby/stringex-1.5.1[ruby_targets_ruby30(-)] !!<dev-ruby/kramdown-1.17.0-r2: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=2
-SRC_URI=https://rubygems.org/gems/kramdown-2.3.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	32c657868f5d944ede724c36996ec27a	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=10491432698ff1ddde34e849d6b61ed2
diff --git a/metadata/md5-cache/dev-ruby/rack-test-2.0.2 b/metadata/md5-cache/dev-ruby/rack-test-2.0.2
index c59ab2d94109..f5273f754438 100644
--- a/metadata/md5-cache/dev-ruby/rack-test-2.0.2
+++ b/metadata/md5-cache/dev-ruby/rack-test-2.0.2
@@ -11,7 +11,7 @@ LICENSE=MIT
 RDEPEND=ruby_targets_ruby27? ( >=dev-ruby/rack-1.3:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/rack-1.3:*[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( >=dev-ruby/rack-1.3:*[ruby_targets_ruby31(-)] ) 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_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_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=1.0
+SLOT=2
 SRC_URI=https://github.com/rack-test/rack-test/archive/v2.0.2.tar.gz -> rack-test-2.0.2.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	32c657868f5d944ede724c36996ec27a	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=a692f23e71162bc87c339f54b66a0e1d
+_md5_=e21bc675f39661c17193085e91f0d0ad
diff --git a/metadata/md5-cache/dev-ruby/stringex-2.8.5-r1 b/metadata/md5-cache/dev-ruby/stringex-2.8.5-r1
deleted file mode 100644
index 4a0e520f1392..000000000000
--- a/metadata/md5-cache/dev-ruby/stringex-2.8.5-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=ruby_targets_ruby27? ( test? ( dev-ruby/i18n:1[ruby_targets_ruby27(-)] dev-ruby/redcloth[ruby_targets_ruby27(-)] dev-ruby/test-unit:2[ruby_targets_ruby27(-)] || ( dev-ruby/activerecord:7.0[ruby_targets_ruby27(-),sqlite] dev-ruby/activerecord:6.1[ruby_targets_ruby27(-),sqlite] dev-ruby/activerecord:6.0[ruby_targets_ruby27(-),sqlite] dev-ruby/activerecord:5.2[ruby_targets_ruby27(-),sqlite] ) ) ) ruby_targets_ruby30? ( test? ( dev-ruby/i18n:1[ruby_targets_ruby30(-)] dev-ruby/redcloth[ruby_targets_ruby30(-)] dev-ruby/test-unit:2[ruby_targets_ruby30(-)] || ( dev-ruby/activerecord:7.0[ruby_targets_ruby30(-),sqlite] dev-ruby/activerecord:6.1[ruby_targets_ruby30(-),sqlite] dev-ruby/activerecord:6.0[ruby_targets_ruby30(-),sqlite] dev-ruby/activerecord:5.2[ruby_targets_ruby30(-),sqlite] ) ) ) 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=Extensions for Ruby's String class
-EAPI=8
-HOMEPAGE=https://github.com/rsl/stringex
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=MIT
-RDEPEND=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 )
-SLOT=0
-SRC_URI=https://rubygems.org/gems/stringex-2.8.5.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	32c657868f5d944ede724c36996ec27a	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=0e509d3e5ca85150bff092137ea9534f
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 2f13c7d68631..86e129227acf 100644
--- a/metadata/md5-cache/dev-util/Manifest.gz
+++ b/metadata/md5-cache/dev-util/Manifest.gz
diff --git a/metadata/md5-cache/dev-util/clion-2022.2.1 b/metadata/md5-cache/dev-util/clion-2022.2.1
new file mode 100644
index 000000000000..7fd8cb76202f
--- /dev/null
+++ b/metadata/md5-cache/dev-util/clion-2022.2.1
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/patchelf
+DEFINED_PHASES=install prepare
+DESCRIPTION=A complete toolset for C and C++ development
+EAPI=8
+HOMEPAGE=https://www.jetbrains.com/clion
+INHERIT=desktop wrapper
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( IDEA IDEA_Academic IDEA_Classroom IDEA_OpenSource IDEA_Personal ) Apache-1.1 Apache-2.0 BSD BSD-2 CC0-1.0 CDDL-1.1 CPL-0.5 CPL-1.0 EPL-1.0 EPL-2.0 GPL-2 GPL-2-with-classpath-exception GPL-3 ISC JDOM LGPL-2.1+ LGPL-3 MIT MPL-1.0 MPL-1.1 OFL public-domain PSF-2 UoI-NCSA ZLIB
+RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss dev-util/cmake dev-util/ninja media-libs/alsa-lib media-libs/freetype:2 media-libs/mesa net-print/cups sys-apps/dbus sys-devel/gdb x11-libs/cairo x11-libs/pango sys-libs/zlib x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libXxf86vm x11-libs/libdrm x11-libs/libxcb x11-libs/libxkbcommon
+RESTRICT=bindist mirror splitdebug
+SLOT=0
+SRC_URI=https://download.jetbrains.com/cpp/CLion-2022.2.1.tar.gz
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=43cbe695bfc292b8e7a8b05f546208b9
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index b8393d98c286..8b12983bc1bc 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/renderdoc-1.20-r1 b/metadata/md5-cache/media-gfx/renderdoc-1.20-r1
deleted file mode 100644
index a3c35f2ce545..000000000000
--- a/metadata/md5-cache/media-gfx/renderdoc-1.20-r1
+++ /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 flag-o-matic optfeature python-single-r1 docs qmake-utils verify-sig xdg
-IUSE=pyside2 qt5 python_single_target_python3_9 python_single_target_python3_10 doc verify-sig
-KEYWORDS=amd64
-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.20.tar.gz -> renderdoc-1.20.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.20/v1.20.tar.gz.asc -> renderdoc-1.20.tar.gz.asc )
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	cmake	44afbf15c35884f7c840470f1cf05d0d	docs	8ed2a8a28ff109e7a3582c9abb7fe327	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	1a2157392a869265b2afcb63a26c12ac	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=c6bc1500eaa4ff9d55b9157c8ce0a12a
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index 9bfbfece68ce..f658854c504b 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/flac-1.4.0 b/metadata/md5-cache/media-libs/flac-1.4.0
new file mode 100644
index 000000000000..5e86017d9c07
--- /dev/null
+++ b/metadata/md5-cache/media-libs/flac-1.4.0
@@ -0,0 +1,15 @@
+BDEPEND=app-arch/xz-utils sys-devel/gettext virtual/pkgconfig abi_x86_32? ( dev-lang/nasm )
+DEFINED_PHASES=compile configure install test
+DEPEND=ogg? ( media-libs/libogg[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+DESCRIPTION=free lossless audio encoder and decoder
+EAPI=8
+HOMEPAGE=https://xiph.org/flac/
+INHERIT=multilib-minimal
+IUSE=+cxx debug ogg cpu_flags_ppc_altivec cpu_flags_ppc_vsx cpu_flags_x86_sse static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=BSD FDL-1.2 GPL-2 LGPL-2.1
+RDEPEND=ogg? ( media-libs/libogg[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+SLOT=0
+SRC_URI=https://downloads.xiph.org/releases/flac/flac-1.4.0.tar.xz
+_eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=2fbd7e2d37130311e009a199c81e58ac
diff --git a/metadata/md5-cache/media-libs/libaom-3.4.0-r1 b/metadata/md5-cache/media-libs/libaom-3.4.0-r1
new file mode 100644
index 000000000000..8b0cfd519d92
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libaom-3.4.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=|| ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) dev-lang/perl abi_x86_32? ( dev-lang/yasm ) abi_x86_64? ( dev-lang/yasm ) abi_x86_x32? ( dev-lang/yasm ) doc? ( app-doc/doxygen ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test
+DESCRIPTION=Alliance for Open Media AV1 Codec SDK
+EAPI=8
+HOMEPAGE=https://aomedia.org https://aomedia.googlesource.com/aom/
+INHERIT=cmake-multilib python-any-r1
+IUSE=doc +examples test cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_arm_neon abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=BSD-2
+REQUIRED_USE=cpu_flags_x86_sse2? ( cpu_flags_x86_mmx ) cpu_flags_x86_ssse3? ( cpu_flags_x86_sse2 )
+RESTRICT=!test? ( test ) test
+SLOT=0/3
+SRC_URI=https://storage.googleapis.com/aom-releases/libaom-3.4.0.tar.gz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	29a755b1291d64133634d80b0328f153	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=c901c2785e36540df958b90f0dc037d4
diff --git a/metadata/md5-cache/media-libs/raptor-2.0.15-r5 b/metadata/md5-cache/media-libs/raptor-2.0.15-r5
index ef06ab447a0f..bc9d6a759548 100644
--- a/metadata/md5-cache/media-libs/raptor-2.0.15-r5
+++ b/metadata/md5-cache/media-libs/raptor-2.0.15-r5
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://librdf.org/raptor/
 INHERIT=autotools multilib-minimal
 IUSE=+curl debug json static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0 GPL-2 LGPL-2.1
 RDEPEND=dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/icu:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] curl? ( net-misc/curl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) json? ( dev-libs/yajl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !media-libs/raptor:0
 SLOT=2
 SRC_URI=https://download.librdf.org/source/raptor2-2.0.15.tar.gz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=a2c0ad6a0737e87e9d0aa0f469d3e853
+_md5_=13964c65515e38c071b695a4687a865b
diff --git a/metadata/md5-cache/media-libs/sratom-0.6.14 b/metadata/md5-cache/media-libs/sratom-0.6.14
new file mode 100644
index 000000000000..6f8aa23e7e50
--- /dev/null
+++ b/metadata/md5-cache/media-libs/sratom-0.6.14
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen dev-python/sphinx dev-python/sphinx_lv2_theme ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-libs/serd dev-libs/sord media-libs/lv2 || ( >=dev-lang/python-3.11.0_beta4:3.11[threads(+)] >=dev-lang/python-3.10.4:3.10[threads(+)] >=dev-lang/python-3.9.12:3.9[threads(+)] >=dev-lang/python-3.8.13:3.8[threads(+)] )
+DESCRIPTION=Library for serialising LV2 atoms to/from RDF, particularly the Turtle syntax
+EAPI=8
+HOMEPAGE=http://drobilla.net/software/sratom/
+INHERIT=meson-multilib python-any-r1
+IUSE=doc test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=ISC
+RDEPEND=dev-libs/serd dev-libs/sord media-libs/lv2
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=http://download.drobilla.net/sratom-0.6.14.tar.xz
+_eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=8afa2a093e36df8b9c5e60aa0de316bc
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index ea0e5899e5d5..a6d68e6825c2 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/exaile-4.1.2 b/metadata/md5-cache/media-sound/exaile-4.1.2
index 7f876162288e..40000f1685d1 100644
--- a/metadata/md5-cache/media-sound/exaile-4.1.2
+++ b/metadata/md5-cache/media-sound/exaile-4.1.2
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://www.exaile.org/
 INHERIT=python-single-r1 xdg
 IUSE=libnotify nls scrobbler python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2 GPL-3
 RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) media-libs/gst-plugins-base:1.0 media-libs/gst-plugins-good:1.0 media-plugins/gst-plugins-meta:1.0 x11-libs/gtk+:3[introspection] libnotify? ( x11-libs/libnotify[introspection] ) python_single_target_python3_8? ( dev-python/bsddb3[python_targets_python3_8(-)] dev-python/dbus-python[python_targets_python3_8(-)] dev-python/gst-python:1.0[python_targets_python3_8(-)] dev-python/pycairo[python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] media-libs/mutagen[python_targets_python3_8(-)] scrobbler? ( dev-python/pylast[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( dev-python/bsddb3[python_targets_python3_9(-)] dev-python/dbus-python[python_targets_python3_9(-)] dev-python/gst-python:1.0[python_targets_python3_9(-)] dev-python/pycairo[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] media-libs/mutagen[python_targets_python3_9(-)] scrobbler? ( dev-python/pylast[python_targets_python3_9(-)] ) ) python_single_target_python3_10? ( dev-python/bsddb3[python_targets_python3_10(-)] dev-python/dbus-python[python_targets_python3_10(-)] dev-python/gst-python:1.0[python_targets_python3_10(-)] dev-python/pycairo[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] media-libs/mutagen[python_targets_python3_10(-)] scrobbler? ( dev-python/pylast[python_targets_python3_10(-)] ) )
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/exaile/exaile/archive/4.1.2/exaile-4.1.2.tar.gz
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=8ee4503d48a9ba892a38a2d92f9634ea
+_md5_=460f5cb5af5405dc016545538607929e
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index ef7e3d7a9eab..7bce5c590fcc 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/putty-0.77-r2 b/metadata/md5-cache/net-misc/putty-0.77-r2
index dbd3ae6b66a3..1c87c4406ecc 100644
--- a/metadata/md5-cache/net-misc/putty-0.77-r2
+++ b/metadata/md5-cache/net-misc/putty-0.77-r2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.chiark.greenend.org.uk/~sgtatham/putty/
 INHERIT=cmake desktop xdg-utils
 IUSE=debug doc +gtk gtk2 gssapi
-KEYWORDS=~alpha amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86
+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/~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	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=8482a6e04df9852da5d38acf43cddc0e
+_md5_=fcac0c1801b80fc07450e202af8a68c1
diff --git a/metadata/md5-cache/net-misc/rsync-3.2.6 b/metadata/md5-cache/net-misc/rsync-3.2.6
new file mode 100644
index 000000000000..3556b7f32982
--- /dev/null
+++ b/metadata/md5-cache/net-misc/rsync-3.2.6
@@ -0,0 +1,16 @@
+BDEPEND=examples? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) ) verify-sig? ( sec-keys/openpgp-keys-waynedavison ) virtual/pkgconfig verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=configure install postinst prepare setup unpack
+DEPEND=>=dev-libs/popt-1.5 acl? ( virtual/acl ) examples? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) dev-lang/perl ) lz4? ( app-arch/lz4:= ) ssl? ( dev-libs/openssl:= ) system-zlib? ( sys-libs/zlib ) xattr? ( kernel_linux? ( sys-apps/attr ) ) xxhash? ( >=dev-libs/xxhash-0.8 ) zstd? ( >=app-arch/zstd-1.4:= ) iconv? ( virtual/libiconv )
+DESCRIPTION=File transfer program to keep remote files into sync
+EAPI=8
+HOMEPAGE=https://rsync.samba.org/
+INHERIT=prefix python-single-r1 systemd verify-sig
+IUSE=acl examples iconv lz4 ssl stunnel system-zlib xattr xxhash zstd python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 verify-sig
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-3
+RDEPEND=>=dev-libs/popt-1.5 acl? ( virtual/acl ) examples? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) dev-lang/perl ) lz4? ( app-arch/lz4:= ) ssl? ( dev-libs/openssl:= ) system-zlib? ( sys-libs/zlib ) xattr? ( kernel_linux? ( sys-apps/attr ) ) xxhash? ( >=dev-libs/xxhash-0.8 ) zstd? ( >=app-arch/zstd-1.4:= ) iconv? ( virtual/libiconv )
+REQUIRED_USE=examples? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
+SLOT=0
+SRC_URI=https://rsync.samba.org/ftp/rsync/src/rsync-3.2.6.tar.gz verify-sig? ( https://rsync.samba.org/ftp/rsync/src/rsync-3.2.6.tar.gz.asc )
+_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16
+_md5_=8217ce91ee3d298c555fd6245eb90302
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index 620e3e62acfd..f29139497850 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/dbus-1.12.20-r5 b/metadata/md5-cache/sys-apps/dbus-1.12.20-r5
deleted file mode 100644
index 0a9bed22dd85..000000000000
--- a/metadata/md5-cache/sys-apps/dbus-1.12.20-r5
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=acct-user/messagebus app-text/xmlto app-text/docbook-xml-dtd:4.4 sys-devel/autoconf-archive 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 virtual/pkgconfig test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=>=dev-libs/expat-2.1.0 elogind? ( sys-auth/elogind ) selinux? ( sys-libs/libselinux ) systemd? ( sys-apps/systemd:0= ) X? ( x11-libs/libX11 x11-libs/libXt ) dev-libs/expat test? ( || ( >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) >=dev-libs/glib-2.40:2 )
-DESCRIPTION=A message bus system, a simple way for applications to talk to each other
-EAPI=7
-HOMEPAGE=https://dbus.freedesktop.org/
-INHERIT=autotools flag-o-matic linux-info python-any-r1 readme.gentoo-r1 systemd tmpfiles virtualx multilib-minimal
-IUSE=debug doc elogind selinux static-libs systemd test X test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=|| ( AFL-2.1 GPL-2 )
-RDEPEND=>=dev-libs/expat-2.1.0 elogind? ( sys-auth/elogind ) selinux? ( sys-libs/libselinux ) systemd? ( sys-apps/systemd:0= ) X? ( x11-libs/libX11 x11-libs/libXt ) acct-user/messagebus selinux? ( sec-policy/selinux-dbus ) systemd? ( virtual/tmpfiles ) X? ( sys-apps/which )
-REQUIRED_USE=?? ( elogind systemd )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://dbus.freedesktop.org/releases/dbus/dbus-1.12.20.tar.gz
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	bbfa385d6907d7948d49a5e107bd654d	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	644887c82aefdf12001489391fca4f02	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=c6239523e09a946591ebd0ff64499b31
diff --git a/metadata/md5-cache/sys-apps/dbus-1.14.0-r2 b/metadata/md5-cache/sys-apps/dbus-1.14.0-r2
deleted file mode 100644
index e835e2ef4d28..000000000000
--- a/metadata/md5-cache/sys-apps/dbus-1.14.0-r2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=acct-user/messagebus app-text/xmlto app-text/docbook-xml-dtd:4.4 sys-devel/autoconf-archive 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 virtual/pkgconfig test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=>=dev-libs/expat-2.1.0 elogind? ( sys-auth/elogind ) selinux? ( sys-libs/libselinux ) systemd? ( sys-apps/systemd:0= ) X? ( x11-libs/libX11 x11-libs/libXt ) dev-libs/expat test? ( || ( >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) >=dev-libs/glib-2.40:2 )
-DESCRIPTION=A message bus system, a simple way for applications to talk to each other
-EAPI=7
-HOMEPAGE=https://www.freedesktop.org/wiki/Software/dbus/
-INHERIT=autotools flag-o-matic linux-info python-any-r1 readme.gentoo-r1 systemd tmpfiles virtualx multilib-minimal
-IUSE=debug doc elogind selinux static-libs systemd test X test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=|| ( AFL-2.1 GPL-2 )
-RDEPEND=>=dev-libs/expat-2.1.0 elogind? ( sys-auth/elogind ) selinux? ( sys-libs/libselinux ) systemd? ( sys-apps/systemd:0= ) X? ( x11-libs/libX11 x11-libs/libXt ) acct-user/messagebus selinux? ( sec-policy/selinux-dbus ) systemd? ( virtual/tmpfiles ) X? ( sys-apps/which )
-REQUIRED_USE=?? ( elogind systemd )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://dbus.freedesktop.org/releases/dbus/dbus-1.14.0.tar.xz
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	bbfa385d6907d7948d49a5e107bd654d	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	644887c82aefdf12001489391fca4f02	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=1e533ca608ebb6b3ddfa2067736b7e5c
diff --git a/metadata/md5-cache/sys-apps/ipmitool-1.8.19 b/metadata/md5-cache/sys-apps/ipmitool-1.8.19
new file mode 100644
index 000000000000..81103b2935cf
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/ipmitool-1.8.19
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=configure install prepare
+DEPEND=dev-libs/openssl:0= sys-libs/readline:0= openbmc? ( sys-apps/systemd:0= ) >=sys-devel/autoconf-2.69-r5 virtual/os-headers openipmi? ( sys-libs/openipmi )
+DESCRIPTION=Utility for controlling IPMI enabled devices
+EAPI=8
+HOMEPAGE=https://github.com/ipmitool/ipmitool
+INHERIT=autotools systemd
+IUSE=openbmc openipmi static
+KEYWORDS=~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86
+LICENSE=BSD
+RDEPEND=dev-libs/openssl:0= sys-libs/readline:0= openbmc? ( sys-apps/systemd:0= )
+SLOT=0
+SRC_URI=https://github.com/ipmitool/ipmitool/archive/refs/tags/IPMITOOL_1_8_19.tar.gz -> ipmitool-1.8.19.tar.gz https://dev.gentoo.org/~ajak/distfiles/sys-apps/ipmitool/enterprise-numbers-1.8.19.xz
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=56b6f12cb40a4dd7f447b167eaa9b694
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index 9599de30783b..025efde99cab 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.0 b/metadata/md5-cache/sys-devel/gcc-10.4.0
index 11b6c68c83e6..c0764bff1702 100644
--- a/metadata/md5-cache/sys-devel/gcc-10.4.0
+++ b/metadata/md5-cache/sys-devel/gcc-10.4.0
@@ -13,5 +13,5 @@ RDEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4
 RESTRICT=!test? ( test )
 SLOT=10
 SRC_URI=mirror://gnu/gcc/gcc-10.4.0/gcc-10.4.0.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-10.4.0-patches-5.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	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	97cbb6eb8c334c62a408019524b38cba	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	d9dfd70ca57bd981112e88d2a4cc166e	toolchain-funcs	1542e649be915f43f6908a9e93909961
 _md5_=49018706229782e33cdfe9210c897205
diff --git a/metadata/md5-cache/sys-devel/gcc-10.4.1_p20220818 b/metadata/md5-cache/sys-devel/gcc-10.4.1_p20220818
deleted file mode 100644
index 68253438c1bd..000000000000
--- a/metadata/md5-cache/sys-devel/gcc-10.4.1_p20220818
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/binutils sys-devel/gnuconfig >=app-portage/elt-patches-20170815 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 )
-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-20220818/gcc-10-20220818.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-10.5.0-patches-0.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-10.5.0-musl-patches-1.tar.xz
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	97cbb6eb8c334c62a408019524b38cba	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=0a8ea3893328fee07ec65057a33ed32f
diff --git a/metadata/md5-cache/sys-devel/gcc-10.4.1_p20220825 b/metadata/md5-cache/sys-devel/gcc-10.4.1_p20220825
deleted file mode 100644
index 0e15b56e5c14..000000000000
--- a/metadata/md5-cache/sys-devel/gcc-10.4.1_p20220825
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/binutils sys-devel/gnuconfig >=app-portage/elt-patches-20170815 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 )
-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-20220825/gcc-10-20220825.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-10.5.0-patches-0.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-10.5.0-musl-patches-1.tar.xz
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	97cbb6eb8c334c62a408019524b38cba	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=0a8ea3893328fee07ec65057a33ed32f
diff --git a/metadata/md5-cache/sys-devel/gcc-10.4.1_p20220901 b/metadata/md5-cache/sys-devel/gcc-10.4.1_p20220901
index 80bfbfe3017f..c1accf8e4575 100644
--- a/metadata/md5-cache/sys-devel/gcc-10.4.1_p20220901
+++ b/metadata/md5-cache/sys-devel/gcc-10.4.1_p20220901
@@ -1,4 +1,4 @@
-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 )
+BDEPEND=sys-devel/binutils sys-devel/gnuconfig >=app-portage/elt-patches-20170815 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) sys-apps/texinfo
 DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
 DEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) sanitize? ( virtual/libcrypt ) systemtap? ( dev-util/systemtap ) zstd? ( app-arch/zstd:= )
 DESCRIPTION=The GNU Compiler Collection
@@ -12,5 +12,5 @@ RDEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4
 RESTRICT=!test? ( test )
 SLOT=10
 SRC_URI=https://gcc.gnu.org/pub/gcc/snapshots/10-20220901/gcc-10-20220901.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-10.5.0-patches-0.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-10.5.0-musl-patches-1.tar.xz
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	97cbb6eb8c334c62a408019524b38cba	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	d9dfd70ca57bd981112e88d2a4cc166e	toolchain-funcs	1542e649be915f43f6908a9e93909961
 _md5_=0a8ea3893328fee07ec65057a33ed32f
diff --git a/metadata/md5-cache/sys-devel/gcc-10.4.1_p20220908 b/metadata/md5-cache/sys-devel/gcc-10.4.1_p20220908
index 280df14526f5..bdd748db8136 100644
--- a/metadata/md5-cache/sys-devel/gcc-10.4.1_p20220908
+++ b/metadata/md5-cache/sys-devel/gcc-10.4.1_p20220908
@@ -1,4 +1,4 @@
-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 )
+BDEPEND=sys-devel/binutils sys-devel/gnuconfig >=app-portage/elt-patches-20170815 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) sys-apps/texinfo
 DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
 DEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) sanitize? ( virtual/libcrypt ) systemtap? ( dev-util/systemtap ) zstd? ( app-arch/zstd:= )
 DESCRIPTION=The GNU Compiler Collection
@@ -12,5 +12,5 @@ RDEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4
 RESTRICT=!test? ( test )
 SLOT=10
 SRC_URI=https://gcc.gnu.org/pub/gcc/snapshots/10-20220908/gcc-10-20220908.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-10.5.0-patches-0.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-10.5.0-musl-patches-1.tar.xz
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	97cbb6eb8c334c62a408019524b38cba	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	d9dfd70ca57bd981112e88d2a4cc166e	toolchain-funcs	1542e649be915f43f6908a9e93909961
 _md5_=0a8ea3893328fee07ec65057a33ed32f
diff --git a/metadata/md5-cache/sys-devel/gcc-10.5.9999 b/metadata/md5-cache/sys-devel/gcc-10.5.9999
index 52c42399fd97..cfc6993a4e83 100644
--- a/metadata/md5-cache/sys-devel/gcc-10.5.9999
+++ b/metadata/md5-cache/sys-devel/gcc-10.5.9999
@@ -12,5 +12,5 @@ PROPERTIES=live
 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
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	29a755b1291d64133634d80b0328f153	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	97cbb6eb8c334c62a408019524b38cba	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	29a755b1291d64133634d80b0328f153	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	d9dfd70ca57bd981112e88d2a4cc166e	toolchain-funcs	1542e649be915f43f6908a9e93909961
 _md5_=75005114e3f30bc1159bdb4a6ed13376
diff --git a/metadata/md5-cache/sys-devel/gcc-11.3.0 b/metadata/md5-cache/sys-devel/gcc-11.3.0
index ac9391607ac1..04953fac5be0 100644
--- a/metadata/md5-cache/sys-devel/gcc-11.3.0
+++ b/metadata/md5-cache/sys-devel/gcc-11.3.0
@@ -13,5 +13,5 @@ RDEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv
 RESTRICT=!test? ( test )
 SLOT=11
 SRC_URI=mirror://gnu/gcc/gcc-11.3.0/gcc-11.3.0.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-11.3.0-patches-7.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-11.3.0-musl-patches-1.tar.xz
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	97cbb6eb8c334c62a408019524b38cba	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	d9dfd70ca57bd981112e88d2a4cc166e	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=3916b606704dea8b357a8c7149cd53b7
diff --git a/metadata/md5-cache/sys-devel/gcc-11.3.1_p20220826 b/metadata/md5-cache/sys-devel/gcc-11.3.1_p20220826
deleted file mode 100644
index 7b6e2d7f9578..000000000000
--- a/metadata/md5-cache/sys-devel/gcc-11.3.1_p20220826
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=sys-devel/binutils-2.30[cet(-)?] sys-devel/gnuconfig >=app-portage/elt-patches-20170815 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) 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-20220826/gcc-11-20220826.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-11.4.0-patches-2.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-11.4.0-musl-patches-0.tar.xz
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	97cbb6eb8c334c62a408019524b38cba	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=64cbe678a83e79b419ae9e2de4e53fed
diff --git a/metadata/md5-cache/sys-devel/gcc-11.3.1_p20220902 b/metadata/md5-cache/sys-devel/gcc-11.3.1_p20220902
index 8e207b05e042..ecc82b0f2206 100644
--- a/metadata/md5-cache/sys-devel/gcc-11.3.1_p20220902
+++ b/metadata/md5-cache/sys-devel/gcc-11.3.1_p20220902
@@ -1,4 +1,4 @@
-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 )
+BDEPEND=>=sys-devel/binutils-2.30[cet(-)?] sys-devel/gnuconfig >=app-portage/elt-patches-20170815 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) sys-apps/texinfo valgrind? ( dev-util/valgrind )
 DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
 DEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) sanitize? ( virtual/libcrypt ) systemtap? ( dev-util/systemtap ) zstd? ( app-arch/zstd:= )
 DESCRIPTION=The GNU Compiler Collection
@@ -12,5 +12,5 @@ RDEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv
 RESTRICT=!test? ( test )
 SLOT=11
 SRC_URI=https://gcc.gnu.org/pub/gcc/snapshots/11-20220902/gcc-11-20220902.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-11.4.0-patches-2.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-11.4.0-musl-patches-0.tar.xz
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	97cbb6eb8c334c62a408019524b38cba	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	d9dfd70ca57bd981112e88d2a4cc166e	toolchain-funcs	1542e649be915f43f6908a9e93909961
 _md5_=64cbe678a83e79b419ae9e2de4e53fed
diff --git a/metadata/md5-cache/sys-devel/gcc-11.3.1_p20220819 b/metadata/md5-cache/sys-devel/gcc-11.3.1_p20220909
index 36ebea96007b..3574737ca0a9 100644
--- a/metadata/md5-cache/sys-devel/gcc-11.3.1_p20220819
+++ b/metadata/md5-cache/sys-devel/gcc-11.3.1_p20220909
@@ -1,4 +1,4 @@
-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 )
+BDEPEND=>=sys-devel/binutils-2.30[cet(-)?] sys-devel/gnuconfig >=app-portage/elt-patches-20170815 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) sys-apps/texinfo valgrind? ( dev-util/valgrind )
 DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
 DEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) sanitize? ( virtual/libcrypt ) systemtap? ( dev-util/systemtap ) zstd? ( app-arch/zstd:= )
 DESCRIPTION=The GNU Compiler Collection
@@ -6,11 +6,12 @@ EAPI=8
 HOMEPAGE=https://gcc.gnu.org/
 INHERIT=toolchain
 IUSE=test vanilla +nls debug +cxx +nptl +fortran doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go +sanitize graphite ada vtv jit +pie +ssp +pch systemtap d lto cet zstd valgrind custom-cflags
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
 PDEPEND=>=sys-devel/gcc-config-2.3
 RDEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) zstd? ( app-arch/zstd:= )
 RESTRICT=!test? ( test )
 SLOT=11
-SRC_URI=https://gcc.gnu.org/pub/gcc/snapshots/11-20220819/gcc-11-20220819.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-11.4.0-patches-2.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-11.4.0-musl-patches-0.tar.xz
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	97cbb6eb8c334c62a408019524b38cba	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=64cbe678a83e79b419ae9e2de4e53fed
+SRC_URI=https://gcc.gnu.org/pub/gcc/snapshots/11-20220909/gcc-11-20220909.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-11.4.0-patches-2.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-11.4.0-musl-patches-0.tar.xz
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	d9dfd70ca57bd981112e88d2a4cc166e	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=90e7e8615012af4618ab6979b8da56d6
diff --git a/metadata/md5-cache/sys-devel/gcc-11.4.9999 b/metadata/md5-cache/sys-devel/gcc-11.4.9999
index e4eacdf6a3b5..5916f5be315c 100644
--- a/metadata/md5-cache/sys-devel/gcc-11.4.9999
+++ b/metadata/md5-cache/sys-devel/gcc-11.4.9999
@@ -12,5 +12,5 @@ PROPERTIES=live
 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
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	97cbb6eb8c334c62a408019524b38cba	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	d9dfd70ca57bd981112e88d2a4cc166e	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=f2a953bbdbb5eabdcfffd0b629bc9fe1
diff --git a/metadata/md5-cache/sys-devel/gcc-12.2.0 b/metadata/md5-cache/sys-devel/gcc-12.2.0
index fb4fc354e447..f428f90df87a 100644
--- a/metadata/md5-cache/sys-devel/gcc-12.2.0
+++ b/metadata/md5-cache/sys-devel/gcc-12.2.0
@@ -13,5 +13,5 @@ RDEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv
 RESTRICT=!test? ( test )
 SLOT=12
 SRC_URI=mirror://gnu/gcc/gcc-12.2.0/gcc-12.2.0.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-12.2.0-patches-1.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-12.2.0-musl-patches-1.tar.xz
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	97cbb6eb8c334c62a408019524b38cba	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	d9dfd70ca57bd981112e88d2a4cc166e	toolchain-funcs	1542e649be915f43f6908a9e93909961
 _md5_=a003c9112081e4f62fe73cf45c2d202d
diff --git a/metadata/md5-cache/sys-devel/gcc-12.2.1_p20220827 b/metadata/md5-cache/sys-devel/gcc-12.2.1_p20220827
index 83839ea86dd5..705fc8a0a628 100644
--- a/metadata/md5-cache/sys-devel/gcc-12.2.1_p20220827
+++ b/metadata/md5-cache/sys-devel/gcc-12.2.1_p20220827
@@ -1,4 +1,4 @@
-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 )
+BDEPEND=>=sys-devel/binutils-2.30[cet(-)?] sys-devel/gnuconfig >=app-portage/elt-patches-20170815 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) sys-apps/texinfo valgrind? ( dev-util/valgrind )
 DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
 DEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) sanitize? ( virtual/libcrypt ) systemtap? ( dev-util/systemtap ) zstd? ( app-arch/zstd:= )
 DESCRIPTION=The GNU Compiler Collection
@@ -12,5 +12,5 @@ RDEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv
 RESTRICT=!test? ( test )
 SLOT=12
 SRC_URI=https://gcc.gnu.org/pub/gcc/snapshots/12-20220827/gcc-12-20220827.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-12.2.0-patches-1.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-12.2.0-musl-patches-1.tar.xz
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	97cbb6eb8c334c62a408019524b38cba	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	d9dfd70ca57bd981112e88d2a4cc166e	toolchain-funcs	1542e649be915f43f6908a9e93909961
 _md5_=9624ff2f545339d3ee11225f931bda32
diff --git a/metadata/md5-cache/sys-devel/gcc-12.2.1_p20220903 b/metadata/md5-cache/sys-devel/gcc-12.2.1_p20220903
index bef16dd852d3..3c791a048e54 100644
--- a/metadata/md5-cache/sys-devel/gcc-12.2.1_p20220903
+++ b/metadata/md5-cache/sys-devel/gcc-12.2.1_p20220903
@@ -1,4 +1,4 @@
-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 )
+BDEPEND=>=sys-devel/binutils-2.30[cet(-)?] sys-devel/gnuconfig >=app-portage/elt-patches-20170815 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) sys-apps/texinfo valgrind? ( dev-util/valgrind )
 DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
 DEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) sanitize? ( virtual/libcrypt ) systemtap? ( dev-util/systemtap ) zstd? ( app-arch/zstd:= )
 DESCRIPTION=The GNU Compiler Collection
@@ -12,5 +12,5 @@ RDEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv
 RESTRICT=!test? ( test )
 SLOT=12
 SRC_URI=https://gcc.gnu.org/pub/gcc/snapshots/12-20220903/gcc-12-20220903.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-12.2.0-patches-1.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-12.2.0-musl-patches-1.tar.xz
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	97cbb6eb8c334c62a408019524b38cba	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	d9dfd70ca57bd981112e88d2a4cc166e	toolchain-funcs	1542e649be915f43f6908a9e93909961
 _md5_=9624ff2f545339d3ee11225f931bda32
diff --git a/metadata/md5-cache/sys-devel/gcc-12.3.9999 b/metadata/md5-cache/sys-devel/gcc-12.3.9999
index 4dba3c74e80d..2d0b030adcdd 100644
--- a/metadata/md5-cache/sys-devel/gcc-12.3.9999
+++ b/metadata/md5-cache/sys-devel/gcc-12.3.9999
@@ -12,5 +12,5 @@ PROPERTIES=live
 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
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	29a755b1291d64133634d80b0328f153	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	97cbb6eb8c334c62a408019524b38cba	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	29a755b1291d64133634d80b0328f153	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	d9dfd70ca57bd981112e88d2a4cc166e	toolchain-funcs	1542e649be915f43f6908a9e93909961
 _md5_=3dd226b4f1ea476fa73901bc62a57ae3
diff --git a/metadata/md5-cache/sys-devel/gcc-13.0.0_pre20220828 b/metadata/md5-cache/sys-devel/gcc-13.0.0_pre20220828
index e24e43d45de9..89f6d2da1f19 100644
--- a/metadata/md5-cache/sys-devel/gcc-13.0.0_pre20220828
+++ b/metadata/md5-cache/sys-devel/gcc-13.0.0_pre20220828
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/binutils[cet(-)?] sys-devel/gnuconfig >=app-portage/elt-patches-20170815 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) valgrind? ( dev-util/valgrind )
+BDEPEND=sys-devel/binutils[cet(-)?] sys-devel/gnuconfig >=app-portage/elt-patches-20170815 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) sys-apps/texinfo valgrind? ( dev-util/valgrind )
 DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
 DEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) sanitize? ( virtual/libcrypt ) systemtap? ( dev-util/systemtap ) zstd? ( app-arch/zstd:= )
 DESCRIPTION=The GNU Compiler Collection
@@ -13,5 +13,5 @@ RDEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv
 RESTRICT=!test? ( test )
 SLOT=13
 SRC_URI=https://gcc.gnu.org/pub/gcc/snapshots/13-20220828/gcc-13-20220828.tar.xz https://dev.gentoo.org/~xen0n/distfiles/sys-devel/gcc/gcc-13.0.0-patches-1.tar.xz
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	97cbb6eb8c334c62a408019524b38cba	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	d9dfd70ca57bd981112e88d2a4cc166e	toolchain-funcs	1542e649be915f43f6908a9e93909961
 _md5_=d4804665563c18b688f5fc23a110c531
diff --git a/metadata/md5-cache/sys-devel/gcc-13.0.0_pre20220904 b/metadata/md5-cache/sys-devel/gcc-13.0.0_pre20220904
index 47e6c0b91241..0f1d58c38ddb 100644
--- a/metadata/md5-cache/sys-devel/gcc-13.0.0_pre20220904
+++ b/metadata/md5-cache/sys-devel/gcc-13.0.0_pre20220904
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/binutils[cet(-)?] sys-devel/gnuconfig >=app-portage/elt-patches-20170815 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) valgrind? ( dev-util/valgrind )
+BDEPEND=sys-devel/binutils[cet(-)?] sys-devel/gnuconfig >=app-portage/elt-patches-20170815 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) sys-apps/texinfo valgrind? ( dev-util/valgrind )
 DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
 DEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) sanitize? ( virtual/libcrypt ) systemtap? ( dev-util/systemtap ) zstd? ( app-arch/zstd:= )
 DESCRIPTION=The GNU Compiler Collection
@@ -13,5 +13,5 @@ RDEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv
 RESTRICT=!test? ( test )
 SLOT=13
 SRC_URI=https://gcc.gnu.org/pub/gcc/snapshots/13-20220904/gcc-13-20220904.tar.xz https://dev.gentoo.org/~xen0n/distfiles/sys-devel/gcc/gcc-13.0.0-patches-1.tar.xz
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	97cbb6eb8c334c62a408019524b38cba	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	d9dfd70ca57bd981112e88d2a4cc166e	toolchain-funcs	1542e649be915f43f6908a9e93909961
 _md5_=d4804665563c18b688f5fc23a110c531
diff --git a/metadata/md5-cache/sys-devel/gcc-13.0.9999 b/metadata/md5-cache/sys-devel/gcc-13.0.9999
index ab52c022989d..fb6551ec62bb 100644
--- a/metadata/md5-cache/sys-devel/gcc-13.0.9999
+++ b/metadata/md5-cache/sys-devel/gcc-13.0.9999
@@ -12,5 +12,5 @@ PROPERTIES=live
 RDEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) zstd? ( app-arch/zstd:= )
 RESTRICT=!test? ( test )
 SLOT=13
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	29a755b1291d64133634d80b0328f153	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	97cbb6eb8c334c62a408019524b38cba	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	29a755b1291d64133634d80b0328f153	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	d9dfd70ca57bd981112e88d2a4cc166e	toolchain-funcs	1542e649be915f43f6908a9e93909961
 _md5_=e811fe45a490259d5c0fe03831572f29
diff --git a/metadata/md5-cache/sys-devel/gcc-8.5.0-r1 b/metadata/md5-cache/sys-devel/gcc-8.5.0-r1
index c310813d85de..8a2593ea1c05 100644
--- a/metadata/md5-cache/sys-devel/gcc-8.5.0-r1
+++ b/metadata/md5-cache/sys-devel/gcc-8.5.0-r1
@@ -13,5 +13,5 @@ RDEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4
 RESTRICT=!test? ( test )
 SLOT=8.5.0
 SRC_URI=mirror://gnu/gcc/gcc-8.5.0/gcc-8.5.0.tar.xz https://dev.gentoo.org/~sam/distfiles/gcc-8.5.0-patches-2.tar.bz2
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	97cbb6eb8c334c62a408019524b38cba	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	d9dfd70ca57bd981112e88d2a4cc166e	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=83a1f563ce1cd12d8f5d43feaf7b93fd
diff --git a/metadata/md5-cache/sys-devel/gcc-9.5.0 b/metadata/md5-cache/sys-devel/gcc-9.5.0
index 7ec8f8542cea..f129755c2d07 100644
--- a/metadata/md5-cache/sys-devel/gcc-9.5.0
+++ b/metadata/md5-cache/sys-devel/gcc-9.5.0
@@ -13,5 +13,5 @@ RDEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4
 RESTRICT=!test? ( test )
 SLOT=9.5.0
 SRC_URI=mirror://gnu/gcc/gcc-9.5.0/gcc-9.5.0.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-9.5.0-patches-1.tar.xz
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	97cbb6eb8c334c62a408019524b38cba	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	d9dfd70ca57bd981112e88d2a4cc166e	toolchain-funcs	1542e649be915f43f6908a9e93909961
 _md5_=7f5064a0675c5e994becd170b7d1cf93
diff --git a/metadata/md5-cache/sys-devel/gcc-apple-4.2.1_p5666-r3 b/metadata/md5-cache/sys-devel/gcc-apple-4.2.1_p5666-r3
index 29632f1b88cb..6391634665d1 100644
--- a/metadata/md5-cache/sys-devel/gcc-apple-4.2.1_p5666-r3
+++ b/metadata/md5-cache/sys-devel/gcc-apple-4.2.1_p5666-r3
@@ -13,5 +13,5 @@ RDEPEND=>=sys-libs/zlib-1.1.4 >=sys-libs/ncurses-5.2-r2 nls? ( sys-devel/gettext
 RESTRICT=!test? ( test )
 SLOT=42
 SRC_URI=http://www.opensource.apple.com/darwinsource/tarballs/other/gcc-5666.3.tar.gz http://www.opensource.apple.com/darwinsource/tarballs/other/libstdcxx-39.tar.gz fortran? ( mirror://gnu/gcc/gcc-4.2.4/gcc-fortran-4.2.4.tar.bz2 https://dev.gentoo.org/~grobian/distfiles/gcc-apple-4.2.1_p5646-gfortran.patch )
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	97cbb6eb8c334c62a408019524b38cba	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	d9dfd70ca57bd981112e88d2a4cc166e	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=a985071b860d5fe91f55bc2183ff0c0e
diff --git a/metadata/md5-cache/sys-devel/kgcc64-10.3.0 b/metadata/md5-cache/sys-devel/kgcc64-10.3.0
index 37c60e008922..d19e7f60aea6 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-10.3.0
+++ b/metadata/md5-cache/sys-devel/kgcc64-10.3.0
@@ -13,5 +13,5 @@ RDEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4
 RESTRICT=!test? ( test )
 SLOT=10
 SRC_URI=mirror://gnu/gcc/gcc-10.3.0/gcc-10.3.0.tar.xz https://dev.gentoo.org/~sam/distfiles/gcc-10.3.0-patches-1.tar.bz2
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	97cbb6eb8c334c62a408019524b38cba	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	d9dfd70ca57bd981112e88d2a4cc166e	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=d34be4589512e82f9f943747de52ad78
diff --git a/metadata/md5-cache/sys-devel/kgcc64-10.4.0 b/metadata/md5-cache/sys-devel/kgcc64-10.4.0
index 23f97a42921b..84eacfceed83 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-10.4.0
+++ b/metadata/md5-cache/sys-devel/kgcc64-10.4.0
@@ -13,5 +13,5 @@ RDEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4
 RESTRICT=!test? ( test )
 SLOT=10
 SRC_URI=mirror://gnu/gcc/gcc-10.4.0/gcc-10.4.0.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-10.4.0-patches-5.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	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	97cbb6eb8c334c62a408019524b38cba	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	d9dfd70ca57bd981112e88d2a4cc166e	toolchain-funcs	1542e649be915f43f6908a9e93909961
 _md5_=d3bdba9eb249c6c0e62b0dfafb12d73c
diff --git a/metadata/md5-cache/sys-devel/kgcc64-11.3.0 b/metadata/md5-cache/sys-devel/kgcc64-11.3.0
index 74d96c91a673..e84ce35ad7e5 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-11.3.0
+++ b/metadata/md5-cache/sys-devel/kgcc64-11.3.0
@@ -13,5 +13,5 @@ RDEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4
 RESTRICT=!test? ( test )
 SLOT=11
 SRC_URI=mirror://gnu/gcc/gcc-11.3.0/gcc-11.3.0.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-11.3.0-patches-4.tar.bz2
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	97cbb6eb8c334c62a408019524b38cba	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	d9dfd70ca57bd981112e88d2a4cc166e	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=17f07a9e9509bb6251bcc010a9d0d3b0
diff --git a/metadata/md5-cache/sys-devel/kgcc64-12.2.0 b/metadata/md5-cache/sys-devel/kgcc64-12.2.0
index dd3e532a974a..d9f67f766304 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-12.2.0
+++ b/metadata/md5-cache/sys-devel/kgcc64-12.2.0
@@ -13,5 +13,5 @@ RDEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4
 RESTRICT=!test? ( test )
 SLOT=12
 SRC_URI=mirror://gnu/gcc/gcc-12.2.0/gcc-12.2.0.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-12.2.0-patches-1.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-12.2.0-musl-patches-1.tar.xz
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	97cbb6eb8c334c62a408019524b38cba	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	d9dfd70ca57bd981112e88d2a4cc166e	toolchain-funcs	1542e649be915f43f6908a9e93909961
 _md5_=054d08d0b5317d9efc2a5bc2fda38c9b
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index e69a7ed6e60e..153953e0191e 100644
--- a/metadata/md5-cache/sys-fs/Manifest.gz
+++ b/metadata/md5-cache/sys-fs/Manifest.gz
diff --git a/metadata/md5-cache/sys-fs/lxcfs-5.0.2 b/metadata/md5-cache/sys-fs/lxcfs-5.0.2
deleted file mode 100644
index 12bff2f51fbd..000000000000
--- a/metadata/md5-cache/sys-fs/lxcfs-5.0.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 ) || ( ( >=dev-lang/python-3.11.0_beta4:3.11 dev-python/jinja[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 dev-python/jinja[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-python/jinja[python_targets_python3_9(-)] ) ) doc? ( sys-apps/help2man ) verify-sig? ( sec-keys/openpgp-keys-linuxcontainers ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=sys-fs/fuse:3
-DESCRIPTION=FUSE filesystem for LXC
-EAPI=8
-HOMEPAGE=https://linuxcontainers.org/lxcfs/introduction/ https://github.com/lxc/lxcfs/
-INHERIT=cmake meson python-any-r1 systemd verify-sig
-IUSE=doc test verify-sig
-KEYWORDS=~amd64 ~arm64 ~riscv ~x86
-LICENSE=Apache-2.0 LGPL-2+
-RDEPEND=sys-fs/fuse:3
-RESTRICT=test
-SLOT=0
-SRC_URI=https://linuxcontainers.org/downloads/lxcfs/lxcfs-5.0.2.tar.gz verify-sig? ( https://linuxcontainers.org/downloads/lxcfs/lxcfs-5.0.2.tar.gz.asc )
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=b5d40a461220768d355e4e1fb408c8d6
diff --git a/metadata/md5-cache/www-servers/Manifest.gz b/metadata/md5-cache/www-servers/Manifest.gz
index 90f5b1acfcb4..fa700d938c83 100644
--- a/metadata/md5-cache/www-servers/Manifest.gz
+++ b/metadata/md5-cache/www-servers/Manifest.gz
diff --git a/metadata/md5-cache/www-servers/nginx-1.23.1-r1 b/metadata/md5-cache/www-servers/nginx-1.23.1-r1
index 1175868d051d..1acfc052ee00 100644
--- a/metadata/md5-cache/www-servers/nginx-1.23.1-r1
+++ b/metadata/md5-cache/www-servers/nginx-1.23.1-r1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://nginx.org
 INHERIT=autotools lua-single ssl-cert toolchain-funcs perl-module systemd pax-utils
 IUSE=aio debug +http +http2 +http-cache +ipv6 libatomic pcre +pcre2 pcre-jit rtmp selinux ssl threads vim-syntax +nginx_modules_http_access +nginx_modules_http_auth_basic +nginx_modules_http_autoindex +nginx_modules_http_browser +nginx_modules_http_charset +nginx_modules_http_empty_gif +nginx_modules_http_fastcgi +nginx_modules_http_geo +nginx_modules_http_grpc +nginx_modules_http_gzip +nginx_modules_http_limit_req +nginx_modules_http_limit_conn +nginx_modules_http_map +nginx_modules_http_memcached +nginx_modules_http_mirror +nginx_modules_http_proxy +nginx_modules_http_referer +nginx_modules_http_rewrite +nginx_modules_http_scgi +nginx_modules_http_ssi +nginx_modules_http_split_clients +nginx_modules_http_upstream_hash +nginx_modules_http_upstream_ip_hash +nginx_modules_http_upstream_keepalive +nginx_modules_http_upstream_least_conn +nginx_modules_http_upstream_zone +nginx_modules_http_userid +nginx_modules_http_uwsgi nginx_modules_http_addition nginx_modules_http_auth_request nginx_modules_http_dav nginx_modules_http_degradation nginx_modules_http_flv nginx_modules_http_geoip nginx_modules_http_gunzip nginx_modules_http_gzip_static nginx_modules_http_image_filter nginx_modules_http_mp4 nginx_modules_http_perl nginx_modules_http_random_index nginx_modules_http_realip nginx_modules_http_secure_link nginx_modules_http_slice nginx_modules_http_stub_status nginx_modules_http_sub nginx_modules_http_xslt nginx_modules_stream_access nginx_modules_stream_geo nginx_modules_stream_limit_conn nginx_modules_stream_map nginx_modules_stream_return nginx_modules_stream_split_clients nginx_modules_stream_upstream_hash nginx_modules_stream_upstream_least_conn nginx_modules_stream_upstream_zone nginx_modules_stream_geoip nginx_modules_stream_realip nginx_modules_stream_ssl_preread nginx_modules_mail_imap nginx_modules_mail_pop3 nginx_modules_mail_smtp nginx_modules_http_auth_ldap nginx_modules_http_auth_pam nginx_modules_http_brotli nginx_modules_http_cache_purge nginx_modules_http_dav_ext nginx_modules_http_echo nginx_modules_http_fancyindex nginx_modules_http_geoip2 nginx_modules_http_headers_more nginx_modules_http_javascript nginx_modules_http_lua nginx_modules_http_memc nginx_modules_http_metrics nginx_modules_http_mogilefs nginx_modules_http_naxsi nginx_modules_http_push_stream nginx_modules_http_security nginx_modules_http_slowfs_cache nginx_modules_http_sticky nginx_modules_http_upload_progress nginx_modules_http_upstream_check nginx_modules_http_vhost_traffic_status nginx_modules_stream_geoip2 nginx_modules_stream_javascript nginx_modules_http_spdy +lua_single_target_luajit
-KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux
 LICENSE=BSD-2 BSD SSLeay MIT GPL-2 GPL-2+ nginx_modules_http_security? ( Apache-2.0 ) nginx_modules_http_push_stream? ( GPL-3 )
 PDEPEND=vim-syntax? ( app-vim/nginx-syntax )
 RDEPEND=acct-group/nginx acct-user/nginx virtual/libcrypt:= pcre? ( dev-libs/libpcre:= ) pcre2? ( dev-libs/libpcre2:= ) pcre-jit? ( dev-libs/libpcre:=[jit] ) ssl? ( dev-libs/openssl:0= ) http2? ( >=dev-libs/openssl-1.0.1c:0= ) http-cache? ( dev-libs/openssl:0= ) nginx_modules_http_brotli? ( app-arch/brotli:= ) nginx_modules_http_geoip? ( dev-libs/geoip ) nginx_modules_http_geoip2? ( dev-libs/libmaxminddb:= ) nginx_modules_http_gunzip? ( sys-libs/zlib ) nginx_modules_http_gzip? ( sys-libs/zlib ) nginx_modules_http_gzip_static? ( sys-libs/zlib ) nginx_modules_http_image_filter? ( media-libs/gd:=[jpeg,png] ) nginx_modules_http_perl? ( >=dev-lang/perl-5.8:= ) nginx_modules_http_rewrite? ( dev-libs/libpcre:= ) nginx_modules_http_secure_link? ( dev-libs/openssl:0= ) nginx_modules_http_xslt? ( dev-libs/libxml2:= dev-libs/libxslt ) nginx_modules_http_lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) ) nginx_modules_http_auth_pam? ( sys-libs/pam ) nginx_modules_http_metrics? ( dev-libs/yajl:= ) nginx_modules_http_dav_ext? ( dev-libs/libxml2 ) nginx_modules_http_security? ( dev-libs/modsecurity ) nginx_modules_http_auth_ldap? ( net-nds/openldap:=[ssl?] ) nginx_modules_stream_geoip? ( dev-libs/geoip ) nginx_modules_stream_geoip2? ( dev-libs/libmaxminddb:= ) selinux? ( sec-policy/selinux-nginx ) !www-servers/nginx:0
@@ -15,4 +15,4 @@ RESTRICT=test
 SLOT=mainline
 SRC_URI=https://nginx.org/download/nginx-1.23.1.tar.gz https://github.com/simpl/ngx_devel_kit/archive/v0.3.1.tar.gz -> ngx_devel_kit-0.3.1.tar.gz nginx_modules_http_auth_ldap? ( https://github.com/kvspb/nginx-auth-ldap/archive/42d195d7a7575ebab1c369ad3fc5d78dc2c2669c.tar.gz -> nginx-auth-ldap-42d195d7a7575ebab1c369ad3fc5d78dc2c2669c.tar.gz ) nginx_modules_http_auth_pam? ( https://github.com/stogh/ngx_http_auth_pam_module/archive/v1.5.2.tar.gz -> ngx_http_auth_pam-1.5.2.tar.gz ) nginx_modules_http_brotli? ( https://github.com/google/ngx_brotli/archive/v1.0.0rc.tar.gz -> ngx_brotli-1.0.0rc.tar.gz ) nginx_modules_http_cache_purge? ( http://labs.frickle.com/files/ngx_cache_purge-2.3.tar.gz -> ngx_http_cache_purge-2.3.tar.gz ) nginx_modules_http_dav_ext? ( https://github.com/arut/nginx-dav-ext-module/archive/v3.0.0.tar.gz -> ngx_http_dav_ext-3.0.0.tar.gz ) nginx_modules_http_echo? ( https://github.com/openresty/echo-nginx-module/archive/v0.62.tar.gz -> ngx_http_echo-0.62.tar.gz ) nginx_modules_http_fancyindex? ( https://github.com/aperezdc/ngx-fancyindex/archive/v0.4.4.tar.gz -> ngx_http_fancyindex-0.4.4.tar.gz ) nginx_modules_http_geoip2? ( https://github.com/leev/ngx_http_geoip2_module/archive/3.4.tar.gz -> ngx_http_geoip2_module-3.4.tar.gz ) nginx_modules_http_headers_more? ( https://github.com/openresty/headers-more-nginx-module/archive/d502e41996d24a382bd9c632e3ae3efa0a5fca66.tar.gz -> ngx_http_headers_more-d502e41996d24a382bd9c632e3ae3efa0a5fca66.tar.gz ) nginx_modules_http_javascript? ( https://github.com/nginx/njs/archive/0.7.7.tar.gz -> njs-0.7.7.tar.gz ) nginx_modules_http_lua? ( https://github.com/openresty/lua-nginx-module/archive/b6d167cf1a93c0c885c28db5a439f2404874cb26.tar.gz -> ngx_http_lua-b6d167cf1a93c0c885c28db5a439f2404874cb26.tar.gz ) nginx_modules_http_memc? ( https://github.com/openresty/memc-nginx-module/archive/v0.19.tar.gz -> ngx_memc_module-0.19.tar.gz ) nginx_modules_http_metrics? ( https://github.com/madvertise/ngx_metrics/archive/v0.1.1.tar.gz -> ngx_metrics-0.1.1.tar.gz ) nginx_modules_http_mogilefs? ( https://github.com/vkholodkov/nginx-mogilefs-module/archive/1.0.4.tar.gz -> ngx_mogilefs_module-1.0.4.tar.gz ) nginx_modules_http_naxsi? ( https://github.com/nbs-system/naxsi/archive/0.56.tar.gz -> ngx_http_naxsi-0.56.tar.gz ) nginx_modules_http_push_stream? ( https://github.com/wandenberg/nginx-push-stream-module/archive/8c02220d484d7848bc8e3a6d9b1c616987e86f66.tar.gz -> ngx_http_push_stream-8c02220d484d7848bc8e3a6d9b1c616987e86f66.tar.gz ) nginx_modules_http_security? ( https://github.com/SpiderLabs/ModSecurity-nginx/archive/refs/tags/v1.0.3.tar.gz -> modsecurity-nginx-1.0.3.tar.gz ) nginx_modules_http_slowfs_cache? ( http://labs.frickle.com/files/ngx_slowfs_cache-1.10.tar.gz -> ngx_http_slowfs_cache-1.10.tar.gz ) nginx_modules_http_sticky? ( https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng/get/1.2.6-10-g08a395c66e42.tar.bz2 -> nginx_http_sticky_module_ng-1.2.6-10-g08a395c66e42.tar.bz2 ) nginx_modules_http_upload_progress? ( https://github.com/masterzen/nginx-upload-progress-module/archive/68b3ab3b64a0cee7f785d161401c8be357bbed12.tar.gz -> ngx_http_upload_progress-68b3ab3b64a0cee7f785d161401c8be357bbed12.tar.gz ) nginx_modules_http_upstream_check? ( https://github.com/yaoweibin/nginx_upstream_check_module/archive/9aecf15ec379fe98f62355c57b60c0bc83296f04.tar.gz -> ngx_http_upstream_check-9aecf15ec379fe98f62355c57b60c0bc83296f04.tar.gz ) nginx_modules_http_vhost_traffic_status? ( https://github.com/vozlt/nginx-module-vts/archive/46d85558e344dfe2b078ce757fd36c69a1ec2dd3.tar.gz -> ngx_http_vhost_traffic_status-46d85558e344dfe2b078ce757fd36c69a1ec2dd3.tar.gz ) nginx_modules_stream_geoip2? ( https://github.com/leev/ngx_http_geoip2_module/archive/3.4.tar.gz -> ngx_http_geoip2_module-3.4.tar.gz ) nginx_modules_stream_javascript? ( https://github.com/nginx/njs/archive/0.7.7.tar.gz -> njs-0.7.7.tar.gz ) rtmp? ( https://github.com/arut/nginx-rtmp-module/archive/v1.2.1.tar.gz -> ngx_rtmp-1.2.1.tar.gz )
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	4f80b00fab088c2f6d68edb55a6c4bf4	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	ssl-cert	6dbe6a8a3dccb3d2f28f8404cd02c7d7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=268703424db454d009b5292fc8c30ab0
+_md5_=72479b837f6429137c6b6d150935096c
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index c8d08a40a5e3..8a4a8458aef1 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 14053 BLAKE2B c0a5bea7cd069c2e9b07dab158b876c74e027945a8fdd50fee280ec7abb59b03a223e89d53d1563fc784c8a353890e9928577f3cf4c4daaf3eebee6f871aa5c0 SHA512 43691780e35724149b779ecf32c3d83556a2e30fb3c35c56b8841fc4c866de83cb09e4b9be3071940181a4933de197417647dd3921df2f61e100510b23a9e327
-TIMESTAMP 2022-09-10T02:40:08Z
+TIMESTAMP 2022-09-10T08:40:05Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmMb+QhfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmMcTWVfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCi+A//SJUyzsBHVdl7H9IT/ASadUM2KAxBn3yzVYv2dpKGELUT2BGg0dE6tvsR
-fA/qd5ZJTcrOhTXOn/CaYONX+83nS88xkxHcLRKnkh0iDx+yJpMZnjSS7igxnHv+
-zkmqYT+12LKcw1RT+Wwp4FoRB0AvCXjWLAEi0rgQ2kHxdTpRQAYF1oFIEaUEEOM6
-dTipsMRZPJLXwYVN13/L4cQgjTpnr0gT86G1kG+YC9FXlyOrZWPWM8Bs6zy3638j
-iFOdB9HpTnGHl+zxe+KOvisCUJ1tYmhmGwiRr8iIhMIu7626EeqDGBUv5IEJMtse
-r8ZZkiUzT7jgz92McuQeHmnpDUeDQQ1TRp+U2Xgs1qUw1UhvRfGEzRdHm3c9vaBK
-o5ih6ILSUdTnziP6vPc5LtGqX3LyO4R0XdZHKFhV2cLE5ccLDDa8axwbOqC7V0KX
-dKWfXKvU9QIzv3FXgXyN7bnSSWO9DLP0zp8gaBjr2AWypH8QTAn1ntYj/yPmZzR7
-qltbw74il2ImyFv4CUCkzWLoUZcKcuC+Un8RmR8cibSWb10ezKDegGPsSq+ZcgqA
-tyNCxbtd4X0LjshfsOv+3wxRSsywDSO8nX68R+hpsFuZ6eRX8r85DZMBeg7A020d
-xEsvtXW57GP/3Jt934VVZcjS9bnCbb2vXf4wBMhMVRJBs+sVq1Q=
-=gQYm
+klDpWxAAktCuXvLmcZu6NcFxbgt7jCO6N+6AIgTFTXnlfveREVXdc2XNKg/qsEAw
+v1f9EDCbmg2J8hQLljDbk+mb0FwwQbsj5jgCSIuT3Au/5xTbFLoS9dgRU7nHNP94
+FSiO8MhykzSRdZwe2NTd5qm25d2B4kvHWQwgyoX/dB1WHkswFFQ5kvqmMa1cvT/Q
+wxxNV+NQeEHUuMCriPf6cEMZ4v2/b4StXuwHX0sxtIOhkT4exhdU3c0awLb8qfGz
+TkppTwqLYvM9zs9bI7qIDBkFoGyiDVzYhHkesdQnHiliTInpuljzzCaLy25/S+Fh
+RzCiqVx0BDWOqUux9yTmqcbTHTMS1uA8YCiUtkpnCCAWceA3kg41gyhQRKH9Jifh
+BYrsx718WleOo/8zXTTtBQ5SRjGeVGgyT9RynuebFsQjYwmJWmQTEy6Hqj5g5ZUz
+1JKZxq918Ar6/8ZxKZi/bA3x4l+DalUOj6y3wg7zVm26UK+j4FyWnwRTbP61zC8D
+VpcT98CUOanWPX9VTbWZ/rqmT7TqzOWtK4zOh/7jIActw9V6D6i5TlhKhd+n68lK
+MPzMHsEEr0Nfx+MA3X7v751SGKcyJHC1TdIeCa3waObK+QNMU6XwhE+m7M/ZGY+6
+kkK+9PLxNnM+FoKabsfU2rbT8uAFF+42Pw+7EXwKT5AGlCU84dU=
+=Z9cD
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index d269ee0247b7..3c78f4ba724f 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Sat, 10 Sep 2022 02:40:05 +0000
+Sat, 10 Sep 2022 08:40:02 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index e9f787005675..b4144fd56d2e 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Sat Sep 10 02:40:05 AM UTC 2022
+Sat Sep 10 08:40:01 AM UTC 2022
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 06e6fb9598c6..b381631534bb 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Sat, 10 Sep 2022 02:45:01 +0000
+Sat, 10 Sep 2022 08:45:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 69c63aa7885f..ac1bd68f28f8 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-d2d2cd9fc9d725978a38f6b0a57eb873a57c7eb1 1662776371 2022-09-10T02:19:31+00:00
+c29e3629c5cecc50f0f7ed8f08cbccd95a05a55e 1662798791 2022-09-10T08:33:11+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 516b6747ea1f..52de65e025a2 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1662777601 Sat 10 Sep 2022 02:40:01 AM UTC
+1662799201 Sat 10 Sep 2022 08:40:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index d269ee0247b7..f771435339c5 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Sat, 10 Sep 2022 02:40:05 +0000
+Sat, 10 Sep 2022 08:40:01 +0000
diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index c8cbd513a6fb..53d5e59e6cd9 100644
--- a/net-im/Manifest.gz
+++ b/net-im/Manifest.gz
diff --git a/net-im/cawbird/Manifest b/net-im/cawbird/Manifest
index a6f93af033b9..1f1ab3aa068c 100644
--- a/net-im/cawbird/Manifest
+++ b/net-im/cawbird/Manifest
@@ -1,3 +1,3 @@
 DIST cawbird-1.5.tar.gz 675527 BLAKE2B d94bf61faba01fc1159fabbf0da24ab49a697112ccd5bb631133c21f52ffe29e9ede214c9eccf553cbbb039b08e487467e4ecc56d0e0ef63f68d4c23d39414aa SHA512 917480ac79606a1ab572f0837fd48e100bbb6d70ad3551a8d86486843d9bfb0e4814c75c56ff0e2aa41fd7d32a614bbff4e6121831b3da7da7614fb5a0d3f6e1
 EBUILD cawbird-1.5-r2.ebuild 1621 BLAKE2B 3c07dde77e3207fd382d4e3eab1ab6c775591f57eb4bc4d57cc168126d4b688293e0795574dc321069dd18c769b9c66af0d5433d415845ef15283030778c5255 SHA512 581ca96bca82dd7820145bbf6f80e5acf8e89ce8499eda803323a97cb2d9d387b310dae9da5c7cf66261935cdfd84f6e4f89aacd4521868716186b10bb149edc
-MISC metadata.xml 324 BLAKE2B f548750610b0b02bf35efb78ee01ef1d2d7a68d65d9d1e88b29639ad576b139fecd3d8b40a2c9ff88f4613a1b6e8fea28efccfcdbc6e83d32855c4414ede7728 SHA512 4aed49f42c279faf8c819e1a1cb1bf0aad5ccd46de295fff062734e68f98aee1cdc96f383a3c45a452fb7cf9e344ddde1f33e3b9287535fec1edfb4f710d6a8a
+MISC metadata.xml 245 BLAKE2B 676b53eacb2672a796da88ec3c22837faaa0ac5a37c539f9e284f8cf5fe72d6684f5c037fdc836017bf9e5318346e3b6e7b6606dd0a6a8c75198aad9d98de789 SHA512 e7f643ef44d596d37a400947aaa0061e15b1f4ba0e4305e0dad0dd44f7c5ff34464d3303e5ef0be1909d0aba264bd940f0e317874d3541db5e100bb5c9af4e7d
diff --git a/net-im/cawbird/metadata.xml b/net-im/cawbird/metadata.xml
index d1905ebb02b4..35907e6cd778 100644
--- a/net-im/cawbird/metadata.xml
+++ b/net-im/cawbird/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-  <email>matthew@gentoo.org</email>
-  <name>Matthew Smith</name>
-</maintainer>
+<!-- maintainer-needed -->
 <upstream>
   <remote-id type="github">IBBoard/cawbird</remote-id>
 </upstream>
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 5b875c03591b..60ad0873d40d 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/putty/Manifest b/net-misc/putty/Manifest
index 46957324f2ca..27a304d92740 100644
--- a/net-misc/putty/Manifest
+++ b/net-misc/putty/Manifest
@@ -3,6 +3,6 @@ DIST putty-0.77.tar.gz 2619481 BLAKE2B 83b0838a3923c93f95020297d6402872605609da8
 DIST putty-icons.tar.bz2 4878 BLAKE2B 589f1bace82e3fd202b70bd35661d2ec4ef383363f8ae6716d4a6828bd822ef624b0acde39354d3d837e2d2bb49a34dbb89e031c64c520cbc675cad79813acff SHA512 4e419a71e26770e159221f6b516e7210d29272917b4b9a9e0b67c72e73508b97278e56c82111b02e106c5d513c2561fec6da372b4b18246f29372ae618ff5f71
 EBUILD putty-0.76.ebuild 1707 BLAKE2B 5da5dbaf196d105ffcdeac1fba6b49f0be19d69d851bfbb0e79812aabc3573d717a440c693ffd96df62d8290c43581b08130c794f0000ed66c7018bbcc10e038 SHA512 93f499eb5fe6fbf3844cbc8a3c970d5329660d85da134b2811de6f9be0c930951057445cc7e663c91467e4e4646cf4f8e1c11d7f3f4de1ebce5a1ea5295d7161
 EBUILD putty-0.77-r1.ebuild 1851 BLAKE2B 81beaf794457204d0e8cd5c54d11b61a47cc2541abf8722677727859ac2977d145645a317eb01254d248ee4e7dde5162edb131f435a0102b7a1a853fbe0cbd2d SHA512 e08e2470968a83cef9a8f225dcf316e00db231a4ce2f43dec93894735dbef3e8571d08b5c569bfb5888017e1d9b3ae91f56b8f69b7542f6503d53120c58b105d
-EBUILD putty-0.77-r2.ebuild 1833 BLAKE2B 2c313d776ca2e47434121b814edc51fdd3e913e951462f7d9941f174e1a0b622cd912ec25a7d06415cb3ba38d4fde1fefe20194e66b5c59ce17a790f3ff99b99 SHA512 7520d4c7c4a6c6e4ba0f02f41b98fe52fd7bf99b74b367f1e3b75176ef0aa6521ce189ee53aaea2ac8230977386679f6b9783b4ca79fece1e08e7df0f72b1cea
+EBUILD putty-0.77-r2.ebuild 1832 BLAKE2B bfe643ae7e8bc7979ecacf17fa3596fe653c704d2b14383802fe04457463bbaa1d9d0b8d4eea028868020d63bb2e0f41da6b60517dfb71ff4685d7d1fff240e6 SHA512 17b049539bac24b43820efa6ff473d8c00dddef40ba6338973c7bd2b498b56276c07ece2852103ffa466985790f3390c5faae88f6e63be6ca67ad8025524e1ed
 EBUILD putty-9999.ebuild 1851 BLAKE2B 81beaf794457204d0e8cd5c54d11b61a47cc2541abf8722677727859ac2977d145645a317eb01254d248ee4e7dde5162edb131f435a0102b7a1a853fbe0cbd2d SHA512 e08e2470968a83cef9a8f225dcf316e00db231a4ce2f43dec93894735dbef3e8571d08b5c569bfb5888017e1d9b3ae91f56b8f69b7542f6503d53120c58b105d
 MISC metadata.xml 1007 BLAKE2B 358ab09685c2020a9d0bd49a7c4845cf3b0f31776d7ad9d11c99b70b325b9d902bad73690e68aa991b0123a3a720eb55f50d07f6df35e7142ddddb5146b92ed8 SHA512 45ed3f5781db722328f6101496538c2d920c6cfe5f9422ba838e4d723b9ca53ad2fa783a6c0dd36557e7d0008071d7886bd7e5f1ca76e1b83465a6312c01d772
diff --git a/net-misc/putty/putty-0.77-r2.ebuild b/net-misc/putty/putty-0.77-r2.ebuild
index ce957b00b8da..db09be43b8d9 100644
--- a/net-misc/putty/putty-0.77-r2.ebuild
+++ b/net-misc/putty/putty-0.77-r2.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://git.tartarus.org/simon/putty.git"
 else
 	SRC_URI+=" https://the.earth.li/~sgtatham/${PN}/${PV}/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86"
+	KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ppc ~ppc64 sparc x86"
 fi
 LICENSE="MIT"
 
diff --git a/net-misc/rsync/Manifest b/net-misc/rsync/Manifest
index f5ebfacb1b7c..12d761e42b12 100644
--- a/net-misc/rsync/Manifest
+++ b/net-misc/rsync/Manifest
@@ -10,8 +10,11 @@ DIST rsync-3.2.4.tar.gz 1114853 BLAKE2B a67fcb9619874f1c5346a876138e59f4bf508a90
 DIST rsync-3.2.4.tar.gz.asc 195 BLAKE2B 9bc2fbd59e5396a91de82f27a461367ad2a129820e2d1926c3b1e26dacf93c676a7231f186c341b6dec9c764a9619b504bc9b5f95925982e78de4607eddf6c65 SHA512 7e1bbebc777d5710345fdec1efd4c2ef1079d6c0ec90272a1a4a51a59ae3cb619b9d1c0ae2f337ecdd06827bb3536b969b6f21f9108f8d21114713aa1750012b
 DIST rsync-3.2.5.tar.gz 1129957 BLAKE2B a0d1c4a2dbebe37bad4f6e2e5e4fae41c53529d96e0ca5a429d29d1dee8c63c8ee1b7dc686b732a88049c547271260e8361ac798673970d5327d08dda01ce811 SHA512 6d115acb5bae546cd2b5df2c11390f8609107b7a45aa649158d8daa0c9290ab5f15640fdd4000b21d1ab39f7385b85d77cd8fe4628fa13b2adeea6fcd53d057a
 DIST rsync-3.2.5.tar.gz.asc 195 BLAKE2B 9ca9034afc39299c2178190412b188f561d274d8e38d58a988487f2db14a8135840acf3413096d26f080358b69779fa3b48e292670ba6b23ae4eb0c05f9df614 SHA512 b384f48b2fd459a51715c8ab2a14e540c5fa7f7f12453282db770893d6121b1b3c9809e667ccacaf910fd90548abeb700a2c717d76fbea22fe3d6a22aa6b2c44
+DIST rsync-3.2.6.tar.gz 1138593 BLAKE2B fa0c4aa9cdffbc9ffd4f81e8c3cdc1fda7080f80c1923084c6d705e6872caaba31c13de4603c9462f312dbbdae76520c27d3f4f40b327f1e66c7127b1d05ea73 SHA512 d141d04732c91e055708e8d1f14b976f9483208a93076bb66dc75cbf87d54f2dcbffc11423f0c9c005d2d4e20cb9c147a7672f7a9c0b987f4e2c39b4c3645cfe
+DIST rsync-3.2.6.tar.gz.asc 195 BLAKE2B 945c60ca67aa4234bc9d5b38c9228125f3040bccecf60c08892286c1b4fa32878d92bfc78ee664d4f6453ccaaf6d394dbe203f0a8be149e557fabede1c111b07 SHA512 1316b358dfa87ad7c35b2b5d11e0be111a182041150cf9c9ae30f73e0af1430a59136250dc853f784e9e80d0ee20cc46e9a34b07cc7c7a48040db168a8c8941b
 EBUILD rsync-3.2.4-r1.ebuild 4489 BLAKE2B d13cc511cb1c48c11dfce0df382a0e3baf107ffeddc6d8204debf64c2a15aa97f970a0e4a59b33f71d3e98ad42913ece4ffe576e653a985d9e3391b61419896b SHA512 bdb098101abe7ef32e23b8658f56718cfb00ca3acf273bf590a21edd80e1e54bdeee6169e4a55af4d6e9c94d00233f9e3dbbe970e48bc9d21da5a9479863df73
 EBUILD rsync-3.2.4-r3.ebuild 4766 BLAKE2B 2c5a0c4bd2f5f600cec463fe3d5a41cd4f9908ec5ead8e19a52a29108ad25be43cb6da3eb3f04fb0aafb9efb0bcc33e66d6b6f3450ce59a922d21db533d5f87d SHA512 482dee5328c886e9103a4d0a7d05e7bb258f12093f2dd530eef427714dd7f80ffbff821c4104783c066a7178efbe46da7d86101d74fb094c46f32ee411db22d2
 EBUILD rsync-3.2.5-r1.ebuild 4569 BLAKE2B 39e55ad37ad47876ae60b763004fa46dc03141833c3e7b4e24d2ef9fe76276c638f9e45c07f5dc4c2ba9f38d3bfa1657e3e17e1ea388d3606fef32bc5f99c76d SHA512 8a204dec65919da949bb9f341beb4a2b671c8ba3f80bbe775df01faef170682542f8bbb9c3f08b4649ddcd4be82f5cd81e77b64d768ccc0abcdbfdb31377662f
+EBUILD rsync-3.2.6.ebuild 4515 BLAKE2B 89f5ad14e0dd506830dae96014566274a70b09b8d66215174dbe15c609075e2cdb179f83b20acde4170bd0c9b2707fa1e9b81a5bd6792d7913f60c5ece06532e SHA512 ebf536d851b3da99859f080e322147ac3438e90b06ea01148698bd22b4269ba4ccd84fc8b7217188010ab8e20ce3f92ff86a245de4aa7013ba500a93b620faf8
 EBUILD rsync-9999.ebuild 4515 BLAKE2B 89f5ad14e0dd506830dae96014566274a70b09b8d66215174dbe15c609075e2cdb179f83b20acde4170bd0c9b2707fa1e9b81a5bd6792d7913f60c5ece06532e SHA512 ebf536d851b3da99859f080e322147ac3438e90b06ea01148698bd22b4269ba4ccd84fc8b7217188010ab8e20ce3f92ff86a245de4aa7013ba500a93b620faf8
 MISC metadata.xml 718 BLAKE2B ba88a2f622a0af1d21fbef7dae30d034959c3a7527fb2a155867eeddad2641875212ad31baa39236dd980ee14d76ad5b826491cd32c6eb1059f6647e81d00e6f SHA512 06fd22f9f5c40abd1f3b524614dadaf8c13f2477b7f3201232c4d928020b7faf3ea2d70389c668c01323e2ed15b40a0ebe76ee89a60072474ee3283692d62c7e
diff --git a/net-misc/rsync/rsync-3.2.6.ebuild b/net-misc/rsync/rsync-3.2.6.ebuild
new file mode 100644
index 000000000000..804909ae11e6
--- /dev/null
+++ b/net-misc/rsync/rsync-3.2.6.ebuild
@@ -0,0 +1,167 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Uncomment when introducing a patch which touches configure
+#RSYNC_NEEDS_AUTOCONF=1
+PYTHON_COMPAT=( python3_{8..10} )
+inherit prefix python-single-r1 systemd
+
+DESCRIPTION="File transfer program to keep remote files into sync"
+HOMEPAGE="https://rsync.samba.org/"
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/WayneD/rsync.git"
+	inherit autotools git-r3
+
+	REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+else
+	VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/waynedavison.asc
+	inherit verify-sig
+
+	if [[ -n ${RSYNC_NEEDS_AUTOCONF} ]] ; then
+		inherit autotools
+	fi
+
+	if [[ ${PV} == *_pre* ]] ; then
+		SRC_DIR="src-previews"
+	else
+		SRC_DIR="src"
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	fi
+
+	SRC_URI="https://rsync.samba.org/ftp/rsync/${SRC_DIR}/${P/_/}.tar.gz
+		verify-sig? ( https://rsync.samba.org/ftp/rsync/${SRC_DIR}/${P/_/}.tar.gz.asc )"
+	S="${WORKDIR}"/${P/_/}
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="acl examples iconv lz4 ssl stunnel system-zlib xattr xxhash zstd"
+REQUIRED_USE+=" examples? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	>=dev-libs/popt-1.5
+	acl? ( virtual/acl )
+	examples? (
+		${PYTHON_DEPS}
+		dev-lang/perl
+	)
+	lz4? ( app-arch/lz4:= )
+	ssl? ( dev-libs/openssl:= )
+	system-zlib? ( sys-libs/zlib )
+	xattr? ( kernel_linux? ( sys-apps/attr ) )
+	xxhash? ( >=dev-libs/xxhash-0.8 )
+	zstd? ( >=app-arch/zstd-1.4:= )
+	iconv? ( virtual/libiconv )"
+DEPEND="${RDEPEND}"
+BDEPEND="examples? ( ${PYTHON_DEPS} )"
+
+if [[ ${PV} == *9999 ]] ; then
+	BDEPEND+=" ${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-python/commonmark[${PYTHON_USEDEP}]
+		')"
+else
+	BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-waynedavison )"
+fi
+
+pkg_setup() {
+	# - USE=examples needs Python itself at runtime, but nothing else
+	# - 9999 needs commonmark at build time
+	if [[ ${PV} == *9999 ]] || use examples ; then
+		python-single-r1_pkg_setup
+	fi
+}
+
+src_prepare() {
+	default
+
+	if [[ ${PV} == *9999 || -n ${RSYNC_NEEDS_AUTOCONF} ]] ; then
+		eaclocal -I m4
+		eautoconf -o configure.sh
+		eautoheader && touch config.h.in
+	fi
+}
+
+src_configure() {
+	local myeconfargs=(
+		--with-rsyncd-conf="${EPREFIX}"/etc/rsyncd.conf
+		--without-included-popt
+		--enable-ipv6
+		$(use_enable acl acl-support)
+		$(use_enable iconv)
+		$(use_enable lz4)
+		$(use_enable ssl openssl)
+		$(use_with !system-zlib included-zlib)
+		$(use_enable xattr xattr-support)
+		$(use_enable xxhash)
+		$(use_enable zstd)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	newconfd "${FILESDIR}"/rsyncd.conf.d rsyncd
+	newinitd "${FILESDIR}"/rsyncd.init.d-r1 rsyncd
+
+	dodoc NEWS.md README.md TODO tech_report.tex
+
+	insinto /etc
+	newins "${FILESDIR}"/rsyncd.conf-3.0.9-r1 rsyncd.conf
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/rsyncd.logrotate rsyncd
+
+	insinto /etc/xinetd.d
+	newins "${FILESDIR}"/rsyncd.xinetd-3.0.9-r1 rsyncd
+
+	# Install stunnel helpers
+	if use stunnel ; then
+		emake DESTDIR="${D}" install-ssl-daemon
+	fi
+
+	# Install the useful contrib scripts
+	if use examples ; then
+		python_fix_shebang support/
+
+		exeinto /usr/share/rsync
+		doexe support/*
+
+		rm -f "${ED}"/usr/share/rsync/{Makefile*,*.c}
+	fi
+
+	eprefixify "${ED}"/etc/{,xinetd.d}/rsyncd*
+
+	systemd_newunit packaging/systemd/rsync.service rsyncd.service
+}
+
+pkg_postinst() {
+	if grep -Eqis '^[[:space:]]use chroot[[:space:]]*=[[:space:]]*(no|0|false)' \
+		"${EROOT}"/etc/rsyncd.conf "${EROOT}"/etc/rsync/rsyncd.conf ; then
+		ewarn "You have disabled chroot support in your rsyncd.conf.  This"
+		ewarn "is a security risk which you should fix.  Please check your"
+		ewarn "/etc/rsyncd.conf file and fix the setting 'use chroot'."
+	fi
+
+	if use stunnel ; then
+		einfo "Please install \">=net-misc/stunnel-4\" in order to use stunnel feature."
+		einfo
+		einfo "You maybe have to update the certificates configured in"
+		einfo "${EROOT}/etc/stunnel/rsync.conf"
+	fi
+
+	if use system-zlib ; then
+		ewarn "Using system-zlib is incompatible with <rsync-3.1.1 when"
+		ewarn "using the --compress option."
+		ewarn
+		ewarn "When syncing with >=rsync-3.1.1 built with bundled zlib,"
+		ewarn "and the --compress option, add --new-compress (-zz)."
+		ewarn
+		ewarn "For syncing the portage tree, add:"
+		ewarn "PORTAGE_RSYNC_EXTRA_OPTS=\"--new-compress\" to make.conf"
+	fi
+}
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index b28a88dd446c..4f5ef1e09796 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/features/clang/make.defaults b/profiles/features/clang/make.defaults
index 09d9b31dbb3e..ad06c1d9333f 100644
--- a/profiles/features/clang/make.defaults
+++ b/profiles/features/clang/make.defaults
@@ -29,7 +29,8 @@ LDFLAGS="${LDFLAGS} ${SOME_HARDENING_LDFLAGS}"
 
 # use LLVM-provided binutils
 AR="llvm-ar"
-AS="llvm-as"
+AS="clang -c"
+CPP="clang-cpp"
 NM="llvm-nm"
 STRIP="llvm-strip"
 RANLIB="llvm-ranlib"
diff --git a/profiles/features/selinux/package.use.mask b/profiles/features/selinux/package.use.mask
index dfab82971fbd..6b42b7f76eb7 100644
--- a/profiles/features/selinux/package.use.mask
+++ b/profiles/features/selinux/package.use.mask
@@ -1,19 +1,6 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Georgy Yakovlev <gyakovlev@gentoo.org> (2020-10-21)
-# requires systemd, as OpenBMC uses sd-dbus for communication
-sys-apps/ipmitool openbmc
-
-# Jeroen Roovers <jer@gentoo.org> (2019-02-23)
-# sdjournal links against sys-apps/systemd's libraries
-net-analyzer/wireshark sdjournal
-
-# Jason Zaman <perfinion@gentoo.org> (2015-06-27)
-# systemd has only experimental support in the SELinux policy at the moment.
-# Please see: https://wiki.gentoo.org/wiki/SELinux/FAQ#Can_I_use_SELinux_with_SystemD.3F
-www-servers/uwsgi uwsgi_plugins_systemd_logger
-
 # Brian Dolbec <dolsen@gentoo.org> (2014-09-17)
 # mask pypy for several utilities due to incompatibility with libselinux
 sys-apps/portage python_targets_pypy3
diff --git a/profiles/updates/3Q-2022 b/profiles/updates/3Q-2022
index 91742f7d8e70..1a0a8ac65926 100644
--- a/profiles/updates/3Q-2022
+++ b/profiles/updates/3Q-2022
@@ -13,3 +13,4 @@ move dev-python/PyQt6_sip dev-python/PyQt6-sip
 move dev-python/PyQt6_WebEngine dev-python/PyQt6-WebEngine
 move net-p2p/go-ipfs net-p2p/kubo
 move app-admin/ansible-base app-admin/ansible-core
+slotmove =dev-ruby/rack-test-2.0.2 1.0 2
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 7f1d28a56487..db8efa795b68 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/dbus/Manifest b/sys-apps/dbus/Manifest
index 6be00e98ba4e..83b63253aeb2 100644
--- a/sys-apps/dbus/Manifest
+++ b/sys-apps/dbus/Manifest
@@ -6,11 +6,8 @@ AUX dbus-1.14.0-x-autoconf-fixes.patch 5171 BLAKE2B 6b7453397e467da695b3efd70e53
 AUX dbus-daemon-optional.patch 2701 BLAKE2B 28054bf147ffc29d893017dd9b8a6c9b3a032c31ec1860c38c7a54910b3fe8da2a9bce175d01fab1c224008ba38e1981dfc161fde80f725096e644495740052e SHA512 6d07220d8c80c49057396dc76d808cad2c995cce259544e8435d0c8fe328f85ac3a7da5a88209f80a127a04b48591ac20fe661683665adca2af75fedd2563bf2
 AUX dbus-enable-elogind.patch 2801 BLAKE2B c9ef41ff7b31af6cbaf28ca16974fb62aa0f2492f1c6970b41216758768d1139d2ce9aabbb3aff952d625b0decd1e8c2b25f79bb0a13c146aa9453dd4f7b5c5a SHA512 84c5eacc9c305ce1fa9f7a50407b7e836a20c679273cef06004ff57665c27818d2c33e0cfa9ea91ae89c50da4f7b9a92077e607f0f17b9300892d16e881a7d9a
 AUX dbus.initd.in 841 BLAKE2B 7df68814224e066e6356ec30215cf76507c4c1d0b0fed7e97339cba680f7a6f4628b71ca5660f9bc2c0efde75b9a083c08b121d186fd7900b3dea0443a7c0760 SHA512 6bc5bf619369448a221e4eb7c5af421b7610d9488f0409cf1847539b94bc2554238a8e53a60432d7ef60f9b812a3efb0b2ae2ca2544b6ed77b845ec0f5ba1a21
-DIST dbus-1.12.20.tar.gz 2095511 BLAKE2B b467526e7e0281db7b8c7c178469fe006dab29ccb1ea197c02495bd297e8de766230b68ed86c4a7e05dbe09ca30ce941a15e0bf8030fe0df66c04febf0534b3b SHA512 0964683bc6859374cc94e42e1ec0cdb542cca67971c205fcba4352500b6c0891665b0718e7d85eb060c81cb82e3346c313892bc02384da300ddd306c7eef0056
 DIST dbus-1.12.22.tar.gz 2108231 BLAKE2B 40c30ad9e48d8ac6b5f1c67726015eb17cb3501372ef2c8ffcd8ad73e4a2f186b80a7bbba094460d4093d1d0a3f1bbb8d83a27724397a8f5312bb8542237e6b7 SHA512 0a716022f9d693fcaf871b6dfb5f242b49a8dd05d3316ec3e530f5129f1d81a2fa9caec795fa62cfdcba6ed21549fdd2f896f9bf1cc9a96e2a7d04f2c7ec7be6
 DIST dbus-1.14.0.tar.xz 1360228 BLAKE2B ae0ebc2779e840e2d83f633029f81fba0e35969648dddce0280640dd9bee3f9508aa7fb6aef696d1c4c56d40f91b754941f847525afaee5cc3170ad23a7eddbf SHA512 9bf17a3ebb3cf44722c6fbf24ee56e9dc14d6882fc312f26c7f07459d969424bc2fb63a229139e011804ecc479a8f0eb1a0c83286f8d5a664c5979d12634179f
-EBUILD dbus-1.12.20-r5.ebuild 7556 BLAKE2B c84cbaa05ea704e11ce4e4a30d49aab696be711c19ed1420aaabeac5e8032b122b2d5fe31ccdfff3c0348bc1100f4eb248777c92d06d83214910eb759c62d2f3 SHA512 83dae4eafd70d47f560092491ebcc024230e346c77db199346464b5cff91fc58ba08c7c7491c0c1240538cb9b7b8489179fe70e17bcb2d8b797d54e7d0d0fc32
 EBUILD dbus-1.12.22-r2.ebuild 7681 BLAKE2B 126c3b7802a3ae3d1e3f928e33249f731f43bb1ad40f4992e645b727cc35e0836bd382810ef97b9f594a7db13bfa602ea13ed7c8da8c376fb9ebccc6c0ff2f47 SHA512 db95a5f1ddb86ad4657cef1e108b429976517961c374213d9b4fb158d65568bd71c1d4a67b53b6548c4349a8ed67e0ae1d7bed547678a97ef85b4db7f9b7f97c
-EBUILD dbus-1.14.0-r2.ebuild 7905 BLAKE2B 8a68a64871afd716c57be3c8d13c18e9eeab2405b716daa913e9e723d062c2bde528f73ebf2b8e6e545b038a6108e7d08ac0f5f755590991cd399d619c484d5f SHA512 f7189dca552c555bcfe8ea1e42c0f84435a36418bc2d22f803b0d2da79ff9417cd568cce4e3d068eb339de2fbc070af6eefe7b311faa0c6cd4db45327d10f13d
 EBUILD dbus-1.14.0-r4.ebuild 7886 BLAKE2B 5a40cdda99f78c9a7a4d65130582960d37537bcf4c33f2a4de99331a254e297f8dface9c8bdd10d1875c48d9d78d8c88dfd0a7bf63515ce5ca01a92e0fba2824 SHA512 13023462e662c0fb261e26a61d450aa6a166d665cca12b9b33addb5effb77c635b54601952b01df456c402bd3f7fd8a047b9b591994e68fd607ff44c05d7206f
 MISC metadata.xml 501 BLAKE2B 7a39c6df0072e46a515e88bbf4023713826167924dda328657fc36f169f4918f92ef59127c435055d942018b6370c47d55fa288ccd6a88414e86e6fab65a0751 SHA512 b750d80e9c8a8cad6eb42952d72fd65868e69ab686a5bfc95896b1734960dab4975ff14b6c44637c0c9b80b76a55f826f2d86f6dfa4f075449a2660fbb85a79e
diff --git a/sys-apps/dbus/dbus-1.12.20-r5.ebuild b/sys-apps/dbus/dbus-1.12.20-r5.ebuild
deleted file mode 100644
index a60671c3d11e..000000000000
--- a/sys-apps/dbus/dbus-1.12.20-r5.ebuild
+++ /dev/null
@@ -1,284 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
-TMPFILES_OPTIONAL=1
-
-inherit autotools flag-o-matic linux-info python-any-r1 readme.gentoo-r1 systemd tmpfiles virtualx multilib-minimal
-
-DESCRIPTION="A message bus system, a simple way for applications to talk to each other"
-HOMEPAGE="https://dbus.freedesktop.org/"
-SRC_URI="https://dbus.freedesktop.org/releases/dbus/${P}.tar.gz"
-
-LICENSE="|| ( AFL-2.1 GPL-2 )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug doc elogind selinux static-libs systemd test X"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="?? ( elogind systemd )"
-
-BDEPEND="
-	acct-user/messagebus
-	app-text/xmlto
-	app-text/docbook-xml-dtd:4.4
-	sys-devel/autoconf-archive
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-"
-COMMON_DEPEND="
-	>=dev-libs/expat-2.1.0
-	elogind? ( sys-auth/elogind )
-	selinux? ( sys-libs/libselinux )
-	systemd? ( sys-apps/systemd:0= )
-	X? (
-		x11-libs/libX11
-		x11-libs/libXt
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/expat
-	test? (
-		${PYTHON_DEPS}
-		>=dev-libs/glib-2.40:2
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	acct-user/messagebus
-	selinux? ( sec-policy/selinux-dbus )
-	systemd? ( virtual/tmpfiles )
-	X? ( sys-apps/which )
-"
-
-DOC_CONTENTS="
-	Some applications require a session bus in addition to the system
-	bus. Please see \`man dbus-launch\` for more information.
-"
-
-# out of sources build dir for make check
-TBD="${WORKDIR}/${P}-tests-build"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-enable-elogind.patch"
-	"${FILESDIR}/${PN}-daemon-optional.patch" # bug #653136
-)
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-
-	if use kernel_linux; then
-		CONFIG_CHECK="~EPOLL"
-		linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	# Tests were restricted because of this
-	sed -i \
-		-e 's/.*bus_dispatch_test.*/printf ("Disabled due to excess noise\\n");/' \
-		-e '/"dispatch"/d' \
-		bus/test-main.c || die
-
-	default
-
-	if [[ ${CHOST} == *-solaris* ]]; then
-		# fix standards conflict, due to gcc being c99 by default nowadays
-		sed -i \
-			-e 's/_XOPEN_SOURCE=500/_XOPEN_SOURCE=600/' \
-			configure.ac || die
-	fi
-
-	# required for bug 263909, cross-compile so don't remove eautoreconf
-	eautoreconf
-}
-
-src_configure() {
-	local rundir=$(usex kernel_linux /run /var/run)
-	sed -e "s;@rundir@;${EPREFIX}${rundir};g" "${FILESDIR}"/dbus.initd.in \
-		> "${T}"/dbus.initd || die
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local docconf myconf testconf
-
-	# so we can get backtraces from apps
-	case ${CHOST} in
-		*-mingw*)
-			# error: unrecognized command line option '-rdynamic' wrt #488036
-			;;
-		*)
-			append-flags -rdynamic
-			;;
-	esac
-
-	# libaudit is *only* used in DBus wrt SELinux support, so disable it, if
-	# not on an SELinux profile.
-	myconf=(
-		--localstatedir="${EPREFIX}/var"
-		$(use_enable static-libs static)
-		$(use_enable debug verbose-mode)
-		--disable-asserts
-		--disable-checks
-		$(use_enable selinux)
-		$(use_enable selinux libaudit)
-		--disable-apparmor
-		$(use_enable kernel_linux inotify)
-		--disable-kqueue
-		$(use_enable elogind)
-		$(use_enable systemd)
-		$(use_enable systemd user-session)
-		--disable-embedded-tests
-		--disable-modular-tests
-		$(use_enable debug stats)
-		--with-session-socket-dir="${EPREFIX}"/tmp
-		--with-system-pid-file="${EPREFIX}${rundir}"/dbus.pid
-		--with-system-socket="${EPREFIX}${rundir}"/dbus/system_bus_socket
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-		--with-systemduserunitdir="$(systemd_get_userunitdir)"
-		--with-dbus-user=messagebus
-		$(use_with X x)
-	)
-
-	if [[ ${CHOST} == *-darwin* ]]; then
-		myconf+=(
-			--enable-launchd
-			--with-launchd-agent-dir="${EPREFIX}"/Library/LaunchAgents
-		)
-	fi
-
-	if multilib_is_native_abi; then
-		docconf=(
-			--enable-xml-docs
-			$(use_enable doc doxygen-docs)
-		)
-	else
-		docconf=(
-			--disable-xml-docs
-			--disable-doxygen-docs
-		)
-		myconf+=(
-			--disable-daemon
-			--disable-selinux
-			--disable-libaudit
-			--disable-elogind
-			--disable-systemd
-			--without-x
-		)
-	fi
-
-	einfo "Running configure in ${BUILD_DIR}"
-	ECONF_SOURCE="${S}" econf "${myconf[@]}" "${docconf[@]}"
-
-	if multilib_is_native_abi && use test; then
-		mkdir "${TBD}" || die
-		cd "${TBD}" || die
-		testconf=(
-			$(use_enable test asserts)
-			$(use_enable test checks)
-			$(use_enable test embedded-tests)
-			$(use_enable test stats)
-			$(has_version dev-libs/dbus-glib && echo --enable-modular-tests)
-		)
-		einfo "Running configure in ${TBD}"
-		ECONF_SOURCE="${S}" econf "${myconf[@]}" "${testconf[@]}"
-	fi
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi; then
-		# after the compile, it uses a selinuxfs interface to
-		# check if the SELinux policy has the right support
-		use selinux && addwrite /selinux/access
-
-		einfo "Running make in ${BUILD_DIR}"
-		emake
-
-		if use test; then
-			einfo "Running make in ${TBD}"
-			emake -C "${TBD}"
-		fi
-	else
-		emake -C dbus libdbus-1.la
-	fi
-}
-
-src_test() {
-	DBUS_VERBOSE=1 virtx emake -j1 -C "${TBD}" check
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		emake DESTDIR="${D}" install
-	else
-		emake DESTDIR="${D}" install-pkgconfigDATA
-		emake DESTDIR="${D}" -C dbus \
-			install-libLTLIBRARIES install-dbusincludeHEADERS \
-			install-nodist_dbusarchincludeHEADERS
-	fi
-}
-
-multilib_src_install_all() {
-	newinitd "${T}"/dbus.initd dbus
-
-	if use X; then
-		# dbus X session script (#77504)
-		# turns out to only work for GDM (and startx). has been merged into
-		# other desktop (kdm and such scripts)
-		exeinto /etc/X11/xinit/xinitrc.d
-		doexe "${FILESDIR}"/80-dbus
-	fi
-
-	# needs to exist for dbus sessions to launch
-	keepdir /usr/share/dbus-1/services
-	keepdir /etc/dbus-1/{session,system}.d
-	# machine-id symlink from pkg_postinst()
-	keepdir /var/lib/dbus
-	# let the init script create the /var/run/dbus directory
-	rm -rf "${ED}"/var/run
-
-	# https://bugs.gentoo.org/761763
-	rm -rf "${ED}"/usr/lib/sysusers.d
-
-	dodoc AUTHORS ChangeLog NEWS README doc/TODO
-	readme.gentoo_create_doc
-
-	find "${ED}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-
-	if use systemd; then
-		tmpfiles_process dbus.conf
-	fi
-
-	# Ensure unique id is generated and put it in /etc wrt #370451 but symlink
-	# for DBUS_MACHINE_UUID_FILE (see tools/dbus-launch.c) and reverse
-	# dependencies with hardcoded paths (although the known ones got fixed already)
-	# TODO: should be safe to remove at least the ln because of the above tmpfiles_process?
-	dbus-uuidgen --ensure="${EROOT}"/etc/machine-id
-	ln -sf "${EPREFIX}"/etc/machine-id "${EROOT}"/var/lib/dbus/machine-id
-
-	if [[ ${CHOST} == *-darwin* ]]; then
-		local plist="org.freedesktop.dbus-session.plist"
-		elog
-		elog
-		elog "For MacOS/Darwin we now ship launchd support for dbus."
-		elog "This enables autolaunch of dbus at session login and makes"
-		elog "dbus usable under MacOS/Darwin."
-		elog
-		elog "The launchd plist file ${plist} has been"
-		elog "installed in ${EPREFIX}/Library/LaunchAgents."
-		elog "For it to be used, you will have to do all of the following:"
-		elog " + cd ~/Library/LaunchAgents"
-		elog " + ln -s ${EPREFIX}/Library/LaunchAgents/${plist}"
-		elog " + logout and log back in"
-		elog
-		elog "If your application needs a proper DBUS_SESSION_BUS_ADDRESS"
-		elog "specified and refused to start otherwise, then export the"
-		elog "the following to your environment:"
-		elog " DBUS_SESSION_BUS_ADDRESS=\"launchd:env=DBUS_LAUNCHD_SESSION_BUS_SOCKET\""
-	fi
-}
diff --git a/sys-apps/dbus/dbus-1.14.0-r2.ebuild b/sys-apps/dbus/dbus-1.14.0-r2.ebuild
deleted file mode 100644
index eb763dd3481c..000000000000
--- a/sys-apps/dbus/dbus-1.14.0-r2.ebuild
+++ /dev/null
@@ -1,293 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-TMPFILES_OPTIONAL=1
-
-# At least at the moment, while a CMake port exists, it's not recommended
-# for distributions.
-# https://gitlab.freedesktop.org/dbus/dbus/-/blob/master/CONTRIBUTING.md#L189
-inherit autotools flag-o-matic linux-info python-any-r1 readme.gentoo-r1 systemd tmpfiles virtualx multilib-minimal
-
-DESCRIPTION="A message bus system, a simple way for applications to talk to each other"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/dbus/"
-SRC_URI="https://dbus.freedesktop.org/releases/dbus/${P}.tar.xz"
-
-LICENSE="|| ( AFL-2.1 GPL-2 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug doc elogind selinux static-libs systemd test X"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="?? ( elogind systemd )"
-
-BDEPEND="
-	acct-user/messagebus
-	app-text/xmlto
-	app-text/docbook-xml-dtd:4.4
-	sys-devel/autoconf-archive
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-"
-COMMON_DEPEND="
-	>=dev-libs/expat-2.1.0
-	elogind? ( sys-auth/elogind )
-	selinux? ( sys-libs/libselinux )
-	systemd? ( sys-apps/systemd:0= )
-	X? (
-		x11-libs/libX11
-		x11-libs/libXt
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/expat
-	test? (
-		${PYTHON_DEPS}
-		>=dev-libs/glib-2.40:2
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	acct-user/messagebus
-	selinux? ( sec-policy/selinux-dbus )
-	systemd? ( virtual/tmpfiles )
-	X? ( sys-apps/which )
-"
-
-DOC_CONTENTS="
-	Some applications require a session bus in addition to the system
-	bus. Please see \`man dbus-launch\` for more information.
-"
-
-# out of sources build dir for make check
-TBD="${WORKDIR}/${P}-tests-build"
-
-PATCHES=(
-	"${FILESDIR}/dbus-enable-elogind.patch"
-	"${FILESDIR}/dbus-daemon-optional.patch" # bug #653136
-
-	"${FILESDIR}/dbus-1.14.0-x-autoconf-fixes.patch"
-	"${FILESDIR}/dbus-1.12.22-check-fd.patch"
-
-	# https://bugs.gentoo.org/836560
-	"${FILESDIR}/dbus-1.14.0-oom_score_adj.patch"
-)
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-
-	if use kernel_linux; then
-		CONFIG_CHECK="~EPOLL"
-		linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	default
-
-	if [[ ${CHOST} == *-solaris* ]]; then
-		# fix standards conflict, due to gcc being c99 by default nowadays
-		sed -i \
-			-e 's/_XOPEN_SOURCE=500/_XOPEN_SOURCE=600/' \
-			configure.ac || die
-	fi
-
-	# required for bug #263909, cross-compile so don't remove eautoreconf
-	eautoreconf
-}
-
-src_configure() {
-	local rundir=$(usex kernel_linux /run /var/run)
-
-	sed -e "s;@rundir@;${EPREFIX}${rundir};g" "${FILESDIR}"/dbus.initd.in \
-		> "${T}"/dbus.initd || die
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local docconf myconf testconf
-
-	# so we can get backtraces from apps
-	case ${CHOST} in
-		*-mingw*)
-			# error: unrecognized command line option '-rdynamic', bug #488036
-			;;
-		*)
-			append-flags -rdynamic
-			;;
-	esac
-
-	# libaudit is *only* used in DBus wrt SELinux support, so disable it, if
-	# not on an SELinux profile.
-	myconf=(
-		--localstatedir="${EPREFIX}/var"
-		$(use_enable static-libs static)
-		$(use_enable debug verbose-mode)
-		--disable-asserts
-		--disable-checks
-		$(use_enable selinux)
-		$(use_enable selinux libaudit)
-		--disable-apparmor
-		$(use_enable kernel_linux inotify)
-		--disable-kqueue
-		$(use_enable elogind)
-		$(use_enable systemd)
-		$(use_enable systemd user-session)
-		--disable-embedded-tests
-		--disable-modular-tests
-		$(use_enable debug stats)
-		--with-session-socket-dir="${EPREFIX}"/tmp
-		--with-system-pid-file="${EPREFIX}${rundir}"/dbus.pid
-		--with-system-socket="${EPREFIX}${rundir}"/dbus/system_bus_socket
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-		--with-systemduserunitdir="$(systemd_get_userunitdir)"
-		--with-dbus-user=messagebus
-		$(use_with X x)
-	)
-
-	if [[ ${CHOST} == *-darwin* ]]; then
-		myconf+=(
-			--enable-launchd
-			--with-launchd-agent-dir="${EPREFIX}"/Library/LaunchAgents
-		)
-	fi
-
-	if multilib_is_native_abi; then
-		docconf=(
-			--enable-xml-docs
-			$(use_enable doc doxygen-docs)
-		)
-	else
-		docconf=(
-			--disable-xml-docs
-			--disable-doxygen-docs
-		)
-		myconf+=(
-			--disable-daemon
-			--disable-selinux
-			--disable-libaudit
-			--disable-elogind
-			--disable-systemd
-			--without-x
-		)
-	fi
-
-	einfo "Running configure in ${BUILD_DIR}"
-	ECONF_SOURCE="${S}" econf "${myconf[@]}" "${docconf[@]}"
-
-	if multilib_is_native_abi && use test; then
-		mkdir "${TBD}" || die
-		cd "${TBD}" || die
-		testconf=(
-			$(use_enable test asserts)
-			$(use_enable test checks)
-			$(use_enable test embedded-tests)
-			$(use_enable test stats)
-			$(has_version dev-libs/dbus-glib && echo --enable-modular-tests)
-		)
-		einfo "Running configure in ${TBD}"
-		ECONF_SOURCE="${S}" econf "${myconf[@]}" "${testconf[@]}"
-	fi
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi; then
-		# After the compile, it uses a selinuxfs interface to
-		# check if the SELinux policy has the right support
-		use selinux && addwrite /selinux/access
-
-		einfo "Running make in ${BUILD_DIR}"
-		emake
-
-		if use test; then
-			einfo "Running make in ${TBD}"
-			emake -C "${TBD}"
-		fi
-	else
-		emake -C dbus libdbus-1.la
-	fi
-}
-
-src_test() {
-	# DBUS_TEST_MALLOC_FAILURES=0 to avoid huge test logs
-	# https://gitlab.freedesktop.org/dbus/dbus/-/blob/master/CONTRIBUTING.md#L231
-	DBUS_TEST_MALLOC_FAILURES=0 DBUS_VERBOSE=1 virtx emake -j1 -C "${TBD}" check
-
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		emake DESTDIR="${D}" install
-	else
-		emake DESTDIR="${D}" install-pkgconfigDATA
-		emake DESTDIR="${D}" -C dbus \
-			install-libLTLIBRARIES install-dbusincludeHEADERS \
-			install-nodist_dbusarchincludeHEADERS
-	fi
-}
-
-multilib_src_install_all() {
-	newinitd "${T}"/dbus.initd dbus
-
-	if use X; then
-		# dbus X session script (bug #77504)
-		# turns out to only work for GDM (and startx). has been merged into
-		# other desktop (kdm and such scripts)
-		exeinto /etc/X11/xinit/xinitrc.d
-		doexe "${FILESDIR}"/80-dbus
-	fi
-
-	# Needs to exist for dbus sessions to launch
-	keepdir /usr/share/dbus-1/services
-	keepdir /etc/dbus-1/{session,system}.d
-	# machine-id symlink from pkg_postinst()
-	keepdir /var/lib/dbus
-	# Let the init script create the /var/run/dbus directory
-	rm -rf "${ED}"/var/run
-
-	# bug #761763
-	rm -rf "${ED}"/usr/lib/sysusers.d
-
-	dodoc AUTHORS NEWS README doc/TODO
-	readme.gentoo_create_doc
-
-	find "${ED}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-
-	if use systemd; then
-		tmpfiles_process dbus.conf
-	fi
-
-	# Ensure unique id is generated and put it in /etc wrt bug #370451 but symlink
-	# for DBUS_MACHINE_UUID_FILE (see tools/dbus-launch.c) and reverse
-	# dependencies with hardcoded paths (although the known ones got fixed already)
-	# TODO: should be safe to remove at least the ln because of the above tmpfiles_process?
-	dbus-uuidgen --ensure="${EROOT}"/etc/machine-id
-	ln -sf "${EPREFIX}"/etc/machine-id "${EROOT}"/var/lib/dbus/machine-id
-
-	if [[ ${CHOST} == *-darwin* ]]; then
-		local plist="org.freedesktop.dbus-session.plist"
-		elog
-		elog
-		elog "For MacOS/Darwin we now ship launchd support for dbus."
-		elog "This enables autolaunch of dbus at session login and makes"
-		elog "dbus usable under MacOS/Darwin."
-		elog
-		elog "The launchd plist file ${plist} has been"
-		elog "installed in ${EPREFIX}/Library/LaunchAgents."
-		elog "For it to be used, you will have to do all of the following:"
-		elog " + cd ~/Library/LaunchAgents"
-		elog " + ln -s ${EPREFIX}/Library/LaunchAgents/${plist}"
-		elog " + logout and log back in"
-		elog
-		elog "If your application needs a proper DBUS_SESSION_BUS_ADDRESS"
-		elog "specified and refused to start otherwise, then export the"
-		elog "the following to your environment:"
-		elog " DBUS_SESSION_BUS_ADDRESS=\"launchd:env=DBUS_LAUNCHD_SESSION_BUS_SOCKET\""
-	fi
-}
diff --git a/sys-apps/ipmitool/Manifest b/sys-apps/ipmitool/Manifest
index 38063daeb102..d49d8e231e79 100644
--- a/sys-apps/ipmitool/Manifest
+++ b/sys-apps/ipmitool/Manifest
@@ -1,10 +1,22 @@
 AUX exchange-bmc-os-info-1.8.18.initd 512 BLAKE2B 43307b959b3a2df518bc667e696f9e8a3dc113a572beb813c3c560f6c19db813195f26f22638261cf40f7f94599a62497e47edb30f24b9f7d6192be973d80795 SHA512 d9a9a2a984e5289e74af63660ef82b7f45e4cb60f4fefe4e1e3a1b9bac9ddc3adfcb177899b3cb1521f91b461cb807ab9edcbf4def96060287f50c9435ab1d29
+AUX exchange-bmc-os-info.initd 512 BLAKE2B 43307b959b3a2df518bc667e696f9e8a3dc113a572beb813c3c560f6c19db813195f26f22638261cf40f7f94599a62497e47edb30f24b9f7d6192be973d80795 SHA512 d9a9a2a984e5289e74af63660ef82b7f45e4cb60f4fefe4e1e3a1b9bac9ddc3adfcb177899b3cb1521f91b461cb807ab9edcbf4def96060287f50c9435ab1d29
+AUX ipmievd.confd 677 BLAKE2B 7656944c3a9e1f8c9ce2a5923da7dda420386020c14449fb182ce9247122564cf6e5179e97bf5396e81e3c5ded8a6791b2e5804327697149e6be097f82e105d6 SHA512 0e494de95d7a193293005b3d93e0ea0c7ada44e54f48259b197e1eb9846f78d986cefba59ebd70484c26e4ac5d3ae38abfc5a6cd1f74785cb3806c0ba35ee572
+AUX ipmievd.initd 898 BLAKE2B f768c90e913d0036113f39716a04b5c28052cb1be78b27221549f871b392df26e989edea20ff8eeffba38150d2b5687ca189d0e471b43e85ae2e4af3a7abb72c SHA512 2f46f3ad1f3d224a3f12fe1feaf7a2cee84dab6f93f788f4e9e82baf42ccbd3e22aa2b51c76646e1bd2a812bf8c673c780a48dfd2c5ec116f9fda944cb1d48cb
 AUX ipmievd.service 158 BLAKE2B 5d02e8647670086bd46160417de32cd199ba1fe731386fce04c2b56183fe6d7885b59199f30a7bfdfc764d7eb021d82554154766fbd23407af950d4e274033ab SHA512 8e1c3ee301bc002d9fe8146d224b9e4d4d054503c118e713c48763eb6352b6e6efe947380d1ab9fa0205ef556683e29ead321360f00bf8e093eb2b48eaa5dfb9
 AUX ipmitool-1.8.18-ipmievd.confd 677 BLAKE2B 7656944c3a9e1f8c9ce2a5923da7dda420386020c14449fb182ce9247122564cf6e5179e97bf5396e81e3c5ded8a6791b2e5804327697149e6be097f82e105d6 SHA512 0e494de95d7a193293005b3d93e0ea0c7ada44e54f48259b197e1eb9846f78d986cefba59ebd70484c26e4ac5d3ae38abfc5a6cd1f74785cb3806c0ba35ee572
 AUX ipmitool-1.8.18-ipmievd.initd 898 BLAKE2B f768c90e913d0036113f39716a04b5c28052cb1be78b27221549f871b392df26e989edea20ff8eeffba38150d2b5687ca189d0e471b43e85ae2e4af3a7abb72c SHA512 2f46f3ad1f3d224a3f12fe1feaf7a2cee84dab6f93f788f4e9e82baf42ccbd3e22aa2b51c76646e1bd2a812bf8c673c780a48dfd2c5ec116f9fda944cb1d48cb
+AUX ipmitool-1.8.19-CVE-2011-4339.patch 922 BLAKE2B 7b6d03a674a891c672402faf664de5411320f40375ab49403fd7f5de12f19190aeb51f029856329dc1c998100a0e17f5c33a8a69f76ce4e9fd145c42ee952f98 SHA512 e3709eff2f822194b302a2642b9fc21c8a570d2180118b65a686850fdd8286128306b81b455987e133147094f5acf9dc367d38714d77f4ee79d4b39d9537b095
+AUX ipmitool-1.8.19-fix-buffer-overflow.patch 1063 BLAKE2B 3e7f010c830a5a0b98c1412a060e213c489c838f49d7fc0518e95f6ac00f2a86e8e2214219ad6d63d6981d553b76d7d288c96a652ad7e4998d138c87951aacf0 SHA512 1630246f4718203b43ecfbdf0cfd21ea81f4e91a50f96942e08e21f732e637f93453e361e9869b482f7336a72ffe879befb114a201b7c3fbeb9d4a86e8ecd3bd
+AUX ipmitool-1.8.19-manpage-longlines.patch 2564 BLAKE2B 61960109491d051f60b5708a5e04849e43e89c61a7c01c2752b10a8fc06468af0f77e5333e1c469526503a5791a24888198b53c466c12d4327d6b1518e258a17 SHA512 13a78926d96999d4e05c83aae74ede176dc806865c0a7ee5e888b3c93728ebf96214d98beb23b2f53b60441d88774b06ced205ba2f5e4198271ffb30f4470a73
+AUX ipmitool-1.8.19-missing-func-decl.patch 896 BLAKE2B 49b8e6c0029498bd510e94eb061f04a00b5d5f733ccda654c4a74bfb972e0205af587b75931286bd84397829cb7428dab54d6fda1a4b7ca5ee6dfa43ab89f0bb SHA512 ef08e6b4b9d42eafd6535ac1089a862ca774581c9242be7c7710bcb55c6a810c002d63ac1ba11f896a47a01bc162b4d917656d5d9671dca4d71578f245948e79
+AUX ipmitool-1.8.19-nvidia-iana.patch 1243 BLAKE2B 9e97ece902caa6f222fd23d5f1be751c888b77afc1ebd347edb143eedbe3792b317407d7caf94a4eb86ce0149c4ffa62be5f337dacf8a4a142e626d23e369711 SHA512 7ea4c4b1636ac69f5e801873b48c4c8b7c311f55d1adbb7bd08f34d88aaa17e5e13ac84d5a69e7660b2cd0dd737fcb8685fe2253c51b2fca4b432fa374a3dfb2
 AUX log_bmc-1.8.18.initd 570 BLAKE2B 7b21b7888f386953c001a635fa4d1fd3b79a1eb9920fc6cefe6770231d67989d47f172e783416d12feb399e882e2fe74b26fdef162fafb85cd686ec83d414d01 SHA512 2d5b62ee5f694629e8f5c4c2d1fcdf7a3d42078f488e43cd1b34193619918ea7429da2bcb236b9216cfabaf94d8c5224b99194023a8db626884c4c766f15136a
+AUX log_bmc.initd 570 BLAKE2B 7b21b7888f386953c001a635fa4d1fd3b79a1eb9920fc6cefe6770231d67989d47f172e783416d12feb399e882e2fe74b26fdef162fafb85cd686ec83d414d01 SHA512 2d5b62ee5f694629e8f5c4c2d1fcdf7a3d42078f488e43cd1b34193619918ea7429da2bcb236b9216cfabaf94d8c5224b99194023a8db626884c4c766f15136a
+DIST enterprise-numbers-1.8.19.xz 1500100 BLAKE2B 15c21792bf46220c5908ecf4f0ddafe2fdf13a1799c054a0cb0cb647e7f489768855c4c25fba8a4408505ff0cf02d1a43408d5c4de557b1b30fe8abb477a7926 SHA512 e88cb459a9c8a3172770bcfefbec0a7ad7d65395063c8c0173fce776ea0beb7ad9f3610e636dfbd71d0af8c952c2b9bc6c25c815daa4ab281bed983cbe2ebcc4
 DIST enterprise-numbers.2020-10-21.xz 1426932 BLAKE2B bfe39ceea321ba47cd40eafa67862eb4dfd6dc29b192afb20ad0c908cd93a16b4103c5de64d042df012417c8cadc03000f2b2a00779bcc582a430603cad5f3cf SHA512 4a854a56e8ed51997c320cbfba041d43cb98b14743ef80b67e701942068d3729604abaedb617655a83ca21a7e20ea5a622ede4de317ca492cefd46da784d28f3
 DIST ipmitool-1.8.18_p20201004.tar.gz 638493 BLAKE2B 52f4ec8c82336b88640d1b91fc17af8f2fe0948a5c48c16067867dcad0852168d48bb21fdd99bde7ed957b66df888fd369c909079d1f81c861acd8c7f8dfa6f2 SHA512 8d72eef3584f4d2c86bfe43f70b5d687f3b7bbdf75b8979f7132c5c98b01baae22c336e540c197652187749fc9bb221a92e546b56e5cf2eb5650fad5094e9433
+DIST ipmitool-1.8.19.tar.gz 641383 BLAKE2B e1db12bb7301cb4b551f87fbfcd405b3597a1f32c45447b2b239d9d43a2cdbe213ee5408291d50801035cc80e28078fb3a778ab28335665bc3316798c13ea1fc SHA512 2d91706e9feba4b2ce4808eca087b81b842c4292a5840830001919c06ec8babd8f8761b74bb9dcf8fbc7765f028a5b1a192a3c1b643f2adaa157fed6fb0d1ee3
 DIST ipmitool_1.8.18-9.debian-ported-gentoo.tar.xz 3208 BLAKE2B b37a127eff361039b3b810e19dd97f0c395462b658803f56f10f2dd1abbbe92743dc409ce6b83560db15621b7fa7a3c0f989100077893993df18108a082e49d2 SHA512 0f7646a2307ac98425e99dece9d3e3b23026136a97524151efdecc910fb537af41a91702782989046e44163da98610fa05792878473e228b45c16351f6015a45
 EBUILD ipmitool-1.8.18_p20201004-r3.ebuild 6249 BLAKE2B 3d5060e5488181de705843c4845ac1c1ff50fb9f2096ab2876b111db2312079cb6111682f34faaa9edb3b2e30fb86db1a2d7359c47f7289d70b2087a3827526d SHA512 ebfc290090a08042a469ed30705c0f16f9b6e6ab15d8a0bf18f244037017b76a0d3299a15eb9ea22abf116d31b1bb74f6ec441b2199ea2fd7ee2694bd3ff3037
+EBUILD ipmitool-1.8.19.ebuild 4146 BLAKE2B e0725fcaaeba10ad7651543dad3cebe8497828aa81bdbdf344425405b4672c56b86779b930db67d5beeef17ff7e47347f328e33556f2cdda58c3c953cfb2e471 SHA512 f8f3fd427ffd425414bf9dfa96c94011e57bac32de14cd97ff2a1de6e3c087739304de79c4ce2bd4450560fc13e34f9f142b61cb573899a517bf900bfaed6ceb
 MISC metadata.xml 693 BLAKE2B 7a0cab3772eb4ebc0529b22ab7fa21eae882da4b652fe67c3abfc8e25b1f5a6d14a52089ec676a17a0a925436675ec80409cde8d2554c4f6dce50c4afc736b14 SHA512 8a2ace6c302db4437e6903899edf87aa005f47c5e84969e4d846f67e97a027bda05fced0ca2b1a8a09f12ed5be3ce9bdabfc1b75643c2a9435ba706a452eb055
diff --git a/sys-apps/ipmitool/files/exchange-bmc-os-info.initd b/sys-apps/ipmitool/files/exchange-bmc-os-info.initd
new file mode 100644
index 000000000000..9c63983f21f3
--- /dev/null
+++ b/sys-apps/ipmitool/files/exchange-bmc-os-info.initd
@@ -0,0 +1,23 @@
+#!/sbin/openrc-run
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+# /etc/init.d/exchange-bmc-os-info
+
+name="exchange-bmc-os-info"
+description="Exchange Information between BMC and OS"
+command=/usr/libexec/exchange-bmc-os-info
+command_args=""
+: "${DEVICENUM:=0}" # which BMC
+required_files=/dev/ipmi${DEVICENUM}
+
+depend() {
+  use hostname modules
+  keyword -docker -lxc -prefix -systemd-nspawn
+}
+
+start() {
+  "${command}" start
+}
+stop() {
+  "${command}" stop
+}
diff --git a/sys-apps/ipmitool/files/ipmievd.confd b/sys-apps/ipmitool/files/ipmievd.confd
new file mode 100644
index 000000000000..b860c23c7f89
--- /dev/null
+++ b/sys-apps/ipmitool/files/ipmievd.confd
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+# /etc/conf.d/ipmievd
+
+# Interfaces:
+#   open      Linux OpenIPMI Interface
+#   imb       Intel IMB Interface
+#   bmc       IPMI v2.0 BMC interface
+#   lan       IPMI v1.5 LAN Interface
+#   lanplus   IPMI v2.0 RMCP+ LAN Interface
+
+INTERFACE="open"
+
+# Commands:
+#   open   Use OpenIPMI for asyncronous notification of events
+#   sel    Poll SEL for notification of events
+#
+# 'pidfile=...' will be appended!
+COMMAND="open daemon"
+
+# Options.
+
+OPTIONS=""
+
+# Device number:
+#  Used to target a specific BMC on a multi-node, multi-BMC system via the open interface
+DEVICENUM=0
diff --git a/sys-apps/ipmitool/files/ipmievd.initd b/sys-apps/ipmitool/files/ipmievd.initd
new file mode 100644
index 000000000000..e8ef2c39d454
--- /dev/null
+++ b/sys-apps/ipmitool/files/ipmievd.initd
@@ -0,0 +1,28 @@
+#!/sbin/openrc-run
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+# /etc/init.d/ipmievd
+
+depend() {
+  use logger modules
+  keyword -docker -lxc -prefix -systemd-nspawn
+}
+
+# TODO: ipmievd has a mode where it could be used to monitor multiple BMCs via
+# DEVICENUM or remote systems, and it would be valid to run multiple instances.
+# That is not supported by this init script at this time.
+
+description="IPMI event daemon for sending events to syslog LOCAL4"
+
+: "${DEVICENUM:=0}"
+: "${INTERFACE:=open}"
+: "${COMMAND:=open daemon}"
+: "${OPTIONS:=}"
+
+daemon=ipmievd
+
+pidfile=/run/${daemon}.pid${DEVICENUM} # see manpage re suffix
+command=/usr/sbin/${daemon}
+cachefile=/run/${daemon}.${DEVICENUM}.sdr-cache
+command_args="-d ${DEVICENUM} -S ${cachefile} -I ${INTERFACE} ${OPTIONS} ${COMMAND} pidfile=${pidfile}"
+required_files=/dev/ipmi$DEVICENUM
diff --git a/sys-apps/ipmitool/files/ipmitool-1.8.19-CVE-2011-4339.patch b/sys-apps/ipmitool/files/ipmitool-1.8.19-CVE-2011-4339.patch
new file mode 100644
index 000000000000..4a25280662b5
--- /dev/null
+++ b/sys-apps/ipmitool/files/ipmitool-1.8.19-CVE-2011-4339.patch
@@ -0,0 +1,20 @@
+Description: CVE-2011-4339
+ insecure file permission when creating PID files
+ based on 112_fix_CVE-2011-4339
+Author: Jörg Frings-Fürst <debian@jff-webhosting.net>
+Bug: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=651917
+Forwarded: https://sourceforge.net/p/ipmitool/patches/99/
+Last-Update: 2020-10-21
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+diff -Nuar --exclude '*.orig' ipmitool-50d8c36edf9657720e25445a435dabc44572cf5f.orig/lib/helper.c ipmitool-50d8c36edf9657720e25445a435dabc44572cf5f/lib/helper.c
+--- ipmitool-50d8c36edf9657720e25445a435dabc44572cf5f.orig/lib/helper.c	2020-08-07 00:53:06.000000000 -0700
++++ ipmitool-50d8c36edf9657720e25445a435dabc44572cf5f/lib/helper.c	2020-10-21 13:59:02.335206233 -0700
+@@ -917,7 +917,6 @@
+ 		lprintf(LOG_ERR, "chdir failed: %s (%d)", strerror(errno), errno);
+ 		exit(1);
+ 	}
+-	umask(0);
+ 
+ 	for (fd=0; fd<64; fd++) {
+ 		if (fd != intf->fd)
diff --git a/sys-apps/ipmitool/files/ipmitool-1.8.19-fix-buffer-overflow.patch b/sys-apps/ipmitool/files/ipmitool-1.8.19-fix-buffer-overflow.patch
new file mode 100644
index 000000000000..ceeffde085a7
--- /dev/null
+++ b/sys-apps/ipmitool/files/ipmitool-1.8.19-fix-buffer-overflow.patch
@@ -0,0 +1,21 @@
+Description: fix buffer overflow
+ based on 101_fix_buf_overflow from Leo Iannacone <l3on@ubuntu.com> 
+Author: Jörg Frings-Fürst <debian@jff-webhosting.net>
+Bug: TSOL buffer overflow
+Bug-ubuntu: https://bugs.launchpad.net/ubuntu/+source/ipmitool/+bug/633054
+Forwarded: https://sourceforge.net/p/ipmitool/patches/100/
+Last-Update: 2020-20-21
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+diff -Nuar --exclude '*.orig' ipmitool-50d8c36edf9657720e25445a435dabc44572cf5f.orig/lib/ipmi_tsol.c ipmitool-50d8c36edf9657720e25445a435dabc44572cf5f/lib/ipmi_tsol.c
+--- ipmitool-50d8c36edf9657720e25445a435dabc44572cf5f.orig/lib/ipmi_tsol.c	2020-08-07 00:53:06.000000000 -0700
++++ ipmitool-50d8c36edf9657720e25445a435dabc44572cf5f/lib/ipmi_tsol.c	2020-10-21 13:55:58.571536858 -0700
+@@ -374,7 +374,7 @@
+ 	char *recvip = NULL;
+ 	char in_buff[IPMI_BUF_SIZE];
+ 	char out_buff[IPMI_BUF_SIZE * 8];
+-	char buff[IPMI_BUF_SIZE + 4];
++	char buff[IPMI_BUF_SIZE * 8 + 4];
+ 	int fd_socket, result, i;
+ 	int out_buff_fill, in_buff_fill;
+ 	int ip1, ip2, ip3, ip4;
diff --git a/sys-apps/ipmitool/files/ipmitool-1.8.19-manpage-longlines.patch b/sys-apps/ipmitool/files/ipmitool-1.8.19-manpage-longlines.patch
new file mode 100644
index 000000000000..6c0e00da3e15
--- /dev/null
+++ b/sys-apps/ipmitool/files/ipmitool-1.8.19-manpage-longlines.patch
@@ -0,0 +1,55 @@
+Description: long lines in man-page
+ prevent "can't break line" warnings
+Author: Jörg Frings-Fürst <debian@jff-webhosting.net>
+Forwarded: not-needed
+Last-Update: 2020-10-21
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+diff -Nuar --exclude '*.orig' ipmitool-50d8c36edf9657720e25445a435dabc44572cf5f.orig/doc/ipmitool.1.in ipmitool-50d8c36edf9657720e25445a435dabc44572cf5f/doc/ipmitool.1.in
+--- ipmitool-50d8c36edf9657720e25445a435dabc44572cf5f.orig/doc/ipmitool.1.in	2020-08-07 00:53:06.000000000 -0700
++++ ipmitool-50d8c36edf9657720e25445a435dabc44572cf5f/doc/ipmitool.1.in	2020-10-21 14:00:23.383643880 -0700
+@@ -1038,7 +1038,7 @@
+       AMC slot B2 topology:
+          Port 0 =====> On Carrier Device ID 0, Port 3
+          Port 2 =====> AMC slot B1, Port 2
+-   *-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*
++   *-*-*-* *-*-* *-*-* *-*-* *-*-* *-*-* *-*-*
+    From Carrier file: carrierfru
+       On Carrier Device ID 0 topology:
+          Port 0 =====> AMC slot B1, Port 4
+@@ -1094,7 +1094,7 @@
+     \-Link Type: AMC.2 Ethernet
+     \-Link Type extension: 1000BASE-BX (SerDES Gigabit) Ethernet link
+     \-Link Group ID: 0 || Link Asym. Match: exact match
+-   *-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*
++   *-*-*-* *-*-* *-*-* *-*-* *-*-* *-*-* *-*-*
+   AMC slot B1 port 1 ==> On-Carrier Device 0 port 12
+    Matching Result
+    - From On-Carrier Device ID 0
+@@ -1107,7 +1107,7 @@
+     \-Link Type: AMC.2 Ethernet
+     \-Link Type extension: 1000BASE-BX (SerDES Gigabit) Ethernet link
+     \-Link Group ID: 0 || Link Asym. Match: exact match
+-   *-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*
++   *-*-*-* *-*-* *-*-* *-*-* *-*-* *-*-* *-*-*
+  On-Carrier Device vs AMC slot A2
+   AMC slot A2 port 0 ==> On-Carrier Device 0 port 3
+    Matching Result
+@@ -1121,7 +1121,7 @@
+     \-Link Type: AMC.2 Ethernet
+     \-Link Type extension: 1000BASE-BX (SerDES Gigabit) Ethernet link
+     \-Link Group ID: 0 || Link Asym. Match: exact match
+-   *-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*
++   *-*-*-* *-*-* *-*-* *-*-* *-*-* *-*-* *-*-*
+  AMC slot B1 vs AMC slot A2
+   AMC slot A2 port 2 ==> AMC slot B1 port 2
+    Matching Result
+@@ -1135,7 +1135,7 @@
+     \-Link Type: AMC.3 Storage
+     \-Link Type extension: Serial Attached SCSI (SAS/SATA)
+     \-Link Group ID: 0 || Link Asym. Match: FC or SAS interface {exact match}
+- *-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*
++   *-*-*-* *-*-* *-*-* *-*-* *-*-* *-*-* *-*-*
+ .TP
+ \fIunmatch\fP <\fBxx=filename\fR> <\fBxx=filename\fR> \fB...\fr
+ .br
diff --git a/sys-apps/ipmitool/files/ipmitool-1.8.19-missing-func-decl.patch b/sys-apps/ipmitool/files/ipmitool-1.8.19-missing-func-decl.patch
new file mode 100644
index 000000000000..5057fcaf0525
--- /dev/null
+++ b/sys-apps/ipmitool/files/ipmitool-1.8.19-missing-func-decl.patch
@@ -0,0 +1,32 @@
+https://github.com/ipmitool/ipmitool/pull/360
+
+From a9e262480722f5affd237ee10d0bbc8c55617cb7 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Fri, 2 Sep 2022 07:30:10 -0700
+Subject: [PATCH] ipmi_fru.c: Provide missing function declarations
+
+Fixes build with clang-15+
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ lib/ipmi_fru.c | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/lib/ipmi_fru.c b/lib/ipmi_fru.c
+index 3d1d8a1a..5c5661cf 100644
+--- a/lib/ipmi_fru.c
++++ b/lib/ipmi_fru.c
+@@ -60,6 +60,13 @@ static const char *section_id[4] = {
+ 	"Board Section",
+ 	"Product Section"
+ };
++/* From lib/ipmi_hpmfwupg.c: */
++uint16_t
++ipmi_intf_get_max_request_data_size(struct ipmi_intf * intf);
++
++/* From src/plugins/ipmi_intf.c: */
++uint16_t
++ipmi_intf_get_max_response_data_size(struct ipmi_intf * intf);
+ 
+ static const char * combined_voltage_desc[] = {
+ 	"12 V",
diff --git a/sys-apps/ipmitool/files/ipmitool-1.8.19-nvidia-iana.patch b/sys-apps/ipmitool/files/ipmitool-1.8.19-nvidia-iana.patch
new file mode 100644
index 000000000000..31b1a42dcf59
--- /dev/null
+++ b/sys-apps/ipmitool/files/ipmitool-1.8.19-nvidia-iana.patch
@@ -0,0 +1,23 @@
+Description: Add IANA ID for NVIDIA hardware
+ Add the NVIDIA IANA ID to the hardcoded list used in ipmitool <= 1.8.18.
+ After upstream commit "9d41136 ID:491 - Fetch vendor IDs from IANA", ipmitool
+ generates a list of vendor IDs dynamically at build time, so we can drop this
+ patch in future releases.
+Author: dann frazier <dannf@debian.org>
+Origin: backport
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=903616
+Forwarded: not-needed
+Last-Update: 2020-10-21
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+diff -Nuar --exclude '*.orig' --exclude '*.rej' ipmitool-50d8c36edf9657720e25445a435dabc44572cf5f.orig/include/ipmitool/ipmi.h ipmitool-50d8c36edf9657720e25445a435dabc44572cf5f/include/ipmitool/ipmi.h
+--- ipmitool-50d8c36edf9657720e25445a435dabc44572cf5f.orig/include/ipmitool/ipmi.h	2020-08-07 00:53:06.000000000 -0700
++++ ipmitool-50d8c36edf9657720e25445a435dabc44572cf5f/include/ipmitool/ipmi.h	2020-10-21 14:04:11.675128602 -0700
+@@ -281,6 +281,7 @@
+      /* 4769 for [IBM Corporation] */
+      IPMI_OEM_IBM_4769   = 4769,
+      IPMI_OEM_MAGNUM     = 5593,
++     IPMI_OEM_NVIDIA     = 5703,
+      IPMI_OEM_TYAN       = 6653,
+      IPMI_OEM_QUANTA     = 7244,
+      IPMI_OEM_VIKING     = 9237,
diff --git a/sys-apps/ipmitool/files/log_bmc.initd b/sys-apps/ipmitool/files/log_bmc.initd
new file mode 100644
index 000000000000..4064edf3b84d
--- /dev/null
+++ b/sys-apps/ipmitool/files/log_bmc.initd
@@ -0,0 +1,25 @@
+#!/sbin/openrc-run
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+name="log_bmc"
+description="Add SEL entries to indicate OS Boot status"
+command=/usr/libexec/log_bmc.sh
+command_args=""
+: "${DEVICENUM:=0}" # which BMC
+required_files=/dev/ipmi${DEVICENUM}
+
+depend() {
+  use modules
+  after ipmievd # to capture our own log event
+  keyword -docker -lxc -prefix -systemd-nspawn
+}
+
+start() {
+  # TODO: should this keep start so it only fires once per boot?
+  "${command}" os_boot
+}
+
+stop() {
+  "${command}" os_shutdown
+}
diff --git a/sys-apps/ipmitool/ipmitool-1.8.19.ebuild b/sys-apps/ipmitool/ipmitool-1.8.19.ebuild
new file mode 100644
index 000000000000..318e661f232d
--- /dev/null
+++ b/sys-apps/ipmitool/ipmitool-1.8.19.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools systemd
+
+DESCRIPTION="Utility for controlling IPMI enabled devices"
+HOMEPAGE="https://github.com/ipmitool/ipmitool"
+
+COMMIT_ID=
+if [[ -n "${COMMIT_ID}" ]]; then
+	SRC_URI="https://github.com/${PN}/${PN}/archive/${COMMIT_ID}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${COMMIT_ID}"
+else
+	MY_P="${PN^^}_${PV//./_}"
+	SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/${MY_P}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${MY_P}"
+fi
+
+# to generate: `make enterprise-numbers` from git checkout of release tag
+SRC_URI+="
+	https://dev.gentoo.org/~ajak/distfiles/${CATEGORY}/${PN}/enterprise-numbers-${PV}.xz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="openbmc openipmi static"
+
+RDEPEND="dev-libs/openssl:0=
+	sys-libs/readline:0=
+	openbmc? ( sys-apps/systemd:0= )"
+DEPEND="${RDEPEND}
+	>=sys-devel/autoconf-2.69-r5
+	virtual/os-headers
+	openipmi? ( sys-libs/openipmi )"
+	#freeipmi? ( sys-libs/freeipmi )
+# ipmitool CAN build against || ( sys-libs/openipmi sys-libs/freeipmi )
+# but it doesn't actually need either.
+
+PATCHES=(
+	"${FILESDIR}/${P}-missing-func-decl.patch"
+	# yoinked out of debian's patchset, previously carried in a SRC_URI
+	# tarball
+	"${FILESDIR}/${P}-fix-buffer-overflow.patch"
+	"${FILESDIR}/${P}-CVE-2011-4339.patch"
+	"${FILESDIR}/${P}-manpage-longlines.patch"
+	"${FILESDIR}/${P}-nvidia-iana.patch"
+)
+
+src_prepare() {
+	default
+
+	# Gentoo chooses to install ipmitool in /usr/sbin
+	# Where RedHat chooses /usr/bin
+	sed -i -e \
+		's,/usr/bin/ipmitool,/usr/sbin/ipmitool,g' \
+		"${S}"/contrib/* \
+		|| die "sed bindir failed"
+
+	eautoreconf
+
+	# If this file is not present, then ipmitool will try to download it during make install!
+	cp -al "${WORKDIR}/enterprise-numbers-${PV}" "${S}/enterprise-numbers" \
+		|| die "Could not place IANA enterprise-numbers"
+}
+
+src_configure() {
+	# - LIPMI and BMC are the Solaris libs
+	# - OpenIPMI is unconditionally enabled in the configure as there is compat
+	# code that is used if the library itself is not available
+	# FreeIPMI does build now, but is disabled until the other arches keyword it
+	#	`use_enable freeipmi intf-free` \
+	# --enable-ipmievd is now unconditional
+
+	local econfargs=(
+		$(use_enable static) \
+		--enable-ipmishell \
+		--enable-intf-lan \
+		--enable-intf-usb \
+		$(use_enable openbmc intf-dbus) \
+		--enable-intf-lanplus \
+		--enable-intf-open \
+		--enable-intf-serial \
+		--disable-intf-bmc \
+		--disable-intf-dummy \
+		--disable-intf-free \
+		--disable-intf-imb \
+		--disable-intf-lipmi \
+		--disable-internal-md5 \
+		--with-kerneldir=/usr \
+		--bindir=/usr/sbin \
+		--runstatedir=/run \
+		CFLAGS="${CFLAGS}"
+	)
+
+	econf "${econfargs[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" PACKAGE="${PF}" install
+	into /usr
+
+	newinitd "${FILESDIR}/ipmievd.initd" ipmievd
+	newconfd "${FILESDIR}/ipmievd.confd" ipmievd
+
+	# From debian, less configurable than OpenRC
+	systemd_dounit "${FILESDIR}/ipmievd.service"
+
+	dosbin contrib/bmclanconf
+
+	exeinto /usr/libexec
+	doexe contrib/log_bmc.sh
+	newinitd "${FILESDIR}/log_bmc.initd" log_bmc
+
+	# contrib/exchange-bmc-os-info.init.redhat
+	# contrib/exchange-bmc-os-info.service.redhat
+	# contrib/exchange-bmc-os-info.sysconf
+	exeinto /usr/libexec
+	newexe contrib/exchange-bmc-os-info.init.redhat exchange-bmc-os-info
+
+	insinto /etc/sysconfig
+	newins contrib/exchange-bmc-os-info.sysconf exchange-bmc-os-info
+
+	systemd_newunit contrib/exchange-bmc-os-info.service.redhat exchange-bmc-os-info.service
+	newinitd "${FILESDIR}/exchange-bmc-os-info.initd" exchange-bmc-os-info
+
+	# contrib/bmc-snmp-proxy
+	# contrib/bmc-snmp-proxy.service
+	# contrib/bmc-snmp-proxy.sysconf
+	exeinto /usr/libexec
+	doexe contrib/bmc-snmp-proxy
+
+	insinto /etc/sysconfig
+	newins contrib/bmc-snmp-proxy.sysconf bmc-snmp-proxy
+
+	systemd_dounit contrib/bmc-snmp-proxy.service
+	# TODO: initd for bmc-snmp-proxy
+
+	insinto "/usr/share/${PN}"
+	doins contrib/oem_ibm_sel_map
+
+	cd "${S}/contrib"
+
+	docinto contrib
+	dodoc collect_data.sh create_rrds.sh create_webpage_compact.sh create_webpage.sh README
+}
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index f1525df246f8..ea373480a1b5 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index b48bfbf1c9a4..ffb6529f098f 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -1,7 +1,5 @@
 AUX gcc-configure-LANG.patch 2052 BLAKE2B 28c36f4992e41305ee421dade5eaaac34e3bdc523665b03f360f2bc01e8f69e9dc48052edb80dece63ab561e80325b4f125502482eb16f7324f1c03670021550 SHA512 a694c7ac2f45cc657097ff5b0cf1356ac88a9c06035c9ba15167e9d444844d0d8a478eb1b9b62195dd063774f79697b9148b9cdb6c261640b472c291061b2129
 AUX gcc-configure-texinfo.patch 341 BLAKE2B d2ea3b2ea08f5d3a498ba27d0fb95e325097e2104e55caa28b66515cb48662649140d90b639369aedc54b2b1178fa4b49cda442f5f504e09d88a2efa45a5057c SHA512 e8d34c5077409df5495cf0c5fbf5e77f841c5698108fa6a5fde33eb28202c685603bdefd8368918e55f30c4b995e895d71d64c715c1ec2b017e09eb2c54c09ff
-DIST gcc-10-20220818.tar.xz 71755772 BLAKE2B b5cf59eb8dec7cc3bdd2317265d3568611ce170a18a35b0e3f1dc7c4510f46d1ecbdcc18fdda01b6af77c78aae7abb3de3def167b16a6292a4d08b8d94ad1f12 SHA512 e0e6b0e1be301ceb839ac05f0e5f495fd2932ea36e9d1308ead87f22e87c9ff50eaf4b9749ff1ab805977e6493201c31ba5e05e0f784675fa566eface85f9b93
-DIST gcc-10-20220825.tar.xz 71753264 BLAKE2B 8e7c6f06bd21891598334f3bcf8ba508d8983d41fd268b3f181280b85613e178c33c2ab5d400b4128422db6f2f5e1aed482be5e7065a4f27f1192d4d2a3bcb5c SHA512 b9867c72edb4fc85386cd7b0107e87512f4b293da34adab7ee66cb0243a55aaa9dc61560fdad5a1f58081474aa31960854c1fadc1a822cffb48be850b303ba0d
 DIST gcc-10-20220901.tar.xz 71753520 BLAKE2B 882d6b8a5eb0ea445e774b8ca076e82ad8bcbf01b65d0ee7edfba7a4f0c09037076f996b3758130f83919c3768bf75ba5be0f6990fd01a61adc3cb305056374d SHA512 1bbe0e182227fc4d66c53b55da97a903f59656bf5870fdd5215b33152c977e33abfd5404741cb4d6712aee92cfce831062e3410d16209f33ab2101c1db364255
 DIST gcc-10-20220908.tar.xz 71756288 BLAKE2B 4ebe4c1d2d655a975049fc148f9458064658130b48ddd7d6ce9f156ba7a90e79d30381d9fec7b3f1725d924fbbf272a8a6720e97d61b6afbea91fcb48ae35e59 SHA512 dcf7dac5a0bbd879a9ae40203fe85adf4bf326d160fa8a180b5c1005e445d8ea866becb4b1864bde80eb905483cd47e8ea514432aef820f017a57d4f30d7b7d7
 DIST gcc-10.4.0-musl-patches-1.tar.xz 3808 BLAKE2B 804d1fcc451dcd03be71240dd498ec2d179869571d44012967c48dccf5a478dd8c55000a964a80fdd5584d739a777dee1c83241cffce514ef002df2572854a67 SHA512 83e4a9c0f7062baf0c606a2bcc56a818494991403d7577dea65f04bbc25bdb786a5889b80d45d80e7f4be07c1aef786802cbfcfafd1a17ec255a2d4e93a77570
@@ -9,9 +7,8 @@ DIST gcc-10.4.0-patches-5.tar.xz 17056 BLAKE2B f336d69a8ad105b8c4a84e8248a5b8a88
 DIST gcc-10.4.0.tar.xz 75018092 BLAKE2B ec1169025d3896b70ab80a4b8ce5040763a95529fc7e120c6bc3a3eb1db5cf938ebde347c1e595a8ff7d4081e79ded6252702d7a1a09648449b7a0783188e434 SHA512 440c08ca746da450d9a1b35e8fd2305cb27e7e6987cd9d0f7d375f3b1fc9e4b0bd7acb3cd7bf795e72fcbead59cdef5b6c152862f5d35cd9fbfe6902101ce648
 DIST gcc-10.5.0-musl-patches-1.tar.xz 3816 BLAKE2B 5995f934a40665d877342853fde8b414eed8770c72e6b11b295b7e7b3c9d38d7407dff63b5751f4449f6fa842c02e87f156cc868e7436a8313f7c8514242d255 SHA512 b93cc54cd7b78fdc487df7c449b03bbfd10094e45f3f8eef20cd69f27a68a14817fe662a2ec119b384eea2dad0491b70f838d010457e386700030b76457afad6
 DIST gcc-10.5.0-patches-0.tar.xz 16188 BLAKE2B 3fe3163c4960ff02eb792b2d00b9b20e1c2b44ad2d2e79661ffa0a5795b1bb631bce83c506f485765a7b971e6d391ebc1803c327f0d8d06e457610f5d6074c90 SHA512 fde1fec92df535416221827d48daf7d498f675da5697bc15bb4e17ccfedf6e6705dd28f57a3c9ebc8065b49328246fa5aa1fd90bd88bc27fe2b7b3e924f0df15
-DIST gcc-11-20220819.tar.xz 75783200 BLAKE2B f047e2839932eb648f43e80cd80d940262f618093f340a51143eb857323b47a14725d733587dec06808c356cb153d0f35cf210806f5f8990e290f78dcb277568 SHA512 aa1418df17221d999ae4d3dd4fcab0f9c7a481e67dae98231b82bbc04f4df06b2add85e664e68e39616255644aa0dfb2df95cad485ec3f02e9db58740e37d8ca
-DIST gcc-11-20220826.tar.xz 75781808 BLAKE2B 01b3e35edc96d29bdf6f41fcd04199aadb624bea38d317b0f8d7eaf3b10cf5c09ebf89b56db4508b31373ae76bdfda46f0d3dc70a59828091f430ddd3b4388c5 SHA512 6b604dce6f716cc7c0607c7821f3839e1b1f718e4b97acbec63601e992db1499012304b62473e497eab2f31f6b4baadb721869bd063fe4227a14551e0c12c620
 DIST gcc-11-20220902.tar.xz 75785408 BLAKE2B d35d2dd3a3a3b1ae63facb55e93893155b59963ed9a9fc3650122fbb7f2274090e375ce41762587bee69c02f79b72f4f1c8e9b8e84035c41a1e9b269b4984f92 SHA512 4ee62df741b16212366a91a8124ac0fa5a8245565deabbc24f88b3379b5b9fbfebc04cd0b6e14ba2e1ef8d0624e3d52a763e259cfe1572489ba6797f3c713571
+DIST gcc-11-20220909.tar.xz 75778496 BLAKE2B 6905614b33c1fa74caf409e4a6e87d0d38464e3f965ba92bba4167608af1143e69540b023626578437bcc4d631f94fc60e72e09b32c586be5c1dd6d29774b275 SHA512 22afab5e99cf787aac0eac2b4e5b7f663dd2a9fa82f4d13c08fca8b79007f5937cdbd8c5d49ae31d4b3267def09c9030c5c1dad4bd28c8d28050c4273810cc5d
 DIST gcc-11.3.0-musl-patches-1.tar.xz 3856 BLAKE2B f511f8b4c0696771d906beee9645b5d009ea4b673602baa1ca562d6f23c5b0caf2012aae93578671624617c4286e3937d79a7383d6a03bb438c5b774a06fe8e6 SHA512 cd375ff2affb213475acaabf02989b1f05d719d972970ea0304d20a816986807390893d1401826f3b497787642f35d90a244195f8e466db41e8d768366057334
 DIST gcc-11.3.0-patches-7.tar.xz 15184 BLAKE2B 426f00feaa982a35d2c459e7a2c2e9d29b4b467ac3625ebd72bb31077c75bbf0c028137df03921c52ddc97a14d92c49777bd3f27b47a7b47d8a05e2d106b6bdb SHA512 bec8bf26b3e50633a5a2e0bb75ffeaba86becb704c14365ff3342e8d651ab75bb3ceec7808d88a25989b8c7182398184b95b6d1267aaef9aa828f687e4895e9d
 DIST gcc-11.3.0.tar.xz 81141364 BLAKE2B 7e562d25446ca4ab9fe8cdb714866f66aba3744d78bf84f31bfb097c1a981e4c7f990cb1e6bcfec5ae6671836a4984e2b70eb8fed81dcef5e244f88da8623469 SHA512 f0be5ad705c73b84477128a69c047f57dd47002f375eb60e1e842e08cf2009a509e92152bca345823926d550b7395ae6d4de7db51d1ee371c2dc37313881fca7
@@ -30,15 +27,12 @@ DIST gcc-8.5.0.tar.xz 63841008 BLAKE2B aa81a1a730fd7371360f6abed6ba78b5843fd18c5
 DIST gcc-9.5.0-patches-1.tar.xz 13772 BLAKE2B 2e2e84a28a729cd271a23716ff3fe08b7209b72254af279f04dd15dbd39482fb7d905dc9293dc326536e14bca9a53397bd7e1c4b617ed8cbe42bcf617fcce3fb SHA512 50e292e665bfae18bf71c0714074025b4f7cb87042862071815874f7c5b241acac3b8f60d85b8970b11978103c2e7616c02d789f6c3b091d7b736b65c535b743
 DIST gcc-9.5.0.tar.xz 72462752 BLAKE2B 69e39314ee6bb46e3be491ba9c3cbc4914cb716f732c6d3f2b14d9382750b40c4f14b5d3051225b81f936ef8297b0ba8cb5439512e961dae5815d3bee2b0bfdb SHA512 cdd144ce4f747e051480410afc8506c90a57cb45da89071ddae377b1453bca3014422455ade9fe4563ebe51f4b6348cbc0c61905a9b8801cd597d51ad0ec62b3
 EBUILD gcc-10.4.0.ebuild 1445 BLAKE2B 05518ec2cdf0180f4db63dcab413097ca777381b496d6b7b7cebc0bf2b04395d14b74daa398ea2e2d916df4f6034357cfc740939e0fb346bbea71a8a09603fbb SHA512 8fd4642dd974006efe35f6d45ebfda66fe5dac0d4e2371804ede5d94e6e820b95cedac08c11de766c0c711bef7c55900cdaeaffe889691f7acd7470c32e7e3b4
-EBUILD gcc-10.4.1_p20220818.ebuild 1456 BLAKE2B 2c0db71c8f80d84ce17f694623942b59ae34a318f740b77fc84d82aff72f481300750ef318bef57eb46748d22a045e038d8982cf6a389cb3bd46aa4a0b33cc4b SHA512 e1f329b81fc4fc54f8fdbf2ceb7b45e1e582cddd82ebbd2be272c7ced8a3e7be8fae01b989697624b238e4f3a881d48143ab6e300eb320d80253f269e4d36ba7
-EBUILD gcc-10.4.1_p20220825.ebuild 1456 BLAKE2B 2c0db71c8f80d84ce17f694623942b59ae34a318f740b77fc84d82aff72f481300750ef318bef57eb46748d22a045e038d8982cf6a389cb3bd46aa4a0b33cc4b SHA512 e1f329b81fc4fc54f8fdbf2ceb7b45e1e582cddd82ebbd2be272c7ced8a3e7be8fae01b989697624b238e4f3a881d48143ab6e300eb320d80253f269e4d36ba7
 EBUILD gcc-10.4.1_p20220901.ebuild 1456 BLAKE2B 2c0db71c8f80d84ce17f694623942b59ae34a318f740b77fc84d82aff72f481300750ef318bef57eb46748d22a045e038d8982cf6a389cb3bd46aa4a0b33cc4b SHA512 e1f329b81fc4fc54f8fdbf2ceb7b45e1e582cddd82ebbd2be272c7ced8a3e7be8fae01b989697624b238e4f3a881d48143ab6e300eb320d80253f269e4d36ba7
 EBUILD gcc-10.4.1_p20220908.ebuild 1456 BLAKE2B 2c0db71c8f80d84ce17f694623942b59ae34a318f740b77fc84d82aff72f481300750ef318bef57eb46748d22a045e038d8982cf6a389cb3bd46aa4a0b33cc4b SHA512 e1f329b81fc4fc54f8fdbf2ceb7b45e1e582cddd82ebbd2be272c7ced8a3e7be8fae01b989697624b238e4f3a881d48143ab6e300eb320d80253f269e4d36ba7
 EBUILD gcc-10.5.9999.ebuild 1108 BLAKE2B 2db612df53fbaec59c707acb56bac804a4ee797d156ea3dfca6396d27268385f1d5177c44bd58a926c981ab1c0c7b7adf5e4ea060a65a9e84e7f8ed1713701b0 SHA512 5193d1f4359ef8963645d25150731ab1929801eae16e94ddef3fb0169ed365d2ac43765a2d4848966508144e121b8b24feccbe66f59ee9363764d5a3db79f946
 EBUILD gcc-11.3.0.ebuild 659 BLAKE2B 310352b879c732515ce63983db79b32bf7c8c200a650627a14b5284fceea9a7e7f3e545044a8c00ccc44cd760b18123542bd233242cb3ebc48ef422439c8e430 SHA512 44c89a7782e5e37c5ef61c50d5aa6d07c09f19bada293ed657d7062837a5a9be9483fda0b1845ee794f42031ea098a1b88d439f7be202f4276f77748ff45815e
-EBUILD gcc-11.3.1_p20220819.ebuild 1304 BLAKE2B c0e791f2c7e2eebf6b19336f987fb8fc11cd53096b8407ba99533bb1ed2f35a3bc756366bdf87a7bc91ff263fc168717f6ad4707639b3d0698bbda795b68a62d SHA512 712a4a74be2f4b058f178dae92cd77fe71be1f0557c51e845f18baf6145a0ee1c1f5b055224c64b17d718f2c50e7524caedf64d87100e446a2b2b22c568eda90
-EBUILD gcc-11.3.1_p20220826.ebuild 1304 BLAKE2B c0e791f2c7e2eebf6b19336f987fb8fc11cd53096b8407ba99533bb1ed2f35a3bc756366bdf87a7bc91ff263fc168717f6ad4707639b3d0698bbda795b68a62d SHA512 712a4a74be2f4b058f178dae92cd77fe71be1f0557c51e845f18baf6145a0ee1c1f5b055224c64b17d718f2c50e7524caedf64d87100e446a2b2b22c568eda90
 EBUILD gcc-11.3.1_p20220902.ebuild 1304 BLAKE2B c0e791f2c7e2eebf6b19336f987fb8fc11cd53096b8407ba99533bb1ed2f35a3bc756366bdf87a7bc91ff263fc168717f6ad4707639b3d0698bbda795b68a62d SHA512 712a4a74be2f4b058f178dae92cd77fe71be1f0557c51e845f18baf6145a0ee1c1f5b055224c64b17d718f2c50e7524caedf64d87100e446a2b2b22c568eda90
+EBUILD gcc-11.3.1_p20220909.ebuild 1294 BLAKE2B b7ebe383beab66923f219509ca9afd6f4d77d4796041acee361644bcd874a86a6bb3c72a5418e669062af7b946646cea92ce8010546e26d09ceb9894e4f67d0a SHA512 13fc00a6381cdfdb5646ce8b405458d2d966fb5daef28ccadade709e1be4375698ab36dd9d97a0c25a8a257b1227076ec8112fdb3716699adc6fcace42240649
 EBUILD gcc-11.4.9999.ebuild 1267 BLAKE2B 09a26812068945e11164d0a4f8f5cc10dc261a20a647fd4102decc83eecbbe8fcc7f38093609314fa1f26c46164e8248aede741880f7cff64dd5a94836765fa2 SHA512 4ecf698cd6e96dc08683a0e9b69936cdd9085c300d330fb9830cee0e38783e0a1fc8409db39159f9b247f28fc5d7d7572ad3e975f3951f1cb8537f49886bdcde
 EBUILD gcc-12.2.0.ebuild 1434 BLAKE2B a02496eb0178f8f3e38487b233eea12467e9e799763eb447cd545ea5afd48460bc8fc64bd68c84fca38f2d4cdb7487a65b34f4ceedf335393964ec770c0a69de SHA512 62d1a2dfac584c8abe548ff03c960a9e545e34ee1bd61977413af1b31ce98e281b5b90a33be2c666f418a272658f5188e9355bacc51dd0cc7ff456bcc47f2edd
 EBUILD gcc-12.2.1_p20220827.ebuild 1437 BLAKE2B c0f35f820ac6b8361761cd90944b7a860c6bff7994497fb96e6be2178f9c888b8927bd3a908af0f0521c06d98d3c84e46c988d70e6a7e454835a978cd0b4b34b SHA512 48ee0cee1a29d0b41f78dd73ce0ebedb5eae4befe60f456f5a80128e878e61f1e6c173110b21ff3de9770f5e05c144f72bacb273532cf6ce62ee221f5281db8a
diff --git a/sys-devel/gcc/gcc-10.4.1_p20220818.ebuild b/sys-devel/gcc/gcc-10.4.1_p20220818.ebuild
deleted file mode 100644
index bb603378916c..000000000000
--- a/sys-devel/gcc/gcc-10.4.1_p20220818.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-TOOLCHAIN_PATCH_SUFFIX="xz"
-TOOLCHAIN_PATCH_DEV="sam"
-#TOOLCHAIN_GCC_RC=1
-PATCH_GCC_VER="10.5.0"
-PATCH_VER="0"
-MUSL_VER="1"
-MUSL_GCC_VER="10.5.0"
-
-if [[ $(ver_cut 3) == 9999 ]] ; then
-	MY_PV_2=$(ver_cut 2)
-	if [[ ${MY_PV_2} == 0 ]] ; then
-		MY_PV_2=0
-	else
-		MY_PV_2=$(($(ver_cut 2) - 1))
-	fi
-
-	# e.g. 12.2.9999 -> 12.1.1
-	TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.$(($(ver_cut 3) - 9998))
-elif [[ -n ${TOOLCHAIN_GCC_RC} ]] ; then
-	# Cheesy hack for RCs
-	MY_PV=$(ver_cut 1).$((($(ver_cut 2) + 1))).$((($(ver_cut 3) - 1)))-RC-$(ver_cut 5)
-	MY_P=${PN}-${MY_PV}
-	GCC_TARBALL_SRC_URI="https://gcc.gnu.org/pub/gcc/snapshots/${MY_PV}/${MY_P}.tar.xz"
-	TOOLCHAIN_SET_S=no
-	S="${WORKDIR}"/${MY_P}
-fi
-
-inherit toolchain
-# Needs to be after inherit (for now?), bug #830908
-EGIT_BRANCH=releases/gcc-$(ver_cut 1)
-
-# Don't keyword live ebuilds
-#if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
-#	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-#fi
-
-RDEPEND=""
-BDEPEND="${CATEGORY}/binutils"
-
-src_prepare() {
-	local p upstreamed_patches=(
-		# add them here
-	)
-	for p in "${upstreamed_patches[@]}"; do
-		rm -v "${WORKDIR}/patch/${p}" || die
-	done
-
-	if has_version '>=sys-libs/glibc-2.32-r1'; then
-		rm -v "${WORKDIR}/patch/23_all_disable-riscv32-ABIs.patch" || die
-	fi
-
-	toolchain_src_prepare
-}
diff --git a/sys-devel/gcc/gcc-10.4.1_p20220825.ebuild b/sys-devel/gcc/gcc-10.4.1_p20220825.ebuild
deleted file mode 100644
index bb603378916c..000000000000
--- a/sys-devel/gcc/gcc-10.4.1_p20220825.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-TOOLCHAIN_PATCH_SUFFIX="xz"
-TOOLCHAIN_PATCH_DEV="sam"
-#TOOLCHAIN_GCC_RC=1
-PATCH_GCC_VER="10.5.0"
-PATCH_VER="0"
-MUSL_VER="1"
-MUSL_GCC_VER="10.5.0"
-
-if [[ $(ver_cut 3) == 9999 ]] ; then
-	MY_PV_2=$(ver_cut 2)
-	if [[ ${MY_PV_2} == 0 ]] ; then
-		MY_PV_2=0
-	else
-		MY_PV_2=$(($(ver_cut 2) - 1))
-	fi
-
-	# e.g. 12.2.9999 -> 12.1.1
-	TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.$(($(ver_cut 3) - 9998))
-elif [[ -n ${TOOLCHAIN_GCC_RC} ]] ; then
-	# Cheesy hack for RCs
-	MY_PV=$(ver_cut 1).$((($(ver_cut 2) + 1))).$((($(ver_cut 3) - 1)))-RC-$(ver_cut 5)
-	MY_P=${PN}-${MY_PV}
-	GCC_TARBALL_SRC_URI="https://gcc.gnu.org/pub/gcc/snapshots/${MY_PV}/${MY_P}.tar.xz"
-	TOOLCHAIN_SET_S=no
-	S="${WORKDIR}"/${MY_P}
-fi
-
-inherit toolchain
-# Needs to be after inherit (for now?), bug #830908
-EGIT_BRANCH=releases/gcc-$(ver_cut 1)
-
-# Don't keyword live ebuilds
-#if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
-#	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-#fi
-
-RDEPEND=""
-BDEPEND="${CATEGORY}/binutils"
-
-src_prepare() {
-	local p upstreamed_patches=(
-		# add them here
-	)
-	for p in "${upstreamed_patches[@]}"; do
-		rm -v "${WORKDIR}/patch/${p}" || die
-	done
-
-	if has_version '>=sys-libs/glibc-2.32-r1'; then
-		rm -v "${WORKDIR}/patch/23_all_disable-riscv32-ABIs.patch" || die
-	fi
-
-	toolchain_src_prepare
-}
diff --git a/sys-devel/gcc/gcc-11.3.1_p20220819.ebuild b/sys-devel/gcc/gcc-11.3.1_p20220819.ebuild
deleted file mode 100644
index 79b1ee62b754..000000000000
--- a/sys-devel/gcc/gcc-11.3.1_p20220819.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-TOOLCHAIN_PATCH_SUFFIX="xz"
-TOOLCHAIN_PATCH_DEV="sam"
-PATCH_VER="2"
-PATCH_GCC_VER="11.4.0"
-MUSL_VER="0"
-MUSL_GCC_VER="11.4.0"
-
-if [[ $(ver_cut 3) == 9999 ]] ; then
-	MY_PV_2=$(ver_cut 2)
-	if [[ ${MY_PV_2} == 0 ]] ; then
-		MY_PV_2=0
-	else
-		MY_PV_2=$(($(ver_cut 2) - 1))
-	fi
-
-	# e.g. 12.2.9999 -> 12.1.1
-	TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.$(($(ver_cut 3) - 9998))
-fi
-
-inherit toolchain
-# Needs to be after inherit (for now?), bug #830908
-EGIT_BRANCH=releases/gcc-$(ver_cut 1)
-
-# Don't keyword live ebuilds
-#if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
-#        KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-#fi
-
-# Technically only if USE=hardened *too* right now, but no point in complicating it further.
-# If GCC is enabling CET by default, we need glibc to be built with support for it.
-# bug #830454
-RDEPEND="elibc_glibc? ( sys-libs/glibc[cet(-)?] )"
-DEPEND="${RDEPEND}"
-BDEPEND=">=${CATEGORY}/binutils-2.30[cet(-)?]"
-
-src_prepare() {
-	local p upstreamed_patches=(
-		# add them here
-	)
-	for p in "${upstreamed_patches[@]}"; do
-		rm -v "${WORKDIR}/patch/${p}" || die
-	done
-
-	toolchain_src_prepare
-
-	eapply_user
-}
diff --git a/sys-devel/gcc/gcc-11.3.1_p20220826.ebuild b/sys-devel/gcc/gcc-11.3.1_p20220909.ebuild
index 79b1ee62b754..e821929d61b4 100644
--- a/sys-devel/gcc/gcc-11.3.1_p20220826.ebuild
+++ b/sys-devel/gcc/gcc-11.3.1_p20220909.ebuild
@@ -27,9 +27,9 @@ inherit toolchain
 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
+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.
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 73ef99cb1762..e14a28dbeeba 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/lxcfs/Manifest b/sys-fs/lxcfs/Manifest
index 2d2dbc07a44a..84b4263955a0 100644
--- a/sys-fs/lxcfs/Manifest
+++ b/sys-fs/lxcfs/Manifest
@@ -9,5 +9,4 @@ DIST lxcfs-5.0.2.tar.gz 103236 BLAKE2B 5fc8dc437e97a79c78320f8d8111746b171b086be
 DIST lxcfs-5.0.2.tar.gz.asc 833 BLAKE2B a411c6cb4f3382469ea80a974166c98b57ae4b92712bf55507720fc78ec73ef6acbd47f6b3410294b209f77f1f3a17dc4b9fb4dda00bb7323ef32c7185ba4c2e SHA512 f9d54e26d406ebca97c82298361318f13e74fd55285c2b6563ae6c71af63d9b8325ac06b9de8103a95a19c5d965c2d907c313ac151210a162998f8a37ea99676
 EBUILD lxcfs-5.0.0_p20220524.ebuild 1728 BLAKE2B 0b357a0906f9f7921d99948ce1721d4f6e3e076f3367ed2eae91078c4c71d20611cb49dad2c446675e200dd1e0060b06fbcadf304911145c1aae78f639b665b1 SHA512 67890b74409da3767b9169b727fc895fd4345abc62190414ee4ca3cb22fee4b24cdbe240b2c73162e99d0c0ce18a3eb340d91a6993c794ac6266f8fa898d4fe6
 EBUILD lxcfs-5.0.2-r1.ebuild 1848 BLAKE2B 35ac744020136ea5b8537b2f7a7b2550a08c45ae2009364e5111abe3fea1d25731c376cbd49874446501675f97dc47ccf73e0cd9a8d4dd9aa8a82c611dfe9f99 SHA512 eedef4f780da3ca12378f578129f8041ec15831b470b152c876fc64817cde712e50f782311fce06bc4b08fd51dabd3c57d74ae5dea0e9be39cc09781730ea5c8
-EBUILD lxcfs-5.0.2.ebuild 1848 BLAKE2B 4bcf1691ede06337d5ee98ec1d5978d46532ff31fa3182d1aa93850e4c5740d0c71977188461a18b5dbf5819c60c9baff16812c34d5171c5e7f53005cd154f4f SHA512 6be20bb6e6fbc1f19e3e56a93717ebb3ab370835e7855145f3b06d7c8c2522768ed0844c4a833956a7d99291da9b1f33ca4b76146654d46ed55ae9626a1eb179
 MISC metadata.xml 710 BLAKE2B ac2111d3b67e2aa7286b98e3069e77e3b852f401b56a921795370febd8836434e13cfec4af92cc83a379037023c3d7af475516bea02545595fe9a58a188dcb2f SHA512 f07ff1acbf28cda31d9d962332ecf473197d2868488e7051185ab5ab792f5bb9405712d68e3f9c3b10f38024d2025784b98ce9513e2978f537c26bc7c4d7caab
diff --git a/sys-fs/lxcfs/lxcfs-5.0.2.ebuild b/sys-fs/lxcfs/lxcfs-5.0.2.ebuild
deleted file mode 100644
index 9af4475e9807..000000000000
--- a/sys-fs/lxcfs/lxcfs-5.0.2.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit cmake meson python-any-r1 systemd verify-sig
-
-DESCRIPTION="FUSE filesystem for LXC"
-HOMEPAGE="https://linuxcontainers.org/lxcfs/introduction/ https://github.com/lxc/lxcfs/"
-SRC_URI="https://linuxcontainers.org/downloads/lxcfs/${P}.tar.gz
-	verify-sig? ( https://linuxcontainers.org/downloads/lxcfs/${P}.tar.gz.asc )"
-
-LICENSE="Apache-2.0 LGPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-IUSE="doc test"
-
-DEPEND="sys-fs/fuse:3"
-RDEPEND="${DEPEND}"
-BDEPEND="${PYTHON_DEPS}
-	$(python_gen_any_dep '
-		dev-python/jinja[${PYTHON_USEDEP}]
-	')
-	doc? ( sys-apps/help2man )
-	verify-sig? ( sec-keys/openpgp-keys-linuxcontainers )"
-
-# Needs some black magic to work inside container/chroot.
-RESTRICT="test"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/linuxcontainers.asc
-
-python_check_deps() {
-	python_has_version -b "dev-python/jinja[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# Fix python shebangs for python-exec[-native-symlinks], #851480
-	local shebangs=($(grep -rl "#!/usr/bin/env python3" || die))
-	python_fix_shebang -q ${shebangs[*]}
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use doc docs)
-		$(meson_use test tests)
-
-		-Dfuse-version=3
-		-Dinit-script=""
-		-Dwith-init-script=""
-	)
-
-	meson_src_configure
-}
-
-src_test() {
-	cd "${BUILD_DIR}"/tests || die "failed to change into tests/ directory."
-	./main.sh || die
-}
-
-src_install() {
-	meson_src_install
-
-	newconfd "${FILESDIR}"/lxcfs-4.0.0.confd lxcfs
-	newinitd "${FILESDIR}"/lxcfs-4.0.0.initd lxcfs
-
-	# Provide our own service file (copy of upstream) due to paths being different from upstream,
-	# #728470
-	systemd_newunit "${FILESDIR}"/lxcfs-4.0.0.service lxcfs.service
-}
diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index 7899010ae575..ef02492efff1 100644
--- a/www-servers/Manifest.gz
+++ b/www-servers/Manifest.gz
diff --git a/www-servers/nginx/Manifest b/www-servers/nginx/Manifest
index ff2c35b254ab..e36e6177bcf2 100644
--- a/www-servers/nginx/Manifest
+++ b/www-servers/nginx/Manifest
@@ -44,5 +44,5 @@ DIST ngx_mogilefs_module-1.0.4.tar.gz 11208 BLAKE2B e0729b66554c8890727190a624d4
 DIST ngx_rtmp-1.2.1.tar.gz 519919 BLAKE2B 744ccb8031eb9653f158f9eceba64fc9c8af7b9a42e64ef996ab3bbbe1402e5ffd3efcc8e4aaca437eb5e208e4b6f2d8643fcca953b32f32543eaa1ae4d9505c SHA512 4a0af5e9afa4deb0b53de8de7ddb2cfa6430d372e1ef9e421f01b509548bd134d427345442ac1ce667338cc2a1484dc2ab732e316e878ac7d3537dc527d5f922
 DIST njs-0.7.7.tar.gz 609779 BLAKE2B 878c1a106237d42f03074051d12a2de409a1ce3088ec3fd8a43032183608b68e0a11f438668aaca3135ac2280875f248467d6fa801539fcfc6d1436db1579199 SHA512 3fd9e9b84e416e95dbdffced78eabd76a519cccec7c386d8acaccd0d891dea5ceeb702408d4450107c7e3909586753e4eeb5e38c06657cd8f273180beb8fae74
 EBUILD nginx-1.21.6-r4.ebuild 40087 BLAKE2B 8cc6e4d5ef9a49f20ba9085f282f103574138166275acb5da4d853f8fd375905acb7dd8434221a4d045017c82b0371603eef58cf731ede327d58f38ddbb6c394 SHA512 80407695e03d1b93a172e2de8b8da55ac9731e4a864f846315e6fab0c8dd89020f902ac1220cc45c8390d89ab1e7d2c1571bd541758e6a2ec69a217d003c2d6a
-EBUILD nginx-1.23.1-r1.ebuild 39599 BLAKE2B 70518d3ded1cd45533c0eee90d9121920e933d9b01a5ab0fa243777fd76c460aeb9715c5d0bd972cd70a41277508cf6ddc0b9ce828113d5d8457bb3f90bfdbb4 SHA512 3510823d2984a8e576e0fe31db2937906f81b8edb39faec7c8bf56c2121c379a1476a9beee1b36d54d6e58bd326cc2b8cce53a5ec7c8a6e920a221d1a8be699b
+EBUILD nginx-1.23.1-r1.ebuild 39598 BLAKE2B 9b63db4a3d1bc982ebc7329235745555004bcf6774c804281e6736f871bd21b9007e05f071763c1400412090324eb4542a62ae3bbd7bfc66b4242b7e05634991 SHA512 368372ac3a9f62791f5b50e9ab4d36440ba64f66c39a4025a3ae84595077960e9414a27073998e75870962c64825f366ef78dfcdaddf689c21330beb5b55cc07
 MISC metadata.xml 1012 BLAKE2B 5fe75eb9105a998668cfebf02c6976784f4ef3332edd0b6c21a23a5ffb0838b4ae8bc9e52f5157b43c3c0d060825ac46bccabc94bcf8b59447311e0f9ac94f29 SHA512 0d243d1d5271d05d51a46b5825fe32ac5283211434672e99e7314c57f5d1f1f88f48c189fffcdb12747c8d33c9dafe0c8df12376cbbec2912732da0ed6de0642
diff --git a/www-servers/nginx/nginx-1.23.1-r1.ebuild b/www-servers/nginx/nginx-1.23.1-r1.ebuild
index cbfbcfbe30f2..874658a6e5c3 100644
--- a/www-servers/nginx/nginx-1.23.1-r1.ebuild
+++ b/www-servers/nginx/nginx-1.23.1-r1.ebuild
@@ -202,7 +202,7 @@ LICENSE="BSD-2 BSD SSLeay MIT GPL-2 GPL-2+
 	nginx_modules_http_push_stream? ( GPL-3 )"
 
 SLOT="mainline"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
 
 # Package doesn't provide a real test suite
 RESTRICT="test"
author	V3n3RiX <venerix@koprulu.sector>	2022-09-10 10:42:05 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2022-09-10 10:42:05 +0100
commit	946859e0e36904cffb3e0ccbccb6b7b1347c1cc8 (patch)
tree	0acec77e64f765c013ceda868659a8e125e429df
parent	b9baffd9af9383cc886b1583814fe15163017d80 (diff)